From d5fe6073789fb60b0177d99ec5320c5ebf43436f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 15 Dec 2022 16:28:38 +0100 Subject: [PATCH 01/57] Migrated CatalogClient from propeller to stdlib Implemented new datacatalog functionality required for cache eviction Updated to latest unreleased version of flyteidl and flyteplugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- flytestdlib/catalog/client.go | 26 + flytestdlib/catalog/config.go | 43 + flytestdlib/catalog/config_flags.go | 60 + flytestdlib/catalog/config_flags_test.go | 186 +++ .../catalog/datacatalog/datacatalog.go | 556 ++++++++ .../catalog/datacatalog/datacatalog_test.go | 1136 +++++++++++++++++ .../catalog/datacatalog/transformer.go | 336 +++++ .../catalog/datacatalog/transformer_test.go | 898 +++++++++++++ flytestdlib/catalog/noop_catalog.go | 60 + flytestdlib/go.mod | 60 +- flytestdlib/go.sum | 261 +++- 11 files changed, 3588 insertions(+), 34 deletions(-) create mode 100644 flytestdlib/catalog/client.go create mode 100644 flytestdlib/catalog/config.go create mode 100755 flytestdlib/catalog/config_flags.go create mode 100755 flytestdlib/catalog/config_flags_test.go create mode 100644 flytestdlib/catalog/datacatalog/datacatalog.go create mode 100644 flytestdlib/catalog/datacatalog/datacatalog_test.go create mode 100644 flytestdlib/catalog/datacatalog/transformer.go create mode 100644 flytestdlib/catalog/datacatalog/transformer_test.go create mode 100644 flytestdlib/catalog/noop_catalog.go diff --git a/flytestdlib/catalog/client.go b/flytestdlib/catalog/client.go new file mode 100644 index 0000000000..ce41c07710 --- /dev/null +++ b/flytestdlib/catalog/client.go @@ -0,0 +1,26 @@ +package catalog + +import ( + "context" + "fmt" + + "google.golang.org/grpc" + + pluginCatalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flytestdlib/catalog/datacatalog" +) + +func NewClient(ctx context.Context, authOpt ...grpc.DialOption) (pluginCatalog.Client, error) { + catalogConfig := GetConfig() + + switch catalogConfig.Type { + case TypeDataCatalog: + return datacatalog.NewDataCatalog(ctx, catalogConfig.Endpoint, catalogConfig.Insecure, + catalogConfig.MaxCacheAge.Duration, catalogConfig.UseAdminAuth, catalogConfig.DefaultServiceConfig, + authOpt...) + case TypeNoOp, "": + return NOOPCatalog{}, nil + } + + return nil, fmt.Errorf("invalid catalog type %q", catalogConfig.Type) +} diff --git a/flytestdlib/catalog/config.go b/flytestdlib/catalog/config.go new file mode 100644 index 0000000000..0ae0a4006f --- /dev/null +++ b/flytestdlib/catalog/config.go @@ -0,0 +1,43 @@ +package catalog + +import ( + "github.com/flyteorg/flytestdlib/config" +) + +//go:generate pflags Config --default-var defaultConfig + +const ConfigSectionKey = "catalog-cache" + +var ( + defaultConfig = &Config{ + Type: TypeNoOp, + } + + configSection = config.MustRegisterSection(ConfigSectionKey, defaultConfig) +) + +type Type = string + +const ( + TypeNoOp Type = "noop" + TypeDataCatalog Type = "datacatalog" +) + +type Config struct { + Type Type `json:"type" pflag:"\"noop\", Catalog Implementation to use"` + Endpoint string `json:"endpoint" pflag:"\"\", Endpoint for catalog service"` + Insecure bool `json:"insecure" pflag:"false, Use insecure grpc connection"` + MaxCacheAge config.Duration `json:"max-cache-age" pflag:", Cache entries past this age will incur cache miss. 0 means cache never expires"` + UseAdminAuth bool `json:"use-admin-auth" pflag:"false, Use the same gRPC credentials option as the flyteadmin client"` + + // Set the gRPC service config formatted as a json string https://github.com/grpc/grpc/blob/master/doc/service_config.md + // eg. {"loadBalancingConfig": [{"round_robin":{}}], "methodConfig": [{"name":[{"service": "foo", "method": "bar"}, {"service": "baz"}], "timeout": "1.000000001s"}]} + // find the full schema here https://github.com/grpc/grpc-proto/blob/master/grpc/service_config/service_config.proto#L625 + // Note that required packages may need to be preloaded to support certain service config. For example "google.golang.org/grpc/balancer/roundrobin" should be preloaded to have round-robin policy supported. + DefaultServiceConfig string `json:"default-service-config" pflag:"\"\", Set the default service config for the catalog gRPC client"` +} + +// GetConfig returns the parsed Catalog configuration +func GetConfig() *Config { + return configSection.GetConfig().(*Config) +} diff --git a/flytestdlib/catalog/config_flags.go b/flytestdlib/catalog/config_flags.go new file mode 100755 index 0000000000..4bd40b20b4 --- /dev/null +++ b/flytestdlib/catalog/config_flags.go @@ -0,0 +1,60 @@ +// Code generated by go generate; DO NOT EDIT. +// This file was generated by robots. + +package catalog + +import ( + "encoding/json" + "reflect" + + "fmt" + + "github.com/spf13/pflag" +) + +// If v is a pointer, it will get its element value or the zero value of the element type. +// If v is not a pointer, it will return it as is. +func (Config) elemValueOrNil(v interface{}) interface{} { + if t := reflect.TypeOf(v); t.Kind() == reflect.Ptr { + if reflect.ValueOf(v).IsNil() { + return reflect.Zero(t.Elem()).Interface() + } else { + return reflect.ValueOf(v).Interface() + } + } else if v == nil { + return reflect.Zero(t).Interface() + } + + return v +} + +func (Config) mustJsonMarshal(v interface{}) string { + raw, err := json.Marshal(v) + if err != nil { + panic(err) + } + + return string(raw) +} + +func (Config) mustMarshalJSON(v json.Marshaler) string { + raw, err := v.MarshalJSON() + if err != nil { + panic(err) + } + + return string(raw) +} + +// GetPFlagSet will return strongly types pflags for all fields in Config and its nested types. The format of the +// flags is json-name.json-sub-name... etc. +func (cfg Config) GetPFlagSet(prefix string) *pflag.FlagSet { + cmdFlags := pflag.NewFlagSet("Config", pflag.ExitOnError) + cmdFlags.String(fmt.Sprintf("%v%v", prefix, "type"), defaultConfig.Type, " Catalog Implementation to use") + cmdFlags.String(fmt.Sprintf("%v%v", prefix, "endpoint"), defaultConfig.Endpoint, " Endpoint for catalog service") + cmdFlags.Bool(fmt.Sprintf("%v%v", prefix, "insecure"), defaultConfig.Insecure, " Use insecure grpc connection") + cmdFlags.String(fmt.Sprintf("%v%v", prefix, "max-cache-age"), defaultConfig.MaxCacheAge.String(), " Cache entries past this age will incur cache miss. 0 means cache never expires") + cmdFlags.Bool(fmt.Sprintf("%v%v", prefix, "use-admin-auth"), defaultConfig.UseAdminAuth, " Use the same gRPC credentials option as the flyteadmin client") + cmdFlags.String(fmt.Sprintf("%v%v", prefix, "default-service-config"), defaultConfig.DefaultServiceConfig, " Set the default service config for the catalog gRPC client") + return cmdFlags +} diff --git a/flytestdlib/catalog/config_flags_test.go b/flytestdlib/catalog/config_flags_test.go new file mode 100755 index 0000000000..3b18a9282d --- /dev/null +++ b/flytestdlib/catalog/config_flags_test.go @@ -0,0 +1,186 @@ +// Code generated by go generate; DO NOT EDIT. +// This file was generated by robots. + +package catalog + +import ( + "encoding/json" + "fmt" + "reflect" + "strings" + "testing" + + "github.com/mitchellh/mapstructure" + "github.com/stretchr/testify/assert" +) + +var dereferencableKindsConfig = map[reflect.Kind]struct{}{ + reflect.Array: {}, reflect.Chan: {}, reflect.Map: {}, reflect.Ptr: {}, reflect.Slice: {}, +} + +// Checks if t is a kind that can be dereferenced to get its underlying type. +func canGetElementConfig(t reflect.Kind) bool { + _, exists := dereferencableKindsConfig[t] + return exists +} + +// This decoder hook tests types for json unmarshaling capability. If implemented, it uses json unmarshal to build the +// object. Otherwise, it'll just pass on the original data. +func jsonUnmarshalerHookConfig(_, to reflect.Type, data interface{}) (interface{}, error) { + unmarshalerType := reflect.TypeOf((*json.Unmarshaler)(nil)).Elem() + if to.Implements(unmarshalerType) || reflect.PtrTo(to).Implements(unmarshalerType) || + (canGetElementConfig(to.Kind()) && to.Elem().Implements(unmarshalerType)) { + + raw, err := json.Marshal(data) + if err != nil { + fmt.Printf("Failed to marshal Data: %v. Error: %v. Skipping jsonUnmarshalHook", data, err) + return data, nil + } + + res := reflect.New(to).Interface() + err = json.Unmarshal(raw, &res) + if err != nil { + fmt.Printf("Failed to umarshal Data: %v. Error: %v. Skipping jsonUnmarshalHook", data, err) + return data, nil + } + + return res, nil + } + + return data, nil +} + +func decode_Config(input, result interface{}) error { + config := &mapstructure.DecoderConfig{ + TagName: "json", + WeaklyTypedInput: true, + Result: result, + DecodeHook: mapstructure.ComposeDecodeHookFunc( + mapstructure.StringToTimeDurationHookFunc(), + mapstructure.StringToSliceHookFunc(","), + jsonUnmarshalerHookConfig, + ), + } + + decoder, err := mapstructure.NewDecoder(config) + if err != nil { + return err + } + + return decoder.Decode(input) +} + +func join_Config(arr interface{}, sep string) string { + listValue := reflect.ValueOf(arr) + strs := make([]string, 0, listValue.Len()) + for i := 0; i < listValue.Len(); i++ { + strs = append(strs, fmt.Sprintf("%v", listValue.Index(i))) + } + + return strings.Join(strs, sep) +} + +func testDecodeJson_Config(t *testing.T, val, result interface{}) { + assert.NoError(t, decode_Config(val, result)) +} + +func testDecodeRaw_Config(t *testing.T, vStringSlice, result interface{}) { + assert.NoError(t, decode_Config(vStringSlice, result)) +} + +func TestConfig_GetPFlagSet(t *testing.T) { + val := Config{} + cmdFlags := val.GetPFlagSet("") + assert.True(t, cmdFlags.HasFlags()) +} + +func TestConfig_SetFlags(t *testing.T) { + actual := Config{} + cmdFlags := actual.GetPFlagSet("") + assert.True(t, cmdFlags.HasFlags()) + + t.Run("Test_type", func(t *testing.T) { + + t.Run("Override", func(t *testing.T) { + testValue := "1" + + cmdFlags.Set("type", testValue) + if vString, err := cmdFlags.GetString("type"); err == nil { + testDecodeJson_Config(t, fmt.Sprintf("%v", vString), &actual.Type) + + } else { + assert.FailNow(t, err.Error()) + } + }) + }) + t.Run("Test_endpoint", func(t *testing.T) { + + t.Run("Override", func(t *testing.T) { + testValue := "1" + + cmdFlags.Set("endpoint", testValue) + if vString, err := cmdFlags.GetString("endpoint"); err == nil { + testDecodeJson_Config(t, fmt.Sprintf("%v", vString), &actual.Endpoint) + + } else { + assert.FailNow(t, err.Error()) + } + }) + }) + t.Run("Test_insecure", func(t *testing.T) { + + t.Run("Override", func(t *testing.T) { + testValue := "1" + + cmdFlags.Set("insecure", testValue) + if vBool, err := cmdFlags.GetBool("insecure"); err == nil { + testDecodeJson_Config(t, fmt.Sprintf("%v", vBool), &actual.Insecure) + + } else { + assert.FailNow(t, err.Error()) + } + }) + }) + t.Run("Test_max-cache-age", func(t *testing.T) { + + t.Run("Override", func(t *testing.T) { + testValue := defaultConfig.MaxCacheAge.String() + + cmdFlags.Set("max-cache-age", testValue) + if vString, err := cmdFlags.GetString("max-cache-age"); err == nil { + testDecodeJson_Config(t, fmt.Sprintf("%v", vString), &actual.MaxCacheAge) + + } else { + assert.FailNow(t, err.Error()) + } + }) + }) + t.Run("Test_use-admin-auth", func(t *testing.T) { + + t.Run("Override", func(t *testing.T) { + testValue := "1" + + cmdFlags.Set("use-admin-auth", testValue) + if vBool, err := cmdFlags.GetBool("use-admin-auth"); err == nil { + testDecodeJson_Config(t, fmt.Sprintf("%v", vBool), &actual.UseAdminAuth) + + } else { + assert.FailNow(t, err.Error()) + } + }) + }) + t.Run("Test_default-service-config", func(t *testing.T) { + + t.Run("Override", func(t *testing.T) { + testValue := "1" + + cmdFlags.Set("default-service-config", testValue) + if vString, err := cmdFlags.GetString("default-service-config"); err == nil { + testDecodeJson_Config(t, fmt.Sprintf("%v", vString), &actual.DefaultServiceConfig) + + } else { + assert.FailNow(t, err.Error()) + } + }) + }) +} diff --git a/flytestdlib/catalog/datacatalog/datacatalog.go b/flytestdlib/catalog/datacatalog/datacatalog.go new file mode 100644 index 0000000000..f13f325ec6 --- /dev/null +++ b/flytestdlib/catalog/datacatalog/datacatalog.go @@ -0,0 +1,556 @@ +package datacatalog + +import ( + "context" + "crypto/x509" + "fmt" + "time" + + "github.com/golang/protobuf/ptypes" + grpcRetry "github.com/grpc-ecosystem/go-grpc-middleware/retry" + grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "github.com/pkg/errors" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials" + "google.golang.org/grpc/status" + "k8s.io/apimachinery/pkg/util/uuid" + + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/flyteorg/flytestdlib/logger" +) + +var ( + _ catalog.Client = &CatalogClient{} +) + +// CatalogClient is the client that caches task executions to DataCatalog service. +type CatalogClient struct { + client datacatalog.DataCatalogClient + maxCacheAge time.Duration +} + +// GetDataset retrieves a dataset that is associated with the task represented by the provided catalog.Key. +func (m *CatalogClient) GetDataset(ctx context.Context, key catalog.Key) (*datacatalog.Dataset, error) { + datasetID, err := GenerateDatasetIDForTask(ctx, key) + if err != nil { + return nil, err + } + logger.Debugf(ctx, "Get Dataset %v", datasetID) + + dsQuery := &datacatalog.GetDatasetRequest{ + Dataset: datasetID, + } + + datasetResponse, err := m.client.GetDataset(ctx, dsQuery) + if err != nil { + return nil, err + } + + return datasetResponse.Dataset, nil +} + +// GetArtifactByTag retrieves an artifact using the provided tag and dataset. +func (m *CatalogClient) GetArtifactByTag(ctx context.Context, tagName string, dataset *datacatalog.Dataset) (*datacatalog.Artifact, error) { + logger.Debugf(ctx, "Get Artifact by tag %v", tagName) + artifactQuery := &datacatalog.GetArtifactRequest{ + Dataset: dataset.Id, + QueryHandle: &datacatalog.GetArtifactRequest_TagName{ + TagName: tagName, + }, + } + response, err := m.client.GetArtifact(ctx, artifactQuery) + if err != nil { + return nil, err + } + + // check artifact's age if the configuration specifies a max age + if m.maxCacheAge > time.Duration(0) { + artifact := response.Artifact + createdAt, err := ptypes.Timestamp(artifact.CreatedAt) + if err != nil { + logger.Errorf(ctx, "DataCatalog Artifact has invalid createdAt %+v, err: %+v", artifact.CreatedAt, err) + return nil, err + } + + if time.Since(createdAt) > m.maxCacheAge { + logger.Warningf(ctx, "Expired Cached Artifact %v created on %v, older than max age %v", + artifact.Id, createdAt.String(), m.maxCacheAge) + return nil, status.Error(codes.NotFound, "Artifact over age limit") + } + } + + return response.Artifact, nil +} + +// Get the cached task execution from Catalog. +// These are the steps taken: +// - Verify there is a Dataset created for the Task +// - Lookup the Artifact that is tagged with the hash of the input values +// - The artifactData contains the literal values that serve as the task outputs +func (m *CatalogClient) Get(ctx context.Context, key catalog.Key) (catalog.Entry, error) { + dataset, err := m.GetDataset(ctx, key) + if err != nil { + logger.Debugf(ctx, "DataCatalog failed to get dataset for ID %s, err: %+v", key.Identifier.String(), err) + return catalog.Entry{}, errors.Wrapf(err, "DataCatalog failed to get dataset for ID %s", key.Identifier.String()) + } + + inputs := &core.LiteralMap{} + if key.TypedInterface.Inputs != nil { + retInputs, err := key.InputReader.Get(ctx) + if err != nil { + return catalog.Entry{}, errors.Wrap(err, "failed to read inputs when trying to query catalog") + } + inputs = retInputs + } + + tag, err := GenerateArtifactTagName(ctx, inputs) + if err != nil { + logger.Errorf(ctx, "DataCatalog failed to generate tag for inputs %+v, err: %+v", inputs, err) + return catalog.Entry{}, err + } + + artifact, err := m.GetArtifactByTag(ctx, tag, dataset) + if err != nil { + logger.Debugf(ctx, "DataCatalog failed to get artifact by tag %+v, err: %+v", tag, err) + return catalog.Entry{}, err + } + logger.Debugf(ctx, "Artifact found %v from tag %v", artifact, tag) + + var relevantTag *datacatalog.Tag + if len(artifact.GetTags()) > 0 { + // TODO should we look through all the tags to find the relevant one? + relevantTag = artifact.GetTags()[0] + } + + source, err := GetSourceFromMetadata(dataset.GetMetadata(), artifact.GetMetadata(), key.Identifier) + if err != nil { + return catalog.Entry{}, fmt.Errorf("failed to get source from metadata. Error: %w", err) + } + + md := EventCatalogMetadata(dataset.GetId(), relevantTag, source) + + outputs, err := GenerateTaskOutputsFromArtifact(key.Identifier, key.TypedInterface, artifact) + if err != nil { + logger.Errorf(ctx, "DataCatalog failed to get outputs from artifact %+v, err: %+v", artifact.Id, err) + return catalog.NewCatalogEntry(ioutils.NewInMemoryOutputReader(outputs, nil, nil), catalog.NewStatus(core.CatalogCacheStatus_CACHE_MISS, md)), err + } + + logger.Infof(ctx, "Retrieved %v outputs from artifact %v, tag: %v", len(outputs.Literals), artifact.Id, tag) + return catalog.NewCatalogEntry(ioutils.NewInMemoryOutputReader(outputs, nil, nil), catalog.NewStatus(core.CatalogCacheStatus_CACHE_HIT, md)), nil +} + +// CreateDataset creates a Dataset in datacatalog including the associated metadata. +func (m *CatalogClient) CreateDataset(ctx context.Context, key catalog.Key, metadata *datacatalog.Metadata) (*datacatalog.DatasetID, error) { + datasetID, err := GenerateDatasetIDForTask(ctx, key) + if err != nil { + logger.Errorf(ctx, "DataCatalog failed to generate dataset for ID: %s, err: %s", key.Identifier, err) + return nil, err + } + + newDataset := &datacatalog.Dataset{ + Id: datasetID, + Metadata: metadata, + } + + _, err = m.client.CreateDataset(ctx, &datacatalog.CreateDatasetRequest{Dataset: newDataset}) + if err != nil { + logger.Debugf(ctx, "Create dataset %v return err %v", datasetID, err) + if status.Code(err) == codes.AlreadyExists { + logger.Debugf(ctx, "Create Dataset for ID %s already exists", key.Identifier) + } else { + logger.Errorf(ctx, "Unable to create dataset %s, err: %s", datasetID, err) + return nil, err + } + } + + return datasetID, nil +} + +// prepareInputsAndOutputs reads the inputs and outputs of a task and returns them as core.LiteralMaps to be consumed by datacatalog. +func (m *CatalogClient) prepareInputsAndOutputs(ctx context.Context, key catalog.Key, reader io.OutputReader) (inputs *core.LiteralMap, outputs *core.LiteralMap, err error) { + inputs = &core.LiteralMap{} + outputs = &core.LiteralMap{} + if key.TypedInterface.Inputs != nil && len(key.TypedInterface.Inputs.Variables) != 0 { + retInputs, err := key.InputReader.Get(ctx) + if err != nil { + logger.Errorf(ctx, "DataCatalog failed to read inputs err: %s", err) + return nil, nil, err + } + logger.Debugf(ctx, "DataCatalog read inputs") + inputs = retInputs + } + + if key.TypedInterface.Outputs != nil && len(key.TypedInterface.Outputs.Variables) != 0 { + retOutputs, retErr, err := reader.Read(ctx) + if err != nil { + logger.Errorf(ctx, "DataCatalog failed to read outputs err: %s", err) + return nil, nil, err + } + if retErr != nil { + logger.Errorf(ctx, "DataCatalog failed to read outputs, err :%s", retErr.Message) + return nil, nil, errors.Errorf("Failed to read outputs. EC: %s, Msg: %s", retErr.Code, retErr.Message) + } + logger.Debugf(ctx, "DataCatalog read outputs") + outputs = retOutputs + } + + return inputs, outputs, nil +} + +// CreateArtifact creates an Artifact in datacatalog including its associated ArtifactData and tags it with a hash of +// the provided input values for retrieval. +func (m *CatalogClient) CreateArtifact(ctx context.Context, key catalog.Key, datasetID *datacatalog.DatasetID, inputs *core.LiteralMap, outputs *core.LiteralMap, metadata catalog.Metadata) (catalog.Status, error) { + logger.Debugf(ctx, "Creating artifact for key %+v, dataset %+v and execution %+v", key, datasetID, metadata) + + // Create the artifact for the execution that belongs in the task + artifactDataList := make([]*datacatalog.ArtifactData, 0, len(outputs.Literals)) + for name, value := range outputs.Literals { + artifactData := &datacatalog.ArtifactData{ + Name: name, + Value: value, + } + artifactDataList = append(artifactDataList, artifactData) + } + + cachedArtifact := &datacatalog.Artifact{ + Id: string(uuid.NewUUID()), + Dataset: datasetID, + Data: artifactDataList, + Metadata: GetArtifactMetadataForSource(metadata.TaskExecutionIdentifier), + } + + createArtifactRequest := &datacatalog.CreateArtifactRequest{Artifact: cachedArtifact} + _, err := m.client.CreateArtifact(ctx, createArtifactRequest) + if err != nil { + logger.Errorf(ctx, "Failed to create Artifact %+v, err: %v", cachedArtifact, err) + return catalog.Status{}, err + } + logger.Debugf(ctx, "Created artifact: %v, with %v outputs from execution %+v", cachedArtifact.Id, len(artifactDataList), metadata) + + // Tag the artifact since it is the cached artifact + tagName, err := GenerateArtifactTagName(ctx, inputs) + if err != nil { + logger.Errorf(ctx, "Failed to generate tag for artifact %+v, err: %+v", cachedArtifact.Id, err) + return catalog.Status{}, err + } + logger.Infof(ctx, "Cached exec tag: %v, task: %v", tagName, key.Identifier) + + // TODO: We should create the artifact + tag in a transaction when the service supports that + tag := &datacatalog.Tag{ + Name: tagName, + Dataset: datasetID, + ArtifactId: cachedArtifact.Id, + } + _, err = m.client.AddTag(ctx, &datacatalog.AddTagRequest{Tag: tag}) + if err != nil { + if status.Code(err) == codes.AlreadyExists { + logger.Warnf(ctx, "Tag %v already exists for Artifact %v (idempotent)", tagName, cachedArtifact.Id) + } else { + logger.Errorf(ctx, "Failed to add tag %+v for artifact %+v, err: %+v", tagName, cachedArtifact.Id, err) + return catalog.Status{}, err + } + } + + logger.Debugf(ctx, "Successfully created artifact %+v for key %+v, dataset %+v and execution %+v", cachedArtifact, key, datasetID, metadata) + return catalog.NewStatus(core.CatalogCacheStatus_CACHE_POPULATED, EventCatalogMetadata(datasetID, tag, nil)), nil +} + +// UpdateArtifact overwrites the ArtifactData of an existing artifact with the provided data in datacatalog. +func (m *CatalogClient) UpdateArtifact(ctx context.Context, key catalog.Key, datasetID *datacatalog.DatasetID, inputs *core.LiteralMap, outputs *core.LiteralMap, metadata catalog.Metadata) (catalog.Status, error) { + logger.Debugf(ctx, "Updating artifact for key %+v, dataset %+v and execution %+v", key, datasetID, metadata) + + artifactDataList := make([]*datacatalog.ArtifactData, 0, len(outputs.Literals)) + for name, value := range outputs.Literals { + artifactData := &datacatalog.ArtifactData{ + Name: name, + Value: value, + } + artifactDataList = append(artifactDataList, artifactData) + } + + tagName, err := GenerateArtifactTagName(ctx, inputs) + if err != nil { + logger.Errorf(ctx, "Failed to generate artifact tag name for key %+v, dataset %+v and execution %+v, err: %+v", key, datasetID, metadata, err) + return catalog.Status{}, err + } + + updateArtifactRequest := &datacatalog.UpdateArtifactRequest{ + Dataset: datasetID, + QueryHandle: &datacatalog.UpdateArtifactRequest_TagName{TagName: tagName}, + Data: artifactDataList, + } + resp, err := m.client.UpdateArtifact(ctx, updateArtifactRequest) + if err != nil { + logger.Errorf(ctx, "Failed to update artifact for key %+v, dataset %+v and execution %+v, err: %v", key, datasetID, metadata, err) + return catalog.Status{}, err + } + + tag := &datacatalog.Tag{ + Name: tagName, + Dataset: datasetID, + ArtifactId: resp.GetArtifactId(), + } + + source, err := GetSourceFromMetadata(GetDatasetMetadataForSource(metadata.TaskExecutionIdentifier), GetArtifactMetadataForSource(metadata.TaskExecutionIdentifier), key.Identifier) + if err != nil { + return catalog.Status{}, fmt.Errorf("failed to get source from metadata. Error: %w", err) + } + + logger.Debugf(ctx, "Successfully updated artifact with ID %v and %d outputs for key %+v, dataset %+v and execution %+v", tag.ArtifactId, len(artifactDataList), key, datasetID, metadata) + return catalog.NewStatus(core.CatalogCacheStatus_CACHE_POPULATED, EventCatalogMetadata(datasetID, tag, source)), nil +} + +// Put stores the result of a task execution as a cached Artifact and associates it with the data by tagging it with +// the hash of the input values. +// The CatalogClient will ensure a dataset exists for the Artifact to be created. A Dataset represents the +// project/domain/name/version of the task executed. +// Lastly, CatalogClient will create an Artifact tagged with the input value hash and store the provided execution data. +func (m *CatalogClient) Put(ctx context.Context, key catalog.Key, reader io.OutputReader, metadata catalog.Metadata) (catalog.Status, error) { + // Ensure dataset exists, idempotent operations. Populate Metadata for later recovery + datasetID, err := m.CreateDataset(ctx, key, GetDatasetMetadataForSource(metadata.TaskExecutionIdentifier)) + if err != nil { + return catalog.Status{}, err + } + + inputs, outputs, err := m.prepareInputsAndOutputs(ctx, key, reader) + if err != nil { + return catalog.Status{}, err + } + + return m.CreateArtifact(ctx, key, datasetID, inputs, outputs, metadata) +} + +// Update stores the result of a task execution as a cached Artifact, overwriting any already stored data from a previous +// execution. +// The CatalogClient will ensure the referenced dataset exists and will silently create a new Artifact if the referenced +// key does not exist in datacatalog yet. +// After the operation succeeds, an artifact with the given key and data will be stored in catalog and a tag with the +// has of the input values will exist. +func (m *CatalogClient) Update(ctx context.Context, key catalog.Key, reader io.OutputReader, metadata catalog.Metadata) (catalog.Status, error) { + // Ensure dataset exists, idempotent operations. Populate Metadata for later recovery + datasetID, err := m.CreateDataset(ctx, key, GetDatasetMetadataForSource(metadata.TaskExecutionIdentifier)) + if err != nil { + return catalog.Status{}, err + } + + inputs, outputs, err := m.prepareInputsAndOutputs(ctx, key, reader) + if err != nil { + return catalog.Status{}, err + } + + catalogStatus, err := m.UpdateArtifact(ctx, key, datasetID, inputs, outputs, metadata) + if err != nil { + if status.Code(err) == codes.NotFound { + // No existing artifact found (e.g. initial execution of task with overwrite flag already set), + // silently ignore error and create artifact instead to make overwriting an idempotent operation. + logger.Debugf(ctx, "Artifact %+v for dataset %+v does not exist while updating, creating instead", key, datasetID) + return m.CreateArtifact(ctx, key, datasetID, inputs, outputs, metadata) + } + + logger.Errorf(ctx, "Failed to update artifact %+v for dataset %+v: %v", key, datasetID, err) + return catalog.Status{}, err + } + + logger.Debugf(ctx, "Successfully updated artifact %+v for dataset %+v", key, datasetID) + return catalogStatus, nil +} + +// GetOrExtendReservation attempts to get a reservation for the cacheable task. If you have +// previously acquired a reservation it will be extended. If another entity holds the reservation +// that is returned. +func (m *CatalogClient) GetOrExtendReservation(ctx context.Context, key catalog.Key, ownerID string, heartbeatInterval time.Duration) (*datacatalog.Reservation, error) { + datasetID, err := GenerateDatasetIDForTask(ctx, key) + if err != nil { + return nil, err + } + + inputs := &core.LiteralMap{} + if key.TypedInterface.Inputs != nil { + retInputs, err := key.InputReader.Get(ctx) + if err != nil { + return nil, errors.Wrap(err, "failed to read inputs when trying to query catalog") + } + inputs = retInputs + } + + tag, err := GenerateArtifactTagName(ctx, inputs) + if err != nil { + return nil, err + } + + return m.GetOrExtendReservationByArtifactTag(ctx, datasetID, tag, ownerID, heartbeatInterval) +} + +// GetOrExtendReservationByArtifactTag attempts to get a reservation for the cacheable task identified by the provided +// dataset ID and artifact tag, reserving it for the given owner ID. If you have previously acquired a reservation it +// will be extended. If another entity holds the reservation that is returned. +func (m *CatalogClient) GetOrExtendReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, + artifactTag string, ownerID string, heartbeatInterval time.Duration) (*datacatalog.Reservation, error) { + reservationQuery := &datacatalog.GetOrExtendReservationRequest{ + ReservationId: &datacatalog.ReservationID{ + DatasetId: datasetID, + TagName: artifactTag, + }, + OwnerId: ownerID, + HeartbeatInterval: ptypes.DurationProto(heartbeatInterval), + } + + response, err := m.client.GetOrExtendReservation(ctx, reservationQuery) + if err != nil { + return nil, err + } + + return response.Reservation, nil +} + +// ReleaseReservation attempts to release a reservation for a cacheable task. If the reservation +// does not exist (e.x. it never existed or has been acquired by another owner) then this call +// still succeeds. +func (m *CatalogClient) ReleaseReservation(ctx context.Context, key catalog.Key, ownerID string) error { + datasetID, err := GenerateDatasetIDForTask(ctx, key) + if err != nil { + return err + } + + inputs := &core.LiteralMap{} + if key.TypedInterface.Inputs != nil { + retInputs, err := key.InputReader.Get(ctx) + if err != nil { + return errors.Wrap(err, "failed to read inputs when trying to query catalog") + } + inputs = retInputs + } + + tag, err := GenerateArtifactTagName(ctx, inputs) + if err != nil { + return err + } + + return m.ReleaseReservationByArtifactTag(ctx, datasetID, tag, ownerID) +} + +// ReleaseReservationByArtifactTag attempts to release a reservation by the given owner ID for a cacheable task +// identified by the provided dataset ID and artifact tag. If the reservation does not exist (e.x. it never existed or +// has been acquired by another owner) then this call still succeeds. +func (m *CatalogClient) ReleaseReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, + artifactTag string, ownerID string) error { + reservationQuery := &datacatalog.ReleaseReservationRequest{ + ReservationId: &datacatalog.ReservationID{ + DatasetId: datasetID, + TagName: artifactTag, + }, + OwnerId: ownerID, + } + + if _, err := m.client.ReleaseReservation(ctx, reservationQuery); err != nil { + return err + } + + return nil +} + +func (m *CatalogClient) Delete(ctx context.Context, key catalog.Key) error { + datasetID, err := GenerateDatasetIDForTask(ctx, key) + if err != nil { + return err + } + + inputs := &core.LiteralMap{} + if key.TypedInterface.Inputs != nil { + retInputs, err := key.InputReader.Get(ctx) + if err != nil { + return errors.Wrap(err, "failed to read inputs when trying to query catalog") + } + inputs = retInputs + } + + tag, err := GenerateArtifactTagName(ctx, inputs) + if err != nil { + return err + } + + return m.DeleteByArtifactTag(ctx, datasetID, tag) +} + +func (m *CatalogClient) DeleteByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string) error { + deleteQuery := &datacatalog.DeleteArtifactRequest{ + Dataset: datasetID, + QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{ + TagName: artifactTag, + }, + } + + if _, err := m.client.DeleteArtifact(ctx, deleteQuery); err != nil { + return err + } + + return nil +} + +func (m *CatalogClient) DeleteByArtifactID(ctx context.Context, datasetID *datacatalog.DatasetID, artifactID string) error { + deleteQuery := &datacatalog.DeleteArtifactRequest{ + Dataset: datasetID, + QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{ + ArtifactId: artifactID, + }, + } + + if _, err := m.client.DeleteArtifact(ctx, deleteQuery); err != nil { + return err + } + + return nil +} + +// NewDataCatalog creates a new Datacatalog client for task execution caching +func NewDataCatalog(ctx context.Context, endpoint string, insecureConnection bool, maxCacheAge time.Duration, useAdminAuth bool, defaultServiceConfig string, authOpt ...grpc.DialOption) (*CatalogClient, error) { + var opts []grpc.DialOption + if useAdminAuth && authOpt != nil { + opts = append(opts, authOpt...) + } + + grpcOptions := []grpcRetry.CallOption{ + grpcRetry.WithBackoff(grpcRetry.BackoffLinear(100 * time.Millisecond)), + grpcRetry.WithCodes(codes.DeadlineExceeded, codes.Unavailable, codes.Canceled), + grpcRetry.WithMax(5), + } + + if insecureConnection { + logger.Debug(ctx, "Establishing insecure connection to DataCatalog") + opts = append(opts, grpc.WithInsecure()) + } else { + logger.Debug(ctx, "Establishing secure connection to DataCatalog") + pool, err := x509.SystemCertPool() + if err != nil { + return nil, err + } + + creds := credentials.NewClientTLSFromCert(pool, "") + opts = append(opts, grpc.WithTransportCredentials(creds)) + } + + if defaultServiceConfig != "" { + opts = append(opts, grpc.WithDefaultServiceConfig(defaultServiceConfig)) + } + + retryInterceptor := grpcRetry.UnaryClientInterceptor(grpcOptions...) + + opts = append(opts, grpc.WithChainUnaryInterceptor(grpcPrometheus.UnaryClientInterceptor, + retryInterceptor)) + clientConn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return nil, err + } + + client := datacatalog.NewDataCatalogClient(clientConn) + + return &CatalogClient{ + client: client, + maxCacheAge: maxCacheAge, + }, nil +} diff --git a/flytestdlib/catalog/datacatalog/datacatalog_test.go b/flytestdlib/catalog/datacatalog/datacatalog_test.go new file mode 100644 index 0000000000..d6ed830b93 --- /dev/null +++ b/flytestdlib/catalog/datacatalog/datacatalog_test.go @@ -0,0 +1,1136 @@ +package datacatalog + +import ( + "context" + "strconv" + "testing" + "time" + + "github.com/flyteorg/flyteidl/clients/go/datacatalog/mocks" + + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + mocks2 "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io/mocks" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + "github.com/golang/protobuf/proto" + "github.com/google/uuid" + "github.com/pkg/errors" + + "github.com/flyteorg/flytestdlib/contextutils" + "github.com/flyteorg/flytestdlib/promutils/labeled" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/golang/protobuf/ptypes" +) + +func init() { + labeled.SetMetricKeys(contextutils.ProjectKey, contextutils.DomainKey, contextutils.WorkflowIDKey, contextutils.TaskIDKey) +} + +func newStringLiteral(value string) *core.Literal { + return &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_Primitive{ + Primitive: &core.Primitive{ + Value: &core.Primitive_StringValue{ + StringValue: value, + }, + }, + }, + }, + }, + } +} + +var sampleParameters = &core.LiteralMap{Literals: map[string]*core.Literal{ + "out1": newStringLiteral("output1-stringval"), +}} + +var variableMap = &core.VariableMap{ + Variables: map[string]*core.Variable{ + "test": { + Type: &core.LiteralType{ + Type: &core.LiteralType_Simple{ + Simple: core.SimpleType_STRING, + }, + }, + }, + }, +} + +var typedInterface = core.TypedInterface{ + Inputs: variableMap, + Outputs: variableMap, +} + +var sampleKey = catalog.Key{ + Identifier: core.Identifier{ResourceType: core.ResourceType_TASK, Project: "project", Domain: "domain", Name: "name", Version: "version"}, + TypedInterface: typedInterface, + CacheVersion: "1.0.0", +} + +var noInputOutputKey = catalog.Key{ + Identifier: core.Identifier{Project: "project", Domain: "domain", Name: "name"}, + CacheVersion: "1.0.0", +} + +var datasetID = &datacatalog.DatasetID{ + Project: "project", + Domain: "domain", + Name: "flyte_task-name", + Version: "1.0.0-ue5g6uuI-ue5g6uuI", +} + +func assertGrpcErr(t *testing.T, err error, code codes.Code) { + assert.Equal(t, code, status.Code(errors.Cause(err)), "Got err: %s", err) +} + +func assertNotFoundGrpcErr(t *testing.T, err error) { + assertGrpcErr(t, err, codes.NotFound) +} + +func TestCatalog_Get(t *testing.T) { + + ctx := context.Background() + + sampleArtifactData := &datacatalog.ArtifactData{ + Name: "test", + Value: newStringLiteral("output1-stringval"), + } + + t.Run("No results, no Dataset", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(newStringLiteral("output"), nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + mockClient.On("GetDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.GetDatasetRequest) bool { + assert.EqualValues(t, datasetID.String(), o.Dataset.String()) + return true + }), + ).Return(nil, status.Error(codes.NotFound, "test not found")) + newKey := sampleKey + newKey.InputReader = ir + resp, err := catalogClient.Get(ctx, newKey) + assert.Error(t, err) + + assertNotFoundGrpcErr(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, resp.GetStatus().GetCacheStatus()) + }) + + t.Run("No results, no Artifact", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + sampleDataSet := &datacatalog.Dataset{ + Id: datasetID, + } + mockClient.On("GetDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.GetDatasetRequest) bool { + assert.EqualValues(t, datasetID.String(), o.Dataset.String()) + return true + }), + ).Return(&datacatalog.GetDatasetResponse{Dataset: sampleDataSet}, nil, "") + + mockClient.On("GetArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.GetArtifactRequest) bool { + return true + }), + ).Return(nil, status.Error(codes.NotFound, "")) + + newKey := sampleKey + newKey.InputReader = ir + resp, err := catalogClient.Get(ctx, newKey) + assert.Error(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, resp.GetStatus().GetCacheStatus()) + }) + + t.Run("Found w/ tag", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + taskID := &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: sampleKey.Identifier.Name, + Project: sampleKey.Identifier.Project, + Domain: sampleKey.Identifier.Domain, + Version: "ver", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "wf", + Project: "p1", + Domain: "d1", + }, + NodeId: "n", + }, + RetryAttempt: 1, + } + sampleDataSet := &datacatalog.Dataset{ + Id: datasetID, + Metadata: GetDatasetMetadataForSource(taskID), + } + + mockClient.On("GetDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.GetDatasetRequest) bool { + assert.EqualValues(t, datasetID, o.Dataset) + return true + }), + ).Return(&datacatalog.GetDatasetResponse{Dataset: sampleDataSet}, nil) + + sampleArtifact := &datacatalog.Artifact{ + Id: "test-artifact", + Dataset: sampleDataSet.Id, + Data: []*datacatalog.ArtifactData{sampleArtifactData}, + Metadata: GetArtifactMetadataForSource(taskID), + Tags: []*datacatalog.Tag{ + { + Name: "x", + ArtifactId: "y", + }, + }, + } + + assert.Equal(t, taskID.NodeExecutionId.ExecutionId.Name, sampleArtifact.GetMetadata().KeyMap[execNameKey]) + assert.Equal(t, taskID.NodeExecutionId.NodeId, sampleArtifact.GetMetadata().KeyMap[execNodeIDKey]) + assert.Equal(t, taskID.NodeExecutionId.ExecutionId.Project, sampleArtifact.GetMetadata().KeyMap[execProjectKey]) + assert.Equal(t, taskID.NodeExecutionId.ExecutionId.Domain, sampleArtifact.GetMetadata().KeyMap[execDomainKey]) + assert.Equal(t, strconv.Itoa(int(taskID.RetryAttempt)), sampleArtifact.GetMetadata().KeyMap[execTaskAttemptKey]) + + mockClient.On("GetArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.GetArtifactRequest) bool { + assert.EqualValues(t, datasetID, o.Dataset) + assert.Equal(t, "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY", o.GetTagName()) + return true + }), + ).Return(&datacatalog.GetArtifactResponse{Artifact: sampleArtifact}, nil) + + newKey := sampleKey + newKey.InputReader = ir + resp, err := catalogClient.Get(ctx, newKey) + assert.NoError(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_HIT.String(), resp.GetStatus().GetCacheStatus().String()) + assert.NotNil(t, resp.GetStatus().GetMetadata().DatasetId) + assert.Equal(t, core.ResourceType_DATASET, resp.GetStatus().GetMetadata().DatasetId.ResourceType) + assert.Equal(t, datasetID.Name, resp.GetStatus().GetMetadata().DatasetId.Name) + assert.Equal(t, datasetID.Project, resp.GetStatus().GetMetadata().DatasetId.Project) + assert.Equal(t, datasetID.Domain, resp.GetStatus().GetMetadata().DatasetId.Domain) + assert.Equal(t, datasetID.Version, resp.GetStatus().GetMetadata().DatasetId.Version) + assert.NotNil(t, resp.GetStatus().GetMetadata().ArtifactTag) + assert.NotNil(t, resp.GetStatus().GetMetadata().SourceExecution) + sourceTID := resp.GetStatus().GetMetadata().GetSourceTaskExecution() + assert.Equal(t, taskID.TaskId.String(), sourceTID.TaskId.String()) + assert.Equal(t, taskID.RetryAttempt, sourceTID.RetryAttempt) + assert.Equal(t, taskID.NodeExecutionId.String(), sourceTID.NodeExecutionId.String()) + }) + + t.Run("Found expired artifact", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + maxCacheAge: time.Hour, + } + + sampleDataSet := &datacatalog.Dataset{ + Id: datasetID, + } + + mockClient.On("GetDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.GetDatasetRequest) bool { + assert.EqualValues(t, datasetID, o.Dataset) + return true + }), + ).Return(&datacatalog.GetDatasetResponse{Dataset: sampleDataSet}, nil) + createdAt, err := ptypes.TimestampProto(time.Now().Add(time.Minute * -61)) + assert.NoError(t, err) + + sampleArtifact := &datacatalog.Artifact{ + Id: "test-artifact", + Dataset: sampleDataSet.Id, + Data: []*datacatalog.ArtifactData{sampleArtifactData}, + CreatedAt: createdAt, + } + mockClient.On("GetArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.GetArtifactRequest) bool { + assert.EqualValues(t, datasetID, o.Dataset) + assert.Equal(t, "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY", o.GetTagName()) + return true + }), + ).Return(&datacatalog.GetArtifactResponse{Artifact: sampleArtifact}, nil) + + newKey := sampleKey + newKey.InputReader = ir + resp, err := catalogClient.Get(ctx, newKey) + assert.Error(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, resp.GetStatus().GetCacheStatus()) + + getStatus, ok := status.FromError(err) + assert.True(t, ok) + assert.Equal(t, getStatus.Code(), codes.NotFound) + }) + + t.Run("Found non-expired artifact", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + maxCacheAge: time.Hour, + } + + sampleDataSet := &datacatalog.Dataset{ + Id: datasetID, + } + + mockClient.On("GetDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.GetDatasetRequest) bool { + assert.EqualValues(t, datasetID, o.Dataset) + return true + }), + ).Return(&datacatalog.GetDatasetResponse{Dataset: sampleDataSet}, nil) + createdAt, err := ptypes.TimestampProto(time.Now().Add(time.Minute * -59)) + assert.NoError(t, err) + + sampleArtifact := &datacatalog.Artifact{ + Id: "test-artifact", + Dataset: sampleDataSet.Id, + Data: []*datacatalog.ArtifactData{sampleArtifactData}, + CreatedAt: createdAt, + } + mockClient.On("GetArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.GetArtifactRequest) bool { + assert.EqualValues(t, datasetID, o.Dataset) + assert.Equal(t, "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY", o.GetTagName()) + return true + }), + ).Return(&datacatalog.GetArtifactResponse{Artifact: sampleArtifact}, nil) + + newKey := sampleKey + newKey.InputReader = ir + resp, err := catalogClient.Get(ctx, newKey) + assert.NoError(t, err) + assert.NotNil(t, resp) + }) + + t.Run("Found w/ tag no inputs or outputs", func(t *testing.T) { + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + sampleDataSet := &datacatalog.Dataset{ + Id: &datacatalog.DatasetID{ + Project: "project", + Domain: "domain", + Name: "name", + Version: "1.0.0-GKw-c0Pw-GKw-c0Pw", + }, + } + + mockClient.On("GetDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.GetDatasetRequest) bool { + assert.EqualValues(t, "1.0.0-GKw-c0Pw-GKw-c0Pw", o.Dataset.Version) + return true + }), + ).Return(&datacatalog.GetDatasetResponse{Dataset: sampleDataSet}, nil) + + sampleArtifact := &datacatalog.Artifact{ + Id: "test-artifact", + Dataset: sampleDataSet.Id, + Data: []*datacatalog.ArtifactData{}, + } + mockClient.On("GetArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.GetArtifactRequest) bool { + assert.EqualValues(t, "1.0.0-GKw-c0Pw-GKw-c0Pw", o.Dataset.Version) + assert.Equal(t, "flyte_cached-GKw-c0PwFokMUQ6T-TUmEWnZ4_VlQ2Qpgw-vCTT0-OQ", o.GetTagName()) + return true + }), + ).Return(&datacatalog.GetArtifactResponse{Artifact: sampleArtifact}, nil) + + assert.False(t, discovery.maxCacheAge > time.Duration(0)) + + resp, err := discovery.Get(ctx, noInputOutputKey) + assert.NoError(t, err) + assert.NotNil(t, resp) + + assert.Equal(t, core.CatalogCacheStatus_CACHE_HIT.String(), resp.GetStatus().GetCacheStatus().String()) + v, e, err := resp.GetOutputs().Read(ctx) + assert.NoError(t, err) + assert.Nil(t, e) + assert.Len(t, v.Literals, 0) + }) +} + +func TestCatalog_Put(t *testing.T) { + ctx := context.Background() + + t.Run("Create new cached execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + mockClient.On("CreateDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateDatasetRequest) bool { + assert.True(t, proto.Equal(o.Dataset.Id, datasetID)) + return true + }), + ).Return(&datacatalog.CreateDatasetResponse{}, nil) + + mockClient.On("CreateArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateArtifactRequest) bool { + _, parseErr := uuid.Parse(o.Artifact.Id) + assert.NoError(t, parseErr) + assert.EqualValues(t, 1, len(o.Artifact.Data)) + assert.EqualValues(t, "out1", o.Artifact.Data[0].Name) + assert.EqualValues(t, newStringLiteral("output1-stringval"), o.Artifact.Data[0].Value) + return true + }), + ).Return(&datacatalog.CreateArtifactResponse{}, nil) + + mockClient.On("AddTag", + ctx, + mock.MatchedBy(func(o *datacatalog.AddTagRequest) bool { + assert.EqualValues(t, "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY", o.Tag.Name) + return true + }), + ).Return(&datacatalog.AddTagResponse{}, nil) + newKey := sampleKey + newKey.InputReader = ir + or := ioutils.NewInMemoryOutputReader(sampleParameters, nil, nil) + s, err := discovery.Put(ctx, newKey, or, catalog.Metadata{ + WorkflowExecutionIdentifier: &core.WorkflowExecutionIdentifier{ + Name: "test", + }, + TaskExecutionIdentifier: nil, + }) + assert.NoError(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_POPULATED, s.GetCacheStatus()) + assert.NotNil(t, s.GetMetadata()) + assert.Equal(t, "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY", s.GetMetadata().ArtifactTag.Name) + }) + + t.Run("Create new cached execution with no inputs/outputs", func(t *testing.T) { + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + mockClient.On("CreateDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateDatasetRequest) bool { + assert.Equal(t, "1.0.0-GKw-c0Pw-GKw-c0Pw", o.Dataset.Id.Version) + return true + }), + ).Return(&datacatalog.CreateDatasetResponse{}, nil) + + mockClient.On("CreateArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateArtifactRequest) bool { + assert.EqualValues(t, 0, len(o.Artifact.Data)) + return true + }), + ).Return(&datacatalog.CreateArtifactResponse{}, nil) + + mockClient.On("AddTag", + ctx, + mock.MatchedBy(func(o *datacatalog.AddTagRequest) bool { + assert.EqualValues(t, "flyte_cached-GKw-c0PwFokMUQ6T-TUmEWnZ4_VlQ2Qpgw-vCTT0-OQ", o.Tag.Name) + return true + }), + ).Return(&datacatalog.AddTagResponse{}, nil) + s, err := catalogClient.Put(ctx, noInputOutputKey, &mocks2.OutputReader{}, catalog.Metadata{}) + assert.NoError(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_POPULATED, s.GetCacheStatus()) + assert.NotNil(t, s.GetMetadata()) + }) + + t.Run("Create new cached execution with existing dataset", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + createDatasetCalled := false + mockClient.On("CreateDataset", + ctx, + mock.MatchedBy(func(_ *datacatalog.CreateDatasetRequest) bool { + createDatasetCalled = true + return true + }), + ).Return(nil, status.Error(codes.AlreadyExists, "test dataset already exists")) + + createArtifactCalled := false + mockClient.On("CreateArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateArtifactRequest) bool { + _, parseErr := uuid.Parse(o.Artifact.Id) + assert.NoError(t, parseErr) + assert.EqualValues(t, 1, len(o.Artifact.Data)) + assert.EqualValues(t, "out1", o.Artifact.Data[0].Name) + assert.EqualValues(t, newStringLiteral("output1-stringval"), o.Artifact.Data[0].Value) + createArtifactCalled = true + return true + }), + ).Return(&datacatalog.CreateArtifactResponse{}, nil) + + addTagCalled := false + mockClient.On("AddTag", + ctx, + mock.MatchedBy(func(o *datacatalog.AddTagRequest) bool { + assert.EqualValues(t, "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY", o.Tag.Name) + addTagCalled = true + return true + }), + ).Return(&datacatalog.AddTagResponse{}, nil) + newKey := sampleKey + newKey.InputReader = ir + or := ioutils.NewInMemoryOutputReader(sampleParameters, nil, nil) + s, err := discovery.Put(ctx, newKey, or, catalog.Metadata{ + WorkflowExecutionIdentifier: &core.WorkflowExecutionIdentifier{ + Name: "test", + }, + TaskExecutionIdentifier: nil, + }) + assert.NoError(t, err) + assert.True(t, createDatasetCalled) + assert.True(t, createArtifactCalled) + assert.True(t, addTagCalled) + assert.Equal(t, core.CatalogCacheStatus_CACHE_POPULATED, s.GetCacheStatus()) + assert.NotNil(t, s.GetMetadata()) + }) +} + +func TestCatalog_Update(t *testing.T) { + ctx := context.Background() + + t.Run("Overwrite existing cached execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + mockClient.On("CreateDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateDatasetRequest) bool { + assert.True(t, proto.Equal(o.Dataset.Id, datasetID)) + return true + }), + ).Return(&datacatalog.CreateDatasetResponse{}, nil) + + mockClient.On("UpdateArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.UpdateArtifactRequest) bool { + assert.True(t, proto.Equal(o.Dataset, datasetID)) + assert.IsType(t, &datacatalog.UpdateArtifactRequest_TagName{}, o.QueryHandle) + assert.Equal(t, tagName, o.GetTagName()) + return true + }), + ).Return(&datacatalog.UpdateArtifactResponse{ArtifactId: "test-artifact"}, nil) + + taskID := &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: sampleKey.Identifier.Name, + Project: sampleKey.Identifier.Project, + Domain: sampleKey.Identifier.Domain, + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "wf", + Project: "p1", + Domain: "d1", + }, + NodeId: "unknown", // not set in Put request below --> defaults to "unknown" + }, + RetryAttempt: 0, + } + + newKey := sampleKey + newKey.InputReader = ir + or := ioutils.NewInMemoryOutputReader(sampleParameters, nil, nil) + s, err := discovery.Update(ctx, newKey, or, catalog.Metadata{ + WorkflowExecutionIdentifier: &core.WorkflowExecutionIdentifier{ + Name: taskID.NodeExecutionId.ExecutionId.Name, + Domain: taskID.NodeExecutionId.ExecutionId.Domain, + Project: taskID.NodeExecutionId.ExecutionId.Project, + }, + TaskExecutionIdentifier: &core.TaskExecutionIdentifier{ + TaskId: &sampleKey.Identifier, + NodeExecutionId: taskID.NodeExecutionId, + RetryAttempt: 0, + }, + }) + assert.NoError(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_POPULATED, s.GetCacheStatus()) + assert.NotNil(t, s.GetMetadata()) + assert.Equal(t, tagName, s.GetMetadata().ArtifactTag.Name) + sourceTID := s.GetMetadata().GetSourceTaskExecution() + assert.Equal(t, taskID.TaskId.String(), sourceTID.TaskId.String()) + assert.Equal(t, taskID.RetryAttempt, sourceTID.RetryAttempt) + assert.Equal(t, taskID.NodeExecutionId.String(), sourceTID.NodeExecutionId.String()) + }) + + t.Run("Overwrite non-existing execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + createDatasetCalled := false + mockClient.On("CreateDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateDatasetRequest) bool { + assert.True(t, proto.Equal(o.Dataset.Id, datasetID)) + createDatasetCalled = true + return true + }), + ).Return(&datacatalog.CreateDatasetResponse{}, nil) + + updateArtifactCalled := false + mockClient.On("UpdateArtifact", ctx, mock.Anything).Run(func(args mock.Arguments) { + updateArtifactCalled = true + }).Return(nil, status.New(codes.NotFound, "missing entity of type Artifact with identifier id").Err()) + + createArtifactCalled := false + mockClient.On("CreateArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateArtifactRequest) bool { + _, parseErr := uuid.Parse(o.Artifact.Id) + assert.NoError(t, parseErr) + assert.True(t, proto.Equal(o.Artifact.Dataset, datasetID)) + createArtifactCalled = true + return true + }), + ).Return(&datacatalog.CreateArtifactResponse{}, nil) + + addTagCalled := false + mockClient.On("AddTag", + ctx, + mock.MatchedBy(func(o *datacatalog.AddTagRequest) bool { + assert.EqualValues(t, "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY", o.Tag.Name) + addTagCalled = true + return true + }), + ).Return(&datacatalog.AddTagResponse{}, nil) + + taskID := &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: sampleKey.Identifier.Name, + Project: sampleKey.Identifier.Project, + Domain: sampleKey.Identifier.Domain, + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "wf", + Project: "p1", + Domain: "d1", + }, + NodeId: "unknown", // not set in Put request below --> defaults to "unknown" + }, + RetryAttempt: 0, + } + + newKey := sampleKey + newKey.InputReader = ir + or := ioutils.NewInMemoryOutputReader(sampleParameters, nil, nil) + s, err := discovery.Update(ctx, newKey, or, catalog.Metadata{ + WorkflowExecutionIdentifier: &core.WorkflowExecutionIdentifier{ + Name: taskID.NodeExecutionId.ExecutionId.Name, + Domain: taskID.NodeExecutionId.ExecutionId.Domain, + Project: taskID.NodeExecutionId.ExecutionId.Project, + }, + TaskExecutionIdentifier: &core.TaskExecutionIdentifier{ + TaskId: &sampleKey.Identifier, + NodeExecutionId: taskID.NodeExecutionId, + RetryAttempt: 0, + }, + }) + assert.NoError(t, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_POPULATED, s.GetCacheStatus()) + assert.NotNil(t, s.GetMetadata()) + assert.Equal(t, tagName, s.GetMetadata().ArtifactTag.Name) + assert.Nil(t, s.GetMetadata().GetSourceTaskExecution()) + assert.True(t, createDatasetCalled) + assert.True(t, updateArtifactCalled) + assert.True(t, createArtifactCalled) + assert.True(t, addTagCalled) + }) + + t.Run("Error while overwriting execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + mockClient.On("CreateDataset", + ctx, + mock.MatchedBy(func(o *datacatalog.CreateDatasetRequest) bool { + assert.True(t, proto.Equal(o.Dataset.Id, datasetID)) + return true + }), + ).Return(&datacatalog.CreateDatasetResponse{}, nil) + + genericErr := errors.New("generic error") + mockClient.On("UpdateArtifact", ctx, mock.Anything).Return(nil, genericErr) + + newKey := sampleKey + newKey.InputReader = ir + or := ioutils.NewInMemoryOutputReader(sampleParameters, nil, nil) + s, err := discovery.Update(ctx, newKey, or, catalog.Metadata{ + WorkflowExecutionIdentifier: &core.WorkflowExecutionIdentifier{ + Name: "test", + }, + TaskExecutionIdentifier: nil, + }) + assert.Error(t, err) + assert.Equal(t, genericErr, err) + assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, s.GetCacheStatus()) + assert.Nil(t, s.GetMetadata()) + }) +} + +var tagName = "flyte_cached-BE6CZsMk6N3ExR_4X9EuwBgj2Jh2UwasXK3a_pM9xlY" +var reservationID = datacatalog.ReservationID{ + DatasetId: datasetID, + TagName: tagName, +} +var prevOwner = "prevOwner" +var currentOwner = "currentOwner" + +func TestCatalog_GetOrExtendReservation(t *testing.T) { + ctx := context.Background() + + heartbeatInterval := time.Second * 5 + prevReservation := datacatalog.Reservation{ + ReservationId: &reservationID, + OwnerId: prevOwner, + } + + currentReservation := datacatalog.Reservation{ + ReservationId: &reservationID, + OwnerId: currentOwner, + } + + t.Run("CreateOrUpdateReservation", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + mockClient.On("GetOrExtendReservation", + ctx, + mock.MatchedBy(func(o *datacatalog.GetOrExtendReservationRequest) bool { + assert.EqualValues(t, datasetID.String(), o.ReservationId.DatasetId.String()) + assert.EqualValues(t, tagName, o.ReservationId.TagName) + return true + }), + ).Return(&datacatalog.GetOrExtendReservationResponse{Reservation: ¤tReservation}, nil, "") + + newKey := sampleKey + newKey.InputReader = ir + reservation, err := catalogClient.GetOrExtendReservation(ctx, newKey, currentOwner, heartbeatInterval) + + assert.NoError(t, err) + assert.Equal(t, reservation.OwnerId, currentOwner) + }) + + t.Run("ExistingReservation", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + mockClient.On("GetOrExtendReservation", + ctx, + mock.MatchedBy(func(o *datacatalog.GetOrExtendReservationRequest) bool { + assert.EqualValues(t, datasetID.String(), o.ReservationId.DatasetId.String()) + assert.EqualValues(t, tagName, o.ReservationId.TagName) + return true + }), + ).Return(&datacatalog.GetOrExtendReservationResponse{Reservation: &prevReservation}, nil, "") + + newKey := sampleKey + newKey.InputReader = ir + reservation, err := catalogClient.GetOrExtendReservation(ctx, newKey, currentOwner, heartbeatInterval) + + assert.NoError(t, err) + assert.Equal(t, reservation.OwnerId, prevOwner) + }) +} + +func TestCatalog_GetOrExtendReservationByArtifactTag(t *testing.T) { + ctx := context.Background() + + heartbeatInterval := time.Second * 5 + prevReservation := datacatalog.Reservation{ + ReservationId: &reservationID, + OwnerId: prevOwner, + } + + currentReservation := datacatalog.Reservation{ + ReservationId: &reservationID, + OwnerId: currentOwner, + } + + t.Run("CreateOrUpdateReservation", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + mockClient.On("GetOrExtendReservation", + ctx, + mock.MatchedBy(func(o *datacatalog.GetOrExtendReservationRequest) bool { + assert.EqualValues(t, datasetID.String(), o.ReservationId.DatasetId.String()) + assert.EqualValues(t, tagName, o.ReservationId.TagName) + return true + }), + ).Return(&datacatalog.GetOrExtendReservationResponse{Reservation: ¤tReservation}, nil, "") + + reservation, err := catalogClient.GetOrExtendReservationByArtifactTag(ctx, datasetID, tagName, currentOwner, heartbeatInterval) + + assert.NoError(t, err) + assert.Equal(t, reservation.OwnerId, currentOwner) + }) + + t.Run("ExistingReservation", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + mockClient.On("GetOrExtendReservation", + ctx, + mock.MatchedBy(func(o *datacatalog.GetOrExtendReservationRequest) bool { + assert.EqualValues(t, datasetID.String(), o.ReservationId.DatasetId.String()) + assert.EqualValues(t, tagName, o.ReservationId.TagName) + return true + }), + ).Return(&datacatalog.GetOrExtendReservationResponse{Reservation: &prevReservation}, nil, "") + + reservation, err := catalogClient.GetOrExtendReservationByArtifactTag(ctx, datasetID, tagName, currentOwner, heartbeatInterval) + + assert.NoError(t, err) + assert.Equal(t, reservation.OwnerId, prevOwner) + }) +} + +func TestCatalog_ReleaseReservation(t *testing.T) { + ctx := context.Background() + + t.Run("ReleaseReservation", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + mockClient.On("ReleaseReservation", + ctx, + mock.MatchedBy(func(o *datacatalog.ReleaseReservationRequest) bool { + assert.EqualValues(t, datasetID.String(), o.ReservationId.DatasetId.String()) + assert.EqualValues(t, tagName, o.ReservationId.TagName) + return true + }), + ).Return(&datacatalog.ReleaseReservationResponse{}, nil, "") + + newKey := sampleKey + newKey.InputReader = ir + err := catalogClient.ReleaseReservation(ctx, newKey, currentOwner) + + assert.NoError(t, err) + }) + + t.Run("ReleaseReservationFailure", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + catalogClient := &CatalogClient{ + client: mockClient, + } + + mockClient.On("ReleaseReservation", + ctx, + mock.MatchedBy(func(o *datacatalog.ReleaseReservationRequest) bool { + assert.EqualValues(t, datasetID.String(), o.ReservationId.DatasetId.String()) + assert.EqualValues(t, tagName, o.ReservationId.TagName) + return true + }), + ).Return(nil, status.Error(codes.NotFound, "reservation not found")) + + newKey := sampleKey + newKey.InputReader = ir + err := catalogClient.ReleaseReservation(ctx, newKey, currentOwner) + + assertNotFoundGrpcErr(t, err) + }) +} + +func TestCatalog_Delete(t *testing.T) { + ctx := context.Background() + + t.Run("Delete existing cached execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + mockClient.On("DeleteArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.DeleteArtifactRequest) bool { + assert.True(t, proto.Equal(o.Dataset, datasetID)) + assert.IsType(t, &datacatalog.DeleteArtifactRequest_TagName{}, o.QueryHandle) + assert.Equal(t, tagName, o.GetTagName()) + return true + }), + ).Return(&datacatalog.DeleteArtifactResponse{}, nil) + + newKey := sampleKey + newKey.InputReader = ir + err := discovery.Delete(ctx, newKey) + assert.NoError(t, err) + }) + + t.Run("Delete non-existing execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + deleteArtifactCalled := false + mockClient.On("DeleteArtifact", ctx, mock.Anything).Run(func(args mock.Arguments) { + deleteArtifactCalled = true + }).Return(nil, status.New(codes.NotFound, "missing entity of type Artifact with identifier id").Err()) + + newKey := sampleKey + newKey.InputReader = ir + err := discovery.Delete(ctx, newKey) + assert.Error(t, err) + assertNotFoundGrpcErr(t, err) + assert.True(t, deleteArtifactCalled) + }) + + t.Run("Error while deleting execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + genericErr := errors.New("generic error") + mockClient.On("DeleteArtifact", ctx, mock.Anything).Return(nil, genericErr) + + newKey := sampleKey + newKey.InputReader = ir + err := discovery.Delete(ctx, newKey) + assert.Error(t, err) + assert.Equal(t, genericErr, err) + }) +} + +func TestCatalog_DeleteByArtifactTag(t *testing.T) { + ctx := context.Background() + + t.Run("Delete existing cached execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + mockClient.On("DeleteArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.DeleteArtifactRequest) bool { + assert.True(t, proto.Equal(o.Dataset, datasetID)) + assert.IsType(t, &datacatalog.DeleteArtifactRequest_TagName{}, o.QueryHandle) + assert.Equal(t, tagName, o.GetTagName()) + return true + }), + ).Return(&datacatalog.DeleteArtifactResponse{}, nil) + + err := discovery.DeleteByArtifactTag(ctx, datasetID, tagName) + assert.NoError(t, err) + }) + + t.Run("Delete non-existing execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + deleteArtifactCalled := false + mockClient.On("DeleteArtifact", ctx, mock.Anything).Run(func(args mock.Arguments) { + deleteArtifactCalled = true + }).Return(nil, status.New(codes.NotFound, "missing entity of type Artifact with identifier id").Err()) + + err := discovery.DeleteByArtifactTag(ctx, datasetID, tagName) + assert.Error(t, err) + assertNotFoundGrpcErr(t, err) + assert.True(t, deleteArtifactCalled) + }) + + t.Run("Error while deleting execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + genericErr := errors.New("generic error") + mockClient.On("DeleteArtifact", ctx, mock.Anything).Return(nil, genericErr) + + err := discovery.DeleteByArtifactTag(ctx, datasetID, tagName) + assert.Error(t, err) + assert.Equal(t, genericErr, err) + }) +} + +func TestCatalog_DeleteByArtifactID(t *testing.T) { + ctx := context.Background() + artifactID := "ff611b8e-f0fa-4f91-a9da-9fa43d619c84" + + t.Run("Delete existing cached execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + mockClient.On("DeleteArtifact", + ctx, + mock.MatchedBy(func(o *datacatalog.DeleteArtifactRequest) bool { + assert.True(t, proto.Equal(o.Dataset, datasetID)) + assert.IsType(t, &datacatalog.DeleteArtifactRequest_ArtifactId{}, o.QueryHandle) + assert.Equal(t, artifactID, o.GetArtifactId()) + return true + }), + ).Return(&datacatalog.DeleteArtifactResponse{}, nil) + + err := discovery.DeleteByArtifactID(ctx, datasetID, artifactID) + assert.NoError(t, err) + }) + + t.Run("Delete non-existing execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + deleteArtifactCalled := false + mockClient.On("DeleteArtifact", ctx, mock.Anything).Run(func(args mock.Arguments) { + deleteArtifactCalled = true + }).Return(nil, status.New(codes.NotFound, "missing entity of type Artifact with identifier id").Err()) + + err := discovery.DeleteByArtifactID(ctx, datasetID, artifactID) + assert.Error(t, err) + assertNotFoundGrpcErr(t, err) + assert.True(t, deleteArtifactCalled) + }) + + t.Run("Error while deleting execution", func(t *testing.T) { + ir := &mocks2.InputReader{} + ir.On("Get", mock.Anything).Return(sampleParameters, nil, nil) + + mockClient := &mocks.DataCatalogClient{} + discovery := &CatalogClient{ + client: mockClient, + } + + genericErr := errors.New("generic error") + mockClient.On("DeleteArtifact", ctx, mock.Anything).Return(nil, genericErr) + + err := discovery.DeleteByArtifactID(ctx, datasetID, artifactID) + assert.Error(t, err) + assert.Equal(t, genericErr, err) + }) +} diff --git a/flytestdlib/catalog/datacatalog/transformer.go b/flytestdlib/catalog/datacatalog/transformer.go new file mode 100644 index 0000000000..3dc0143ad3 --- /dev/null +++ b/flytestdlib/catalog/datacatalog/transformer.go @@ -0,0 +1,336 @@ +package datacatalog + +import ( + "context" + "encoding/base64" + "fmt" + "reflect" + "strconv" + "strings" + + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + + "github.com/flyteorg/flytepropeller/pkg/compiler/validators" + + "github.com/flyteorg/flytestdlib/pbhash" +) + +const cachedTaskTag = "flyte_cached" +const taskNamespace = "flyte_task" +const maxParamHashLength = 8 + +// Declare the definition of empty literal and variable maps. This is important because we hash against +// the literal and variable maps. So Nil and empty literals and variable maps should translate to these definitions +// in order to have a consistent hash. +var emptyLiteralMap = core.LiteralMap{Literals: map[string]*core.Literal{}} +var emptyVariableMap = core.VariableMap{Variables: map[string]*core.Variable{}} + +func getDatasetNameFromTask(taskID core.Identifier) string { + return fmt.Sprintf("%s-%s", taskNamespace, taskID.Name) +} + +// GenerateTaskOutputsFromArtifact transforms the artifact Data into task execution outputs as a literal map +func GenerateTaskOutputsFromArtifact(id core.Identifier, taskInterface core.TypedInterface, artifact *datacatalog.Artifact) (*core.LiteralMap, error) { + + // if there are no outputs in the task, return empty map + if taskInterface.Outputs == nil || len(taskInterface.Outputs.Variables) == 0 { + return &emptyLiteralMap, nil + } + + outputVariables := taskInterface.Outputs.Variables + artifactDataList := artifact.Data + + // verify the task outputs matches what is stored in ArtifactData + if len(outputVariables) != len(artifactDataList) { + return nil, fmt.Errorf("the task %s with %d outputs, should have %d artifactData for artifact %s", id.String(), len(outputVariables), len(artifactDataList), artifact.Id) + } + + outputs := make(map[string]*core.Literal, len(artifactDataList)) + for _, artifactData := range artifactDataList { + // verify that the name and type of artifactData matches what is expected from the interface + if _, ok := outputVariables[artifactData.Name]; !ok { + return nil, fmt.Errorf("unexpected artifactData with name [%v] does not match any task output variables %v", artifactData.Name, reflect.ValueOf(outputVariables).MapKeys()) + } + + expectedVarType := outputVariables[artifactData.Name].GetType() + inputType := validators.LiteralTypeForLiteral(artifactData.Value) + if !validators.AreTypesCastable(inputType, expectedVarType) { + return nil, fmt.Errorf("unexpected artifactData: [%v] type: [%v] does not match any task output type: [%v]", artifactData.Name, inputType, expectedVarType) + } + + outputs[artifactData.Name] = artifactData.Value + } + + return &core.LiteralMap{Literals: outputs}, nil +} + +func generateDataSetVersionFromTask(ctx context.Context, taskInterface core.TypedInterface, cacheVersion string) (string, error) { + signatureHash, err := generateTaskSignatureHash(ctx, taskInterface) + if err != nil { + return "", err + } + + cacheVersion = strings.Trim(cacheVersion, " ") + if len(cacheVersion) == 0 { + return "", fmt.Errorf("task cannot have an empty discoveryVersion %v", cacheVersion) + } + + return fmt.Sprintf("%s-%s", cacheVersion, signatureHash), nil +} + +func generateTaskSignatureHash(ctx context.Context, taskInterface core.TypedInterface) (string, error) { + taskInputs := &emptyVariableMap + taskOutputs := &emptyVariableMap + + if taskInterface.Inputs != nil && len(taskInterface.Inputs.Variables) != 0 { + taskInputs = taskInterface.Inputs + } + + if taskInterface.Outputs != nil && len(taskInterface.Outputs.Variables) != 0 { + taskOutputs = taskInterface.Outputs + } + + inputHash, err := pbhash.ComputeHash(ctx, taskInputs) + if err != nil { + return "", err + } + + outputHash, err := pbhash.ComputeHash(ctx, taskOutputs) + if err != nil { + return "", err + } + + inputHashString := base64.RawURLEncoding.EncodeToString(inputHash) + + if len(inputHashString) > maxParamHashLength { + inputHashString = inputHashString[0:maxParamHashLength] + } + + outputHashString := base64.RawURLEncoding.EncodeToString(outputHash) + if len(outputHashString) > maxParamHashLength { + outputHashString = outputHashString[0:maxParamHashLength] + } + + return fmt.Sprintf("%v-%v", inputHashString, outputHashString), nil +} + +// Hashify a literal, in other words, produce a new literal where the corresponding value is removed in case +// the literal hash is set. +func hashify(literal *core.Literal) *core.Literal { + // Two recursive cases: + // 1. A collection of literals or + // 2. A map of literals + + if literal.GetCollection() != nil { + literals := literal.GetCollection().Literals + literalsHash := make([]*core.Literal, 0) + for _, lit := range literals { + literalsHash = append(literalsHash, hashify(lit)) + } + return &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: literalsHash, + }, + }, + } + } + if literal.GetMap() != nil { + literalsMap := make(map[string]*core.Literal) + for key, lit := range literal.GetMap().Literals { + literalsMap[key] = hashify(lit) + } + return &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: literalsMap, + }, + }, + } + } + + // And a base case that consists of a scalar, where the hash might be set + if literal.GetHash() != "" { + return &core.Literal{ + Hash: literal.GetHash(), + } + } + return literal +} + +// GenerateArtifactTagName generates a tag by hashing the input values +func GenerateArtifactTagName(ctx context.Context, inputs *core.LiteralMap) (string, error) { + if inputs == nil || len(inputs.Literals) == 0 { + inputs = &emptyLiteralMap + } + + // Hashify, i.e. generate a copy of the literal map where each literal value is removed + // in case the corresponding hash is set. + hashifiedLiteralMap := make(map[string]*core.Literal, len(inputs.Literals)) + for name, literal := range inputs.Literals { + hashifiedLiteralMap[name] = hashify(literal) + } + hashifiedInputs := &core.LiteralMap{ + Literals: hashifiedLiteralMap, + } + + inputsHash, err := pbhash.ComputeHash(ctx, hashifiedInputs) + if err != nil { + return "", err + } + + hashString := base64.RawURLEncoding.EncodeToString(inputsHash) + tag := fmt.Sprintf("%s-%s", cachedTaskTag, hashString) + return tag, nil +} + +// GenerateDatasetIDForTask returns the DataSetID for a task. +// NOTE: the version of the task is a combination of both the discoverable_version and the task signature. +// This is because the interface may have changed even if the discoverable_version hadn't. +func GenerateDatasetIDForTask(ctx context.Context, k catalog.Key) (*datacatalog.DatasetID, error) { + datasetVersion, err := generateDataSetVersionFromTask(ctx, k.TypedInterface, k.CacheVersion) + if err != nil { + return nil, err + } + + datasetID := &datacatalog.DatasetID{ + Project: k.Identifier.Project, + Domain: k.Identifier.Domain, + Name: getDatasetNameFromTask(k.Identifier), + Version: datasetVersion, + } + return datasetID, nil +} + +func DatasetIDToIdentifier(id *datacatalog.DatasetID) *core.Identifier { + if id == nil { + return nil + } + return &core.Identifier{ResourceType: core.ResourceType_DATASET, Name: id.Name, Project: id.Project, Domain: id.Domain, Version: id.Version} +} + +func IdentifierToDatasetID(identifier *core.Identifier) *datacatalog.DatasetID { + if identifier == nil { + return nil + } + return &datacatalog.DatasetID{ + Project: identifier.Project, + Name: identifier.Name, + Domain: identifier.Domain, + Version: identifier.Version, + } +} + +// With Node-Node relationship this is bound to change. So lets keep it extensible +const ( + taskVersionKey = "task-version" + execNameKey = "execution-name" + execDomainKey = "exec-domain" + execProjectKey = "exec-project" + execNodeIDKey = "exec-node" + execTaskAttemptKey = "exec-attempt" +) + +// GetDatasetMetadataForSource returns the dataset metadata for the given task execution. +// Understanding Catalog Identifiers +// DatasetID represents the ID of the dataset. For Flyte this represents the ID of the generating task and the version calculated as the hash of the interface & cache version. refer to `GenerateDatasetIDForTask` +// TaskID is the same as the DatasetID + name: (DataSetID - namespace) + task version which is stored in the metadata +// ExecutionID is stored only in the metadata (project and domain available after Jul-2020) +// NodeExecID = Execution ID + Node ID (available after Jul-2020) +// TaskExecID is the same as the NodeExecutionID + attempt (attempt is available in Metadata) after Jul-2020 +func GetDatasetMetadataForSource(taskExecutionID *core.TaskExecutionIdentifier) *datacatalog.Metadata { + if taskExecutionID == nil { + return &datacatalog.Metadata{} + } + return &datacatalog.Metadata{ + KeyMap: map[string]string{ + taskVersionKey: taskExecutionID.TaskId.Version, + }, + } +} + +func GetArtifactMetadataForSource(taskExecutionID *core.TaskExecutionIdentifier) *datacatalog.Metadata { + if taskExecutionID == nil { + return &datacatalog.Metadata{} + } + return &datacatalog.Metadata{ + KeyMap: map[string]string{ + execProjectKey: taskExecutionID.NodeExecutionId.GetExecutionId().GetProject(), + execDomainKey: taskExecutionID.NodeExecutionId.GetExecutionId().GetDomain(), + execNameKey: taskExecutionID.NodeExecutionId.GetExecutionId().GetName(), + execNodeIDKey: taskExecutionID.NodeExecutionId.GetNodeId(), + execTaskAttemptKey: strconv.Itoa(int(taskExecutionID.GetRetryAttempt())), + }, + } +} + +// GetSourceFromMetadata returns the Source TaskExecutionIdentifier from the catalog metadata +// For all the information not available it returns Unknown. This is because as of July-2020 Catalog does not have all +// the information. After the first deployment of this code, it will have this and the "unknown's" can be phased out +func GetSourceFromMetadata(datasetMd, artifactMd *datacatalog.Metadata, currentID core.Identifier) (*core.TaskExecutionIdentifier, error) { + if datasetMd == nil || datasetMd.KeyMap == nil { + datasetMd = &datacatalog.Metadata{KeyMap: map[string]string{}} + } + if artifactMd == nil || artifactMd.KeyMap == nil { + artifactMd = &datacatalog.Metadata{KeyMap: map[string]string{}} + } + + // Jul-06-2020 DataCatalog stores only wfExecutionKey & taskVersionKey So we will default the project / domain to the current dataset's project domain + val := GetOrDefault(artifactMd.KeyMap, execTaskAttemptKey, "0") + attempt, err := strconv.ParseUint(val, 10, 32) + if err != nil { + return nil, fmt.Errorf("failed to parse [%v] to integer. Error: %w", val, err) + } + + return &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: currentID.ResourceType, + Project: currentID.Project, + Domain: currentID.Domain, + Name: currentID.Name, + Version: GetOrDefault(datasetMd.KeyMap, taskVersionKey, "unknown"), + }, + RetryAttempt: uint32(attempt), + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: GetOrDefault(artifactMd.KeyMap, execNodeIDKey, "unknown"), + ExecutionId: &core.WorkflowExecutionIdentifier{ + Project: GetOrDefault(artifactMd.KeyMap, execProjectKey, currentID.GetProject()), + Domain: GetOrDefault(artifactMd.KeyMap, execDomainKey, currentID.GetDomain()), + Name: GetOrDefault(artifactMd.KeyMap, execNameKey, "unknown"), + }, + }, + }, nil +} + +// EventCatalogMetadata returns the CatalogMetadata that is populated in the event, given the Catalog Information (returned from a Catalog call). +func EventCatalogMetadata(datasetID *datacatalog.DatasetID, tag *datacatalog.Tag, sourceID *core.TaskExecutionIdentifier) *core.CatalogMetadata { + md := &core.CatalogMetadata{ + DatasetId: DatasetIDToIdentifier(datasetID), + } + + if tag != nil { + md.ArtifactTag = &core.CatalogArtifactTag{ + ArtifactId: tag.ArtifactId, + Name: tag.Name, + } + } + + if sourceID != nil { + md.SourceExecution = &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: sourceID, + } + } + + return md +} + +// GetOrDefault returns a default value, if the given key is not found in the map, else returns the value in the map +func GetOrDefault(m map[string]string, key, defaultValue string) string { + v, ok := m[key] + if !ok { + return defaultValue + } + return v +} diff --git a/flytestdlib/catalog/datacatalog/transformer_test.go b/flytestdlib/catalog/datacatalog/transformer_test.go new file mode 100644 index 0000000000..2ce8c1dff7 --- /dev/null +++ b/flytestdlib/catalog/datacatalog/transformer_test.go @@ -0,0 +1,898 @@ +package datacatalog + +import ( + "context" + "reflect" + "strconv" + "testing" + + "github.com/flyteorg/flyteidl/clients/go/coreutils" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/stretchr/testify/assert" +) + +// add test for raarranged Literal maps for input values + +func TestNilParamTask(t *testing.T) { + key := catalog.Key{ + Identifier: core.Identifier{ + Project: "project", + Domain: "domain", + Name: "name", + Version: "1.0.0", + }, + CacheVersion: "1.0.0", + TypedInterface: core.TypedInterface{ + Inputs: nil, + Outputs: nil, + }, + } + datasetID, err := GenerateDatasetIDForTask(context.TODO(), key) + assert.NoError(t, err) + assert.NotEmpty(t, datasetID.Version) + assert.Equal(t, "1.0.0-GKw-c0Pw-GKw-c0Pw", datasetID.Version) +} + +// Ensure that empty parameters generate the same dataset as nil parameters +func TestEmptyParamTask(t *testing.T) { + key := catalog.Key{ + Identifier: core.Identifier{ + Project: "project", + Domain: "domain", + Name: "name", + Version: "1.0.0", + }, + CacheVersion: "1.0.0", + TypedInterface: core.TypedInterface{ + Inputs: &core.VariableMap{}, + Outputs: &core.VariableMap{}, + }, + } + datasetID, err := GenerateDatasetIDForTask(context.TODO(), key) + assert.NoError(t, err) + assert.NotEmpty(t, datasetID.Version) + assert.Equal(t, "1.0.0-GKw-c0Pw-GKw-c0Pw", datasetID.Version) + + key.TypedInterface.Inputs = nil + key.TypedInterface.Outputs = nil + datasetIDDupe, err := GenerateDatasetIDForTask(context.TODO(), key) + assert.NoError(t, err) + assert.Equal(t, datasetIDDupe.String(), datasetID.String()) +} + +// Ensure the key order on the map generates the same dataset +func TestVariableMapOrder(t *testing.T) { + key := catalog.Key{ + Identifier: core.Identifier{ + Project: "project", + Domain: "domain", + Name: "name", + Version: "1.0.0", + }, + CacheVersion: "1.0.0", + TypedInterface: core.TypedInterface{ + Inputs: &core.VariableMap{ + Variables: map[string]*core.Variable{ + "1": {Type: &core.LiteralType{Type: &core.LiteralType_Simple{Simple: core.SimpleType_INTEGER}}}, + "2": {Type: &core.LiteralType{Type: &core.LiteralType_Simple{Simple: core.SimpleType_INTEGER}}}, + }, + }, + }, + } + datasetID, err := GenerateDatasetIDForTask(context.TODO(), key) + assert.NoError(t, err) + assert.NotEmpty(t, datasetID.Version) + assert.Equal(t, "1.0.0-UxVtPm0k-GKw-c0Pw", datasetID.Version) + + key.TypedInterface.Inputs = &core.VariableMap{ + Variables: map[string]*core.Variable{ + "2": {Type: &core.LiteralType{Type: &core.LiteralType_Simple{Simple: core.SimpleType_INTEGER}}}, + "1": {Type: &core.LiteralType{Type: &core.LiteralType_Simple{Simple: core.SimpleType_INTEGER}}}, + }, + } + datasetIDDupe, err := GenerateDatasetIDForTask(context.TODO(), key) + assert.NoError(t, err) + + assert.Equal(t, "1.0.0-UxVtPm0k-GKw-c0Pw", datasetIDDupe.Version) + assert.Equal(t, datasetID.String(), datasetIDDupe.String()) +} + +// Ensure the key order on the inputs generates the same tag +func TestInputValueSorted(t *testing.T) { + literalMap, err := coreutils.MakeLiteralMap(map[string]interface{}{"1": 1, "2": 2}) + assert.NoError(t, err) + + tag, err := GenerateArtifactTagName(context.TODO(), literalMap) + assert.NoError(t, err) + assert.Equal(t, "flyte_cached-GQid5LjHbakcW68DS3P2jp80QLbiF0olFHF2hTh5bg8", tag) + + literalMap, err = coreutils.MakeLiteralMap(map[string]interface{}{"2": 2, "1": 1}) + assert.NoError(t, err) + + tagDupe, err := GenerateArtifactTagName(context.TODO(), literalMap) + assert.NoError(t, err) + assert.Equal(t, tagDupe, tag) +} + +// Ensure that empty inputs are hashed the same way +func TestNoInputValues(t *testing.T) { + tag, err := GenerateArtifactTagName(context.TODO(), nil) + assert.NoError(t, err) + assert.Equal(t, "flyte_cached-GKw-c0PwFokMUQ6T-TUmEWnZ4_VlQ2Qpgw-vCTT0-OQ", tag) + + tagDupe, err := GenerateArtifactTagName(context.TODO(), &core.LiteralMap{Literals: nil}) + assert.NoError(t, err) + assert.Equal(t, "flyte_cached-GKw-c0PwFokMUQ6T-TUmEWnZ4_VlQ2Qpgw-vCTT0-OQ", tagDupe) + assert.Equal(t, tagDupe, tag) +} + +func TestGetOrDefault(t *testing.T) { + type args struct { + m map[string]string + key string + defaultValue string + } + tests := []struct { + name string + args args + want string + }{ + {"default", args{m: map[string]string{"x": "val"}, key: "y", defaultValue: "def"}, "def"}, + {"original", args{m: map[string]string{"y": "val"}, key: "y", defaultValue: "def"}, "val"}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := GetOrDefault(tt.args.m, tt.args.key, tt.args.defaultValue); got != tt.want { + t.Errorf("GetOrDefault() = %v, want %v", got, tt.want) + } + }) + } +} + +func TestGetArtifactMetadataForSource(t *testing.T) { + type args struct { + taskExecutionID *core.TaskExecutionIdentifier + } + + tID := &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: "x", + Project: "project", + Domain: "development", + Version: "ver", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "wf", + Project: "p1", + Domain: "d1", + }, + NodeId: "n", + }, + RetryAttempt: 1, + } + + tests := []struct { + name string + args args + want map[string]string + }{ + {"nil TaskExec", args{}, nil}, + {"TaskExec", args{tID}, map[string]string{ + execTaskAttemptKey: strconv.Itoa(int(tID.RetryAttempt)), + execProjectKey: tID.NodeExecutionId.ExecutionId.Project, + execDomainKey: tID.NodeExecutionId.ExecutionId.Domain, + execNodeIDKey: tID.NodeExecutionId.NodeId, + execNameKey: tID.NodeExecutionId.ExecutionId.Name, + }}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := GetArtifactMetadataForSource(tt.args.taskExecutionID); !reflect.DeepEqual(got.KeyMap, tt.want) { + t.Errorf("GetMetadataForSource() = %v, want %v", got.KeyMap, tt.want) + } + }) + } +} + +func TestGetSourceFromMetadata(t *testing.T) { + tID := core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: "x", + Project: "project", + Domain: "development", + Version: "ver", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "wf", + Project: "p1", + Domain: "d1", + }, + NodeId: "n", + }, + RetryAttempt: 1, + } + + currentTaskID := core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: "x", + Project: "project", + Domain: "development", + Version: "ver2", + } + + type args struct { + datasetMd map[string]string + artifactMd map[string]string + currentID core.Identifier + } + tests := []struct { + name string + args args + want *core.TaskExecutionIdentifier + }{ + // EVerything is missing + {"missing", args{currentID: currentTaskID}, &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: "x", + Project: "project", + Domain: "development", + Version: "unknown", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "unknown", + Project: "project", + Domain: "development", + }, + NodeId: "unknown", + }, + RetryAttempt: 0, + }}, + // In legacy only taskVersionKey is available + {"legacy", args{datasetMd: GetDatasetMetadataForSource(&tID).KeyMap, currentID: currentTaskID}, &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: "x", + Project: "project", + Domain: "development", + Version: tID.TaskId.Version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "unknown", + Project: "project", + Domain: "development", + }, + NodeId: "unknown", + }, + RetryAttempt: 0, + }}, + // Completely available + {"latest", args{datasetMd: GetDatasetMetadataForSource(&tID).KeyMap, artifactMd: GetArtifactMetadataForSource(&tID).KeyMap, currentID: currentTaskID}, &tID}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got, err := GetSourceFromMetadata(&datacatalog.Metadata{KeyMap: tt.args.datasetMd}, &datacatalog.Metadata{KeyMap: tt.args.artifactMd}, tt.args.currentID); !reflect.DeepEqual(got, tt.want) { + t.Errorf("GetSourceFromMetadata() = %v, want %v", got, tt.want) + assert.NoError(t, err) + } + }) + } +} + +func TestEventCatalogMetadata(t *testing.T) { + tID := core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Name: "x", + Project: "project", + Domain: "development", + Version: "ver", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &core.WorkflowExecutionIdentifier{ + Name: "wf", + Project: "p1", + Domain: "d1", + }, + NodeId: "n", + }, + RetryAttempt: 1, + } + datasetID := &datacatalog.DatasetID{Project: "p", Domain: "d", Name: "n", Version: "v"} + type args struct { + datasetID *datacatalog.DatasetID + tag *datacatalog.Tag + sourceID *core.TaskExecutionIdentifier + } + tests := []struct { + name string + args args + want *core.CatalogMetadata + }{ + {"only datasetID", args{datasetID: datasetID}, &core.CatalogMetadata{DatasetId: DatasetIDToIdentifier(datasetID)}}, + {"tag", args{datasetID: datasetID, tag: &datacatalog.Tag{Name: "n", ArtifactId: "a"}}, &core.CatalogMetadata{DatasetId: DatasetIDToIdentifier(datasetID), ArtifactTag: &core.CatalogArtifactTag{Name: "n", ArtifactId: "a"}}}, + {"source", args{datasetID: datasetID, tag: &datacatalog.Tag{Name: "n", ArtifactId: "a"}, sourceID: &tID}, &core.CatalogMetadata{DatasetId: DatasetIDToIdentifier(datasetID), ArtifactTag: &core.CatalogArtifactTag{Name: "n", ArtifactId: "a"}, SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &tID, + }}}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := EventCatalogMetadata(tt.args.datasetID, tt.args.tag, tt.args.sourceID); !reflect.DeepEqual(got, tt.want) { + t.Errorf("EventCatalogMetadata() = %v, want %v", got, tt.want) + } + }) + } +} + +func TestDatasetIDToIdentifier(t *testing.T) { + id := DatasetIDToIdentifier(&datacatalog.DatasetID{Project: "p", Domain: "d", Name: "n", Version: "v"}) + assert.Equal(t, core.ResourceType_DATASET, id.ResourceType) + assert.Equal(t, "n", id.Name) + assert.Equal(t, "p", id.Project) + assert.Equal(t, "d", id.Domain) + assert.Equal(t, "v", id.Version) +} + +func TestGenerateArtifactTagName_LiteralsWithHashSet(t *testing.T) { + tests := []struct { + name string + literal *core.Literal + expectedLiteral *core.Literal + }{ + { + name: "single literal where hash is not set", + literal: coreutils.MustMakeLiteral(42), + expectedLiteral: coreutils.MustMakeLiteral(42), + }, + { + name: "single literal containing hash", + literal: &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "abcde", + }, + expectedLiteral: &core.Literal{ + Value: nil, + Hash: "abcde", + }, + }, + { + name: "list of literals containing a single item where literal sets its hash", + literal: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "hash1", + }, + }, + }, + }, + }, + expectedLiteral: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: nil, + Hash: "hash1", + }, + }, + }, + }, + }, + }, + { + name: "list of literals containing two items where each literal sets its hash", + literal: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "hash1", + }, + &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://another-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "hash2", + }, + }, + }, + }, + }, + expectedLiteral: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: nil, + Hash: "hash1", + }, + &core.Literal{ + Value: nil, + Hash: "hash2", + }, + }, + }, + }, + }, + }, + { + name: "list of literals containing two items where only one literal has its hash set", + literal: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "hash1", + }, + &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://another-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + expectedLiteral: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: nil, + Hash: "hash1", + }, + &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://another-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + { + name: "map of literals containing a single item where literal sets its hash", + literal: &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "literal1": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "hash-42", + }, + }, + }, + }, + }, + expectedLiteral: &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "literal1": &core.Literal{ + Value: nil, + Hash: "hash-42", + }, + }, + }, + }, + }, + }, + { + name: "map of literals containing a three items where only one literal sets its hash", + literal: &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "literal1": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + "literal2-set-its-hash": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-2", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "literal-2-hash", + }, + "literal3": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-3", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + expectedLiteral: &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "literal1": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + "literal2-set-its-hash": &core.Literal{ + Value: nil, + Hash: "literal-2-hash", + }, + "literal3": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-3", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + { + name: "list of map of literals containing a mixture of literals have their hashes set or not set", + literal: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "literal1": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + "literal2-set-its-hash": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-2", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "literal-2-hash", + }, + "literal3": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-3", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "another-literal-1": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-another-literal-1", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + Hash: "another-literal-1-hash", + }, + "another-literal2-set-its-hash": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-2", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + expectedLiteral: &core.Literal{ + Value: &core.Literal_Collection{ + Collection: &core.LiteralCollection{ + Literals: []*core.Literal{ + &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "literal1": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + "literal2-set-its-hash": &core.Literal{ + Value: nil, + Hash: "literal-2-hash", + }, + "literal3": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-3", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + &core.Literal{ + Value: &core.Literal_Map{ + Map: &core.LiteralMap{ + Literals: map[string]*core.Literal{ + "another-literal-1": &core.Literal{ + Value: nil, + Hash: "another-literal-1-hash", + }, + "another-literal2-set-its-hash": &core.Literal{ + Value: &core.Literal_Scalar{ + Scalar: &core.Scalar{ + Value: &core.Scalar_StructuredDataset{ + StructuredDataset: &core.StructuredDataset{ + Uri: "my-blob-stora://some-address-for-literal-2", + Metadata: &core.StructuredDatasetMetadata{ + StructuredDatasetType: &core.StructuredDatasetType{ + Format: "my-columnar-data-format", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assert.Equal(t, tt.expectedLiteral, hashify(tt.literal)) + + // Double-check that generating a tag is successful + literalMap := &core.LiteralMap{Literals: map[string]*core.Literal{"o0": tt.literal}} + tag, err := GenerateArtifactTagName(context.TODO(), literalMap) + assert.NoError(t, err) + assert.NotEmpty(t, tag) + }) + } +} diff --git a/flytestdlib/catalog/noop_catalog.go b/flytestdlib/catalog/noop_catalog.go new file mode 100644 index 0000000000..41cf445784 --- /dev/null +++ b/flytestdlib/catalog/noop_catalog.go @@ -0,0 +1,60 @@ +package catalog + +import ( + "context" + "time" + + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/io" +) + +var ( + _ catalog.Client = NOOPCatalog{} +) + +var disabledStatus = catalog.NewStatus(core.CatalogCacheStatus_CACHE_DISABLED, nil) + +type NOOPCatalog struct { +} + +func (n NOOPCatalog) Get(_ context.Context, _ catalog.Key) (catalog.Entry, error) { + return catalog.NewCatalogEntry(nil, disabledStatus), nil +} + +func (n NOOPCatalog) Put(_ context.Context, _ catalog.Key, _ io.OutputReader, _ catalog.Metadata) (catalog.Status, error) { + return disabledStatus, nil +} + +func (n NOOPCatalog) Update(_ context.Context, _ catalog.Key, _ io.OutputReader, _ catalog.Metadata) (catalog.Status, error) { + return disabledStatus, nil +} + +func (n NOOPCatalog) GetOrExtendReservation(_ context.Context, _ catalog.Key, _ string, _ time.Duration) (*datacatalog.Reservation, error) { + return nil, nil +} + +func (n NOOPCatalog) GetOrExtendReservationByArtifactTag(_ context.Context, _ *datacatalog.DatasetID, _ string, _ string, _ time.Duration) (*datacatalog.Reservation, error) { + return nil, nil +} + +func (n NOOPCatalog) ReleaseReservation(_ context.Context, _ catalog.Key, _ string) error { + return nil +} + +func (n NOOPCatalog) ReleaseReservationByArtifactTag(_ context.Context, _ *datacatalog.DatasetID, _ string, _ string) error { + return nil +} + +func (n NOOPCatalog) Delete(_ context.Context, _ catalog.Key) error { + return nil +} + +func (n NOOPCatalog) DeleteByArtifactTag(_ context.Context, _ *datacatalog.DatasetID, _ string) error { + return nil +} + +func (n NOOPCatalog) DeleteByArtifactID(_ context.Context, _ *datacatalog.DatasetID, _ string) error { + return nil +} diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod index 5002bbeadb..8ee8a86c61 100644 --- a/flytestdlib/go.mod +++ b/flytestdlib/go.mod @@ -2,6 +2,11 @@ module github.com/flyteorg/flytestdlib go 1.18 +replace ( + github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 + github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 +) + require ( github.com/aws/aws-sdk-go v1.44.2 github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 @@ -9,28 +14,35 @@ require ( github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607 github.com/fatih/color v1.13.0 github.com/fatih/structtag v1.2.0 + github.com/flyteorg/flyteidl v1.2.3 + github.com/flyteorg/flyteplugins v1.0.18 + github.com/flyteorg/flytepropeller v1.1.28 github.com/flyteorg/stow v0.3.6 github.com/fsnotify/fsnotify v1.5.1 github.com/ghodss/yaml v1.0.0 github.com/go-test/deep v1.0.7 github.com/golang/protobuf v1.5.2 + github.com/google/uuid v1.3.0 + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/hashicorp/golang-lru v0.5.4 github.com/magiconair/properties v1.8.6 github.com/mitchellh/mapstructure v1.4.3 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 - github.com/sirupsen/logrus v1.7.0 + github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.11.0 - github.com/stretchr/testify v1.7.1 - golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 + github.com/stretchr/testify v1.7.2 + golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 golang.org/x/tools v0.1.12 + google.golang.org/grpc v1.46.0 google.golang.org/protobuf v1.28.0 gorm.io/gorm v1.22.4 - k8s.io/api v0.20.2 - k8s.io/apimachinery v0.20.2 - k8s.io/client-go v0.0.0-20210217172142-7279fc64d847 + k8s.io/api v0.24.1 + k8s.io/apimachinery v0.24.1 + k8s.io/client-go v0.24.1 ) require ( @@ -48,29 +60,39 @@ require ( github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v0.4.0 // indirect + github.com/emicklei/go-restful v2.9.6+incompatible // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.8 // indirect - github.com/google/gofuzz v1.1.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect github.com/googleapis/gax-go/v2 v2.3.0 // indirect github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kr/text v0.2.0 // indirect + github.com/mailru/easyjson v0.7.6 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/ncw/swift v1.0.53 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect @@ -84,21 +106,27 @@ require ( github.com/stretchr/objx v0.3.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect go.opencensus.io v0.23.0 // indirect - golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect - golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect + golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/api v0.76.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 // indirect - google.golang.org/grpc v1.46.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - k8s.io/klog/v2 v2.5.0 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/klog/v2 v2.60.1 // indirect + k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect + k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + sigs.k8s.io/controller-runtime v0.12.1 // indirect + sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum index b235518a81..b89f0d6930 100644 --- a/flytestdlib/go.sum +++ b/flytestdlib/go.sum @@ -45,6 +45,7 @@ cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wq cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -62,9 +63,12 @@ cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.0/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 h1:3CVsSo4mp8NDWO11tHzN/mdo2zP0CtaSK5IcwBjfqRA= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0= github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0 h1:NVS/4LOQfkBpk+B1VopIzv1ptmYeEskA8w/3K/w7vjo= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0/go.mod h1:RG0cZndeZM17StwohYclmcXSr4oOJ8b1I5hB8llIc6Y= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 h1:Px2KVERcYEg2Lv25AqC2hVr0xUWaq94wuEObLIkYzmA= github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2/go.mod h1:CdSJQNNzZhCkwDaV27XV1w48ZBPtxe7mlrZAsPNxD5g= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 h1:0nJeKDmB7a1a8RDMjTltahlPsaNlWjq/LpkZleSwINk= @@ -72,9 +76,11 @@ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0/go.mod h1:mbwxKc/fW+ github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= +github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= +github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ= github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= @@ -83,18 +89,23 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= +github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c= +github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -102,6 +113,12 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.44.2 h1:5VBk5r06bgxgRKVaUtm1/4NT/rtrnH2E4cnAYv5zgQc= github.com/aws/aws-sdk-go v1.44.2/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= @@ -111,6 +128,11 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMpKRTsX2FjEIP2WCWrdOAfvg9nwoObBkJCCnksQaM= +github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 h1:Qxsd2LWl44bfLn75MHrPv32P1PhPZ9fajg39eHZ/a7g= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081/go.mod h1:ZbZVBxEWh8Icj1AgfNKg0uPzHHGd9twa4eWcY2Yt6xE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -118,9 +140,12 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= +github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -133,6 +158,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc= github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -144,6 +171,9 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.6+incompatible h1:tfrHha8zJ01ywiOEC1miGY8st1/igzWB8OmvPgoYX7w= +github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -157,17 +187,26 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607 h1:cTavhURetDkezJCvxFggiyLeP40Mrk/TtVg2+ycw1Es= github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/flyteorg/flytepropeller v1.1.28 h1:68qQ0QRHoCzagF0oifkW/c4A1L4B4LdgyHCPLKMiY2g= +github.com/flyteorg/flytepropeller v1.1.28/go.mod h1:QE3szUWkFnyFg3mMxpn3y93ZSs18T+1SQtVgNhcEMvA= +github.com/flyteorg/flytestdlib v1.0.12/go.mod h1:nIBmBHtjTJvhZEn3e/EwVC/iMkR2tUX8hEiXjRBpH/s= github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk= github.com/flyteorg/stow v0.3.6/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -182,30 +221,43 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= +github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= +github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ= github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -241,6 +293,9 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= +github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -257,8 +312,9 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -281,10 +337,12 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/readahead v0.0.0-20161222183148-eaceba169032/go.mod h1:qYysrqQXuV4tzsizt4oOQ6mrBZQ0xnQXP3ylXX8Jk5Y= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -296,21 +354,55 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.3 h1:PlHq1bSCSZL9K0wUhbm2pGLoTWs2GwVhsP6emvGV/ZI= github.com/jinzhu/now v1.1.3/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= @@ -318,8 +410,11 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -328,6 +423,7 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -336,7 +432,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -344,18 +439,35 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -368,32 +480,54 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= +github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks= github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0= github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI= +github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= @@ -404,12 +538,14 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= @@ -417,11 +553,15 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpOAnclKvg+mdA= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= @@ -438,6 +578,7 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44= github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -449,15 +590,21 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= +go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.2/go.mod h1:2D7ZejHVMIfog1221iLSYlQRzrtECw3kz4I4VAQm3qI= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -467,20 +614,34 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -491,6 +652,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -534,6 +697,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -544,6 +708,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -558,13 +723,17 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -582,6 +751,7 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -598,11 +768,14 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -612,15 +785,21 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -630,6 +809,7 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -644,10 +824,12 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -661,6 +843,8 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -670,9 +854,13 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -688,8 +876,10 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -705,6 +895,7 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -726,6 +917,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -752,8 +944,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -783,6 +977,7 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= @@ -821,6 +1016,7 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -831,6 +1027,7 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -859,6 +1056,8 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -926,14 +1125,17 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/kothar/go-backblaze.v0 v0.0.0-20210124194846-35409b867216/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -945,10 +1147,13 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/gorm v1.22.4 h1:8aPcyEJhY0MAt8aY6Dc524Pn+pO29K+ydu+e/cXSpQM= gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -957,26 +1162,46 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20210217171935-8e2decd92398/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78= -k8s.io/api v0.20.2 h1:y/HR22XDZY3pniu9hIFDLpUCPq2w5eQ6aV/VFQ7uJMw= k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= +k8s.io/api v0.24.1 h1:BjCMRDcyEYz03joa3K1+rbshwh1Ay6oB53+iUx2H8UY= +k8s.io/api v0.24.1/go.mod h1:JhoOvNiLXKTPQ60zh2g0ewpA+bnEYf5q44Flhquh4vQ= +k8s.io/apiextensions-apiserver v0.24.1 h1:5yBh9+ueTq/kfnHQZa0MAo6uNcPrtxPMpNQgorBaKS0= k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY= -k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg= k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/client-go v0.0.0-20210217172142-7279fc64d847 h1:d+LBRNY3c/KGp7lDblRlUJkayx4Vla7WUTIazoGMdYo= +k8s.io/apimachinery v0.24.1 h1:ShD4aDxTQKN5zNf8K1RQ2u98ELLdIW7jEnlO9uAMX/I= +k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/client-go v0.0.0-20210217172142-7279fc64d847/go.mod h1:q0EaghmVye2uui19vxSZ2NG6ssgUWgjudO6vrwXneSI= +k8s.io/client-go v0.24.1 h1:w1hNdI9PFrzu3OlovVeTnf4oHDt+FJLd9Ndluvnb42E= +k8s.io/client-go v0.24.1/go.mod h1:f1kIDqcEYmwXS/vTbbhopMUbhKp2JhOeVTfxgaCIlF8= +k8s.io/component-base v0.24.1 h1:APv6W/YmfOWZfo+XJ1mZwep/f7g7Tpwvdbo9CQLDuts= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI= k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= +k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/controller-runtime v0.12.1 h1:4BJY01xe9zKQti8oRjj/NeHKRXthf1YkYJAgLONFFoI= +sigs.k8s.io/controller-runtime v0.12.1/go.mod h1:BKhxlA4l7FPK4AQcsuL4X6vZeWnKDXez/vp1Y8dxTU0= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 h1:2sgAQQcY0dEW2SsQwTXhQV4vO6+rSslYx8K3XmM5hqQ= +sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= From 422eb46d5ef996244bcd5005bc7a877f028e301b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 15 Dec 2022 18:52:21 +0100 Subject: [PATCH 02/57] Added function for updating selected fields of NodeExecutionModel Allows for fields to be explicity set/updated to nil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../repositories/gormimpl/node_execution_repo.go | 10 ++++++++++ .../repositories/interfaces/node_execution_repo.go | 3 +++ .../pkg/repositories/mocks/node_execution_repo.go | 13 +++++++++++++ 3 files changed, 26 insertions(+) diff --git a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go index 65cd8a774c..4d446c631a 100644 --- a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go +++ b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go @@ -106,6 +106,16 @@ func (r *NodeExecutionRepo) Update(ctx context.Context, nodeExecution *models.No return nil } +func (r *NodeExecutionRepo) UpdateSelected(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error { + timer := r.metrics.UpdateDuration.Start() + tx := r.db.Model(&nodeExecution).Select(selectedFields).Updates(nodeExecution) + timer.Stop() + if err := tx.Error; err != nil { + return r.errorTransformer.ToFlyteAdminError(err) + } + return nil +} + func (r *NodeExecutionRepo) List(ctx context.Context, input interfaces.ListResourceInput) ( interfaces.NodeExecutionCollectionOutput, error) { // First validate input. diff --git a/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go b/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go index 384d11afb8..139c0e0321 100644 --- a/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go +++ b/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go @@ -13,6 +13,9 @@ type NodeExecutionRepoInterface interface { Create(ctx context.Context, execution *models.NodeExecution) error // Update an existing node execution in the database store with all non-empty fields in the input. Update(ctx context.Context, execution *models.NodeExecution) error + // UpdateSelected updates the selected fields of an existing node execution in the database. + // This is required when updating fields to their zero values (e.g. nil) as Update will only handle non-empty fields. + UpdateSelected(ctx context.Context, execution *models.NodeExecution, selectedFields []string) error // Get returns a matching execution if it exists. Get(ctx context.Context, input NodeExecutionResource) (models.NodeExecution, error) // GetWithChildren returns a matching execution with preloaded child node executions. This should only be called for legacy node executions diff --git a/flyteadmin/pkg/repositories/mocks/node_execution_repo.go b/flyteadmin/pkg/repositories/mocks/node_execution_repo.go index 006b357bd8..969934dfd4 100644 --- a/flyteadmin/pkg/repositories/mocks/node_execution_repo.go +++ b/flyteadmin/pkg/repositories/mocks/node_execution_repo.go @@ -9,6 +9,7 @@ import ( type CreateNodeExecutionFunc func(ctx context.Context, input *models.NodeExecution) error type UpdateNodeExecutionFunc func(ctx context.Context, nodeExecution *models.NodeExecution) error +type UpdateSelectedNodeExecutionFunc func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error type GetNodeExecutionFunc func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) type ListNodeExecutionFunc func(ctx context.Context, input interfaces.ListResourceInput) ( interfaces.NodeExecutionCollectionOutput, error) @@ -18,6 +19,7 @@ type CountNodeExecutionFunc func(ctx context.Context, input interfaces.CountReso type MockNodeExecutionRepo struct { createFunction CreateNodeExecutionFunc updateFunction UpdateNodeExecutionFunc + updateSelectedFunction UpdateSelectedNodeExecutionFunc getFunction GetNodeExecutionFunc getWithChildrenFunction GetNodeExecutionFunc listFunction ListNodeExecutionFunc @@ -47,6 +49,17 @@ func (r *MockNodeExecutionRepo) SetUpdateCallback(updateFunction UpdateNodeExecu r.updateFunction = updateFunction } +func (r *MockNodeExecutionRepo) UpdateSelected(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error { + if r.updateSelectedFunction != nil { + return r.updateSelectedFunction(ctx, nodeExecution, selectedFields) + } + return nil +} + +func (r *MockNodeExecutionRepo) SetUpdateSelectedCallback(updateSelectedFunction UpdateSelectedNodeExecutionFunc) { + r.updateSelectedFunction = updateSelectedFunction +} + func (r *MockNodeExecutionRepo) Get(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) { if r.getFunction != nil { return r.getFunction(ctx, input) From 47e9a006a01466c9eeaa6022094877b04b99bc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 15 Dec 2022 18:59:34 +0100 Subject: [PATCH 03/57] Refactored listing of node and task executions to shared util Allows for re-use by cache manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../manager/impl/node_execution_manager.go | 108 +++---------- .../manager/impl/task_execution_manager.go | 41 +---- flyteadmin/pkg/manager/impl/util/shared.go | 145 ++++++++++++++++++ 3 files changed, 169 insertions(+), 125 deletions(-) diff --git a/flyteadmin/pkg/manager/impl/node_execution_manager.go b/flyteadmin/pkg/manager/impl/node_execution_manager.go index ca6d71e033..3e58f83d18 100644 --- a/flyteadmin/pkg/manager/impl/node_execution_manager.go +++ b/flyteadmin/pkg/manager/impl/node_execution_manager.go @@ -2,7 +2,6 @@ package impl import ( "context" - "strconv" cloudeventInterfaces "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/interfaces" @@ -17,7 +16,6 @@ import ( "github.com/flyteorg/flytestdlib/contextutils" - "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" "github.com/flyteorg/flytestdlib/promutils" "github.com/prometheus/client_golang/prometheus" @@ -74,11 +72,6 @@ const ( alreadyInTerminalStatus ) -var isParent = common.NewMapFilter(map[string]interface{}{ - shared.ParentTaskExecutionID: nil, - shared.ParentID: nil, -}) - func getNodeExecutionContext(ctx context.Context, identifier *core.NodeExecutionIdentifier) context.Context { ctx = contextutils.WithProjectDomain(ctx, identifier.ExecutionId.Project, identifier.ExecutionId.Domain) ctx = contextutils.WithExecutionID(ctx, identifier.ExecutionId.Name) @@ -369,48 +362,23 @@ func (m *NodeExecutionManager) GetNodeExecution( return nodeExecution, nil } -func (m *NodeExecutionManager) listNodeExecutions( - ctx context.Context, identifierFilters []common.InlineFilter, - requestFilters string, limit uint32, requestToken string, sortBy *admin.Sort, mapFilters []common.MapFilter) ( - *admin.NodeExecutionList, error) { - - filters, err := util.AddRequestFilters(requestFilters, common.NodeExecution, identifierFilters) - if err != nil { +func (m *NodeExecutionManager) ListNodeExecutions( + ctx context.Context, request admin.NodeExecutionListRequest) (*admin.NodeExecutionList, error) { + // Check required fields + if err := validation.ValidateNodeExecutionListRequest(request); err != nil { return nil, err } - var sortParameter common.SortParameter - if sortBy != nil { - sortParameter, err = common.NewSortParameter(*sortBy) - if err != nil { - return nil, err - } - } - offset, err := validation.ValidateToken(requestToken) - if err != nil { - return nil, errors.NewFlyteAdminErrorf(codes.InvalidArgument, - "invalid pagination token %s for ListNodeExecutions", requestToken) - } - listInput := repoInterfaces.ListResourceInput{ - Limit: int(limit), - Offset: offset, - InlineFilters: filters, - SortParameter: sortParameter, - } + ctx = getExecutionContext(ctx, request.WorkflowExecutionId) - listInput.MapFilters = mapFilters - output, err := m.db.NodeExecutionRepo().List(ctx, listInput) + nodeExecutions, token, err := util.ListNodeExecutionsForWorkflow(ctx, m.db, request.WorkflowExecutionId, + request.UniqueParentId, request.Filters, request.Limit, request.Token, request.SortBy) if err != nil { - logger.Debugf(ctx, "Failed to list node executions for request with err %v", err) return nil, err } - var token string - if len(output.NodeExecutions) == int(limit) { - token = strconv.Itoa(offset + len(output.NodeExecutions)) - } - nodeExecutionList, err := m.transformNodeExecutionModelList(ctx, output.NodeExecutions) + nodeExecutionList, err := m.transformNodeExecutionModelList(ctx, nodeExecutions) if err != nil { - logger.Debugf(ctx, "failed to transform node execution models for request with err: %v", err) + logger.Debugf(ctx, "failed to transform node execution models for request [%+v] with err: %v", request, err) return nil, err } @@ -420,42 +388,6 @@ func (m *NodeExecutionManager) listNodeExecutions( }, nil } -func (m *NodeExecutionManager) ListNodeExecutions( - ctx context.Context, request admin.NodeExecutionListRequest) (*admin.NodeExecutionList, error) { - // Check required fields - if err := validation.ValidateNodeExecutionListRequest(request); err != nil { - return nil, err - } - ctx = getExecutionContext(ctx, request.WorkflowExecutionId) - - identifierFilters, err := util.GetWorkflowExecutionIdentifierFilters(ctx, *request.WorkflowExecutionId) - if err != nil { - return nil, err - } - var mapFilters []common.MapFilter - if request.UniqueParentId != "" { - parentNodeExecution, err := util.GetNodeExecutionModel(ctx, m.db, &core.NodeExecutionIdentifier{ - ExecutionId: request.WorkflowExecutionId, - NodeId: request.UniqueParentId, - }) - if err != nil { - return nil, err - } - parentIDFilter, err := common.NewSingleValueFilter( - common.NodeExecution, common.Equal, shared.ParentID, parentNodeExecution.ID) - if err != nil { - return nil, err - } - identifierFilters = append(identifierFilters, parentIDFilter) - } else { - mapFilters = []common.MapFilter{ - isParent, - } - } - return m.listNodeExecutions( - ctx, identifierFilters, request.Filters, request.Limit, request.Token, request.SortBy, mapFilters) -} - // Filters on node executions matching the execution parameters (execution project, domain, and name) as well as the // parent task execution id corresponding to the task execution identified in the request params. func (m *NodeExecutionManager) ListNodeExecutionsForTask( @@ -465,23 +397,23 @@ func (m *NodeExecutionManager) ListNodeExecutionsForTask( return nil, err } ctx = getTaskExecutionContext(ctx, request.TaskExecutionId) - identifierFilters, err := util.GetWorkflowExecutionIdentifierFilters( - ctx, *request.TaskExecutionId.NodeExecutionId.ExecutionId) - if err != nil { - return nil, err - } - parentTaskExecutionModel, err := util.GetTaskExecutionModel(ctx, m.db, request.TaskExecutionId) + + nodeExecutions, token, err := util.ListNodeExecutionsForTask(ctx, m.db, request.TaskExecutionId, + request.TaskExecutionId.NodeExecutionId.ExecutionId, request.Filters, request.Limit, request.Token, request.SortBy) if err != nil { return nil, err } - nodeIDFilter, err := common.NewSingleValueFilter( - common.NodeExecution, common.Equal, shared.ParentTaskExecutionID, parentTaskExecutionModel.ID) + + nodeExecutionList, err := m.transformNodeExecutionModelList(ctx, nodeExecutions) if err != nil { + logger.Debugf(ctx, "failed to transform node execution models for request [%+v] with err: %v", request, err) return nil, err } - identifierFilters = append(identifierFilters, nodeIDFilter) - return m.listNodeExecutions( - ctx, identifierFilters, request.Filters, request.Limit, request.Token, request.SortBy, nil) + + return &admin.NodeExecutionList{ + NodeExecutions: nodeExecutionList, + Token: token, + }, nil } func (m *NodeExecutionManager) GetNodeExecutionData( diff --git a/flyteadmin/pkg/manager/impl/task_execution_manager.go b/flyteadmin/pkg/manager/impl/task_execution_manager.go index db88b77c86..1e09923459 100644 --- a/flyteadmin/pkg/manager/impl/task_execution_manager.go +++ b/flyteadmin/pkg/manager/impl/task_execution_manager.go @@ -3,7 +3,6 @@ package impl import ( "context" "fmt" - "strconv" cloudeventInterfaces "github.com/flyteorg/flyteadmin/pkg/async/cloudevent/interfaces" @@ -249,50 +248,18 @@ func (m *TaskExecutionManager) ListTaskExecutions( } ctx = getNodeExecutionContext(ctx, request.NodeExecutionId) - identifierFilters, err := util.GetNodeExecutionIdentifierFilters(ctx, *request.NodeExecutionId) + taskExecutions, token, err := util.ListTaskExecutions(ctx, m.db, request.NodeExecutionId, request.Filters, + request.Limit, request.Token, request.SortBy) if err != nil { return nil, err } - filters, err := util.AddRequestFilters(request.Filters, common.TaskExecution, identifierFilters) - if err != nil { - return nil, err - } - var sortParameter common.SortParameter - if request.SortBy != nil { - sortParameter, err = common.NewSortParameter(*request.SortBy) - if err != nil { - return nil, err - } - } - - offset, err := validation.ValidateToken(request.Token) - if err != nil { - return nil, errors.NewFlyteAdminErrorf(codes.InvalidArgument, - "invalid pagination token %s for ListTaskExecutions", request.Token) - } - - output, err := m.db.TaskExecutionRepo().List(ctx, repoInterfaces.ListResourceInput{ - InlineFilters: filters, - Offset: offset, - Limit: int(request.Limit), - SortParameter: sortParameter, - }) - if err != nil { - logger.Debugf(ctx, "Failed to list task executions with request [%+v] with err %v", - request, err) - return nil, err - } - - taskExecutionList, err := transformers.FromTaskExecutionModels(output.TaskExecutions) + taskExecutionList, err := transformers.FromTaskExecutionModels(taskExecutions) if err != nil { logger.Debugf(ctx, "failed to transform task execution models for request [%+v] with err: %v", request, err) return nil, err } - var token string - if len(taskExecutionList) == int(request.Limit) { - token = strconv.Itoa(offset + len(taskExecutionList)) - } + return &admin.TaskExecutionList{ TaskExecutions: taskExecutionList, Token: token, diff --git a/flyteadmin/pkg/manager/impl/util/shared.go b/flyteadmin/pkg/manager/impl/util/shared.go index bf94904735..6f3aafe584 100644 --- a/flyteadmin/pkg/manager/impl/util/shared.go +++ b/flyteadmin/pkg/manager/impl/util/shared.go @@ -3,6 +3,7 @@ package util import ( "context" + "strconv" "time" "github.com/flyteorg/flyteadmin/pkg/common" @@ -327,3 +328,147 @@ func MergeIntoExecConfig(workflowExecConfig admin.WorkflowExecutionConfig, spec return workflowExecConfig } + +func ListNodeExecutions(ctx context.Context, repo repoInterfaces.Repository, identifierFilters []common.InlineFilter, + requestFilters string, limit uint32, requestToken string, sortBy *admin.Sort, + mapFilters []common.MapFilter) ([]models.NodeExecution, string, error) { + filters, err := AddRequestFilters(requestFilters, common.NodeExecution, identifierFilters) + if err != nil { + return nil, "", err + } + var sortParameter common.SortParameter + if sortBy != nil { + sortParameter, err = common.NewSortParameter(*sortBy) + if err != nil { + return nil, "", err + } + } + offset, err := validation.ValidateToken(requestToken) + if err != nil { + return nil, "", errors.NewFlyteAdminErrorf(codes.InvalidArgument, + "invalid pagination token %s for ListNodeExecutions", requestToken) + } + listInput := repoInterfaces.ListResourceInput{ + Limit: int(limit), + Offset: offset, + InlineFilters: filters, + SortParameter: sortParameter, + MapFilters: mapFilters, + } + + output, err := repo.NodeExecutionRepo().List(ctx, listInput) + if err != nil { + logger.Debugf(ctx, "Failed to list node executions: %v", err) + return nil, "", err + } + + var token string + if len(output.NodeExecutions) == int(limit) { + token = strconv.Itoa(offset + len(output.NodeExecutions)) + } + + return output.NodeExecutions, token, nil +} + +func ListNodeExecutionsForWorkflow(ctx context.Context, repo repoInterfaces.Repository, + workflowExecutionID *core.WorkflowExecutionIdentifier, uniqueParentID string, requestFilters string, + limit uint32, requestToken string, sortBy *admin.Sort) ([]models.NodeExecution, string, error) { + identifierFilters, err := GetWorkflowExecutionIdentifierFilters(ctx, *workflowExecutionID) + if err != nil { + return nil, "", err + } + + var mapFilters []common.MapFilter + if len(uniqueParentID) > 0 { + parentNodeExecution, err := GetNodeExecutionModel(ctx, repo, &core.NodeExecutionIdentifier{ + ExecutionId: workflowExecutionID, + NodeId: uniqueParentID, + }) + if err != nil { + return nil, "", err + } + parentIDFilter, err := common.NewSingleValueFilter( + common.NodeExecution, common.Equal, shared.ParentID, parentNodeExecution.ID) + if err != nil { + return nil, "", err + } + identifierFilters = append(identifierFilters, parentIDFilter) + } else { + mapFilters = []common.MapFilter{ + common.NewMapFilter(map[string]interface{}{ + shared.ParentTaskExecutionID: nil, + shared.ParentID: nil, + }), + } + } + + return ListNodeExecutions(ctx, repo, identifierFilters, requestFilters, limit, requestToken, sortBy, mapFilters) +} + +func ListNodeExecutionsForTask(ctx context.Context, repo repoInterfaces.Repository, + taskExecutionID *core.TaskExecutionIdentifier, workflowExecutionID *core.WorkflowExecutionIdentifier, + requestFilters string, limit uint32, requestToken string, sortBy *admin.Sort) ([]models.NodeExecution, string, error) { + identifierFilters, err := GetWorkflowExecutionIdentifierFilters(ctx, *workflowExecutionID) + if err != nil { + return nil, "", err + } + + parentTaskExecutionModel, err := GetTaskExecutionModel(ctx, repo, taskExecutionID) + if err != nil { + return nil, "", err + } + + nodeIDFilter, err := common.NewSingleValueFilter( + common.NodeExecution, common.Equal, shared.ParentTaskExecutionID, parentTaskExecutionModel.ID) + if err != nil { + return nil, "", err + } + identifierFilters = append(identifierFilters, nodeIDFilter) + + return ListNodeExecutions(ctx, repo, identifierFilters, requestFilters, limit, requestToken, sortBy, nil) +} + +func ListTaskExecutions(ctx context.Context, repo repoInterfaces.Repository, + nodeExecutionID *core.NodeExecutionIdentifier, requestFilters string, limit uint32, requestToken string, + sortBy *admin.Sort) ([]models.TaskExecution, string, error) { + identifierFilters, err := GetNodeExecutionIdentifierFilters(ctx, *nodeExecutionID) + if err != nil { + return nil, "", err + } + + filters, err := AddRequestFilters(requestFilters, common.TaskExecution, identifierFilters) + if err != nil { + return nil, "", err + } + var sortParameter common.SortParameter + if sortBy != nil { + sortParameter, err = common.NewSortParameter(*sortBy) + if err != nil { + return nil, "", err + } + } + + offset, err := validation.ValidateToken(requestToken) + if err != nil { + return nil, "", errors.NewFlyteAdminErrorf(codes.InvalidArgument, + "invalid pagination token %s for ListTaskExecutions", requestToken) + } + + output, err := repo.TaskExecutionRepo().List(ctx, repoInterfaces.ListResourceInput{ + InlineFilters: filters, + Offset: offset, + Limit: int(limit), + SortParameter: sortParameter, + }) + if err != nil { + logger.Debugf(ctx, "Failed to list task executions: %v", err) + return nil, "", err + } + + var token string + if len(output.TaskExecutions) == int(limit) { + token = strconv.Itoa(offset + len(output.TaskExecutions)) + } + + return output.TaskExecutions, token, nil +} From 25c187c6691bc56a2c5703ae7ee262c64b75b041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 15 Dec 2022 19:15:08 +0100 Subject: [PATCH 04/57] Implemented CacheService Added endpoint for evicting execution cache Added endpoint for evicting task execution cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- flyteadmin/go.mod | 13 +- flyteadmin/go.sum | 456 +- flyteadmin/pkg/manager/impl/cache_manager.go | 463 + .../pkg/manager/impl/cache_manager_test.go | 8529 +++++++++++++++++ .../manager/impl/execution_manager_test.go | 10 +- .../pkg/manager/impl/shared/constants.go | 2 + flyteadmin/pkg/manager/interfaces/cache.go | 12 + flyteadmin/pkg/manager/mocks/cache.go | 42 + flyteadmin/pkg/rpc/cacheservice/base.go | 86 + flyteadmin/pkg/rpc/cacheservice/cache.go | 59 + flyteadmin/pkg/rpc/cacheservice/metrics.go | 36 + flyteadmin/pkg/server/service.go | 8 + 12 files changed, 9569 insertions(+), 147 deletions(-) create mode 100644 flyteadmin/pkg/manager/impl/cache_manager.go create mode 100644 flyteadmin/pkg/manager/impl/cache_manager_test.go create mode 100644 flyteadmin/pkg/manager/interfaces/cache.go create mode 100644 flyteadmin/pkg/manager/mocks/cache.go create mode 100644 flyteadmin/pkg/rpc/cacheservice/base.go create mode 100644 flyteadmin/pkg/rpc/cacheservice/cache.go create mode 100644 flyteadmin/pkg/rpc/cacheservice/metrics.go diff --git a/flyteadmin/go.mod b/flyteadmin/go.mod index eb30f352be..9b3a961aae 100644 --- a/flyteadmin/go.mod +++ b/flyteadmin/go.mod @@ -2,6 +2,13 @@ module github.com/flyteorg/flyteadmin go 1.18 +replace ( + github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 + github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 + github.com/flyteorg/flytepropeller => github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215161838-a505ae7f1062 + github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf +) + require ( cloud.google.com/go/iam v0.3.0 cloud.google.com/go/storage v1.22.0 @@ -198,9 +205,9 @@ require ( github.com/imdario/mergo v0.3.13 // indirect github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 // indirect github.com/prometheus/common v0.32.1 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.19.1 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.8.0 // indirect + go.uber.org/zap v1.21.0 // indirect k8s.io/klog/v2 v2.60.1 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect diff --git a/flyteadmin/go.sum b/flyteadmin/go.sum index 5d9e68acf8..454a6f2902 100644 --- a/flyteadmin/go.sum +++ b/flyteadmin/go.sum @@ -10,6 +10,7 @@ cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxK cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= @@ -17,7 +18,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.66.0/go.mod h1:dgqGAjKCDxyhGTtC9dAREQGUJpkceNm1yt590Qno0Ko= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= @@ -51,6 +51,7 @@ cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLq cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= @@ -68,68 +69,71 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.12.0/go.mod h1:fFLk2dp2oAhDz8QFKwqrjdJvxSp/W2g7nillojlL5Ho= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8= cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE= contrib.go.opencensus.io/exporter/stackdriver v0.13.1/go.mod h1:z2tyTZtPmQ2HvWH4cOmVDgtY+1lomfKdbLnkJvZdc8c= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-sdk-for-go v62.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo= github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.0/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 h1:3CVsSo4mp8NDWO11tHzN/mdo2zP0CtaSK5IcwBjfqRA= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0= github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0 h1:NVS/4LOQfkBpk+B1VopIzv1ptmYeEskA8w/3K/w7vjo= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0/go.mod h1:RG0cZndeZM17StwohYclmcXSr4oOJ8b1I5hB8llIc6Y= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 h1:Px2KVERcYEg2Lv25AqC2hVr0xUWaq94wuEObLIkYzmA= github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2/go.mod h1:CdSJQNNzZhCkwDaV27XV1w48ZBPtxe7mlrZAsPNxD5g= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 h1:0nJeKDmB7a1a8RDMjTltahlPsaNlWjq/LpkZleSwINk= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0/go.mod h1:mbwxKc/fW+IkF0GG591MuXw0KuEQBDkeRoZ9vmVJPxg= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= +github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.10/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= +github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ= github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c= +github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.4.1+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.0.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20191210083620-6965a1cfed68/go.mod h1:gMGUEe16aZh0QN941HgDjwrdjU4iTthPoz2/AtDRADE= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295/go.mod h1:e0aH495YLkrsIe9fhedd6aSR6fgU/qhKvtroi6y7G/M= +github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20200723154620-6f35a1152625/go.mod h1:6PnrZv6zUDkrNMw0mIoGRmGBR7i9LulhKPmxFq4rUiM= +github.com/Jeffail/gabs/v2 v2.5.1/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -144,8 +148,11 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Selvatico/go-mocket v1.0.7 h1:sXuFMnMfVL9b/Os8rGXPgbOFbr4HJm8aHsulD/uMTUk= @@ -156,8 +163,9 @@ github.com/Shopify/sarama v1.26.4 h1:+17TxUq/PJEAfZAll0T7XJjSgQWCpaQSoki/x5yN8o8 github.com/Shopify/sarama v1.26.4/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/adammck/venv v0.0.0-20160819025605-8a9c907a37d3/go.mod h1:3zXR2a/VSQndtpShh783rUTaEA2mpqN2VqZclBARBc0= +github.com/adammck/venv v0.0.0-20200610172036-e77789703e7c/go.mod h1:3zXR2a/VSQndtpShh783rUTaEA2mpqN2VqZclBARBc0= +github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -165,33 +173,39 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.23.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d/go.mod h1:mZUP7GJmjiWtf8v3FD1X/QdK08BqyeH/1Ejt0qhNzCs= github.com/aws/aws-sdk-go v1.23.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.31.3/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.37.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.37.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.44.2 h1:5VBk5r06bgxgRKVaUtm1/4NT/rtrnH2E4cnAYv5zgQc= github.com/aws/aws-sdk-go v1.44.2/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aws/aws-sdk-go-v2 v1.0.0/go.mod h1:smfAbmpW+tcRVuNUjo3MOArSZmW72t62rkCzc2i0TWM= +github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= +github.com/aws/aws-sdk-go-v2/config v1.0.0/go.mod h1:WysE/OpUgE37tjtmtJd8GXgT8s1euilE5XtUkRNUQ1w= +github.com/aws/aws-sdk-go-v2/credentials v1.0.0/go.mod h1:/SvsiqBf509hG4Bddigr3NB12MIpfHhZapyBurJe8aY= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.0/go.mod h1:wpMHDCXvOXZxGCRSidyepa8uJHY4vaBGfY2/+oKU/Bc= +github.com/aws/aws-sdk-go-v2/service/athena v1.0.0/go.mod h1:qY8QFbemf2ceqweXcS6hQqiiIe1z42WqTvHsK2Lb0rE= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.0/go.mod h1:3jExOmpbjgPnz2FJaMOfbSk1heTkZ66aD3yNtVhnjvI= +github.com/aws/aws-sdk-go-v2/service/sts v1.0.0/go.mod h1:5f+cELGATgill5Pu3/vK3Ebuigstc+qYEHW5MvGWZO4= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= +github.com/aws/smithy-go v1.0.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= +github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -203,12 +217,22 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMpKRTsX2FjEIP2WCWrdOAfvg9nwoObBkJCCnksQaM= +github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 h1:Qxsd2LWl44bfLn75MHrPv32P1PhPZ9fajg39eHZ/a7g= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081/go.mod h1:ZbZVBxEWh8Icj1AgfNKg0uPzHHGd9twa4eWcY2Yt6xE= +github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215161838-a505ae7f1062 h1:YsvNz+6O3EJ4+SmuNvaVDly28i/srudS4TVk9GxqUms= +github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215161838-a505ae7f1062/go.mod h1:8TkbXE8oinqU+FBgUWUeewr6X40GpGpVxodiKxGuXGY= +github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf h1:tKQlA5yx6BVA9W2zJl60b60nTOgZKTP8Uk9xIQfhDMA= +github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY= +github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bmatcuk/doublestar/v2 v2.0.3/go.mod h1:QMmcs3H2AUQICWhfzLXz+IYln8lRQmTZRptLie8RgRw= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737 h1:rRISKWyXfVxvoa702s91Zl5oREZTrR3yv+tXrrX7G/g= github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= @@ -226,7 +250,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.8.0 h1:hRguaVL9rVsO8PMOpKSZ5gYZ2kjGRCvuKw4yMlfsBtg= github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.8.0/go.mod h1:Ba4CS2d+naAK8tGd6nm5ftGIWuHim+1lryAaIxhuh1k= @@ -273,9 +298,9 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -300,9 +325,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= -github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= -github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -318,7 +343,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= @@ -339,12 +363,15 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4= +github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= +github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= +github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= @@ -352,16 +379,6 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= 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.2.5 h1:oPs0PX9opR9JtWjP5ZH2YMChkbGGL45PIy+90FlaxYc= -github.com/flyteorg/flyteidl v1.2.5/go.mod h1:OJAq333OpInPnMhvVz93AlEjmlQ+t0FAD4aakIYE4OU= -github.com/flyteorg/flyteplugins v1.0.20 h1:8ZGN2c0iaZa3d/UmN2VYozLBRhthAIO48aD5g8Wly7s= -github.com/flyteorg/flyteplugins v1.0.20/go.mod h1:ZbZVBxEWh8Icj1AgfNKg0uPzHHGd9twa4eWcY2Yt6xE= -github.com/flyteorg/flytepropeller v1.1.51 h1:ITPH2Fqx+/1hKBFnfb6Rawws3VbEJ3tQ/1tQXSIXvcQ= -github.com/flyteorg/flytepropeller v1.1.51/go.mod h1:zstMUz30mIskZB4uMkObzOj3CjsGfXIV/+nVxlOmI7I= -github.com/flyteorg/flytestdlib v1.0.0/go.mod h1:QSVN5wIM1lM9d60eAEbX7NwweQXW96t5x4jbyftn89c= -github.com/flyteorg/flytestdlib v1.0.14 h1:P6hy9yVrIEUxp4JaxV7/KwTSTYjHGizQu1fKXYkq9Y8= -github.com/flyteorg/flytestdlib v1.0.14/go.mod h1:nIBmBHtjTJvhZEn3e/EwVC/iMkR2tUX8hEiXjRBpH/s= -github.com/flyteorg/stow v0.3.3/go.mod h1:HBld7ud0i4khMHwJjkO8v+NSP7ddKa/ruhf4I8fliaA= github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk= github.com/flyteorg/stow v0.3.6/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -370,8 +387,6 @@ github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o= github.com/frankban/quicktest v1.10.0 h1:Gfh+GAJZOAoKZsIZeZbdn2JF10kN1XHNvjsvQK8gVkE= @@ -385,6 +400,8 @@ github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49P github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -393,37 +410,76 @@ github.com/go-gormigrate/gormigrate/v2 v2.0.0 h1:e2A3Uznk4viUC4UuemuVgsNnvYZyOA8 github.com/go-gormigrate/gormigrate/v2 v2.0.0/go.mod h1:YuVJ+D/dNt4HWrThTBnjgZuRbt7AuwINeg4q52ZE3Jw= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= +github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= +github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= +github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= +github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= +github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= +github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= +github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= +github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= +github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= +github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= +github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-redis/redis v6.15.7+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= github.com/gobuffalo/attrs v0.1.0/go.mod h1:fmNpaWyHM0tRm8gCZWKx8yY9fvaNLo2PyzBNSrBZ5Hw= @@ -672,6 +728,7 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ= @@ -701,6 +758,7 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -727,6 +785,7 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= @@ -765,12 +824,12 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -789,10 +848,16 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181004151105-1babbf986f6f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -831,22 +896,31 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69 h1:7xsUJsB2NrdcttQPa7JLEaGzvdbk7KvfrjgHZXOQRo0= github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69/go.mod h1:YLEMZOtU+AZ7dhN9T/IpGhXVGly2bvkJQ+zxj3WeVQo= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -856,18 +930,22 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -937,6 +1015,7 @@ github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.2.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jarcoal/httpmock v1.2.0/go.mod h1:oCoTsnAz4+UoOUIf5lJOWV2QQIW5UoeUI6aM2YnWAZk= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= @@ -970,6 +1049,7 @@ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -1005,9 +1085,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -1015,7 +1094,10 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kubeflow/common v0.4.3/go.mod h1:Qb/5aON7/OWVkN8OnjRqqT0i8X/XzMekRIZ8lkLosj4= +github.com/kubeflow/training-operator v1.5.0-rc.0/go.mod h1:xgcu/ZI/RwKbTvYgzU7ZWFpxbsefSey5We3KmKroALY= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lestrrat-go/backoff/v2 v2.0.7 h1:i2SeK33aOFJlUNJZzf2IpXRBvqBBnaGXfY5Xaop/GsE= github.com/lestrrat-go/backoff/v2 v2.0.7/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= github.com/lestrrat-go/codegen v1.0.0/go.mod h1:JhJw6OQAuPEfVKUCLItpaVLumDGWQznd1VaXrBk9TdM= @@ -1038,18 +1120,20 @@ github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/luna-duclos/instrumentedsql v0.0.0-20181127104832-b7d587d28109/go.mod h1:PWUIzhtavmOR965zfawVsHXbEuU1G29BPZ/CB3C7jXk= github.com/luna-duclos/instrumentedsql v1.1.2/go.mod h1:4LGbEqDnopzNAiyxPPDXhLspyunZxgPTMJBKtC6U0BQ= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/deplist v1.0.4/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM= @@ -1078,7 +1162,6 @@ github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcncea github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= @@ -1088,6 +1171,7 @@ github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= @@ -1105,10 +1189,14 @@ github.com/mattn/goveralls v0.0.6/go.mod h1:h8b4ow6FxSPMQHF6o2ve3qsclnffZjYTNEKm github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/maxatome/go-testdeep v1.11.0/go.mod h1:011SgQ6efzZYAen6fDn4BqQ+lUR72ysdyKe7Dyogw70= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -1123,6 +1211,8 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= +github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= @@ -1135,6 +1225,7 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGEJq24YyJ2ban8EO0RUVSJlF1pGsEvoLEACr/Q= +github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/moul/http2curl v0.0.0-20170919181001-9ac6cf4d929b/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= @@ -1142,23 +1233,15 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/ncw/swift v1.0.49/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks= github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/oleiade/reflections v1.0.0 h1:0ir4pc6v8/PJ0yw5AEtMddfXpWBXg9cnG7SgSoJuCgY= github.com/oleiade/reflections v1.0.0/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w= @@ -1173,7 +1256,12 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1182,22 +1270,24 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.6.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/ory/analytics-go/v4 v4.0.0/go.mod h1:FMx9cLRD9xN+XevPvZ5FDMfignpmcqPP6FUKnJ9/MmE= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/ory/dockertest/v3 v3.5.4/go.mod h1:J8ZUbNB2FOhm1cFZW9xBpDsODqsSWcyYgtJYVPcnF70= @@ -1224,25 +1314,23 @@ github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g= github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162 h1:xE/UBmmMlInTvlgGXUyo+VeZAcWU5gyWb/xh6jmBWsI= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= -github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0= github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= @@ -1255,57 +1343,52 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.10.0/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 h1:0XM1XL/OFFJjXsYXlG30spTkV/E9+gmd5GD1w2HE8xM= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= +github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v0.9.4/go.mod h1:oCXIBxdI62A4cR6aTRJCgetEjecSIYzOEaeAn4iYEpM= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c/go.mod h1:uLBlYqsCS2nsKiVlxJxI5EVgq8CrqNeHDP5uq3hde+c= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= @@ -1329,7 +1412,7 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpOAnclKvg+mdA= github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4= github.com/santhosh-tekuri/jsonschema/v2 v2.1.0/go.mod h1:yzJzKUGV4RbWqWIBBP4wSOBqavX5saE02yirLS0OTyg= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= @@ -1377,7 +1460,6 @@ github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:X github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= @@ -1386,7 +1468,6 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.2.0/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.2/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= @@ -1400,8 +1481,8 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -1419,14 +1500,12 @@ github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/spf13/viper v1.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44= github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk= github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518/go.mod h1:CKI4AZ4XmGV240rTHfO0hfE83S6/a3/Q1siZJ/vXf7A= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -1452,6 +1531,7 @@ github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDW github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= @@ -1464,11 +1544,10 @@ github.com/unionai/cron/v3 v3.0.2-0.20210825070134-bfc34418fe84/go.mod h1:eQICP3 github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA= github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= +github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -1480,7 +1559,9 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.elastic.co/apm v1.8.0/go.mod h1:tCw6CkOJgkWnzEthFN9HUP1uL3Gjc/Ur6m7gRPLaoH0= @@ -1489,20 +1570,26 @@ go.elastic.co/apm/module/apmot v1.8.0/go.mod h1:Q5Xzabte8G/fkvDjr1jlDuOSUt9hkVWN go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.2/go.mod h1:2D7ZejHVMIfog1221iLSYlQRzrtECw3kz4I4VAQm3qI= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= @@ -1510,7 +1597,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= @@ -1532,24 +1618,31 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180830192347-182538f80094/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1567,7 +1660,9 @@ golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190102171810-8d7daa0c54b3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -1575,28 +1670,36 @@ golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200320181102-891825fb96df/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1643,6 +1746,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1661,9 +1766,9 @@ golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181207154023-610586996380/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1677,6 +1782,7 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1693,7 +1799,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -1705,6 +1810,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -1716,6 +1823,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1727,14 +1836,15 @@ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -1753,6 +1863,7 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1772,14 +1883,15 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181106135930-3a76605856fd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181206074257-70b957f3b65e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190102155601-82a175fd1598/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190116161447-11f53e031339/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1793,14 +1905,17 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1824,19 +1939,20 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1852,11 +1968,14 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1864,14 +1983,21 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1886,19 +2012,17 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181003024731-2f84ea8ef872/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181006002542-f60d9635b16a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181008205924-a2b3f7f249e9/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181013182035-5e66757b835f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181017214349-06f26fdaaa28/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181024171208-a2dc47679d30/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1920,6 +2044,7 @@ golang.org/x/tools v0.0.0-20190104182027-498d95493402/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190111214448-fc1d57b08d7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190118193359-16909d206f00/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1933,6 +2058,7 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190613204242-ed0dc450797f/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624190245-7f2218787638/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1940,7 +2066,9 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190711191110-9a621aea19f8/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1969,26 +2097,25 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200721223218-6123e77877b2/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1999,8 +2126,10 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2012,14 +2141,15 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= +gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20191229114700-bbb4dff026f8/go.mod h1:2IgXn/sJaRbePPBA1wRj8OE+QLvVaH0q8SK6TSTKlnk= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= gonum.org/v1/plot v0.0.0-20200111075622-4abb28f724d5/go.mod h1:+HbaZVpsa73UwN7kXGCECULRHovLRJjH+t5cFPgxErs= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -2038,14 +2168,12 @@ google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo= -google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.38.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= @@ -2054,6 +2182,7 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= @@ -2078,7 +2207,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190626174449-989357319d63/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= @@ -2108,10 +2236,7 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2119,7 +2244,6 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210302174412-5ede27ff9881/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2144,6 +2268,8 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -2164,7 +2290,6 @@ google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 h1:G1IeWbjrqEq9ChWxEuRPJu6laA67+XgTFHVSAvepr38= google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -2183,7 +2308,6 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= @@ -2225,13 +2349,11 @@ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/mold.v2 v2.2.0/go.mod h1:XMyyRsGtakkDPbxXbrA5VODo6bUXyvoDjLd5l3T0XoA= @@ -2257,7 +2379,7 @@ gopkg.in/jcmturner/gokrb5.v7 v7.5.0 h1:a9tsXlIDD9SKxotJMK3niV7rPZAJeX2aD/0yg3qlI gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/kothar/go-backblaze.v0 v0.0.0-20190520213052-702d4e7eb465/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE= +gopkg.in/kothar/go-backblaze.v0 v0.0.0-20210124194846-35409b867216/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE= gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= @@ -2268,7 +2390,6 @@ gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -2280,6 +2401,7 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -2304,7 +2426,6 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2313,37 +2434,83 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= -k8s.io/api v0.0.0-20210217171935-8e2decd92398/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78= -k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= +k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= +k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= +k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= +k8s.io/api v0.19.6/go.mod h1:Plxx44Nh4zVblkJrIgxVPgPre1mvng6tXf1Sj3bs0fU= +k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg= +k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I= k8s.io/api v0.24.1 h1:BjCMRDcyEYz03joa3K1+rbshwh1Ay6oB53+iUx2H8UY= k8s.io/api v0.24.1/go.mod h1:JhoOvNiLXKTPQ60zh2g0ewpA+bnEYf5q44Flhquh4vQ= +k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= +k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= +k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4= +k8s.io/apiextensions-apiserver v0.24.0/go.mod h1:iuVe4aEpe6827lvO6yWQVxiPSpPoSKVjkq+MIdg84cM= k8s.io/apiextensions-apiserver v0.24.1 h1:5yBh9+ueTq/kfnHQZa0MAo6uNcPrtxPMpNQgorBaKS0= k8s.io/apiextensions-apiserver v0.24.1/go.mod h1:A6MHfaLDGfjOc/We2nM7uewD5Oa/FnEbZ6cD7g2ca4Q= -k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY= +k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= +k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= +k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= +k8s.io/apimachinery v0.19.6/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= +k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.24.1 h1:ShD4aDxTQKN5zNf8K1RQ2u98ELLdIW7jEnlO9uAMX/I= k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= +k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= +k8s.io/apiserver v0.19.6/go.mod h1:05XquZxCDzQ27ebk7uV2LrFIK4lm5Yt47XkkUvLAoAM= +k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4= +k8s.io/apiserver v0.24.0/go.mod h1:WFx2yiOMawnogNToVvUYT9nn1jaIkMKj41ZYCVycsBA= k8s.io/apiserver v0.24.1/go.mod h1:dQWNMx15S8NqJMp0gpYfssyvhYnkilc1LpExd/dkLh0= -k8s.io/client-go v0.0.0-20210217172142-7279fc64d847/go.mod h1:q0EaghmVye2uui19vxSZ2NG6ssgUWgjudO6vrwXneSI= +k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= +k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= +k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= +k8s.io/client-go v0.19.6/go.mod h1:gEiS+efRlXYUEQ9Oz4lmNXlxAl5JZ8y2zbTDGhvXXnk= +k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA= +k8s.io/client-go v0.24.0/go.mod h1:VFPQET+cAFpYxh6Bq6f4xyMY80G6jKKktU6G0m00VDw= k8s.io/client-go v0.24.1 h1:w1hNdI9PFrzu3OlovVeTnf4oHDt+FJLd9Ndluvnb42E= k8s.io/client-go v0.24.1/go.mod h1:f1kIDqcEYmwXS/vTbbhopMUbhKp2JhOeVTfxgaCIlF8= +k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= +k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= +k8s.io/code-generator v0.19.6/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= +k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE= +k8s.io/code-generator v0.24.0/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/code-generator v0.24.1/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= +k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= +k8s.io/component-base v0.19.6/go.mod h1:8Btsf8J00/fVDa/YFmXjei7gVkcFrlKZXjSeP4SZNJg= +k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI= +k8s.io/component-base v0.24.0/go.mod h1:Dgazgon0i7KYUsS8krG8muGiMVtUZxG037l1MKyXgrA= k8s.io/component-base v0.24.1 h1:APv6W/YmfOWZfo+XJ1mZwep/f7g7Tpwvdbo9CQLDuts= k8s.io/component-base v0.24.1/go.mod h1:DW5vQGYVCog8WYpNob3PMmmsY8A3L9QZNg4j/dV3s38= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= @@ -2355,18 +2522,29 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= +sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E= +sigs.k8s.io/controller-runtime v0.11.1/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/controller-runtime v0.12.1 h1:4BJY01xe9zKQti8oRjj/NeHKRXthf1YkYJAgLONFFoI= sigs.k8s.io/controller-runtime v0.12.1/go.mod h1:BKhxlA4l7FPK4AQcsuL4X6vZeWnKDXez/vp1Y8dxTU0= +sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 h1:2sgAQQcY0dEW2SsQwTXhQV4vO6+rSslYx8K3XmM5hqQ= sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +volcano.sh/apis v1.2.0-k8s1.19.6/go.mod h1:UaeJ/s5Hyd+ZhFLc+Kw9YlgM8gRZ/5OzXqHa0yKOoXY= diff --git a/flyteadmin/pkg/manager/impl/cache_manager.go b/flyteadmin/pkg/manager/impl/cache_manager.go new file mode 100644 index 0000000000..8e4039db47 --- /dev/null +++ b/flyteadmin/pkg/manager/impl/cache_manager.go @@ -0,0 +1,463 @@ +package impl + +import ( + "context" + "strings" + "time" + + "github.com/golang/protobuf/proto" + "github.com/prometheus/client_golang/prometheus" + + "github.com/flyteorg/flyteadmin/pkg/manager/impl/shared" + "github.com/flyteorg/flyteadmin/pkg/manager/impl/util" + "github.com/flyteorg/flyteadmin/pkg/manager/impl/validation" + "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + repoInterfaces "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyteadmin/pkg/repositories/transformers" + runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" + "github.com/flyteorg/flytestdlib/catalog/datacatalog" + "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flytestdlib/promutils" +) + +var ( + _ interfaces.CacheInterface = &CacheManager{} +) + +var sortByCreatedAtAsc = &admin.Sort{Key: shared.CreatedAt, Direction: admin.Sort_ASCENDING} + +const ( + nodeExecutionLimit = 10000 + taskExecutionLimit = 10000 + reservationHeartbeat = 10 * time.Second +) + +type cacheMetrics struct { + Scope promutils.Scope + CacheEvictionTime promutils.StopWatch + CacheEvictionSuccess prometheus.Counter + CacheEvictionFailures prometheus.Counter +} + +type CacheManager struct { + db repoInterfaces.Repository + config runtimeInterfaces.Configuration + catalogClient catalog.Client + metrics cacheMetrics +} + +func (m *CacheManager) EvictExecutionCache(ctx context.Context, req service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { + if err := validation.ValidateWorkflowExecutionIdentifier(req.GetWorkflowExecutionId()); err != nil { + logger.Debugf(ctx, "EvictExecutionCache request [%+v] failed validation with err: %v", req, err) + return nil, err + } + + ctx = getExecutionContext(ctx, req.WorkflowExecutionId) + + executionModel, err := util.GetExecutionModel(ctx, m.db, *req.WorkflowExecutionId) + if err != nil { + logger.Debugf(ctx, "Failed to get workflow execution model for workflow execution ID %+v: %v", req.WorkflowExecutionId, err) + return nil, err + } + + logger.Debugf(ctx, "Starting to evict cache for execution %d of workflow %+v", executionModel.ID, req.WorkflowExecutionId) + + nodeExecutions, err := m.listAllNodeExecutionsForWorkflow(ctx, req.WorkflowExecutionId, "") + if err != nil { + logger.Debugf(ctx, "Failed to list all node executions for execution %d of workflow %+v: %v", executionModel.ID, req.WorkflowExecutionId, err) + return nil, err + } + + var evictionErrors []*core.CacheEvictionError + for _, nodeExecution := range nodeExecutions { + evictionErrors = m.evictNodeExecutionCache(ctx, nodeExecution, evictionErrors) + } + + logger.Debugf(ctx, "Finished evicting cache for execution %d of workflow %+v", executionModel.ID, req.WorkflowExecutionId) + return &service.EvictCacheResponse{ + Errors: &core.CacheEvictionErrorList{Errors: evictionErrors}, + }, nil +} + +func (m *CacheManager) EvictTaskExecutionCache(ctx context.Context, req service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { + if err := validation.ValidateTaskExecutionIdentifier(req.GetTaskExecutionId()); err != nil { + logger.Debugf(ctx, "EvictTaskExecutionCache request [%+v] failed validation with err: %v", req, err) + return nil, err + } + + ctx = getTaskExecutionContext(ctx, req.TaskExecutionId) + + // Sanity check to ensure referenced task execution exists although only encapsulated node execution is strictly required + _, err := util.GetTaskExecutionModel(ctx, m.db, req.TaskExecutionId) + if err != nil { + logger.Debugf(ctx, "Failed to get task execution model for task execution ID %+v: %v", req.TaskExecutionId, err) + return nil, err + } + + logger.Debugf(ctx, "Starting to evict cache for execution %+v of task %+v", req.TaskExecutionId, req.TaskExecutionId.TaskId) + + nodeExecutionModel, err := util.GetNodeExecutionModel(ctx, m.db, req.TaskExecutionId.NodeExecutionId) + if err != nil { + logger.Debugf(ctx, "Failed to get node execution model for node execution ID %+v: %v", req.TaskExecutionId.NodeExecutionId, err) + return nil, err + } + + evictionErrors := m.evictNodeExecutionCache(ctx, *nodeExecutionModel, nil) + + logger.Debugf(ctx, "Finished evicting cache for execution %+v of task %+v", req.TaskExecutionId, req.TaskExecutionId.TaskId) + return &service.EvictCacheResponse{ + Errors: &core.CacheEvictionErrorList{Errors: evictionErrors}, + }, nil +} + +func (m *CacheManager) evictNodeExecutionCache(ctx context.Context, nodeExecutionModel models.NodeExecution, + evictionErrors []*core.CacheEvictionError) []*core.CacheEvictionError { + if strings.HasSuffix(nodeExecutionModel.NodeID, v1alpha1.StartNodeID) || strings.HasSuffix(nodeExecutionModel.NodeID, v1alpha1.EndNodeID) { + return evictionErrors + } + + nodeExecution, err := transformers.FromNodeExecutionModel(nodeExecutionModel) + if err != nil { + logger.Warnf(ctx, "Failed to transform node execution model %+v: %v", + nodeExecutionModel.NodeExecutionKey, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: nodeExecutionModel.NodeID, + ExecutionId: &core.WorkflowExecutionIdentifier{ + Project: nodeExecutionModel.NodeExecutionKey.ExecutionKey.Project, + Domain: nodeExecutionModel.NodeExecutionKey.ExecutionKey.Domain, + Name: nodeExecutionModel.NodeExecutionKey.ExecutionKey.Name, + }, + }, + Code: core.CacheEvictionError_INTERNAL, + Message: "Internal error", + }) + return evictionErrors + } + + logger.Debugf(ctx, "Starting to evict cache for node execution %+v", nodeExecution.Id) + t := m.metrics.CacheEvictionTime.Start() + defer t.Stop() + + if nodeExecution.Metadata.IsParentNode { + var childNodeExecutions []models.NodeExecution + if nodeExecution.Metadata.IsDynamic { + var err error + childNodeExecutions, err = m.listAllNodeExecutionsForWorkflow(ctx, nodeExecution.Id.ExecutionId, nodeExecution.Id.NodeId) + if err != nil { + logger.Warnf(ctx, "Failed to list child node executions for dynamic node execution %+v: %v", + nodeExecution.Id, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_WorkflowExecutionId{ + WorkflowExecutionId: nodeExecution.Id.ExecutionId, + }, + Code: core.CacheEvictionError_INTERNAL, + Message: "Failed to list child node executions", + }) + return evictionErrors + } + } else { + childNodeExecutions = nodeExecutionModel.ChildNodeExecutions + } + for _, childNodeExecution := range childNodeExecutions { + evictionErrors = m.evictNodeExecutionCache(ctx, childNodeExecution, evictionErrors) + } + } + + taskExecutions, err := m.listAllTaskExecutions(ctx, nodeExecution.Id) + if err != nil { + logger.Warnf(ctx, "Failed to list task executions for node execution %+v: %v", + nodeExecution.Id, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_WorkflowExecutionId{ + WorkflowExecutionId: nodeExecution.Id.ExecutionId, + }, + Code: core.CacheEvictionError_INTERNAL, + Message: "Failed to list task executions", + }) + return evictionErrors + } + + switch md := nodeExecution.GetClosure().GetTargetMetadata().(type) { + case *admin.NodeExecutionClosure_TaskNodeMetadata: + for _, taskExecutionModel := range taskExecutions { + taskExecution, err := transformers.FromTaskExecutionModel(taskExecutionModel) + if err != nil { + logger.Warnf(ctx, "Failed to transform task execution model %+v: %v", + taskExecutionModel.TaskExecutionKey, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_TaskExecutionId{ + TaskExecutionId: taskExecution.Id, + }, + Code: core.CacheEvictionError_INTERNAL, + Message: "Internal error", + }) + return evictionErrors + } + + evictionErrors = m.evictTaskNodeExecutionCache(ctx, nodeExecutionModel, nodeExecution, taskExecution, + md.TaskNodeMetadata, evictionErrors) + } + case *admin.NodeExecutionClosure_WorkflowNodeMetadata: + evictionErrors = m.evictWorkflowNodeExecutionCache(ctx, nodeExecution, md.WorkflowNodeMetadata, evictionErrors) + default: + logger.Errorf(ctx, "Invalid target metadata type %T for node execution closure %+v for node execution %+v", + md, md, nodeExecution.Id) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_WorkflowExecutionId{ + WorkflowExecutionId: nodeExecution.Id.ExecutionId, + }, + Code: core.CacheEvictionError_INTERNAL, + Message: "Internal error", + }) + } + + return evictionErrors +} + +func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExecutionModel models.NodeExecution, + nodeExecution *admin.NodeExecution, taskExecution *admin.TaskExecution, + taskNodeMetadata *admin.TaskNodeMetadata, evictionErrors []*core.CacheEvictionError) []*core.CacheEvictionError { + if taskNodeMetadata == nil || (taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_HIT && + taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_POPULATED) { + logger.Debugf(ctx, "Node execution %+v did not contain cached data, skipping cache eviction", + nodeExecution.Id) + return evictionErrors + } + + datasetID := datacatalog.IdentifierToDatasetID(taskNodeMetadata.GetCatalogKey().GetDatasetId()) + artifactTag := taskNodeMetadata.GetCatalogKey().GetArtifactTag().GetName() + artifactID := taskNodeMetadata.GetCatalogKey().GetArtifactTag().GetArtifactId() + ownerID := taskExecution.GetClosure().GetMetadata().GetGeneratedName() + + reservation, err := m.catalogClient.GetOrExtendReservationByArtifactTag(ctx, datasetID, artifactTag, ownerID, + reservationHeartbeat) + if err != nil { + logger.Warnf(ctx, + "Failed to acquire reservation for artifact with tag %q for dataset %+v of node execution %+v: %v", + artifactTag, datasetID, nodeExecution.Id, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_TaskExecutionId{ + TaskExecutionId: taskExecution.Id, + }, + Code: core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, + Message: "Failed to acquire reservation for artifact", + }) + return evictionErrors + } + + if len(reservation.GetOwnerId()) == 0 { + logger.Debugf(ctx, "Received empty owner ID for artifact of node execution %+v, assuming NOOP catalog, skipping cache eviction", + nodeExecution.Id) + return evictionErrors + } else if reservation.GetOwnerId() != ownerID { + logger.Debugf(ctx, "Artifact of node execution %+v is reserved by different owner, cannot evict cache", + nodeExecution.Id) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_TaskExecutionId{ + TaskExecutionId: taskExecution.Id, + }, + Code: core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, + Message: "Artifact is reserved by different owner", + }) + return evictionErrors + } + + selectedFields := []string{shared.CreatedAt} + nodeExecutionModel.CacheStatus = nil + + taskNodeMetadata.CacheStatus = core.CatalogCacheStatus_CACHE_DISABLED + taskNodeMetadata.CatalogKey = nil + nodeExecution.Closure.TargetMetadata = &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: taskNodeMetadata, + } + + marshaledClosure, err := proto.Marshal(nodeExecution.Closure) + if err != nil { + logger.Warnf(ctx, "Failed to marshal updated closure for node execution %+v: err", + nodeExecution.Id, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_TaskExecutionId{ + TaskExecutionId: taskExecution.Id, + }, + Code: core.CacheEvictionError_INTERNAL, + Message: "Failed to marshal updated node execution closure", + }) + return evictionErrors + } + + nodeExecutionModel.Closure = marshaledClosure + selectedFields = append(selectedFields, shared.Closure) + + if err := m.db.NodeExecutionRepo().UpdateSelected(ctx, &nodeExecutionModel, selectedFields); err != nil { + logger.Warnf(ctx, "Failed to update node execution model %+v before deleting artifact: %v", + nodeExecution.Id, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_TaskExecutionId{ + TaskExecutionId: taskExecution.Id, + }, + Code: core.CacheEvictionError_DATABASE_UPDATE_FAILED, + Message: "Failed to update node execution", + }) + return evictionErrors + } + + if err := m.catalogClient.DeleteByArtifactID(ctx, datasetID, artifactID); err != nil { + if catalog.IsNotFound(err) { + logger.Debugf(ctx, "Artifact with ID %s for dataset %+v of node execution %+v not found, assuming already deleted by previous eviction. Skipping...", + artifactID, datasetID, nodeExecution.Id) + } else { + logger.Warnf(ctx, "Failed to delete artifact with ID %s for dataset %+v of node execution %+v: %v", + artifactID, datasetID, nodeExecution.Id, err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_TaskExecutionId{ + TaskExecutionId: taskExecution.Id, + }, + Code: core.CacheEvictionError_ARTIFACT_DELETE_FAILED, + Message: "Failed to delete artifact", + }) + return evictionErrors + } + } + + if err := m.catalogClient.ReleaseReservationByArtifactTag(ctx, datasetID, artifactTag, ownerID); err != nil { + logger.Warnf(ctx, "Failed to release reservation for artifact of node execution %+v, cannot evict cache", + nodeExecution.Id) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_TaskExecutionId{ + TaskExecutionId: taskExecution.Id, + }, + Code: core.CacheEvictionError_RESERVATION_NOT_RELEASED, + Message: "Failed to release reservation for artifact", + }) + return evictionErrors + } + + logger.Debugf(ctx, "Successfully evicted cache for task node execution %+v", nodeExecution.Id) + m.metrics.CacheEvictionSuccess.Inc() + + return evictionErrors +} + +func (m *CacheManager) evictWorkflowNodeExecutionCache(ctx context.Context, nodeExecution *admin.NodeExecution, + workflowNodeMetadata *admin.WorkflowNodeMetadata, evictionErrors []*core.CacheEvictionError) []*core.CacheEvictionError { + if workflowNodeMetadata == nil { + logger.Debugf(ctx, "Node execution %+v did not contain cached data, skipping cache eviction", + nodeExecution.Id) + return evictionErrors + } + + childNodeExecutions, err := m.listAllNodeExecutionsForWorkflow(ctx, workflowNodeMetadata.GetExecutionId(), "") + if err != nil { + logger.Debugf(ctx, "Failed to list child executions for node execution %+v of workflow %+v: %v", + nodeExecution.Id, workflowNodeMetadata.GetExecutionId(), err) + m.metrics.CacheEvictionFailures.Inc() + evictionErrors = append(evictionErrors, &core.CacheEvictionError{ + NodeExecutionId: nodeExecution.Id, + Source: &core.CacheEvictionError_WorkflowExecutionId{ + WorkflowExecutionId: workflowNodeMetadata.GetExecutionId(), + }, + Code: core.CacheEvictionError_INTERNAL, + Message: "Failed to evict child executions for workflow", + }) + return evictionErrors + } + for _, childNodeExecution := range childNodeExecutions { + evictionErrors = m.evictNodeExecutionCache(ctx, childNodeExecution, evictionErrors) + } + + logger.Debugf(ctx, "Successfully evicted cache for workflow node execution %+v", nodeExecution.Id) + m.metrics.CacheEvictionSuccess.Inc() + + return evictionErrors +} + +func (m *CacheManager) listAllNodeExecutionsForWorkflow(ctx context.Context, + workflowExecutionID *core.WorkflowExecutionIdentifier, uniqueParentID string) ([]models.NodeExecution, error) { + var nodeExecutions []models.NodeExecution + var token string + for { + executions, newToken, err := util.ListNodeExecutionsForWorkflow(ctx, m.db, workflowExecutionID, + uniqueParentID, "", nodeExecutionLimit, token, sortByCreatedAtAsc) + if err != nil { + return nil, err + } + + nodeExecutions = append(nodeExecutions, executions...) + if len(newToken) == 0 { + // empty token is returned once no more node executions are available + break + } + token = newToken + } + + return nodeExecutions, nil +} + +func (m *CacheManager) listAllTaskExecutions(ctx context.Context, nodeExecutionID *core.NodeExecutionIdentifier) ([]models.TaskExecution, error) { + var taskExecutions []models.TaskExecution + var token string + for { + executions, newToken, err := util.ListTaskExecutions(ctx, m.db, nodeExecutionID, "", + taskExecutionLimit, token, sortByCreatedAtAsc) + if err != nil { + return nil, err + } + + taskExecutions = append(taskExecutions, executions...) + if len(newToken) == 0 { + // empty token is returned once no more task executions are available + break + } + token = newToken + } + + return taskExecutions, nil +} + +func NewCacheManager(db repoInterfaces.Repository, config runtimeInterfaces.Configuration, catalogClient catalog.Client, + scope promutils.Scope) interfaces.CacheInterface { + metrics := cacheMetrics{ + Scope: scope, + CacheEvictionTime: scope.MustNewStopWatch("cache_eviction_duration", + "duration taken for evicting the cache of a node execution", time.Millisecond), + CacheEvictionSuccess: scope.MustNewCounter("cache_eviction_success", + "number of times cache eviction for a node execution succeeded"), + CacheEvictionFailures: scope.MustNewCounter("cache_eviction_failures", + "number of times cache eviction for a node execution failed"), + } + + return &CacheManager{ + db: db, + config: config, + catalogClient: catalogClient, + metrics: metrics, + } +} diff --git a/flyteadmin/pkg/manager/impl/cache_manager_test.go b/flyteadmin/pkg/manager/impl/cache_manager_test.go new file mode 100644 index 0000000000..ccf62c841a --- /dev/null +++ b/flyteadmin/pkg/manager/impl/cache_manager_test.go @@ -0,0 +1,8529 @@ +package impl + +import ( + "context" + "errors" + "fmt" + "testing" + + "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + flyteAdminErrors "github.com/flyteorg/flyteadmin/pkg/errors" + "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" + repositoryMocks "github.com/flyteorg/flyteadmin/pkg/repositories/mocks" + "github.com/flyteorg/flyteadmin/pkg/repositories/models" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/event" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" + pluginCatalog "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/catalog/mocks" + "github.com/flyteorg/flytestdlib/catalog" + "github.com/flyteorg/flytestdlib/promutils" +) + +func serializeNodeExecutionMetadata(t *testing.T, nodeExecutionMetadata *admin.NodeExecutionMetaData) []byte { + t.Helper() + marshalled, err := proto.Marshal(nodeExecutionMetadata) + require.NoError(t, err) + return marshalled +} + +func serializeNodeExecutionClosure(t *testing.T, nodeExecutionClosure *admin.NodeExecutionClosure) []byte { + t.Helper() + marshalled, err := proto.Marshal(nodeExecutionClosure) + require.NoError(t, err) + return marshalled +} + +func serializeTaskExecutionClosure(t *testing.T, taskExecutionClosure *admin.TaskExecutionClosure) []byte { + t.Helper() + marshalled, err := proto.Marshal(taskExecutionClosure) + require.NoError(t, err) + return marshalled +} + +func ptr[T any](val T) *T { + return &val +} + +func setupCacheEvictionMockRepositories(t *testing.T, repository interfaces.Repository, executionModel *models.Execution, + nodeExecutionModels []models.NodeExecution, taskExecutionModels map[string][]models.TaskExecution) map[string]int { + if executionModel != nil { + repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) { + assert.Equal(t, executionIdentifier.Domain, input.Domain) + assert.Equal(t, executionIdentifier.Name, input.Name) + assert.Equal(t, executionIdentifier.Project, input.Project) + return *executionModel, nil + }) + } + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) { + for _, nodeExecution := range nodeExecutionModels { + if nodeExecution.NodeID == input.NodeExecutionIdentifier.NodeId { + return nodeExecution, nil + } + } + return models.NodeExecution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.NotFound, "entry not found") + }) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetListCallback( + func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.NodeExecutionCollectionOutput, error) { + var parentID uint + for _, filter := range input.InlineFilters { + if filter.GetField() == "parent_id" { + query, err := filter.GetGormJoinTableQueryExpr("") + require.NoError(t, err) + var ok bool + parentID, ok = query.Args.(uint) + require.True(t, ok) + } + } + if parentID == 0 { + return interfaces.NodeExecutionCollectionOutput{NodeExecutions: nodeExecutionModels}, nil + } + for _, nodeExecution := range nodeExecutionModels { + if nodeExecution.ID == parentID { + return interfaces.NodeExecutionCollectionOutput{NodeExecutions: nodeExecution.ChildNodeExecutions}, nil + } + } + return interfaces.NodeExecutionCollectionOutput{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.NotFound, "entry not found") + }) + + updatedNodeExecutions := make(map[string]int) + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback( + func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error { + assert.Nil(t, nodeExecution.CacheStatus) + + var closure admin.NodeExecutionClosure + err := proto.Unmarshal(nodeExecution.Closure, &closure) + require.NoError(t, err) + md, ok := closure.TargetMetadata.(*admin.NodeExecutionClosure_TaskNodeMetadata) + require.True(t, ok) + require.NotNil(t, md.TaskNodeMetadata) + assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, md.TaskNodeMetadata.CacheStatus) + assert.Nil(t, md.TaskNodeMetadata.CatalogKey) + + updatedNodeExecutions[nodeExecution.NodeID]++ + + for i := range nodeExecutionModels { + if nodeExecutionModels[i].ID == nodeExecution.ID { + nodeExecutionModels[i] = *nodeExecution + break + } + } + return nil + }) + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetListCallback( + func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.TaskExecutionCollectionOutput, error) { + var nodeID string + for _, filter := range input.InlineFilters { + if filter.GetField() == "node_id" { + query, err := filter.GetGormJoinTableQueryExpr("") + require.NoError(t, err) + var ok bool + nodeID, ok = query.Args.(string) + require.True(t, ok) + } + } + require.NotEmpty(t, nodeID) + taskExecutions, ok := taskExecutionModels[nodeID] + require.True(t, ok) + return interfaces.TaskExecutionCollectionOutput{TaskExecutions: taskExecutions}, nil + }) + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.GetTaskExecutionInput) (models.TaskExecution, error) { + for nodeID := range taskExecutionModels { + if nodeID == input.TaskExecutionID.NodeExecutionId.NodeId { + return taskExecutionModels[nodeID][0], nil + } + } + return models.TaskExecution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.NotFound, "entry not found") + }) + + return updatedNodeExecutions +} + +func setupCacheEvictionCatalogClient(t *testing.T, catalogClient *mocks.Client, artifactTags []*core.CatalogArtifactTag, + taskExecutionModels map[string][]models.TaskExecution) map[string]int { + for nodeID := range taskExecutionModels { + for _, taskExecution := range taskExecutionModels[nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID).Return(nil) + } + } + } + + deletedArtifactIDs := make(map[string]int) + for _, artifactTag := range artifactTags { + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, artifactTag.GetArtifactId()). + Run(func(args mock.Arguments) { + deletedArtifactIDs[args.Get(2).(string)] = deletedArtifactIDs[args.Get(2).(string)] + 1 + }). + Return(nil) + } + + return deletedArtifactIDs +} + +func TestEvictExecutionCache(t *testing.T) { + t.Run("single task", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactID := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactID.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("multiple tasks", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[1], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n2", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[2], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + "n1": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n1-0", + }, + }), + }, + }, + "n2": { + { + BaseModel: models.BaseModel{ + ID: 3, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n2-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("single subtask", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[1], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n0-0-n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + if len(taskExecutionModels[nodeID]) > 0 { + assert.Contains(t, updatedNodeExecutions, nodeID) + } else { + assert.NotContains(t, updatedNodeExecutions, nodeID) + } + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("multiple subtasks", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO", + }, + { + ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYP", + }, + { + ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYQ", + }, + { + ArtifactId: "55bbd39e-ff7d-42c8-a03b-bcc5f4019a0f", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYR", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[1], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: false, + SpecNodeId: "n1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[2], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 7, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 8, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1-0-n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[3], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 9, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + { + BaseModel: models.BaseModel{ + ID: 10, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: false, + SpecNodeId: "n2", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[4], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 11, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 12, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2-0-n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[5], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 13, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + { + BaseModel: models.BaseModel{ + ID: 14, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 4, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n1": { + { + BaseModel: models.BaseModel{ + ID: 5, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n1-0-n0-0", + }, + }), + }, + }, + "n2": { + { + BaseModel: models.BaseModel{ + ID: 6, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n2-0-n0-0", + }, + }), + }, + }, + "n0-0-n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n1-0-n0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1-0-n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n1-0-n0-0", + }, + }), + }, + }, + "n2-0-n0": { + { + BaseModel: models.BaseModel{ + ID: 3, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2-0-n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n2-0-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + if len(taskExecutionModels[nodeID]) > 0 { + assert.Contains(t, updatedNodeExecutions, nodeID) + } else { + assert.NotContains(t, updatedNodeExecutions, nodeID) + } + } + assert.Len(t, updatedNodeExecutions, 6) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("single launch plan", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + } + + childExecutionIdentifier := core.WorkflowExecutionIdentifier{ + Project: "project", + Domain: "domain", + Name: "childname", + } + + executionModels := map[string]models.Execution{ + executionIdentifier.Name: { + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + }, + childExecutionIdentifier.Name: { + BaseModel: models.BaseModel{ + ID: 2, + }, + ExecutionKey: models.ExecutionKey{ + Project: childExecutionIdentifier.Project, + Domain: childExecutionIdentifier.Domain, + Name: childExecutionIdentifier.Name, + }, + LaunchPlanID: 7, + WorkflowID: 5, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + }, + } + + nodeExecutionModels := map[string][]models.NodeExecution{ + executionIdentifier.Name: { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: true, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_WorkflowNodeMetadata{ + WorkflowNodeMetadata: &admin.WorkflowNodeMetadata{ + ExecutionId: &childExecutionIdentifier, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + childExecutionIdentifier.Name: { + { + BaseModel: models.BaseModel{ + ID: 7, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: childExecutionIdentifier.Project, + Domain: childExecutionIdentifier.Domain, + Name: childExecutionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 8, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: childExecutionIdentifier.Project, + Domain: childExecutionIdentifier.Domain, + Name: childExecutionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: childExecutionIdentifier.Project, + Domain: childExecutionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[1], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 9, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: childExecutionIdentifier.Project, + Domain: childExecutionIdentifier.Domain, + Name: childExecutionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + } + + taskExecutionModels := map[string]map[string][]models.TaskExecution{ + executionIdentifier.Name: { + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + "n0-0-dn0": {}, + }, + childExecutionIdentifier.Name: { + "n0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "childname-n0-0", + }, + }), + }, + }, + }, + } + + repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) { + execution, ok := executionModels[input.Name] + require.True(t, ok) + return execution, nil + }) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) { + nodeExecutions, ok := nodeExecutionModels[input.NodeExecutionIdentifier.ExecutionId.Name] + require.True(t, ok) + for _, nodeExecution := range nodeExecutions { + if nodeExecution.NodeID == input.NodeExecutionIdentifier.NodeId { + return nodeExecution, nil + } + } + return models.NodeExecution{}, errors.New("not found") + }) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetListCallback( + func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.NodeExecutionCollectionOutput, error) { + var executionName string + var parentID uint + for _, filter := range input.InlineFilters { + if filter.GetField() == "execution_name" { + query, err := filter.GetGormJoinTableQueryExpr("") + require.NoError(t, err) + var ok bool + executionName, ok = query.Args.(string) + require.True(t, ok) + } else if filter.GetField() == "parent_id" { + query, err := filter.GetGormJoinTableQueryExpr("") + require.NoError(t, err) + var ok bool + parentID, ok = query.Args.(uint) + require.True(t, ok) + } + } + + nodeExecutions, ok := nodeExecutionModels[executionName] + require.True(t, ok) + + if parentID == 0 { + return interfaces.NodeExecutionCollectionOutput{NodeExecutions: nodeExecutions}, nil + } + for _, nodeExecution := range nodeExecutions { + if nodeExecution.ID == parentID { + return interfaces.NodeExecutionCollectionOutput{NodeExecutions: nodeExecution.ChildNodeExecutions}, nil + } + } + return interfaces.NodeExecutionCollectionOutput{}, errors.New("not found") + }) + + updatedNodeExecutions := make(map[string]map[string]struct{}) + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback( + func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error { + assert.Nil(t, nodeExecution.CacheStatus) + + var closure admin.NodeExecutionClosure + err := proto.Unmarshal(nodeExecution.Closure, &closure) + require.NoError(t, err) + md, ok := closure.TargetMetadata.(*admin.NodeExecutionClosure_TaskNodeMetadata) + require.True(t, ok) + require.NotNil(t, md.TaskNodeMetadata) + assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, md.TaskNodeMetadata.CacheStatus) + assert.Nil(t, md.TaskNodeMetadata.CatalogKey) + + if _, ok := updatedNodeExecutions[nodeExecution.Name]; !ok { + updatedNodeExecutions[nodeExecution.Name] = make(map[string]struct{}) + } + updatedNodeExecutions[nodeExecution.Name][nodeExecution.NodeID] = struct{}{} + return nil + }) + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetListCallback( + func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.TaskExecutionCollectionOutput, error) { + var executionName string + var nodeID string + for _, filter := range input.InlineFilters { + if filter.GetField() == "execution_name" { + query, err := filter.GetGormJoinTableQueryExpr("") + require.NoError(t, err) + var ok bool + executionName, ok = query.Args.(string) + require.True(t, ok) + } else if filter.GetField() == "node_id" { + query, err := filter.GetGormJoinTableQueryExpr("") + require.NoError(t, err) + var ok bool + nodeID, ok = query.Args.(string) + require.True(t, ok) + } + } + require.NotEmpty(t, nodeID) + taskExecutions, ok := taskExecutionModels[executionName] + require.True(t, ok) + executions, ok := taskExecutions[nodeID] + require.True(t, ok) + return interfaces.TaskExecutionCollectionOutput{TaskExecutions: executions}, nil + }) + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.GetTaskExecutionInput) (models.TaskExecution, error) { + taskExecutions, ok := taskExecutionModels[input.TaskExecutionID.NodeExecutionId.ExecutionId.Name] + require.True(t, ok) + executions, ok := taskExecutions[input.TaskExecutionID.NodeExecutionId.NodeId] + require.True(t, ok) + return executions[0], nil + }) + + for executionName := range taskExecutionModels { + for nodeID := range taskExecutionModels[executionName] { + for _, taskExecution := range taskExecutionModels[executionName][nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionName, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID).Return(nil) + } + } + } + } + + deletedArtifactIDs := make(map[string]int) + for _, artifactTag := range artifactTags { + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, artifactTag.GetArtifactId()). + Run(func(args mock.Arguments) { + deletedArtifactIDs[args.Get(2).(string)] = deletedArtifactIDs[args.Get(2).(string)] + 1 + }). + Return(nil) + } + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for executionName := range taskExecutionModels { + require.Contains(t, updatedNodeExecutions, executionName) + for nodeID := range taskExecutionModels[executionName] { + if len(taskExecutionModels[executionName][nodeID]) > 0 { + assert.Contains(t, updatedNodeExecutions[executionName], nodeID) + } else { + assert.NotContains(t, updatedNodeExecutions[executionName], nodeID) + } + } + assert.Len(t, updatedNodeExecutions[executionName], 1) + } + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("single dynamic task", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO", + }, + { + ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYP", + }, + { + ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYQ", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: true, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_dynamic", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + ParentID: ptr[uint](2), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[1], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[2], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn2", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[3], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 7, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn3", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn3", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[4], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 8, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + ParentID: ptr[uint](2), + }, + }, + }, + { + BaseModel: models.BaseModel{ + ID: 9, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + "n0-0-dn0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn0-0", + }, + }), + }, + }, + "n0-0-dn1": { + { + BaseModel: models.BaseModel{ + ID: 3, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn1-0", + }, + }), + }, + }, + "n0-0-dn2": { + { + BaseModel: models.BaseModel{ + ID: 4, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn2-0", + }, + }), + }, + }, + "n0-0-dn3": { + { + BaseModel: models.BaseModel{ + ID: 5, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn3", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn3-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("noop catalog", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := catalog.NOOPCatalog{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []string{"flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM"} + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: &core.CatalogArtifactTag{ + ArtifactId: "c7cc868e-767f-4896-a97d-9f4887826cdd", + Name: artifactTags[0], + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("unknown execution", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + mockConfig := getMockExecutionsConfigProvider() + + repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) { + return models.Execution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.NotFound, "entry not found") + }) + + catalogClient := &mocks.Client{} + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + assert.Error(t, err) + assert.True(t, pluginCatalog.IsNotFound(err)) + assert.Nil(t, resp) + }) + + t.Run("single task without cached results", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_DISABLED, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("multiple tasks with partially cached results", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_DISABLED, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n2", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[1], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + "n1": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n1-0", + }, + }), + }, + }, + "n2": { + { + BaseModel: models.BaseModel{ + ID: 3, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n2-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + assert.Contains(t, updatedNodeExecutions, "n0") + assert.Contains(t, updatedNodeExecutions, "n2") + assert.Len(t, updatedNodeExecutions, 2) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("idempotency", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + resp, err = cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + resp, err = cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("reserved artifact", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, mock.Anything, + mock.Anything, mock.Anything).Return(&datacatalog.Reservation{OwnerId: "differentOwnerID"}, nil) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("unknown artifact", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + for nodeID := range taskExecutionModels { + for _, taskExecution := range taskExecutionModels[nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID).Return(nil) + } + } + } + + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything). + Return(status.Error(codes.NotFound, "not found")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + }) + + t.Run("datacatalog error", func(t *testing.T) { + t.Run("GetOrExtendReservationByArtifactTag", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + mock.Anything, mock.Anything, mock.Anything).Return(nil, status.Error(codes.Internal, "error")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("DeleteByArtifactID", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + for nodeID := range taskExecutionModels { + for _, taskExecution := range taskExecutionModels[nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + } + } + } + + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything). + Return(status.Error(codes.Internal, "error")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_ARTIFACT_DELETE_FAILED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + }) + + t.Run("ReleaseReservationByArtifactTag", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + for nodeID := range taskExecutionModels { + for _, taskExecution := range taskExecutionModels[nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + } + } + } + + deletedArtifactIDs := make(map[string]int) + for _, artifactTag := range artifactTags { + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, artifactTag.GetArtifactId()). + Run(func(args mock.Arguments) { + deletedArtifactIDs[args.Get(2).(string)] = deletedArtifactIDs[args.Get(2).(string)] + 1 + }). + Return(nil) + } + + catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything, + mock.Anything, mock.Anything).Return(status.Error(codes.Internal, "error")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_RELEASED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + }) + }) + + t.Run("repository error", func(t *testing.T) { + t.Run("ExecutionRepo", func(t *testing.T) { + t.Run("Get", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) { + return models.Execution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.Internal, "error") + }) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.Error(t, err) + s, ok := status.FromError(err) + require.True(t, ok) + assert.Equal(t, codes.Internal, s.Code()) + assert.Nil(t, resp) + + assert.Empty(t, updatedNodeExecutions) + }) + }) + + t.Run("NodeExecutionRepo", func(t *testing.T) { + t.Run("List", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetListCallback( + func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.NodeExecutionCollectionOutput, error) { + return interfaces.NodeExecutionCollectionOutput{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.Internal, "error") + }) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.Error(t, err) + s, ok := status.FromError(err) + require.True(t, ok) + assert.Equal(t, codes.Internal, s.Code()) + assert.Nil(t, resp) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("UpdateSelected", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback( + func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error { + return flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error") + }) + + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_DATABASE_UPDATE_FAILED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + assert.Empty(t, deletedArtifactIDs) + }) + }) + + t.Run("TaskExecutionRepo", func(t *testing.T) { + t.Run("List", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetListCallback( + func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.TaskExecutionCollectionOutput, error) { + return interfaces.TaskExecutionCollectionOutput{}, flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error") + }) + + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_INTERNAL, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_WorkflowExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + assert.Empty(t, deletedArtifactIDs) + }) + }) + }) + + t.Run("multiple tasks with identical artifact tags", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + executionModel := models.Execution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + LaunchPlanID: 6, + WorkflowID: 4, + TaskID: 0, + Phase: core.NodeExecution_SUCCEEDED.String(), + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[1], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[2], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n3", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n3", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[3], + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + "n1": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n1-0", + }, + }), + }, + }, + "n2": { + { + BaseModel: models.BaseModel{ + ID: 3, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n2-0", + }, + }), + }, + }, + "n3": { + { + BaseModel: models.BaseModel{ + ID: 4, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n3", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n3-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) +} + +func TestEvictTaskExecutionCache(t *testing.T) { + t.Run("task", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("subtask", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[1], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n0-0-n0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + if len(taskExecutionModels[nodeID]) > 0 { + assert.Contains(t, updatedNodeExecutions, nodeID) + } else { + assert.NotContains(t, updatedNodeExecutions, nodeID) + } + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("dynamic task", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO", + }, + { + ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYP", + }, + { + ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYQ", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: true, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_dynamic", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + ParentID: ptr[uint](2), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[1], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[2], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn2", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[3], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn3", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "dn3", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + ArtifactTag: artifactTags[4], + }, + }, + }, + }), + ParentID: ptr[uint](2), + CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()), + }, + { + BaseModel: models.BaseModel{ + ID: 7, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + ParentID: ptr[uint](2), + }, + }, + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + "n0-0-dn0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn0-0", + }, + }), + }, + }, + "n0-0-dn1": { + { + BaseModel: models.BaseModel{ + ID: 3, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn1-0", + }, + }), + }, + }, + "n0-0-dn2": { + { + BaseModel: models.BaseModel{ + ID: 4, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn2-0", + }, + }), + }, + }, + "n0-0-dn3": { + { + BaseModel: models.BaseModel{ + ID: 5, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-dn3", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-dn3-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictExecutionCacheRequest{ + WorkflowExecutionId: &executionIdentifier, + } + resp, err := cacheManager.EvictExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("noop catalog", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := catalog.NOOPCatalog{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("unknown task execution", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.GetTaskExecutionInput) (models.TaskExecution, error) { + return models.TaskExecution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.NotFound, "entry not found") + }) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + assert.Error(t, err) + assert.True(t, pluginCatalog.IsNotFound(err)) + assert.Nil(t, resp) + }) + + t.Run("unknown node execution", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + taskExecutionModel := models.TaskExecution{ + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + } + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.GetTaskExecutionInput) (models.TaskExecution, error) { + assert.EqualValues(t, executionIdentifier, *input.TaskExecutionID.NodeExecutionId.ExecutionId) + assert.Equal(t, taskExecutionModel.TaskExecutionKey.NodeID, input.TaskExecutionID.NodeExecutionId.NodeId) + return taskExecutionModel, nil + }) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) { + return models.NodeExecution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.NotFound, "entry not found") + }) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + assert.Error(t, err) + assert.True(t, pluginCatalog.IsNotFound(err)) + assert.Nil(t, resp) + }) + + t.Run("task without cached results", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_DISABLED, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("subtask with partially cached results", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[1], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_DISABLED, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n2", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[2], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn2", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n0-0-n0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n0-0-n1": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n1-0", + }, + }), + }, + }, + "n0-0-n2": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n2-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + assert.Contains(t, updatedNodeExecutions, "n0") + assert.Contains(t, updatedNodeExecutions, "n0-0-n0") + assert.Contains(t, updatedNodeExecutions, "n0-0-n2") + assert.Len(t, updatedNodeExecutions, 3) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("idempotency", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) + + t.Run("reserved artifact", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, mock.Anything, + mock.Anything, mock.Anything).Return(&datacatalog.Reservation{OwnerId: "otherOwnerID"}, nil) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("unknown artifact", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + for nodeID := range taskExecutionModels { + for _, taskExecution := range taskExecutionModels[nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID).Return(nil) + } + } + } + + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything). + Return(status.Error(codes.NotFound, "not found")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + }) + + t.Run("datacatalog error", func(t *testing.T) { + t.Run("GetOrExtendReservationByArtifactTag", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + mock.Anything, mock.Anything, mock.Anything).Return(nil, status.Error(codes.Internal, "error")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("DeleteByArtifactID", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + for nodeID := range taskExecutionModels { + for _, taskExecution := range taskExecutionModels[nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + } + } + } + + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything). + Return(status.Error(codes.Internal, "error")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_ARTIFACT_DELETE_FAILED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + }) + + t.Run("ReleaseReservationByArtifactTag", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + for nodeID := range taskExecutionModels { + for _, taskExecution := range taskExecutionModels[nodeID] { + require.NotNil(t, taskExecution.RetryAttempt) + ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt) + for _, artifactTag := range artifactTags { + catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, + artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil) + } + } + } + + deletedArtifactIDs := make(map[string]int) + for _, artifactTag := range artifactTags { + catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, artifactTag.GetArtifactId()). + Run(func(args mock.Arguments) { + deletedArtifactIDs[args.Get(2).(string)] = deletedArtifactIDs[args.Get(2).(string)] + 1 + }). + Return(nil) + } + + catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything, + mock.Anything, mock.Anything).Return(status.Error(codes.Internal, "error")) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_RELEASED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + }) + }) + + t.Run("repository error", func(t *testing.T) { + t.Run("NodeExecutionRepo", func(t *testing.T) { + t.Run("Get", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) { + return models.NodeExecution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.Internal, "error") + }) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.Error(t, err) + s, ok := status.FromError(err) + require.True(t, ok) + assert.Equal(t, codes.Internal, s.Code()) + assert.Nil(t, resp) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("UpdateSelected", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback( + func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error { + return flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error") + }) + + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_DATABASE_UPDATE_FAILED, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + assert.Empty(t, deletedArtifactIDs) + }) + }) + + t.Run("TaskExecutionRepo", func(t *testing.T) { + t.Run("List", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetListCallback( + func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.TaskExecutionCollectionOutput, error) { + return interfaces.TaskExecutionCollectionOutput{}, flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error") + }) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags)) + eErr := resp.GetErrors().GetErrors()[0] + assert.Equal(t, core.CacheEvictionError_INTERNAL, eErr.Code) + assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId) + assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId)) + require.NotNil(t, eErr.Source) + assert.IsType(t, &core.CacheEvictionError_WorkflowExecutionId{}, eErr.Source) + + assert.Empty(t, updatedNodeExecutions) + }) + + t.Run("Get", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + + repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetGetCallback( + func(ctx context.Context, input interfaces.GetTaskExecutionInput) (models.TaskExecution, error) { + return models.TaskExecution{}, flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error") + }) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.Error(t, err) + s, ok := status.FromError(err) + require.True(t, ok) + assert.Equal(t, codes.Internal, s.Code()) + assert.Nil(t, resp) + + assert.Empty(t, updatedNodeExecutions) + }) + }) + }) + + t.Run("subtask with identical artifact tags", func(t *testing.T) { + repository := repositoryMocks.NewMockRepository() + catalogClient := &mocks.Client{} + mockConfig := getMockExecutionsConfigProvider() + + artifactTags := []*core.CatalogArtifactTag{ + { + ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM", + }, + { + ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + { + ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277", + Name: "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN", + }, + } + + nodeExecutionModels := []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 1, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: true, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + ArtifactTag: artifactTags[0], + }, + }, + }, + }), + ChildNodeExecutions: []models.NodeExecution{ + { + BaseModel: models.BaseModel{ + ID: 2, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-start-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "start-node", + }), + }, + { + BaseModel: models.BaseModel{ + ID: 3, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n0", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[1], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 4, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n1", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n1", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[2], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn0", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 5, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n2", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n2", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[3], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn2", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 6, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n3", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "n3", + }), + Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{ + TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{ + TaskNodeMetadata: &admin.TaskNodeMetadata{ + CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED, + CatalogKey: &core.CatalogMetadata{ + DatasetId: &core.Identifier{ + ResourceType: core.ResourceType_DATASET, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_sub", + Version: "version", + }, + ArtifactTag: artifactTags[4], + SourceExecution: &core.CatalogMetadata_SourceTaskExecution{ + SourceTaskExecution: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + NodeId: "dn3", + ExecutionId: &executionIdentifier, + }, + RetryAttempt: 0, + }, + }, + }, + }, + }, + }), + }, + { + BaseModel: models.BaseModel{ + ID: 7, + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-end-node", + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{ + IsParentNode: false, + IsDynamic: false, + SpecNodeId: "end-node", + }), + }, + }, + }, + } + + taskExecutionModels := map[string][]models.TaskExecution{ + "n0": { + { + BaseModel: models.BaseModel{ + ID: 1, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache_single_task", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n0-0-n0": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n0", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n0-0", + }, + }), + }, + }, + "n0-0-n1": { + { + BaseModel: models.BaseModel{ + ID: 2, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n1", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n1-0", + }, + }), + }, + }, + "n0-0-n2": { + { + BaseModel: models.BaseModel{ + ID: 3, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n2", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n2-0", + }, + }), + }, + }, + "n0-0-n3": { + { + BaseModel: models.BaseModel{ + ID: 4, + }, + TaskExecutionKey: models.TaskExecutionKey{ + TaskKey: models.TaskKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: "flyte_task-test.evict.execution_cache", + Version: "version", + }, + NodeExecutionKey: models.NodeExecutionKey{ + ExecutionKey: models.ExecutionKey{ + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + }, + NodeID: "n0-0-n3", + }, + RetryAttempt: ptr[uint32](0), + }, + Phase: core.NodeExecution_SUCCEEDED.String(), + Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{ + Metadata: &event.TaskExecutionMetadata{ + GeneratedName: "name-n0-0-n3-0", + }, + }), + }, + }, + } + + updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels, + taskExecutionModels) + deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels) + + cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope()) + request := service.EvictTaskExecutionCacheRequest{ + TaskExecutionId: &core.TaskExecutionIdentifier{ + TaskId: &core.Identifier{ + ResourceType: core.ResourceType_TASK, + Project: executionIdentifier.Project, + Domain: executionIdentifier.Domain, + Name: executionIdentifier.Name, + Version: version, + }, + NodeExecutionId: &core.NodeExecutionIdentifier{ + ExecutionId: &executionIdentifier, + NodeId: "n0", + }, + RetryAttempt: uint32(0), + }, + } + resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request) + require.NoError(t, err) + require.NotNil(t, resp) + assert.Empty(t, resp.GetErrors().GetErrors()) + + for nodeID := range taskExecutionModels { + assert.Contains(t, updatedNodeExecutions, nodeID) + } + assert.Len(t, updatedNodeExecutions, len(taskExecutionModels)) + + for _, artifactTag := range artifactTags { + assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()]) + } + assert.Len(t, deletedArtifactIDs, len(artifactTags)) + }) +} diff --git a/flyteadmin/pkg/manager/impl/execution_manager_test.go b/flyteadmin/pkg/manager/impl/execution_manager_test.go index 94eeab925b..14cc0a4405 100644 --- a/flyteadmin/pkg/manager/impl/execution_manager_test.go +++ b/flyteadmin/pkg/manager/impl/execution_manager_test.go @@ -367,7 +367,7 @@ func TestCreateExecution(t *testing.T) { Id: &executionIdentifier, } assert.Nil(t, err) - assert.Equal(t, expectedResponse, response) + assert.True(t, proto.Equal(expectedResponse, response)) // TODO: Check for offloaded inputs } @@ -461,7 +461,7 @@ func TestCreateExecutionFromWorkflowNode(t *testing.T) { Id: &executionIdentifier, } assert.Nil(t, err) - assert.Equal(t, expectedResponse, response) + assert.True(t, proto.Equal(expectedResponse, response)) } func TestCreateExecution_NoAssignedName(t *testing.T) { @@ -545,7 +545,7 @@ func TestCreateExecution_TaggedQueue(t *testing.T) { Id: &executionIdentifier, } assert.Nil(t, err) - assert.Equal(t, expectedResponse, response) + assert.True(t, proto.Equal(expectedResponse, response)) } func TestCreateExecutionValidationError(t *testing.T) { @@ -896,7 +896,7 @@ func TestCreateExecutionDynamicLabelsAndAnnotations(t *testing.T) { Id: &executionIdentifier, } assert.Nil(t, err) - assert.Equal(t, expectedResponse, response) + assert.True(t, proto.Equal(expectedResponse, response)) } func TestCreateExecutionInterruptible(t *testing.T) { @@ -3559,7 +3559,7 @@ func TestCreateExecution_LegacyClient(t *testing.T) { Id: &executionIdentifier, } assert.Nil(t, err) - assert.Equal(t, expectedResponse, response) + assert.True(t, proto.Equal(expectedResponse, response)) } func TestRelaunchExecution_LegacyModel(t *testing.T) { diff --git a/flyteadmin/pkg/manager/impl/shared/constants.go b/flyteadmin/pkg/manager/impl/shared/constants.go index 469bd3e3ba..09684468ba 100644 --- a/flyteadmin/pkg/manager/impl/shared/constants.go +++ b/flyteadmin/pkg/manager/impl/shared/constants.go @@ -35,4 +35,6 @@ const ( // Parent of a node execution in the node executions table ParentID = "parent_id" WorkflowClosure = "workflow_closure" + CreatedAt = "created_at" + Closure = "closure" ) diff --git a/flyteadmin/pkg/manager/interfaces/cache.go b/flyteadmin/pkg/manager/interfaces/cache.go new file mode 100644 index 0000000000..c2bd3c3d06 --- /dev/null +++ b/flyteadmin/pkg/manager/interfaces/cache.go @@ -0,0 +1,12 @@ +package interfaces + +import ( + "context" + + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" +) + +type CacheInterface interface { + EvictExecutionCache(ctx context.Context, request service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) + EvictTaskExecutionCache(ctx context.Context, request service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) +} diff --git a/flyteadmin/pkg/manager/mocks/cache.go b/flyteadmin/pkg/manager/mocks/cache.go new file mode 100644 index 0000000000..37a21df6a2 --- /dev/null +++ b/flyteadmin/pkg/manager/mocks/cache.go @@ -0,0 +1,42 @@ +package mocks + +import ( + "context" + + "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" +) + +var ( + _ interfaces.CacheInterface = &MockCacheManager{} +) + +type EvictExecutionCacheFunc func(ctx context.Context, req service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) +type EvictTaskExecutionCacheFunc func(ctx context.Context, req service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) + +type MockCacheManager struct { + evictExecutionCacheFunc EvictExecutionCacheFunc + evictTaskExecutionCacheFunc EvictTaskExecutionCacheFunc +} + +func (m *MockCacheManager) SetEvictExecutionCacheFunc(evictExecutionCacheFunc EvictExecutionCacheFunc) { + m.evictExecutionCacheFunc = evictExecutionCacheFunc +} + +func (m *MockCacheManager) EvictExecutionCache(ctx context.Context, req service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { + if m.evictExecutionCacheFunc != nil { + return m.evictExecutionCacheFunc(ctx, req) + } + return nil, nil +} + +func (m *MockCacheManager) SetEvictTaskExecutionCacheFunc(evictTaskExecutionCacheFunc EvictTaskExecutionCacheFunc) { + m.evictTaskExecutionCacheFunc = evictTaskExecutionCacheFunc +} + +func (m *MockCacheManager) EvictTaskExecutionCache(ctx context.Context, req service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { + if m.evictTaskExecutionCacheFunc != nil { + return m.evictTaskExecutionCacheFunc(ctx, req) + } + return nil, nil +} diff --git a/flyteadmin/pkg/rpc/cacheservice/base.go b/flyteadmin/pkg/rpc/cacheservice/base.go new file mode 100644 index 0000000000..440504c25c --- /dev/null +++ b/flyteadmin/pkg/rpc/cacheservice/base.go @@ -0,0 +1,86 @@ +package cacheservice + +import ( + "context" + "fmt" + + "runtime/debug" + + "github.com/golang/protobuf/proto" + "google.golang.org/grpc" + + manager "github.com/flyteorg/flyteadmin/pkg/manager/impl" + "github.com/flyteorg/flyteadmin/pkg/manager/interfaces" + "github.com/flyteorg/flyteadmin/pkg/repositories" + "github.com/flyteorg/flyteadmin/pkg/repositories/errors" + runtimeInterfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" + "github.com/flyteorg/flyteidl/clients/go/admin" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" + "github.com/flyteorg/flytestdlib/catalog" + "github.com/flyteorg/flytestdlib/logger" + "github.com/flyteorg/flytestdlib/promutils" + "github.com/flyteorg/flytestdlib/storage" +) + +type CacheService struct { + service.UnimplementedCacheServiceServer + + CacheManager interfaces.CacheInterface + Metrics CacheMetrics +} + +// Intercepts all cache requests to handle panics during execution. +func (s *CacheService) interceptPanic(ctx context.Context, request proto.Message) { + err := recover() + if err == nil { + return + } + + s.Metrics.PanicCounter.Inc() + logger.Fatalf(ctx, "panic-ed for request: [%+v] with err: %v with Stack: %v", request, err, string(debug.Stack())) +} + +func NewCacheServer(ctx context.Context, config runtimeInterfaces.Configuration, storageClient *storage.DataStore, + cacheScope promutils.Scope) *CacheService { + panicCounter := cacheScope.MustNewCounter("initialization_panic", + "panics encountered initializing the cache service") + + defer func() { + if err := recover(); err != nil { + panicCounter.Inc() + logger.Fatalf(ctx, fmt.Sprintf("caught panic: %v [%+v]", err, string(debug.Stack()))) + } + }() + + databaseConfig := config.ApplicationConfiguration().GetDbConfig() + logConfig := logger.GetConfig() + + db, err := repositories.GetDB(ctx, databaseConfig, logConfig) + if err != nil { + logger.Fatal(ctx, err) + } + dbScope := cacheScope.NewSubScope("database") + repo := repositories.NewGormRepo( + db, errors.NewPostgresErrorTransformer(cacheScope.NewSubScope("errors")), dbScope) + + // flyteadmin config/auth optionally used by datacatalog client (if enabled) + adminCfg := admin.GetConfig(ctx) + adminCredentialsFuture := admin.NewPerRPCCredentialsFuture() + adminAuthOpts := []grpc.DialOption{ + grpc.WithChainUnaryInterceptor(admin.NewAuthInterceptor(adminCfg, nil, adminCredentialsFuture)), + grpc.WithPerRPCCredentials(adminCredentialsFuture), + } + + catalogClient, err := catalog.NewClient(ctx, adminAuthOpts...) + if err != nil { + logger.Fatal(ctx, err) + } + + cacheManager := manager.NewCacheManager(repo, config, catalogClient, cacheScope.NewSubScope("cache_manager")) + + logger.Info(ctx, "Initializing a new CacheService") + return &CacheService{ + CacheManager: cacheManager, + Metrics: InitMetrics(cacheScope), + } +} diff --git a/flyteadmin/pkg/rpc/cacheservice/cache.go b/flyteadmin/pkg/rpc/cacheservice/cache.go new file mode 100644 index 0000000000..b8a969584c --- /dev/null +++ b/flyteadmin/pkg/rpc/cacheservice/cache.go @@ -0,0 +1,59 @@ +package cacheservice + +import ( + "context" + + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" + "github.com/flyteorg/flytestdlib/logger" +) + +func (s *CacheService) EvictExecutionCache(ctx context.Context, req *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { + defer s.interceptPanic(ctx, req) + if req == nil { + return nil, status.Errorf(codes.InvalidArgument, "Incorrect request, nil requests not allowed") + } + + var resp *service.EvictCacheResponse + var err error + s.Metrics.cacheEndpointMetrics.evictExecution.Time(func() { + resp, err = s.CacheManager.EvictExecutionCache(ctx, *req) + }) + if err != nil { + return nil, util.TransformAndRecordError(err, &s.Metrics.cacheEndpointMetrics.evictExecution) + } + s.Metrics.cacheEndpointMetrics.evictExecution.Success() + + return resp, nil +} + +func (s *CacheService) EvictTaskExecutionCache(ctx context.Context, req *service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { + defer s.interceptPanic(ctx, req) + if req == nil { + return nil, status.Errorf(codes.InvalidArgument, "Incorrect request, nil requests not allowed") + } + + // Calling the HTTP endpoint implicitly carries the resource type information in the URL, but does not set it in the + // parsed protobuf message. Ensure task execution identifier is valid by manually setting task resource type below. + if req.TaskExecutionId != nil && req.TaskExecutionId.TaskId != nil && + req.TaskExecutionId.TaskId.ResourceType == core.ResourceType_UNSPECIFIED { + logger.Infof(ctx, "Adding task resource type for unspecified value in request: [%+v]", req) + req.TaskExecutionId.TaskId.ResourceType = core.ResourceType_TASK + } + + var resp *service.EvictCacheResponse + var err error + s.Metrics.cacheEndpointMetrics.evictTaskExecution.Time(func() { + resp, err = s.CacheManager.EvictTaskExecutionCache(ctx, *req) + }) + if err != nil { + return nil, util.TransformAndRecordError(err, &s.Metrics.cacheEndpointMetrics.evictTaskExecution) + } + s.Metrics.cacheEndpointMetrics.evictTaskExecution.Success() + + return resp, nil +} diff --git a/flyteadmin/pkg/rpc/cacheservice/metrics.go b/flyteadmin/pkg/rpc/cacheservice/metrics.go new file mode 100644 index 0000000000..6803617b82 --- /dev/null +++ b/flyteadmin/pkg/rpc/cacheservice/metrics.go @@ -0,0 +1,36 @@ +package cacheservice + +import ( + "github.com/prometheus/client_golang/prometheus" + + "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice/util" + "github.com/flyteorg/flytestdlib/promutils" +) + +type cacheEndpointMetrics struct { + scope promutils.Scope + + evictExecution util.RequestMetrics + evictTaskExecution util.RequestMetrics +} + +type CacheMetrics struct { + Scope promutils.Scope + PanicCounter prometheus.Counter + + cacheEndpointMetrics cacheEndpointMetrics +} + +func InitMetrics(cacheScope promutils.Scope) CacheMetrics { + return CacheMetrics{ + Scope: cacheScope, + PanicCounter: cacheScope.MustNewCounter("handler_panic", + "panics encountered while handling requests to the cache service"), + + cacheEndpointMetrics: cacheEndpointMetrics{ + scope: cacheScope, + evictExecution: util.NewRequestMetrics(cacheScope, "evict_execution"), + evictTaskExecution: util.NewRequestMetrics(cacheScope, "evict_task_execution"), + }, + } +} diff --git a/flyteadmin/pkg/server/service.go b/flyteadmin/pkg/server/service.go index 4f1f58ffb5..415cf8155e 100644 --- a/flyteadmin/pkg/server/service.go +++ b/flyteadmin/pkg/server/service.go @@ -27,6 +27,7 @@ import ( "github.com/flyteorg/flyteadmin/pkg/config" "github.com/flyteorg/flyteadmin/pkg/rpc" "github.com/flyteorg/flyteadmin/pkg/rpc/adminservice" + "github.com/flyteorg/flyteadmin/pkg/rpc/cacheservice" runtimeIfaces "github.com/flyteorg/flyteadmin/pkg/runtime/interfaces" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" "github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/secretmanager" @@ -129,6 +130,8 @@ func newGRPCServer(ctx context.Context, pluginRegistry *plugins.Registry, cfg *c service.RegisterSignalServiceServer(grpcServer, rpc.NewSignalServer(ctx, configuration, scope.NewSubScope("signal"))) + service.RegisterCacheServiceServer(grpcServer, cacheservice.NewCacheServer(ctx, configuration, dataStorageClient, scope.NewSubScope("cache"))) + healthServer := health.NewServer() healthServer.SetServingStatus("flyteadmin", grpc_health_v1.HealthCheckResponse_SERVING) grpc_health_v1.RegisterHealthServer(grpcServer, healthServer) @@ -228,6 +231,11 @@ func newHTTPServer(ctx context.Context, cfg *config.ServerConfig, _ *authConfig. return nil, errors.Wrap(err, "error registering signal service") } + err = service.RegisterCacheServiceHandlerFromEndpoint(ctx, gwmux, grpcAddress, grpcConnectionOpts) + if err != nil { + return nil, errors.Wrap(err, "error registering cache service") + } + mux.Handle("/", gwmux) return mux, nil From dc59334cc184103aa26cbad2ecf25ad9d59e92f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 15 Dec 2022 19:30:35 +0100 Subject: [PATCH 05/57] Updated to latest unreleased versions of flytepropeller and flytestdlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- flyteadmin/go.mod | 4 ++-- flyteadmin/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flyteadmin/go.mod b/flyteadmin/go.mod index 9b3a961aae..a7764808b5 100644 --- a/flyteadmin/go.mod +++ b/flyteadmin/go.mod @@ -5,8 +5,8 @@ go 1.18 replace ( github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 - github.com/flyteorg/flytepropeller => github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215161838-a505ae7f1062 - github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf + github.com/flyteorg/flytepropeller => github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215182111-03a138161b7d + github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced ) require ( diff --git a/flyteadmin/go.sum b/flyteadmin/go.sum index 454a6f2902..52b94f688c 100644 --- a/flyteadmin/go.sum +++ b/flyteadmin/go.sum @@ -222,10 +222,10 @@ github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMp github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo= github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 h1:Qxsd2LWl44bfLn75MHrPv32P1PhPZ9fajg39eHZ/a7g= github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081/go.mod h1:ZbZVBxEWh8Icj1AgfNKg0uPzHHGd9twa4eWcY2Yt6xE= -github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215161838-a505ae7f1062 h1:YsvNz+6O3EJ4+SmuNvaVDly28i/srudS4TVk9GxqUms= -github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215161838-a505ae7f1062/go.mod h1:8TkbXE8oinqU+FBgUWUeewr6X40GpGpVxodiKxGuXGY= -github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf h1:tKQlA5yx6BVA9W2zJl60b60nTOgZKTP8Uk9xIQfhDMA= -github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY= +github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215182111-03a138161b7d h1:Q2TBTMMkPnnFb/U6g8K1uFQcXmFkjrRRorUfV81W5pY= +github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215182111-03a138161b7d/go.mod h1:r65OoIqz8JsXZeGs3V/LK9vZf0oeOpUWW9O1lY+ttBU= +github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced h1:Dxj7o/Q5FPMH+nYKptNq2n5forXJET8MiR2hVDzTMqU= +github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= From 4c041c1adeaad13dab72684e6bea02eb28cd3fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Tue, 8 Nov 2022 14:01:24 +0100 Subject: [PATCH 06/57] Added function for deleting artifacts to catalog client interface Extended reservation retrieval to allow querying via artifact tag in catalog client interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../tasks/pluginmachinery/catalog/client.go | 8 ++ .../pluginmachinery/catalog/mocks/client.go | 105 ++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/client.go index 7531a59d93..30b99bd3a0 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/client.go @@ -131,6 +131,9 @@ type Client interface { // GetOrExtendReservation tries to retrieve a (valid) reservation for the given key, creating a new one using the // specified owner ID if none was found or updating an existing one if it has expired. GetOrExtendReservation(ctx context.Context, key Key, ownerID string, heartbeatInterval time.Duration) (*datacatalog.Reservation, error) + // GetOrExtendReservationByArtifactTag tries to retrieve a (valid) reservation for the given dataset ID and artifact + // tag, creating a new one using the specified owner ID if none was found or updating an existing one if it has expired. + GetOrExtendReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string, ownerID string, heartbeatInterval time.Duration) (*datacatalog.Reservation, error) // Put stores the given data using the specified key, creating artifact entries as required. // To update an existing artifact, use Update instead. Put(ctx context.Context, key Key, reader io.OutputReader, metadata Metadata) (Status, error) @@ -139,6 +142,11 @@ type Client interface { Update(ctx context.Context, key Key, reader io.OutputReader, metadata Metadata) (Status, error) // ReleaseReservation releases an acquired reservation for the given key and owner ID. ReleaseReservation(ctx context.Context, key Key, ownerID string) error + // Delete removes the artifact associated with the given key and deletes its underlying data from blob storage. + Delete(ctx context.Context, key Key) error + // DeleteByArtifactTag removes the artifact associated with the given dataset ID and artifact tag and deletes its + // underlying data from blob storage. + DeleteByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string) error } func IsNotFound(err error) bool { diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go index fe9d75f1cc..172b721771 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go @@ -21,6 +21,70 @@ type Client struct { mock.Mock } +type Client_Delete struct { + *mock.Call +} + +func (_m Client_Delete) Return(_a0 error) *Client_Delete { + return &Client_Delete{Call: _m.Call.Return(_a0)} +} + +func (_m *Client) OnDelete(ctx context.Context, key catalog.Key) *Client_Delete { + c_call := _m.On("Delete", ctx, key) + return &Client_Delete{Call: c_call} +} + +func (_m *Client) OnDeleteMatch(matchers ...interface{}) *Client_Delete { + c_call := _m.On("Delete", matchers...) + return &Client_Delete{Call: c_call} +} + +// Delete provides a mock function with given fields: ctx, key +func (_m *Client) Delete(ctx context.Context, key catalog.Key) error { + ret := _m.Called(ctx, key) + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context, catalog.Key) error); ok { + r0 = rf(ctx, key) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +type Client_DeleteByArtifactTag struct { + *mock.Call +} + +func (_m Client_DeleteByArtifactTag) Return(_a0 error) *Client_DeleteByArtifactTag { + return &Client_DeleteByArtifactTag{Call: _m.Call.Return(_a0)} +} + +func (_m *Client) OnDeleteByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string) *Client_DeleteByArtifactTag { + c_call := _m.On("DeleteByArtifactTag", ctx, datasetID, artifactTag) + return &Client_DeleteByArtifactTag{Call: c_call} +} + +func (_m *Client) OnDeleteByArtifactTagMatch(matchers ...interface{}) *Client_DeleteByArtifactTag { + c_call := _m.On("DeleteByArtifactTag", matchers...) + return &Client_DeleteByArtifactTag{Call: c_call} +} + +// DeleteByArtifactTag provides a mock function with given fields: ctx, datasetID, artifactTag +func (_m *Client) DeleteByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string) error { + ret := _m.Called(ctx, datasetID, artifactTag) + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DatasetID, string) error); ok { + r0 = rf(ctx, datasetID, artifactTag) + } else { + r0 = ret.Error(0) + } + + return r0 +} + type Client_Get struct { *mock.Call } @@ -101,6 +165,47 @@ func (_m *Client) GetOrExtendReservation(ctx context.Context, key catalog.Key, o return r0, r1 } +type Client_GetOrExtendReservationByArtifactTag struct { + *mock.Call +} + +func (_m Client_GetOrExtendReservationByArtifactTag) Return(_a0 *datacatalog.Reservation, _a1 error) *Client_GetOrExtendReservationByArtifactTag { + return &Client_GetOrExtendReservationByArtifactTag{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *Client) OnGetOrExtendReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string, ownerID string, heartbeatInterval time.Duration) *Client_GetOrExtendReservationByArtifactTag { + c_call := _m.On("GetOrExtendReservationByArtifactTag", ctx, datasetID, artifactTag, ownerID, heartbeatInterval) + return &Client_GetOrExtendReservationByArtifactTag{Call: c_call} +} + +func (_m *Client) OnGetOrExtendReservationByArtifactTagMatch(matchers ...interface{}) *Client_GetOrExtendReservationByArtifactTag { + c_call := _m.On("GetOrExtendReservationByArtifactTag", matchers...) + return &Client_GetOrExtendReservationByArtifactTag{Call: c_call} +} + +// GetOrExtendReservationByArtifactTag provides a mock function with given fields: ctx, datasetID, artifactTag, ownerID, heartbeatInterval +func (_m *Client) GetOrExtendReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string, ownerID string, heartbeatInterval time.Duration) (*datacatalog.Reservation, error) { + ret := _m.Called(ctx, datasetID, artifactTag, ownerID, heartbeatInterval) + + var r0 *datacatalog.Reservation + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DatasetID, string, string, time.Duration) *datacatalog.Reservation); ok { + r0 = rf(ctx, datasetID, artifactTag, ownerID, heartbeatInterval) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*datacatalog.Reservation) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.DatasetID, string, string, time.Duration) error); ok { + r1 = rf(ctx, datasetID, artifactTag, ownerID, heartbeatInterval) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + type Client_Put struct { *mock.Call } From 56c7b31d5f8c015b73207d3847eaaec2d4befd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 15 Dec 2022 16:10:25 +0100 Subject: [PATCH 07/57] Added method to release catalog reservation by artifact tag Added method to delete catalog artifact by ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../tasks/pluginmachinery/catalog/client.go | 6 ++ .../pluginmachinery/catalog/mocks/client.go | 64 +++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/client.go index 30b99bd3a0..8630d004db 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/client.go @@ -142,11 +142,17 @@ type Client interface { Update(ctx context.Context, key Key, reader io.OutputReader, metadata Metadata) (Status, error) // ReleaseReservation releases an acquired reservation for the given key and owner ID. ReleaseReservation(ctx context.Context, key Key, ownerID string) error + // ReleaseReservationByArtifactTag releases an acquired reservation for the given dataset ID, artifact tag and + // owner ID. + ReleaseReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string, ownerID string) error // Delete removes the artifact associated with the given key and deletes its underlying data from blob storage. Delete(ctx context.Context, key Key) error // DeleteByArtifactTag removes the artifact associated with the given dataset ID and artifact tag and deletes its // underlying data from blob storage. DeleteByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string) error + // DeleteByArtifactID removes the artifact associated with the given dataset and artifact ID and deletes its + // underlying data from blob storage. + DeleteByArtifactID(ctx context.Context, datasetID *datacatalog.DatasetID, artifactID string) error } func IsNotFound(err error) bool { diff --git a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go index 172b721771..4fed501d5a 100644 --- a/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/catalog/mocks/client.go @@ -53,6 +53,38 @@ func (_m *Client) Delete(ctx context.Context, key catalog.Key) error { return r0 } +type Client_DeleteByArtifactID struct { + *mock.Call +} + +func (_m Client_DeleteByArtifactID) Return(_a0 error) *Client_DeleteByArtifactID { + return &Client_DeleteByArtifactID{Call: _m.Call.Return(_a0)} +} + +func (_m *Client) OnDeleteByArtifactID(ctx context.Context, datasetID *datacatalog.DatasetID, artifactID string) *Client_DeleteByArtifactID { + c_call := _m.On("DeleteByArtifactID", ctx, datasetID, artifactID) + return &Client_DeleteByArtifactID{Call: c_call} +} + +func (_m *Client) OnDeleteByArtifactIDMatch(matchers ...interface{}) *Client_DeleteByArtifactID { + c_call := _m.On("DeleteByArtifactID", matchers...) + return &Client_DeleteByArtifactID{Call: c_call} +} + +// DeleteByArtifactID provides a mock function with given fields: ctx, datasetID, artifactID +func (_m *Client) DeleteByArtifactID(ctx context.Context, datasetID *datacatalog.DatasetID, artifactID string) error { + ret := _m.Called(ctx, datasetID, artifactID) + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DatasetID, string) error); ok { + r0 = rf(ctx, datasetID, artifactID) + } else { + r0 = ret.Error(0) + } + + return r0 +} + type Client_DeleteByArtifactTag struct { *mock.Call } @@ -277,6 +309,38 @@ func (_m *Client) ReleaseReservation(ctx context.Context, key catalog.Key, owner return r0 } +type Client_ReleaseReservationByArtifactTag struct { + *mock.Call +} + +func (_m Client_ReleaseReservationByArtifactTag) Return(_a0 error) *Client_ReleaseReservationByArtifactTag { + return &Client_ReleaseReservationByArtifactTag{Call: _m.Call.Return(_a0)} +} + +func (_m *Client) OnReleaseReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string, ownerID string) *Client_ReleaseReservationByArtifactTag { + c_call := _m.On("ReleaseReservationByArtifactTag", ctx, datasetID, artifactTag, ownerID) + return &Client_ReleaseReservationByArtifactTag{Call: c_call} +} + +func (_m *Client) OnReleaseReservationByArtifactTagMatch(matchers ...interface{}) *Client_ReleaseReservationByArtifactTag { + c_call := _m.On("ReleaseReservationByArtifactTag", matchers...) + return &Client_ReleaseReservationByArtifactTag{Call: c_call} +} + +// ReleaseReservationByArtifactTag provides a mock function with given fields: ctx, datasetID, artifactTag, ownerID +func (_m *Client) ReleaseReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string, ownerID string) error { + ret := _m.Called(ctx, datasetID, artifactTag, ownerID) + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DatasetID, string, string) error); ok { + r0 = rf(ctx, datasetID, artifactTag, ownerID) + } else { + r0 = ret.Error(0) + } + + return r0 +} + type Client_Update struct { *mock.Call } From 557a99167d6014d927069e0b4b7613d393f82671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Wed, 4 Jan 2023 15:45:30 +0100 Subject: [PATCH 08/57] Update to latest unreleased versions of flyteidl and flyteplugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- flytestdlib/go.mod | 6 +++--- flytestdlib/go.sum | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod index 8ee8a86c61..d1129abfe9 100644 --- a/flytestdlib/go.mod +++ b/flytestdlib/go.mod @@ -3,8 +3,8 @@ module github.com/flyteorg/flytestdlib go 1.18 replace ( - github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 - github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 + github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f + github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20230104150443-bda210ef6073 ) require ( @@ -14,7 +14,7 @@ require ( github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607 github.com/fatih/color v1.13.0 github.com/fatih/structtag v1.2.0 - github.com/flyteorg/flyteidl v1.2.3 + github.com/flyteorg/flyteidl v1.3.1 github.com/flyteorg/flyteplugins v1.0.18 github.com/flyteorg/flytepropeller v1.1.28 github.com/flyteorg/stow v0.3.6 diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum index b89f0d6930..80543bce98 100644 --- a/flytestdlib/go.sum +++ b/flytestdlib/go.sum @@ -129,10 +129,10 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMpKRTsX2FjEIP2WCWrdOAfvg9nwoObBkJCCnksQaM= -github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo= -github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 h1:Qxsd2LWl44bfLn75MHrPv32P1PhPZ9fajg39eHZ/a7g= -github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081/go.mod h1:ZbZVBxEWh8Icj1AgfNKg0uPzHHGd9twa4eWcY2Yt6xE= +github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f h1:BFpozetWgkWdrOz2wDQY/2pcvm8Wx60uI4mJup+0yrg= +github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20230104150443-bda210ef6073 h1:+4NEKyFn+6Upq4DEIE0p7o0R2Ue1mXmVffTw+boGh+4= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20230104150443-bda210ef6073/go.mod h1:x+e4ongzLdwdq7Gpl7TsPxwh1yal2ndWmB9ZqcjUuz8= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= From 821467e1317a3e3023b1595d0fc40aeaefdd27f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Wed, 4 Jan 2023 16:26:56 +0100 Subject: [PATCH 09/57] Updated to latest unreleased versions of flyteidl, flyteplugins, flytepropeller and flytestdlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- flyteadmin/go.mod | 12 ++++++------ flyteadmin/go.sum | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flyteadmin/go.mod b/flyteadmin/go.mod index a7764808b5..330dc52e59 100644 --- a/flyteadmin/go.mod +++ b/flyteadmin/go.mod @@ -3,10 +3,10 @@ module github.com/flyteorg/flyteadmin go 1.18 replace ( - github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 - github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 - github.com/flyteorg/flytepropeller => github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215182111-03a138161b7d - github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced + github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f + github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20230104150443-bda210ef6073 + github.com/flyteorg/flytepropeller => github.com/blackshark-ai/flytepropeller v0.16.48-0.20230104152227-93eb7b4cc558 + github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697 ) require ( @@ -20,8 +20,8 @@ require ( github.com/cloudevents/sdk-go/v2 v2.8.0 github.com/coreos/go-oidc v2.2.1+incompatible github.com/evanphx/json-patch v4.12.0+incompatible - github.com/flyteorg/flyteidl v1.2.5 - github.com/flyteorg/flyteplugins v1.0.20 + github.com/flyteorg/flyteidl v1.3.1 + github.com/flyteorg/flyteplugins v1.0.26 github.com/flyteorg/flytepropeller v1.1.51 github.com/flyteorg/flytestdlib v1.0.14 github.com/flyteorg/stow v0.3.6 diff --git a/flyteadmin/go.sum b/flyteadmin/go.sum index 52b94f688c..11a1cd8892 100644 --- a/flyteadmin/go.sum +++ b/flyteadmin/go.sum @@ -218,14 +218,14 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMpKRTsX2FjEIP2WCWrdOAfvg9nwoObBkJCCnksQaM= -github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo= -github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081 h1:Qxsd2LWl44bfLn75MHrPv32P1PhPZ9fajg39eHZ/a7g= -github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081/go.mod h1:ZbZVBxEWh8Icj1AgfNKg0uPzHHGd9twa4eWcY2Yt6xE= -github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215182111-03a138161b7d h1:Q2TBTMMkPnnFb/U6g8K1uFQcXmFkjrRRorUfV81W5pY= -github.com/blackshark-ai/flytepropeller v0.16.48-0.20221215182111-03a138161b7d/go.mod h1:r65OoIqz8JsXZeGs3V/LK9vZf0oeOpUWW9O1lY+ttBU= -github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced h1:Dxj7o/Q5FPMH+nYKptNq2n5forXJET8MiR2hVDzTMqU= -github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY= +github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f h1:BFpozetWgkWdrOz2wDQY/2pcvm8Wx60uI4mJup+0yrg= +github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20230104150443-bda210ef6073 h1:+4NEKyFn+6Upq4DEIE0p7o0R2Ue1mXmVffTw+boGh+4= +github.com/blackshark-ai/flyteplugins v1.0.2-0.20230104150443-bda210ef6073/go.mod h1:x+e4ongzLdwdq7Gpl7TsPxwh1yal2ndWmB9ZqcjUuz8= +github.com/blackshark-ai/flytepropeller v0.16.48-0.20230104152227-93eb7b4cc558 h1:FGWUf9ncwUL71kk9g4Lj1Hlnl0aOWmqk1/V4vu3u8MA= +github.com/blackshark-ai/flytepropeller v0.16.48-0.20230104152227-93eb7b4cc558/go.mod h1:HPFi9V7+BBtEhBYutUjHSVU0HF9kNNgYg7kbCcPcAng= +github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697 h1:N3ch1D89Hhe72LK9zVuSwZ9DrRl9G3M5fsntD6ydZEY= +github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697/go.mod h1:ojJnMQ9sDf1VW6zrHv8TauKrMV0+Pf+6n+uProvhzac= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= From 4dd0afdde0ebe6bec62ab85e242cbc96613b8ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Fri, 7 Oct 2022 14:47:53 +0200 Subject: [PATCH 10/57] Added datacatalog endpoint for deleting artifacts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- flyteidl/clients/go/admin/authtype_enumer.go | 1 + .../go/datacatalog/mocks/DataCatalogClient.go | 48 + .../datacatalog/datacatalog.grpc.pb.cc | 48 +- .../datacatalog/datacatalog.grpc.pb.h | 208 +- .../flyteidl/datacatalog/datacatalog.pb.cc | 1475 ++++++++++---- .../flyteidl/datacatalog/datacatalog.pb.h | 582 +++++- .../flyteidl/datacatalog/datacatalog.pb.go | 426 ++-- .../datacatalog/datacatalog.pb.validate.go | 154 ++ .../gen/pb-java/datacatalog/Datacatalog.java | 1735 +++++++++++++++-- .../flyteidl/datacatalog/datacatalog_pb2.py | 110 +- .../flyteidl/datacatalog/datacatalog_pb2.pyi | 14 + .../datacatalog/datacatalog_pb2_grpc.py | 34 + .../protos/docs/datacatalog/datacatalog.rst | 38 + .../flyteidl/datacatalog/datacatalog.proto | 24 + 14 files changed, 4198 insertions(+), 699 deletions(-) diff --git a/flyteidl/clients/go/admin/authtype_enumer.go b/flyteidl/clients/go/admin/authtype_enumer.go index 33a816637e..d09a85ac6f 100644 --- a/flyteidl/clients/go/admin/authtype_enumer.go +++ b/flyteidl/clients/go/admin/authtype_enumer.go @@ -1,5 +1,6 @@ // Code generated by "enumer --type=AuthType -json -yaml -trimprefix=AuthType"; DO NOT EDIT. +// package admin import ( diff --git a/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go b/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go index 28e347f66c..8b53552898 100644 --- a/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go +++ b/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go @@ -160,6 +160,54 @@ func (_m *DataCatalogClient) CreateDataset(ctx context.Context, in *datacatalog. return r0, r1 } +type DataCatalogClient_DeleteArtifact struct { + *mock.Call +} + +func (_m DataCatalogClient_DeleteArtifact) Return(_a0 *datacatalog.DeleteArtifactResponse, _a1 error) *DataCatalogClient_DeleteArtifact { + return &DataCatalogClient_DeleteArtifact{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *DataCatalogClient) OnDeleteArtifact(ctx context.Context, in *datacatalog.DeleteArtifactRequest, opts ...grpc.CallOption) *DataCatalogClient_DeleteArtifact { + c_call := _m.On("DeleteArtifact", ctx, in, opts) + return &DataCatalogClient_DeleteArtifact{Call: c_call} +} + +func (_m *DataCatalogClient) OnDeleteArtifactMatch(matchers ...interface{}) *DataCatalogClient_DeleteArtifact { + c_call := _m.On("DeleteArtifact", matchers...) + return &DataCatalogClient_DeleteArtifact{Call: c_call} +} + +// DeleteArtifact provides a mock function with given fields: ctx, in, opts +func (_m *DataCatalogClient) DeleteArtifact(ctx context.Context, in *datacatalog.DeleteArtifactRequest, opts ...grpc.CallOption) (*datacatalog.DeleteArtifactResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *datacatalog.DeleteArtifactResponse + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DeleteArtifactRequest, ...grpc.CallOption) *datacatalog.DeleteArtifactResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*datacatalog.DeleteArtifactResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.DeleteArtifactRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + type DataCatalogClient_GetArtifact struct { *mock.Call } diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc index 9fa10c82c8..3abf6da52c 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc @@ -27,6 +27,7 @@ static const char* DataCatalog_method_names[] = { "/datacatalog.DataCatalog/ListArtifacts", "/datacatalog.DataCatalog/ListDatasets", "/datacatalog.DataCatalog/UpdateArtifact", + "/datacatalog.DataCatalog/DeleteArtifact", "/datacatalog.DataCatalog/GetOrExtendReservation", "/datacatalog.DataCatalog/ReleaseReservation", }; @@ -46,8 +47,9 @@ DataCatalog::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channe , rpcmethod_ListArtifacts_(DataCatalog_method_names[5], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_ListDatasets_(DataCatalog_method_names[6], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_UpdateArtifact_(DataCatalog_method_names[7], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetOrExtendReservation_(DataCatalog_method_names[8], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ReleaseReservation_(DataCatalog_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteArtifact_(DataCatalog_method_names[8], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetOrExtendReservation_(DataCatalog_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ReleaseReservation_(DataCatalog_method_names[10], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} ::grpc::Status DataCatalog::Stub::CreateDataset(::grpc::ClientContext* context, const ::datacatalog::CreateDatasetRequest& request, ::datacatalog::CreateDatasetResponse* response) { @@ -274,6 +276,34 @@ ::grpc::ClientAsyncResponseReader< ::datacatalog::UpdateArtifactResponse>* DataC return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::UpdateArtifactResponse>::Create(channel_.get(), cq, rpcmethod_UpdateArtifact_, context, request, false); } +::grpc::Status DataCatalog::Stub::DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::datacatalog::DeleteArtifactResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_DeleteArtifact_, context, request, response); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifact_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifact_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifact_, context, request, response, reactor); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifact_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataCatalog::Stub::AsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifact_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataCatalog::Stub::PrepareAsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifact_, context, request, false); +} + ::grpc::Status DataCatalog::Stub::GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::datacatalog::GetOrExtendReservationResponse* response) { return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_GetOrExtendReservation_, context, request, response); } @@ -374,10 +404,15 @@ DataCatalog::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( DataCatalog_method_names[8], ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::DeleteArtifactRequest, ::datacatalog::DeleteArtifactResponse>( + std::mem_fn(&DataCatalog::Service::DeleteArtifact), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + DataCatalog_method_names[9], + ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>( std::mem_fn(&DataCatalog::Service::GetOrExtendReservation), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - DataCatalog_method_names[9], + DataCatalog_method_names[10], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>( std::mem_fn(&DataCatalog::Service::ReleaseReservation), this))); @@ -442,6 +477,13 @@ ::grpc::Status DataCatalog::Service::UpdateArtifact(::grpc::ServerContext* conte return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } +::grpc::Status DataCatalog::Service::DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + ::grpc::Status DataCatalog::Service::GetOrExtendReservation(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response) { (void) context; (void) request; diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h index 358bfd9ded..b4c3a41a3c 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h @@ -117,6 +117,14 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::UpdateArtifactResponse>> PrepareAsyncUpdateArtifact(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::UpdateArtifactResponse>>(PrepareAsyncUpdateArtifactRaw(context, request, cq)); } + // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. + virtual ::grpc::Status DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::datacatalog::DeleteArtifactResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> AsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(AsyncDeleteArtifactRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactRaw(context, request, cq)); + } // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -189,6 +197,11 @@ class DataCatalog final { virtual void UpdateArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::UpdateArtifactResponse* response, std::function) = 0; virtual void UpdateArtifact(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest* request, ::datacatalog::UpdateArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void UpdateArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::UpdateArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. + virtual void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0; + virtual void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0; + virtual void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -229,6 +242,8 @@ class DataCatalog final { virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ListDatasetsResponse>* PrepareAsyncListDatasetsRaw(::grpc::ClientContext* context, const ::datacatalog::ListDatasetsRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::UpdateArtifactResponse>* AsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::UpdateArtifactResponse>* PrepareAsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>* AsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>* PrepareAsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) = 0; @@ -293,6 +308,13 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::UpdateArtifactResponse>> PrepareAsyncUpdateArtifact(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::UpdateArtifactResponse>>(PrepareAsyncUpdateArtifactRaw(context, request, cq)); } + ::grpc::Status DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::datacatalog::DeleteArtifactResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> AsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(AsyncDeleteArtifactRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactRaw(context, request, cq)); + } ::grpc::Status GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::datacatalog::GetOrExtendReservationResponse* response) override; std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>> AsyncGetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>>(AsyncGetOrExtendReservationRaw(context, request, cq)); @@ -342,6 +364,10 @@ class DataCatalog final { void UpdateArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::UpdateArtifactResponse* response, std::function) override; void UpdateArtifact(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest* request, ::datacatalog::UpdateArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void UpdateArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::UpdateArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override; + void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override; + void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) override; void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) override; void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; @@ -377,6 +403,8 @@ class DataCatalog final { ::grpc::ClientAsyncResponseReader< ::datacatalog::ListDatasetsResponse>* PrepareAsyncListDatasetsRaw(::grpc::ClientContext* context, const ::datacatalog::ListDatasetsRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::UpdateArtifactResponse>* AsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::UpdateArtifactResponse>* PrepareAsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>* AsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>* PrepareAsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) override; @@ -389,6 +417,7 @@ class DataCatalog final { const ::grpc::internal::RpcMethod rpcmethod_ListArtifacts_; const ::grpc::internal::RpcMethod rpcmethod_ListDatasets_; const ::grpc::internal::RpcMethod rpcmethod_UpdateArtifact_; + const ::grpc::internal::RpcMethod rpcmethod_DeleteArtifact_; const ::grpc::internal::RpcMethod rpcmethod_GetOrExtendReservation_; const ::grpc::internal::RpcMethod rpcmethod_ReleaseReservation_; }; @@ -416,6 +445,8 @@ class DataCatalog final { virtual ::grpc::Status ListDatasets(::grpc::ServerContext* context, const ::datacatalog::ListDatasetsRequest* request, ::datacatalog::ListDatasetsResponse* response); // Updates an existing artifact, overwriting the stored artifact data in the underlying blob storage. virtual ::grpc::Status UpdateArtifact(::grpc::ServerContext* context, const ::datacatalog::UpdateArtifactRequest* request, ::datacatalog::UpdateArtifactResponse* response); + // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. + virtual ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response); // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -593,12 +624,32 @@ class DataCatalog final { } }; template + class WithAsyncMethod_DeleteArtifact : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_DeleteArtifact() { + ::grpc::Service::MarkMethodAsync(8); + } + ~WithAsyncMethod_DeleteArtifact() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestDeleteArtifact(::grpc::ServerContext* context, ::datacatalog::DeleteArtifactRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::DeleteArtifactResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template class WithAsyncMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodAsync(8); + ::grpc::Service::MarkMethodAsync(9); } ~WithAsyncMethod_GetOrExtendReservation() override { BaseClassMustBeDerivedFromService(this); @@ -609,7 +660,7 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetOrExtendReservation(::grpc::ServerContext* context, ::datacatalog::GetOrExtendReservationRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::GetOrExtendReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -618,7 +669,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodAsync(9); + ::grpc::Service::MarkMethodAsync(10); } ~WithAsyncMethod_ReleaseReservation() override { BaseClassMustBeDerivedFromService(this); @@ -629,10 +680,10 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestReleaseReservation(::grpc::ServerContext* context, ::datacatalog::ReleaseReservationRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::ReleaseReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_CreateDataset > > > > > > > > > AsyncService; + typedef WithAsyncMethod_CreateDataset > > > > > > > > > > AsyncService; template class ExperimentalWithCallbackMethod_CreateDataset : public BaseClass { private: @@ -882,12 +933,43 @@ class DataCatalog final { virtual void UpdateArtifact(::grpc::ServerContext* context, const ::datacatalog::UpdateArtifactRequest* request, ::datacatalog::UpdateArtifactResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithCallbackMethod_DeleteArtifact : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_DeleteArtifact() { + ::grpc::Service::experimental().MarkMethodCallback(8, + new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::DeleteArtifactRequest, ::datacatalog::DeleteArtifactResponse>( + [this](::grpc::ServerContext* context, + const ::datacatalog::DeleteArtifactRequest* request, + ::datacatalog::DeleteArtifactResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->DeleteArtifact(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_DeleteArtifact( + ::grpc::experimental::MessageAllocator< ::datacatalog::DeleteArtifactRequest, ::datacatalog::DeleteArtifactResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::DeleteArtifactRequest, ::datacatalog::DeleteArtifactResponse>*>( + ::grpc::Service::experimental().GetHandler(8)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_DeleteArtifact() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithCallbackMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetOrExtendReservation() { - ::grpc::Service::experimental().MarkMethodCallback(8, + ::grpc::Service::experimental().MarkMethodCallback(9, new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>( [this](::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, @@ -899,7 +981,7 @@ class DataCatalog final { void SetMessageAllocatorFor_GetOrExtendReservation( ::grpc::experimental::MessageAllocator< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>*>( - ::grpc::Service::experimental().GetHandler(8)) + ::grpc::Service::experimental().GetHandler(9)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetOrExtendReservation() override { @@ -918,7 +1000,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ReleaseReservation() { - ::grpc::Service::experimental().MarkMethodCallback(9, + ::grpc::Service::experimental().MarkMethodCallback(10, new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>( [this](::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, @@ -930,7 +1012,7 @@ class DataCatalog final { void SetMessageAllocatorFor_ReleaseReservation( ::grpc::experimental::MessageAllocator< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>*>( - ::grpc::Service::experimental().GetHandler(9)) + ::grpc::Service::experimental().GetHandler(10)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ReleaseReservation() override { @@ -943,7 +1025,7 @@ class DataCatalog final { } virtual void ReleaseReservation(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; - typedef ExperimentalWithCallbackMethod_CreateDataset > > > > > > > > > ExperimentalCallbackService; + typedef ExperimentalWithCallbackMethod_CreateDataset > > > > > > > > > > ExperimentalCallbackService; template class WithGenericMethod_CreateDataset : public BaseClass { private: @@ -1081,12 +1163,29 @@ class DataCatalog final { } }; template + class WithGenericMethod_DeleteArtifact : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_DeleteArtifact() { + ::grpc::Service::MarkMethodGeneric(8); + } + ~WithGenericMethod_DeleteArtifact() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template class WithGenericMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodGeneric(8); + ::grpc::Service::MarkMethodGeneric(9); } ~WithGenericMethod_GetOrExtendReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1103,7 +1202,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodGeneric(9); + ::grpc::Service::MarkMethodGeneric(10); } ~WithGenericMethod_ReleaseReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1275,12 +1374,32 @@ class DataCatalog final { } }; template + class WithRawMethod_DeleteArtifact : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_DeleteArtifact() { + ::grpc::Service::MarkMethodRaw(8); + } + ~WithRawMethod_DeleteArtifact() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestDeleteArtifact(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template class WithRawMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodRaw(8); + ::grpc::Service::MarkMethodRaw(9); } ~WithRawMethod_GetOrExtendReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1291,7 +1410,7 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetOrExtendReservation(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -1300,7 +1419,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodRaw(9); + ::grpc::Service::MarkMethodRaw(10); } ~WithRawMethod_ReleaseReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1311,7 +1430,7 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestReleaseReservation(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -1515,12 +1634,37 @@ class DataCatalog final { virtual void UpdateArtifact(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithRawCallbackMethod_DeleteArtifact : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_DeleteArtifact() { + ::grpc::Service::experimental().MarkMethodRawCallback(8, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->DeleteArtifact(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_DeleteArtifact() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void DeleteArtifact(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithRawCallbackMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetOrExtendReservation() { - ::grpc::Service::experimental().MarkMethodRawCallback(8, + ::grpc::Service::experimental().MarkMethodRawCallback(9, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -1545,7 +1689,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ReleaseReservation() { - ::grpc::Service::experimental().MarkMethodRawCallback(9, + ::grpc::Service::experimental().MarkMethodRawCallback(10, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -1725,12 +1869,32 @@ class DataCatalog final { virtual ::grpc::Status StreamedUpdateArtifact(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::UpdateArtifactRequest,::datacatalog::UpdateArtifactResponse>* server_unary_streamer) = 0; }; template + class WithStreamedUnaryMethod_DeleteArtifact : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_DeleteArtifact() { + ::grpc::Service::MarkMethodStreamed(8, + new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::DeleteArtifactRequest, ::datacatalog::DeleteArtifactResponse>(std::bind(&WithStreamedUnaryMethod_DeleteArtifact::StreamedDeleteArtifact, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_DeleteArtifact() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedDeleteArtifact(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::DeleteArtifactRequest,::datacatalog::DeleteArtifactResponse>* server_unary_streamer) = 0; + }; + template class WithStreamedUnaryMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodStreamed(8, + ::grpc::Service::MarkMethodStreamed(9, new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>(std::bind(&WithStreamedUnaryMethod_GetOrExtendReservation::StreamedGetOrExtendReservation, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetOrExtendReservation() override { @@ -1750,7 +1914,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodStreamed(9, + ::grpc::Service::MarkMethodStreamed(10, new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>(std::bind(&WithStreamedUnaryMethod_ReleaseReservation::StreamedReleaseReservation, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ReleaseReservation() override { @@ -1764,9 +1928,9 @@ class DataCatalog final { // replace default version of method with streamed unary virtual ::grpc::Status StreamedReleaseReservation(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::ReleaseReservationRequest,::datacatalog::ReleaseReservationResponse>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > StreamedUnaryService; + typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > StreamedUnaryService; typedef Service SplitStreamedService; - typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > StreamedService; + typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > StreamedService; }; } // namespace datacatalog diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc index a133969583..5741f661d6 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc @@ -106,6 +106,16 @@ class UpdateArtifactResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _UpdateArtifactResponse_default_instance_; +class DeleteArtifactRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ArenaStringPtr artifact_id_; + ::google::protobuf::internal::ArenaStringPtr tag_name_; +} _DeleteArtifactRequest_default_instance_; +class DeleteArtifactResponseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _DeleteArtifactResponse_default_instance_; class ReservationIDDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -446,6 +456,35 @@ static void InitDefaultsUpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacata ::google::protobuf::internal::SCCInfo<0> scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsUpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {}}; +static void InitDefaultsDeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::datacatalog::_DeleteArtifactRequest_default_instance_; + new (ptr) ::datacatalog::DeleteArtifactRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::datacatalog::DeleteArtifactRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsDeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { + &scc_info_DatasetID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; + +static void InitDefaultsDeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::datacatalog::_DeleteArtifactResponse_default_instance_; + new (ptr) ::datacatalog::DeleteArtifactResponse(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::datacatalog::DeleteArtifactResponse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsDeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {}}; + static void InitDefaultsReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -796,6 +835,8 @@ void InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_ListDatasetsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_UpdateArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); @@ -820,7 +861,7 @@ void InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_PaginationOptions_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[38]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[40]; const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[3]; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = nullptr; @@ -931,6 +972,20 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::datacatalog::UpdateArtifactResponse, artifact_id_), ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactRequest, _internal_metadata_), + ~0u, // no _extensions_ + PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactRequest, _oneof_case_[0]), + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactRequest, dataset_), + offsetof(::datacatalog::DeleteArtifactRequestDefaultTypeInternal, artifact_id_), + offsetof(::datacatalog::DeleteArtifactRequestDefaultTypeInternal, tag_name_), + PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactRequest, query_handle_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactResponse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::datacatalog::ReservationID, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ @@ -1122,28 +1177,30 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 82, -1, sizeof(::datacatalog::ListDatasetsResponse)}, { 89, -1, sizeof(::datacatalog::UpdateArtifactRequest)}, { 99, -1, sizeof(::datacatalog::UpdateArtifactResponse)}, - { 105, -1, sizeof(::datacatalog::ReservationID)}, - { 112, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)}, - { 120, -1, sizeof(::datacatalog::Reservation)}, - { 130, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)}, - { 136, -1, sizeof(::datacatalog::ReleaseReservationRequest)}, - { 143, -1, sizeof(::datacatalog::ReleaseReservationResponse)}, - { 148, -1, sizeof(::datacatalog::Dataset)}, - { 156, -1, sizeof(::datacatalog::Partition)}, - { 163, -1, sizeof(::datacatalog::DatasetID)}, - { 173, -1, sizeof(::datacatalog::Artifact)}, - { 185, -1, sizeof(::datacatalog::ArtifactData)}, - { 192, -1, sizeof(::datacatalog::Tag)}, - { 200, 207, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)}, - { 209, -1, sizeof(::datacatalog::Metadata)}, - { 215, -1, sizeof(::datacatalog::FilterExpression)}, - { 221, -1, sizeof(::datacatalog::SinglePropertyFilter)}, - { 232, -1, sizeof(::datacatalog::ArtifactPropertyFilter)}, - { 239, -1, sizeof(::datacatalog::TagPropertyFilter)}, - { 246, -1, sizeof(::datacatalog::PartitionPropertyFilter)}, - { 253, -1, sizeof(::datacatalog::KeyValuePair)}, - { 260, -1, sizeof(::datacatalog::DatasetPropertyFilter)}, - { 270, -1, sizeof(::datacatalog::PaginationOptions)}, + { 105, -1, sizeof(::datacatalog::DeleteArtifactRequest)}, + { 114, -1, sizeof(::datacatalog::DeleteArtifactResponse)}, + { 119, -1, sizeof(::datacatalog::ReservationID)}, + { 126, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)}, + { 134, -1, sizeof(::datacatalog::Reservation)}, + { 144, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)}, + { 150, -1, sizeof(::datacatalog::ReleaseReservationRequest)}, + { 157, -1, sizeof(::datacatalog::ReleaseReservationResponse)}, + { 162, -1, sizeof(::datacatalog::Dataset)}, + { 170, -1, sizeof(::datacatalog::Partition)}, + { 177, -1, sizeof(::datacatalog::DatasetID)}, + { 187, -1, sizeof(::datacatalog::Artifact)}, + { 199, -1, sizeof(::datacatalog::ArtifactData)}, + { 206, -1, sizeof(::datacatalog::Tag)}, + { 214, 221, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)}, + { 223, -1, sizeof(::datacatalog::Metadata)}, + { 229, -1, sizeof(::datacatalog::FilterExpression)}, + { 235, -1, sizeof(::datacatalog::SinglePropertyFilter)}, + { 246, -1, sizeof(::datacatalog::ArtifactPropertyFilter)}, + { 253, -1, sizeof(::datacatalog::TagPropertyFilter)}, + { 260, -1, sizeof(::datacatalog::PartitionPropertyFilter)}, + { 267, -1, sizeof(::datacatalog::KeyValuePair)}, + { 274, -1, sizeof(::datacatalog::DatasetPropertyFilter)}, + { 284, -1, sizeof(::datacatalog::PaginationOptions)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -1163,6 +1220,8 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::datacatalog::_ListDatasetsResponse_default_instance_), reinterpret_cast(&::datacatalog::_UpdateArtifactRequest_default_instance_), reinterpret_cast(&::datacatalog::_UpdateArtifactResponse_default_instance_), + reinterpret_cast(&::datacatalog::_DeleteArtifactRequest_default_instance_), + reinterpret_cast(&::datacatalog::_DeleteArtifactResponse_default_instance_), reinterpret_cast(&::datacatalog::_ReservationID_default_instance_), reinterpret_cast(&::datacatalog::_GetOrExtendReservationRequest_default_instance_), reinterpret_cast(&::datacatalog::_Reservation_default_instance_), @@ -1190,7 +1249,7 @@ static ::google::protobuf::Message const * const file_default_instances[] = { ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = { {}, AddDescriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, "flyteidl/datacatalog/datacatalog.proto", schemas, file_default_instances, TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto::offsets, - file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 38, file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, + file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 40, file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, }; const char descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[] = @@ -1228,99 +1287,105 @@ const char descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eprot "_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001(\tH\000\022\'\n\004data\030" "\004 \003(\0132\031.datacatalog.ArtifactDataB\016\n\014quer" "y_handle\"-\n\026UpdateArtifactResponse\022\023\n\013ar" - "tifact_id\030\001 \001(\t\"M\n\rReservationID\022*\n\ndata" - "set_id\030\001 \001(\0132\026.datacatalog.DatasetID\022\020\n\010" - "tag_name\030\002 \001(\t\"\234\001\n\035GetOrExtendReservatio" - "nRequest\0222\n\016reservation_id\030\001 \001(\0132\032.datac" - "atalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225" - "\n\022heartbeat_interval\030\003 \001(\0132\031.google.prot" - "obuf.Duration\"\343\001\n\013Reservation\0222\n\016reserva" - "tion_id\030\001 \001(\0132\032.datacatalog.ReservationI" - "D\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbeat_interva" - "l\030\003 \001(\0132\031.google.protobuf.Duration\022.\n\nex" - "pires_at\030\004 \001(\0132\032.google.protobuf.Timesta" - "mp\022\'\n\010metadata\030\006 \001(\0132\025.datacatalog.Metad" - "ata\"O\n\036GetOrExtendReservationResponse\022-\n" - "\013reservation\030\001 \001(\0132\030.datacatalog.Reserva" - "tion\"a\n\031ReleaseReservationRequest\0222\n\016res" - "ervation_id\030\001 \001(\0132\032.datacatalog.Reservat" - "ionID\022\020\n\010owner_id\030\002 \001(\t\"\034\n\032ReleaseReserv" - "ationResponse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.d" - "atacatalog.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025" - ".datacatalog.Metadata\022\025\n\rpartitionKeys\030\003" - " \003(\t\"\'\n\tPartition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" - "\002 \001(\t\"Y\n\tDatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004n" - "ame\030\002 \001(\t\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001" - "(\t\022\014\n\004UUID\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(" - "\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Dataset" - "ID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.ArtifactD" - "ata\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog.Meta" - "data\022*\n\npartitions\030\005 \003(\0132\026.datacatalog.P" - "artition\022\036\n\004tags\030\006 \003(\0132\020.datacatalog.Tag" - "\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf.T" - "imestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022%" - "\n\005value\030\002 \001(\0132\026.flyteidl.core.Literal\"Q\n" - "\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022" - "\'\n\007dataset\030\003 \001(\0132\026.datacatalog.DatasetID" - "\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.datacata" - "log.Metadata.KeyMapEntry\032-\n\013KeyMapEntry\022" - "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020Filte" - "rExpression\0222\n\007filters\030\001 \003(\0132!.datacatal" - "og.SinglePropertyFilter\"\211\003\n\024SingleProper" - "tyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.datacatal" - "og.TagPropertyFilterH\000\022@\n\020partition_filt" - "er\030\002 \001(\0132$.datacatalog.PartitionProperty" - "FilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#.data" - "catalog.ArtifactPropertyFilterH\000\022<\n\016data" - "set_filter\030\004 \001(\0132\".datacatalog.DatasetPr" - "opertyFilterH\000\022F\n\010operator\030\n \001(\01624.datac" - "atalog.SinglePropertyFilter.ComparisonOp" - "erator\" \n\022ComparisonOperator\022\n\n\006EQUALS\020\000" - "B\021\n\017property_filter\";\n\026ArtifactPropertyF" - "ilter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010property" - "\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001 \001(\tH" - "\000B\n\n\010property\"S\n\027PartitionPropertyFilter" - "\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.KeyValue" - "PairH\000B\n\n\010property\"*\n\014KeyValuePair\022\013\n\003ke" - "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"k\n\025DatasetPropert" - "yFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\t" - "H\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B" - "\n\n\010property\"\361\001\n\021PaginationOptions\022\r\n\005lim" - "it\030\001 \001(\r\022\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\016" - "2&.datacatalog.PaginationOptions.SortKey" - "\022;\n\tsortOrder\030\004 \001(\0162(.datacatalog.Pagina" - "tionOptions.SortOrder\"*\n\tSortOrder\022\016\n\nDE" - "SCENDING\020\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\r" - "CREATION_TIME\020\0002\206\007\n\013DataCatalog\022V\n\rCreat" - "eDataset\022!.datacatalog.CreateDatasetRequ" - "est\032\".datacatalog.CreateDatasetResponse\022" - "M\n\nGetDataset\022\036.datacatalog.GetDatasetRe" - "quest\032\037.datacatalog.GetDatasetResponse\022Y" - "\n\016CreateArtifact\022\".datacatalog.CreateArt" - "ifactRequest\032#.datacatalog.CreateArtifac" - "tResponse\022P\n\013GetArtifact\022\037.datacatalog.G" - "etArtifactRequest\032 .datacatalog.GetArtif" - "actResponse\022A\n\006AddTag\022\032.datacatalog.AddT" - "agRequest\032\033.datacatalog.AddTagResponse\022V" - "\n\rListArtifacts\022!.datacatalog.ListArtifa" - "ctsRequest\032\".datacatalog.ListArtifactsRe" - "sponse\022S\n\014ListDatasets\022 .datacatalog.Lis" - "tDatasetsRequest\032!.datacatalog.ListDatas" - "etsResponse\022Y\n\016UpdateArtifact\022\".datacata" - "log.UpdateArtifactRequest\032#.datacatalog." - "UpdateArtifactResponse\022q\n\026GetOrExtendRes" - "ervation\022*.datacatalog.GetOrExtendReserv" - "ationRequest\032+.datacatalog.GetOrExtendRe" - "servationResponse\022e\n\022ReleaseReservation\022" - "&.datacatalog.ReleaseReservationRequest\032" - "\'.datacatalog.ReleaseReservationResponse" - "B=Z;github.com/flyteorg/flyteidl/gen/pb-" - "go/flyteidl/datacatalogb\006proto3" + "tifact_id\030\001 \001(\t\"{\n\025DeleteArtifactRequest" + "\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.DatasetI" + "D\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001" + "(\tH\000B\016\n\014query_handle\"\030\n\026DeleteArtifactRe" + "sponse\"M\n\rReservationID\022*\n\ndataset_id\030\001 " + "\001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name\030" + "\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest\022" + "2\n\016reservation_id\030\001 \001(\0132\032.datacatalog.Re" + "servationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbe" + "at_interval\030\003 \001(\0132\031.google.protobuf.Dura" + "tion\"\343\001\n\013Reservation\0222\n\016reservation_id\030\001" + " \001(\0132\032.datacatalog.ReservationID\022\020\n\010owne" + "r_id\030\002 \001(\t\0225\n\022heartbeat_interval\030\003 \001(\0132\031" + ".google.protobuf.Duration\022.\n\nexpires_at\030" + "\004 \001(\0132\032.google.protobuf.Timestamp\022\'\n\010met" + "adata\030\006 \001(\0132\025.datacatalog.Metadata\"O\n\036Ge" + "tOrExtendReservationResponse\022-\n\013reservat" + "ion\030\001 \001(\0132\030.datacatalog.Reservation\"a\n\031R" + "eleaseReservationRequest\0222\n\016reservation_" + "id\030\001 \001(\0132\032.datacatalog.ReservationID\022\020\n\010" + "owner_id\030\002 \001(\t\"\034\n\032ReleaseReservationResp" + "onse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalo" + "g.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacata" + "log.Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tP" + "artition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\t" + "DatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t" + "\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUI" + "D\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007data" + "set\030\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004dat" + "a\030\003 \003(\0132\031.datacatalog.ArtifactData\022\'\n\010me" + "tadata\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\np" + "artitions\030\005 \003(\0132\026.datacatalog.Partition\022" + "\036\n\004tags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreat" + "ed_at\030\007 \001(\0132\032.google.protobuf.Timestamp\"" + "C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002" + " \001(\0132\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004n" + "ame\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007datase" + "t\030\003 \001(\0132\026.datacatalog.DatasetID\"m\n\010Metad" + "ata\0222\n\007key_map\030\001 \003(\0132!.datacatalog.Metad" + "ata.KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 " + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpressi" + "on\0222\n\007filters\030\001 \003(\0132!.datacatalog.Single" + "PropertyFilter\"\211\003\n\024SinglePropertyFilter\022" + "4\n\ntag_filter\030\001 \001(\0132\036.datacatalog.TagPro" + "pertyFilterH\000\022@\n\020partition_filter\030\002 \001(\0132" + "$.datacatalog.PartitionPropertyFilterH\000\022" + ">\n\017artifact_filter\030\003 \001(\0132#.datacatalog.A" + "rtifactPropertyFilterH\000\022<\n\016dataset_filte" + "r\030\004 \001(\0132\".datacatalog.DatasetPropertyFil" + "terH\000\022F\n\010operator\030\n \001(\01624.datacatalog.Si" + "nglePropertyFilter.ComparisonOperator\" \n" + "\022ComparisonOperator\022\n\n\006EQUALS\020\000B\021\n\017prope" + "rty_filter\";\n\026ArtifactPropertyFilter\022\025\n\013" + "artifact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagPr" + "opertyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010prop" + "erty\"S\n\027PartitionPropertyFilter\022,\n\007key_v" + "al\030\001 \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n" + "\010property\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r" + "\n\005value\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021" + "\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006dom" + "ain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010proper" + "ty\"\361\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022" + "\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.dataca" + "talog.PaginationOptions.SortKey\022;\n\tsortO" + "rder\030\004 \001(\0162(.datacatalog.PaginationOptio" + "ns.SortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020" + "\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_" + "TIME\020\0002\341\007\n\013DataCatalog\022V\n\rCreateDataset\022" + "!.datacatalog.CreateDatasetRequest\032\".dat" + "acatalog.CreateDatasetResponse\022M\n\nGetDat" + "aset\022\036.datacatalog.GetDatasetRequest\032\037.d" + "atacatalog.GetDatasetResponse\022Y\n\016CreateA" + "rtifact\022\".datacatalog.CreateArtifactRequ" + "est\032#.datacatalog.CreateArtifactResponse" + "\022P\n\013GetArtifact\022\037.datacatalog.GetArtifac" + "tRequest\032 .datacatalog.GetArtifactRespon" + "se\022A\n\006AddTag\022\032.datacatalog.AddTagRequest" + "\032\033.datacatalog.AddTagResponse\022V\n\rListArt" + "ifacts\022!.datacatalog.ListArtifactsReques" + "t\032\".datacatalog.ListArtifactsResponse\022S\n" + "\014ListDatasets\022 .datacatalog.ListDatasets" + "Request\032!.datacatalog.ListDatasetsRespon" + "se\022Y\n\016UpdateArtifact\022\".datacatalog.Updat" + "eArtifactRequest\032#.datacatalog.UpdateArt" + "ifactResponse\022Y\n\016DeleteArtifact\022\".dataca" + "talog.DeleteArtifactRequest\032#.datacatalo" + "g.DeleteArtifactResponse\022q\n\026GetOrExtendR" + "eservation\022*.datacatalog.GetOrExtendRese" + "rvationRequest\032+.datacatalog.GetOrExtend" + "ReservationResponse\022e\n\022ReleaseReservatio" + "n\022&.datacatalog.ReleaseReservationReques" + "t\032\'.datacatalog.ReleaseReservationRespon" + "seB=Z;github.com/flyteorg/flyteidl/gen/p" + "b-go/flyteidl/datacatalogb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = { false, InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, - "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 4871, + "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 5113, }; void AddDescriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { @@ -5763,39 +5828,867 @@ UpdateArtifactRequest::UpdateArtifactRequest(const UpdateArtifactRequest& from) break; } } - // @@protoc_insertion_point(copy_constructor:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(copy_constructor:datacatalog.UpdateArtifactRequest) +} + +void UpdateArtifactRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_UpdateArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + dataset_ = nullptr; + clear_has_query_handle(); +} + +UpdateArtifactRequest::~UpdateArtifactRequest() { + // @@protoc_insertion_point(destructor:datacatalog.UpdateArtifactRequest) + SharedDtor(); +} + +void UpdateArtifactRequest::SharedDtor() { + if (this != internal_default_instance()) delete dataset_; + if (has_query_handle()) { + clear_query_handle(); + } +} + +void UpdateArtifactRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const UpdateArtifactRequest& UpdateArtifactRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_UpdateArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + return *internal_default_instance(); +} + + +void UpdateArtifactRequest::clear_query_handle() { +// @@protoc_insertion_point(one_of_clear_start:datacatalog.UpdateArtifactRequest) + switch (query_handle_case()) { + case kArtifactId: { + query_handle_.artifact_id_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + break; + } + case kTagName: { + query_handle_.tag_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + break; + } + case QUERY_HANDLE_NOT_SET: { + break; + } + } + _oneof_case_[0] = QUERY_HANDLE_NOT_SET; +} + + +void UpdateArtifactRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.UpdateArtifactRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + data_.Clear(); + if (GetArenaNoVirtual() == nullptr && dataset_ != nullptr) { + delete dataset_; + } + dataset_ = nullptr; + clear_query_handle(); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* UpdateArtifactRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .datacatalog.DatasetID dataset = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::datacatalog::DatasetID::_InternalParse; + object = msg->mutable_dataset(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // string artifact_id = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("datacatalog.UpdateArtifactRequest.artifact_id"); + object = msg->mutable_artifact_id(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string tag_name = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("datacatalog.UpdateArtifactRequest.tag_name"); + object = msg->mutable_tag_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // repeated .datacatalog.ArtifactData data = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::datacatalog::ArtifactData::_InternalParse; + object = msg->add_data(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool UpdateArtifactRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:datacatalog.UpdateArtifactRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .datacatalog.DatasetID dataset = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_dataset())); + } else { + goto handle_unusual; + } + break; + } + + // string artifact_id = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_artifact_id())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->artifact_id().data(), static_cast(this->artifact_id().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "datacatalog.UpdateArtifactRequest.artifact_id")); + } else { + goto handle_unusual; + } + break; + } + + // string tag_name = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_tag_name())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->tag_name().data(), static_cast(this->tag_name().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "datacatalog.UpdateArtifactRequest.tag_name")); + } else { + goto handle_unusual; + } + break; + } + + // repeated .datacatalog.ArtifactData data = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_data())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:datacatalog.UpdateArtifactRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:datacatalog.UpdateArtifactRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void UpdateArtifactRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:datacatalog.UpdateArtifactRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .datacatalog.DatasetID dataset = 1; + if (this->has_dataset()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::dataset(this), output); + } + + // string artifact_id = 2; + if (has_artifact_id()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->artifact_id().data(), static_cast(this->artifact_id().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "datacatalog.UpdateArtifactRequest.artifact_id"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->artifact_id(), output); + } + + // string tag_name = 3; + if (has_tag_name()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->tag_name().data(), static_cast(this->tag_name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "datacatalog.UpdateArtifactRequest.tag_name"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->tag_name(), output); + } + + // repeated .datacatalog.ArtifactData data = 4; + for (unsigned int i = 0, + n = static_cast(this->data_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 4, + this->data(static_cast(i)), + output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:datacatalog.UpdateArtifactRequest) +} + +::google::protobuf::uint8* UpdateArtifactRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.UpdateArtifactRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .datacatalog.DatasetID dataset = 1; + if (this->has_dataset()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::dataset(this), target); + } + + // string artifact_id = 2; + if (has_artifact_id()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->artifact_id().data(), static_cast(this->artifact_id().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "datacatalog.UpdateArtifactRequest.artifact_id"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 2, this->artifact_id(), target); + } + + // string tag_name = 3; + if (has_tag_name()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->tag_name().data(), static_cast(this->tag_name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "datacatalog.UpdateArtifactRequest.tag_name"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 3, this->tag_name(), target); + } + + // repeated .datacatalog.ArtifactData data = 4; + for (unsigned int i = 0, + n = static_cast(this->data_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 4, this->data(static_cast(i)), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.UpdateArtifactRequest) + return target; +} + +size_t UpdateArtifactRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.UpdateArtifactRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // repeated .datacatalog.ArtifactData data = 4; + { + unsigned int count = static_cast(this->data_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->data(static_cast(i))); + } + } + + // .datacatalog.DatasetID dataset = 1; + if (this->has_dataset()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *dataset_); + } + + switch (query_handle_case()) { + // string artifact_id = 2; + case kArtifactId: { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->artifact_id()); + break; + } + // string tag_name = 3; + case kTagName: { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->tag_name()); + break; + } + case QUERY_HANDLE_NOT_SET: { + break; + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void UpdateArtifactRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.UpdateArtifactRequest) + GOOGLE_DCHECK_NE(&from, this); + const UpdateArtifactRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.UpdateArtifactRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.UpdateArtifactRequest) + MergeFrom(*source); + } +} + +void UpdateArtifactRequest::MergeFrom(const UpdateArtifactRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.UpdateArtifactRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + data_.MergeFrom(from.data_); + if (from.has_dataset()) { + mutable_dataset()->::datacatalog::DatasetID::MergeFrom(from.dataset()); + } + switch (from.query_handle_case()) { + case kArtifactId: { + set_artifact_id(from.artifact_id()); + break; + } + case kTagName: { + set_tag_name(from.tag_name()); + break; + } + case QUERY_HANDLE_NOT_SET: { + break; + } + } +} + +void UpdateArtifactRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.UpdateArtifactRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void UpdateArtifactRequest::CopyFrom(const UpdateArtifactRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.UpdateArtifactRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool UpdateArtifactRequest::IsInitialized() const { + return true; +} + +void UpdateArtifactRequest::Swap(UpdateArtifactRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void UpdateArtifactRequest::InternalSwap(UpdateArtifactRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + CastToBase(&data_)->InternalSwap(CastToBase(&other->data_)); + swap(dataset_, other->dataset_); + swap(query_handle_, other->query_handle_); + swap(_oneof_case_[0], other->_oneof_case_[0]); +} + +::google::protobuf::Metadata UpdateArtifactRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void UpdateArtifactResponse::InitAsDefaultInstance() { +} +class UpdateArtifactResponse::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int UpdateArtifactResponse::kArtifactIdFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +UpdateArtifactResponse::UpdateArtifactResponse() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:datacatalog.UpdateArtifactResponse) +} +UpdateArtifactResponse::UpdateArtifactResponse(const UpdateArtifactResponse& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.artifact_id().size() > 0) { + artifact_id_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.artifact_id_); + } + // @@protoc_insertion_point(copy_constructor:datacatalog.UpdateArtifactResponse) +} + +void UpdateArtifactResponse::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} + +UpdateArtifactResponse::~UpdateArtifactResponse() { + // @@protoc_insertion_point(destructor:datacatalog.UpdateArtifactResponse) + SharedDtor(); +} + +void UpdateArtifactResponse::SharedDtor() { + artifact_id_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} + +void UpdateArtifactResponse::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const UpdateArtifactResponse& UpdateArtifactResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + return *internal_default_instance(); +} + + +void UpdateArtifactResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.UpdateArtifactResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + artifact_id_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* UpdateArtifactResponse::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string artifact_id = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("datacatalog.UpdateArtifactResponse.artifact_id"); + object = msg->mutable_artifact_id(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool UpdateArtifactResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:datacatalog.UpdateArtifactResponse) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string artifact_id = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_artifact_id())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->artifact_id().data(), static_cast(this->artifact_id().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "datacatalog.UpdateArtifactResponse.artifact_id")); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:datacatalog.UpdateArtifactResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:datacatalog.UpdateArtifactResponse) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void UpdateArtifactResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:datacatalog.UpdateArtifactResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string artifact_id = 1; + if (this->artifact_id().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->artifact_id().data(), static_cast(this->artifact_id().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "datacatalog.UpdateArtifactResponse.artifact_id"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->artifact_id(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:datacatalog.UpdateArtifactResponse) +} + +::google::protobuf::uint8* UpdateArtifactResponse::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.UpdateArtifactResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string artifact_id = 1; + if (this->artifact_id().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->artifact_id().data(), static_cast(this->artifact_id().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "datacatalog.UpdateArtifactResponse.artifact_id"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->artifact_id(), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.UpdateArtifactResponse) + return target; +} + +size_t UpdateArtifactResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.UpdateArtifactResponse) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // string artifact_id = 1; + if (this->artifact_id().size() > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->artifact_id()); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void UpdateArtifactResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.UpdateArtifactResponse) + GOOGLE_DCHECK_NE(&from, this); + const UpdateArtifactResponse* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.UpdateArtifactResponse) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.UpdateArtifactResponse) + MergeFrom(*source); + } +} + +void UpdateArtifactResponse::MergeFrom(const UpdateArtifactResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.UpdateArtifactResponse) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.artifact_id().size() > 0) { + + artifact_id_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.artifact_id_); + } +} + +void UpdateArtifactResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.UpdateArtifactResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void UpdateArtifactResponse::CopyFrom(const UpdateArtifactResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.UpdateArtifactResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool UpdateArtifactResponse::IsInitialized() const { + return true; +} + +void UpdateArtifactResponse::Swap(UpdateArtifactResponse* other) { + if (other == this) return; + InternalSwap(other); +} +void UpdateArtifactResponse::InternalSwap(UpdateArtifactResponse* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + artifact_id_.Swap(&other->artifact_id_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); +} + +::google::protobuf::Metadata UpdateArtifactResponse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void DeleteArtifactRequest::InitAsDefaultInstance() { + ::datacatalog::_DeleteArtifactRequest_default_instance_._instance.get_mutable()->dataset_ = const_cast< ::datacatalog::DatasetID*>( + ::datacatalog::DatasetID::internal_default_instance()); + ::datacatalog::_DeleteArtifactRequest_default_instance_.artifact_id_.UnsafeSetDefault( + &::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::datacatalog::_DeleteArtifactRequest_default_instance_.tag_name_.UnsafeSetDefault( + &::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +class DeleteArtifactRequest::HasBitSetters { + public: + static const ::datacatalog::DatasetID& dataset(const DeleteArtifactRequest* msg); +}; + +const ::datacatalog::DatasetID& +DeleteArtifactRequest::HasBitSetters::dataset(const DeleteArtifactRequest* msg) { + return *msg->dataset_; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int DeleteArtifactRequest::kDatasetFieldNumber; +const int DeleteArtifactRequest::kArtifactIdFieldNumber; +const int DeleteArtifactRequest::kTagNameFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +DeleteArtifactRequest::DeleteArtifactRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactRequest) +} +DeleteArtifactRequest::DeleteArtifactRequest(const DeleteArtifactRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_dataset()) { + dataset_ = new ::datacatalog::DatasetID(*from.dataset_); + } else { + dataset_ = nullptr; + } + clear_has_query_handle(); + switch (from.query_handle_case()) { + case kArtifactId: { + set_artifact_id(from.artifact_id()); + break; + } + case kTagName: { + set_tag_name(from.tag_name()); + break; + } + case QUERY_HANDLE_NOT_SET: { + break; + } + } + // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactRequest) } -void UpdateArtifactRequest::SharedCtor() { +void DeleteArtifactRequest::SharedCtor() { ::google::protobuf::internal::InitSCC( - &scc_info_UpdateArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + &scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); dataset_ = nullptr; clear_has_query_handle(); } -UpdateArtifactRequest::~UpdateArtifactRequest() { - // @@protoc_insertion_point(destructor:datacatalog.UpdateArtifactRequest) +DeleteArtifactRequest::~DeleteArtifactRequest() { + // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactRequest) SharedDtor(); } -void UpdateArtifactRequest::SharedDtor() { +void DeleteArtifactRequest::SharedDtor() { if (this != internal_default_instance()) delete dataset_; if (has_query_handle()) { clear_query_handle(); } } -void UpdateArtifactRequest::SetCachedSize(int size) const { +void DeleteArtifactRequest::SetCachedSize(int size) const { _cached_size_.Set(size); } -const UpdateArtifactRequest& UpdateArtifactRequest::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_UpdateArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); +const DeleteArtifactRequest& DeleteArtifactRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); return *internal_default_instance(); } -void UpdateArtifactRequest::clear_query_handle() { -// @@protoc_insertion_point(one_of_clear_start:datacatalog.UpdateArtifactRequest) +void DeleteArtifactRequest::clear_query_handle() { +// @@protoc_insertion_point(one_of_clear_start:datacatalog.DeleteArtifactRequest) switch (query_handle_case()) { case kArtifactId: { query_handle_.artifact_id_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); @@ -5813,13 +6706,12 @@ void UpdateArtifactRequest::clear_query_handle() { } -void UpdateArtifactRequest::Clear() { -// @@protoc_insertion_point(message_clear_start:datacatalog.UpdateArtifactRequest) +void DeleteArtifactRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactRequest) ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - data_.Clear(); if (GetArenaNoVirtual() == nullptr && dataset_ != nullptr) { delete dataset_; } @@ -5829,9 +6721,9 @@ void UpdateArtifactRequest::Clear() { } #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* UpdateArtifactRequest::_InternalParse(const char* begin, const char* end, void* object, +const char* DeleteArtifactRequest::_InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); + auto msg = static_cast(object); ::google::protobuf::int32 size; (void)size; int depth; (void)depth; ::google::protobuf::uint32 tag; @@ -5859,7 +6751,7 @@ const char* UpdateArtifactRequest::_InternalParse(const char* begin, const char* if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("datacatalog.UpdateArtifactRequest.artifact_id"); + ctx->extra_parse_data().SetFieldName("datacatalog.DeleteArtifactRequest.artifact_id"); object = msg->mutable_artifact_id(); if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; @@ -5875,7 +6767,7 @@ const char* UpdateArtifactRequest::_InternalParse(const char* begin, const char* if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("datacatalog.UpdateArtifactRequest.tag_name"); + ctx->extra_parse_data().SetFieldName("datacatalog.DeleteArtifactRequest.tag_name"); object = msg->mutable_tag_name(); if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; @@ -5886,22 +6778,6 @@ const char* UpdateArtifactRequest::_InternalParse(const char* begin, const char* ptr += size; break; } - // repeated .datacatalog.ArtifactData data = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::datacatalog::ArtifactData::_InternalParse; - object = msg->add_data(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); - break; - } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -5926,11 +6802,11 @@ const char* UpdateArtifactRequest::_InternalParse(const char* begin, const char* {parser_till_end, object}, size); } #else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool UpdateArtifactRequest::MergePartialFromCodedStream( +bool DeleteArtifactRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactRequest) for (;;) { ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; @@ -5955,7 +6831,7 @@ bool UpdateArtifactRequest::MergePartialFromCodedStream( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->artifact_id().data(), static_cast(this->artifact_id().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "datacatalog.UpdateArtifactRequest.artifact_id")); + "datacatalog.DeleteArtifactRequest.artifact_id")); } else { goto handle_unusual; } @@ -5970,18 +6846,7 @@ bool UpdateArtifactRequest::MergePartialFromCodedStream( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->tag_name().data(), static_cast(this->tag_name().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "datacatalog.UpdateArtifactRequest.tag_name")); - } else { - goto handle_unusual; - } - break; - } - - // repeated .datacatalog.ArtifactData data = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, add_data())); + "datacatalog.DeleteArtifactRequest.tag_name")); } else { goto handle_unusual; } @@ -6000,18 +6865,18 @@ bool UpdateArtifactRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactRequest) return false; #undef DO_ } #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -void UpdateArtifactRequest::SerializeWithCachedSizes( +void DeleteArtifactRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -6026,7 +6891,7 @@ void UpdateArtifactRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->artifact_id().data(), static_cast(this->artifact_id().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "datacatalog.UpdateArtifactRequest.artifact_id"); + "datacatalog.DeleteArtifactRequest.artifact_id"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 2, this->artifact_id(), output); } @@ -6036,30 +6901,21 @@ void UpdateArtifactRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->tag_name().data(), static_cast(this->tag_name().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "datacatalog.UpdateArtifactRequest.tag_name"); + "datacatalog.DeleteArtifactRequest.tag_name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 3, this->tag_name(), output); } - // repeated .datacatalog.ArtifactData data = 4; - for (unsigned int i = 0, - n = static_cast(this->data_size()); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 4, - this->data(static_cast(i)), - output); - } - if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactRequest) } -::google::protobuf::uint8* UpdateArtifactRequest::InternalSerializeWithCachedSizesToArray( +::google::protobuf::uint8* DeleteArtifactRequest::InternalSerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -6075,7 +6931,7 @@ ::google::protobuf::uint8* UpdateArtifactRequest::InternalSerializeWithCachedSiz ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->artifact_id().data(), static_cast(this->artifact_id().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "datacatalog.UpdateArtifactRequest.artifact_id"); + "datacatalog.DeleteArtifactRequest.artifact_id"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 2, this->artifact_id(), target); @@ -6086,30 +6942,22 @@ ::google::protobuf::uint8* UpdateArtifactRequest::InternalSerializeWithCachedSiz ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->tag_name().data(), static_cast(this->tag_name().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "datacatalog.UpdateArtifactRequest.tag_name"); + "datacatalog.DeleteArtifactRequest.tag_name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 3, this->tag_name(), target); } - // repeated .datacatalog.ArtifactData data = 4; - for (unsigned int i = 0, - n = static_cast(this->data_size()); i < n; i++) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 4, this->data(static_cast(i)), target); - } - if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactRequest) return target; } -size_t UpdateArtifactRequest::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:datacatalog.UpdateArtifactRequest) +size_t DeleteArtifactRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactRequest) size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { @@ -6121,17 +6969,6 @@ size_t UpdateArtifactRequest::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .datacatalog.ArtifactData data = 4; - { - unsigned int count = static_cast(this->data_size()); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSize( - this->data(static_cast(i))); - } - } - // .datacatalog.DatasetID dataset = 1; if (this->has_dataset()) { total_size += 1 + @@ -6163,29 +7000,28 @@ size_t UpdateArtifactRequest::ByteSizeLong() const { return total_size; } -void UpdateArtifactRequest::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.UpdateArtifactRequest) +void DeleteArtifactRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactRequest) GOOGLE_DCHECK_NE(&from, this); - const UpdateArtifactRequest* source = - ::google::protobuf::DynamicCastToGenerated( + const DeleteArtifactRequest* source = + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactRequest) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.UpdateArtifactRequest) + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactRequest) MergeFrom(*source); } } -void UpdateArtifactRequest::MergeFrom(const UpdateArtifactRequest& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.UpdateArtifactRequest) +void DeleteArtifactRequest::MergeFrom(const DeleteArtifactRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactRequest) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - data_.MergeFrom(from.data_); if (from.has_dataset()) { mutable_dataset()->::datacatalog::DatasetID::MergeFrom(from.dataset()); } @@ -6204,38 +7040,37 @@ void UpdateArtifactRequest::MergeFrom(const UpdateArtifactRequest& from) { } } -void UpdateArtifactRequest::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.UpdateArtifactRequest) +void DeleteArtifactRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactRequest) if (&from == this) return; Clear(); MergeFrom(from); } -void UpdateArtifactRequest::CopyFrom(const UpdateArtifactRequest& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.UpdateArtifactRequest) +void DeleteArtifactRequest::CopyFrom(const DeleteArtifactRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactRequest) if (&from == this) return; Clear(); MergeFrom(from); } -bool UpdateArtifactRequest::IsInitialized() const { +bool DeleteArtifactRequest::IsInitialized() const { return true; } -void UpdateArtifactRequest::Swap(UpdateArtifactRequest* other) { +void DeleteArtifactRequest::Swap(DeleteArtifactRequest* other) { if (other == this) return; InternalSwap(other); } -void UpdateArtifactRequest::InternalSwap(UpdateArtifactRequest* other) { +void DeleteArtifactRequest::InternalSwap(DeleteArtifactRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - CastToBase(&data_)->InternalSwap(CastToBase(&other->data_)); swap(dataset_, other->dataset_); swap(query_handle_, other->query_handle_); swap(_oneof_case_[0], other->_oneof_case_[0]); } -::google::protobuf::Metadata UpdateArtifactRequest::GetMetadata() const { +::google::protobuf::Metadata DeleteArtifactRequest::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; } @@ -6243,70 +7078,60 @@ ::google::protobuf::Metadata UpdateArtifactRequest::GetMetadata() const { // =================================================================== -void UpdateArtifactResponse::InitAsDefaultInstance() { +void DeleteArtifactResponse::InitAsDefaultInstance() { } -class UpdateArtifactResponse::HasBitSetters { +class DeleteArtifactResponse::HasBitSetters { public: }; #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int UpdateArtifactResponse::kArtifactIdFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -UpdateArtifactResponse::UpdateArtifactResponse() +DeleteArtifactResponse::DeleteArtifactResponse() : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); - // @@protoc_insertion_point(constructor:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactResponse) } -UpdateArtifactResponse::UpdateArtifactResponse(const UpdateArtifactResponse& from) +DeleteArtifactResponse::DeleteArtifactResponse(const DeleteArtifactResponse& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.artifact_id().size() > 0) { - artifact_id_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.artifact_id_); - } - // @@protoc_insertion_point(copy_constructor:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactResponse) } -void UpdateArtifactResponse::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); - artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +void DeleteArtifactResponse::SharedCtor() { } -UpdateArtifactResponse::~UpdateArtifactResponse() { - // @@protoc_insertion_point(destructor:datacatalog.UpdateArtifactResponse) +DeleteArtifactResponse::~DeleteArtifactResponse() { + // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactResponse) SharedDtor(); } -void UpdateArtifactResponse::SharedDtor() { - artifact_id_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +void DeleteArtifactResponse::SharedDtor() { } -void UpdateArtifactResponse::SetCachedSize(int size) const { +void DeleteArtifactResponse::SetCachedSize(int size) const { _cached_size_.Set(size); } -const UpdateArtifactResponse& UpdateArtifactResponse::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); +const DeleteArtifactResponse& DeleteArtifactResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); return *internal_default_instance(); } -void UpdateArtifactResponse::Clear() { -// @@protoc_insertion_point(message_clear_start:datacatalog.UpdateArtifactResponse) +void DeleteArtifactResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactResponse) ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - artifact_id_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); _internal_metadata_.Clear(); } #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* UpdateArtifactResponse::_InternalParse(const char* begin, const char* end, void* object, +const char* DeleteArtifactResponse::_InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); + auto msg = static_cast(object); ::google::protobuf::int32 size; (void)size; int depth; (void)depth; ::google::protobuf::uint32 tag; @@ -6316,24 +7141,7 @@ const char* UpdateArtifactResponse::_InternalParse(const char* begin, const char ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { - // string artifact_id = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("datacatalog.UpdateArtifactResponse.artifact_id"); - object = msg->mutable_artifact_id(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } default: { - handle_unusual: if ((tag & 7) == 4 || tag == 0) { ctx->EndGroup(tag); return ptr; @@ -6347,111 +7155,63 @@ const char* UpdateArtifactResponse::_InternalParse(const char* begin, const char } // switch } // while return ptr; -string_till_end: - static_cast<::std::string*>(object)->clear(); - static_cast<::std::string*>(object)->reserve(size); - goto len_delim_till_end; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); } #else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool UpdateArtifactResponse::MergePartialFromCodedStream( +bool DeleteArtifactResponse::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactResponse) for (;;) { ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // string artifact_id = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_artifact_id())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->artifact_id().data(), static_cast(this->artifact_id().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "datacatalog.UpdateArtifactResponse.artifact_id")); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } + handle_unusual: + if (tag == 0) { + goto success; } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); } success: - // @@protoc_insertion_point(parse_success:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactResponse) return true; failure: - // @@protoc_insertion_point(parse_failure:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactResponse) return false; #undef DO_ } #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -void UpdateArtifactResponse::SerializeWithCachedSizes( +void DeleteArtifactResponse::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactResponse) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // string artifact_id = 1; - if (this->artifact_id().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->artifact_id().data(), static_cast(this->artifact_id().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "datacatalog.UpdateArtifactResponse.artifact_id"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->artifact_id(), output); - } - if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactResponse) } -::google::protobuf::uint8* UpdateArtifactResponse::InternalSerializeWithCachedSizesToArray( +::google::protobuf::uint8* DeleteArtifactResponse::InternalSerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactResponse) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // string artifact_id = 1; - if (this->artifact_id().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->artifact_id().data(), static_cast(this->artifact_id().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "datacatalog.UpdateArtifactResponse.artifact_id"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->artifact_id(), target); - } - if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactResponse) return target; } -size_t UpdateArtifactResponse::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:datacatalog.UpdateArtifactResponse) +size_t DeleteArtifactResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactResponse) size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { @@ -6463,76 +7223,63 @@ size_t UpdateArtifactResponse::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // string artifact_id = 1; - if (this->artifact_id().size() > 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->artifact_id()); - } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void UpdateArtifactResponse::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.UpdateArtifactResponse) +void DeleteArtifactResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactResponse) GOOGLE_DCHECK_NE(&from, this); - const UpdateArtifactResponse* source = - ::google::protobuf::DynamicCastToGenerated( + const DeleteArtifactResponse* source = + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactResponse) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.UpdateArtifactResponse) + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactResponse) MergeFrom(*source); } } -void UpdateArtifactResponse::MergeFrom(const UpdateArtifactResponse& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.UpdateArtifactResponse) +void DeleteArtifactResponse::MergeFrom(const DeleteArtifactResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactResponse) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - if (from.artifact_id().size() > 0) { - - artifact_id_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.artifact_id_); - } } -void UpdateArtifactResponse::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.UpdateArtifactResponse) +void DeleteArtifactResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactResponse) if (&from == this) return; Clear(); MergeFrom(from); } -void UpdateArtifactResponse::CopyFrom(const UpdateArtifactResponse& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.UpdateArtifactResponse) +void DeleteArtifactResponse::CopyFrom(const DeleteArtifactResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactResponse) if (&from == this) return; Clear(); MergeFrom(from); } -bool UpdateArtifactResponse::IsInitialized() const { +bool DeleteArtifactResponse::IsInitialized() const { return true; } -void UpdateArtifactResponse::Swap(UpdateArtifactResponse* other) { +void DeleteArtifactResponse::Swap(DeleteArtifactResponse* other) { if (other == this) return; InternalSwap(other); } -void UpdateArtifactResponse::InternalSwap(UpdateArtifactResponse* other) { +void DeleteArtifactResponse::InternalSwap(DeleteArtifactResponse* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - artifact_id_.Swap(&other->artifact_id_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), - GetArenaNoVirtual()); } -::google::protobuf::Metadata UpdateArtifactResponse::GetMetadata() const { +::google::protobuf::Metadata DeleteArtifactResponse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; } @@ -11663,7 +12410,7 @@ void Metadata_KeyMapEntry_DoNotUse::MergeFrom(const Metadata_KeyMapEntry_DoNotUs } ::google::protobuf::Metadata Metadata_KeyMapEntry_DoNotUse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); - return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[28]; + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[30]; } void Metadata_KeyMapEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { @@ -15380,6 +16127,12 @@ template<> PROTOBUF_NOINLINE ::datacatalog::UpdateArtifactRequest* Arena::Create template<> PROTOBUF_NOINLINE ::datacatalog::UpdateArtifactResponse* Arena::CreateMaybeMessage< ::datacatalog::UpdateArtifactResponse >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::UpdateArtifactResponse >(arena); } +template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactRequest* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactRequest >(Arena* arena) { + return Arena::CreateInternal< ::datacatalog::DeleteArtifactRequest >(arena); +} +template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactResponse* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactResponse >(Arena* arena) { + return Arena::CreateInternal< ::datacatalog::DeleteArtifactResponse >(arena); +} template<> PROTOBUF_NOINLINE ::datacatalog::ReservationID* Arena::CreateMaybeMessage< ::datacatalog::ReservationID >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::ReservationID >(arena); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h index ac8b5c69c8..e08c957829 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h @@ -48,7 +48,7 @@ struct TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[38] + static const ::google::protobuf::internal::ParseTable schema[40] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -92,6 +92,12 @@ extern DatasetIDDefaultTypeInternal _DatasetID_default_instance_; class DatasetPropertyFilter; class DatasetPropertyFilterDefaultTypeInternal; extern DatasetPropertyFilterDefaultTypeInternal _DatasetPropertyFilter_default_instance_; +class DeleteArtifactRequest; +class DeleteArtifactRequestDefaultTypeInternal; +extern DeleteArtifactRequestDefaultTypeInternal _DeleteArtifactRequest_default_instance_; +class DeleteArtifactResponse; +class DeleteArtifactResponseDefaultTypeInternal; +extern DeleteArtifactResponseDefaultTypeInternal _DeleteArtifactResponse_default_instance_; class FilterExpression; class FilterExpressionDefaultTypeInternal; extern FilterExpressionDefaultTypeInternal _FilterExpression_default_instance_; @@ -185,6 +191,8 @@ template<> ::datacatalog::CreateDatasetResponse* Arena::CreateMaybeMessage<::dat template<> ::datacatalog::Dataset* Arena::CreateMaybeMessage<::datacatalog::Dataset>(Arena*); template<> ::datacatalog::DatasetID* Arena::CreateMaybeMessage<::datacatalog::DatasetID>(Arena*); template<> ::datacatalog::DatasetPropertyFilter* Arena::CreateMaybeMessage<::datacatalog::DatasetPropertyFilter>(Arena*); +template<> ::datacatalog::DeleteArtifactRequest* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactRequest>(Arena*); +template<> ::datacatalog::DeleteArtifactResponse* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactResponse>(Arena*); template<> ::datacatalog::FilterExpression* Arena::CreateMaybeMessage<::datacatalog::FilterExpression>(Arena*); template<> ::datacatalog::GetArtifactRequest* Arena::CreateMaybeMessage<::datacatalog::GetArtifactRequest>(Arena*); template<> ::datacatalog::GetArtifactResponse* Arena::CreateMaybeMessage<::datacatalog::GetArtifactResponse>(Arena*); @@ -2280,6 +2288,280 @@ class UpdateArtifactResponse final : }; // ------------------------------------------------------------------- +class DeleteArtifactRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.DeleteArtifactRequest) */ { + public: + DeleteArtifactRequest(); + virtual ~DeleteArtifactRequest(); + + DeleteArtifactRequest(const DeleteArtifactRequest& from); + + inline DeleteArtifactRequest& operator=(const DeleteArtifactRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + DeleteArtifactRequest(DeleteArtifactRequest&& from) noexcept + : DeleteArtifactRequest() { + *this = ::std::move(from); + } + + inline DeleteArtifactRequest& operator=(DeleteArtifactRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const DeleteArtifactRequest& default_instance(); + + enum QueryHandleCase { + kArtifactId = 2, + kTagName = 3, + QUERY_HANDLE_NOT_SET = 0, + }; + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const DeleteArtifactRequest* internal_default_instance() { + return reinterpret_cast( + &_DeleteArtifactRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 16; + + void Swap(DeleteArtifactRequest* other); + friend void swap(DeleteArtifactRequest& a, DeleteArtifactRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline DeleteArtifactRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + DeleteArtifactRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const DeleteArtifactRequest& from); + void MergeFrom(const DeleteArtifactRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(DeleteArtifactRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .datacatalog.DatasetID dataset = 1; + bool has_dataset() const; + void clear_dataset(); + static const int kDatasetFieldNumber = 1; + const ::datacatalog::DatasetID& dataset() const; + ::datacatalog::DatasetID* release_dataset(); + ::datacatalog::DatasetID* mutable_dataset(); + void set_allocated_dataset(::datacatalog::DatasetID* dataset); + + // string artifact_id = 2; + private: + bool has_artifact_id() const; + public: + void clear_artifact_id(); + static const int kArtifactIdFieldNumber = 2; + const ::std::string& artifact_id() const; + void set_artifact_id(const ::std::string& value); + #if LANG_CXX11 + void set_artifact_id(::std::string&& value); + #endif + void set_artifact_id(const char* value); + void set_artifact_id(const char* value, size_t size); + ::std::string* mutable_artifact_id(); + ::std::string* release_artifact_id(); + void set_allocated_artifact_id(::std::string* artifact_id); + + // string tag_name = 3; + private: + bool has_tag_name() const; + public: + void clear_tag_name(); + static const int kTagNameFieldNumber = 3; + const ::std::string& tag_name() const; + void set_tag_name(const ::std::string& value); + #if LANG_CXX11 + void set_tag_name(::std::string&& value); + #endif + void set_tag_name(const char* value); + void set_tag_name(const char* value, size_t size); + ::std::string* mutable_tag_name(); + ::std::string* release_tag_name(); + void set_allocated_tag_name(::std::string* tag_name); + + void clear_query_handle(); + QueryHandleCase query_handle_case() const; + // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactRequest) + private: + class HasBitSetters; + void set_has_artifact_id(); + void set_has_tag_name(); + + inline bool has_query_handle() const; + inline void clear_has_query_handle(); + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::datacatalog::DatasetID* dataset_; + union QueryHandleUnion { + QueryHandleUnion() {} + ::google::protobuf::internal::ArenaStringPtr artifact_id_; + ::google::protobuf::internal::ArenaStringPtr tag_name_; + } query_handle_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::google::protobuf::uint32 _oneof_case_[1]; + + friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +}; +// ------------------------------------------------------------------- + +class DeleteArtifactResponse final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.DeleteArtifactResponse) */ { + public: + DeleteArtifactResponse(); + virtual ~DeleteArtifactResponse(); + + DeleteArtifactResponse(const DeleteArtifactResponse& from); + + inline DeleteArtifactResponse& operator=(const DeleteArtifactResponse& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + DeleteArtifactResponse(DeleteArtifactResponse&& from) noexcept + : DeleteArtifactResponse() { + *this = ::std::move(from); + } + + inline DeleteArtifactResponse& operator=(DeleteArtifactResponse&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const DeleteArtifactResponse& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const DeleteArtifactResponse* internal_default_instance() { + return reinterpret_cast( + &_DeleteArtifactResponse_default_instance_); + } + static constexpr int kIndexInFileMessages = + 17; + + void Swap(DeleteArtifactResponse* other); + friend void swap(DeleteArtifactResponse& a, DeleteArtifactResponse& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline DeleteArtifactResponse* New() const final { + return CreateMaybeMessage(nullptr); + } + + DeleteArtifactResponse* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const DeleteArtifactResponse& from); + void MergeFrom(const DeleteArtifactResponse& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(DeleteArtifactResponse* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactResponse) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +}; +// ------------------------------------------------------------------- + class ReservationID final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.ReservationID) */ { public: @@ -2318,7 +2600,7 @@ class ReservationID final : &_ReservationID_default_instance_); } static constexpr int kIndexInFileMessages = - 16; + 18; void Swap(ReservationID* other); friend void swap(ReservationID& a, ReservationID& b) { @@ -2448,7 +2730,7 @@ class GetOrExtendReservationRequest final : &_GetOrExtendReservationRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 17; + 19; void Swap(GetOrExtendReservationRequest* other); friend void swap(GetOrExtendReservationRequest& a, GetOrExtendReservationRequest& b) { @@ -2588,7 +2870,7 @@ class Reservation final : &_Reservation_default_instance_); } static constexpr int kIndexInFileMessages = - 18; + 20; void Swap(Reservation* other); friend void swap(Reservation& a, Reservation& b) { @@ -2748,7 +3030,7 @@ class GetOrExtendReservationResponse final : &_GetOrExtendReservationResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 19; + 21; void Swap(GetOrExtendReservationResponse* other); friend void swap(GetOrExtendReservationResponse& a, GetOrExtendReservationResponse& b) { @@ -2863,7 +3145,7 @@ class ReleaseReservationRequest final : &_ReleaseReservationRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 20; + 22; void Swap(ReleaseReservationRequest* other); friend void swap(ReleaseReservationRequest& a, ReleaseReservationRequest& b) { @@ -2993,7 +3275,7 @@ class ReleaseReservationResponse final : &_ReleaseReservationResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 21; + 23; void Swap(ReleaseReservationResponse* other); friend void swap(ReleaseReservationResponse& a, ReleaseReservationResponse& b) { @@ -3098,7 +3380,7 @@ class Dataset final : &_Dataset_default_instance_); } static constexpr int kIndexInFileMessages = - 22; + 24; void Swap(Dataset* other); friend void swap(Dataset& a, Dataset& b) { @@ -3246,7 +3528,7 @@ class Partition final : &_Partition_default_instance_); } static constexpr int kIndexInFileMessages = - 23; + 25; void Swap(Partition* other); friend void swap(Partition& a, Partition& b) { @@ -3381,7 +3663,7 @@ class DatasetID final : &_DatasetID_default_instance_); } static constexpr int kIndexInFileMessages = - 24; + 26; void Swap(DatasetID* other); friend void swap(DatasetID& a, DatasetID& b) { @@ -3561,7 +3843,7 @@ class Artifact final : &_Artifact_default_instance_); } static constexpr int kIndexInFileMessages = - 25; + 27; void Swap(Artifact* other); friend void swap(Artifact& a, Artifact& b) { @@ -3750,7 +4032,7 @@ class ArtifactData final : &_ArtifactData_default_instance_); } static constexpr int kIndexInFileMessages = - 26; + 28; void Swap(ArtifactData* other); friend void swap(ArtifactData& a, ArtifactData& b) { @@ -3880,7 +4162,7 @@ class Tag final : &_Tag_default_instance_); } static constexpr int kIndexInFileMessages = - 27; + 29; void Swap(Tag* other); friend void swap(Tag& a, Tag& b) { @@ -4049,7 +4331,7 @@ class Metadata final : &_Metadata_default_instance_); } static constexpr int kIndexInFileMessages = - 29; + 31; void Swap(Metadata* other); friend void swap(Metadata& a, Metadata& b) { @@ -4170,7 +4452,7 @@ class FilterExpression final : &_FilterExpression_default_instance_); } static constexpr int kIndexInFileMessages = - 30; + 32; void Swap(FilterExpression* other); friend void swap(FilterExpression& a, FilterExpression& b) { @@ -4296,7 +4578,7 @@ class SinglePropertyFilter final : &_SinglePropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 31; + 33; void Swap(SinglePropertyFilter* other); friend void swap(SinglePropertyFilter& a, SinglePropertyFilter& b) { @@ -4491,7 +4773,7 @@ class ArtifactPropertyFilter final : &_ArtifactPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 32; + 34; void Swap(ArtifactPropertyFilter* other); friend void swap(ArtifactPropertyFilter& a, ArtifactPropertyFilter& b) { @@ -4630,7 +4912,7 @@ class TagPropertyFilter final : &_TagPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 33; + 35; void Swap(TagPropertyFilter* other); friend void swap(TagPropertyFilter& a, TagPropertyFilter& b) { @@ -4769,7 +5051,7 @@ class PartitionPropertyFilter final : &_PartitionPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 34; + 36; void Swap(PartitionPropertyFilter* other); friend void swap(PartitionPropertyFilter& a, PartitionPropertyFilter& b) { @@ -4895,7 +5177,7 @@ class KeyValuePair final : &_KeyValuePair_default_instance_); } static constexpr int kIndexInFileMessages = - 35; + 37; void Swap(KeyValuePair* other); friend void swap(KeyValuePair& a, KeyValuePair& b) { @@ -5038,7 +5320,7 @@ class DatasetPropertyFilter final : &_DatasetPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 36; + 38; void Swap(DatasetPropertyFilter* other); friend void swap(DatasetPropertyFilter& a, DatasetPropertyFilter& b) { @@ -5229,7 +5511,7 @@ class PaginationOptions final : &_PaginationOptions_default_instance_); } static constexpr int kIndexInFileMessages = - 37; + 39; void Swap(PaginationOptions* other); friend void swap(PaginationOptions& a, PaginationOptions& b) { @@ -6751,6 +7033,258 @@ inline void UpdateArtifactResponse::set_allocated_artifact_id(::std::string* art // ------------------------------------------------------------------- +// DeleteArtifactRequest + +// .datacatalog.DatasetID dataset = 1; +inline bool DeleteArtifactRequest::has_dataset() const { + return this != internal_default_instance() && dataset_ != nullptr; +} +inline void DeleteArtifactRequest::clear_dataset() { + if (GetArenaNoVirtual() == nullptr && dataset_ != nullptr) { + delete dataset_; + } + dataset_ = nullptr; +} +inline const ::datacatalog::DatasetID& DeleteArtifactRequest::dataset() const { + const ::datacatalog::DatasetID* p = dataset_; + // @@protoc_insertion_point(field_get:datacatalog.DeleteArtifactRequest.dataset) + return p != nullptr ? *p : *reinterpret_cast( + &::datacatalog::_DatasetID_default_instance_); +} +inline ::datacatalog::DatasetID* DeleteArtifactRequest::release_dataset() { + // @@protoc_insertion_point(field_release:datacatalog.DeleteArtifactRequest.dataset) + + ::datacatalog::DatasetID* temp = dataset_; + dataset_ = nullptr; + return temp; +} +inline ::datacatalog::DatasetID* DeleteArtifactRequest::mutable_dataset() { + + if (dataset_ == nullptr) { + auto* p = CreateMaybeMessage<::datacatalog::DatasetID>(GetArenaNoVirtual()); + dataset_ = p; + } + // @@protoc_insertion_point(field_mutable:datacatalog.DeleteArtifactRequest.dataset) + return dataset_; +} +inline void DeleteArtifactRequest::set_allocated_dataset(::datacatalog::DatasetID* dataset) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete dataset_; + } + if (dataset) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + dataset = ::google::protobuf::internal::GetOwnedMessage( + message_arena, dataset, submessage_arena); + } + + } else { + + } + dataset_ = dataset; + // @@protoc_insertion_point(field_set_allocated:datacatalog.DeleteArtifactRequest.dataset) +} + +// string artifact_id = 2; +inline bool DeleteArtifactRequest::has_artifact_id() const { + return query_handle_case() == kArtifactId; +} +inline void DeleteArtifactRequest::set_has_artifact_id() { + _oneof_case_[0] = kArtifactId; +} +inline void DeleteArtifactRequest::clear_artifact_id() { + if (has_artifact_id()) { + query_handle_.artifact_id_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_query_handle(); + } +} +inline const ::std::string& DeleteArtifactRequest::artifact_id() const { + // @@protoc_insertion_point(field_get:datacatalog.DeleteArtifactRequest.artifact_id) + if (has_artifact_id()) { + return query_handle_.artifact_id_.GetNoArena(); + } + return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); +} +inline void DeleteArtifactRequest::set_artifact_id(const ::std::string& value) { + // @@protoc_insertion_point(field_set:datacatalog.DeleteArtifactRequest.artifact_id) + if (!has_artifact_id()) { + clear_query_handle(); + set_has_artifact_id(); + query_handle_.artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.artifact_id_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:datacatalog.DeleteArtifactRequest.artifact_id) +} +#if LANG_CXX11 +inline void DeleteArtifactRequest::set_artifact_id(::std::string&& value) { + // @@protoc_insertion_point(field_set:datacatalog.DeleteArtifactRequest.artifact_id) + if (!has_artifact_id()) { + clear_query_handle(); + set_has_artifact_id(); + query_handle_.artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.artifact_id_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:datacatalog.DeleteArtifactRequest.artifact_id) +} +#endif +inline void DeleteArtifactRequest::set_artifact_id(const char* value) { + GOOGLE_DCHECK(value != nullptr); + if (!has_artifact_id()) { + clear_query_handle(); + set_has_artifact_id(); + query_handle_.artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.artifact_id_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(value)); + // @@protoc_insertion_point(field_set_char:datacatalog.DeleteArtifactRequest.artifact_id) +} +inline void DeleteArtifactRequest::set_artifact_id(const char* value, size_t size) { + if (!has_artifact_id()) { + clear_query_handle(); + set_has_artifact_id(); + query_handle_.artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.artifact_id_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:datacatalog.DeleteArtifactRequest.artifact_id) +} +inline ::std::string* DeleteArtifactRequest::mutable_artifact_id() { + if (!has_artifact_id()) { + clear_query_handle(); + set_has_artifact_id(); + query_handle_.artifact_id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_mutable:datacatalog.DeleteArtifactRequest.artifact_id) + return query_handle_.artifact_id_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline ::std::string* DeleteArtifactRequest::release_artifact_id() { + // @@protoc_insertion_point(field_release:datacatalog.DeleteArtifactRequest.artifact_id) + if (has_artifact_id()) { + clear_has_query_handle(); + return query_handle_.artifact_id_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } else { + return nullptr; + } +} +inline void DeleteArtifactRequest::set_allocated_artifact_id(::std::string* artifact_id) { + if (has_query_handle()) { + clear_query_handle(); + } + if (artifact_id != nullptr) { + set_has_artifact_id(); + query_handle_.artifact_id_.UnsafeSetDefault(artifact_id); + } + // @@protoc_insertion_point(field_set_allocated:datacatalog.DeleteArtifactRequest.artifact_id) +} + +// string tag_name = 3; +inline bool DeleteArtifactRequest::has_tag_name() const { + return query_handle_case() == kTagName; +} +inline void DeleteArtifactRequest::set_has_tag_name() { + _oneof_case_[0] = kTagName; +} +inline void DeleteArtifactRequest::clear_tag_name() { + if (has_tag_name()) { + query_handle_.tag_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_query_handle(); + } +} +inline const ::std::string& DeleteArtifactRequest::tag_name() const { + // @@protoc_insertion_point(field_get:datacatalog.DeleteArtifactRequest.tag_name) + if (has_tag_name()) { + return query_handle_.tag_name_.GetNoArena(); + } + return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); +} +inline void DeleteArtifactRequest::set_tag_name(const ::std::string& value) { + // @@protoc_insertion_point(field_set:datacatalog.DeleteArtifactRequest.tag_name) + if (!has_tag_name()) { + clear_query_handle(); + set_has_tag_name(); + query_handle_.tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.tag_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:datacatalog.DeleteArtifactRequest.tag_name) +} +#if LANG_CXX11 +inline void DeleteArtifactRequest::set_tag_name(::std::string&& value) { + // @@protoc_insertion_point(field_set:datacatalog.DeleteArtifactRequest.tag_name) + if (!has_tag_name()) { + clear_query_handle(); + set_has_tag_name(); + query_handle_.tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.tag_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:datacatalog.DeleteArtifactRequest.tag_name) +} +#endif +inline void DeleteArtifactRequest::set_tag_name(const char* value) { + GOOGLE_DCHECK(value != nullptr); + if (!has_tag_name()) { + clear_query_handle(); + set_has_tag_name(); + query_handle_.tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.tag_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(value)); + // @@protoc_insertion_point(field_set_char:datacatalog.DeleteArtifactRequest.tag_name) +} +inline void DeleteArtifactRequest::set_tag_name(const char* value, size_t size) { + if (!has_tag_name()) { + clear_query_handle(); + set_has_tag_name(); + query_handle_.tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + query_handle_.tag_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:datacatalog.DeleteArtifactRequest.tag_name) +} +inline ::std::string* DeleteArtifactRequest::mutable_tag_name() { + if (!has_tag_name()) { + clear_query_handle(); + set_has_tag_name(); + query_handle_.tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_mutable:datacatalog.DeleteArtifactRequest.tag_name) + return query_handle_.tag_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline ::std::string* DeleteArtifactRequest::release_tag_name() { + // @@protoc_insertion_point(field_release:datacatalog.DeleteArtifactRequest.tag_name) + if (has_tag_name()) { + clear_has_query_handle(); + return query_handle_.tag_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } else { + return nullptr; + } +} +inline void DeleteArtifactRequest::set_allocated_tag_name(::std::string* tag_name) { + if (has_query_handle()) { + clear_query_handle(); + } + if (tag_name != nullptr) { + set_has_tag_name(); + query_handle_.tag_name_.UnsafeSetDefault(tag_name); + } + // @@protoc_insertion_point(field_set_allocated:datacatalog.DeleteArtifactRequest.tag_name) +} + +inline bool DeleteArtifactRequest::has_query_handle() const { + return query_handle_case() != QUERY_HANDLE_NOT_SET; +} +inline void DeleteArtifactRequest::clear_has_query_handle() { + _oneof_case_[0] = QUERY_HANDLE_NOT_SET; +} +inline DeleteArtifactRequest::QueryHandleCase DeleteArtifactRequest::query_handle_case() const { + return DeleteArtifactRequest::QueryHandleCase(_oneof_case_[0]); +} +// ------------------------------------------------------------------- + +// DeleteArtifactResponse + +// ------------------------------------------------------------------- + // ReservationID // .datacatalog.DatasetID dataset_id = 1; @@ -9721,6 +10255,10 @@ inline void PaginationOptions::set_sortorder(::datacatalog::PaginationOptions_So // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go index a643383127..fd2e9774de 100644 --- a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go @@ -47,7 +47,7 @@ func (x SinglePropertyFilter_ComparisonOperator) String() string { } func (SinglePropertyFilter_ComparisonOperator) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{30, 0} + return fileDescriptor_275951237ff4368a, []int{32, 0} } type PaginationOptions_SortOrder int32 @@ -72,7 +72,7 @@ func (x PaginationOptions_SortOrder) String() string { } func (PaginationOptions_SortOrder) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{36, 0} + return fileDescriptor_275951237ff4368a, []int{38, 0} } type PaginationOptions_SortKey int32 @@ -94,7 +94,7 @@ func (x PaginationOptions_SortKey) String() string { } func (PaginationOptions_SortKey) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{36, 1} + return fileDescriptor_275951237ff4368a, []int{38, 1} } // @@ -891,6 +891,132 @@ func (m *UpdateArtifactResponse) GetArtifactId() string { return "" } +// +// Request message for deleting an Artifact and its associated ArtifactData. +type DeleteArtifactRequest struct { + // ID of dataset the artifact is associated with + Dataset *DatasetID `protobuf:"bytes,1,opt,name=dataset,proto3" json:"dataset,omitempty"` + // Either ID of artifact or name of tag of existing artifact + // + // Types that are valid to be assigned to QueryHandle: + // *DeleteArtifactRequest_ArtifactId + // *DeleteArtifactRequest_TagName + QueryHandle isDeleteArtifactRequest_QueryHandle `protobuf_oneof:"query_handle"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteArtifactRequest) Reset() { *m = DeleteArtifactRequest{} } +func (m *DeleteArtifactRequest) String() string { return proto.CompactTextString(m) } +func (*DeleteArtifactRequest) ProtoMessage() {} +func (*DeleteArtifactRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_275951237ff4368a, []int{16} +} + +func (m *DeleteArtifactRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteArtifactRequest.Unmarshal(m, b) +} +func (m *DeleteArtifactRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteArtifactRequest.Marshal(b, m, deterministic) +} +func (m *DeleteArtifactRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteArtifactRequest.Merge(m, src) +} +func (m *DeleteArtifactRequest) XXX_Size() int { + return xxx_messageInfo_DeleteArtifactRequest.Size(m) +} +func (m *DeleteArtifactRequest) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteArtifactRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteArtifactRequest proto.InternalMessageInfo + +func (m *DeleteArtifactRequest) GetDataset() *DatasetID { + if m != nil { + return m.Dataset + } + return nil +} + +type isDeleteArtifactRequest_QueryHandle interface { + isDeleteArtifactRequest_QueryHandle() +} + +type DeleteArtifactRequest_ArtifactId struct { + ArtifactId string `protobuf:"bytes,2,opt,name=artifact_id,json=artifactId,proto3,oneof"` +} + +type DeleteArtifactRequest_TagName struct { + TagName string `protobuf:"bytes,3,opt,name=tag_name,json=tagName,proto3,oneof"` +} + +func (*DeleteArtifactRequest_ArtifactId) isDeleteArtifactRequest_QueryHandle() {} + +func (*DeleteArtifactRequest_TagName) isDeleteArtifactRequest_QueryHandle() {} + +func (m *DeleteArtifactRequest) GetQueryHandle() isDeleteArtifactRequest_QueryHandle { + if m != nil { + return m.QueryHandle + } + return nil +} + +func (m *DeleteArtifactRequest) GetArtifactId() string { + if x, ok := m.GetQueryHandle().(*DeleteArtifactRequest_ArtifactId); ok { + return x.ArtifactId + } + return "" +} + +func (m *DeleteArtifactRequest) GetTagName() string { + if x, ok := m.GetQueryHandle().(*DeleteArtifactRequest_TagName); ok { + return x.TagName + } + return "" +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*DeleteArtifactRequest) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*DeleteArtifactRequest_ArtifactId)(nil), + (*DeleteArtifactRequest_TagName)(nil), + } +} + +// +// Response message for deleting an Artifact. +type DeleteArtifactResponse struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteArtifactResponse) Reset() { *m = DeleteArtifactResponse{} } +func (m *DeleteArtifactResponse) String() string { return proto.CompactTextString(m) } +func (*DeleteArtifactResponse) ProtoMessage() {} +func (*DeleteArtifactResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_275951237ff4368a, []int{17} +} + +func (m *DeleteArtifactResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteArtifactResponse.Unmarshal(m, b) +} +func (m *DeleteArtifactResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteArtifactResponse.Marshal(b, m, deterministic) +} +func (m *DeleteArtifactResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteArtifactResponse.Merge(m, src) +} +func (m *DeleteArtifactResponse) XXX_Size() int { + return xxx_messageInfo_DeleteArtifactResponse.Size(m) +} +func (m *DeleteArtifactResponse) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteArtifactResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteArtifactResponse proto.InternalMessageInfo + // // ReservationID message that is composed of several string fields. type ReservationID struct { @@ -907,7 +1033,7 @@ func (m *ReservationID) Reset() { *m = ReservationID{} } func (m *ReservationID) String() string { return proto.CompactTextString(m) } func (*ReservationID) ProtoMessage() {} func (*ReservationID) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{16} + return fileDescriptor_275951237ff4368a, []int{18} } func (m *ReservationID) XXX_Unmarshal(b []byte) error { @@ -959,7 +1085,7 @@ func (m *GetOrExtendReservationRequest) Reset() { *m = GetOrExtendReserv func (m *GetOrExtendReservationRequest) String() string { return proto.CompactTextString(m) } func (*GetOrExtendReservationRequest) ProtoMessage() {} func (*GetOrExtendReservationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{17} + return fileDescriptor_275951237ff4368a, []int{19} } func (m *GetOrExtendReservationRequest) XXX_Unmarshal(b []byte) error { @@ -1022,7 +1148,7 @@ func (m *Reservation) Reset() { *m = Reservation{} } func (m *Reservation) String() string { return proto.CompactTextString(m) } func (*Reservation) ProtoMessage() {} func (*Reservation) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{18} + return fileDescriptor_275951237ff4368a, []int{20} } func (m *Reservation) XXX_Unmarshal(b []byte) error { @@ -1091,7 +1217,7 @@ func (m *GetOrExtendReservationResponse) Reset() { *m = GetOrExtendReser func (m *GetOrExtendReservationResponse) String() string { return proto.CompactTextString(m) } func (*GetOrExtendReservationResponse) ProtoMessage() {} func (*GetOrExtendReservationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{19} + return fileDescriptor_275951237ff4368a, []int{21} } func (m *GetOrExtendReservationResponse) XXX_Unmarshal(b []byte) error { @@ -1134,7 +1260,7 @@ func (m *ReleaseReservationRequest) Reset() { *m = ReleaseReservationReq func (m *ReleaseReservationRequest) String() string { return proto.CompactTextString(m) } func (*ReleaseReservationRequest) ProtoMessage() {} func (*ReleaseReservationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{20} + return fileDescriptor_275951237ff4368a, []int{22} } func (m *ReleaseReservationRequest) XXX_Unmarshal(b []byte) error { @@ -1180,7 +1306,7 @@ func (m *ReleaseReservationResponse) Reset() { *m = ReleaseReservationRe func (m *ReleaseReservationResponse) String() string { return proto.CompactTextString(m) } func (*ReleaseReservationResponse) ProtoMessage() {} func (*ReleaseReservationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{21} + return fileDescriptor_275951237ff4368a, []int{23} } func (m *ReleaseReservationResponse) XXX_Unmarshal(b []byte) error { @@ -1216,7 +1342,7 @@ func (m *Dataset) Reset() { *m = Dataset{} } func (m *Dataset) String() string { return proto.CompactTextString(m) } func (*Dataset) ProtoMessage() {} func (*Dataset) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{22} + return fileDescriptor_275951237ff4368a, []int{24} } func (m *Dataset) XXX_Unmarshal(b []byte) error { @@ -1272,7 +1398,7 @@ func (m *Partition) Reset() { *m = Partition{} } func (m *Partition) String() string { return proto.CompactTextString(m) } func (*Partition) ProtoMessage() {} func (*Partition) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{23} + return fileDescriptor_275951237ff4368a, []int{25} } func (m *Partition) XXX_Unmarshal(b []byte) error { @@ -1324,7 +1450,7 @@ func (m *DatasetID) Reset() { *m = DatasetID{} } func (m *DatasetID) String() string { return proto.CompactTextString(m) } func (*DatasetID) ProtoMessage() {} func (*DatasetID) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{24} + return fileDescriptor_275951237ff4368a, []int{26} } func (m *DatasetID) XXX_Unmarshal(b []byte) error { @@ -1399,7 +1525,7 @@ func (m *Artifact) Reset() { *m = Artifact{} } func (m *Artifact) String() string { return proto.CompactTextString(m) } func (*Artifact) ProtoMessage() {} func (*Artifact) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{25} + return fileDescriptor_275951237ff4368a, []int{27} } func (m *Artifact) XXX_Unmarshal(b []byte) error { @@ -1483,7 +1609,7 @@ func (m *ArtifactData) Reset() { *m = ArtifactData{} } func (m *ArtifactData) String() string { return proto.CompactTextString(m) } func (*ArtifactData) ProtoMessage() {} func (*ArtifactData) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{26} + return fileDescriptor_275951237ff4368a, []int{28} } func (m *ArtifactData) XXX_Unmarshal(b []byte) error { @@ -1534,7 +1660,7 @@ func (m *Tag) Reset() { *m = Tag{} } func (m *Tag) String() string { return proto.CompactTextString(m) } func (*Tag) ProtoMessage() {} func (*Tag) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{27} + return fileDescriptor_275951237ff4368a, []int{29} } func (m *Tag) XXX_Unmarshal(b []byte) error { @@ -1589,7 +1715,7 @@ func (m *Metadata) Reset() { *m = Metadata{} } func (m *Metadata) String() string { return proto.CompactTextString(m) } func (*Metadata) ProtoMessage() {} func (*Metadata) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{28} + return fileDescriptor_275951237ff4368a, []int{30} } func (m *Metadata) XXX_Unmarshal(b []byte) error { @@ -1629,7 +1755,7 @@ func (m *FilterExpression) Reset() { *m = FilterExpression{} } func (m *FilterExpression) String() string { return proto.CompactTextString(m) } func (*FilterExpression) ProtoMessage() {} func (*FilterExpression) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{29} + return fileDescriptor_275951237ff4368a, []int{31} } func (m *FilterExpression) XXX_Unmarshal(b []byte) error { @@ -1675,7 +1801,7 @@ func (m *SinglePropertyFilter) Reset() { *m = SinglePropertyFilter{} } func (m *SinglePropertyFilter) String() string { return proto.CompactTextString(m) } func (*SinglePropertyFilter) ProtoMessage() {} func (*SinglePropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{30} + return fileDescriptor_275951237ff4368a, []int{32} } func (m *SinglePropertyFilter) XXX_Unmarshal(b []byte) error { @@ -1792,7 +1918,7 @@ func (m *ArtifactPropertyFilter) Reset() { *m = ArtifactPropertyFilter{} func (m *ArtifactPropertyFilter) String() string { return proto.CompactTextString(m) } func (*ArtifactPropertyFilter) ProtoMessage() {} func (*ArtifactPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{31} + return fileDescriptor_275951237ff4368a, []int{33} } func (m *ArtifactPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -1858,7 +1984,7 @@ func (m *TagPropertyFilter) Reset() { *m = TagPropertyFilter{} } func (m *TagPropertyFilter) String() string { return proto.CompactTextString(m) } func (*TagPropertyFilter) ProtoMessage() {} func (*TagPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{32} + return fileDescriptor_275951237ff4368a, []int{34} } func (m *TagPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -1924,7 +2050,7 @@ func (m *PartitionPropertyFilter) Reset() { *m = PartitionPropertyFilter func (m *PartitionPropertyFilter) String() string { return proto.CompactTextString(m) } func (*PartitionPropertyFilter) ProtoMessage() {} func (*PartitionPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{33} + return fileDescriptor_275951237ff4368a, []int{35} } func (m *PartitionPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -1988,7 +2114,7 @@ func (m *KeyValuePair) Reset() { *m = KeyValuePair{} } func (m *KeyValuePair) String() string { return proto.CompactTextString(m) } func (*KeyValuePair) ProtoMessage() {} func (*KeyValuePair) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{34} + return fileDescriptor_275951237ff4368a, []int{36} } func (m *KeyValuePair) XXX_Unmarshal(b []byte) error { @@ -2040,7 +2166,7 @@ func (m *DatasetPropertyFilter) Reset() { *m = DatasetPropertyFilter{} } func (m *DatasetPropertyFilter) String() string { return proto.CompactTextString(m) } func (*DatasetPropertyFilter) ProtoMessage() {} func (*DatasetPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{35} + return fileDescriptor_275951237ff4368a, []int{37} } func (m *DatasetPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -2153,7 +2279,7 @@ func (m *PaginationOptions) Reset() { *m = PaginationOptions{} } func (m *PaginationOptions) String() string { return proto.CompactTextString(m) } func (*PaginationOptions) ProtoMessage() {} func (*PaginationOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{36} + return fileDescriptor_275951237ff4368a, []int{38} } func (m *PaginationOptions) XXX_Unmarshal(b []byte) error { @@ -2222,6 +2348,8 @@ func init() { proto.RegisterType((*ListDatasetsResponse)(nil), "datacatalog.ListDatasetsResponse") proto.RegisterType((*UpdateArtifactRequest)(nil), "datacatalog.UpdateArtifactRequest") proto.RegisterType((*UpdateArtifactResponse)(nil), "datacatalog.UpdateArtifactResponse") + proto.RegisterType((*DeleteArtifactRequest)(nil), "datacatalog.DeleteArtifactRequest") + proto.RegisterType((*DeleteArtifactResponse)(nil), "datacatalog.DeleteArtifactResponse") proto.RegisterType((*ReservationID)(nil), "datacatalog.ReservationID") proto.RegisterType((*GetOrExtendReservationRequest)(nil), "datacatalog.GetOrExtendReservationRequest") proto.RegisterType((*Reservation)(nil), "datacatalog.Reservation") @@ -2251,112 +2379,114 @@ func init() { } var fileDescriptor_275951237ff4368a = []byte{ - // 1669 bytes of a gzipped FileDescriptorProto + // 1703 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, - 0x16, 0x36, 0x25, 0x47, 0x32, 0x8f, 0x2c, 0x45, 0x9e, 0xd8, 0x8e, 0xac, 0x24, 0xb6, 0xc2, 0x04, - 0xbe, 0x46, 0xee, 0x8d, 0x94, 0x6b, 0x27, 0xc1, 0x4d, 0x72, 0xfb, 0x90, 0x2d, 0xc5, 0x56, 0x1d, - 0x3f, 0x42, 0x3f, 0x80, 0x3e, 0x00, 0x61, 0x6c, 0x8e, 0x19, 0xd6, 0x94, 0xc8, 0x90, 0xe3, 0xd4, - 0x5a, 0x15, 0xdd, 0x74, 0xd1, 0x76, 0x57, 0xa0, 0x7f, 0xa0, 0x3f, 0xa4, 0xcb, 0x74, 0xd5, 0xdf, - 0x54, 0x0c, 0x39, 0x43, 0x91, 0x14, 0x65, 0x2b, 0x5e, 0x04, 0xe8, 0x86, 0xe0, 0xcc, 0x9c, 0xf3, - 0xcd, 0x79, 0xcc, 0x99, 0x73, 0xce, 0xc0, 0xe2, 0x89, 0xd9, 0xa3, 0xc4, 0xd0, 0xcc, 0x9a, 0x86, - 0x29, 0x3e, 0xc6, 0x14, 0x9b, 0x96, 0x1e, 0xfe, 0xaf, 0xda, 0x8e, 0x45, 0x2d, 0x94, 0x0b, 0x4d, - 0x95, 0x6f, 0x07, 0x4c, 0xc7, 0x96, 0x43, 0x6a, 0xa6, 0x41, 0x89, 0x83, 0x4d, 0xd7, 0x27, 0x2d, - 0xcf, 0xeb, 0x96, 0xa5, 0x9b, 0xa4, 0xe6, 0x8d, 0x8e, 0xce, 0x4e, 0x6a, 0xda, 0x99, 0x83, 0xa9, - 0x61, 0x75, 0xf9, 0xfa, 0x42, 0x7c, 0x9d, 0x1a, 0x1d, 0xe2, 0x52, 0xdc, 0xb1, 0x7d, 0x02, 0xe5, - 0x25, 0x4c, 0xaf, 0x39, 0x04, 0x53, 0xd2, 0xc0, 0x14, 0xbb, 0x84, 0xaa, 0xe4, 0xed, 0x19, 0x71, - 0x29, 0xaa, 0x42, 0x56, 0xf3, 0x67, 0x4a, 0x52, 0x45, 0x5a, 0xca, 0x2d, 0x4f, 0x57, 0xc3, 0x82, - 0x0a, 0x6a, 0x41, 0xa4, 0xdc, 0x84, 0x99, 0x18, 0x8e, 0x6b, 0x5b, 0x5d, 0x97, 0x28, 0x4d, 0x98, - 0x5a, 0x27, 0x34, 0x86, 0xfe, 0x28, 0x8e, 0x3e, 0x9b, 0x84, 0xde, 0x6a, 0xf4, 0xf1, 0x1b, 0x80, - 0xc2, 0x30, 0x3e, 0xf8, 0x07, 0x4b, 0xf9, 0x9b, 0xe4, 0xc1, 0xd4, 0x1d, 0x6a, 0x9c, 0xe0, 0xe3, - 0xab, 0x8b, 0x83, 0xee, 0x42, 0x0e, 0x73, 0x90, 0xb6, 0xa1, 0x95, 0x52, 0x15, 0x69, 0x49, 0xde, - 0x18, 0x53, 0x41, 0x4c, 0xb6, 0x34, 0x74, 0x0b, 0x26, 0x28, 0xd6, 0xdb, 0x5d, 0xdc, 0x21, 0xa5, - 0x34, 0x5f, 0xcf, 0x52, 0xac, 0x6f, 0xe3, 0x0e, 0x59, 0x2d, 0xc0, 0xe4, 0xdb, 0x33, 0xe2, 0xf4, - 0xda, 0x6f, 0x70, 0x57, 0x33, 0x89, 0xb2, 0x01, 0x37, 0x22, 0x72, 0x71, 0xfd, 0xfe, 0x0b, 0x13, - 0x02, 0x91, 0x4b, 0x36, 0x13, 0x91, 0x2c, 0x60, 0x08, 0xc8, 0x94, 0x2f, 0x84, 0x23, 0xe2, 0x4a, - 0x5e, 0x01, 0xab, 0x04, 0xb3, 0x71, 0x2c, 0xee, 0xd5, 0x15, 0xc8, 0xd7, 0x35, 0x6d, 0x1f, 0xeb, - 0x02, 0x5d, 0x81, 0x34, 0xc5, 0x3a, 0x07, 0x2e, 0x46, 0x80, 0x19, 0x15, 0x5b, 0x54, 0x8a, 0x50, - 0x10, 0x4c, 0x1c, 0xe6, 0x0f, 0x09, 0xa6, 0x5f, 0x19, 0x6e, 0xa0, 0xb8, 0x7b, 0x75, 0x8f, 0x3c, - 0x81, 0xcc, 0x89, 0x61, 0x52, 0xe2, 0x78, 0xce, 0xc8, 0x2d, 0xdf, 0x89, 0x30, 0xbc, 0xf4, 0x96, - 0x9a, 0xe7, 0xb6, 0x43, 0x5c, 0xd7, 0xb0, 0xba, 0x2a, 0x27, 0x46, 0x9f, 0x02, 0xd8, 0x58, 0x37, - 0xba, 0x5e, 0xd0, 0x78, 0x7e, 0xca, 0x2d, 0xcf, 0x47, 0x58, 0x77, 0x83, 0xe5, 0x1d, 0x9b, 0x7d, - 0x5d, 0x35, 0xc4, 0xa1, 0x9c, 0xc2, 0x4c, 0x4c, 0x01, 0xee, 0xba, 0x15, 0x90, 0x85, 0x1d, 0xdd, - 0x92, 0x54, 0x49, 0x0f, 0xb7, 0x77, 0x9f, 0x0e, 0xdd, 0x01, 0xe8, 0x92, 0x73, 0xda, 0xa6, 0xd6, - 0x29, 0xe9, 0xfa, 0xa7, 0x4a, 0x95, 0xd9, 0xcc, 0x3e, 0x9b, 0x50, 0x7e, 0x91, 0xe0, 0x06, 0xdb, - 0x8d, 0xab, 0x1f, 0x58, 0xab, 0xaf, 0xbb, 0x74, 0x75, 0xdd, 0x53, 0x1f, 0xac, 0xbb, 0xee, 0x3b, - 0xaf, 0x2f, 0x0d, 0x57, 0xfd, 0x11, 0x4c, 0x70, 0xaf, 0x08, 0xcd, 0x93, 0xc3, 0x32, 0xa0, 0xba, - 0x4c, 0xef, 0x3f, 0x25, 0x98, 0x39, 0xb0, 0xb5, 0x84, 0x43, 0xfd, 0xd1, 0x23, 0x17, 0x3d, 0x84, - 0x71, 0x06, 0x55, 0x1a, 0xf7, 0x14, 0x9b, 0x4b, 0x74, 0x29, 0xdb, 0x56, 0xf5, 0xc8, 0x06, 0x02, - 0xfd, 0x19, 0xcc, 0xc6, 0x35, 0xe1, 0x56, 0x5b, 0x88, 0x0a, 0x26, 0x79, 0x46, 0x08, 0x89, 0xa5, - 0x60, 0xc8, 0xab, 0xc4, 0x25, 0xce, 0x3b, 0xcf, 0xfa, 0xad, 0x06, 0x7a, 0x02, 0xc0, 0xb5, 0x12, - 0x0c, 0xc3, 0xf5, 0x97, 0x39, 0x65, 0x4b, 0x43, 0x73, 0x21, 0xf5, 0x7c, 0x53, 0x0b, 0xe5, 0x94, - 0xf7, 0x12, 0xdc, 0x59, 0x27, 0x74, 0xc7, 0x69, 0x9e, 0x53, 0xd2, 0xd5, 0x42, 0xdb, 0x09, 0x83, - 0xd7, 0xa1, 0xe0, 0xf4, 0x67, 0xfb, 0xfb, 0x96, 0x23, 0xfb, 0x46, 0xe4, 0x54, 0xf3, 0x21, 0x0e, - 0x7f, 0x7f, 0xeb, 0xbb, 0x2e, 0x71, 0x02, 0xf3, 0xab, 0x59, 0x6f, 0xdc, 0xd2, 0xd0, 0x06, 0xa0, - 0x37, 0x04, 0x3b, 0xf4, 0x88, 0x60, 0xda, 0x36, 0xba, 0x94, 0x71, 0x99, 0x3c, 0x2a, 0xe7, 0xaa, - 0x7e, 0x2e, 0xab, 0x8a, 0x5c, 0x56, 0x6d, 0xf0, 0x5c, 0xa7, 0x4e, 0x05, 0x4c, 0x2d, 0xce, 0xa3, - 0xfc, 0x9e, 0x82, 0x5c, 0x48, 0x8a, 0x7f, 0x8a, 0xdc, 0xe8, 0x19, 0x00, 0x39, 0xb7, 0x0d, 0x87, - 0xb8, 0x6d, 0x4c, 0x4b, 0xe3, 0x5c, 0xc6, 0x38, 0xc2, 0xbe, 0xc8, 0xe2, 0xaa, 0xcc, 0xa9, 0xeb, - 0xde, 0x05, 0xdf, 0x21, 0x14, 0x7b, 0xa7, 0x33, 0x93, 0x70, 0xc1, 0x6f, 0xf1, 0x45, 0x35, 0x20, - 0x53, 0xbe, 0x81, 0xf9, 0x61, 0xee, 0xe6, 0xa7, 0xf2, 0x39, 0xe4, 0x42, 0x56, 0xe0, 0x46, 0x2b, - 0x0d, 0x33, 0x9a, 0x1a, 0x26, 0x56, 0x7a, 0x30, 0xa7, 0x12, 0x93, 0x60, 0x97, 0x7c, 0xec, 0x83, - 0xa4, 0xdc, 0x86, 0x72, 0xd2, 0xd6, 0x3c, 0xed, 0xfc, 0x24, 0x41, 0x96, 0x87, 0x06, 0x5a, 0x84, - 0xd4, 0xa5, 0xc1, 0x93, 0x32, 0xb4, 0x88, 0x75, 0x53, 0x23, 0x59, 0x17, 0xdd, 0x87, 0xbc, 0xcd, - 0xe2, 0x97, 0xed, 0xbd, 0x49, 0x7a, 0x6e, 0x29, 0x5d, 0x49, 0x2f, 0xc9, 0x6a, 0x74, 0x52, 0x59, - 0x01, 0x79, 0x57, 0x4c, 0xa0, 0x22, 0xa4, 0x4f, 0x49, 0x8f, 0x07, 0x3f, 0xfb, 0x45, 0xd3, 0x70, - 0xed, 0x1d, 0x36, 0xcf, 0x44, 0xa8, 0xfa, 0x03, 0xe5, 0x7b, 0x90, 0x03, 0xf1, 0x50, 0x09, 0xb2, - 0xb6, 0x63, 0x7d, 0x4b, 0x78, 0x62, 0x97, 0x55, 0x31, 0x44, 0x08, 0xc6, 0x43, 0x61, 0xee, 0xfd, - 0xa3, 0x59, 0xc8, 0x68, 0x56, 0x07, 0x1b, 0x7e, 0xb6, 0x93, 0x55, 0x3e, 0x62, 0x28, 0xef, 0x88, - 0xc3, 0x12, 0x84, 0x77, 0xec, 0x64, 0x55, 0x0c, 0x19, 0xca, 0xc1, 0x41, 0xab, 0x51, 0xba, 0xe6, - 0xa3, 0xb0, 0x7f, 0xe5, 0x7d, 0x0a, 0x26, 0xc4, 0x15, 0x86, 0x0a, 0x81, 0x0d, 0x65, 0xcf, 0x56, - 0xa1, 0x5b, 0x39, 0x35, 0xda, 0xad, 0x2c, 0x6e, 0xd5, 0xf4, 0x48, 0xb7, 0x6a, 0xc4, 0x19, 0xe3, - 0xa3, 0x39, 0xe3, 0x29, 0x4b, 0x76, 0xdc, 0xcc, 0x6e, 0xe9, 0x9a, 0xb7, 0xcf, 0x6c, 0x2c, 0xd9, - 0xf1, 0x65, 0x35, 0x44, 0x89, 0xee, 0xc3, 0x38, 0xc5, 0xba, 0x5b, 0xca, 0x78, 0x1c, 0x83, 0x95, - 0x8d, 0xb7, 0xca, 0xc2, 0xf6, 0xd8, 0xab, 0x94, 0x34, 0x16, 0xb6, 0xd9, 0xcb, 0xc3, 0x96, 0x53, - 0xd7, 0xa9, 0xb2, 0x0b, 0x93, 0x61, 0x0d, 0x03, 0x9f, 0x49, 0x21, 0x9f, 0xfd, 0x27, 0x7c, 0x08, - 0x98, 0xdc, 0xa2, 0x29, 0xa8, 0xb2, 0xa6, 0xa0, 0xfa, 0xca, 0x6f, 0x0a, 0xc4, 0xe1, 0x30, 0x21, - 0xbd, 0x8f, 0xf5, 0x44, 0xa0, 0x85, 0x84, 0xec, 0x17, 0xc9, 0x7d, 0x21, 0xd7, 0xa5, 0x47, 0xab, - 0xcc, 0x7f, 0x90, 0x60, 0x42, 0xd8, 0x1b, 0x3d, 0x87, 0xec, 0x29, 0xe9, 0xb5, 0x3b, 0xd8, 0xe6, - 0x99, 0xff, 0x6e, 0xa2, 0x5f, 0xaa, 0x9b, 0xa4, 0xb7, 0x85, 0xed, 0x66, 0x97, 0x3a, 0x3d, 0x35, - 0x73, 0xea, 0x0d, 0xca, 0xcf, 0x20, 0x17, 0x9a, 0x1e, 0x35, 0x14, 0x9e, 0xa7, 0xfe, 0x27, 0x29, - 0x3b, 0x50, 0x8c, 0x57, 0x39, 0xe8, 0x05, 0x64, 0xfd, 0x3a, 0xc7, 0x4d, 0x14, 0x65, 0xcf, 0xe8, - 0xea, 0x26, 0xd9, 0x75, 0x2c, 0x9b, 0x38, 0xb4, 0xe7, 0x73, 0xab, 0x82, 0x43, 0xf9, 0x2b, 0x0d, - 0xd3, 0x49, 0x14, 0xe8, 0x33, 0x00, 0x96, 0x3c, 0x23, 0xe5, 0xd6, 0x7c, 0xfc, 0x50, 0x44, 0x79, - 0x36, 0xc6, 0x54, 0x99, 0x62, 0x9d, 0x03, 0xbc, 0x86, 0x62, 0x70, 0xba, 0xda, 0x91, 0x8a, 0xf5, - 0x7e, 0xf2, 0x69, 0x1c, 0x00, 0xbb, 0x1e, 0xf0, 0x73, 0xc8, 0x6d, 0xb8, 0x1e, 0x38, 0x95, 0x23, - 0xfa, 0xbe, 0xbb, 0x97, 0x18, 0x47, 0x03, 0x80, 0x05, 0xc1, 0xcd, 0xf1, 0x36, 0xa1, 0x20, 0xea, - 0x0a, 0x0e, 0xe7, 0xc7, 0x98, 0x92, 0x74, 0x14, 0x06, 0xd0, 0xf2, 0x9c, 0x97, 0x83, 0xed, 0xc2, - 0x04, 0x23, 0xc0, 0xd4, 0x72, 0x4a, 0x50, 0x91, 0x96, 0x0a, 0xcb, 0x8f, 0x2f, 0xf5, 0x43, 0x75, - 0xcd, 0xea, 0xd8, 0xd8, 0x31, 0x5c, 0x56, 0x77, 0xfa, 0xbc, 0x6a, 0x80, 0xa2, 0x54, 0x00, 0x0d, - 0xae, 0x23, 0x80, 0x4c, 0xf3, 0xf5, 0x41, 0xfd, 0xd5, 0x5e, 0x71, 0x6c, 0x75, 0x0a, 0xae, 0xdb, - 0x1c, 0x90, 0x6b, 0xa0, 0xac, 0xc3, 0x6c, 0xb2, 0xfe, 0xf1, 0x82, 0x50, 0x1a, 0x2c, 0x08, 0x57, - 0x01, 0x26, 0x04, 0x9e, 0xf2, 0x7f, 0x98, 0x1a, 0xf0, 0x70, 0xa4, 0x62, 0x94, 0xe2, 0xbd, 0x5e, - 0x98, 0xfb, 0x6b, 0xb8, 0x39, 0xc4, 0xb1, 0xe8, 0xb1, 0x1f, 0x3a, 0xac, 0x70, 0x90, 0x78, 0xe1, - 0x10, 0xb6, 0xd3, 0x26, 0xe9, 0x1d, 0xb2, 0xf3, 0xbe, 0x8b, 0x0d, 0x66, 0x65, 0x16, 0x34, 0x87, - 0xd8, 0x8c, 0x80, 0x3f, 0x85, 0xc9, 0x30, 0xd5, 0xc8, 0xc9, 0xe4, 0x67, 0x09, 0x66, 0x12, 0xbd, - 0x89, 0xca, 0xb1, 0xcc, 0xc2, 0xd4, 0x12, 0xb9, 0x65, 0x3a, 0x9c, 0x5b, 0x36, 0xc6, 0xf8, 0x05, - 0x53, 0x8a, 0x66, 0x17, 0x26, 0x29, 0xcf, 0x2f, 0xe5, 0x58, 0x7e, 0x61, 0x58, 0x7c, 0x22, 0xa2, - 0xc5, 0xaf, 0x29, 0x98, 0x1a, 0xe8, 0x3b, 0x98, 0xe4, 0xa6, 0xd1, 0x31, 0x7c, 0x39, 0xf2, 0xaa, - 0x3f, 0x60, 0xb3, 0xe1, 0x96, 0xc1, 0x1f, 0xa0, 0xcf, 0x21, 0xeb, 0x5a, 0x0e, 0xdd, 0x24, 0x3d, - 0x4f, 0x88, 0xc2, 0xf2, 0xe2, 0xc5, 0x4d, 0x4d, 0x75, 0xcf, 0xa7, 0x56, 0x05, 0x1b, 0x7a, 0x09, - 0x32, 0xfb, 0xdd, 0x71, 0x34, 0x7e, 0xf8, 0x0b, 0xcb, 0x4b, 0x23, 0x60, 0x78, 0xf4, 0x6a, 0x9f, - 0x55, 0x79, 0x00, 0x72, 0x30, 0x8f, 0x0a, 0x00, 0x8d, 0xe6, 0xde, 0x5a, 0x73, 0xbb, 0xd1, 0xda, - 0x5e, 0x2f, 0x8e, 0xa1, 0x3c, 0xc8, 0xf5, 0x60, 0x28, 0x29, 0xb7, 0x21, 0xcb, 0xe5, 0x40, 0x53, - 0x90, 0x5f, 0x53, 0x9b, 0xf5, 0xfd, 0xd6, 0xce, 0x76, 0x7b, 0xbf, 0xb5, 0xd5, 0x2c, 0x8e, 0x2d, - 0xff, 0x98, 0x85, 0x1c, 0xf3, 0xd1, 0x9a, 0x2f, 0x00, 0x3a, 0x84, 0x7c, 0xe4, 0xbd, 0x05, 0x45, - 0x6f, 0xb7, 0xa4, 0x37, 0x9d, 0xb2, 0x72, 0x11, 0x09, 0xaf, 0xf7, 0xb6, 0x00, 0xfa, 0xef, 0x2c, - 0x28, 0x7a, 0xb3, 0x0d, 0xbc, 0xe3, 0x94, 0x17, 0x86, 0xae, 0x73, 0xb8, 0x2f, 0xa1, 0x10, 0x7d, - 0x41, 0x40, 0x49, 0x42, 0xc4, 0xba, 0xba, 0xf2, 0xbd, 0x0b, 0x69, 0x38, 0xf4, 0x2e, 0xe4, 0x42, - 0x4f, 0x26, 0x68, 0x40, 0x94, 0x38, 0x68, 0x65, 0x38, 0x01, 0x47, 0xac, 0x43, 0xc6, 0x7f, 0x9f, - 0x40, 0xd1, 0x22, 0x34, 0xf2, 0xd2, 0x51, 0xbe, 0x95, 0xb8, 0xc6, 0x21, 0x0e, 0x21, 0x1f, 0x79, - 0x0e, 0x88, 0xb9, 0x25, 0xe9, 0xad, 0x23, 0xe6, 0x96, 0xe4, 0xd7, 0x84, 0x3d, 0x98, 0x0c, 0xb7, - 0xda, 0xa8, 0x32, 0xc0, 0x13, 0x7b, 0x13, 0x28, 0xdf, 0xbd, 0x80, 0xa2, 0xef, 0x9c, 0x68, 0x2f, - 0x1a, 0x73, 0x4e, 0x62, 0xcb, 0x1d, 0x73, 0xce, 0x90, 0x66, 0xf6, 0x2d, 0xcc, 0x26, 0x37, 0x16, - 0xe8, 0x41, 0xdc, 0x0d, 0xc3, 0x9b, 0xcd, 0xf2, 0xbf, 0x47, 0xa2, 0xe5, 0x5b, 0x12, 0x40, 0x83, - 0x25, 0x3f, 0x5a, 0x8c, 0xb5, 0x13, 0x43, 0xda, 0x91, 0xf2, 0xbf, 0x2e, 0xa5, 0xf3, 0xb7, 0x59, - 0xfd, 0xe4, 0xab, 0x17, 0xba, 0x41, 0xdf, 0x9c, 0x1d, 0x55, 0x8f, 0xad, 0x4e, 0xcd, 0xab, 0xc3, - 0x2c, 0x47, 0xaf, 0x05, 0xaf, 0xb4, 0x3a, 0xe9, 0xd6, 0xec, 0xa3, 0x87, 0xba, 0x55, 0x4b, 0x7a, - 0xed, 0x3d, 0xca, 0x78, 0xc5, 0xe0, 0xca, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x74, 0x70, - 0xf4, 0x0c, 0x16, 0x00, 0x00, + 0x16, 0x36, 0x25, 0x47, 0x32, 0x8f, 0x2c, 0x45, 0x9e, 0xd8, 0x0a, 0xad, 0x24, 0xb6, 0xc2, 0x04, + 0xbe, 0x46, 0xee, 0x8d, 0x94, 0x6b, 0x27, 0x41, 0x93, 0xf4, 0x25, 0x5b, 0x8a, 0xad, 0x3a, 0x7e, + 0x84, 0x7e, 0x00, 0x69, 0x0b, 0x08, 0x63, 0x73, 0xcc, 0xb0, 0xa6, 0x44, 0x86, 0x1c, 0xa7, 0xd6, + 0xaa, 0xe8, 0xb6, 0xed, 0xae, 0x40, 0x81, 0xae, 0xfb, 0x43, 0xba, 0x4c, 0x57, 0xfd, 0x0f, 0xfd, + 0x27, 0xc5, 0x90, 0x43, 0x8a, 0xa4, 0x28, 0x5b, 0xf1, 0x22, 0x68, 0x37, 0x82, 0x66, 0xe6, 0x9c, + 0x6f, 0xce, 0x63, 0x0e, 0xcf, 0x03, 0x16, 0x8e, 0x8d, 0x1e, 0x25, 0xba, 0x6a, 0xd4, 0x54, 0x4c, + 0xf1, 0x11, 0xa6, 0xd8, 0x30, 0xb5, 0xf0, 0xff, 0xaa, 0x65, 0x9b, 0xd4, 0x44, 0xb9, 0xd0, 0x56, + 0xf9, 0x66, 0xc0, 0x74, 0x64, 0xda, 0xa4, 0x66, 0xe8, 0x94, 0xd8, 0xd8, 0x70, 0x3c, 0xd2, 0xf2, + 0x9c, 0x66, 0x9a, 0x9a, 0x41, 0x6a, 0xee, 0xea, 0xf0, 0xf4, 0xb8, 0xa6, 0x9e, 0xda, 0x98, 0xea, + 0x66, 0x97, 0x9f, 0xcf, 0xc7, 0xcf, 0xa9, 0xde, 0x21, 0x0e, 0xc5, 0x1d, 0xcb, 0x23, 0x90, 0x9f, + 0xc3, 0xf4, 0xaa, 0x4d, 0x30, 0x25, 0x0d, 0x4c, 0xb1, 0x43, 0xa8, 0x42, 0xde, 0x9c, 0x12, 0x87, + 0xa2, 0x2a, 0x64, 0x55, 0x6f, 0x47, 0x12, 0x2a, 0xc2, 0x62, 0x6e, 0x69, 0xba, 0x1a, 0x16, 0xd4, + 0xa7, 0xf6, 0x89, 0xe4, 0xeb, 0x30, 0x13, 0xc3, 0x71, 0x2c, 0xb3, 0xeb, 0x10, 0xb9, 0x09, 0x53, + 0x6b, 0x84, 0xc6, 0xd0, 0x1f, 0xc4, 0xd1, 0x4b, 0x49, 0xe8, 0xad, 0x46, 0x1f, 0xbf, 0x01, 0x28, + 0x0c, 0xe3, 0x81, 0xbf, 0xb7, 0x94, 0xbf, 0x08, 0x2e, 0x4c, 0xdd, 0xa6, 0xfa, 0x31, 0x3e, 0xba, + 0xbc, 0x38, 0xe8, 0x36, 0xe4, 0x30, 0x07, 0x69, 0xeb, 0xaa, 0x94, 0xaa, 0x08, 0x8b, 0xe2, 0xfa, + 0x98, 0x02, 0xfe, 0x66, 0x4b, 0x45, 0x37, 0x60, 0x82, 0x62, 0xad, 0xdd, 0xc5, 0x1d, 0x22, 0xa5, + 0xf9, 0x79, 0x96, 0x62, 0x6d, 0x0b, 0x77, 0xc8, 0x4a, 0x01, 0x26, 0xdf, 0x9c, 0x12, 0xbb, 0xd7, + 0x7e, 0x8d, 0xbb, 0xaa, 0x41, 0xe4, 0x75, 0xb8, 0x16, 0x91, 0x8b, 0xeb, 0xf7, 0x7f, 0x98, 0xf0, + 0x11, 0xb9, 0x64, 0x33, 0x11, 0xc9, 0x02, 0x86, 0x80, 0x4c, 0xfe, 0xc2, 0x77, 0x44, 0x5c, 0xc9, + 0x4b, 0x60, 0x49, 0x50, 0x8a, 0x63, 0x71, 0xaf, 0x2e, 0x43, 0xbe, 0xae, 0xaa, 0x7b, 0x58, 0xf3, + 0xd1, 0x65, 0x48, 0x53, 0xac, 0x71, 0xe0, 0x62, 0x04, 0x98, 0x51, 0xb1, 0x43, 0xb9, 0x08, 0x05, + 0x9f, 0x89, 0xc3, 0xfc, 0x2e, 0xc0, 0xf4, 0x0b, 0xdd, 0x09, 0x14, 0x77, 0x2e, 0xef, 0x91, 0x47, + 0x90, 0x39, 0xd6, 0x0d, 0x4a, 0x6c, 0xd7, 0x19, 0xb9, 0xa5, 0x5b, 0x11, 0x86, 0xe7, 0xee, 0x51, + 0xf3, 0xcc, 0xb2, 0x89, 0xe3, 0xe8, 0x66, 0x57, 0xe1, 0xc4, 0xe8, 0x53, 0x00, 0x0b, 0x6b, 0x7a, + 0xd7, 0x0d, 0x1a, 0xd7, 0x4f, 0xb9, 0xa5, 0xb9, 0x08, 0xeb, 0x4e, 0x70, 0xbc, 0x6d, 0xb1, 0x5f, + 0x47, 0x09, 0x71, 0xc8, 0x27, 0x30, 0x13, 0x53, 0x80, 0xbb, 0x6e, 0x19, 0x44, 0xdf, 0x8e, 0x8e, + 0x24, 0x54, 0xd2, 0xc3, 0xed, 0xdd, 0xa7, 0x43, 0xb7, 0x00, 0xba, 0xe4, 0x8c, 0xb6, 0xa9, 0x79, + 0x42, 0xba, 0xde, 0xab, 0x52, 0x44, 0xb6, 0xb3, 0xc7, 0x36, 0xe4, 0x9f, 0x04, 0xb8, 0xc6, 0x6e, + 0xe3, 0xea, 0x07, 0xd6, 0xea, 0xeb, 0x2e, 0x5c, 0x5e, 0xf7, 0xd4, 0x7b, 0xeb, 0xae, 0x79, 0xce, + 0xeb, 0x4b, 0xc3, 0x55, 0x7f, 0x00, 0x13, 0xdc, 0x2b, 0xbe, 0xe6, 0xc9, 0x61, 0x19, 0x50, 0x5d, + 0xa4, 0xf7, 0x1f, 0x02, 0xcc, 0xec, 0x5b, 0x6a, 0xc2, 0xa3, 0xfe, 0xe0, 0x91, 0x8b, 0xee, 0xc3, + 0x38, 0x83, 0x92, 0xc6, 0x5d, 0xc5, 0x66, 0x13, 0x5d, 0xca, 0xae, 0x55, 0x5c, 0xb2, 0x81, 0x40, + 0x7f, 0x02, 0xa5, 0xb8, 0x26, 0xdc, 0x6a, 0xf3, 0x51, 0xc1, 0x04, 0xd7, 0x08, 0x21, 0xb1, 0xe4, + 0x5f, 0x05, 0x98, 0x69, 0x10, 0x83, 0xfc, 0x03, 0xac, 0x30, 0xa0, 0x96, 0x04, 0xa5, 0xb8, 0x68, + 0x3c, 0xc4, 0x31, 0xe4, 0x15, 0xe2, 0x10, 0xfb, 0xad, 0xfb, 0x66, 0x5a, 0x0d, 0xf4, 0x08, 0x80, + 0x4b, 0xe1, 0xab, 0x39, 0x5c, 0x5e, 0x91, 0x53, 0xb6, 0x54, 0x34, 0x1b, 0x12, 0xc7, 0x7b, 0x20, + 0xbe, 0x30, 0xf2, 0x3b, 0x01, 0x6e, 0xad, 0x11, 0xba, 0x6d, 0x37, 0xcf, 0x28, 0xe9, 0xaa, 0xa1, + 0xeb, 0x7c, 0x03, 0xd5, 0xa1, 0x60, 0xf7, 0x77, 0xfb, 0xf7, 0x96, 0x23, 0xf7, 0x46, 0xe4, 0x54, + 0xf2, 0x21, 0x0e, 0xef, 0x7e, 0xf3, 0xdb, 0x2e, 0xb1, 0x03, 0x73, 0x29, 0x59, 0x77, 0xdd, 0x52, + 0xd1, 0x3a, 0xa0, 0xd7, 0x04, 0xdb, 0xf4, 0x90, 0x60, 0xda, 0xd6, 0xbb, 0x94, 0x71, 0x19, 0xfc, + 0x5b, 0x32, 0x5b, 0xf5, 0x32, 0x70, 0xd5, 0xcf, 0xc0, 0xd5, 0x06, 0xcf, 0xd0, 0xca, 0x54, 0xc0, + 0xd4, 0xe2, 0x3c, 0xf2, 0x6f, 0x29, 0xc8, 0x85, 0xa4, 0xf8, 0xb7, 0xc8, 0x8d, 0x9e, 0x00, 0x90, + 0x33, 0x4b, 0xb7, 0x89, 0xd3, 0xc6, 0x54, 0x1a, 0xe7, 0x32, 0xc6, 0x11, 0xf6, 0xfc, 0xda, 0x43, + 0x11, 0x39, 0x75, 0xdd, 0x4d, 0x4b, 0x1d, 0x42, 0xb1, 0x1b, 0x53, 0x99, 0x84, 0xb4, 0xb4, 0xc9, + 0x0f, 0x95, 0x80, 0x4c, 0xfe, 0x1a, 0xe6, 0x86, 0xb9, 0x9b, 0xc7, 0xd2, 0x53, 0xc8, 0x85, 0xac, + 0xc0, 0x8d, 0x26, 0x0d, 0x33, 0x9a, 0x12, 0x26, 0x96, 0x7b, 0x30, 0xab, 0x10, 0x83, 0x60, 0x87, + 0x7c, 0xe8, 0x87, 0x24, 0xdf, 0x84, 0x72, 0xd2, 0xd5, 0x3c, 0x92, 0x7e, 0x10, 0x20, 0xcb, 0x43, + 0x03, 0x2d, 0x40, 0xea, 0xc2, 0xe0, 0x49, 0xe9, 0x6a, 0xc4, 0xba, 0xa9, 0x91, 0xac, 0x8b, 0xee, + 0x42, 0xde, 0x62, 0x9f, 0x01, 0x76, 0xf7, 0x06, 0xe9, 0x39, 0x52, 0xba, 0x92, 0x5e, 0x14, 0x95, + 0xe8, 0xa6, 0xbc, 0x0c, 0xe2, 0x8e, 0xbf, 0x81, 0x8a, 0x90, 0x3e, 0x21, 0x3d, 0xfe, 0xc9, 0x62, + 0x7f, 0xd1, 0x34, 0x5c, 0x79, 0x8b, 0x8d, 0x53, 0x3f, 0x54, 0xbd, 0x85, 0xfc, 0x1d, 0x88, 0x81, + 0x78, 0x48, 0x82, 0xac, 0x65, 0x9b, 0xdf, 0x10, 0x5e, 0x8e, 0x88, 0x8a, 0xbf, 0x44, 0x08, 0xc6, + 0x43, 0x61, 0xee, 0xfe, 0x47, 0x25, 0xc8, 0xa8, 0x66, 0x07, 0xeb, 0x5e, 0x8e, 0x16, 0x15, 0xbe, + 0x62, 0x28, 0x6f, 0x89, 0xcd, 0xd2, 0x9a, 0xfb, 0xec, 0x44, 0xc5, 0x5f, 0x32, 0x94, 0xfd, 0xfd, + 0x56, 0x43, 0xba, 0xe2, 0xa1, 0xb0, 0xff, 0xf2, 0xbb, 0x14, 0x4c, 0xf8, 0x5f, 0x28, 0x54, 0x08, + 0x6c, 0x28, 0xba, 0xb6, 0x0a, 0x7d, 0x45, 0x53, 0xa3, 0x7d, 0x45, 0xfd, 0x5c, 0x90, 0x1e, 0x29, + 0x17, 0x44, 0x9c, 0x31, 0x3e, 0x9a, 0x33, 0x1e, 0xb3, 0x14, 0xcd, 0xcd, 0xec, 0x48, 0x57, 0xdc, + 0x7b, 0x4a, 0xb1, 0x14, 0xcd, 0x8f, 0x95, 0x10, 0x25, 0xba, 0x0b, 0xe3, 0x14, 0x6b, 0x8e, 0x94, + 0x71, 0x39, 0x06, 0xeb, 0x31, 0xf7, 0x94, 0x85, 0xed, 0x91, 0x5b, 0xdf, 0xa9, 0x2c, 0x6c, 0xb3, + 0x17, 0x87, 0x2d, 0xa7, 0xae, 0x53, 0x79, 0x07, 0x26, 0xc3, 0x1a, 0x06, 0x3e, 0x13, 0x42, 0x3e, + 0xfb, 0x5f, 0xf8, 0x11, 0x30, 0xb9, 0xfd, 0x56, 0xa6, 0xca, 0x5a, 0x99, 0xea, 0x0b, 0xaf, 0x95, + 0xf1, 0x1f, 0x87, 0x01, 0xe9, 0x3d, 0xac, 0x25, 0x02, 0xcd, 0x27, 0x64, 0xab, 0x48, 0xae, 0x0a, + 0xb9, 0x2e, 0x3d, 0x5a, 0x3f, 0xf1, 0xbd, 0x00, 0x13, 0xbe, 0xbd, 0xd1, 0x53, 0xc8, 0x9e, 0x90, + 0x5e, 0xbb, 0x83, 0x2d, 0x5e, 0xaf, 0xdc, 0x4e, 0xf4, 0x4b, 0x75, 0x83, 0xf4, 0x36, 0xb1, 0xd5, + 0xec, 0x52, 0xbb, 0xa7, 0x64, 0x4e, 0xdc, 0x45, 0xf9, 0x09, 0xe4, 0x42, 0xdb, 0xa3, 0x86, 0xc2, + 0xd3, 0xd4, 0x47, 0x82, 0xbc, 0x0d, 0xc5, 0x78, 0x6d, 0x86, 0x9e, 0x41, 0xd6, 0xab, 0xce, 0x9c, + 0x44, 0x51, 0x76, 0xf5, 0xae, 0x66, 0x90, 0x1d, 0xdb, 0xb4, 0x88, 0x4d, 0x7b, 0x1e, 0xb7, 0xe2, + 0x73, 0xc8, 0x7f, 0xa6, 0x61, 0x3a, 0x89, 0x02, 0x7d, 0x06, 0xc0, 0x92, 0x67, 0xa4, 0x48, 0x9c, + 0x8b, 0x3f, 0x8a, 0x28, 0xcf, 0xfa, 0x98, 0x22, 0x52, 0xac, 0x71, 0x80, 0x97, 0x50, 0x0c, 0x5e, + 0x57, 0x3b, 0x52, 0x67, 0xdf, 0x4d, 0x7e, 0x8d, 0x03, 0x60, 0x57, 0x03, 0x7e, 0x0e, 0xb9, 0x05, + 0x57, 0x03, 0xa7, 0x72, 0x44, 0xcf, 0x77, 0x77, 0x12, 0xe3, 0x68, 0x00, 0xb0, 0xe0, 0x73, 0x73, + 0xbc, 0x0d, 0x28, 0xf8, 0x75, 0x05, 0x87, 0xf3, 0x62, 0x4c, 0x4e, 0x7a, 0x0a, 0x03, 0x68, 0x79, + 0xce, 0xcb, 0xc1, 0x76, 0x60, 0x82, 0x11, 0x60, 0x6a, 0xda, 0x12, 0x54, 0x84, 0xc5, 0xc2, 0xd2, + 0xc3, 0x0b, 0xfd, 0x50, 0x5d, 0x35, 0x3b, 0x16, 0xb6, 0x75, 0x87, 0x55, 0xcb, 0x1e, 0xaf, 0x12, + 0xa0, 0xc8, 0x15, 0x40, 0x83, 0xe7, 0x08, 0x20, 0xd3, 0x7c, 0xb9, 0x5f, 0x7f, 0xb1, 0x5b, 0x1c, + 0x5b, 0x99, 0x82, 0xab, 0x16, 0x07, 0xe4, 0x1a, 0xc8, 0x6b, 0x50, 0x4a, 0xd6, 0x3f, 0x5e, 0xc0, + 0x09, 0x83, 0x05, 0xdc, 0x0a, 0xc0, 0x84, 0x8f, 0x27, 0x7f, 0x0c, 0x53, 0x03, 0x1e, 0x8e, 0x54, + 0x78, 0x42, 0xbc, 0xc2, 0x0b, 0x73, 0x7f, 0x05, 0xd7, 0x87, 0x38, 0x16, 0x3d, 0xf4, 0x42, 0x87, + 0x15, 0x0e, 0x02, 0x2f, 0x1c, 0xc2, 0x76, 0xda, 0x20, 0xbd, 0x03, 0xf6, 0xde, 0x77, 0xb0, 0xce, + 0xac, 0xcc, 0x82, 0xe6, 0x00, 0x1b, 0x11, 0xf0, 0xc7, 0x30, 0x19, 0xa6, 0x1a, 0x39, 0x99, 0xfc, + 0xc8, 0xca, 0xe1, 0x24, 0x6f, 0xa2, 0x72, 0x2c, 0xb3, 0x30, 0xb5, 0xfc, 0xdc, 0x32, 0x1d, 0xce, + 0x2d, 0xeb, 0x63, 0xfc, 0x03, 0x23, 0x45, 0xb3, 0x0b, 0x93, 0x94, 0xe7, 0x97, 0x72, 0x2c, 0xbf, + 0x30, 0x2c, 0xbe, 0x11, 0xd1, 0xe2, 0xe7, 0x14, 0x4c, 0x0d, 0x74, 0x4b, 0x4c, 0x72, 0x43, 0xef, + 0xe8, 0x9e, 0x1c, 0x79, 0xc5, 0x5b, 0xb0, 0xdd, 0x70, 0xa3, 0xe3, 0x2d, 0xd0, 0xe7, 0x90, 0x75, + 0x4c, 0x9b, 0x6e, 0x90, 0x9e, 0x2b, 0x44, 0x61, 0x69, 0xe1, 0xfc, 0x56, 0xac, 0xba, 0xeb, 0x51, + 0x2b, 0x3e, 0x1b, 0x7a, 0x0e, 0x22, 0xfb, 0xbb, 0x6d, 0xab, 0xfc, 0xf1, 0x17, 0x96, 0x16, 0x47, + 0xc0, 0x70, 0xe9, 0x95, 0x3e, 0xab, 0x7c, 0x0f, 0xc4, 0x60, 0x1f, 0x15, 0x00, 0x1a, 0xcd, 0xdd, + 0xd5, 0xe6, 0x56, 0xa3, 0xb5, 0xb5, 0x56, 0x1c, 0x43, 0x79, 0x10, 0xeb, 0xc1, 0x52, 0x90, 0x6f, + 0x42, 0x96, 0xcb, 0x81, 0xa6, 0x20, 0xbf, 0xaa, 0x34, 0xeb, 0x7b, 0xad, 0xed, 0xad, 0xf6, 0x5e, + 0x6b, 0xb3, 0x59, 0x1c, 0x5b, 0xfa, 0x2b, 0x0b, 0x39, 0xe6, 0xa3, 0x55, 0x4f, 0x00, 0x74, 0x00, + 0xf9, 0xc8, 0x94, 0x08, 0x45, 0xbf, 0x6e, 0x49, 0x93, 0xa8, 0xb2, 0x7c, 0x1e, 0x09, 0xaf, 0xf7, + 0x36, 0x01, 0xfa, 0xd3, 0x21, 0x14, 0xfd, 0xb2, 0x0d, 0x4c, 0x9f, 0xca, 0xf3, 0x43, 0xcf, 0x39, + 0xdc, 0x2b, 0x28, 0x44, 0xe7, 0x1e, 0x28, 0x49, 0x88, 0x58, 0x17, 0x56, 0xbe, 0x73, 0x2e, 0x0d, + 0x87, 0xde, 0x81, 0x5c, 0x68, 0xd0, 0x83, 0x06, 0x44, 0x89, 0x83, 0x56, 0x86, 0x13, 0x70, 0xc4, + 0x3a, 0x64, 0xbc, 0xa9, 0x0a, 0x8a, 0x16, 0xa1, 0x91, 0xf9, 0x4c, 0xf9, 0x46, 0xe2, 0x19, 0x87, + 0x38, 0x80, 0x7c, 0x64, 0x88, 0x11, 0x73, 0x4b, 0xd2, 0x84, 0x26, 0xe6, 0x96, 0xe4, 0x19, 0xc8, + 0x2e, 0x4c, 0x86, 0x07, 0x04, 0xa8, 0x32, 0xc0, 0x13, 0x9b, 0x64, 0x94, 0x6f, 0x9f, 0x43, 0xd1, + 0x77, 0x4e, 0xb4, 0x83, 0x8e, 0x39, 0x27, 0x71, 0x50, 0x10, 0x73, 0xce, 0x90, 0x16, 0xfc, 0x15, + 0x14, 0xa2, 0x5d, 0x6c, 0x0c, 0x3a, 0xb1, 0xfb, 0x8e, 0x41, 0x27, 0xb7, 0xc1, 0xe8, 0x0d, 0x94, + 0x92, 0x7b, 0x16, 0x74, 0x2f, 0xee, 0xe1, 0xe1, 0x7d, 0x6c, 0xf9, 0xbf, 0x23, 0xd1, 0xf2, 0x2b, + 0x09, 0xa0, 0xc1, 0x6e, 0x02, 0x2d, 0xc4, 0x3a, 0x95, 0x21, 0x9d, 0x4e, 0xf9, 0x3f, 0x17, 0xd2, + 0x79, 0xd7, 0xac, 0x7c, 0xf2, 0xe5, 0x33, 0x4d, 0xa7, 0xaf, 0x4f, 0x0f, 0xab, 0x47, 0x66, 0xa7, + 0xe6, 0x96, 0x78, 0xa6, 0xad, 0xd5, 0x82, 0xb1, 0xb5, 0x46, 0xba, 0x35, 0xeb, 0xf0, 0xbe, 0x66, + 0xd6, 0x92, 0xc6, 0xdf, 0x87, 0x19, 0xb7, 0xce, 0x5c, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x66, + 0xa6, 0x52, 0x31, 0x1d, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2389,6 +2519,8 @@ type DataCatalogClient interface { ListDatasets(ctx context.Context, in *ListDatasetsRequest, opts ...grpc.CallOption) (*ListDatasetsResponse, error) // Updates an existing artifact, overwriting the stored artifact data in the underlying blob storage. UpdateArtifact(ctx context.Context, in *UpdateArtifactRequest, opts ...grpc.CallOption) (*UpdateArtifactResponse, error) + // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. + DeleteArtifact(ctx context.Context, in *DeleteArtifactRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error) // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -2486,6 +2618,15 @@ func (c *dataCatalogClient) UpdateArtifact(ctx context.Context, in *UpdateArtifa return out, nil } +func (c *dataCatalogClient) DeleteArtifact(ctx context.Context, in *DeleteArtifactRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error) { + out := new(DeleteArtifactResponse) + err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/DeleteArtifact", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *dataCatalogClient) GetOrExtendReservation(ctx context.Context, in *GetOrExtendReservationRequest, opts ...grpc.CallOption) (*GetOrExtendReservationResponse, error) { out := new(GetOrExtendReservationResponse) err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/GetOrExtendReservation", in, out, opts...) @@ -2524,6 +2665,8 @@ type DataCatalogServer interface { ListDatasets(context.Context, *ListDatasetsRequest) (*ListDatasetsResponse, error) // Updates an existing artifact, overwriting the stored artifact data in the underlying blob storage. UpdateArtifact(context.Context, *UpdateArtifactRequest) (*UpdateArtifactResponse, error) + // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. + DeleteArtifact(context.Context, *DeleteArtifactRequest) (*DeleteArtifactResponse, error) // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -2569,6 +2712,9 @@ func (*UnimplementedDataCatalogServer) ListDatasets(ctx context.Context, req *Li func (*UnimplementedDataCatalogServer) UpdateArtifact(ctx context.Context, req *UpdateArtifactRequest) (*UpdateArtifactResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateArtifact not implemented") } +func (*UnimplementedDataCatalogServer) DeleteArtifact(ctx context.Context, req *DeleteArtifactRequest) (*DeleteArtifactResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteArtifact not implemented") +} func (*UnimplementedDataCatalogServer) GetOrExtendReservation(ctx context.Context, req *GetOrExtendReservationRequest) (*GetOrExtendReservationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetOrExtendReservation not implemented") } @@ -2724,6 +2870,24 @@ func _DataCatalog_UpdateArtifact_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } +func _DataCatalog_DeleteArtifact_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteArtifactRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DataCatalogServer).DeleteArtifact(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/datacatalog.DataCatalog/DeleteArtifact", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DataCatalogServer).DeleteArtifact(ctx, req.(*DeleteArtifactRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _DataCatalog_GetOrExtendReservation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetOrExtendReservationRequest) if err := dec(in); err != nil { @@ -2796,6 +2960,10 @@ var _DataCatalog_serviceDesc = grpc.ServiceDesc{ MethodName: "UpdateArtifact", Handler: _DataCatalog_UpdateArtifact_Handler, }, + { + MethodName: "DeleteArtifact", + Handler: _DataCatalog_DeleteArtifact_Handler, + }, { MethodName: "GetOrExtendReservation", Handler: _DataCatalog_GetOrExtendReservation_Handler, diff --git a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go index 0f1f5dd9e6..547139a3f1 100644 --- a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go @@ -1305,6 +1305,160 @@ var _ interface { ErrorName() string } = UpdateArtifactResponseValidationError{} +// Validate checks the field values on DeleteArtifactRequest with the rules +// defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *DeleteArtifactRequest) Validate() error { + if m == nil { + return nil + } + + if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DeleteArtifactRequestValidationError{ + field: "Dataset", + reason: "embedded message failed validation", + cause: err, + } + } + } + + switch m.QueryHandle.(type) { + + case *DeleteArtifactRequest_ArtifactId: + // no validation rules for ArtifactId + + case *DeleteArtifactRequest_TagName: + // no validation rules for TagName + + } + + return nil +} + +// DeleteArtifactRequestValidationError is the validation error returned by +// DeleteArtifactRequest.Validate if the designated constraints aren't met. +type DeleteArtifactRequestValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e DeleteArtifactRequestValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e DeleteArtifactRequestValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e DeleteArtifactRequestValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e DeleteArtifactRequestValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e DeleteArtifactRequestValidationError) ErrorName() string { + return "DeleteArtifactRequestValidationError" +} + +// Error satisfies the builtin error interface +func (e DeleteArtifactRequestValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sDeleteArtifactRequest.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = DeleteArtifactRequestValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = DeleteArtifactRequestValidationError{} + +// Validate checks the field values on DeleteArtifactResponse with the rules +// defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *DeleteArtifactResponse) Validate() error { + if m == nil { + return nil + } + + return nil +} + +// DeleteArtifactResponseValidationError is the validation error returned by +// DeleteArtifactResponse.Validate if the designated constraints aren't met. +type DeleteArtifactResponseValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e DeleteArtifactResponseValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e DeleteArtifactResponseValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e DeleteArtifactResponseValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e DeleteArtifactResponseValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e DeleteArtifactResponseValidationError) ErrorName() string { + return "DeleteArtifactResponseValidationError" +} + +// Error satisfies the builtin error interface +func (e DeleteArtifactResponseValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sDeleteArtifactResponse.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = DeleteArtifactResponseValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = DeleteArtifactResponseValidationError{} + // Validate checks the field values on ReservationID with the rules defined in // the proto definition for this message. If any rules are violated, an error // is returned. diff --git a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java index a10dd9b2a4..550f06cb5c 100644 --- a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java +++ b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java @@ -12414,6 +12414,1495 @@ public datacatalog.Datacatalog.UpdateArtifactResponse getDefaultInstanceForType( } + public interface DeleteArtifactRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * ID of dataset the artifact is associated with
+     *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + boolean hasDataset(); + /** + * 
+     * ID of dataset the artifact is associated with
+     *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + datacatalog.Datacatalog.DatasetID getDataset(); + /** + * 
+     * ID of dataset the artifact is associated with
+     *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetOrBuilder(); + + /** + * string artifact_id = 2; + */ + java.lang.String getArtifactId(); + /** + * string artifact_id = 2; + */ + com.google.protobuf.ByteString + getArtifactIdBytes(); + + /** + * string tag_name = 3; + */ + java.lang.String getTagName(); + /** + * string tag_name = 3; + */ + com.google.protobuf.ByteString + getTagNameBytes(); + + public datacatalog.Datacatalog.DeleteArtifactRequest.QueryHandleCase getQueryHandleCase(); + } + /** + * 
+   * Request message for deleting an Artifact and its associated ArtifactData.
+   *
+ * + * Protobuf type {@code datacatalog.DeleteArtifactRequest} + */ + public static final class DeleteArtifactRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactRequest) + DeleteArtifactRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use DeleteArtifactRequest.newBuilder() to construct. + private DeleteArtifactRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private DeleteArtifactRequest() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private DeleteArtifactRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + datacatalog.Datacatalog.DatasetID.Builder subBuilder = null; + if (dataset_ != null) { + subBuilder = dataset_.toBuilder(); + } + dataset_ = input.readMessage(datacatalog.Datacatalog.DatasetID.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(dataset_); + dataset_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + queryHandleCase_ = 2; + queryHandle_ = s; + break; + } + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + queryHandleCase_ = 3; + queryHandle_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.DeleteArtifactRequest.class, datacatalog.Datacatalog.DeleteArtifactRequest.Builder.class); + } + + private int queryHandleCase_ = 0; + private java.lang.Object queryHandle_; + public enum QueryHandleCase + implements com.google.protobuf.Internal.EnumLite { + ARTIFACT_ID(2), + TAG_NAME(3), + QUERYHANDLE_NOT_SET(0); + private final int value; + private QueryHandleCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static QueryHandleCase valueOf(int value) { + return forNumber(value); + } + + public static QueryHandleCase forNumber(int value) { + switch (value) { + case 2: return ARTIFACT_ID; + case 3: return TAG_NAME; + case 0: return QUERYHANDLE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public QueryHandleCase + getQueryHandleCase() { + return QueryHandleCase.forNumber( + queryHandleCase_); + } + + public static final int DATASET_FIELD_NUMBER = 1; + private datacatalog.Datacatalog.DatasetID dataset_; + /** + * 
+     * ID of dataset the artifact is associated with
+     *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public boolean hasDataset() { + return dataset_ != null; + } + /** + * 
+     * ID of dataset the artifact is associated with
+     *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public datacatalog.Datacatalog.DatasetID getDataset() { + return dataset_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : dataset_; + } + /** + * 
+     * ID of dataset the artifact is associated with
+     *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetOrBuilder() { + return getDataset(); + } + + public static final int ARTIFACT_ID_FIELD_NUMBER = 2; + /** + * string artifact_id = 2; + */ + public java.lang.String getArtifactId() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 2) { + ref = queryHandle_; + } + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (queryHandleCase_ == 2) { + queryHandle_ = s; + } + return s; + } + } + /** + * string artifact_id = 2; + */ + public com.google.protobuf.ByteString + getArtifactIdBytes() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 2) { + ref = queryHandle_; + } + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (queryHandleCase_ == 2) { + queryHandle_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int TAG_NAME_FIELD_NUMBER = 3; + /** + * string tag_name = 3; + */ + public java.lang.String getTagName() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 3) { + ref = queryHandle_; + } + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (queryHandleCase_ == 3) { + queryHandle_ = s; + } + return s; + } + } + /** + * string tag_name = 3; + */ + public com.google.protobuf.ByteString + getTagNameBytes() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 3) { + ref = queryHandle_; + } + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (queryHandleCase_ == 3) { + queryHandle_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (dataset_ != null) { + output.writeMessage(1, getDataset()); + } + if (queryHandleCase_ == 2) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, queryHandle_); + } + if (queryHandleCase_ == 3) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, queryHandle_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (dataset_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getDataset()); + } + if (queryHandleCase_ == 2) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, queryHandle_); + } + if (queryHandleCase_ == 3) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, queryHandle_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactRequest)) { + return super.equals(obj); + } + datacatalog.Datacatalog.DeleteArtifactRequest other = (datacatalog.Datacatalog.DeleteArtifactRequest) obj; + + if (hasDataset() != other.hasDataset()) return false; + if (hasDataset()) { + if (!getDataset() + .equals(other.getDataset())) return false; + } + if (!getQueryHandleCase().equals(other.getQueryHandleCase())) return false; + switch (queryHandleCase_) { + case 2: + if (!getArtifactId() + .equals(other.getArtifactId())) return false; + break; + case 3: + if (!getTagName() + .equals(other.getTagName())) return false; + break; + case 0: + default: + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasDataset()) { + hash = (37 * hash) + DATASET_FIELD_NUMBER; + hash = (53 * hash) + getDataset().hashCode(); + } + switch (queryHandleCase_) { + case 2: + hash = (37 * hash) + ARTIFACT_ID_FIELD_NUMBER; + hash = (53 * hash) + getArtifactId().hashCode(); + break; + case 3: + hash = (37 * hash) + TAG_NAME_FIELD_NUMBER; + hash = (53 * hash) + getTagName().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * Request message for deleting an Artifact and its associated ArtifactData.
+     *
+ * + * Protobuf type {@code datacatalog.DeleteArtifactRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactRequest) + datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.DeleteArtifactRequest.class, datacatalog.Datacatalog.DeleteArtifactRequest.Builder.class); + } + + // Construct using datacatalog.Datacatalog.DeleteArtifactRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (datasetBuilder_ == null) { + dataset_ = null; + } else { + dataset_ = null; + datasetBuilder_ = null; + } + queryHandleCase_ = 0; + queryHandle_ = null; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactRequest_descriptor; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactRequest getDefaultInstanceForType() { + return datacatalog.Datacatalog.DeleteArtifactRequest.getDefaultInstance(); + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactRequest build() { + datacatalog.Datacatalog.DeleteArtifactRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactRequest buildPartial() { + datacatalog.Datacatalog.DeleteArtifactRequest result = new datacatalog.Datacatalog.DeleteArtifactRequest(this); + if (datasetBuilder_ == null) { + result.dataset_ = dataset_; + } else { + result.dataset_ = datasetBuilder_.build(); + } + if (queryHandleCase_ == 2) { + result.queryHandle_ = queryHandle_; + } + if (queryHandleCase_ == 3) { + result.queryHandle_ = queryHandle_; + } + result.queryHandleCase_ = queryHandleCase_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof datacatalog.Datacatalog.DeleteArtifactRequest) { + return mergeFrom((datacatalog.Datacatalog.DeleteArtifactRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactRequest other) { + if (other == datacatalog.Datacatalog.DeleteArtifactRequest.getDefaultInstance()) return this; + if (other.hasDataset()) { + mergeDataset(other.getDataset()); + } + switch (other.getQueryHandleCase()) { + case ARTIFACT_ID: { + queryHandleCase_ = 2; + queryHandle_ = other.queryHandle_; + onChanged(); + break; + } + case TAG_NAME: { + queryHandleCase_ = 3; + queryHandle_ = other.queryHandle_; + onChanged(); + break; + } + case QUERYHANDLE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + datacatalog.Datacatalog.DeleteArtifactRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (datacatalog.Datacatalog.DeleteArtifactRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int queryHandleCase_ = 0; + private java.lang.Object queryHandle_; + public QueryHandleCase + getQueryHandleCase() { + return QueryHandleCase.forNumber( + queryHandleCase_); + } + + public Builder clearQueryHandle() { + queryHandleCase_ = 0; + queryHandle_ = null; + onChanged(); + return this; + } + + + private datacatalog.Datacatalog.DatasetID dataset_; + private com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> datasetBuilder_; + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public boolean hasDataset() { + return datasetBuilder_ != null || dataset_ != null; + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public datacatalog.Datacatalog.DatasetID getDataset() { + if (datasetBuilder_ == null) { + return dataset_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : dataset_; + } else { + return datasetBuilder_.getMessage(); + } + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public Builder setDataset(datacatalog.Datacatalog.DatasetID value) { + if (datasetBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + dataset_ = value; + onChanged(); + } else { + datasetBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public Builder setDataset( + datacatalog.Datacatalog.DatasetID.Builder builderForValue) { + if (datasetBuilder_ == null) { + dataset_ = builderForValue.build(); + onChanged(); + } else { + datasetBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public Builder mergeDataset(datacatalog.Datacatalog.DatasetID value) { + if (datasetBuilder_ == null) { + if (dataset_ != null) { + dataset_ = + datacatalog.Datacatalog.DatasetID.newBuilder(dataset_).mergeFrom(value).buildPartial(); + } else { + dataset_ = value; + } + onChanged(); + } else { + datasetBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public Builder clearDataset() { + if (datasetBuilder_ == null) { + dataset_ = null; + onChanged(); + } else { + dataset_ = null; + datasetBuilder_ = null; + } + + return this; + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public datacatalog.Datacatalog.DatasetID.Builder getDatasetBuilder() { + + onChanged(); + return getDatasetFieldBuilder().getBuilder(); + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetOrBuilder() { + if (datasetBuilder_ != null) { + return datasetBuilder_.getMessageOrBuilder(); + } else { + return dataset_ == null ? + datacatalog.Datacatalog.DatasetID.getDefaultInstance() : dataset_; + } + } + /** + * 
+       * ID of dataset the artifact is associated with
+       *
+ * + * .datacatalog.DatasetID dataset = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> + getDatasetFieldBuilder() { + if (datasetBuilder_ == null) { + datasetBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder>( + getDataset(), + getParentForChildren(), + isClean()); + dataset_ = null; + } + return datasetBuilder_; + } + + /** + * string artifact_id = 2; + */ + public java.lang.String getArtifactId() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 2) { + ref = queryHandle_; + } + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (queryHandleCase_ == 2) { + queryHandle_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string artifact_id = 2; + */ + public com.google.protobuf.ByteString + getArtifactIdBytes() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 2) { + ref = queryHandle_; + } + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (queryHandleCase_ == 2) { + queryHandle_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string artifact_id = 2; + */ + public Builder setArtifactId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + queryHandleCase_ = 2; + queryHandle_ = value; + onChanged(); + return this; + } + /** + * string artifact_id = 2; + */ + public Builder clearArtifactId() { + if (queryHandleCase_ == 2) { + queryHandleCase_ = 0; + queryHandle_ = null; + onChanged(); + } + return this; + } + /** + * string artifact_id = 2; + */ + public Builder setArtifactIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + queryHandleCase_ = 2; + queryHandle_ = value; + onChanged(); + return this; + } + + /** + * string tag_name = 3; + */ + public java.lang.String getTagName() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 3) { + ref = queryHandle_; + } + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (queryHandleCase_ == 3) { + queryHandle_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string tag_name = 3; + */ + public com.google.protobuf.ByteString + getTagNameBytes() { + java.lang.Object ref = ""; + if (queryHandleCase_ == 3) { + ref = queryHandle_; + } + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (queryHandleCase_ == 3) { + queryHandle_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string tag_name = 3; + */ + public Builder setTagName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + queryHandleCase_ = 3; + queryHandle_ = value; + onChanged(); + return this; + } + /** + * string tag_name = 3; + */ + public Builder clearTagName() { + if (queryHandleCase_ == 3) { + queryHandleCase_ = 0; + queryHandle_ = null; + onChanged(); + } + return this; + } + /** + * string tag_name = 3; + */ + public Builder setTagNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + queryHandleCase_ = 3; + queryHandle_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactRequest) + } + + // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactRequest) + private static final datacatalog.Datacatalog.DeleteArtifactRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactRequest(); + } + + public static datacatalog.Datacatalog.DeleteArtifactRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public DeleteArtifactRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DeleteArtifactRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface DeleteArtifactResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactResponse) + com.google.protobuf.MessageOrBuilder { + } + /** + * 
+   * Response message for deleting an Artifact.
+   *
+ * + * Protobuf type {@code datacatalog.DeleteArtifactResponse} + */ + public static final class DeleteArtifactResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactResponse) + DeleteArtifactResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use DeleteArtifactResponse.newBuilder() to construct. + private DeleteArtifactResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private DeleteArtifactResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private DeleteArtifactResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactResponse)) { + return super.equals(obj); + } + datacatalog.Datacatalog.DeleteArtifactResponse other = (datacatalog.Datacatalog.DeleteArtifactResponse) obj; + + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * Response message for deleting an Artifact.
+     *
+ * + * Protobuf type {@code datacatalog.DeleteArtifactResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactResponse) + datacatalog.Datacatalog.DeleteArtifactResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class); + } + + // Construct using datacatalog.Datacatalog.DeleteArtifactResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() { + return datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance(); + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse build() { + datacatalog.Datacatalog.DeleteArtifactResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse buildPartial() { + datacatalog.Datacatalog.DeleteArtifactResponse result = new datacatalog.Datacatalog.DeleteArtifactResponse(this); + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof datacatalog.Datacatalog.DeleteArtifactResponse) { + return mergeFrom((datacatalog.Datacatalog.DeleteArtifactResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactResponse other) { + if (other == datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance()) return this; + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + datacatalog.Datacatalog.DeleteArtifactResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (datacatalog.Datacatalog.DeleteArtifactResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactResponse) + } + + // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactResponse) + private static final datacatalog.Datacatalog.DeleteArtifactResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactResponse(); + } + + public static datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public DeleteArtifactResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DeleteArtifactResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + public interface ReservationIDOrBuilder extends // @@protoc_insertion_point(interface_extends:datacatalog.ReservationID) com.google.protobuf.MessageOrBuilder { @@ -33440,6 +34929,16 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_datacatalog_UpdateArtifactResponse_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_datacatalog_DeleteArtifactRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_datacatalog_DeleteArtifactRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_datacatalog_DeleteArtifactResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_datacatalog_ReservationID_descriptor; private static final @@ -33593,94 +35092,100 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() { "_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001(\tH\000\022\'\n\004data\030" + "\004 \003(\0132\031.datacatalog.ArtifactDataB\016\n\014quer" + "y_handle\"-\n\026UpdateArtifactResponse\022\023\n\013ar" + - "tifact_id\030\001 \001(\t\"M\n\rReservationID\022*\n\ndata" + - "set_id\030\001 \001(\0132\026.datacatalog.DatasetID\022\020\n\010" + - "tag_name\030\002 \001(\t\"\234\001\n\035GetOrExtendReservatio" + - "nRequest\0222\n\016reservation_id\030\001 \001(\0132\032.datac" + - "atalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225" + - "\n\022heartbeat_interval\030\003 \001(\0132\031.google.prot" + - "obuf.Duration\"\343\001\n\013Reservation\0222\n\016reserva" + - "tion_id\030\001 \001(\0132\032.datacatalog.ReservationI" + - "D\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbeat_interva" + - "l\030\003 \001(\0132\031.google.protobuf.Duration\022.\n\nex" + - "pires_at\030\004 \001(\0132\032.google.protobuf.Timesta" + - "mp\022\'\n\010metadata\030\006 \001(\0132\025.datacatalog.Metad" + - "ata\"O\n\036GetOrExtendReservationResponse\022-\n" + - "\013reservation\030\001 \001(\0132\030.datacatalog.Reserva" + - "tion\"a\n\031ReleaseReservationRequest\0222\n\016res" + - "ervation_id\030\001 \001(\0132\032.datacatalog.Reservat" + - "ionID\022\020\n\010owner_id\030\002 \001(\t\"\034\n\032ReleaseReserv" + - "ationResponse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.d" + - "atacatalog.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025" + - ".datacatalog.Metadata\022\025\n\rpartitionKeys\030\003" + - " \003(\t\"\'\n\tPartition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" + - "\002 \001(\t\"Y\n\tDatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004n" + - "ame\030\002 \001(\t\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001" + - "(\t\022\014\n\004UUID\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(" + - "\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Dataset" + - "ID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.ArtifactD" + - "ata\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog.Meta" + - "data\022*\n\npartitions\030\005 \003(\0132\026.datacatalog.P" + - "artition\022\036\n\004tags\030\006 \003(\0132\020.datacatalog.Tag" + - "\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf.T" + - "imestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022%" + - "\n\005value\030\002 \001(\0132\026.flyteidl.core.Literal\"Q\n" + - "\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022" + - "\'\n\007dataset\030\003 \001(\0132\026.datacatalog.DatasetID" + - "\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.datacata" + - "log.Metadata.KeyMapEntry\032-\n\013KeyMapEntry\022" + - "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020Filte" + - "rExpression\0222\n\007filters\030\001 \003(\0132!.datacatal" + - "og.SinglePropertyFilter\"\211\003\n\024SingleProper" + - "tyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.datacatal" + - "og.TagPropertyFilterH\000\022@\n\020partition_filt" + - "er\030\002 \001(\0132$.datacatalog.PartitionProperty" + - "FilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#.data" + - "catalog.ArtifactPropertyFilterH\000\022<\n\016data" + - "set_filter\030\004 \001(\0132\".datacatalog.DatasetPr" + - "opertyFilterH\000\022F\n\010operator\030\n \001(\01624.datac" + - "atalog.SinglePropertyFilter.ComparisonOp" + - "erator\" \n\022ComparisonOperator\022\n\n\006EQUALS\020\000" + - "B\021\n\017property_filter\";\n\026ArtifactPropertyF" + - "ilter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010property" + - "\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001 \001(\tH" + - "\000B\n\n\010property\"S\n\027PartitionPropertyFilter" + - "\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.KeyValue" + - "PairH\000B\n\n\010property\"*\n\014KeyValuePair\022\013\n\003ke" + - "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"k\n\025DatasetPropert" + - "yFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\t" + - "H\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B" + - "\n\n\010property\"\361\001\n\021PaginationOptions\022\r\n\005lim" + - "it\030\001 \001(\r\022\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\016" + - "2&.datacatalog.PaginationOptions.SortKey" + - "\022;\n\tsortOrder\030\004 \001(\0162(.datacatalog.Pagina" + - "tionOptions.SortOrder\"*\n\tSortOrder\022\016\n\nDE" + - "SCENDING\020\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\r" + - "CREATION_TIME\020\0002\206\007\n\013DataCatalog\022V\n\rCreat" + - "eDataset\022!.datacatalog.CreateDatasetRequ" + - "est\032\".datacatalog.CreateDatasetResponse\022" + - "M\n\nGetDataset\022\036.datacatalog.GetDatasetRe" + - "quest\032\037.datacatalog.GetDatasetResponse\022Y" + - "\n\016CreateArtifact\022\".datacatalog.CreateArt" + - "ifactRequest\032#.datacatalog.CreateArtifac" + - "tResponse\022P\n\013GetArtifact\022\037.datacatalog.G" + - "etArtifactRequest\032 .datacatalog.GetArtif" + - "actResponse\022A\n\006AddTag\022\032.datacatalog.AddT" + - "agRequest\032\033.datacatalog.AddTagResponse\022V" + - "\n\rListArtifacts\022!.datacatalog.ListArtifa" + - "ctsRequest\032\".datacatalog.ListArtifactsRe" + - "sponse\022S\n\014ListDatasets\022 .datacatalog.Lis" + - "tDatasetsRequest\032!.datacatalog.ListDatas" + - "etsResponse\022Y\n\016UpdateArtifact\022\".datacata" + - "log.UpdateArtifactRequest\032#.datacatalog." + - "UpdateArtifactResponse\022q\n\026GetOrExtendRes" + - "ervation\022*.datacatalog.GetOrExtendReserv" + - "ationRequest\032+.datacatalog.GetOrExtendRe" + - "servationResponse\022e\n\022ReleaseReservation\022" + - "&.datacatalog.ReleaseReservationRequest\032" + - "\'.datacatalog.ReleaseReservationResponse" + - "B=Z;github.com/flyteorg/flyteidl/gen/pb-" + - "go/flyteidl/datacatalogb\006proto3" + "tifact_id\030\001 \001(\t\"{\n\025DeleteArtifactRequest" + + "\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.DatasetI" + + "D\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001" + + "(\tH\000B\016\n\014query_handle\"\030\n\026DeleteArtifactRe" + + "sponse\"M\n\rReservationID\022*\n\ndataset_id\030\001 " + + "\001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name\030" + + "\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest\022" + + "2\n\016reservation_id\030\001 \001(\0132\032.datacatalog.Re" + + "servationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbe" + + "at_interval\030\003 \001(\0132\031.google.protobuf.Dura" + + "tion\"\343\001\n\013Reservation\0222\n\016reservation_id\030\001" + + " \001(\0132\032.datacatalog.ReservationID\022\020\n\010owne" + + "r_id\030\002 \001(\t\0225\n\022heartbeat_interval\030\003 \001(\0132\031" + + ".google.protobuf.Duration\022.\n\nexpires_at\030" + + "\004 \001(\0132\032.google.protobuf.Timestamp\022\'\n\010met" + + "adata\030\006 \001(\0132\025.datacatalog.Metadata\"O\n\036Ge" + + "tOrExtendReservationResponse\022-\n\013reservat" + + "ion\030\001 \001(\0132\030.datacatalog.Reservation\"a\n\031R" + + "eleaseReservationRequest\0222\n\016reservation_" + + "id\030\001 \001(\0132\032.datacatalog.ReservationID\022\020\n\010" + + "owner_id\030\002 \001(\t\"\034\n\032ReleaseReservationResp" + + "onse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalo" + + "g.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacata" + + "log.Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tP" + + "artition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\t" + + "DatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t" + + "\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUI" + + "D\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007data" + + "set\030\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004dat" + + "a\030\003 \003(\0132\031.datacatalog.ArtifactData\022\'\n\010me" + + "tadata\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\np" + + "artitions\030\005 \003(\0132\026.datacatalog.Partition\022" + + "\036\n\004tags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreat" + + "ed_at\030\007 \001(\0132\032.google.protobuf.Timestamp\"" + + "C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002" + + " \001(\0132\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004n" + + "ame\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007datase" + + "t\030\003 \001(\0132\026.datacatalog.DatasetID\"m\n\010Metad" + + "ata\0222\n\007key_map\030\001 \003(\0132!.datacatalog.Metad" + + "ata.KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 " + + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpressi" + + "on\0222\n\007filters\030\001 \003(\0132!.datacatalog.Single" + + "PropertyFilter\"\211\003\n\024SinglePropertyFilter\022" + + "4\n\ntag_filter\030\001 \001(\0132\036.datacatalog.TagPro" + + "pertyFilterH\000\022@\n\020partition_filter\030\002 \001(\0132" + + "$.datacatalog.PartitionPropertyFilterH\000\022" + + ">\n\017artifact_filter\030\003 \001(\0132#.datacatalog.A" + + "rtifactPropertyFilterH\000\022<\n\016dataset_filte" + + "r\030\004 \001(\0132\".datacatalog.DatasetPropertyFil" + + "terH\000\022F\n\010operator\030\n \001(\01624.datacatalog.Si" + + "nglePropertyFilter.ComparisonOperator\" \n" + + "\022ComparisonOperator\022\n\n\006EQUALS\020\000B\021\n\017prope" + + "rty_filter\";\n\026ArtifactPropertyFilter\022\025\n\013" + + "artifact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagPr" + + "opertyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010prop" + + "erty\"S\n\027PartitionPropertyFilter\022,\n\007key_v" + + "al\030\001 \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n" + + "\010property\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r" + + "\n\005value\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021" + + "\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006dom" + + "ain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010proper" + + "ty\"\361\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022" + + "\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.dataca" + + "talog.PaginationOptions.SortKey\022;\n\tsortO" + + "rder\030\004 \001(\0162(.datacatalog.PaginationOptio" + + "ns.SortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020" + + "\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_" + + "TIME\020\0002\341\007\n\013DataCatalog\022V\n\rCreateDataset\022" + + "!.datacatalog.CreateDatasetRequest\032\".dat" + + "acatalog.CreateDatasetResponse\022M\n\nGetDat" + + "aset\022\036.datacatalog.GetDatasetRequest\032\037.d" + + "atacatalog.GetDatasetResponse\022Y\n\016CreateA" + + "rtifact\022\".datacatalog.CreateArtifactRequ" + + "est\032#.datacatalog.CreateArtifactResponse" + + "\022P\n\013GetArtifact\022\037.datacatalog.GetArtifac" + + "tRequest\032 .datacatalog.GetArtifactRespon" + + "se\022A\n\006AddTag\022\032.datacatalog.AddTagRequest" + + "\032\033.datacatalog.AddTagResponse\022V\n\rListArt" + + "ifacts\022!.datacatalog.ListArtifactsReques" + + "t\032\".datacatalog.ListArtifactsResponse\022S\n" + + "\014ListDatasets\022 .datacatalog.ListDatasets" + + "Request\032!.datacatalog.ListDatasetsRespon" + + "se\022Y\n\016UpdateArtifact\022\".datacatalog.Updat" + + "eArtifactRequest\032#.datacatalog.UpdateArt" + + "ifactResponse\022Y\n\016DeleteArtifact\022\".dataca" + + "talog.DeleteArtifactRequest\032#.datacatalo" + + "g.DeleteArtifactResponse\022q\n\026GetOrExtendR" + + "eservation\022*.datacatalog.GetOrExtendRese" + + "rvationRequest\032+.datacatalog.GetOrExtend" + + "ReservationResponse\022e\n\022ReleaseReservatio" + + "n\022&.datacatalog.ReleaseReservationReques" + + "t\032\'.datacatalog.ReleaseReservationRespon" + + "seB=Z;github.com/flyteorg/flyteidl/gen/p" + + "b-go/flyteidl/datacatalogb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -33793,80 +35298,92 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_UpdateArtifactResponse_descriptor, new java.lang.String[] { "ArtifactId", }); - internal_static_datacatalog_ReservationID_descriptor = + internal_static_datacatalog_DeleteArtifactRequest_descriptor = getDescriptor().getMessageTypes().get(16); + internal_static_datacatalog_DeleteArtifactRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_datacatalog_DeleteArtifactRequest_descriptor, + new java.lang.String[] { "Dataset", "ArtifactId", "TagName", "QueryHandle", }); + internal_static_datacatalog_DeleteArtifactResponse_descriptor = + getDescriptor().getMessageTypes().get(17); + internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_datacatalog_DeleteArtifactResponse_descriptor, + new java.lang.String[] { }); + internal_static_datacatalog_ReservationID_descriptor = + getDescriptor().getMessageTypes().get(18); internal_static_datacatalog_ReservationID_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_ReservationID_descriptor, new java.lang.String[] { "DatasetId", "TagName", }); internal_static_datacatalog_GetOrExtendReservationRequest_descriptor = - getDescriptor().getMessageTypes().get(17); + getDescriptor().getMessageTypes().get(19); internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_GetOrExtendReservationRequest_descriptor, new java.lang.String[] { "ReservationId", "OwnerId", "HeartbeatInterval", }); internal_static_datacatalog_Reservation_descriptor = - getDescriptor().getMessageTypes().get(18); + getDescriptor().getMessageTypes().get(20); internal_static_datacatalog_Reservation_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_Reservation_descriptor, new java.lang.String[] { "ReservationId", "OwnerId", "HeartbeatInterval", "ExpiresAt", "Metadata", }); internal_static_datacatalog_GetOrExtendReservationResponse_descriptor = - getDescriptor().getMessageTypes().get(19); + getDescriptor().getMessageTypes().get(21); internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_GetOrExtendReservationResponse_descriptor, new java.lang.String[] { "Reservation", }); internal_static_datacatalog_ReleaseReservationRequest_descriptor = - getDescriptor().getMessageTypes().get(20); + getDescriptor().getMessageTypes().get(22); internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_ReleaseReservationRequest_descriptor, new java.lang.String[] { "ReservationId", "OwnerId", }); internal_static_datacatalog_ReleaseReservationResponse_descriptor = - getDescriptor().getMessageTypes().get(21); + getDescriptor().getMessageTypes().get(23); internal_static_datacatalog_ReleaseReservationResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_ReleaseReservationResponse_descriptor, new java.lang.String[] { }); internal_static_datacatalog_Dataset_descriptor = - getDescriptor().getMessageTypes().get(22); + getDescriptor().getMessageTypes().get(24); internal_static_datacatalog_Dataset_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_Dataset_descriptor, new java.lang.String[] { "Id", "Metadata", "PartitionKeys", }); internal_static_datacatalog_Partition_descriptor = - getDescriptor().getMessageTypes().get(23); + getDescriptor().getMessageTypes().get(25); internal_static_datacatalog_Partition_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_Partition_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_datacatalog_DatasetID_descriptor = - getDescriptor().getMessageTypes().get(24); + getDescriptor().getMessageTypes().get(26); internal_static_datacatalog_DatasetID_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_DatasetID_descriptor, new java.lang.String[] { "Project", "Name", "Domain", "Version", "UUID", }); internal_static_datacatalog_Artifact_descriptor = - getDescriptor().getMessageTypes().get(25); + getDescriptor().getMessageTypes().get(27); internal_static_datacatalog_Artifact_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_Artifact_descriptor, new java.lang.String[] { "Id", "Dataset", "Data", "Metadata", "Partitions", "Tags", "CreatedAt", }); internal_static_datacatalog_ArtifactData_descriptor = - getDescriptor().getMessageTypes().get(26); + getDescriptor().getMessageTypes().get(28); internal_static_datacatalog_ArtifactData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_ArtifactData_descriptor, new java.lang.String[] { "Name", "Value", }); internal_static_datacatalog_Tag_descriptor = - getDescriptor().getMessageTypes().get(27); + getDescriptor().getMessageTypes().get(29); internal_static_datacatalog_Tag_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_Tag_descriptor, new java.lang.String[] { "Name", "ArtifactId", "Dataset", }); internal_static_datacatalog_Metadata_descriptor = - getDescriptor().getMessageTypes().get(28); + getDescriptor().getMessageTypes().get(30); internal_static_datacatalog_Metadata_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_Metadata_descriptor, @@ -33878,49 +35395,49 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_datacatalog_Metadata_KeyMapEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_datacatalog_FilterExpression_descriptor = - getDescriptor().getMessageTypes().get(29); + getDescriptor().getMessageTypes().get(31); internal_static_datacatalog_FilterExpression_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_FilterExpression_descriptor, new java.lang.String[] { "Filters", }); internal_static_datacatalog_SinglePropertyFilter_descriptor = - getDescriptor().getMessageTypes().get(30); + getDescriptor().getMessageTypes().get(32); internal_static_datacatalog_SinglePropertyFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_SinglePropertyFilter_descriptor, new java.lang.String[] { "TagFilter", "PartitionFilter", "ArtifactFilter", "DatasetFilter", "Operator", "PropertyFilter", }); internal_static_datacatalog_ArtifactPropertyFilter_descriptor = - getDescriptor().getMessageTypes().get(31); + getDescriptor().getMessageTypes().get(33); internal_static_datacatalog_ArtifactPropertyFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_ArtifactPropertyFilter_descriptor, new java.lang.String[] { "ArtifactId", "Property", }); internal_static_datacatalog_TagPropertyFilter_descriptor = - getDescriptor().getMessageTypes().get(32); + getDescriptor().getMessageTypes().get(34); internal_static_datacatalog_TagPropertyFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_TagPropertyFilter_descriptor, new java.lang.String[] { "TagName", "Property", }); internal_static_datacatalog_PartitionPropertyFilter_descriptor = - getDescriptor().getMessageTypes().get(33); + getDescriptor().getMessageTypes().get(35); internal_static_datacatalog_PartitionPropertyFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_PartitionPropertyFilter_descriptor, new java.lang.String[] { "KeyVal", "Property", }); internal_static_datacatalog_KeyValuePair_descriptor = - getDescriptor().getMessageTypes().get(34); + getDescriptor().getMessageTypes().get(36); internal_static_datacatalog_KeyValuePair_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_KeyValuePair_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_datacatalog_DatasetPropertyFilter_descriptor = - getDescriptor().getMessageTypes().get(35); + getDescriptor().getMessageTypes().get(37); internal_static_datacatalog_DatasetPropertyFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_DatasetPropertyFilter_descriptor, new java.lang.String[] { "Project", "Name", "Domain", "Version", "Property", }); internal_static_datacatalog_PaginationOptions_descriptor = - getDescriptor().getMessageTypes().get(36); + getDescriptor().getMessageTypes().get(38); internal_static_datacatalog_PaginationOptions_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datacatalog_PaginationOptions_descriptor, diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py index 125d65920e..93cf75a9ea 100644 --- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py @@ -16,7 +16,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xc8\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61taB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x7f\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x8b\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07versionB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\x86\x07\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xac\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01Z;github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xc8\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61taB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"\x99\x01\n\x15\x44\x65leteArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"\x18\n\x16\x44\x65leteArtifactResponse\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x7f\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x8b\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07versionB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\xe1\x07\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12Y\n\x0e\x44\x65leteArtifact\x12\".datacatalog.DeleteArtifactRequest\x1a#.datacatalog.DeleteArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xac\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01Z;github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.datacatalog.datacatalog_pb2', globals()) @@ -58,56 +58,60 @@ _UPDATEARTIFACTREQUEST._serialized_end=1540 _UPDATEARTIFACTRESPONSE._serialized_start=1542 _UPDATEARTIFACTRESPONSE._serialized_end=1599 - _RESERVATIONID._serialized_start=1601 - _RESERVATIONID._serialized_end=1698 - _GETOREXTENDRESERVATIONREQUEST._serialized_start=1701 - _GETOREXTENDRESERVATIONREQUEST._serialized_end=1900 - _RESERVATION._serialized_start=1903 - _RESERVATION._serialized_end=2194 - _GETOREXTENDRESERVATIONRESPONSE._serialized_start=2196 - _GETOREXTENDRESERVATIONRESPONSE._serialized_end=2288 - _RELEASERESERVATIONREQUEST._serialized_start=2290 - _RELEASERESERVATIONREQUEST._serialized_end=2411 - _RELEASERESERVATIONRESPONSE._serialized_start=2413 - _RELEASERESERVATIONRESPONSE._serialized_end=2441 - _DATASET._serialized_start=2444 - _DATASET._serialized_end=2582 - _PARTITION._serialized_start=2584 - _PARTITION._serialized_end=2635 - _DATASETID._serialized_start=2637 - _DATASETID._serialized_end=2764 - _ARTIFACT._serialized_start=2767 - _ARTIFACT._serialized_end=3094 - _ARTIFACTDATA._serialized_start=3096 - _ARTIFACTDATA._serialized_end=3176 - _TAG._serialized_start=3178 - _TAG._serialized_end=3286 - _METADATA._serialized_start=3289 - _METADATA._serialized_end=3418 - _METADATA_KEYMAPENTRY._serialized_start=3361 - _METADATA_KEYMAPENTRY._serialized_end=3418 - _FILTEREXPRESSION._serialized_start=3420 - _FILTEREXPRESSION._serialized_end=3499 - _SINGLEPROPERTYFILTER._serialized_start=3502 - _SINGLEPROPERTYFILTER._serialized_end=3964 - _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_start=3913 - _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_end=3945 - _ARTIFACTPROPERTYFILTER._serialized_start=3966 - _ARTIFACTPROPERTYFILTER._serialized_end=4037 - _TAGPROPERTYFILTER._serialized_start=4039 - _TAGPROPERTYFILTER._serialized_end=4099 - _PARTITIONPROPERTYFILTER._serialized_start=4101 - _PARTITIONPROPERTYFILTER._serialized_end=4192 - _KEYVALUEPAIR._serialized_start=4194 - _KEYVALUEPAIR._serialized_end=4248 - _DATASETPROPERTYFILTER._serialized_start=4251 - _DATASETPROPERTYFILTER._serialized_end=4390 - _PAGINATIONOPTIONS._serialized_start=4393 - _PAGINATIONOPTIONS._serialized_end=4668 - _PAGINATIONOPTIONS_SORTORDER._serialized_start=4596 - _PAGINATIONOPTIONS_SORTORDER._serialized_end=4638 - _PAGINATIONOPTIONS_SORTKEY._serialized_start=4640 - _PAGINATIONOPTIONS_SORTKEY._serialized_end=4668 - _DATACATALOG._serialized_start=4671 - _DATACATALOG._serialized_end=5573 + _DELETEARTIFACTREQUEST._serialized_start=1602 + _DELETEARTIFACTREQUEST._serialized_end=1755 + _DELETEARTIFACTRESPONSE._serialized_start=1757 + _DELETEARTIFACTRESPONSE._serialized_end=1781 + _RESERVATIONID._serialized_start=1783 + _RESERVATIONID._serialized_end=1880 + _GETOREXTENDRESERVATIONREQUEST._serialized_start=1883 + _GETOREXTENDRESERVATIONREQUEST._serialized_end=2082 + _RESERVATION._serialized_start=2085 + _RESERVATION._serialized_end=2376 + _GETOREXTENDRESERVATIONRESPONSE._serialized_start=2378 + _GETOREXTENDRESERVATIONRESPONSE._serialized_end=2470 + _RELEASERESERVATIONREQUEST._serialized_start=2472 + _RELEASERESERVATIONREQUEST._serialized_end=2593 + _RELEASERESERVATIONRESPONSE._serialized_start=2595 + _RELEASERESERVATIONRESPONSE._serialized_end=2623 + _DATASET._serialized_start=2626 + _DATASET._serialized_end=2764 + _PARTITION._serialized_start=2766 + _PARTITION._serialized_end=2817 + _DATASETID._serialized_start=2819 + _DATASETID._serialized_end=2946 + _ARTIFACT._serialized_start=2949 + _ARTIFACT._serialized_end=3276 + _ARTIFACTDATA._serialized_start=3278 + _ARTIFACTDATA._serialized_end=3358 + _TAG._serialized_start=3360 + _TAG._serialized_end=3468 + _METADATA._serialized_start=3471 + _METADATA._serialized_end=3600 + _METADATA_KEYMAPENTRY._serialized_start=3543 + _METADATA_KEYMAPENTRY._serialized_end=3600 + _FILTEREXPRESSION._serialized_start=3602 + _FILTEREXPRESSION._serialized_end=3681 + _SINGLEPROPERTYFILTER._serialized_start=3684 + _SINGLEPROPERTYFILTER._serialized_end=4146 + _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_start=4095 + _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_end=4127 + _ARTIFACTPROPERTYFILTER._serialized_start=4148 + _ARTIFACTPROPERTYFILTER._serialized_end=4219 + _TAGPROPERTYFILTER._serialized_start=4221 + _TAGPROPERTYFILTER._serialized_end=4281 + _PARTITIONPROPERTYFILTER._serialized_start=4283 + _PARTITIONPROPERTYFILTER._serialized_end=4374 + _KEYVALUEPAIR._serialized_start=4376 + _KEYVALUEPAIR._serialized_end=4430 + _DATASETPROPERTYFILTER._serialized_start=4433 + _DATASETPROPERTYFILTER._serialized_end=4572 + _PAGINATIONOPTIONS._serialized_start=4575 + _PAGINATIONOPTIONS._serialized_end=4850 + _PAGINATIONOPTIONS_SORTORDER._serialized_start=4778 + _PAGINATIONOPTIONS_SORTORDER._serialized_end=4820 + _PAGINATIONOPTIONS_SORTKEY._serialized_start=4822 + _PAGINATIONOPTIONS_SORTKEY._serialized_end=4850 + _DATACATALOG._serialized_start=4853 + _DATACATALOG._serialized_end=5846 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi index 252534a559..a92db2946d 100644 --- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi @@ -107,6 +107,20 @@ class DatasetPropertyFilter(_message.Message): version: str def __init__(self, project: _Optional[str] = ..., name: _Optional[str] = ..., domain: _Optional[str] = ..., version: _Optional[str] = ...) -> None: ... +class DeleteArtifactRequest(_message.Message): + __slots__ = ["artifact_id", "dataset", "tag_name"] + ARTIFACT_ID_FIELD_NUMBER: _ClassVar[int] + DATASET_FIELD_NUMBER: _ClassVar[int] + TAG_NAME_FIELD_NUMBER: _ClassVar[int] + artifact_id: str + dataset: DatasetID + tag_name: str + def __init__(self, dataset: _Optional[_Union[DatasetID, _Mapping]] = ..., artifact_id: _Optional[str] = ..., tag_name: _Optional[str] = ...) -> None: ... + +class DeleteArtifactResponse(_message.Message): + __slots__ = [] + def __init__(self) -> None: ... + class FilterExpression(_message.Message): __slots__ = ["filters"] FILTERS_FIELD_NUMBER: _ClassVar[int] diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py index b78b2fa78b..fe4158c7bb 100644 --- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py @@ -58,6 +58,11 @@ def __init__(self, channel): request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.UpdateArtifactRequest.SerializeToString, response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.UpdateArtifactResponse.FromString, ) + self.DeleteArtifact = channel.unary_unary( + '/datacatalog.DataCatalog/DeleteArtifact', + request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactRequest.SerializeToString, + response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString, + ) self.GetOrExtendReservation = channel.unary_unary( '/datacatalog.DataCatalog/GetOrExtendReservation', request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationRequest.SerializeToString, @@ -135,6 +140,13 @@ def UpdateArtifact(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def DeleteArtifact(self, request, context): + """Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def GetOrExtendReservation(self, request, context): """Attempts to get or extend a reservation for the corresponding artifact. If one already exists (ie. another entity owns the reservation) then that reservation is retrieved. @@ -203,6 +215,11 @@ def add_DataCatalogServicer_to_server(servicer, server): request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.UpdateArtifactRequest.FromString, response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.UpdateArtifactResponse.SerializeToString, ), + 'DeleteArtifact': grpc.unary_unary_rpc_method_handler( + servicer.DeleteArtifact, + request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactRequest.FromString, + response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.SerializeToString, + ), 'GetOrExtendReservation': grpc.unary_unary_rpc_method_handler( servicer.GetOrExtendReservation, request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationRequest.FromString, @@ -363,6 +380,23 @@ def UpdateArtifact(request, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + @staticmethod + def DeleteArtifact(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/datacatalog.DataCatalog/DeleteArtifact', + flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactRequest.SerializeToString, + flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + @staticmethod def GetOrExtendReservation(request, target, diff --git a/flyteidl/protos/docs/datacatalog/datacatalog.rst b/flyteidl/protos/docs/datacatalog/datacatalog.rst index a699b88378..789c0c69c0 100644 --- a/flyteidl/protos/docs/datacatalog/datacatalog.rst +++ b/flyteidl/protos/docs/datacatalog/datacatalog.rst @@ -261,6 +261,43 @@ Dataset properties we can filter by +.. _ref_datacatalog.DeleteArtifactRequest: + +DeleteArtifactRequest +------------------------------------------------------------------ + +Request message for deleting an Artifact and its associated ArtifactData. + + + +.. csv-table:: DeleteArtifactRequest type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "dataset", ":ref:`ref_datacatalog.DatasetID`", "", "ID of dataset the artifact is associated with" + "artifact_id", ":ref:`ref_string`", "", "" + "tag_name", ":ref:`ref_string`", "", "" + + + + + + + +.. _ref_datacatalog.DeleteArtifactResponse: + +DeleteArtifactResponse +------------------------------------------------------------------ + +Response message for deleting an Artifact. + + + + + + + + .. _ref_datacatalog.FilterExpression: FilterExpression @@ -915,6 +952,7 @@ Artifacts are associated with a Dataset, and can be tagged for retrieval. "ListArtifacts", ":ref:`ref_datacatalog.ListArtifactsRequest`", ":ref:`ref_datacatalog.ListArtifactsResponse`", "Return a paginated list of artifacts" "ListDatasets", ":ref:`ref_datacatalog.ListDatasetsRequest`", ":ref:`ref_datacatalog.ListDatasetsResponse`", "Return a paginated list of datasets" "UpdateArtifact", ":ref:`ref_datacatalog.UpdateArtifactRequest`", ":ref:`ref_datacatalog.UpdateArtifactResponse`", "Updates an existing artifact, overwriting the stored artifact data in the underlying blob storage." + "DeleteArtifact", ":ref:`ref_datacatalog.DeleteArtifactRequest`", ":ref:`ref_datacatalog.DeleteArtifactResponse`", "Deletes an existing artifact, removing the stored artifact data from the underlying blob storage." "GetOrExtendReservation", ":ref:`ref_datacatalog.GetOrExtendReservationRequest`", ":ref:`ref_datacatalog.GetOrExtendReservationResponse`", "Attempts to get or extend a reservation for the corresponding artifact. If one already exists (ie. another entity owns the reservation) then that reservation is retrieved. Once you acquire a reservation, you need to periodically extend the reservation with an identical call. If the reservation is not extended before the defined expiration, it may be acquired by another task. Note: We may have multiple concurrent tasks with the same signature and the same input that try to populate the same artifact at the same time. Thus with reservation, only one task can run at a time, until the reservation expires. Note: If task A does not extend the reservation in time and the reservation expires, another task B may take over the reservation, resulting in two tasks A and B running in parallel. So a third task C may get the Artifact from A or B, whichever writes last." "ReleaseReservation", ":ref:`ref_datacatalog.ReleaseReservationRequest`", ":ref:`ref_datacatalog.ReleaseReservationResponse`", "Release the reservation when the task holding the spot fails so that the other tasks can grab the spot." diff --git a/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto b/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto index 6f059159f3..e22dccdef0 100644 --- a/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto +++ b/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto @@ -40,6 +40,9 @@ service DataCatalog { // Updates an existing artifact, overwriting the stored artifact data in the underlying blob storage. rpc UpdateArtifact (UpdateArtifactRequest) returns (UpdateArtifactResponse); + // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. + rpc DeleteArtifact (DeleteArtifactRequest) returns (DeleteArtifactResponse); + // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -199,6 +202,27 @@ message UpdateArtifactResponse { string artifact_id = 1; } +/* + * Request message for deleting an Artifact and its associated ArtifactData. + */ +message DeleteArtifactRequest { + // ID of dataset the artifact is associated with + DatasetID dataset = 1; + + // Either ID of artifact or name of tag of existing artifact + oneof query_handle { + string artifact_id = 2; + string tag_name = 3; + } +} + +/* + * Response message for deleting an Artifact. + */ +message DeleteArtifactResponse { + +} + /* * ReservationID message that is composed of several string fields. */ From 7df2814344a79027326aa4bfa229e605f5308b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Tue, 8 Nov 2022 14:29:06 +0100 Subject: [PATCH 11/57] WIP: first draft for cache eviction of past executions Added new CacheEvictionError message representing an error encountered during eviction of stored data Added new UpdateTaskExecution endpoint for updating task executions, currently only supporting cache eviction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../go/admin/mocks/AdminServiceClient.go | 48 + .../go/admin/mocks/AdminServiceServer.go | 41 + .../gen/pb-cpp/flyteidl/admin/execution.pb.cc | 374 ++- .../gen/pb-cpp/flyteidl/admin/execution.pb.h | 77 + .../flyteidl/admin/task_execution.pb.cc | 797 +++++- .../pb-cpp/flyteidl/admin/task_execution.pb.h | 364 ++- .../gen/pb-cpp/flyteidl/core/errors.pb.cc | 1057 ++++++- flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h | 586 +++- .../pb-cpp/flyteidl/service/admin.grpc.pb.cc | 104 +- .../pb-cpp/flyteidl/service/admin.grpc.pb.h | 460 ++- .../gen/pb-cpp/flyteidl/service/admin.pb.cc | 174 +- .../gen/pb-go/flyteidl/admin/execution.pb.go | 255 +- .../flyteidl/admin/execution.pb.validate.go | 12 + .../pb-go/flyteidl/admin/task_execution.pb.go | 206 +- .../admin/task_execution.pb.validate.go | 157 + flyteidl/gen/pb-go/flyteidl/core/errors.pb.go | 225 +- .../pb-go/flyteidl/core/errors.pb.validate.go | 191 ++ .../gen/pb-go/flyteidl/service/admin.pb.go | 308 +- .../gen/pb-go/flyteidl/service/admin.pb.gw.go | 150 + .../pb-go/flyteidl/service/admin.swagger.json | 80 +- .../flyteidl/service/flyteadmin/README.md | 6 +- .../service/flyteadmin/api/swagger.yaml | 261 +- .../service/flyteadmin/api_admin_service.go | 233 +- .../model_admin_execution_update_request.go | 2 + .../model_admin_execution_update_response.go | 2 + ...el_admin_task_execution_update_response.go | 14 + .../model_cache_eviction_error_code.go | 17 + .../model_core_cache_eviction_error.go | 24 + .../model_core_cache_eviction_error_list.go | 15 + .../gen/pb-go/flyteidl/service/openapi.go | 4 +- .../flyteidl/admin/ExecutionOuterClass.java | 573 +++- .../admin/TaskExecutionOuterClass.java | 1476 +++++++++- .../gen/pb-java/flyteidl/core/Errors.java | 2532 ++++++++++++++++- .../gen/pb-java/flyteidl/service/Admin.java | 172 +- flyteidl/gen/pb-js/flyteidl.d.ts | 282 ++ flyteidl/gen/pb-js/flyteidl.js | 653 +++++ .../pb_python/flyteidl/admin/execution_pb2.py | 95 +- .../flyteidl/admin/execution_pb2.pyi | 13 +- .../flyteidl/admin/task_execution_pb2.py | 35 +- .../flyteidl/admin/task_execution_pb2.pyi | 15 + .../gen/pb_python/flyteidl/core/errors_pb2.py | 21 +- .../pb_python/flyteidl/core/errors_pb2.pyi | 27 +- .../pb_python/flyteidl/service/admin_pb2.py | 6 +- .../flyteidl/service/admin_pb2_grpc.py | 34 + .../flyteidl/service/flyteadmin/README.md | 6 +- .../service/flyteadmin/flyteadmin/__init__.py | 4 + .../flyteadmin/api/admin_service_api.py | 334 +-- .../flyteadmin/flyteadmin/models/__init__.py | 4 + .../models/admin_execution_update_request.py | 34 +- .../models/admin_execution_update_response.py | 34 +- .../admin_task_execution_update_response.py | 117 + .../models/cache_eviction_error_code.py | 92 + .../models/core_cache_eviction_error.py | 234 ++ .../models/core_cache_eviction_error_list.py | 117 + .../flyteadmin/test/test_admin_service_api.py | 14 +- ...st_admin_task_execution_update_response.py | 40 + .../test/test_cache_eviction_error_code.py | 40 + .../test/test_core_cache_eviction_error.py | 40 + .../test_core_cache_eviction_error_list.py | 40 + flyteidl/protos/docs/admin/admin.rst | 51 + flyteidl/protos/docs/core/core.rst | 61 + flyteidl/protos/docs/service/service.rst | 1 + .../protos/flyteidl/admin/execution.proto | 11 +- .../flyteidl/admin/task_execution.proto | 14 + flyteidl/protos/flyteidl/core/errors.proto | 27 + flyteidl/protos/flyteidl/service/admin.proto | 10 + 66 files changed, 12107 insertions(+), 1396 deletions(-) create mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go create mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go create mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go create mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py diff --git a/flyteidl/clients/go/admin/mocks/AdminServiceClient.go b/flyteidl/clients/go/admin/mocks/AdminServiceClient.go index 3858c5a696..8d27ec5579 100644 --- a/flyteidl/clients/go/admin/mocks/AdminServiceClient.go +++ b/flyteidl/clients/go/admin/mocks/AdminServiceClient.go @@ -2465,6 +2465,54 @@ func (_m *AdminServiceClient) UpdateProjectDomainAttributes(ctx context.Context, return r0, r1 } +type AdminServiceClient_UpdateTaskExecution struct { + *mock.Call +} + +func (_m AdminServiceClient_UpdateTaskExecution) Return(_a0 *admin.TaskExecutionUpdateResponse, _a1 error) *AdminServiceClient_UpdateTaskExecution { + return &AdminServiceClient_UpdateTaskExecution{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AdminServiceClient) OnUpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) *AdminServiceClient_UpdateTaskExecution { + c_call := _m.On("UpdateTaskExecution", ctx, in, opts) + return &AdminServiceClient_UpdateTaskExecution{Call: c_call} +} + +func (_m *AdminServiceClient) OnUpdateTaskExecutionMatch(matchers ...interface{}) *AdminServiceClient_UpdateTaskExecution { + c_call := _m.On("UpdateTaskExecution", matchers...) + return &AdminServiceClient_UpdateTaskExecution{Call: c_call} +} + +// UpdateTaskExecution provides a mock function with given fields: ctx, in, opts +func (_m *AdminServiceClient) UpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) (*admin.TaskExecutionUpdateResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *admin.TaskExecutionUpdateResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.TaskExecutionUpdateRequest, ...grpc.CallOption) *admin.TaskExecutionUpdateResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.TaskExecutionUpdateResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.TaskExecutionUpdateRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + type AdminServiceClient_UpdateWorkflowAttributes struct { *mock.Call } diff --git a/flyteidl/clients/go/admin/mocks/AdminServiceServer.go b/flyteidl/clients/go/admin/mocks/AdminServiceServer.go index 67bc383780..62841debaa 100644 --- a/flyteidl/clients/go/admin/mocks/AdminServiceServer.go +++ b/flyteidl/clients/go/admin/mocks/AdminServiceServer.go @@ -2106,6 +2106,47 @@ func (_m *AdminServiceServer) UpdateProjectDomainAttributes(_a0 context.Context, return r0, r1 } +type AdminServiceServer_UpdateTaskExecution struct { + *mock.Call +} + +func (_m AdminServiceServer_UpdateTaskExecution) Return(_a0 *admin.TaskExecutionUpdateResponse, _a1 error) *AdminServiceServer_UpdateTaskExecution { + return &AdminServiceServer_UpdateTaskExecution{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AdminServiceServer) OnUpdateTaskExecution(_a0 context.Context, _a1 *admin.TaskExecutionUpdateRequest) *AdminServiceServer_UpdateTaskExecution { + c_call := _m.On("UpdateTaskExecution", _a0, _a1) + return &AdminServiceServer_UpdateTaskExecution{Call: c_call} +} + +func (_m *AdminServiceServer) OnUpdateTaskExecutionMatch(matchers ...interface{}) *AdminServiceServer_UpdateTaskExecution { + c_call := _m.On("UpdateTaskExecution", matchers...) + return &AdminServiceServer_UpdateTaskExecution{Call: c_call} +} + +// UpdateTaskExecution provides a mock function with given fields: _a0, _a1 +func (_m *AdminServiceServer) UpdateTaskExecution(_a0 context.Context, _a1 *admin.TaskExecutionUpdateRequest) (*admin.TaskExecutionUpdateResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *admin.TaskExecutionUpdateResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.TaskExecutionUpdateRequest) *admin.TaskExecutionUpdateResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.TaskExecutionUpdateResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.TaskExecutionUpdateRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + type AdminServiceServer_UpdateWorkflowAttributes struct { *mock.Call } diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc index caba0518a5..20dc2e93b8 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc @@ -32,6 +32,7 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::p extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_Execution_flyteidl_2fadmin_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_ExecutionMetadata_flyteidl_2fadmin_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<9> scc_info_ExecutionClosure_flyteidl_2fadmin_2fexecution_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_ExecutionError_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_QualityOfService_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Identifier_flyteidl_2fcore_2fidentifier_2eproto; @@ -474,8 +475,9 @@ static void InitDefaultsExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2ep ::flyteidl::admin::ExecutionUpdateResponse::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<0> scc_info_ExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto}, {}}; +::google::protobuf::internal::SCCInfo<1> scc_info_ExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto}, { + &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}}; void InitDefaults_flyteidl_2fadmin_2fexecution_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_ExecutionCreateRequest_flyteidl_2fadmin_2fexecution_2eproto.base); @@ -673,6 +675,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fexecution_2eprot ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateRequest, id_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateRequest, state_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateRequest, evict_cache_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionStateChangeDetails, _internal_metadata_), ~0u, // no _extensions_ @@ -686,6 +689,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fexecution_2eprot ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateResponse, cache_eviction_errors_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::admin::ExecutionCreateRequest)}, @@ -707,8 +711,8 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 145, -1, sizeof(::flyteidl::admin::WorkflowExecutionGetDataRequest)}, { 151, -1, sizeof(::flyteidl::admin::WorkflowExecutionGetDataResponse)}, { 160, -1, sizeof(::flyteidl::admin::ExecutionUpdateRequest)}, - { 167, -1, sizeof(::flyteidl::admin::ExecutionStateChangeDetails)}, - { 175, -1, sizeof(::flyteidl::admin::ExecutionUpdateResponse)}, + { 168, -1, sizeof(::flyteidl::admin::ExecutionStateChangeDetails)}, + { 176, -1, sizeof(::flyteidl::admin::ExecutionUpdateResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -745,109 +749,112 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fexecution_2eproto[] = "\n\036flyteidl/admin/execution.proto\022\016flytei" "dl.admin\032\'flyteidl/admin/cluster_assignm" "ent.proto\032\033flyteidl/admin/common.proto\032\034" - "flyteidl/core/literals.proto\032\035flyteidl/c" - "ore/execution.proto\032\036flyteidl/core/ident" - "ifier.proto\032\034flyteidl/core/security.prot" - "o\032\036google/protobuf/duration.proto\032\037googl" - "e/protobuf/timestamp.proto\032\036google/proto" - "buf/wrappers.proto\"\237\001\n\026ExecutionCreateRe" - "quest\022\017\n\007project\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014" - "\n\004name\030\003 \001(\t\022+\n\004spec\030\004 \001(\0132\035.flyteidl.ad" - "min.ExecutionSpec\022)\n\006inputs\030\005 \001(\0132\031.flyt" - "eidl.core.LiteralMap\"\177\n\030ExecutionRelaunc" - "hRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" - "kflowExecutionIdentifier\022\014\n\004name\030\003 \001(\t\022\027" - "\n\017overwrite_cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027Execut" - "ionRecoverRequest\0226\n\002id\030\001 \001(\0132*.flyteidl" - ".core.WorkflowExecutionIdentifier\022\014\n\004nam" - "e\030\002 \001(\t\0223\n\010metadata\030\003 \001(\0132!.flyteidl.adm" - "in.ExecutionMetadata\"Q\n\027ExecutionCreateR" - "esponse\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Work" - "flowExecutionIdentifier\"U\n\033WorkflowExecu" - "tionGetRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.co" - "re.WorkflowExecutionIdentifier\"\243\001\n\tExecu" - "tion\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workflo" - "wExecutionIdentifier\022+\n\004spec\030\002 \001(\0132\035.fly" - "teidl.admin.ExecutionSpec\0221\n\007closure\030\003 \001" - "(\0132 .flyteidl.admin.ExecutionClosure\"M\n\r" - "ExecutionList\022-\n\nexecutions\030\001 \003(\0132\031.flyt" - "eidl.admin.Execution\022\r\n\005token\030\002 \001(\t\"X\n\016L" - "iteralMapBlob\022/\n\006values\030\001 \001(\0132\031.flyteidl" - ".core.LiteralMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n" - "\004data\"1\n\rAbortMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n" - "\tprincipal\030\002 \001(\t\"\360\005\n\020ExecutionClosure\0225\n" - "\007outputs\030\001 \001(\0132\036.flyteidl.admin.LiteralM" - "apBlobB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl.c" - "ore.ExecutionErrorH\000\022\031\n\013abort_cause\030\n \001(" - "\tB\002\030\001H\000\0227\n\016abort_metadata\030\014 \001(\0132\035.flytei" - "dl.admin.AbortMetadataH\000\0224\n\013output_data\030" - "\r \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0226" - "\n\017computed_inputs\030\003 \001(\0132\031.flyteidl.core." - "LiteralMapB\002\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl" - ".core.WorkflowExecution.Phase\022.\n\nstarted" - "_at\030\005 \001(\0132\032.google.protobuf.Timestamp\022+\n" - "\010duration\030\006 \001(\0132\031.google.protobuf.Durati" - "on\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf" - ".Timestamp\022.\n\nupdated_at\030\010 \001(\0132\032.google." - "protobuf.Timestamp\0223\n\rnotifications\030\t \003(" - "\0132\034.flyteidl.admin.Notification\022.\n\013workf" - "low_id\030\013 \001(\0132\031.flyteidl.core.Identifier\022" - "I\n\024state_change_details\030\016 \001(\0132+.flyteidl" - ".admin.ExecutionStateChangeDetailsB\017\n\rou" - "tput_result\"+\n\016SystemMetadata\022\031\n\021executi" - "on_cluster\030\001 \001(\t\"\332\003\n\021ExecutionMetadata\022=" - "\n\004mode\030\001 \001(\0162/.flyteidl.admin.ExecutionM" - "etadata.ExecutionMode\022\021\n\tprincipal\030\002 \001(\t" - "\022\017\n\007nesting\030\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132" - "\032.google.protobuf.Timestamp\022E\n\025parent_no" - "de_execution\030\005 \001(\0132&.flyteidl.core.NodeE" - "xecutionIdentifier\022G\n\023reference_executio" - "n\030\020 \001(\0132*.flyteidl.core.WorkflowExecutio" - "nIdentifier\0227\n\017system_metadata\030\021 \001(\0132\036.f" - "lyteidl.admin.SystemMetadata\"g\n\rExecutio" - "nMode\022\n\n\006MANUAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYST" - "EM\020\002\022\014\n\010RELAUNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r" - "\n\tRECOVERED\020\005\"G\n\020NotificationList\0223\n\rnot" - "ifications\030\001 \003(\0132\034.flyteidl.admin.Notifi" - "cation\"\200\006\n\rExecutionSpec\022.\n\013launch_plan\030" - "\001 \001(\0132\031.flyteidl.core.Identifier\022-\n\006inpu" - "ts\030\002 \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001\022" - "3\n\010metadata\030\003 \001(\0132!.flyteidl.admin.Execu" - "tionMetadata\0229\n\rnotifications\030\005 \001(\0132 .fl" - "yteidl.admin.NotificationListH\000\022\025\n\013disab" - "le_all\030\006 \001(\010H\000\022&\n\006labels\030\007 \001(\0132\026.flyteid" - "l.admin.Labels\0220\n\013annotations\030\010 \001(\0132\033.fl" - "yteidl.admin.Annotations\0228\n\020security_con" - "text\030\n \001(\0132\036.flyteidl.core.SecurityConte" - "xt\022/\n\tauth_role\030\020 \001(\0132\030.flyteidl.admin.A" - "uthRoleB\002\030\001\022;\n\022quality_of_service\030\021 \001(\0132" - "\037.flyteidl.core.QualityOfService\022\027\n\017max_" - "parallelism\030\022 \001(\005\022C\n\026raw_output_data_con" - "fig\030\023 \001(\0132#.flyteidl.admin.RawOutputData" - "Config\022=\n\022cluster_assignment\030\024 \001(\0132!.fly" - "teidl.admin.ClusterAssignment\0221\n\rinterru" - "ptible\030\025 \001(\0132\032.google.protobuf.BoolValue" - "\022\027\n\017overwrite_cache\030\026 \001(\010B\030\n\026notificatio" - "n_overridesJ\004\010\004\020\005\"b\n\031ExecutionTerminateR" - "equest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workf" - "lowExecutionIdentifier\022\r\n\005cause\030\002 \001(\t\"\034\n" - "\032ExecutionTerminateResponse\"Y\n\037WorkflowE" - "xecutionGetDataRequest\0226\n\002id\030\001 \001(\0132*.fly" - "teidl.core.WorkflowExecutionIdentifier\"\336" - "\001\n WorkflowExecutionGetDataResponse\022,\n\007o" - "utputs\030\001 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030" - "\001\022+\n\006inputs\030\002 \001(\0132\027.flyteidl.admin.UrlBl" - "obB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132\031.flyteidl.c" - "ore.LiteralMap\022/\n\014full_outputs\030\004 \001(\0132\031.f" - "lyteidl.core.LiteralMap\"\177\n\026ExecutionUpda" - "teRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wo" - "rkflowExecutionIdentifier\022-\n\005state\030\002 \001(\016" - "2\036.flyteidl.admin.ExecutionState\"\220\001\n\033Exe" - "cutionStateChangeDetails\022-\n\005state\030\001 \001(\0162" - "\036.flyteidl.admin.ExecutionState\022/\n\013occur" - "red_at\030\002 \001(\0132\032.google.protobuf.Timestamp" - "\022\021\n\tprincipal\030\003 \001(\t\"\031\n\027ExecutionUpdateRe" - "sponse*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" + "flyteidl/core/literals.proto\032\032flyteidl/c" + "ore/errors.proto\032\035flyteidl/core/executio" + "n.proto\032\036flyteidl/core/identifier.proto\032" + "\034flyteidl/core/security.proto\032\036google/pr" + "otobuf/duration.proto\032\037google/protobuf/t" + "imestamp.proto\032\036google/protobuf/wrappers" + ".proto\"\237\001\n\026ExecutionCreateRequest\022\017\n\007pro" + "ject\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014\n\004name\030\003 \001(\t" + "\022+\n\004spec\030\004 \001(\0132\035.flyteidl.admin.Executio" + "nSpec\022)\n\006inputs\030\005 \001(\0132\031.flyteidl.core.Li" + "teralMap\"\177\n\030ExecutionRelaunchRequest\0226\n\002" + "id\030\001 \001(\0132*.flyteidl.core.WorkflowExecuti" + "onIdentifier\022\014\n\004name\030\003 \001(\t\022\027\n\017overwrite_" + "cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027ExecutionRecoverRe" + "quest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workfl" + "owExecutionIdentifier\022\014\n\004name\030\002 \001(\t\0223\n\010m" + "etadata\030\003 \001(\0132!.flyteidl.admin.Execution" + "Metadata\"Q\n\027ExecutionCreateResponse\0226\n\002i" + "d\030\001 \001(\0132*.flyteidl.core.WorkflowExecutio" + "nIdentifier\"U\n\033WorkflowExecutionGetReque" + "st\0226\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowE" + "xecutionIdentifier\"\243\001\n\tExecution\0226\n\002id\030\001" + " \001(\0132*.flyteidl.core.WorkflowExecutionId" + "entifier\022+\n\004spec\030\002 \001(\0132\035.flyteidl.admin." + "ExecutionSpec\0221\n\007closure\030\003 \001(\0132 .flyteid" + "l.admin.ExecutionClosure\"M\n\rExecutionLis" + "t\022-\n\nexecutions\030\001 \003(\0132\031.flyteidl.admin.E" + "xecution\022\r\n\005token\030\002 \001(\t\"X\n\016LiteralMapBlo" + "b\022/\n\006values\030\001 \001(\0132\031.flyteidl.core.Litera" + "lMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n\004data\"1\n\rAbo" + "rtMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n\tprincipal\030\002" + " \001(\t\"\360\005\n\020ExecutionClosure\0225\n\007outputs\030\001 \001" + "(\0132\036.flyteidl.admin.LiteralMapBlobB\002\030\001H\000" + "\022.\n\005error\030\002 \001(\0132\035.flyteidl.core.Executio" + "nErrorH\000\022\031\n\013abort_cause\030\n \001(\tB\002\030\001H\000\0227\n\016a" + "bort_metadata\030\014 \001(\0132\035.flyteidl.admin.Abo" + "rtMetadataH\000\0224\n\013output_data\030\r \001(\0132\031.flyt" + "eidl.core.LiteralMapB\002\030\001H\000\0226\n\017computed_i" + "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMapB\002" + "\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl.core.Workfl" + "owExecution.Phase\022.\n\nstarted_at\030\005 \001(\0132\032." + "google.protobuf.Timestamp\022+\n\010duration\030\006 " + "\001(\0132\031.google.protobuf.Duration\022.\n\ncreate" + "d_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022." + "\n\nupdated_at\030\010 \001(\0132\032.google.protobuf.Tim" + "estamp\0223\n\rnotifications\030\t \003(\0132\034.flyteidl" + ".admin.Notification\022.\n\013workflow_id\030\013 \001(\013" + "2\031.flyteidl.core.Identifier\022I\n\024state_cha" + "nge_details\030\016 \001(\0132+.flyteidl.admin.Execu" + "tionStateChangeDetailsB\017\n\routput_result\"" + "+\n\016SystemMetadata\022\031\n\021execution_cluster\030\001" + " \001(\t\"\332\003\n\021ExecutionMetadata\022=\n\004mode\030\001 \001(\016" + "2/.flyteidl.admin.ExecutionMetadata.Exec" + "utionMode\022\021\n\tprincipal\030\002 \001(\t\022\017\n\007nesting\030" + "\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132\032.google.pro" + "tobuf.Timestamp\022E\n\025parent_node_execution" + "\030\005 \001(\0132&.flyteidl.core.NodeExecutionIden" + "tifier\022G\n\023reference_execution\030\020 \001(\0132*.fl" + "yteidl.core.WorkflowExecutionIdentifier\022" + "7\n\017system_metadata\030\021 \001(\0132\036.flyteidl.admi" + "n.SystemMetadata\"g\n\rExecutionMode\022\n\n\006MAN" + "UAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYSTEM\020\002\022\014\n\010RELA" + "UNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r\n\tRECOVERED\020" + "\005\"G\n\020NotificationList\0223\n\rnotifications\030\001" + " \003(\0132\034.flyteidl.admin.Notification\"\200\006\n\rE" + "xecutionSpec\022.\n\013launch_plan\030\001 \001(\0132\031.flyt" + "eidl.core.Identifier\022-\n\006inputs\030\002 \001(\0132\031.f" + "lyteidl.core.LiteralMapB\002\030\001\0223\n\010metadata\030" + "\003 \001(\0132!.flyteidl.admin.ExecutionMetadata" + "\0229\n\rnotifications\030\005 \001(\0132 .flyteidl.admin" + ".NotificationListH\000\022\025\n\013disable_all\030\006 \001(\010" + "H\000\022&\n\006labels\030\007 \001(\0132\026.flyteidl.admin.Labe" + "ls\0220\n\013annotations\030\010 \001(\0132\033.flyteidl.admin" + ".Annotations\0228\n\020security_context\030\n \001(\0132\036" + ".flyteidl.core.SecurityContext\022/\n\tauth_r" + "ole\030\020 \001(\0132\030.flyteidl.admin.AuthRoleB\002\030\001\022" + ";\n\022quality_of_service\030\021 \001(\0132\037.flyteidl.c" + "ore.QualityOfService\022\027\n\017max_parallelism\030" + "\022 \001(\005\022C\n\026raw_output_data_config\030\023 \001(\0132#." + "flyteidl.admin.RawOutputDataConfig\022=\n\022cl" + "uster_assignment\030\024 \001(\0132!.flyteidl.admin." + "ClusterAssignment\0221\n\rinterruptible\030\025 \001(\013" + "2\032.google.protobuf.BoolValue\022\027\n\017overwrit" + "e_cache\030\026 \001(\010B\030\n\026notification_overridesJ" + "\004\010\004\020\005\"b\n\031ExecutionTerminateRequest\0226\n\002id" + "\030\001 \001(\0132*.flyteidl.core.WorkflowExecution" + "Identifier\022\r\n\005cause\030\002 \001(\t\"\034\n\032ExecutionTe" + "rminateResponse\"Y\n\037WorkflowExecutionGetD" + "ataRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.W" + "orkflowExecutionIdentifier\"\336\001\n WorkflowE" + "xecutionGetDataResponse\022,\n\007outputs\030\001 \001(\013" + "2\027.flyteidl.admin.UrlBlobB\002\030\001\022+\n\006inputs\030" + "\002 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013fu" + "ll_inputs\030\003 \001(\0132\031.flyteidl.core.LiteralM" + "ap\022/\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core" + ".LiteralMap\"\224\001\n\026ExecutionUpdateRequest\0226" + "\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowExecu" + "tionIdentifier\022-\n\005state\030\002 \001(\0162\036.flyteidl" + ".admin.ExecutionState\022\023\n\013evict_cache\030\003 \001" + "(\010\"\220\001\n\033ExecutionStateChangeDetails\022-\n\005st" + "ate\030\001 \001(\0162\036.flyteidl.admin.ExecutionStat" + "e\022/\n\013occurred_at\030\002 \001(\0132\032.google.protobuf" + ".Timestamp\022\021\n\tprincipal\030\003 \001(\t\"_\n\027Executi" + "onUpdateResponse\022D\n\025cache_eviction_error" + "s\030\001 \001(\0132%.flyteidl.core.CacheEvictionErr" + "orList*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" "TIVE\020\000\022\026\n\022EXECUTION_ARCHIVED\020\001B7Z5github" ".com/flyteorg/flyteidl/gen/pb-go/flyteid" "l/adminb\006proto3" @@ -855,15 +862,16 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fexecution_2eproto[] = ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fexecution_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fexecution_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fexecution_2eproto, - "flyteidl/admin/execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2fexecution_2eproto, 4335, + "flyteidl/admin/execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2fexecution_2eproto, 4455, }; void AddDescriptors_flyteidl_2fadmin_2fexecution_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[9] = + static constexpr ::google::protobuf::internal::InitFunc deps[10] = { ::AddDescriptors_flyteidl_2fadmin_2fcluster_5fassignment_2eproto, ::AddDescriptors_flyteidl_2fadmin_2fcommon_2eproto, ::AddDescriptors_flyteidl_2fcore_2fliterals_2eproto, + ::AddDescriptors_flyteidl_2fcore_2ferrors_2eproto, ::AddDescriptors_flyteidl_2fcore_2fexecution_2eproto, ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, ::AddDescriptors_flyteidl_2fcore_2fsecurity_2eproto, @@ -871,7 +879,7 @@ void AddDescriptors_flyteidl_2fadmin_2fexecution_2eproto() { ::AddDescriptors_google_2fprotobuf_2ftimestamp_2eproto, ::AddDescriptors_google_2fprotobuf_2fwrappers_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2fexecution_2eproto, deps, 9); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2fexecution_2eproto, deps, 10); } // Force running AddDescriptors() at dynamic initialization time. @@ -9702,6 +9710,7 @@ void ExecutionUpdateRequest::clear_id() { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int ExecutionUpdateRequest::kIdFieldNumber; const int ExecutionUpdateRequest::kStateFieldNumber; +const int ExecutionUpdateRequest::kEvictCacheFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 ExecutionUpdateRequest::ExecutionUpdateRequest() @@ -9718,7 +9727,9 @@ ExecutionUpdateRequest::ExecutionUpdateRequest(const ExecutionUpdateRequest& fro } else { id_ = nullptr; } - state_ = from.state_; + ::memcpy(&state_, &from.state_, + static_cast(reinterpret_cast(&evict_cache_) - + reinterpret_cast(&state_)) + sizeof(evict_cache_)); // @@protoc_insertion_point(copy_constructor:flyteidl.admin.ExecutionUpdateRequest) } @@ -9726,8 +9737,8 @@ void ExecutionUpdateRequest::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_ExecutionUpdateRequest_flyteidl_2fadmin_2fexecution_2eproto.base); ::memset(&id_, 0, static_cast( - reinterpret_cast(&state_) - - reinterpret_cast(&id_)) + sizeof(state_)); + reinterpret_cast(&evict_cache_) - + reinterpret_cast(&id_)) + sizeof(evict_cache_)); } ExecutionUpdateRequest::~ExecutionUpdateRequest() { @@ -9758,7 +9769,9 @@ void ExecutionUpdateRequest::Clear() { delete id_; } id_ = nullptr; - state_ = 0; + ::memset(&state_, 0, static_cast( + reinterpret_cast(&evict_cache_) - + reinterpret_cast(&state_)) + sizeof(evict_cache_)); _internal_metadata_.Clear(); } @@ -9796,6 +9809,13 @@ const char* ExecutionUpdateRequest::_InternalParse(const char* begin, const char GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); break; } + // bool evict_cache = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual; + msg->set_evict_cache(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -9851,6 +9871,19 @@ bool ExecutionUpdateRequest::MergePartialFromCodedStream( break; } + // bool evict_cache = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &evict_cache_))); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -9890,6 +9923,11 @@ void ExecutionUpdateRequest::SerializeWithCachedSizes( 2, this->state(), output); } + // bool evict_cache = 3; + if (this->evict_cache() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->evict_cache(), output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -9916,6 +9954,11 @@ ::google::protobuf::uint8* ExecutionUpdateRequest::InternalSerializeWithCachedSi 2, this->state(), target); } + // bool evict_cache = 3; + if (this->evict_cache() != 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->evict_cache(), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -9950,6 +9993,11 @@ size_t ExecutionUpdateRequest::ByteSizeLong() const { ::google::protobuf::internal::WireFormatLite::EnumSize(this->state()); } + // bool evict_cache = 3; + if (this->evict_cache() != 0) { + total_size += 1 + 1; + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -9983,6 +10031,9 @@ void ExecutionUpdateRequest::MergeFrom(const ExecutionUpdateRequest& from) { if (from.state() != 0) { set_state(from.state()); } + if (from.evict_cache() != 0) { + set_evict_cache(from.evict_cache()); + } } void ExecutionUpdateRequest::CopyFrom(const ::google::protobuf::Message& from) { @@ -10012,6 +10063,7 @@ void ExecutionUpdateRequest::InternalSwap(ExecutionUpdateRequest* other) { _internal_metadata_.Swap(&other->_internal_metadata_); swap(id_, other->id_); swap(state_, other->state_); + swap(evict_cache_, other->evict_cache_); } ::google::protobuf::Metadata ExecutionUpdateRequest::GetMetadata() const { @@ -10442,12 +10494,26 @@ ::google::protobuf::Metadata ExecutionStateChangeDetails::GetMetadata() const { // =================================================================== void ExecutionUpdateResponse::InitAsDefaultInstance() { + ::flyteidl::admin::_ExecutionUpdateResponse_default_instance_._instance.get_mutable()->cache_eviction_errors_ = const_cast< ::flyteidl::core::CacheEvictionErrorList*>( + ::flyteidl::core::CacheEvictionErrorList::internal_default_instance()); } class ExecutionUpdateResponse::HasBitSetters { public: + static const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors(const ExecutionUpdateResponse* msg); }; +const ::flyteidl::core::CacheEvictionErrorList& +ExecutionUpdateResponse::HasBitSetters::cache_eviction_errors(const ExecutionUpdateResponse* msg) { + return *msg->cache_eviction_errors_; +} +void ExecutionUpdateResponse::clear_cache_eviction_errors() { + if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { + delete cache_eviction_errors_; + } + cache_eviction_errors_ = nullptr; +} #if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int ExecutionUpdateResponse::kCacheEvictionErrorsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 ExecutionUpdateResponse::ExecutionUpdateResponse() @@ -10459,10 +10525,18 @@ ExecutionUpdateResponse::ExecutionUpdateResponse(const ExecutionUpdateResponse& : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_cache_eviction_errors()) { + cache_eviction_errors_ = new ::flyteidl::core::CacheEvictionErrorList(*from.cache_eviction_errors_); + } else { + cache_eviction_errors_ = nullptr; + } // @@protoc_insertion_point(copy_constructor:flyteidl.admin.ExecutionUpdateResponse) } void ExecutionUpdateResponse::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_ExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto.base); + cache_eviction_errors_ = nullptr; } ExecutionUpdateResponse::~ExecutionUpdateResponse() { @@ -10471,6 +10545,7 @@ ExecutionUpdateResponse::~ExecutionUpdateResponse() { } void ExecutionUpdateResponse::SharedDtor() { + if (this != internal_default_instance()) delete cache_eviction_errors_; } void ExecutionUpdateResponse::SetCachedSize(int size) const { @@ -10488,6 +10563,10 @@ void ExecutionUpdateResponse::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { + delete cache_eviction_errors_; + } + cache_eviction_errors_ = nullptr; _internal_metadata_.Clear(); } @@ -10504,7 +10583,21 @@ const char* ExecutionUpdateResponse::_InternalParse(const char* begin, const cha ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::CacheEvictionErrorList::_InternalParse; + object = msg->mutable_cache_eviction_errors(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } default: { + handle_unusual: if ((tag & 7) == 4 || tag == 0) { ctx->EndGroup(tag); return ptr; @@ -10518,6 +10611,9 @@ const char* ExecutionUpdateResponse::_InternalParse(const char* begin, const cha } // switch } // while return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); } #else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool ExecutionUpdateResponse::MergePartialFromCodedStream( @@ -10529,12 +10625,28 @@ bool ExecutionUpdateResponse::MergePartialFromCodedStream( ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; - handle_unusual: - if (tag == 0) { - goto success; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_cache_eviction_errors())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); } success: // @@protoc_insertion_point(parse_success:flyteidl.admin.ExecutionUpdateResponse) @@ -10552,6 +10664,12 @@ void ExecutionUpdateResponse::SerializeWithCachedSizes( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + if (this->has_cache_eviction_errors()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::cache_eviction_errors(this), output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -10565,6 +10683,13 @@ ::google::protobuf::uint8* ExecutionUpdateResponse::InternalSerializeWithCachedS ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + if (this->has_cache_eviction_errors()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::cache_eviction_errors(this), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -10586,6 +10711,13 @@ size_t ExecutionUpdateResponse::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + if (this->has_cache_eviction_errors()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *cache_eviction_errors_); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -10613,6 +10745,9 @@ void ExecutionUpdateResponse::MergeFrom(const ExecutionUpdateResponse& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + if (from.has_cache_eviction_errors()) { + mutable_cache_eviction_errors()->::flyteidl::core::CacheEvictionErrorList::MergeFrom(from.cache_eviction_errors()); + } } void ExecutionUpdateResponse::CopyFrom(const ::google::protobuf::Message& from) { @@ -10640,6 +10775,7 @@ void ExecutionUpdateResponse::Swap(ExecutionUpdateResponse* other) { void ExecutionUpdateResponse::InternalSwap(ExecutionUpdateResponse* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); + swap(cache_eviction_errors_, other->cache_eviction_errors_); } ::google::protobuf::Metadata ExecutionUpdateResponse::GetMetadata() const { diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h index b333e1c4b1..8c9886c5e1 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h @@ -35,6 +35,7 @@ #include "flyteidl/admin/cluster_assignment.pb.h" #include "flyteidl/admin/common.pb.h" #include "flyteidl/core/literals.pb.h" +#include "flyteidl/core/errors.pb.h" #include "flyteidl/core/execution.pb.h" #include "flyteidl/core/identifier.pb.h" #include "flyteidl/core/security.pb.h" @@ -3027,6 +3028,12 @@ class ExecutionUpdateRequest final : ::flyteidl::admin::ExecutionState state() const; void set_state(::flyteidl::admin::ExecutionState value); + // bool evict_cache = 3; + void clear_evict_cache(); + static const int kEvictCacheFieldNumber = 3; + bool evict_cache() const; + void set_evict_cache(bool value); + // @@protoc_insertion_point(class_scope:flyteidl.admin.ExecutionUpdateRequest) private: class HasBitSetters; @@ -3034,6 +3041,7 @@ class ExecutionUpdateRequest final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::flyteidl::core::WorkflowExecutionIdentifier* id_; int state_; + bool evict_cache_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fexecution_2eproto; }; @@ -3271,11 +3279,21 @@ class ExecutionUpdateResponse final : // accessors ------------------------------------------------------- + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + bool has_cache_eviction_errors() const; + void clear_cache_eviction_errors(); + static const int kCacheEvictionErrorsFieldNumber = 1; + const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors() const; + ::flyteidl::core::CacheEvictionErrorList* release_cache_eviction_errors(); + ::flyteidl::core::CacheEvictionErrorList* mutable_cache_eviction_errors(); + void set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors); + // @@protoc_insertion_point(class_scope:flyteidl.admin.ExecutionUpdateResponse) private: class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fexecution_2eproto; }; @@ -6398,6 +6416,20 @@ inline void ExecutionUpdateRequest::set_state(::flyteidl::admin::ExecutionState // @@protoc_insertion_point(field_set:flyteidl.admin.ExecutionUpdateRequest.state) } +// bool evict_cache = 3; +inline void ExecutionUpdateRequest::clear_evict_cache() { + evict_cache_ = false; +} +inline bool ExecutionUpdateRequest::evict_cache() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.ExecutionUpdateRequest.evict_cache) + return evict_cache_; +} +inline void ExecutionUpdateRequest::set_evict_cache(bool value) { + + evict_cache_ = value; + // @@protoc_insertion_point(field_set:flyteidl.admin.ExecutionUpdateRequest.evict_cache) +} + // ------------------------------------------------------------------- // ExecutionStateChangeDetails @@ -6519,6 +6551,51 @@ inline void ExecutionStateChangeDetails::set_allocated_principal(::std::string* // ExecutionUpdateResponse +// .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; +inline bool ExecutionUpdateResponse::has_cache_eviction_errors() const { + return this != internal_default_instance() && cache_eviction_errors_ != nullptr; +} +inline const ::flyteidl::core::CacheEvictionErrorList& ExecutionUpdateResponse::cache_eviction_errors() const { + const ::flyteidl::core::CacheEvictionErrorList* p = cache_eviction_errors_; + // @@protoc_insertion_point(field_get:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_CacheEvictionErrorList_default_instance_); +} +inline ::flyteidl::core::CacheEvictionErrorList* ExecutionUpdateResponse::release_cache_eviction_errors() { + // @@protoc_insertion_point(field_release:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) + + ::flyteidl::core::CacheEvictionErrorList* temp = cache_eviction_errors_; + cache_eviction_errors_ = nullptr; + return temp; +} +inline ::flyteidl::core::CacheEvictionErrorList* ExecutionUpdateResponse::mutable_cache_eviction_errors() { + + if (cache_eviction_errors_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::CacheEvictionErrorList>(GetArenaNoVirtual()); + cache_eviction_errors_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) + return cache_eviction_errors_; +} +inline void ExecutionUpdateResponse::set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(cache_eviction_errors_); + } + if (cache_eviction_errors) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + cache_eviction_errors = ::google::protobuf::internal::GetOwnedMessage( + message_arena, cache_eviction_errors, submessage_arena); + } + + } else { + + } + cache_eviction_errors_ = cache_eviction_errors; + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc index f80d895efb..a9c93c94c4 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc @@ -20,6 +20,7 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fcommon_2eproto ::google::prot extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fcommon_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_UrlBlob_flyteidl_2fadmin_2fcommon_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2ftask_5fexecution_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecution_flyteidl_2fadmin_2ftask_5fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2ftask_5fexecution_2eproto ::google::protobuf::internal::SCCInfo<7> scc_info_TaskExecutionClosure_flyteidl_2fadmin_2ftask_5fexecution_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_ExecutionError_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_TaskLog_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_NodeExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; @@ -62,6 +63,14 @@ class TaskExecutionGetDataResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _TaskExecutionGetDataResponse_default_instance_; +class TaskExecutionUpdateRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _TaskExecutionUpdateRequest_default_instance_; +class TaskExecutionUpdateResponseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _TaskExecutionUpdateResponse_default_instance_; } // namespace admin } // namespace flyteidl static void InitDefaultsTaskExecutionGetRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { @@ -178,6 +187,36 @@ ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionGetDataResponse_f &scc_info_UrlBlob_flyteidl_2fadmin_2fcommon_2eproto.base, &scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto.base,}}; +static void InitDefaultsTaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_TaskExecutionUpdateRequest_default_instance_; + new (ptr) ::flyteidl::admin::TaskExecutionUpdateRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::admin::TaskExecutionUpdateRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsTaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto}, { + &scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; + +static void InitDefaultsTaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_TaskExecutionUpdateResponse_default_instance_; + new (ptr) ::flyteidl::admin::TaskExecutionUpdateResponse(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::admin::TaskExecutionUpdateResponse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsTaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto}, { + &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}}; + void InitDefaults_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionGetRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionListRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); @@ -186,9 +225,11 @@ void InitDefaults_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionClosure_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionGetDataRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionGetDataResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[7]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[9]; constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto = nullptr; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto = nullptr; @@ -260,6 +301,19 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2ftask_5fexecution PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionGetDataResponse, outputs_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionGetDataResponse, full_inputs_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionGetDataResponse, full_outputs_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateRequest, id_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateRequest, evict_cache_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateResponse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateResponse, cache_eviction_errors_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::admin::TaskExecutionGetRequest)}, @@ -269,6 +323,8 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 32, -1, sizeof(::flyteidl::admin::TaskExecutionClosure)}, { 52, -1, sizeof(::flyteidl::admin::TaskExecutionGetDataRequest)}, { 58, -1, sizeof(::flyteidl::admin::TaskExecutionGetDataResponse)}, + { 67, -1, sizeof(::flyteidl::admin::TaskExecutionUpdateRequest)}, + { 74, -1, sizeof(::flyteidl::admin::TaskExecutionUpdateResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -279,71 +335,80 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::admin::_TaskExecutionClosure_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionGetDataRequest_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionGetDataResponse_default_instance_), + reinterpret_cast(&::flyteidl::admin::_TaskExecutionUpdateRequest_default_instance_), + reinterpret_cast(&::flyteidl::admin::_TaskExecutionUpdateResponse_default_instance_), }; ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto = { {}, AddDescriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, "flyteidl/admin/task_execution.proto", schemas, file_default_instances, TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto::offsets, - file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 7, file_level_enum_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, + file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 9, file_level_enum_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, }; const char descriptor_table_protodef_flyteidl_2fadmin_2ftask_5fexecution_2eproto[] = "\n#flyteidl/admin/task_execution.proto\022\016f" "lyteidl.admin\032\033flyteidl/admin/common.pro" - "to\032\035flyteidl/core/execution.proto\032\036flyte" - "idl/core/identifier.proto\032\034flyteidl/core" - "/literals.proto\032\032flyteidl/event/event.pr" - "oto\032\037google/protobuf/timestamp.proto\032\036go" - "ogle/protobuf/duration.proto\032\034google/pro" - "tobuf/struct.proto\"M\n\027TaskExecutionGetRe" - "quest\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" - "ecutionIdentifier\"\263\001\n\030TaskExecutionListR" - "equest\022A\n\021node_execution_id\030\001 \001(\0132&.flyt" - "eidl.core.NodeExecutionIdentifier\022\r\n\005lim" - "it\030\002 \001(\r\022\r\n\005token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t" - "\022%\n\007sort_by\030\005 \001(\0132\024.flyteidl.admin.Sort\"" - "\240\001\n\rTaskExecution\0222\n\002id\030\001 \001(\0132&.flyteidl" - ".core.TaskExecutionIdentifier\022\021\n\tinput_u" - "ri\030\002 \001(\t\0225\n\007closure\030\003 \001(\0132$.flyteidl.adm" - "in.TaskExecutionClosure\022\021\n\tis_parent\030\004 \001" - "(\010\"Z\n\021TaskExecutionList\0226\n\017task_executio" - "ns\030\001 \003(\0132\035.flyteidl.admin.TaskExecution\022" - "\r\n\005token\030\002 \001(\t\"\336\004\n\024TaskExecutionClosure\022" - "\030\n\noutput_uri\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\013" - "2\035.flyteidl.core.ExecutionErrorH\000\0224\n\013out" - "put_data\030\014 \001(\0132\031.flyteidl.core.LiteralMa" - "pB\002\030\001H\000\0221\n\005phase\030\003 \001(\0162\".flyteidl.core.T" - "askExecution.Phase\022$\n\004logs\030\004 \003(\0132\026.flyte" - "idl.core.TaskLog\022.\n\nstarted_at\030\005 \001(\0132\032.g" - "oogle.protobuf.Timestamp\022+\n\010duration\030\006 \001" - "(\0132\031.google.protobuf.Duration\022.\n\ncreated" - "_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022.\n" - "\nupdated_at\030\010 \001(\0132\032.google.protobuf.Time" - "stamp\022,\n\013custom_info\030\t \001(\0132\027.google.prot" - "obuf.Struct\022\016\n\006reason\030\n \001(\t\022\021\n\ttask_type" - "\030\013 \001(\t\0227\n\010metadata\030\020 \001(\0132%.flyteidl.even" - "t.TaskExecutionMetadata\022\025\n\revent_version" - "\030\021 \001(\005B\017\n\routput_result\"Q\n\033TaskExecution" - "GetDataRequest\0222\n\002id\030\001 \001(\0132&.flyteidl.co" - "re.TaskExecutionIdentifier\"\332\001\n\034TaskExecu" - "tionGetDataResponse\022+\n\006inputs\030\001 \001(\0132\027.fl" - "yteidl.admin.UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(" - "\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013full_i" - "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMap\022/" - "\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core.Lit" - "eralMapB7Z5github.com/flyteorg/flyteidl/" - "gen/pb-go/flyteidl/adminb\006proto3" + "to\032\032flyteidl/core/errors.proto\032\035flyteidl" + "/core/execution.proto\032\036flyteidl/core/ide" + "ntifier.proto\032\034flyteidl/core/literals.pr" + "oto\032\032flyteidl/event/event.proto\032\037google/" + "protobuf/timestamp.proto\032\036google/protobu" + "f/duration.proto\032\034google/protobuf/struct" + ".proto\"M\n\027TaskExecutionGetRequest\0222\n\002id\030" + "\001 \001(\0132&.flyteidl.core.TaskExecutionIdent" + "ifier\"\263\001\n\030TaskExecutionListRequest\022A\n\021no" + "de_execution_id\030\001 \001(\0132&.flyteidl.core.No" + "deExecutionIdentifier\022\r\n\005limit\030\002 \001(\r\022\r\n\005" + "token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t\022%\n\007sort_by\030" + "\005 \001(\0132\024.flyteidl.admin.Sort\"\240\001\n\rTaskExec" + "ution\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" + "ecutionIdentifier\022\021\n\tinput_uri\030\002 \001(\t\0225\n\007" + "closure\030\003 \001(\0132$.flyteidl.admin.TaskExecu" + "tionClosure\022\021\n\tis_parent\030\004 \001(\010\"Z\n\021TaskEx" + "ecutionList\0226\n\017task_executions\030\001 \003(\0132\035.f" + "lyteidl.admin.TaskExecution\022\r\n\005token\030\002 \001" + "(\t\"\336\004\n\024TaskExecutionClosure\022\030\n\noutput_ur" + "i\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl." + "core.ExecutionErrorH\000\0224\n\013output_data\030\014 \001" + "(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0221\n\005p" + "hase\030\003 \001(\0162\".flyteidl.core.TaskExecution" + ".Phase\022$\n\004logs\030\004 \003(\0132\026.flyteidl.core.Tas" + "kLog\022.\n\nstarted_at\030\005 \001(\0132\032.google.protob" + "uf.Timestamp\022+\n\010duration\030\006 \001(\0132\031.google." + "protobuf.Duration\022.\n\ncreated_at\030\007 \001(\0132\032." + "google.protobuf.Timestamp\022.\n\nupdated_at\030" + "\010 \001(\0132\032.google.protobuf.Timestamp\022,\n\013cus" + "tom_info\030\t \001(\0132\027.google.protobuf.Struct\022" + "\016\n\006reason\030\n \001(\t\022\021\n\ttask_type\030\013 \001(\t\0227\n\010me" + "tadata\030\020 \001(\0132%.flyteidl.event.TaskExecut" + "ionMetadata\022\025\n\revent_version\030\021 \001(\005B\017\n\rou" + "tput_result\"Q\n\033TaskExecutionGetDataReque" + "st\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskExecu" + "tionIdentifier\"\332\001\n\034TaskExecutionGetDataR" + "esponse\022+\n\006inputs\030\001 \001(\0132\027.flyteidl.admin" + ".UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(\0132\027.flyteidl" + ".admin.UrlBlobB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132" + "\031.flyteidl.core.LiteralMap\022/\n\014full_outpu" + "ts\030\004 \001(\0132\031.flyteidl.core.LiteralMap\"e\n\032T" + "askExecutionUpdateRequest\0222\n\002id\030\001 \001(\0132&." + "flyteidl.core.TaskExecutionIdentifier\022\023\n" + "\013evict_cache\030\002 \001(\010\"c\n\033TaskExecutionUpdat" + "eResponse\022D\n\025cache_eviction_errors\030\001 \001(\013" + "2%.flyteidl.core.CacheEvictionErrorListB" + "7Z5github.com/flyteorg/flyteidl/gen/pb-g" + "o/flyteidl/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto = { false, InitDefaults_flyteidl_2fadmin_2ftask_5fexecution_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2ftask_5fexecution_2eproto, - "flyteidl/admin/task_execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 1792, + "flyteidl/admin/task_execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 2024, }; void AddDescriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[8] = + static constexpr ::google::protobuf::internal::InitFunc deps[9] = { ::AddDescriptors_flyteidl_2fadmin_2fcommon_2eproto, + ::AddDescriptors_flyteidl_2fcore_2ferrors_2eproto, ::AddDescriptors_flyteidl_2fcore_2fexecution_2eproto, ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, ::AddDescriptors_flyteidl_2fcore_2fliterals_2eproto, @@ -352,7 +417,7 @@ void AddDescriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { ::AddDescriptors_google_2fprotobuf_2fduration_2eproto, ::AddDescriptors_google_2fprotobuf_2fstruct_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, deps, 8); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, deps, 9); } // Force running AddDescriptors() at dynamic initialization time. @@ -4092,6 +4157,636 @@ ::google::protobuf::Metadata TaskExecutionGetDataResponse::GetMetadata() const { } +// =================================================================== + +void TaskExecutionUpdateRequest::InitAsDefaultInstance() { + ::flyteidl::admin::_TaskExecutionUpdateRequest_default_instance_._instance.get_mutable()->id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( + ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); +} +class TaskExecutionUpdateRequest::HasBitSetters { + public: + static const ::flyteidl::core::TaskExecutionIdentifier& id(const TaskExecutionUpdateRequest* msg); +}; + +const ::flyteidl::core::TaskExecutionIdentifier& +TaskExecutionUpdateRequest::HasBitSetters::id(const TaskExecutionUpdateRequest* msg) { + return *msg->id_; +} +void TaskExecutionUpdateRequest::clear_id() { + if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { + delete id_; + } + id_ = nullptr; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int TaskExecutionUpdateRequest::kIdFieldNumber; +const int TaskExecutionUpdateRequest::kEvictCacheFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +TaskExecutionUpdateRequest::TaskExecutionUpdateRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.admin.TaskExecutionUpdateRequest) +} +TaskExecutionUpdateRequest::TaskExecutionUpdateRequest(const TaskExecutionUpdateRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_id()) { + id_ = new ::flyteidl::core::TaskExecutionIdentifier(*from.id_); + } else { + id_ = nullptr; + } + evict_cache_ = from.evict_cache_; + // @@protoc_insertion_point(copy_constructor:flyteidl.admin.TaskExecutionUpdateRequest) +} + +void TaskExecutionUpdateRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); + ::memset(&id_, 0, static_cast( + reinterpret_cast(&evict_cache_) - + reinterpret_cast(&id_)) + sizeof(evict_cache_)); +} + +TaskExecutionUpdateRequest::~TaskExecutionUpdateRequest() { + // @@protoc_insertion_point(destructor:flyteidl.admin.TaskExecutionUpdateRequest) + SharedDtor(); +} + +void TaskExecutionUpdateRequest::SharedDtor() { + if (this != internal_default_instance()) delete id_; +} + +void TaskExecutionUpdateRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const TaskExecutionUpdateRequest& TaskExecutionUpdateRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); + return *internal_default_instance(); +} + + +void TaskExecutionUpdateRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.admin.TaskExecutionUpdateRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { + delete id_; + } + id_ = nullptr; + evict_cache_ = false; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* TaskExecutionUpdateRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.core.TaskExecutionIdentifier id = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::TaskExecutionIdentifier::_InternalParse; + object = msg->mutable_id(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // bool evict_cache = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; + msg->set_evict_cache(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool TaskExecutionUpdateRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.admin.TaskExecutionUpdateRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.TaskExecutionIdentifier id = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_id())); + } else { + goto handle_unusual; + } + break; + } + + // bool evict_cache = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &evict_cache_))); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.admin.TaskExecutionUpdateRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.admin.TaskExecutionUpdateRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void TaskExecutionUpdateRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.admin.TaskExecutionUpdateRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + if (this->has_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::id(this), output); + } + + // bool evict_cache = 2; + if (this->evict_cache() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->evict_cache(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.admin.TaskExecutionUpdateRequest) +} + +::google::protobuf::uint8* TaskExecutionUpdateRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.TaskExecutionUpdateRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + if (this->has_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::id(this), target); + } + + // bool evict_cache = 2; + if (this->evict_cache() != 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->evict_cache(), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.TaskExecutionUpdateRequest) + return target; +} + +size_t TaskExecutionUpdateRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.TaskExecutionUpdateRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + if (this->has_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *id_); + } + + // bool evict_cache = 2; + if (this->evict_cache() != 0) { + total_size += 1 + 1; + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void TaskExecutionUpdateRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.TaskExecutionUpdateRequest) + GOOGLE_DCHECK_NE(&from, this); + const TaskExecutionUpdateRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.TaskExecutionUpdateRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.TaskExecutionUpdateRequest) + MergeFrom(*source); + } +} + +void TaskExecutionUpdateRequest::MergeFrom(const TaskExecutionUpdateRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.TaskExecutionUpdateRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_id()) { + mutable_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.id()); + } + if (from.evict_cache() != 0) { + set_evict_cache(from.evict_cache()); + } +} + +void TaskExecutionUpdateRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.TaskExecutionUpdateRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void TaskExecutionUpdateRequest::CopyFrom(const TaskExecutionUpdateRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.TaskExecutionUpdateRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool TaskExecutionUpdateRequest::IsInitialized() const { + return true; +} + +void TaskExecutionUpdateRequest::Swap(TaskExecutionUpdateRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void TaskExecutionUpdateRequest::InternalSwap(TaskExecutionUpdateRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(id_, other->id_); + swap(evict_cache_, other->evict_cache_); +} + +::google::protobuf::Metadata TaskExecutionUpdateRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void TaskExecutionUpdateResponse::InitAsDefaultInstance() { + ::flyteidl::admin::_TaskExecutionUpdateResponse_default_instance_._instance.get_mutable()->cache_eviction_errors_ = const_cast< ::flyteidl::core::CacheEvictionErrorList*>( + ::flyteidl::core::CacheEvictionErrorList::internal_default_instance()); +} +class TaskExecutionUpdateResponse::HasBitSetters { + public: + static const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors(const TaskExecutionUpdateResponse* msg); +}; + +const ::flyteidl::core::CacheEvictionErrorList& +TaskExecutionUpdateResponse::HasBitSetters::cache_eviction_errors(const TaskExecutionUpdateResponse* msg) { + return *msg->cache_eviction_errors_; +} +void TaskExecutionUpdateResponse::clear_cache_eviction_errors() { + if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { + delete cache_eviction_errors_; + } + cache_eviction_errors_ = nullptr; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int TaskExecutionUpdateResponse::kCacheEvictionErrorsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +TaskExecutionUpdateResponse::TaskExecutionUpdateResponse() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.admin.TaskExecutionUpdateResponse) +} +TaskExecutionUpdateResponse::TaskExecutionUpdateResponse(const TaskExecutionUpdateResponse& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_cache_eviction_errors()) { + cache_eviction_errors_ = new ::flyteidl::core::CacheEvictionErrorList(*from.cache_eviction_errors_); + } else { + cache_eviction_errors_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:flyteidl.admin.TaskExecutionUpdateResponse) +} + +void TaskExecutionUpdateResponse::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); + cache_eviction_errors_ = nullptr; +} + +TaskExecutionUpdateResponse::~TaskExecutionUpdateResponse() { + // @@protoc_insertion_point(destructor:flyteidl.admin.TaskExecutionUpdateResponse) + SharedDtor(); +} + +void TaskExecutionUpdateResponse::SharedDtor() { + if (this != internal_default_instance()) delete cache_eviction_errors_; +} + +void TaskExecutionUpdateResponse::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const TaskExecutionUpdateResponse& TaskExecutionUpdateResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); + return *internal_default_instance(); +} + + +void TaskExecutionUpdateResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.admin.TaskExecutionUpdateResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { + delete cache_eviction_errors_; + } + cache_eviction_errors_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* TaskExecutionUpdateResponse::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::CacheEvictionErrorList::_InternalParse; + object = msg->mutable_cache_eviction_errors(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool TaskExecutionUpdateResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.admin.TaskExecutionUpdateResponse) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_cache_eviction_errors())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.admin.TaskExecutionUpdateResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.admin.TaskExecutionUpdateResponse) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void TaskExecutionUpdateResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.admin.TaskExecutionUpdateResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + if (this->has_cache_eviction_errors()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::cache_eviction_errors(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.admin.TaskExecutionUpdateResponse) +} + +::google::protobuf::uint8* TaskExecutionUpdateResponse::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.TaskExecutionUpdateResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + if (this->has_cache_eviction_errors()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::cache_eviction_errors(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.TaskExecutionUpdateResponse) + return target; +} + +size_t TaskExecutionUpdateResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.TaskExecutionUpdateResponse) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + if (this->has_cache_eviction_errors()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *cache_eviction_errors_); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void TaskExecutionUpdateResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.TaskExecutionUpdateResponse) + GOOGLE_DCHECK_NE(&from, this); + const TaskExecutionUpdateResponse* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.TaskExecutionUpdateResponse) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.TaskExecutionUpdateResponse) + MergeFrom(*source); + } +} + +void TaskExecutionUpdateResponse::MergeFrom(const TaskExecutionUpdateResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.TaskExecutionUpdateResponse) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_cache_eviction_errors()) { + mutable_cache_eviction_errors()->::flyteidl::core::CacheEvictionErrorList::MergeFrom(from.cache_eviction_errors()); + } +} + +void TaskExecutionUpdateResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.TaskExecutionUpdateResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void TaskExecutionUpdateResponse::CopyFrom(const TaskExecutionUpdateResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.TaskExecutionUpdateResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool TaskExecutionUpdateResponse::IsInitialized() const { + return true; +} + +void TaskExecutionUpdateResponse::Swap(TaskExecutionUpdateResponse* other) { + if (other == this) return; + InternalSwap(other); +} +void TaskExecutionUpdateResponse::InternalSwap(TaskExecutionUpdateResponse* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(cache_eviction_errors_, other->cache_eviction_errors_); +} + +::google::protobuf::Metadata TaskExecutionUpdateResponse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[kIndexInFileMessages]; +} + + // @@protoc_insertion_point(namespace_scope) } // namespace admin } // namespace flyteidl @@ -4118,6 +4813,12 @@ template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionGetDataRequest* Are template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionGetDataResponse* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionGetDataResponse >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionGetDataResponse >(arena); } +template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionUpdateRequest* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionUpdateRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionUpdateRequest >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionUpdateResponse* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionUpdateResponse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionUpdateResponse >(arena); +} } // namespace protobuf } // namespace google diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h index 32c81855f9..99d9dc6b46 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h @@ -32,6 +32,7 @@ #include // IWYU pragma: export #include #include "flyteidl/admin/common.pb.h" +#include "flyteidl/core/errors.pb.h" #include "flyteidl/core/execution.pb.h" #include "flyteidl/core/identifier.pb.h" #include "flyteidl/core/literals.pb.h" @@ -49,7 +50,7 @@ struct TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[7] + static const ::google::protobuf::internal::ParseTable schema[9] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -79,6 +80,12 @@ extern TaskExecutionListDefaultTypeInternal _TaskExecutionList_default_instance_ class TaskExecutionListRequest; class TaskExecutionListRequestDefaultTypeInternal; extern TaskExecutionListRequestDefaultTypeInternal _TaskExecutionListRequest_default_instance_; +class TaskExecutionUpdateRequest; +class TaskExecutionUpdateRequestDefaultTypeInternal; +extern TaskExecutionUpdateRequestDefaultTypeInternal _TaskExecutionUpdateRequest_default_instance_; +class TaskExecutionUpdateResponse; +class TaskExecutionUpdateResponseDefaultTypeInternal; +extern TaskExecutionUpdateResponseDefaultTypeInternal _TaskExecutionUpdateResponse_default_instance_; } // namespace admin } // namespace flyteidl namespace google { @@ -90,6 +97,8 @@ template<> ::flyteidl::admin::TaskExecutionGetDataResponse* Arena::CreateMaybeMe template<> ::flyteidl::admin::TaskExecutionGetRequest* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionGetRequest>(Arena*); template<> ::flyteidl::admin::TaskExecutionList* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionList>(Arena*); template<> ::flyteidl::admin::TaskExecutionListRequest* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionListRequest>(Arena*); +template<> ::flyteidl::admin::TaskExecutionUpdateRequest* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionUpdateRequest>(Arena*); +template<> ::flyteidl::admin::TaskExecutionUpdateResponse* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionUpdateResponse>(Arena*); } // namespace protobuf } // namespace google namespace flyteidl { @@ -1192,6 +1201,243 @@ class TaskExecutionGetDataResponse final : mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto; }; +// ------------------------------------------------------------------- + +class TaskExecutionUpdateRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.TaskExecutionUpdateRequest) */ { + public: + TaskExecutionUpdateRequest(); + virtual ~TaskExecutionUpdateRequest(); + + TaskExecutionUpdateRequest(const TaskExecutionUpdateRequest& from); + + inline TaskExecutionUpdateRequest& operator=(const TaskExecutionUpdateRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + TaskExecutionUpdateRequest(TaskExecutionUpdateRequest&& from) noexcept + : TaskExecutionUpdateRequest() { + *this = ::std::move(from); + } + + inline TaskExecutionUpdateRequest& operator=(TaskExecutionUpdateRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const TaskExecutionUpdateRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const TaskExecutionUpdateRequest* internal_default_instance() { + return reinterpret_cast( + &_TaskExecutionUpdateRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 7; + + void Swap(TaskExecutionUpdateRequest* other); + friend void swap(TaskExecutionUpdateRequest& a, TaskExecutionUpdateRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline TaskExecutionUpdateRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + TaskExecutionUpdateRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const TaskExecutionUpdateRequest& from); + void MergeFrom(const TaskExecutionUpdateRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(TaskExecutionUpdateRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + bool has_id() const; + void clear_id(); + static const int kIdFieldNumber = 1; + const ::flyteidl::core::TaskExecutionIdentifier& id() const; + ::flyteidl::core::TaskExecutionIdentifier* release_id(); + ::flyteidl::core::TaskExecutionIdentifier* mutable_id(); + void set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id); + + // bool evict_cache = 2; + void clear_evict_cache(); + static const int kEvictCacheFieldNumber = 2; + bool evict_cache() const; + void set_evict_cache(bool value); + + // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::core::TaskExecutionIdentifier* id_; + bool evict_cache_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto; +}; +// ------------------------------------------------------------------- + +class TaskExecutionUpdateResponse final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.TaskExecutionUpdateResponse) */ { + public: + TaskExecutionUpdateResponse(); + virtual ~TaskExecutionUpdateResponse(); + + TaskExecutionUpdateResponse(const TaskExecutionUpdateResponse& from); + + inline TaskExecutionUpdateResponse& operator=(const TaskExecutionUpdateResponse& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + TaskExecutionUpdateResponse(TaskExecutionUpdateResponse&& from) noexcept + : TaskExecutionUpdateResponse() { + *this = ::std::move(from); + } + + inline TaskExecutionUpdateResponse& operator=(TaskExecutionUpdateResponse&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const TaskExecutionUpdateResponse& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const TaskExecutionUpdateResponse* internal_default_instance() { + return reinterpret_cast( + &_TaskExecutionUpdateResponse_default_instance_); + } + static constexpr int kIndexInFileMessages = + 8; + + void Swap(TaskExecutionUpdateResponse* other); + friend void swap(TaskExecutionUpdateResponse& a, TaskExecutionUpdateResponse& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline TaskExecutionUpdateResponse* New() const final { + return CreateMaybeMessage(nullptr); + } + + TaskExecutionUpdateResponse* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const TaskExecutionUpdateResponse& from); + void MergeFrom(const TaskExecutionUpdateResponse& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(TaskExecutionUpdateResponse* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + bool has_cache_eviction_errors() const; + void clear_cache_eviction_errors(); + static const int kCacheEvictionErrorsFieldNumber = 1; + const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors() const; + ::flyteidl::core::CacheEvictionErrorList* release_cache_eviction_errors(); + ::flyteidl::core::CacheEvictionErrorList* mutable_cache_eviction_errors(); + void set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors); + + // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateResponse) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto; +}; // =================================================================== @@ -2560,6 +2806,118 @@ inline void TaskExecutionGetDataResponse::set_allocated_full_outputs(::flyteidl: // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.TaskExecutionGetDataResponse.full_outputs) } +// ------------------------------------------------------------------- + +// TaskExecutionUpdateRequest + +// .flyteidl.core.TaskExecutionIdentifier id = 1; +inline bool TaskExecutionUpdateRequest::has_id() const { + return this != internal_default_instance() && id_ != nullptr; +} +inline const ::flyteidl::core::TaskExecutionIdentifier& TaskExecutionUpdateRequest::id() const { + const ::flyteidl::core::TaskExecutionIdentifier* p = id_; + // @@protoc_insertion_point(field_get:flyteidl.admin.TaskExecutionUpdateRequest.id) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_TaskExecutionIdentifier_default_instance_); +} +inline ::flyteidl::core::TaskExecutionIdentifier* TaskExecutionUpdateRequest::release_id() { + // @@protoc_insertion_point(field_release:flyteidl.admin.TaskExecutionUpdateRequest.id) + + ::flyteidl::core::TaskExecutionIdentifier* temp = id_; + id_ = nullptr; + return temp; +} +inline ::flyteidl::core::TaskExecutionIdentifier* TaskExecutionUpdateRequest::mutable_id() { + + if (id_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::TaskExecutionIdentifier>(GetArenaNoVirtual()); + id_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.admin.TaskExecutionUpdateRequest.id) + return id_; +} +inline void TaskExecutionUpdateRequest::set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(id_); + } + if (id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, id, submessage_arena); + } + + } else { + + } + id_ = id; + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.TaskExecutionUpdateRequest.id) +} + +// bool evict_cache = 2; +inline void TaskExecutionUpdateRequest::clear_evict_cache() { + evict_cache_ = false; +} +inline bool TaskExecutionUpdateRequest::evict_cache() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.TaskExecutionUpdateRequest.evict_cache) + return evict_cache_; +} +inline void TaskExecutionUpdateRequest::set_evict_cache(bool value) { + + evict_cache_ = value; + // @@protoc_insertion_point(field_set:flyteidl.admin.TaskExecutionUpdateRequest.evict_cache) +} + +// ------------------------------------------------------------------- + +// TaskExecutionUpdateResponse + +// .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; +inline bool TaskExecutionUpdateResponse::has_cache_eviction_errors() const { + return this != internal_default_instance() && cache_eviction_errors_ != nullptr; +} +inline const ::flyteidl::core::CacheEvictionErrorList& TaskExecutionUpdateResponse::cache_eviction_errors() const { + const ::flyteidl::core::CacheEvictionErrorList* p = cache_eviction_errors_; + // @@protoc_insertion_point(field_get:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_CacheEvictionErrorList_default_instance_); +} +inline ::flyteidl::core::CacheEvictionErrorList* TaskExecutionUpdateResponse::release_cache_eviction_errors() { + // @@protoc_insertion_point(field_release:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) + + ::flyteidl::core::CacheEvictionErrorList* temp = cache_eviction_errors_; + cache_eviction_errors_ = nullptr; + return temp; +} +inline ::flyteidl::core::CacheEvictionErrorList* TaskExecutionUpdateResponse::mutable_cache_eviction_errors() { + + if (cache_eviction_errors_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::CacheEvictionErrorList>(GetArenaNoVirtual()); + cache_eviction_errors_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) + return cache_eviction_errors_; +} +inline void TaskExecutionUpdateResponse::set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(cache_eviction_errors_); + } + if (cache_eviction_errors) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + cache_eviction_errors = ::google::protobuf::internal::GetOwnedMessage( + message_arena, cache_eviction_errors, submessage_arena); + } + + } else { + + } + cache_eviction_errors_ = cache_eviction_errors; + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ @@ -2575,6 +2933,10 @@ inline void TaskExecutionGetDataResponse::set_allocated_full_outputs(::flyteidl: // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc index cc160ff103..2aac06b2d1 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc @@ -17,6 +17,10 @@ #include extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_ContainerError_flyteidl_2fcore_2ferrors_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_CacheEvictionError_flyteidl_2fcore_2ferrors_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_NodeExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; namespace flyteidl { namespace core { class ContainerErrorDefaultTypeInternal { @@ -27,6 +31,16 @@ class ErrorDocumentDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _ErrorDocument_default_instance_; +class CacheEvictionErrorDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; + const ::flyteidl::core::TaskExecutionIdentifier* task_execution_id_; + const ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_; +} _CacheEvictionError_default_instance_; +class CacheEvictionErrorListDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _CacheEvictionErrorList_default_instance_; } // namespace core } // namespace flyteidl static void InitDefaultsContainerError_flyteidl_2fcore_2ferrors_2eproto() { @@ -58,13 +72,47 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_ErrorDocument_flyteidl_2fcore_ {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsErrorDocument_flyteidl_2fcore_2ferrors_2eproto}, { &scc_info_ContainerError_flyteidl_2fcore_2ferrors_2eproto.base,}}; +static void InitDefaultsCacheEvictionError_flyteidl_2fcore_2ferrors_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::core::_CacheEvictionError_default_instance_; + new (ptr) ::flyteidl::core::CacheEvictionError(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::core::CacheEvictionError::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<3> scc_info_CacheEvictionError_flyteidl_2fcore_2ferrors_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsCacheEvictionError_flyteidl_2fcore_2ferrors_2eproto}, { + &scc_info_NodeExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base, + &scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base, + &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; + +static void InitDefaultsCacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::core::_CacheEvictionErrorList_default_instance_; + new (ptr) ::flyteidl::core::CacheEvictionErrorList(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::core::CacheEvictionErrorList::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsCacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto}, { + &scc_info_CacheEvictionError_flyteidl_2fcore_2ferrors_2eproto.base,}}; + void InitDefaults_flyteidl_2fcore_2ferrors_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_ContainerError_flyteidl_2fcore_2ferrors_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_ErrorDocument_flyteidl_2fcore_2ferrors_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_CacheEvictionError_flyteidl_2fcore_2ferrors_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fcore_2ferrors_2eproto[2]; -const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fcore_2ferrors_2eproto[1]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fcore_2ferrors_2eproto[4]; +const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fcore_2ferrors_2eproto[2]; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fcore_2ferrors_2eproto = nullptr; const ::google::protobuf::uint32 TableStruct_flyteidl_2fcore_2ferrors_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { @@ -83,48 +131,81 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fcore_2ferrors_2eproto::o ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::core::ErrorDocument, error_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionError, _internal_metadata_), + ~0u, // no _extensions_ + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionError, _oneof_case_[0]), + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionError, code_), + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionError, message_), + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionError, node_execution_id_), + offsetof(::flyteidl::core::CacheEvictionErrorDefaultTypeInternal, task_execution_id_), + offsetof(::flyteidl::core::CacheEvictionErrorDefaultTypeInternal, workflow_execution_id_), + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionError, source_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionErrorList, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::core::CacheEvictionErrorList, errors_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::core::ContainerError)}, { 9, -1, sizeof(::flyteidl::core::ErrorDocument)}, + { 15, -1, sizeof(::flyteidl::core::CacheEvictionError)}, + { 26, -1, sizeof(::flyteidl::core::CacheEvictionErrorList)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::core::_ContainerError_default_instance_), reinterpret_cast(&::flyteidl::core::_ErrorDocument_default_instance_), + reinterpret_cast(&::flyteidl::core::_CacheEvictionError_default_instance_), + reinterpret_cast(&::flyteidl::core::_CacheEvictionErrorList_default_instance_), }; ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto = { {}, AddDescriptors_flyteidl_2fcore_2ferrors_2eproto, "flyteidl/core/errors.proto", schemas, file_default_instances, TableStruct_flyteidl_2fcore_2ferrors_2eproto::offsets, - file_level_metadata_flyteidl_2fcore_2ferrors_2eproto, 2, file_level_enum_descriptors_flyteidl_2fcore_2ferrors_2eproto, file_level_service_descriptors_flyteidl_2fcore_2ferrors_2eproto, + file_level_metadata_flyteidl_2fcore_2ferrors_2eproto, 4, file_level_enum_descriptors_flyteidl_2fcore_2ferrors_2eproto, file_level_service_descriptors_flyteidl_2fcore_2ferrors_2eproto, }; const char descriptor_table_protodef_flyteidl_2fcore_2ferrors_2eproto[] = "\n\032flyteidl/core/errors.proto\022\rflyteidl.c" - "ore\032\035flyteidl/core/execution.proto\"\310\001\n\016C" - "ontainerError\022\014\n\004code\030\001 \001(\t\022\017\n\007message\030\002" - " \001(\t\0220\n\004kind\030\003 \001(\0162\".flyteidl.core.Conta" - "inerError.Kind\0227\n\006origin\030\004 \001(\0162\'.flyteid" - "l.core.ExecutionError.ErrorKind\",\n\004Kind\022" - "\023\n\017NON_RECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n" - "\rErrorDocument\022,\n\005error\030\001 \001(\0132\035.flyteidl" - ".core.ContainerErrorB6Z4github.com/flyte" - "org/flyteidl/gen/pb-go/flyteidl/coreb\006pr" - "oto3" + "ore\032\035flyteidl/core/execution.proto\032\036flyt" + "eidl/core/identifier.proto\"\310\001\n\016Container" + "Error\022\014\n\004code\030\001 \001(\t\022\017\n\007message\030\002 \001(\t\0220\n\004" + "kind\030\003 \001(\0162\".flyteidl.core.ContainerErro" + "r.Kind\0227\n\006origin\030\004 \001(\0162\'.flyteidl.core.E" + "xecutionError.ErrorKind\",\n\004Kind\022\023\n\017NON_R" + "ECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n\rErrorDo" + "cument\022,\n\005error\030\001 \001(\0132\035.flyteidl.core.Co" + "ntainerError\"\317\002\n\022CacheEvictionError\0224\n\004c" + "ode\030\001 \001(\0162&.flyteidl.core.CacheEvictionE" + "rror.Code\022\017\n\007message\030\002 \001(\t\022A\n\021node_execu" + "tion_id\030\003 \001(\0132&.flyteidl.core.NodeExecut" + "ionIdentifier\022C\n\021task_execution_id\030\004 \001(\013" + "2&.flyteidl.core.TaskExecutionIdentifier" + "H\000\022K\n\025workflow_execution_id\030\005 \001(\0132*.flyt" + "eidl.core.WorkflowExecutionIdentifierH\000\"" + "\023\n\004Code\022\013\n\007UNKNOWN\020\000B\010\n\006source\"K\n\026CacheE" + "victionErrorList\0221\n\006errors\030\001 \003(\0132!.flyte" + "idl.core.CacheEvictionErrorB6Z4github.co" + "m/flyteorg/flyteidl/gen/pb-go/flyteidl/c" + "oreb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fcore_2ferrors_2eproto = { false, InitDefaults_flyteidl_2fcore_2ferrors_2eproto, descriptor_table_protodef_flyteidl_2fcore_2ferrors_2eproto, - "flyteidl/core/errors.proto", &assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto, 404, + "flyteidl/core/errors.proto", &assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto, 851, }; void AddDescriptors_flyteidl_2fcore_2ferrors_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[1] = + static constexpr ::google::protobuf::internal::InitFunc deps[2] = { ::AddDescriptors_flyteidl_2fcore_2fexecution_2eproto, + ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fcore_2ferrors_2eproto, deps, 1); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fcore_2ferrors_2eproto, deps, 2); } // Force running AddDescriptors() at dynamic initialization time. @@ -152,6 +233,25 @@ const ContainerError_Kind ContainerError::Kind_MIN; const ContainerError_Kind ContainerError::Kind_MAX; const int ContainerError::Kind_ARRAYSIZE; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* CacheEvictionError_Code_descriptor() { + ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto); + return file_level_enum_descriptors_flyteidl_2fcore_2ferrors_2eproto[1]; +} +bool CacheEvictionError_Code_IsValid(int value) { + switch (value) { + case 0: + return true; + default: + return false; + } +} + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const CacheEvictionError_Code CacheEvictionError::UNKNOWN; +const CacheEvictionError_Code CacheEvictionError::Code_MIN; +const CacheEvictionError_Code CacheEvictionError::Code_MAX; +const int CacheEvictionError::Code_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 // =================================================================== @@ -909,16 +1009,923 @@ ::google::protobuf::Metadata ErrorDocument::GetMetadata() const { } -// @@protoc_insertion_point(namespace_scope) -} // namespace core -} // namespace flyteidl -namespace google { -namespace protobuf { -template<> PROTOBUF_NOINLINE ::flyteidl::core::ContainerError* Arena::CreateMaybeMessage< ::flyteidl::core::ContainerError >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::core::ContainerError >(arena); +// =================================================================== + +void CacheEvictionError::InitAsDefaultInstance() { + ::flyteidl::core::_CacheEvictionError_default_instance_._instance.get_mutable()->node_execution_id_ = const_cast< ::flyteidl::core::NodeExecutionIdentifier*>( + ::flyteidl::core::NodeExecutionIdentifier::internal_default_instance()); + ::flyteidl::core::_CacheEvictionError_default_instance_.task_execution_id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( + ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); + ::flyteidl::core::_CacheEvictionError_default_instance_.workflow_execution_id_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>( + ::flyteidl::core::WorkflowExecutionIdentifier::internal_default_instance()); } -template<> PROTOBUF_NOINLINE ::flyteidl::core::ErrorDocument* Arena::CreateMaybeMessage< ::flyteidl::core::ErrorDocument >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::core::ErrorDocument >(arena); +class CacheEvictionError::HasBitSetters { + public: + static const ::flyteidl::core::NodeExecutionIdentifier& node_execution_id(const CacheEvictionError* msg); + static const ::flyteidl::core::TaskExecutionIdentifier& task_execution_id(const CacheEvictionError* msg); + static const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id(const CacheEvictionError* msg); +}; + +const ::flyteidl::core::NodeExecutionIdentifier& +CacheEvictionError::HasBitSetters::node_execution_id(const CacheEvictionError* msg) { + return *msg->node_execution_id_; +} +const ::flyteidl::core::TaskExecutionIdentifier& +CacheEvictionError::HasBitSetters::task_execution_id(const CacheEvictionError* msg) { + return *msg->source_.task_execution_id_; +} +const ::flyteidl::core::WorkflowExecutionIdentifier& +CacheEvictionError::HasBitSetters::workflow_execution_id(const CacheEvictionError* msg) { + return *msg->source_.workflow_execution_id_; +} +void CacheEvictionError::clear_node_execution_id() { + if (GetArenaNoVirtual() == nullptr && node_execution_id_ != nullptr) { + delete node_execution_id_; + } + node_execution_id_ = nullptr; +} +void CacheEvictionError::set_allocated_task_execution_id(::flyteidl::core::TaskExecutionIdentifier* task_execution_id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + clear_source(); + if (task_execution_id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + task_execution_id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, task_execution_id, submessage_arena); + } + set_has_task_execution_id(); + source_.task_execution_id_ = task_execution_id; + } + // @@protoc_insertion_point(field_set_allocated:flyteidl.core.CacheEvictionError.task_execution_id) +} +void CacheEvictionError::clear_task_execution_id() { + if (has_task_execution_id()) { + delete source_.task_execution_id_; + clear_has_source(); + } +} +void CacheEvictionError::set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + clear_source(); + if (workflow_execution_id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + workflow_execution_id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, workflow_execution_id, submessage_arena); + } + set_has_workflow_execution_id(); + source_.workflow_execution_id_ = workflow_execution_id; + } + // @@protoc_insertion_point(field_set_allocated:flyteidl.core.CacheEvictionError.workflow_execution_id) +} +void CacheEvictionError::clear_workflow_execution_id() { + if (has_workflow_execution_id()) { + delete source_.workflow_execution_id_; + clear_has_source(); + } +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int CacheEvictionError::kCodeFieldNumber; +const int CacheEvictionError::kMessageFieldNumber; +const int CacheEvictionError::kNodeExecutionIdFieldNumber; +const int CacheEvictionError::kTaskExecutionIdFieldNumber; +const int CacheEvictionError::kWorkflowExecutionIdFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +CacheEvictionError::CacheEvictionError() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.core.CacheEvictionError) +} +CacheEvictionError::CacheEvictionError(const CacheEvictionError& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + message_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.message().size() > 0) { + message_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.message_); + } + if (from.has_node_execution_id()) { + node_execution_id_ = new ::flyteidl::core::NodeExecutionIdentifier(*from.node_execution_id_); + } else { + node_execution_id_ = nullptr; + } + code_ = from.code_; + clear_has_source(); + switch (from.source_case()) { + case kTaskExecutionId: { + mutable_task_execution_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_execution_id()); + break; + } + case kWorkflowExecutionId: { + mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id()); + break; + } + case SOURCE_NOT_SET: { + break; + } + } + // @@protoc_insertion_point(copy_constructor:flyteidl.core.CacheEvictionError) +} + +void CacheEvictionError::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_CacheEvictionError_flyteidl_2fcore_2ferrors_2eproto.base); + message_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(&node_execution_id_, 0, static_cast( + reinterpret_cast(&code_) - + reinterpret_cast(&node_execution_id_)) + sizeof(code_)); + clear_has_source(); +} + +CacheEvictionError::~CacheEvictionError() { + // @@protoc_insertion_point(destructor:flyteidl.core.CacheEvictionError) + SharedDtor(); +} + +void CacheEvictionError::SharedDtor() { + message_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (this != internal_default_instance()) delete node_execution_id_; + if (has_source()) { + clear_source(); + } +} + +void CacheEvictionError::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const CacheEvictionError& CacheEvictionError::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_CacheEvictionError_flyteidl_2fcore_2ferrors_2eproto.base); + return *internal_default_instance(); +} + + +void CacheEvictionError::clear_source() { +// @@protoc_insertion_point(one_of_clear_start:flyteidl.core.CacheEvictionError) + switch (source_case()) { + case kTaskExecutionId: { + delete source_.task_execution_id_; + break; + } + case kWorkflowExecutionId: { + delete source_.workflow_execution_id_; + break; + } + case SOURCE_NOT_SET: { + break; + } + } + _oneof_case_[0] = SOURCE_NOT_SET; +} + + +void CacheEvictionError::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.core.CacheEvictionError) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + message_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (GetArenaNoVirtual() == nullptr && node_execution_id_ != nullptr) { + delete node_execution_id_; + } + node_execution_id_ = nullptr; + code_ = 0; + clear_source(); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* CacheEvictionError::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.core.CacheEvictionError.Code code = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; + ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr); + msg->set_code(static_cast<::flyteidl::core::CacheEvictionError_Code>(val)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + // string message = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("flyteidl.core.CacheEvictionError.message"); + object = msg->mutable_message(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::NodeExecutionIdentifier::_InternalParse; + object = msg->mutable_node_execution_id(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::TaskExecutionIdentifier::_InternalParse; + object = msg->mutable_task_execution_id(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::WorkflowExecutionIdentifier::_InternalParse; + object = msg->mutable_workflow_execution_id(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool CacheEvictionError::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.core.CacheEvictionError) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.CacheEvictionError.Code code = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { + int value = 0; + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( + input, &value))); + set_code(static_cast< ::flyteidl::core::CacheEvictionError_Code >(value)); + } else { + goto handle_unusual; + } + break; + } + + // string message = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_message())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->message().data(), static_cast(this->message().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.core.CacheEvictionError.message")); + } else { + goto handle_unusual; + } + break; + } + + // .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_node_execution_id())); + } else { + goto handle_unusual; + } + break; + } + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_task_execution_id())); + } else { + goto handle_unusual; + } + break; + } + + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + case 5: { + if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_workflow_execution_id())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.core.CacheEvictionError) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.core.CacheEvictionError) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void CacheEvictionError::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.core.CacheEvictionError) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionError.Code code = 1; + if (this->code() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteEnum( + 1, this->code(), output); + } + + // string message = 2; + if (this->message().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->message().data(), static_cast(this->message().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.core.CacheEvictionError.message"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->message(), output); + } + + // .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + if (this->has_node_execution_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 3, HasBitSetters::node_execution_id(this), output); + } + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + if (has_task_execution_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 4, HasBitSetters::task_execution_id(this), output); + } + + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + if (has_workflow_execution_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 5, HasBitSetters::workflow_execution_id(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.core.CacheEvictionError) +} + +::google::protobuf::uint8* CacheEvictionError::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.core.CacheEvictionError) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionError.Code code = 1; + if (this->code() != 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( + 1, this->code(), target); + } + + // string message = 2; + if (this->message().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->message().data(), static_cast(this->message().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.core.CacheEvictionError.message"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 2, this->message(), target); + } + + // .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + if (this->has_node_execution_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 3, HasBitSetters::node_execution_id(this), target); + } + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + if (has_task_execution_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 4, HasBitSetters::task_execution_id(this), target); + } + + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + if (has_workflow_execution_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 5, HasBitSetters::workflow_execution_id(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.core.CacheEvictionError) + return target; +} + +size_t CacheEvictionError::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.core.CacheEvictionError) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // string message = 2; + if (this->message().size() > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->message()); + } + + // .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + if (this->has_node_execution_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *node_execution_id_); + } + + // .flyteidl.core.CacheEvictionError.Code code = 1; + if (this->code() != 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->code()); + } + + switch (source_case()) { + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + case kTaskExecutionId: { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *source_.task_execution_id_); + break; + } + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + case kWorkflowExecutionId: { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *source_.workflow_execution_id_); + break; + } + case SOURCE_NOT_SET: { + break; + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void CacheEvictionError::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.core.CacheEvictionError) + GOOGLE_DCHECK_NE(&from, this); + const CacheEvictionError* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.core.CacheEvictionError) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.core.CacheEvictionError) + MergeFrom(*source); + } +} + +void CacheEvictionError::MergeFrom(const CacheEvictionError& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.core.CacheEvictionError) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.message().size() > 0) { + + message_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.message_); + } + if (from.has_node_execution_id()) { + mutable_node_execution_id()->::flyteidl::core::NodeExecutionIdentifier::MergeFrom(from.node_execution_id()); + } + if (from.code() != 0) { + set_code(from.code()); + } + switch (from.source_case()) { + case kTaskExecutionId: { + mutable_task_execution_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_execution_id()); + break; + } + case kWorkflowExecutionId: { + mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id()); + break; + } + case SOURCE_NOT_SET: { + break; + } + } +} + +void CacheEvictionError::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.core.CacheEvictionError) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void CacheEvictionError::CopyFrom(const CacheEvictionError& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.core.CacheEvictionError) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool CacheEvictionError::IsInitialized() const { + return true; +} + +void CacheEvictionError::Swap(CacheEvictionError* other) { + if (other == this) return; + InternalSwap(other); +} +void CacheEvictionError::InternalSwap(CacheEvictionError* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + message_.Swap(&other->message_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); + swap(node_execution_id_, other->node_execution_id_); + swap(code_, other->code_); + swap(source_, other->source_); + swap(_oneof_case_[0], other->_oneof_case_[0]); +} + +::google::protobuf::Metadata CacheEvictionError::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto); + return ::file_level_metadata_flyteidl_2fcore_2ferrors_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void CacheEvictionErrorList::InitAsDefaultInstance() { +} +class CacheEvictionErrorList::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int CacheEvictionErrorList::kErrorsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +CacheEvictionErrorList::CacheEvictionErrorList() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.core.CacheEvictionErrorList) +} +CacheEvictionErrorList::CacheEvictionErrorList(const CacheEvictionErrorList& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr), + errors_(from.errors_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:flyteidl.core.CacheEvictionErrorList) +} + +void CacheEvictionErrorList::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base); +} + +CacheEvictionErrorList::~CacheEvictionErrorList() { + // @@protoc_insertion_point(destructor:flyteidl.core.CacheEvictionErrorList) + SharedDtor(); +} + +void CacheEvictionErrorList::SharedDtor() { +} + +void CacheEvictionErrorList::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const CacheEvictionErrorList& CacheEvictionErrorList::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base); + return *internal_default_instance(); +} + + +void CacheEvictionErrorList::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.core.CacheEvictionErrorList) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + errors_.Clear(); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* CacheEvictionErrorList::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // repeated .flyteidl.core.CacheEvictionError errors = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::CacheEvictionError::_InternalParse; + object = msg->add_errors(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool CacheEvictionErrorList::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.core.CacheEvictionErrorList) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .flyteidl.core.CacheEvictionError errors = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_errors())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.core.CacheEvictionErrorList) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.core.CacheEvictionErrorList) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void CacheEvictionErrorList::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.core.CacheEvictionErrorList) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .flyteidl.core.CacheEvictionError errors = 1; + for (unsigned int i = 0, + n = static_cast(this->errors_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, + this->errors(static_cast(i)), + output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.core.CacheEvictionErrorList) +} + +::google::protobuf::uint8* CacheEvictionErrorList::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.core.CacheEvictionErrorList) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .flyteidl.core.CacheEvictionError errors = 1; + for (unsigned int i = 0, + n = static_cast(this->errors_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, this->errors(static_cast(i)), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.core.CacheEvictionErrorList) + return target; +} + +size_t CacheEvictionErrorList::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.core.CacheEvictionErrorList) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // repeated .flyteidl.core.CacheEvictionError errors = 1; + { + unsigned int count = static_cast(this->errors_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->errors(static_cast(i))); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void CacheEvictionErrorList::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.core.CacheEvictionErrorList) + GOOGLE_DCHECK_NE(&from, this); + const CacheEvictionErrorList* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.core.CacheEvictionErrorList) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.core.CacheEvictionErrorList) + MergeFrom(*source); + } +} + +void CacheEvictionErrorList::MergeFrom(const CacheEvictionErrorList& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.core.CacheEvictionErrorList) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + errors_.MergeFrom(from.errors_); +} + +void CacheEvictionErrorList::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.core.CacheEvictionErrorList) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void CacheEvictionErrorList::CopyFrom(const CacheEvictionErrorList& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.core.CacheEvictionErrorList) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool CacheEvictionErrorList::IsInitialized() const { + return true; +} + +void CacheEvictionErrorList::Swap(CacheEvictionErrorList* other) { + if (other == this) return; + InternalSwap(other); +} +void CacheEvictionErrorList::InternalSwap(CacheEvictionErrorList* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + CastToBase(&errors_)->InternalSwap(CastToBase(&other->errors_)); +} + +::google::protobuf::Metadata CacheEvictionErrorList::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto); + return ::file_level_metadata_flyteidl_2fcore_2ferrors_2eproto[kIndexInFileMessages]; +} + + +// @@protoc_insertion_point(namespace_scope) +} // namespace core +} // namespace flyteidl +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::flyteidl::core::ContainerError* Arena::CreateMaybeMessage< ::flyteidl::core::ContainerError >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::core::ContainerError >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::core::ErrorDocument* Arena::CreateMaybeMessage< ::flyteidl::core::ErrorDocument >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::core::ErrorDocument >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::core::CacheEvictionError* Arena::CreateMaybeMessage< ::flyteidl::core::CacheEvictionError >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::core::CacheEvictionError >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::core::CacheEvictionErrorList* Arena::CreateMaybeMessage< ::flyteidl::core::CacheEvictionErrorList >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::core::CacheEvictionErrorList >(arena); } } // namespace protobuf } // namespace google diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h index 993d23487c..d3a0ebc902 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h @@ -33,6 +33,7 @@ #include #include #include "flyteidl/core/execution.pb.h" +#include "flyteidl/core/identifier.pb.h" // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto @@ -43,7 +44,7 @@ struct TableStruct_flyteidl_2fcore_2ferrors_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[2] + static const ::google::protobuf::internal::ParseTable schema[4] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -52,6 +53,12 @@ struct TableStruct_flyteidl_2fcore_2ferrors_2eproto { void AddDescriptors_flyteidl_2fcore_2ferrors_2eproto(); namespace flyteidl { namespace core { +class CacheEvictionError; +class CacheEvictionErrorDefaultTypeInternal; +extern CacheEvictionErrorDefaultTypeInternal _CacheEvictionError_default_instance_; +class CacheEvictionErrorList; +class CacheEvictionErrorListDefaultTypeInternal; +extern CacheEvictionErrorListDefaultTypeInternal _CacheEvictionErrorList_default_instance_; class ContainerError; class ContainerErrorDefaultTypeInternal; extern ContainerErrorDefaultTypeInternal _ContainerError_default_instance_; @@ -62,6 +69,8 @@ extern ErrorDocumentDefaultTypeInternal _ErrorDocument_default_instance_; } // namespace flyteidl namespace google { namespace protobuf { +template<> ::flyteidl::core::CacheEvictionError* Arena::CreateMaybeMessage<::flyteidl::core::CacheEvictionError>(Arena*); +template<> ::flyteidl::core::CacheEvictionErrorList* Arena::CreateMaybeMessage<::flyteidl::core::CacheEvictionErrorList>(Arena*); template<> ::flyteidl::core::ContainerError* Arena::CreateMaybeMessage<::flyteidl::core::ContainerError>(Arena*); template<> ::flyteidl::core::ErrorDocument* Arena::CreateMaybeMessage<::flyteidl::core::ErrorDocument>(Arena*); } // namespace protobuf @@ -90,6 +99,26 @@ inline bool ContainerError_Kind_Parse( return ::google::protobuf::internal::ParseNamedEnum( ContainerError_Kind_descriptor(), name, value); } +enum CacheEvictionError_Code { + CacheEvictionError_Code_UNKNOWN = 0, + CacheEvictionError_Code_CacheEvictionError_Code_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::min(), + CacheEvictionError_Code_CacheEvictionError_Code_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::max() +}; +bool CacheEvictionError_Code_IsValid(int value); +const CacheEvictionError_Code CacheEvictionError_Code_Code_MIN = CacheEvictionError_Code_UNKNOWN; +const CacheEvictionError_Code CacheEvictionError_Code_Code_MAX = CacheEvictionError_Code_UNKNOWN; +const int CacheEvictionError_Code_Code_ARRAYSIZE = CacheEvictionError_Code_Code_MAX + 1; + +const ::google::protobuf::EnumDescriptor* CacheEvictionError_Code_descriptor(); +inline const ::std::string& CacheEvictionError_Code_Name(CacheEvictionError_Code value) { + return ::google::protobuf::internal::NameOfEnum( + CacheEvictionError_Code_descriptor(), value); +} +inline bool CacheEvictionError_Code_Parse( + const ::std::string& name, CacheEvictionError_Code* value) { + return ::google::protobuf::internal::ParseNamedEnum( + CacheEvictionError_Code_descriptor(), name, value); +} // =================================================================== class ContainerError final : @@ -380,6 +409,323 @@ class ErrorDocument final : mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fcore_2ferrors_2eproto; }; +// ------------------------------------------------------------------- + +class CacheEvictionError final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.core.CacheEvictionError) */ { + public: + CacheEvictionError(); + virtual ~CacheEvictionError(); + + CacheEvictionError(const CacheEvictionError& from); + + inline CacheEvictionError& operator=(const CacheEvictionError& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + CacheEvictionError(CacheEvictionError&& from) noexcept + : CacheEvictionError() { + *this = ::std::move(from); + } + + inline CacheEvictionError& operator=(CacheEvictionError&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const CacheEvictionError& default_instance(); + + enum SourceCase { + kTaskExecutionId = 4, + kWorkflowExecutionId = 5, + SOURCE_NOT_SET = 0, + }; + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const CacheEvictionError* internal_default_instance() { + return reinterpret_cast( + &_CacheEvictionError_default_instance_); + } + static constexpr int kIndexInFileMessages = + 2; + + void Swap(CacheEvictionError* other); + friend void swap(CacheEvictionError& a, CacheEvictionError& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline CacheEvictionError* New() const final { + return CreateMaybeMessage(nullptr); + } + + CacheEvictionError* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const CacheEvictionError& from); + void MergeFrom(const CacheEvictionError& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(CacheEvictionError* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + typedef CacheEvictionError_Code Code; + static const Code UNKNOWN = + CacheEvictionError_Code_UNKNOWN; + static inline bool Code_IsValid(int value) { + return CacheEvictionError_Code_IsValid(value); + } + static const Code Code_MIN = + CacheEvictionError_Code_Code_MIN; + static const Code Code_MAX = + CacheEvictionError_Code_Code_MAX; + static const int Code_ARRAYSIZE = + CacheEvictionError_Code_Code_ARRAYSIZE; + static inline const ::google::protobuf::EnumDescriptor* + Code_descriptor() { + return CacheEvictionError_Code_descriptor(); + } + static inline const ::std::string& Code_Name(Code value) { + return CacheEvictionError_Code_Name(value); + } + static inline bool Code_Parse(const ::std::string& name, + Code* value) { + return CacheEvictionError_Code_Parse(name, value); + } + + // accessors ------------------------------------------------------- + + // string message = 2; + void clear_message(); + static const int kMessageFieldNumber = 2; + const ::std::string& message() const; + void set_message(const ::std::string& value); + #if LANG_CXX11 + void set_message(::std::string&& value); + #endif + void set_message(const char* value); + void set_message(const char* value, size_t size); + ::std::string* mutable_message(); + ::std::string* release_message(); + void set_allocated_message(::std::string* message); + + // .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + bool has_node_execution_id() const; + void clear_node_execution_id(); + static const int kNodeExecutionIdFieldNumber = 3; + const ::flyteidl::core::NodeExecutionIdentifier& node_execution_id() const; + ::flyteidl::core::NodeExecutionIdentifier* release_node_execution_id(); + ::flyteidl::core::NodeExecutionIdentifier* mutable_node_execution_id(); + void set_allocated_node_execution_id(::flyteidl::core::NodeExecutionIdentifier* node_execution_id); + + // .flyteidl.core.CacheEvictionError.Code code = 1; + void clear_code(); + static const int kCodeFieldNumber = 1; + ::flyteidl::core::CacheEvictionError_Code code() const; + void set_code(::flyteidl::core::CacheEvictionError_Code value); + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + bool has_task_execution_id() const; + void clear_task_execution_id(); + static const int kTaskExecutionIdFieldNumber = 4; + const ::flyteidl::core::TaskExecutionIdentifier& task_execution_id() const; + ::flyteidl::core::TaskExecutionIdentifier* release_task_execution_id(); + ::flyteidl::core::TaskExecutionIdentifier* mutable_task_execution_id(); + void set_allocated_task_execution_id(::flyteidl::core::TaskExecutionIdentifier* task_execution_id); + + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + bool has_workflow_execution_id() const; + void clear_workflow_execution_id(); + static const int kWorkflowExecutionIdFieldNumber = 5; + const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id() const; + ::flyteidl::core::WorkflowExecutionIdentifier* release_workflow_execution_id(); + ::flyteidl::core::WorkflowExecutionIdentifier* mutable_workflow_execution_id(); + void set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id); + + void clear_source(); + SourceCase source_case() const; + // @@protoc_insertion_point(class_scope:flyteidl.core.CacheEvictionError) + private: + class HasBitSetters; + void set_has_task_execution_id(); + void set_has_workflow_execution_id(); + + inline bool has_source() const; + inline void clear_has_source(); + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::ArenaStringPtr message_; + ::flyteidl::core::NodeExecutionIdentifier* node_execution_id_; + int code_; + union SourceUnion { + SourceUnion() {} + ::flyteidl::core::TaskExecutionIdentifier* task_execution_id_; + ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_; + } source_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::google::protobuf::uint32 _oneof_case_[1]; + + friend struct ::TableStruct_flyteidl_2fcore_2ferrors_2eproto; +}; +// ------------------------------------------------------------------- + +class CacheEvictionErrorList final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.core.CacheEvictionErrorList) */ { + public: + CacheEvictionErrorList(); + virtual ~CacheEvictionErrorList(); + + CacheEvictionErrorList(const CacheEvictionErrorList& from); + + inline CacheEvictionErrorList& operator=(const CacheEvictionErrorList& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + CacheEvictionErrorList(CacheEvictionErrorList&& from) noexcept + : CacheEvictionErrorList() { + *this = ::std::move(from); + } + + inline CacheEvictionErrorList& operator=(CacheEvictionErrorList&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const CacheEvictionErrorList& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const CacheEvictionErrorList* internal_default_instance() { + return reinterpret_cast( + &_CacheEvictionErrorList_default_instance_); + } + static constexpr int kIndexInFileMessages = + 3; + + void Swap(CacheEvictionErrorList* other); + friend void swap(CacheEvictionErrorList& a, CacheEvictionErrorList& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline CacheEvictionErrorList* New() const final { + return CreateMaybeMessage(nullptr); + } + + CacheEvictionErrorList* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const CacheEvictionErrorList& from); + void MergeFrom(const CacheEvictionErrorList& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(CacheEvictionErrorList* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .flyteidl.core.CacheEvictionError errors = 1; + int errors_size() const; + void clear_errors(); + static const int kErrorsFieldNumber = 1; + ::flyteidl::core::CacheEvictionError* mutable_errors(int index); + ::google::protobuf::RepeatedPtrField< ::flyteidl::core::CacheEvictionError >* + mutable_errors(); + const ::flyteidl::core::CacheEvictionError& errors(int index) const; + ::flyteidl::core::CacheEvictionError* add_errors(); + const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::CacheEvictionError >& + errors() const; + + // @@protoc_insertion_point(class_scope:flyteidl.core.CacheEvictionErrorList) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::flyteidl::core::CacheEvictionError > errors_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fcore_2ferrors_2eproto; +}; // =================================================================== @@ -580,11 +926,244 @@ inline void ErrorDocument::set_allocated_error(::flyteidl::core::ContainerError* // @@protoc_insertion_point(field_set_allocated:flyteidl.core.ErrorDocument.error) } +// ------------------------------------------------------------------- + +// CacheEvictionError + +// .flyteidl.core.CacheEvictionError.Code code = 1; +inline void CacheEvictionError::clear_code() { + code_ = 0; +} +inline ::flyteidl::core::CacheEvictionError_Code CacheEvictionError::code() const { + // @@protoc_insertion_point(field_get:flyteidl.core.CacheEvictionError.code) + return static_cast< ::flyteidl::core::CacheEvictionError_Code >(code_); +} +inline void CacheEvictionError::set_code(::flyteidl::core::CacheEvictionError_Code value) { + + code_ = value; + // @@protoc_insertion_point(field_set:flyteidl.core.CacheEvictionError.code) +} + +// string message = 2; +inline void CacheEvictionError::clear_message() { + message_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline const ::std::string& CacheEvictionError::message() const { + // @@protoc_insertion_point(field_get:flyteidl.core.CacheEvictionError.message) + return message_.GetNoArena(); +} +inline void CacheEvictionError::set_message(const ::std::string& value) { + + message_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:flyteidl.core.CacheEvictionError.message) +} +#if LANG_CXX11 +inline void CacheEvictionError::set_message(::std::string&& value) { + + message_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:flyteidl.core.CacheEvictionError.message) +} +#endif +inline void CacheEvictionError::set_message(const char* value) { + GOOGLE_DCHECK(value != nullptr); + + message_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:flyteidl.core.CacheEvictionError.message) +} +inline void CacheEvictionError::set_message(const char* value, size_t size) { + + message_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:flyteidl.core.CacheEvictionError.message) +} +inline ::std::string* CacheEvictionError::mutable_message() { + + // @@protoc_insertion_point(field_mutable:flyteidl.core.CacheEvictionError.message) + return message_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline ::std::string* CacheEvictionError::release_message() { + // @@protoc_insertion_point(field_release:flyteidl.core.CacheEvictionError.message) + + return message_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline void CacheEvictionError::set_allocated_message(::std::string* message) { + if (message != nullptr) { + + } else { + + } + message_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), message); + // @@protoc_insertion_point(field_set_allocated:flyteidl.core.CacheEvictionError.message) +} + +// .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; +inline bool CacheEvictionError::has_node_execution_id() const { + return this != internal_default_instance() && node_execution_id_ != nullptr; +} +inline const ::flyteidl::core::NodeExecutionIdentifier& CacheEvictionError::node_execution_id() const { + const ::flyteidl::core::NodeExecutionIdentifier* p = node_execution_id_; + // @@protoc_insertion_point(field_get:flyteidl.core.CacheEvictionError.node_execution_id) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_NodeExecutionIdentifier_default_instance_); +} +inline ::flyteidl::core::NodeExecutionIdentifier* CacheEvictionError::release_node_execution_id() { + // @@protoc_insertion_point(field_release:flyteidl.core.CacheEvictionError.node_execution_id) + + ::flyteidl::core::NodeExecutionIdentifier* temp = node_execution_id_; + node_execution_id_ = nullptr; + return temp; +} +inline ::flyteidl::core::NodeExecutionIdentifier* CacheEvictionError::mutable_node_execution_id() { + + if (node_execution_id_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::NodeExecutionIdentifier>(GetArenaNoVirtual()); + node_execution_id_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.core.CacheEvictionError.node_execution_id) + return node_execution_id_; +} +inline void CacheEvictionError::set_allocated_node_execution_id(::flyteidl::core::NodeExecutionIdentifier* node_execution_id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(node_execution_id_); + } + if (node_execution_id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + node_execution_id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, node_execution_id, submessage_arena); + } + + } else { + + } + node_execution_id_ = node_execution_id; + // @@protoc_insertion_point(field_set_allocated:flyteidl.core.CacheEvictionError.node_execution_id) +} + +// .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; +inline bool CacheEvictionError::has_task_execution_id() const { + return source_case() == kTaskExecutionId; +} +inline void CacheEvictionError::set_has_task_execution_id() { + _oneof_case_[0] = kTaskExecutionId; +} +inline ::flyteidl::core::TaskExecutionIdentifier* CacheEvictionError::release_task_execution_id() { + // @@protoc_insertion_point(field_release:flyteidl.core.CacheEvictionError.task_execution_id) + if (has_task_execution_id()) { + clear_has_source(); + ::flyteidl::core::TaskExecutionIdentifier* temp = source_.task_execution_id_; + source_.task_execution_id_ = nullptr; + return temp; + } else { + return nullptr; + } +} +inline const ::flyteidl::core::TaskExecutionIdentifier& CacheEvictionError::task_execution_id() const { + // @@protoc_insertion_point(field_get:flyteidl.core.CacheEvictionError.task_execution_id) + return has_task_execution_id() + ? *source_.task_execution_id_ + : *reinterpret_cast< ::flyteidl::core::TaskExecutionIdentifier*>(&::flyteidl::core::_TaskExecutionIdentifier_default_instance_); +} +inline ::flyteidl::core::TaskExecutionIdentifier* CacheEvictionError::mutable_task_execution_id() { + if (!has_task_execution_id()) { + clear_source(); + set_has_task_execution_id(); + source_.task_execution_id_ = CreateMaybeMessage< ::flyteidl::core::TaskExecutionIdentifier >( + GetArenaNoVirtual()); + } + // @@protoc_insertion_point(field_mutable:flyteidl.core.CacheEvictionError.task_execution_id) + return source_.task_execution_id_; +} + +// .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; +inline bool CacheEvictionError::has_workflow_execution_id() const { + return source_case() == kWorkflowExecutionId; +} +inline void CacheEvictionError::set_has_workflow_execution_id() { + _oneof_case_[0] = kWorkflowExecutionId; +} +inline ::flyteidl::core::WorkflowExecutionIdentifier* CacheEvictionError::release_workflow_execution_id() { + // @@protoc_insertion_point(field_release:flyteidl.core.CacheEvictionError.workflow_execution_id) + if (has_workflow_execution_id()) { + clear_has_source(); + ::flyteidl::core::WorkflowExecutionIdentifier* temp = source_.workflow_execution_id_; + source_.workflow_execution_id_ = nullptr; + return temp; + } else { + return nullptr; + } +} +inline const ::flyteidl::core::WorkflowExecutionIdentifier& CacheEvictionError::workflow_execution_id() const { + // @@protoc_insertion_point(field_get:flyteidl.core.CacheEvictionError.workflow_execution_id) + return has_workflow_execution_id() + ? *source_.workflow_execution_id_ + : *reinterpret_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>(&::flyteidl::core::_WorkflowExecutionIdentifier_default_instance_); +} +inline ::flyteidl::core::WorkflowExecutionIdentifier* CacheEvictionError::mutable_workflow_execution_id() { + if (!has_workflow_execution_id()) { + clear_source(); + set_has_workflow_execution_id(); + source_.workflow_execution_id_ = CreateMaybeMessage< ::flyteidl::core::WorkflowExecutionIdentifier >( + GetArenaNoVirtual()); + } + // @@protoc_insertion_point(field_mutable:flyteidl.core.CacheEvictionError.workflow_execution_id) + return source_.workflow_execution_id_; +} + +inline bool CacheEvictionError::has_source() const { + return source_case() != SOURCE_NOT_SET; +} +inline void CacheEvictionError::clear_has_source() { + _oneof_case_[0] = SOURCE_NOT_SET; +} +inline CacheEvictionError::SourceCase CacheEvictionError::source_case() const { + return CacheEvictionError::SourceCase(_oneof_case_[0]); +} +// ------------------------------------------------------------------- + +// CacheEvictionErrorList + +// repeated .flyteidl.core.CacheEvictionError errors = 1; +inline int CacheEvictionErrorList::errors_size() const { + return errors_.size(); +} +inline void CacheEvictionErrorList::clear_errors() { + errors_.Clear(); +} +inline ::flyteidl::core::CacheEvictionError* CacheEvictionErrorList::mutable_errors(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.core.CacheEvictionErrorList.errors) + return errors_.Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField< ::flyteidl::core::CacheEvictionError >* +CacheEvictionErrorList::mutable_errors() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.core.CacheEvictionErrorList.errors) + return &errors_; +} +inline const ::flyteidl::core::CacheEvictionError& CacheEvictionErrorList::errors(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.core.CacheEvictionErrorList.errors) + return errors_.Get(index); +} +inline ::flyteidl::core::CacheEvictionError* CacheEvictionErrorList::add_errors() { + // @@protoc_insertion_point(field_add:flyteidl.core.CacheEvictionErrorList.errors) + return errors_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::CacheEvictionError >& +CacheEvictionErrorList::errors() const { + // @@protoc_insertion_point(field_list:flyteidl.core.CacheEvictionErrorList.errors) + return errors_; +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) @@ -599,6 +1178,11 @@ template <> inline const EnumDescriptor* GetEnumDescriptor< ::flyteidl::core::ContainerError_Kind>() { return ::flyteidl::core::ContainerError_Kind_descriptor(); } +template <> struct is_proto_enum< ::flyteidl::core::CacheEvictionError_Code> : ::std::true_type {}; +template <> +inline const EnumDescriptor* GetEnumDescriptor< ::flyteidl::core::CacheEvictionError_Code>() { + return ::flyteidl::core::CacheEvictionError_Code_descriptor(); +} } // namespace protobuf } // namespace google diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc index e3d019e881..295f6c569a 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc @@ -56,6 +56,7 @@ static const char* AdminService_method_names[] = { "/flyteidl.service.AdminService/GetTaskExecution", "/flyteidl.service.AdminService/ListTaskExecutions", "/flyteidl.service.AdminService/GetTaskExecutionData", + "/flyteidl.service.AdminService/UpdateTaskExecution", "/flyteidl.service.AdminService/UpdateProjectDomainAttributes", "/flyteidl.service.AdminService/GetProjectDomainAttributes", "/flyteidl.service.AdminService/DeleteProjectDomainAttributes", @@ -117,22 +118,23 @@ AdminService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& chann , rpcmethod_GetTaskExecution_(AdminService_method_names[33], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_ListTaskExecutions_(AdminService_method_names[34], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_GetTaskExecutionData_(AdminService_method_names[35], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateProjectDomainAttributes_(AdminService_method_names[36], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetProjectDomainAttributes_(AdminService_method_names[37], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_DeleteProjectDomainAttributes_(AdminService_method_names[38], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateProjectAttributes_(AdminService_method_names[39], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetProjectAttributes_(AdminService_method_names[40], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_DeleteProjectAttributes_(AdminService_method_names[41], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateWorkflowAttributes_(AdminService_method_names[42], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetWorkflowAttributes_(AdminService_method_names[43], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_DeleteWorkflowAttributes_(AdminService_method_names[44], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ListMatchableAttributes_(AdminService_method_names[45], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ListNamedEntities_(AdminService_method_names[46], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetNamedEntity_(AdminService_method_names[47], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateNamedEntity_(AdminService_method_names[48], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetVersion_(AdminService_method_names[49], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetDescriptionEntity_(AdminService_method_names[50], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ListDescriptionEntities_(AdminService_method_names[51], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateTaskExecution_(AdminService_method_names[36], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateProjectDomainAttributes_(AdminService_method_names[37], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetProjectDomainAttributes_(AdminService_method_names[38], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteProjectDomainAttributes_(AdminService_method_names[39], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateProjectAttributes_(AdminService_method_names[40], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetProjectAttributes_(AdminService_method_names[41], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteProjectAttributes_(AdminService_method_names[42], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateWorkflowAttributes_(AdminService_method_names[43], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetWorkflowAttributes_(AdminService_method_names[44], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteWorkflowAttributes_(AdminService_method_names[45], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListMatchableAttributes_(AdminService_method_names[46], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListNamedEntities_(AdminService_method_names[47], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetNamedEntity_(AdminService_method_names[48], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateNamedEntity_(AdminService_method_names[49], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetVersion_(AdminService_method_names[50], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetDescriptionEntity_(AdminService_method_names[51], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListDescriptionEntities_(AdminService_method_names[52], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} ::grpc::Status AdminService::Stub::CreateTask(::grpc::ClientContext* context, const ::flyteidl::admin::TaskCreateRequest& request, ::flyteidl::admin::TaskCreateResponse* response) { @@ -1143,6 +1145,34 @@ ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataRespon return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::TaskExecutionGetDataResponse>::Create(channel_.get(), cq, rpcmethod_GetTaskExecutionData_, context, request, false); } +::grpc::Status AdminService::Stub::UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_UpdateTaskExecution_, context, request, response); +} + +void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, std::move(f)); +} + +void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, std::move(f)); +} + +void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, reactor); +} + +void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* AdminService::Stub::AsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::TaskExecutionUpdateResponse>::Create(channel_.get(), cq, rpcmethod_UpdateTaskExecution_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* AdminService::Stub::PrepareAsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::TaskExecutionUpdateResponse>::Create(channel_.get(), cq, rpcmethod_UpdateTaskExecution_, context, request, false); +} + ::grpc::Status AdminService::Stub::UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) { return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_UpdateProjectDomainAttributes_, context, request, response); } @@ -1775,80 +1805,85 @@ AdminService::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( AdminService_method_names[36], ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>( + std::mem_fn(&AdminService::Service::UpdateTaskExecution), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + AdminService_method_names[37], + ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateProjectDomainAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[37], + AdminService_method_names[38], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>( std::mem_fn(&AdminService::Service::GetProjectDomainAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[38], + AdminService_method_names[39], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>( std::mem_fn(&AdminService::Service::DeleteProjectDomainAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[39], + AdminService_method_names[40], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateProjectAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[40], + AdminService_method_names[41], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>( std::mem_fn(&AdminService::Service::GetProjectAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[41], + AdminService_method_names[42], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>( std::mem_fn(&AdminService::Service::DeleteProjectAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[42], + AdminService_method_names[43], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateWorkflowAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[43], + AdminService_method_names[44], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>( std::mem_fn(&AdminService::Service::GetWorkflowAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[44], + AdminService_method_names[45], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>( std::mem_fn(&AdminService::Service::DeleteWorkflowAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[45], + AdminService_method_names[46], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>( std::mem_fn(&AdminService::Service::ListMatchableAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[46], + AdminService_method_names[47], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>( std::mem_fn(&AdminService::Service::ListNamedEntities), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[47], + AdminService_method_names[48], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>( std::mem_fn(&AdminService::Service::GetNamedEntity), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[48], + AdminService_method_names[49], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateNamedEntity), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[49], + AdminService_method_names[50], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>( std::mem_fn(&AdminService::Service::GetVersion), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[50], + AdminService_method_names[51], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>( std::mem_fn(&AdminService::Service::GetDescriptionEntity), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[51], + AdminService_method_names[52], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>( std::mem_fn(&AdminService::Service::ListDescriptionEntities), this))); @@ -2109,6 +2144,13 @@ ::grpc::Status AdminService::Service::GetTaskExecutionData(::grpc::ServerContext return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } +::grpc::Status AdminService::Service::UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + ::grpc::Status AdminService::Service::UpdateProjectDomainAttributes(::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) { (void) context; (void) request; diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h index 57ff8aa599..6eb63a088b 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h @@ -344,6 +344,14 @@ class AdminService final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>> PrepareAsyncGetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>>(PrepareAsyncGetTaskExecutionDataRaw(context, request, cq)); } + // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>> AsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>>(AsyncUpdateTaskExecutionRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>> PrepareAsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>>(PrepareAsyncUpdateTaskExecutionRaw(context, request, cq)); + } // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. virtual ::grpc::Status UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) = 0; std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>> AsyncUpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) { @@ -660,6 +668,11 @@ class AdminService final { virtual void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, std::function) = 0; virtual void GetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) = 0; + virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) = 0; + virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. virtual void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) = 0; virtual void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) = 0; @@ -814,6 +827,8 @@ class AdminService final { virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionList>* PrepareAsyncListTaskExecutionsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionListRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>* AsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>* PrepareAsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>* AsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>* PrepareAsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* AsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* PrepareAsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesGetResponse>* AsyncGetProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesGetRequest& request, ::grpc::CompletionQueue* cq) = 0; @@ -1102,6 +1117,13 @@ class AdminService final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>> PrepareAsyncGetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>>(PrepareAsyncGetTaskExecutionDataRaw(context, request, cq)); } + ::grpc::Status UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>> AsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>>(AsyncUpdateTaskExecutionRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>> PrepareAsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>>(PrepareAsyncUpdateTaskExecutionRaw(context, request, cq)); + } ::grpc::Status UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) override; std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>> AsyncUpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>>(AsyncUpdateProjectDomainAttributesRaw(context, request, cq)); @@ -1361,6 +1383,10 @@ class AdminService final { void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, std::function) override; void GetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) override; + void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) override; + void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) override; void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) override; void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; @@ -1508,6 +1534,8 @@ class AdminService final { ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionList>* PrepareAsyncListTaskExecutionsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionListRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>* AsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>* PrepareAsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* AsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* PrepareAsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* AsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* PrepareAsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesGetResponse>* AsyncGetProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesGetRequest& request, ::grpc::CompletionQueue* cq) override; @@ -1576,6 +1604,7 @@ class AdminService final { const ::grpc::internal::RpcMethod rpcmethod_GetTaskExecution_; const ::grpc::internal::RpcMethod rpcmethod_ListTaskExecutions_; const ::grpc::internal::RpcMethod rpcmethod_GetTaskExecutionData_; + const ::grpc::internal::RpcMethod rpcmethod_UpdateTaskExecution_; const ::grpc::internal::RpcMethod rpcmethod_UpdateProjectDomainAttributes_; const ::grpc::internal::RpcMethod rpcmethod_GetProjectDomainAttributes_; const ::grpc::internal::RpcMethod rpcmethod_DeleteProjectDomainAttributes_; @@ -1677,6 +1706,8 @@ class AdminService final { virtual ::grpc::Status ListTaskExecutions(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionListRequest* request, ::flyteidl::admin::TaskExecutionList* response); // Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. virtual ::grpc::Status GetTaskExecutionData(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response); + // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response); // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. virtual ::grpc::Status UpdateProjectDomainAttributes(::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response); // Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. @@ -2430,12 +2461,32 @@ class AdminService final { } }; template + class WithAsyncMethod_UpdateTaskExecution : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_UpdateTaskExecution() { + ::grpc::Service::MarkMethodAsync(36); + } + ~WithAsyncMethod_UpdateTaskExecution() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestUpdateTaskExecution(::grpc::ServerContext* context, ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::TaskExecutionUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template class WithAsyncMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodAsync(36); + ::grpc::Service::MarkMethodAsync(37); } ~WithAsyncMethod_UpdateProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2446,7 +2497,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectDomainAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2455,7 +2506,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodAsync(37); + ::grpc::Service::MarkMethodAsync(38); } ~WithAsyncMethod_GetProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2466,7 +2517,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectDomainAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectDomainAttributesGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectDomainAttributesGetResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2475,7 +2526,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodAsync(38); + ::grpc::Service::MarkMethodAsync(39); } ~WithAsyncMethod_DeleteProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2486,7 +2537,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectDomainAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectDomainAttributesDeleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2495,7 +2546,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodAsync(39); + ::grpc::Service::MarkMethodAsync(40); } ~WithAsyncMethod_UpdateProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2506,7 +2557,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectAttributesUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectAttributesUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2515,7 +2566,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodAsync(40); + ::grpc::Service::MarkMethodAsync(41); } ~WithAsyncMethod_GetProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2526,7 +2577,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectAttributesGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectAttributesGetResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2535,7 +2586,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodAsync(41); + ::grpc::Service::MarkMethodAsync(42); } ~WithAsyncMethod_DeleteProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2546,7 +2597,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectAttributesDeleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectAttributesDeleteResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2555,7 +2606,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodAsync(42); + ::grpc::Service::MarkMethodAsync(43); } ~WithAsyncMethod_UpdateWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2566,7 +2617,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateWorkflowAttributes(::grpc::ServerContext* context, ::flyteidl::admin::WorkflowAttributesUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::WorkflowAttributesUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2575,7 +2626,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodAsync(43); + ::grpc::Service::MarkMethodAsync(44); } ~WithAsyncMethod_GetWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2586,7 +2637,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetWorkflowAttributes(::grpc::ServerContext* context, ::flyteidl::admin::WorkflowAttributesGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::WorkflowAttributesGetResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2595,7 +2646,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodAsync(44); + ::grpc::Service::MarkMethodAsync(45); } ~WithAsyncMethod_DeleteWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2606,7 +2657,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteWorkflowAttributes(::grpc::ServerContext* context, ::flyteidl::admin::WorkflowAttributesDeleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::WorkflowAttributesDeleteResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2615,7 +2666,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodAsync(45); + ::grpc::Service::MarkMethodAsync(46); } ~WithAsyncMethod_ListMatchableAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2626,7 +2677,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListMatchableAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ListMatchableAttributesRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ListMatchableAttributesResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2635,7 +2686,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodAsync(46); + ::grpc::Service::MarkMethodAsync(47); } ~WithAsyncMethod_ListNamedEntities() override { BaseClassMustBeDerivedFromService(this); @@ -2646,7 +2697,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListNamedEntities(::grpc::ServerContext* context, ::flyteidl::admin::NamedEntityListRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::NamedEntityList>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2655,7 +2706,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodAsync(47); + ::grpc::Service::MarkMethodAsync(48); } ~WithAsyncMethod_GetNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -2666,7 +2717,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetNamedEntity(::grpc::ServerContext* context, ::flyteidl::admin::NamedEntityGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::NamedEntity>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2675,7 +2726,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodAsync(48); + ::grpc::Service::MarkMethodAsync(49); } ~WithAsyncMethod_UpdateNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -2686,7 +2737,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateNamedEntity(::grpc::ServerContext* context, ::flyteidl::admin::NamedEntityUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::NamedEntityUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2695,7 +2746,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetVersion() { - ::grpc::Service::MarkMethodAsync(49); + ::grpc::Service::MarkMethodAsync(50); } ~WithAsyncMethod_GetVersion() override { BaseClassMustBeDerivedFromService(this); @@ -2706,7 +2757,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetVersion(::grpc::ServerContext* context, ::flyteidl::admin::GetVersionRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::GetVersionResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2715,7 +2766,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodAsync(50); + ::grpc::Service::MarkMethodAsync(51); } ~WithAsyncMethod_GetDescriptionEntity() override { BaseClassMustBeDerivedFromService(this); @@ -2726,7 +2777,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetDescriptionEntity(::grpc::ServerContext* context, ::flyteidl::admin::ObjectGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::DescriptionEntity>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2735,7 +2786,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodAsync(51); + ::grpc::Service::MarkMethodAsync(52); } ~WithAsyncMethod_ListDescriptionEntities() override { BaseClassMustBeDerivedFromService(this); @@ -2746,10 +2797,10 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListDescriptionEntities(::grpc::ServerContext* context, ::flyteidl::admin::DescriptionEntityListRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::DescriptionEntityList>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(52, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService; + typedef WithAsyncMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService; template class ExperimentalWithCallbackMethod_CreateTask : public BaseClass { private: @@ -3867,12 +3918,43 @@ class AdminService final { virtual void GetTaskExecutionData(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithCallbackMethod_UpdateTaskExecution : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_UpdateTaskExecution() { + ::grpc::Service::experimental().MarkMethodCallback(36, + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>( + [this](::grpc::ServerContext* context, + const ::flyteidl::admin::TaskExecutionUpdateRequest* request, + ::flyteidl::admin::TaskExecutionUpdateResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->UpdateTaskExecution(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_UpdateTaskExecution( + ::grpc::experimental::MessageAllocator< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>*>( + ::grpc::Service::experimental().GetHandler(36)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_UpdateTaskExecution() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithCallbackMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(36, + ::grpc::Service::experimental().MarkMethodCallback(37, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, @@ -3884,7 +3966,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateProjectDomainAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(36)) + ::grpc::Service::experimental().GetHandler(37)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateProjectDomainAttributes() override { @@ -3903,7 +3985,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(37, + ::grpc::Service::experimental().MarkMethodCallback(38, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesGetRequest* request, @@ -3915,7 +3997,7 @@ class AdminService final { void SetMessageAllocatorFor_GetProjectDomainAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>*>( - ::grpc::Service::experimental().GetHandler(37)) + ::grpc::Service::experimental().GetHandler(38)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetProjectDomainAttributes() override { @@ -3934,7 +4016,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(38, + ::grpc::Service::experimental().MarkMethodCallback(39, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesDeleteRequest* request, @@ -3946,7 +4028,7 @@ class AdminService final { void SetMessageAllocatorFor_DeleteProjectDomainAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>*>( - ::grpc::Service::experimental().GetHandler(38)) + ::grpc::Service::experimental().GetHandler(39)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_DeleteProjectDomainAttributes() override { @@ -3965,7 +4047,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateProjectAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(39, + ::grpc::Service::experimental().MarkMethodCallback(40, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectAttributesUpdateRequest* request, @@ -3977,7 +4059,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateProjectAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(39)) + ::grpc::Service::experimental().GetHandler(40)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateProjectAttributes() override { @@ -3996,7 +4078,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetProjectAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(40, + ::grpc::Service::experimental().MarkMethodCallback(41, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectAttributesGetRequest* request, @@ -4008,7 +4090,7 @@ class AdminService final { void SetMessageAllocatorFor_GetProjectAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>*>( - ::grpc::Service::experimental().GetHandler(40)) + ::grpc::Service::experimental().GetHandler(41)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetProjectAttributes() override { @@ -4027,7 +4109,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_DeleteProjectAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(41, + ::grpc::Service::experimental().MarkMethodCallback(42, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectAttributesDeleteRequest* request, @@ -4039,7 +4121,7 @@ class AdminService final { void SetMessageAllocatorFor_DeleteProjectAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>*>( - ::grpc::Service::experimental().GetHandler(41)) + ::grpc::Service::experimental().GetHandler(42)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_DeleteProjectAttributes() override { @@ -4058,7 +4140,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(42, + ::grpc::Service::experimental().MarkMethodCallback(43, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::WorkflowAttributesUpdateRequest* request, @@ -4070,7 +4152,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateWorkflowAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(42)) + ::grpc::Service::experimental().GetHandler(43)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateWorkflowAttributes() override { @@ -4089,7 +4171,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(43, + ::grpc::Service::experimental().MarkMethodCallback(44, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::WorkflowAttributesGetRequest* request, @@ -4101,7 +4183,7 @@ class AdminService final { void SetMessageAllocatorFor_GetWorkflowAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>*>( - ::grpc::Service::experimental().GetHandler(43)) + ::grpc::Service::experimental().GetHandler(44)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetWorkflowAttributes() override { @@ -4120,7 +4202,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_DeleteWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(44, + ::grpc::Service::experimental().MarkMethodCallback(45, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::WorkflowAttributesDeleteRequest* request, @@ -4132,7 +4214,7 @@ class AdminService final { void SetMessageAllocatorFor_DeleteWorkflowAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>*>( - ::grpc::Service::experimental().GetHandler(44)) + ::grpc::Service::experimental().GetHandler(45)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_DeleteWorkflowAttributes() override { @@ -4151,7 +4233,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ListMatchableAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(45, + ::grpc::Service::experimental().MarkMethodCallback(46, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ListMatchableAttributesRequest* request, @@ -4163,7 +4245,7 @@ class AdminService final { void SetMessageAllocatorFor_ListMatchableAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>*>( - ::grpc::Service::experimental().GetHandler(45)) + ::grpc::Service::experimental().GetHandler(46)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ListMatchableAttributes() override { @@ -4182,7 +4264,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ListNamedEntities() { - ::grpc::Service::experimental().MarkMethodCallback(46, + ::grpc::Service::experimental().MarkMethodCallback(47, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::NamedEntityListRequest* request, @@ -4194,7 +4276,7 @@ class AdminService final { void SetMessageAllocatorFor_ListNamedEntities( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>*>( - ::grpc::Service::experimental().GetHandler(46)) + ::grpc::Service::experimental().GetHandler(47)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ListNamedEntities() override { @@ -4213,7 +4295,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetNamedEntity() { - ::grpc::Service::experimental().MarkMethodCallback(47, + ::grpc::Service::experimental().MarkMethodCallback(48, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::NamedEntityGetRequest* request, @@ -4225,7 +4307,7 @@ class AdminService final { void SetMessageAllocatorFor_GetNamedEntity( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>*>( - ::grpc::Service::experimental().GetHandler(47)) + ::grpc::Service::experimental().GetHandler(48)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetNamedEntity() override { @@ -4244,7 +4326,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateNamedEntity() { - ::grpc::Service::experimental().MarkMethodCallback(48, + ::grpc::Service::experimental().MarkMethodCallback(49, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::NamedEntityUpdateRequest* request, @@ -4256,7 +4338,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateNamedEntity( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(48)) + ::grpc::Service::experimental().GetHandler(49)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateNamedEntity() override { @@ -4275,7 +4357,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetVersion() { - ::grpc::Service::experimental().MarkMethodCallback(49, + ::grpc::Service::experimental().MarkMethodCallback(50, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::GetVersionRequest* request, @@ -4287,7 +4369,7 @@ class AdminService final { void SetMessageAllocatorFor_GetVersion( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>*>( - ::grpc::Service::experimental().GetHandler(49)) + ::grpc::Service::experimental().GetHandler(50)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetVersion() override { @@ -4306,7 +4388,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetDescriptionEntity() { - ::grpc::Service::experimental().MarkMethodCallback(50, + ::grpc::Service::experimental().MarkMethodCallback(51, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ObjectGetRequest* request, @@ -4318,7 +4400,7 @@ class AdminService final { void SetMessageAllocatorFor_GetDescriptionEntity( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>*>( - ::grpc::Service::experimental().GetHandler(50)) + ::grpc::Service::experimental().GetHandler(51)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetDescriptionEntity() override { @@ -4337,7 +4419,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ListDescriptionEntities() { - ::grpc::Service::experimental().MarkMethodCallback(51, + ::grpc::Service::experimental().MarkMethodCallback(52, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::DescriptionEntityListRequest* request, @@ -4349,7 +4431,7 @@ class AdminService final { void SetMessageAllocatorFor_ListDescriptionEntities( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>*>( - ::grpc::Service::experimental().GetHandler(51)) + ::grpc::Service::experimental().GetHandler(52)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ListDescriptionEntities() override { @@ -4362,7 +4444,7 @@ class AdminService final { } virtual void ListDescriptionEntities(::grpc::ServerContext* context, const ::flyteidl::admin::DescriptionEntityListRequest* request, ::flyteidl::admin::DescriptionEntityList* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; - typedef ExperimentalWithCallbackMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ExperimentalCallbackService; + typedef ExperimentalWithCallbackMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ExperimentalCallbackService; template class WithGenericMethod_CreateTask : public BaseClass { private: @@ -4976,12 +5058,29 @@ class AdminService final { } }; template + class WithGenericMethod_UpdateTaskExecution : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_UpdateTaskExecution() { + ::grpc::Service::MarkMethodGeneric(36); + } + ~WithGenericMethod_UpdateTaskExecution() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template class WithGenericMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodGeneric(36); + ::grpc::Service::MarkMethodGeneric(37); } ~WithGenericMethod_UpdateProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -4998,7 +5097,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodGeneric(37); + ::grpc::Service::MarkMethodGeneric(38); } ~WithGenericMethod_GetProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5015,7 +5114,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodGeneric(38); + ::grpc::Service::MarkMethodGeneric(39); } ~WithGenericMethod_DeleteProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5032,7 +5131,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodGeneric(39); + ::grpc::Service::MarkMethodGeneric(40); } ~WithGenericMethod_UpdateProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5049,7 +5148,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodGeneric(40); + ::grpc::Service::MarkMethodGeneric(41); } ~WithGenericMethod_GetProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5066,7 +5165,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodGeneric(41); + ::grpc::Service::MarkMethodGeneric(42); } ~WithGenericMethod_DeleteProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5083,7 +5182,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodGeneric(42); + ::grpc::Service::MarkMethodGeneric(43); } ~WithGenericMethod_UpdateWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5100,7 +5199,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodGeneric(43); + ::grpc::Service::MarkMethodGeneric(44); } ~WithGenericMethod_GetWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5117,7 +5216,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodGeneric(44); + ::grpc::Service::MarkMethodGeneric(45); } ~WithGenericMethod_DeleteWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5134,7 +5233,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodGeneric(45); + ::grpc::Service::MarkMethodGeneric(46); } ~WithGenericMethod_ListMatchableAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5151,7 +5250,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodGeneric(46); + ::grpc::Service::MarkMethodGeneric(47); } ~WithGenericMethod_ListNamedEntities() override { BaseClassMustBeDerivedFromService(this); @@ -5168,7 +5267,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodGeneric(47); + ::grpc::Service::MarkMethodGeneric(48); } ~WithGenericMethod_GetNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -5185,7 +5284,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodGeneric(48); + ::grpc::Service::MarkMethodGeneric(49); } ~WithGenericMethod_UpdateNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -5202,7 +5301,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetVersion() { - ::grpc::Service::MarkMethodGeneric(49); + ::grpc::Service::MarkMethodGeneric(50); } ~WithGenericMethod_GetVersion() override { BaseClassMustBeDerivedFromService(this); @@ -5219,7 +5318,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodGeneric(50); + ::grpc::Service::MarkMethodGeneric(51); } ~WithGenericMethod_GetDescriptionEntity() override { BaseClassMustBeDerivedFromService(this); @@ -5236,7 +5335,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodGeneric(51); + ::grpc::Service::MarkMethodGeneric(52); } ~WithGenericMethod_ListDescriptionEntities() override { BaseClassMustBeDerivedFromService(this); @@ -5968,12 +6067,32 @@ class AdminService final { } }; template + class WithRawMethod_UpdateTaskExecution : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_UpdateTaskExecution() { + ::grpc::Service::MarkMethodRaw(36); + } + ~WithRawMethod_UpdateTaskExecution() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestUpdateTaskExecution(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template class WithRawMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodRaw(36); + ::grpc::Service::MarkMethodRaw(37); } ~WithRawMethod_UpdateProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5984,7 +6103,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectDomainAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -5993,7 +6112,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodRaw(37); + ::grpc::Service::MarkMethodRaw(38); } ~WithRawMethod_GetProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6004,7 +6123,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectDomainAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6013,7 +6132,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodRaw(38); + ::grpc::Service::MarkMethodRaw(39); } ~WithRawMethod_DeleteProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6024,7 +6143,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectDomainAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6033,7 +6152,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodRaw(39); + ::grpc::Service::MarkMethodRaw(40); } ~WithRawMethod_UpdateProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6044,7 +6163,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6053,7 +6172,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodRaw(40); + ::grpc::Service::MarkMethodRaw(41); } ~WithRawMethod_GetProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6064,7 +6183,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6073,7 +6192,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodRaw(41); + ::grpc::Service::MarkMethodRaw(42); } ~WithRawMethod_DeleteProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6084,7 +6203,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6093,7 +6212,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodRaw(42); + ::grpc::Service::MarkMethodRaw(43); } ~WithRawMethod_UpdateWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6104,7 +6223,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateWorkflowAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6113,7 +6232,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodRaw(43); + ::grpc::Service::MarkMethodRaw(44); } ~WithRawMethod_GetWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6124,7 +6243,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetWorkflowAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6133,7 +6252,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodRaw(44); + ::grpc::Service::MarkMethodRaw(45); } ~WithRawMethod_DeleteWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6144,7 +6263,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteWorkflowAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6153,7 +6272,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodRaw(45); + ::grpc::Service::MarkMethodRaw(46); } ~WithRawMethod_ListMatchableAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6164,7 +6283,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListMatchableAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6173,7 +6292,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodRaw(46); + ::grpc::Service::MarkMethodRaw(47); } ~WithRawMethod_ListNamedEntities() override { BaseClassMustBeDerivedFromService(this); @@ -6184,7 +6303,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListNamedEntities(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6193,7 +6312,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodRaw(47); + ::grpc::Service::MarkMethodRaw(48); } ~WithRawMethod_GetNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -6204,7 +6323,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetNamedEntity(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6213,7 +6332,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodRaw(48); + ::grpc::Service::MarkMethodRaw(49); } ~WithRawMethod_UpdateNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -6224,7 +6343,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateNamedEntity(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6233,7 +6352,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetVersion() { - ::grpc::Service::MarkMethodRaw(49); + ::grpc::Service::MarkMethodRaw(50); } ~WithRawMethod_GetVersion() override { BaseClassMustBeDerivedFromService(this); @@ -6244,7 +6363,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetVersion(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6253,7 +6372,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodRaw(50); + ::grpc::Service::MarkMethodRaw(51); } ~WithRawMethod_GetDescriptionEntity() override { BaseClassMustBeDerivedFromService(this); @@ -6264,7 +6383,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetDescriptionEntity(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6273,7 +6392,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodRaw(51); + ::grpc::Service::MarkMethodRaw(52); } ~WithRawMethod_ListDescriptionEntities() override { BaseClassMustBeDerivedFromService(this); @@ -6284,7 +6403,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListDescriptionEntities(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(52, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -7188,12 +7307,37 @@ class AdminService final { virtual void GetTaskExecutionData(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithRawCallbackMethod_UpdateTaskExecution : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_UpdateTaskExecution() { + ::grpc::Service::experimental().MarkMethodRawCallback(36, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->UpdateTaskExecution(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_UpdateTaskExecution() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void UpdateTaskExecution(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithRawCallbackMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(36, + ::grpc::Service::experimental().MarkMethodRawCallback(37, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7218,7 +7362,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(37, + ::grpc::Service::experimental().MarkMethodRawCallback(38, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7243,7 +7387,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(38, + ::grpc::Service::experimental().MarkMethodRawCallback(39, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7268,7 +7412,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateProjectAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(39, + ::grpc::Service::experimental().MarkMethodRawCallback(40, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7293,7 +7437,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetProjectAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(40, + ::grpc::Service::experimental().MarkMethodRawCallback(41, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7318,7 +7462,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_DeleteProjectAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(41, + ::grpc::Service::experimental().MarkMethodRawCallback(42, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7343,7 +7487,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(42, + ::grpc::Service::experimental().MarkMethodRawCallback(43, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7368,7 +7512,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(43, + ::grpc::Service::experimental().MarkMethodRawCallback(44, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7393,7 +7537,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_DeleteWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(44, + ::grpc::Service::experimental().MarkMethodRawCallback(45, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7418,7 +7562,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ListMatchableAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(45, + ::grpc::Service::experimental().MarkMethodRawCallback(46, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7443,7 +7587,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ListNamedEntities() { - ::grpc::Service::experimental().MarkMethodRawCallback(46, + ::grpc::Service::experimental().MarkMethodRawCallback(47, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7468,7 +7612,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetNamedEntity() { - ::grpc::Service::experimental().MarkMethodRawCallback(47, + ::grpc::Service::experimental().MarkMethodRawCallback(48, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7493,7 +7637,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateNamedEntity() { - ::grpc::Service::experimental().MarkMethodRawCallback(48, + ::grpc::Service::experimental().MarkMethodRawCallback(49, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7518,7 +7662,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetVersion() { - ::grpc::Service::experimental().MarkMethodRawCallback(49, + ::grpc::Service::experimental().MarkMethodRawCallback(50, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7543,7 +7687,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetDescriptionEntity() { - ::grpc::Service::experimental().MarkMethodRawCallback(50, + ::grpc::Service::experimental().MarkMethodRawCallback(51, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7568,7 +7712,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ListDescriptionEntities() { - ::grpc::Service::experimental().MarkMethodRawCallback(51, + ::grpc::Service::experimental().MarkMethodRawCallback(52, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -8308,12 +8452,32 @@ class AdminService final { virtual ::grpc::Status StreamedGetTaskExecutionData(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::TaskExecutionGetDataRequest,::flyteidl::admin::TaskExecutionGetDataResponse>* server_unary_streamer) = 0; }; template + class WithStreamedUnaryMethod_UpdateTaskExecution : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_UpdateTaskExecution() { + ::grpc::Service::MarkMethodStreamed(36, + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateTaskExecution::StreamedUpdateTaskExecution, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_UpdateTaskExecution() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedUpdateTaskExecution(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::TaskExecutionUpdateRequest,::flyteidl::admin::TaskExecutionUpdateResponse>* server_unary_streamer) = 0; + }; + template class WithStreamedUnaryMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodStreamed(36, + ::grpc::Service::MarkMethodStreamed(37, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateProjectDomainAttributes::StreamedUpdateProjectDomainAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateProjectDomainAttributes() override { @@ -8333,7 +8497,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodStreamed(37, + ::grpc::Service::MarkMethodStreamed(38, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>(std::bind(&WithStreamedUnaryMethod_GetProjectDomainAttributes::StreamedGetProjectDomainAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetProjectDomainAttributes() override { @@ -8353,7 +8517,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodStreamed(38, + ::grpc::Service::MarkMethodStreamed(39, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>(std::bind(&WithStreamedUnaryMethod_DeleteProjectDomainAttributes::StreamedDeleteProjectDomainAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_DeleteProjectDomainAttributes() override { @@ -8373,7 +8537,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodStreamed(39, + ::grpc::Service::MarkMethodStreamed(40, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateProjectAttributes::StreamedUpdateProjectAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateProjectAttributes() override { @@ -8393,7 +8557,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodStreamed(40, + ::grpc::Service::MarkMethodStreamed(41, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>(std::bind(&WithStreamedUnaryMethod_GetProjectAttributes::StreamedGetProjectAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetProjectAttributes() override { @@ -8413,7 +8577,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodStreamed(41, + ::grpc::Service::MarkMethodStreamed(42, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>(std::bind(&WithStreamedUnaryMethod_DeleteProjectAttributes::StreamedDeleteProjectAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_DeleteProjectAttributes() override { @@ -8433,7 +8597,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodStreamed(42, + ::grpc::Service::MarkMethodStreamed(43, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateWorkflowAttributes::StreamedUpdateWorkflowAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateWorkflowAttributes() override { @@ -8453,7 +8617,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodStreamed(43, + ::grpc::Service::MarkMethodStreamed(44, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>(std::bind(&WithStreamedUnaryMethod_GetWorkflowAttributes::StreamedGetWorkflowAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetWorkflowAttributes() override { @@ -8473,7 +8637,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodStreamed(44, + ::grpc::Service::MarkMethodStreamed(45, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>(std::bind(&WithStreamedUnaryMethod_DeleteWorkflowAttributes::StreamedDeleteWorkflowAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_DeleteWorkflowAttributes() override { @@ -8493,7 +8657,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodStreamed(45, + ::grpc::Service::MarkMethodStreamed(46, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>(std::bind(&WithStreamedUnaryMethod_ListMatchableAttributes::StreamedListMatchableAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ListMatchableAttributes() override { @@ -8513,7 +8677,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodStreamed(46, + ::grpc::Service::MarkMethodStreamed(47, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>(std::bind(&WithStreamedUnaryMethod_ListNamedEntities::StreamedListNamedEntities, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ListNamedEntities() override { @@ -8533,7 +8697,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodStreamed(47, + ::grpc::Service::MarkMethodStreamed(48, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>(std::bind(&WithStreamedUnaryMethod_GetNamedEntity::StreamedGetNamedEntity, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetNamedEntity() override { @@ -8553,7 +8717,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodStreamed(48, + ::grpc::Service::MarkMethodStreamed(49, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateNamedEntity::StreamedUpdateNamedEntity, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateNamedEntity() override { @@ -8573,7 +8737,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetVersion() { - ::grpc::Service::MarkMethodStreamed(49, + ::grpc::Service::MarkMethodStreamed(50, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>(std::bind(&WithStreamedUnaryMethod_GetVersion::StreamedGetVersion, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetVersion() override { @@ -8593,7 +8757,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodStreamed(50, + ::grpc::Service::MarkMethodStreamed(51, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>(std::bind(&WithStreamedUnaryMethod_GetDescriptionEntity::StreamedGetDescriptionEntity, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetDescriptionEntity() override { @@ -8613,7 +8777,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodStreamed(51, + ::grpc::Service::MarkMethodStreamed(52, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>(std::bind(&WithStreamedUnaryMethod_ListDescriptionEntities::StreamedListDescriptionEntities, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ListDescriptionEntities() override { @@ -8627,9 +8791,9 @@ class AdminService final { // replace default version of method with streamed unary virtual ::grpc::Status StreamedListDescriptionEntities(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::DescriptionEntityListRequest,::flyteidl::admin::DescriptionEntityList>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService; + typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService; typedef Service SplitStreamedService; - typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService; + typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService; }; } // namespace service diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc index 6d96c762a3..7abacc4c30 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc @@ -52,8 +52,8 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto[] = "admin/task_execution.proto\032\034flyteidl/adm" "in/version.proto\032\033flyteidl/admin/common." "proto\032\'flyteidl/admin/description_entity" - ".proto\032\036flyteidl/core/identifier.proto2\274" - "L\n\014AdminService\022m\n\nCreateTask\022!.flyteidl" + ".proto\032\036flyteidl/core/identifier.proto2\323" + "O\n\014AdminService\022m\n\nCreateTask\022!.flyteidl" ".admin.TaskCreateRequest\032\".flyteidl.admi" "n.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/api/v1/ta" "sks:\001*\022\210\001\n\007GetTask\022 .flyteidl.admin.Obje" @@ -221,90 +221,100 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto[] = "cution_id.name}/{id.node_execution_id.no" "de_id}/{id.task_id.project}/{id.task_id." "domain}/{id.task_id.name}/{id.task_id.ve" - "rsion}/{id.retry_attempt}\022\343\001\n\035UpdateProj" - "ectDomainAttributes\0224.flyteidl.admin.Pro" - "jectDomainAttributesUpdateRequest\0325.flyt" - "eidl.admin.ProjectDomainAttributesUpdate" - "Response\"U\202\323\344\223\002O\032J/api/v1/project_domain" - "_attributes/{attributes.project}/{attrib" - "utes.domain}:\001*\022\301\001\n\032GetProjectDomainAttr" - "ibutes\0221.flyteidl.admin.ProjectDomainAtt" - "ributesGetRequest\0322.flyteidl.admin.Proje" - "ctDomainAttributesGetResponse\"<\202\323\344\223\0026\0224/" - "api/v1/project_domain_attributes/{projec" - "t}/{domain}\022\315\001\n\035DeleteProjectDomainAttri" - "butes\0224.flyteidl.admin.ProjectDomainAttr" - "ibutesDeleteRequest\0325.flyteidl.admin.Pro" - "jectDomainAttributesDeleteResponse\"\?\202\323\344\223" - "\0029*4/api/v1/project_domain_attributes/{p" - "roject}/{domain}:\001*\022\266\001\n\027UpdateProjectAtt" - "ributes\022..flyteidl.admin.ProjectAttribut" - "esUpdateRequest\032/.flyteidl.admin.Project" - "AttributesUpdateResponse\":\202\323\344\223\0024\032//api/v" - "1/project_attributes/{attributes.project" - "}:\001*\022\237\001\n\024GetProjectAttributes\022+.flyteidl" - ".admin.ProjectAttributesGetRequest\032,.fly" - "teidl.admin.ProjectAttributesGetResponse" - "\",\202\323\344\223\002&\022$/api/v1/project_attributes/{pr" - "oject}\022\253\001\n\027DeleteProjectAttributes\022..fly" - "teidl.admin.ProjectAttributesDeleteReque" - "st\032/.flyteidl.admin.ProjectAttributesDel" - "eteResponse\"/\202\323\344\223\002)*$/api/v1/project_att" - "ributes/{project}:\001*\022\344\001\n\030UpdateWorkflowA" - "ttributes\022/.flyteidl.admin.WorkflowAttri" - "butesUpdateRequest\0320.flyteidl.admin.Work" - "flowAttributesUpdateResponse\"e\202\323\344\223\002_\032Z/a" - "pi/v1/workflow_attributes/{attributes.pr" - "oject}/{attributes.domain}/{attributes.w" - "orkflow}:\001*\022\267\001\n\025GetWorkflowAttributes\022,." - "flyteidl.admin.WorkflowAttributesGetRequ" - "est\032-.flyteidl.admin.WorkflowAttributesG" - "etResponse\"A\202\323\344\223\002;\0229/api/v1/workflow_att" - "ributes/{project}/{domain}/{workflow}\022\303\001" - "\n\030DeleteWorkflowAttributes\022/.flyteidl.ad" - "min.WorkflowAttributesDeleteRequest\0320.fl" - "yteidl.admin.WorkflowAttributesDeleteRes" - "ponse\"D\202\323\344\223\002>*9/api/v1/workflow_attribut" - "es/{project}/{domain}/{workflow}:\001*\022\240\001\n\027" - "ListMatchableAttributes\022..flyteidl.admin" - ".ListMatchableAttributesRequest\032/.flytei" - "dl.admin.ListMatchableAttributesResponse" - "\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attributes\022\237" - "\001\n\021ListNamedEntities\022&.flyteidl.admin.Na" - "medEntityListRequest\032\037.flyteidl.admin.Na" - "medEntityList\"A\202\323\344\223\002;\0229/api/v1/named_ent" - "ities/{resource_type}/{project}/{domain}" - "\022\247\001\n\016GetNamedEntity\022%.flyteidl.admin.Nam" - "edEntityGetRequest\032\033.flyteidl.admin.Name" - "dEntity\"Q\202\323\344\223\002K\022I/api/v1/named_entities/" - "{resource_type}/{id.project}/{id.domain}" - "/{id.name}\022\276\001\n\021UpdateNamedEntity\022(.flyte" - "idl.admin.NamedEntityUpdateRequest\032).fly" - "teidl.admin.NamedEntityUpdateResponse\"T\202" - "\323\344\223\002N\032I/api/v1/named_entities/{resource_" - "type}/{id.project}/{id.domain}/{id.name}" - ":\001*\022l\n\nGetVersion\022!.flyteidl.admin.GetVe" - "rsionRequest\032\".flyteidl.admin.GetVersion" - "Response\"\027\202\323\344\223\002\021\022\017/api/v1/version\022\304\001\n\024Ge" - "tDescriptionEntity\022 .flyteidl.admin.Obje" - "ctGetRequest\032!.flyteidl.admin.Descriptio" - "nEntity\"g\202\323\344\223\002a\022_/api/v1/description_ent" - "ities/{id.resource_type}/{id.project}/{i" - "d.domain}/{id.name}/{id.version}\022\222\002\n\027Lis" - "tDescriptionEntities\022,.flyteidl.admin.De" - "scriptionEntityListRequest\032%.flyteidl.ad" - "min.DescriptionEntityList\"\241\001\202\323\344\223\002\232\001\022O/ap" - "i/v1/description_entities/{resource_type" - "}/{id.project}/{id.domain}/{id.name}ZG\022E" - "/api/v1/description_entities/{resource_t" - "ype}/{id.project}/{id.domain}B9Z7github." - "com/flyteorg/flyteidl/gen/pb-go/flyteidl" - "/serviceb\006proto3" + "rsion}/{id.retry_attempt}\022\224\003\n\023UpdateTask" + "Execution\022*.flyteidl.admin.TaskExecution" + "UpdateRequest\032+.flyteidl.admin.TaskExecu" + "tionUpdateResponse\"\243\002\202\323\344\223\002\234\002\022\231\002/api/v1/t" + "ask_executions/{id.node_execution_id.exe" + "cution_id.project}/{id.node_execution_id" + ".execution_id.domain}/{id.node_execution" + "_id.execution_id.name}/{id.node_executio" + "n_id.node_id}/{id.task_id.project}/{id.t" + "ask_id.domain}/{id.task_id.name}/{id.tas" + "k_id.version}/{id.retry_attempt}\022\343\001\n\035Upd" + "ateProjectDomainAttributes\0224.flyteidl.ad" + "min.ProjectDomainAttributesUpdateRequest" + "\0325.flyteidl.admin.ProjectDomainAttribute" + "sUpdateResponse\"U\202\323\344\223\002O\032J/api/v1/project" + "_domain_attributes/{attributes.project}/" + "{attributes.domain}:\001*\022\301\001\n\032GetProjectDom" + "ainAttributes\0221.flyteidl.admin.ProjectDo" + "mainAttributesGetRequest\0322.flyteidl.admi" + "n.ProjectDomainAttributesGetResponse\"<\202\323" + "\344\223\0026\0224/api/v1/project_domain_attributes/" + "{project}/{domain}\022\315\001\n\035DeleteProjectDoma" + "inAttributes\0224.flyteidl.admin.ProjectDom" + "ainAttributesDeleteRequest\0325.flyteidl.ad" + "min.ProjectDomainAttributesDeleteRespons" + "e\"\?\202\323\344\223\0029*4/api/v1/project_domain_attrib" + "utes/{project}/{domain}:\001*\022\266\001\n\027UpdatePro" + "jectAttributes\022..flyteidl.admin.ProjectA" + "ttributesUpdateRequest\032/.flyteidl.admin." + "ProjectAttributesUpdateResponse\":\202\323\344\223\0024\032" + "//api/v1/project_attributes/{attributes." + "project}:\001*\022\237\001\n\024GetProjectAttributes\022+.f" + "lyteidl.admin.ProjectAttributesGetReques" + "t\032,.flyteidl.admin.ProjectAttributesGetR" + "esponse\",\202\323\344\223\002&\022$/api/v1/project_attribu" + "tes/{project}\022\253\001\n\027DeleteProjectAttribute" + "s\022..flyteidl.admin.ProjectAttributesDele" + "teRequest\032/.flyteidl.admin.ProjectAttrib" + "utesDeleteResponse\"/\202\323\344\223\002)*$/api/v1/proj" + "ect_attributes/{project}:\001*\022\344\001\n\030UpdateWo" + "rkflowAttributes\022/.flyteidl.admin.Workfl" + "owAttributesUpdateRequest\0320.flyteidl.adm" + "in.WorkflowAttributesUpdateResponse\"e\202\323\344" + "\223\002_\032Z/api/v1/workflow_attributes/{attrib" + "utes.project}/{attributes.domain}/{attri" + "butes.workflow}:\001*\022\267\001\n\025GetWorkflowAttrib" + "utes\022,.flyteidl.admin.WorkflowAttributes" + "GetRequest\032-.flyteidl.admin.WorkflowAttr" + "ibutesGetResponse\"A\202\323\344\223\002;\0229/api/v1/workf" + "low_attributes/{project}/{domain}/{workf" + "low}\022\303\001\n\030DeleteWorkflowAttributes\022/.flyt" + "eidl.admin.WorkflowAttributesDeleteReque" + "st\0320.flyteidl.admin.WorkflowAttributesDe" + "leteResponse\"D\202\323\344\223\002>*9/api/v1/workflow_a" + "ttributes/{project}/{domain}/{workflow}:" + "\001*\022\240\001\n\027ListMatchableAttributes\022..flyteid" + "l.admin.ListMatchableAttributesRequest\032/" + ".flyteidl.admin.ListMatchableAttributesR" + "esponse\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attri" + "butes\022\237\001\n\021ListNamedEntities\022&.flyteidl.a" + "dmin.NamedEntityListRequest\032\037.flyteidl.a" + "dmin.NamedEntityList\"A\202\323\344\223\002;\0229/api/v1/na" + "med_entities/{resource_type}/{project}/{" + "domain}\022\247\001\n\016GetNamedEntity\022%.flyteidl.ad" + "min.NamedEntityGetRequest\032\033.flyteidl.adm" + "in.NamedEntity\"Q\202\323\344\223\002K\022I/api/v1/named_en" + "tities/{resource_type}/{id.project}/{id." + "domain}/{id.name}\022\276\001\n\021UpdateNamedEntity\022" + "(.flyteidl.admin.NamedEntityUpdateReques" + "t\032).flyteidl.admin.NamedEntityUpdateResp" + "onse\"T\202\323\344\223\002N\032I/api/v1/named_entities/{re" + "source_type}/{id.project}/{id.domain}/{i" + "d.name}:\001*\022l\n\nGetVersion\022!.flyteidl.admi" + "n.GetVersionRequest\032\".flyteidl.admin.Get" + "VersionResponse\"\027\202\323\344\223\002\021\022\017/api/v1/version" + "\022\304\001\n\024GetDescriptionEntity\022 .flyteidl.adm" + "in.ObjectGetRequest\032!.flyteidl.admin.Des" + "criptionEntity\"g\202\323\344\223\002a\022_/api/v1/descript" + "ion_entities/{id.resource_type}/{id.proj" + "ect}/{id.domain}/{id.name}/{id.version}\022" + "\222\002\n\027ListDescriptionEntities\022,.flyteidl.a" + "dmin.DescriptionEntityListRequest\032%.flyt" + "eidl.admin.DescriptionEntityList\"\241\001\202\323\344\223\002" + "\232\001\022O/api/v1/description_entities/{resour" + "ce_type}/{id.project}/{id.domain}/{id.na" + "me}ZG\022E/api/v1/description_entities/{res" + "ource_type}/{id.project}/{id.domain}B9Z7" + "github.com/flyteorg/flyteidl/gen/pb-go/f" + "lyteidl/serviceb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fadmin_2eproto = { false, InitDefaults_flyteidl_2fservice_2fadmin_2eproto, descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto, - "flyteidl/service/admin.proto", &assign_descriptors_table_flyteidl_2fservice_2fadmin_2eproto, 10496, + "flyteidl/service/admin.proto", &assign_descriptors_table_flyteidl_2fservice_2fadmin_2eproto, 10903, }; void AddDescriptors_flyteidl_2fservice_2fadmin_2eproto() { diff --git a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go index 97f79a51e8..0a13f9c22d 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go @@ -1445,10 +1445,13 @@ type ExecutionUpdateRequest struct { // Identifier of the execution to update Id *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // State to set as the new value active/archive - State ExecutionState `protobuf:"varint,2,opt,name=state,proto3,enum=flyteidl.admin.ExecutionState" json:"state,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + State ExecutionState `protobuf:"varint,2,opt,name=state,proto3,enum=flyteidl.admin.ExecutionState" json:"state,omitempty"` + // Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the + // execution DAG and remove all stored results from datacatalog. + EvictCache bool `protobuf:"varint,3,opt,name=evict_cache,json=evictCache,proto3" json:"evict_cache,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ExecutionUpdateRequest) Reset() { *m = ExecutionUpdateRequest{} } @@ -1490,6 +1493,13 @@ func (m *ExecutionUpdateRequest) GetState() ExecutionState { return ExecutionState_EXECUTION_ACTIVE } +func (m *ExecutionUpdateRequest) GetEvictCache() bool { + if m != nil { + return m.EvictCache + } + return false +} + type ExecutionStateChangeDetails struct { // The state of the execution is used to control its visibility in the UI/CLI. State ExecutionState `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.ExecutionState" json:"state,omitempty"` @@ -1549,9 +1559,12 @@ func (m *ExecutionStateChangeDetails) GetPrincipal() string { } type ExecutionUpdateResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // List of errors encountered during cache eviction (if any). + // Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. + CacheEvictionErrors *core.CacheEvictionErrorList `protobuf:"bytes,1,opt,name=cache_eviction_errors,json=cacheEvictionErrors,proto3" json:"cache_eviction_errors,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ExecutionUpdateResponse) Reset() { *m = ExecutionUpdateResponse{} } @@ -1579,6 +1592,13 @@ func (m *ExecutionUpdateResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ExecutionUpdateResponse proto.InternalMessageInfo +func (m *ExecutionUpdateResponse) GetCacheEvictionErrors() *core.CacheEvictionErrorList { + if m != nil { + return m.CacheEvictionErrors + } + return nil +} + func init() { proto.RegisterEnum("flyteidl.admin.ExecutionState", ExecutionState_name, ExecutionState_value) proto.RegisterEnum("flyteidl.admin.ExecutionMetadata_ExecutionMode", ExecutionMetadata_ExecutionMode_name, ExecutionMetadata_ExecutionMode_value) @@ -1608,114 +1628,117 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/execution.proto", fileDescriptor_4e2785d91b3809ec) } var fileDescriptor_4e2785d91b3809ec = []byte{ - // 1730 bytes of a gzipped FileDescriptorProto + // 1786 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdd, 0x72, 0xdb, 0xc6, - 0x15, 0x16, 0x29, 0x52, 0xa2, 0x0e, 0x4d, 0x9a, 0x5e, 0x3b, 0x0a, 0x2c, 0x3b, 0xb6, 0x82, 0x4e, - 0x1b, 0x4f, 0x32, 0x25, 0x27, 0x4a, 0x35, 0x99, 0xb8, 0x75, 0x26, 0x14, 0x45, 0x87, 0x4a, 0xf5, - 0xe3, 0xae, 0x7e, 0x9c, 0xa4, 0x93, 0x41, 0x97, 0xc0, 0x92, 0x42, 0xb3, 0xc0, 0xc2, 0x8b, 0x85, - 0x65, 0xbf, 0x41, 0xa7, 0x4f, 0xd0, 0xbe, 0x41, 0xaf, 0x7a, 0xd9, 0x8b, 0x5e, 0xf7, 0x09, 0xfa, - 0x44, 0x19, 0x2c, 0x16, 0x20, 0x00, 0x52, 0x96, 0x3c, 0xf6, 0x1d, 0xf7, 0x9c, 0xef, 0x1c, 0x9c, - 0x3d, 0xff, 0x4b, 0x78, 0x30, 0x61, 0xaf, 0x25, 0x75, 0x1d, 0xd6, 0x23, 0x8e, 0xe7, 0xfa, 0x3d, - 0xfa, 0x8a, 0xda, 0x91, 0x74, 0xb9, 0xdf, 0x0d, 0x04, 0x97, 0x1c, 0xb5, 0x53, 0x7e, 0x57, 0xf1, - 0x37, 0x3e, 0x29, 0xe1, 0x6d, 0x16, 0x85, 0x92, 0x0a, 0x8b, 0x84, 0xa1, 0x3b, 0xf5, 0x3d, 0xea, - 0xcb, 0x44, 0x70, 0xe3, 0x5e, 0x19, 0xc8, 0x3d, 0x2f, 0xd5, 0xba, 0x71, 0x3f, 0x63, 0xda, 0x5c, - 0xd0, 0x1e, 0x73, 0x25, 0x15, 0x84, 0x85, 0x9a, 0xfb, 0x51, 0x91, 0x5b, 0x32, 0x69, 0xe3, 0x41, - 0x91, 0xed, 0x3a, 0xd4, 0x97, 0xee, 0xc4, 0xa5, 0x62, 0xb1, 0xf2, 0x90, 0xda, 0x91, 0x70, 0xe5, - 0xeb, 0x54, 0x7a, 0xca, 0xf9, 0x94, 0xd1, 0x9e, 0x3a, 0x8d, 0xa3, 0x49, 0xcf, 0x89, 0x04, 0xc9, - 0x69, 0x7f, 0x58, 0xe6, 0x4b, 0xd7, 0xa3, 0xa1, 0x24, 0x5e, 0x70, 0x99, 0x82, 0x0b, 0x41, 0x82, - 0x80, 0x0a, 0x6d, 0xbd, 0xf9, 0xbf, 0x0a, 0xac, 0x0f, 0x53, 0x93, 0x07, 0x82, 0x12, 0x49, 0x31, - 0x7d, 0x11, 0xd1, 0x50, 0x22, 0x03, 0x56, 0x03, 0xc1, 0xff, 0x4a, 0x6d, 0x69, 0x54, 0x36, 0x2b, - 0x8f, 0xd6, 0x70, 0x7a, 0x44, 0xeb, 0xb0, 0xe2, 0x70, 0x8f, 0xb8, 0xbe, 0x51, 0x55, 0x0c, 0x7d, - 0x42, 0x08, 0x6a, 0x3e, 0xf1, 0xa8, 0xb1, 0xac, 0xa8, 0xea, 0x37, 0xfa, 0x1c, 0x6a, 0x61, 0x40, - 0x6d, 0xa3, 0xb6, 0x59, 0x79, 0xd4, 0xdc, 0xfa, 0xa8, 0x5b, 0x8c, 0x50, 0x37, 0xfb, 0xf6, 0x71, - 0x40, 0x6d, 0xac, 0xa0, 0xe8, 0x73, 0x58, 0x71, 0xfd, 0x20, 0x92, 0xa1, 0x51, 0x57, 0x42, 0x77, - 0x67, 0x42, 0xb1, 0x8f, 0xba, 0xfb, 0x49, 0x00, 0x0e, 0x48, 0x80, 0x35, 0xd0, 0xfc, 0x67, 0x05, - 0x8c, 0x4c, 0x15, 0xa6, 0x8c, 0x44, 0xbe, 0x7d, 0x9e, 0x5e, 0xe4, 0x31, 0x54, 0x5d, 0x47, 0xdd, - 0xa1, 0xb9, 0xf5, 0x69, 0x49, 0xd7, 0x73, 0x2e, 0x7e, 0x9e, 0x30, 0x7e, 0x91, 0x09, 0xef, 0x65, - 0x01, 0xc2, 0x55, 0xd7, 0x59, 0x78, 0xa5, 0x4f, 0xe0, 0x26, 0x7f, 0x49, 0xc5, 0x85, 0x70, 0x25, - 0xb5, 0x6c, 0x62, 0x9f, 0x53, 0x75, 0xbb, 0x06, 0x6e, 0x67, 0xe4, 0x41, 0x4c, 0xfd, 0xae, 0xd6, - 0xa8, 0x76, 0x96, 0xcd, 0x7f, 0x55, 0xe0, 0xc3, 0x9c, 0x6d, 0x76, 0x0c, 0x7a, 0x9f, 0xa6, 0x55, - 0x73, 0xa6, 0x3d, 0x81, 0x86, 0x47, 0x25, 0x71, 0x88, 0x24, 0xca, 0xe4, 0xe6, 0xd6, 0xc7, 0x97, - 0x7a, 0xfc, 0x40, 0x03, 0x71, 0x26, 0x62, 0x9e, 0xe6, 0x2c, 0x4d, 0x93, 0x21, 0x0c, 0xb8, 0x1f, - 0xd2, 0x77, 0xb1, 0xd4, 0xfc, 0x01, 0xee, 0xcd, 0x41, 0xbe, 0xa5, 0xf2, 0x3d, 0x38, 0xc1, 0xfc, - 0x4f, 0x05, 0xd6, 0x32, 0xde, 0x3b, 0xb9, 0x33, 0x4d, 0xd4, 0xea, 0xf5, 0x13, 0xf5, 0x31, 0xac, - 0xda, 0x8c, 0x87, 0x91, 0xa0, 0xda, 0xd9, 0x9b, 0x97, 0x4a, 0x0d, 0x12, 0x1c, 0x4e, 0x05, 0xcc, - 0xbf, 0x40, 0x2b, 0x63, 0xee, 0xbb, 0xa1, 0x44, 0x5f, 0x01, 0x64, 0xbd, 0x23, 0x34, 0x2a, 0x9b, - 0xcb, 0xc5, 0xcc, 0x2f, 0xe9, 0xc3, 0x39, 0x30, 0xba, 0x03, 0x75, 0xc9, 0x7f, 0xa6, 0x69, 0x39, - 0x26, 0x07, 0x93, 0x42, 0x7b, 0x56, 0x29, 0x3b, 0x8c, 0x8f, 0xd1, 0x97, 0xb0, 0xf2, 0x92, 0xb0, - 0x88, 0x86, 0xda, 0x45, 0x97, 0x17, 0xd6, 0x4e, 0xd5, 0xa8, 0x8c, 0x96, 0xb0, 0x86, 0x23, 0x04, - 0xcb, 0x91, 0x70, 0x13, 0xf5, 0xa3, 0x25, 0x1c, 0x1f, 0x76, 0x56, 0xa0, 0xa6, 0x72, 0x66, 0x00, - 0xad, 0xfe, 0x98, 0x0b, 0x99, 0xa6, 0x53, 0x6c, 0x8d, 0x4d, 0xa2, 0x90, 0xea, 0xae, 0x91, 0x1c, - 0xd0, 0x7d, 0x58, 0x0b, 0x84, 0xeb, 0xdb, 0x6e, 0x40, 0x98, 0xb6, 0x73, 0x46, 0x30, 0xff, 0xb1, - 0x0a, 0x9d, 0xb2, 0xaf, 0xd0, 0xd7, 0xb0, 0xca, 0x23, 0xa9, 0x1a, 0x41, 0x62, 0xef, 0x83, 0xb2, - 0x3b, 0x8a, 0xf7, 0xd3, 0x46, 0xa7, 0x42, 0x68, 0x1b, 0xea, 0x54, 0x08, 0x2e, 0xe6, 0x43, 0xaa, - 0x6e, 0x9b, 0x7d, 0x6f, 0x18, 0x83, 0x46, 0x4b, 0x38, 0x41, 0xa3, 0x5f, 0x43, 0x93, 0xc4, 0x17, - 0xb2, 0x92, 0x5b, 0x40, 0x6c, 0xab, 0x56, 0x0d, 0x8a, 0x31, 0x50, 0x17, 0x7a, 0x0a, 0xed, 0x04, - 0x96, 0x15, 0xdc, 0x8d, 0xc5, 0x99, 0x53, 0xf0, 0xce, 0x68, 0x09, 0xb7, 0x48, 0xc1, 0x5d, 0xdf, - 0x40, 0x33, 0x31, 0xd8, 0x52, 0x4a, 0x5a, 0xd7, 0x8b, 0x0c, 0x24, 0x32, 0xbb, 0xb1, 0x86, 0xa7, - 0x70, 0xd3, 0xe6, 0x5e, 0x10, 0x49, 0xea, 0x58, 0xba, 0x71, 0x2e, 0x5f, 0x43, 0x0b, 0x6e, 0xa7, - 0x52, 0x7b, 0x4a, 0x08, 0xfd, 0x01, 0xea, 0xc1, 0x39, 0x09, 0x93, 0x6e, 0xd6, 0xde, 0xfa, 0xcd, - 0x55, 0x05, 0xd4, 0x7d, 0x16, 0xa3, 0x71, 0x22, 0x14, 0xe7, 0x6f, 0x28, 0x89, 0x88, 0x8d, 0x20, - 0x52, 0x77, 0xee, 0x8d, 0x6e, 0x32, 0x7e, 0xba, 0xe9, 0xf8, 0xe9, 0x9e, 0xa4, 0xf3, 0x09, 0xaf, - 0x69, 0x74, 0x5f, 0xa2, 0x6d, 0x68, 0xa4, 0x73, 0xcd, 0x58, 0xd1, 0x96, 0x97, 0x05, 0x77, 0x35, - 0x00, 0x67, 0xd0, 0xf8, 0x8b, 0xb6, 0x6a, 0x52, 0xea, 0x8b, 0xab, 0x57, 0x7f, 0x51, 0xa3, 0xfb, - 0xaa, 0xd8, 0xa2, 0xc0, 0x49, 0x45, 0x1b, 0x57, 0x8b, 0x6a, 0x74, 0x5f, 0xa2, 0x1d, 0x68, 0xf9, - 0x3c, 0xee, 0x1b, 0x36, 0x49, 0x4a, 0x75, 0x4d, 0x95, 0xea, 0xfd, 0x72, 0xd8, 0x0f, 0x73, 0x20, - 0x5c, 0x14, 0x41, 0x8f, 0xa1, 0x79, 0xa1, 0xbd, 0x69, 0xb9, 0x8e, 0xd1, 0x5c, 0x18, 0xad, 0x5c, - 0x7f, 0x82, 0x14, 0xbd, 0xe7, 0xa0, 0x9f, 0xe0, 0x4e, 0x28, 0x49, 0x3c, 0x79, 0xce, 0x89, 0x3f, - 0xa5, 0x96, 0x43, 0x25, 0x71, 0x59, 0x68, 0xb4, 0x95, 0x92, 0xcf, 0x2e, 0xef, 0x5b, 0xb1, 0xd0, - 0x40, 0xc9, 0xec, 0x26, 0x22, 0x18, 0x85, 0x73, 0xb4, 0x9d, 0x9b, 0xd0, 0xd2, 0xe9, 0x28, 0x68, - 0x18, 0x31, 0x69, 0x3e, 0x81, 0xf6, 0xf1, 0xeb, 0x50, 0x52, 0x2f, 0xcb, 0xd8, 0xcf, 0xe0, 0x56, - 0xd6, 0x7c, 0x2c, 0xbd, 0x52, 0xe9, 0x62, 0xef, 0xd0, 0x59, 0x11, 0x2b, 0xba, 0xf9, 0xdf, 0x1a, - 0xdc, 0x9a, 0x1b, 0x39, 0x68, 0x00, 0x35, 0x8f, 0x3b, 0x49, 0x8b, 0x68, 0x6f, 0xf5, 0xae, 0x9c, - 0x51, 0x39, 0x0a, 0x77, 0x28, 0x56, 0xc2, 0x6f, 0x6e, 0x29, 0xf1, 0xfa, 0xe2, 0xd3, 0x50, 0xba, - 0xfe, 0x54, 0x55, 0x43, 0x0b, 0xa7, 0x47, 0xf4, 0x04, 0x6e, 0x84, 0xf6, 0x39, 0x75, 0x22, 0x96, - 0x84, 0xbf, 0x76, 0x65, 0xf8, 0x9b, 0x19, 0xbe, 0x2f, 0xd1, 0x8f, 0xf0, 0x41, 0x40, 0x04, 0xf5, - 0xa5, 0xe5, 0x73, 0x87, 0x5a, 0xd9, 0x8d, 0x75, 0xce, 0x97, 0xcb, 0xe6, 0x90, 0x3b, 0x74, 0xd1, - 0xcc, 0xb9, 0x9d, 0x28, 0x29, 0xb0, 0xd1, 0x9f, 0xe1, 0xb6, 0xa0, 0x13, 0x2a, 0xa8, 0x6f, 0xe7, - 0x35, 0x77, 0xde, 0x7a, 0xa2, 0xa1, 0x4c, 0xcd, 0x4c, 0xf9, 0xb7, 0x70, 0x33, 0x54, 0x91, 0x9c, - 0xb5, 0xac, 0x5b, 0x8b, 0xfb, 0x6a, 0x31, 0xe0, 0xb8, 0x1d, 0x16, 0xce, 0xe6, 0x34, 0x37, 0xbb, - 0xe2, 0x78, 0x20, 0x80, 0x95, 0x83, 0xfe, 0xe1, 0x69, 0x7f, 0xbf, 0xb3, 0x84, 0x5a, 0xb0, 0x76, - 0x3c, 0x18, 0x0d, 0x77, 0x4f, 0xf7, 0x87, 0xbb, 0x9d, 0x4a, 0xcc, 0x3a, 0xfe, 0xe1, 0xf8, 0x64, - 0x78, 0xd0, 0xa9, 0xa2, 0x1b, 0xd0, 0xc0, 0xc3, 0xfd, 0xfe, 0xe9, 0xe1, 0x60, 0xd4, 0x59, 0x46, - 0x08, 0xda, 0x83, 0xd1, 0xde, 0xfe, 0xae, 0xf5, 0xfc, 0x08, 0xff, 0xf1, 0xe9, 0xfe, 0xd1, 0xf3, - 0x4e, 0x2d, 0x16, 0xc6, 0xc3, 0xc1, 0xd1, 0xd9, 0x10, 0x0f, 0x77, 0x3b, 0x75, 0xf3, 0x0c, 0x3a, - 0xf9, 0x32, 0x52, 0x73, 0x72, 0xae, 0xfe, 0x2a, 0x6f, 0x5d, 0x7f, 0xe6, 0xff, 0x57, 0x73, 0x37, - 0x38, 0x4e, 0x46, 0x79, 0x33, 0x59, 0x1a, 0xad, 0x80, 0x11, 0xff, 0x92, 0xf9, 0x98, 0xaf, 0xc8, - 0x04, 0xfd, 0x8c, 0x11, 0x1f, 0x6d, 0x67, 0xfb, 0x6a, 0xf5, 0x3a, 0x6d, 0x57, 0x83, 0xdf, 0x71, - 0x57, 0x43, 0xa3, 0xb2, 0x1f, 0xea, 0x8b, 0x57, 0x90, 0xb2, 0x03, 0xe3, 0x09, 0x54, 0xec, 0x46, - 0x1f, 0x43, 0xd3, 0x71, 0x43, 0x32, 0x66, 0xd4, 0x22, 0x8c, 0xa9, 0x0e, 0xdc, 0x88, 0x47, 0x8c, - 0x26, 0xf6, 0x19, 0x43, 0x5d, 0x58, 0x61, 0x64, 0x4c, 0x59, 0xa8, 0xdb, 0xec, 0xfa, 0xdc, 0x24, - 0x56, 0x5c, 0xac, 0x51, 0xe8, 0x09, 0x34, 0x89, 0xef, 0x73, 0xa9, 0x4d, 0x4b, 0x1a, 0xec, 0xbd, - 0xb9, 0xc9, 0x38, 0x83, 0xe0, 0x3c, 0x1e, 0xed, 0x41, 0x27, 0x7d, 0x08, 0x59, 0x36, 0xf7, 0x25, - 0x7d, 0x25, 0xd5, 0x1c, 0x2e, 0xa4, 0xaa, 0xf2, 0xed, 0xb1, 0x86, 0x0d, 0x12, 0x14, 0xbe, 0x19, - 0x16, 0x09, 0xe8, 0x2b, 0x58, 0x23, 0x91, 0x3c, 0xb7, 0x04, 0x67, 0x54, 0xd7, 0x91, 0x31, 0x67, - 0x47, 0x24, 0xcf, 0x31, 0x67, 0x54, 0x85, 0xa7, 0x41, 0xf4, 0x09, 0x1d, 0x00, 0x7a, 0x11, 0x11, - 0x16, 0x1b, 0xc1, 0x27, 0x56, 0x48, 0xc5, 0x4b, 0xd7, 0xa6, 0xba, 0x64, 0x1e, 0x96, 0xec, 0xf8, - 0x53, 0x02, 0x3c, 0x9a, 0x1c, 0x27, 0x30, 0xdc, 0x79, 0x51, 0xa2, 0xc4, 0xcf, 0x06, 0x8f, 0xbc, - 0xb2, 0x02, 0x22, 0x08, 0x63, 0x94, 0xb9, 0xa1, 0x67, 0xa0, 0xcd, 0xca, 0xa3, 0x3a, 0x6e, 0x7b, - 0xe4, 0xd5, 0xb3, 0x19, 0x15, 0x7d, 0x0f, 0xeb, 0x82, 0x5c, 0x58, 0xb9, 0xad, 0x20, 0x76, 0xc2, - 0xc4, 0x9d, 0x1a, 0xb7, 0xd5, 0xb7, 0x7f, 0x55, 0xb6, 0x1f, 0x93, 0x8b, 0xa3, 0x6c, 0x1d, 0x18, - 0x28, 0x28, 0xbe, 0x2d, 0xe6, 0x89, 0xe8, 0x19, 0xa0, 0xf9, 0x27, 0xb0, 0x71, 0x67, 0x71, 0xf2, - 0xe9, 0x0e, 0xde, 0xcf, 0x80, 0xf8, 0x96, 0x5d, 0x26, 0xa1, 0x6f, 0xa0, 0xe5, 0xfa, 0x92, 0x0a, - 0x11, 0x05, 0xd2, 0x1d, 0x33, 0x6a, 0x7c, 0x70, 0x49, 0x33, 0xdd, 0xe1, 0x9c, 0x9d, 0xc5, 0xdb, - 0x24, 0x2e, 0x0a, 0x2c, 0x7a, 0x4d, 0xad, 0x2f, 0x7a, 0x4d, 0xed, 0x18, 0xb0, 0x9e, 0xcf, 0x5b, - 0x2b, 0x66, 0x0b, 0xd7, 0xa1, 0xe1, 0x77, 0xb5, 0x46, 0xad, 0x53, 0x37, 0x3d, 0xb8, 0x9b, 0xd5, - 0xcb, 0x09, 0x15, 0x9e, 0xeb, 0xe7, 0x1e, 0xb3, 0xef, 0xf2, 0x32, 0xc8, 0x16, 0xda, 0x6a, 0x6e, - 0xa1, 0x35, 0xef, 0xc3, 0xc6, 0xa2, 0xcf, 0x25, 0xcf, 0x25, 0xf3, 0x27, 0x78, 0xb8, 0xe8, 0xc9, - 0x13, 0xc7, 0xe2, 0x7d, 0x3c, 0x7b, 0xfe, 0x56, 0x85, 0xcd, 0xcb, 0xf5, 0xeb, 0x27, 0xdb, 0x76, - 0x79, 0x7f, 0xfe, 0xb0, 0x1c, 0xe2, 0x53, 0xc1, 0xd2, 0xc5, 0x79, 0xb6, 0x36, 0x7f, 0x51, 0x6a, - 0x67, 0x6f, 0x94, 0x4a, 0x9b, 0xd9, 0x63, 0x68, 0x4e, 0x22, 0xc6, 0xae, 0xbb, 0x7f, 0x62, 0x88, - 0xd1, 0xd9, 0xde, 0x79, 0x43, 0xc9, 0xa6, 0xc6, 0xd6, 0xae, 0x12, 0x56, 0x9f, 0x4a, 0x92, 0x3b, - 0x34, 0xff, 0x9e, 0xff, 0x07, 0xe3, 0x54, 0xad, 0x69, 0xef, 0x23, 0xe8, 0xbf, 0x83, 0xba, 0xda, - 0x8e, 0x94, 0x13, 0xda, 0xf3, 0x23, 0xb2, 0xb8, 0x57, 0xe1, 0x04, 0x6c, 0xfe, 0xbb, 0x02, 0xf7, - 0xde, 0xb0, 0x71, 0xcd, 0xb4, 0x56, 0xde, 0x42, 0x2b, 0xfa, 0x3d, 0x34, 0xb9, 0x6d, 0x47, 0x42, - 0x24, 0xfb, 0x4a, 0xf5, 0xca, 0x7d, 0x05, 0x52, 0x78, 0x5f, 0x16, 0xb7, 0xa4, 0xe5, 0xf2, 0xc3, - 0xeb, 0x6e, 0xee, 0xc5, 0x9f, 0x3a, 0x2f, 0x49, 0x9f, 0x4f, 0xbf, 0x86, 0x76, 0xd1, 0x1c, 0x74, - 0x07, 0x3a, 0xc3, 0xef, 0x87, 0x83, 0xd3, 0x93, 0xbd, 0xa3, 0x43, 0xab, 0x3f, 0x38, 0xd9, 0x3b, - 0x1b, 0x76, 0x96, 0xd0, 0x3a, 0xa0, 0x1c, 0x15, 0x0f, 0x46, 0x7b, 0x67, 0xf1, 0xe4, 0xdf, 0xf9, - 0xf2, 0xc7, 0xed, 0xa9, 0x2b, 0xcf, 0xa3, 0x71, 0xd7, 0xe6, 0x5e, 0x4f, 0x5d, 0x94, 0x8b, 0x69, - 0x2f, 0xfb, 0xbf, 0x6b, 0x4a, 0xfd, 0x5e, 0x30, 0xfe, 0xed, 0x94, 0xf7, 0x8a, 0x7f, 0xbe, 0x8d, - 0x57, 0xd4, 0x8d, 0xbe, 0xf8, 0x25, 0x00, 0x00, 0xff, 0xff, 0x26, 0xb3, 0xd4, 0x61, 0xee, 0x13, - 0x00, 0x00, + 0x15, 0x16, 0x29, 0x4a, 0xa2, 0x0e, 0x4d, 0x8a, 0x5e, 0x39, 0x0a, 0x22, 0x3b, 0xb6, 0x82, 0x4e, + 0x1a, 0x4f, 0x32, 0x25, 0x27, 0x4a, 0x35, 0x99, 0xb8, 0x75, 0x26, 0x14, 0x45, 0x87, 0x4a, 0xf5, + 0xe3, 0xae, 0x7e, 0x1c, 0xa7, 0x93, 0x41, 0x97, 0xc0, 0x92, 0x42, 0x03, 0x60, 0xe1, 0xdd, 0x85, + 0x65, 0xbf, 0x41, 0x1f, 0xa1, 0x7d, 0x83, 0xce, 0x74, 0xa6, 0x97, 0xbd, 0xe8, 0x75, 0x9f, 0xa0, + 0x4f, 0xd4, 0xc1, 0x62, 0x01, 0x02, 0x20, 0x65, 0xc9, 0x63, 0xdf, 0x11, 0xe7, 0x7c, 0xe7, 0xec, + 0xd9, 0xf3, 0xbf, 0x84, 0xfb, 0x63, 0xef, 0xb5, 0xa4, 0xae, 0xe3, 0x75, 0x89, 0xe3, 0xbb, 0x41, + 0x97, 0xbe, 0xa2, 0x76, 0x24, 0x5d, 0x16, 0x74, 0x42, 0xce, 0x24, 0x43, 0xad, 0x94, 0xdf, 0x51, + 0xfc, 0xcd, 0xcf, 0x4a, 0x78, 0xdb, 0x8b, 0x84, 0xa4, 0xdc, 0x22, 0x42, 0xb8, 0x93, 0xc0, 0xa7, + 0x81, 0x4c, 0x04, 0x37, 0xef, 0x96, 0x81, 0xcc, 0xf7, 0x53, 0xad, 0x9b, 0xf7, 0x32, 0xa6, 0xcd, + 0x38, 0xed, 0x7a, 0xae, 0xa4, 0x9c, 0x78, 0x42, 0x73, 0x37, 0x8b, 0x5c, 0xca, 0x39, 0xe3, 0x29, + 0xef, 0xe3, 0x12, 0xaf, 0x68, 0xee, 0xe6, 0xfd, 0x22, 0xdb, 0x75, 0x68, 0x20, 0xdd, 0xb1, 0x4b, + 0xf9, 0xfc, 0x83, 0x05, 0xb5, 0x23, 0xee, 0xca, 0xd7, 0xa9, 0xf4, 0x84, 0xb1, 0x89, 0x47, 0xbb, + 0xea, 0x6b, 0x14, 0x8d, 0xbb, 0x4e, 0xc4, 0x49, 0x4e, 0xfb, 0x83, 0x32, 0x5f, 0xba, 0x3e, 0x15, + 0x92, 0xf8, 0xe1, 0x55, 0x0a, 0x2e, 0x39, 0x09, 0x43, 0x9a, 0x5a, 0x6f, 0xfe, 0xb7, 0x02, 0x1b, + 0x83, 0xd4, 0xe4, 0x3e, 0xa7, 0x44, 0x52, 0x4c, 0x5f, 0x44, 0x54, 0x48, 0x64, 0xc0, 0x4a, 0xc8, + 0xd9, 0x5f, 0xa8, 0x2d, 0x8d, 0xca, 0x56, 0xe5, 0xe1, 0x2a, 0x4e, 0x3f, 0xd1, 0x06, 0x2c, 0x3b, + 0xcc, 0x27, 0x6e, 0x60, 0x54, 0x15, 0x43, 0x7f, 0x21, 0x04, 0xb5, 0x80, 0xf8, 0xd4, 0x58, 0x54, + 0x54, 0xf5, 0x1b, 0x7d, 0x09, 0x35, 0x11, 0x52, 0xdb, 0xa8, 0x6d, 0x55, 0x1e, 0x36, 0xb6, 0x3f, + 0xee, 0x14, 0xa3, 0xd7, 0xc9, 0xce, 0x3e, 0x09, 0xa9, 0x8d, 0x15, 0x14, 0x7d, 0x09, 0xcb, 0x6e, + 0x10, 0x46, 0x52, 0x18, 0x4b, 0x4a, 0xe8, 0xa3, 0xa9, 0x50, 0xec, 0xa3, 0xce, 0x41, 0x12, 0x9c, + 0x43, 0x12, 0x62, 0x0d, 0x34, 0xff, 0x5e, 0x01, 0x23, 0x53, 0x85, 0xa9, 0x47, 0xa2, 0xc0, 0xbe, + 0x48, 0x2f, 0xf2, 0x08, 0xaa, 0xae, 0xa3, 0xee, 0xd0, 0xd8, 0xfe, 0xbc, 0xa4, 0xeb, 0x19, 0xe3, + 0xbf, 0x8c, 0x3d, 0x76, 0x99, 0x09, 0xef, 0x67, 0x01, 0xc2, 0x55, 0xd7, 0x99, 0x7b, 0xa5, 0xcf, + 0x60, 0x8d, 0xbd, 0xa4, 0xfc, 0x92, 0xbb, 0x92, 0x5a, 0x36, 0xb1, 0x2f, 0xa8, 0xba, 0x5d, 0x1d, + 0xb7, 0x32, 0x72, 0x3f, 0xa6, 0xfe, 0x50, 0xab, 0x57, 0xdb, 0x8b, 0xe6, 0x3f, 0x2a, 0xf0, 0x61, + 0xce, 0x36, 0x3b, 0x06, 0xbd, 0x4f, 0xd3, 0xaa, 0x39, 0xd3, 0x1e, 0x43, 0xdd, 0xa7, 0x92, 0x38, + 0x44, 0x12, 0x65, 0x72, 0x63, 0xfb, 0x93, 0x2b, 0x3d, 0x7e, 0xa8, 0x81, 0x38, 0x13, 0x31, 0xcf, + 0x72, 0x96, 0xa6, 0xc9, 0x20, 0x42, 0x16, 0x08, 0xfa, 0x2e, 0x96, 0x9a, 0xcf, 0xe1, 0xee, 0x0c, + 0xe4, 0x7b, 0x2a, 0xdf, 0x83, 0x13, 0xcc, 0x7f, 0x57, 0x60, 0x35, 0xe3, 0xbd, 0x93, 0x3b, 0xd3, + 0x44, 0xad, 0xde, 0x3c, 0x51, 0x1f, 0xc1, 0x8a, 0xed, 0x31, 0x11, 0x71, 0xaa, 0x9d, 0xbd, 0x75, + 0xa5, 0x54, 0x3f, 0xc1, 0xe1, 0x54, 0xc0, 0xfc, 0x33, 0x34, 0x33, 0xe6, 0x81, 0x2b, 0x24, 0xfa, + 0x06, 0x20, 0xeb, 0x1d, 0xc2, 0xa8, 0x6c, 0x2d, 0x16, 0x33, 0xbf, 0xa4, 0x0f, 0xe7, 0xc0, 0xe8, + 0x0e, 0x2c, 0x49, 0xf6, 0x0b, 0x4d, 0xcb, 0x31, 0xf9, 0x30, 0x29, 0xb4, 0xa6, 0x95, 0xb2, 0xeb, + 0xb1, 0x11, 0xfa, 0x1a, 0x96, 0x5f, 0x12, 0x2f, 0xa2, 0x42, 0xbb, 0xe8, 0xea, 0xc2, 0xda, 0xad, + 0x1a, 0x95, 0xe1, 0x02, 0xd6, 0x70, 0x84, 0x60, 0x31, 0xe2, 0x6e, 0xa2, 0x7e, 0xb8, 0x80, 0xe3, + 0x8f, 0xdd, 0x65, 0xa8, 0xa9, 0x9c, 0xe9, 0x43, 0xb3, 0x37, 0x62, 0x5c, 0xa6, 0xe9, 0x14, 0x5b, + 0x63, 0x93, 0x48, 0x50, 0xdd, 0x35, 0x92, 0x0f, 0x74, 0x0f, 0x56, 0x43, 0xee, 0x06, 0xb6, 0x1b, + 0x12, 0x4f, 0xdb, 0x39, 0x25, 0x98, 0x7f, 0x5b, 0x81, 0x76, 0xd9, 0x57, 0xe8, 0x5b, 0x58, 0x61, + 0x91, 0x54, 0x8d, 0x20, 0xb1, 0xf7, 0x7e, 0xd9, 0x1d, 0xc5, 0xfb, 0x69, 0xa3, 0x53, 0x21, 0xb4, + 0x03, 0x4b, 0xaa, 0x53, 0xcf, 0x86, 0x54, 0xdd, 0x36, 0x3b, 0x6f, 0x10, 0x83, 0x86, 0x0b, 0x38, + 0x41, 0xa3, 0x4f, 0xa1, 0x41, 0xe2, 0x0b, 0x59, 0xc9, 0x2d, 0x20, 0xb6, 0x55, 0xab, 0x06, 0xc5, + 0xe8, 0xab, 0x0b, 0x3d, 0x81, 0x56, 0x02, 0xcb, 0x0a, 0xee, 0xd6, 0xfc, 0xcc, 0x29, 0x78, 0x67, + 0xb8, 0x80, 0x9b, 0xa4, 0xe0, 0xae, 0xef, 0xa0, 0x91, 0x18, 0x6c, 0x29, 0x25, 0xcd, 0x9b, 0x45, + 0x06, 0x12, 0x99, 0xbd, 0x58, 0xc3, 0x13, 0x58, 0xb3, 0x99, 0x1f, 0x46, 0x92, 0x3a, 0x96, 0x6e, + 0x9c, 0x8b, 0x37, 0xd0, 0x82, 0x5b, 0xa9, 0xd4, 0xbe, 0x12, 0x42, 0xbf, 0x87, 0xa5, 0xf0, 0x82, + 0x88, 0xa4, 0x9b, 0xb5, 0xb6, 0x7f, 0x7d, 0x5d, 0x01, 0x75, 0x9e, 0xc6, 0x68, 0x9c, 0x08, 0xc5, + 0xf9, 0x2b, 0x24, 0xe1, 0xb1, 0x11, 0x44, 0xea, 0xce, 0xbd, 0xd9, 0x49, 0xc6, 0x4f, 0x27, 0x1d, + 0x3f, 0x9d, 0xd3, 0x74, 0x3e, 0xe1, 0x55, 0x8d, 0xee, 0x49, 0xb4, 0x03, 0xf5, 0x74, 0xae, 0x19, + 0xcb, 0xda, 0xf2, 0xb2, 0xe0, 0x9e, 0x06, 0xe0, 0x0c, 0x1a, 0x9f, 0x68, 0xab, 0x26, 0xa5, 0x4e, + 0x5c, 0xb9, 0xfe, 0x44, 0x8d, 0xee, 0xa9, 0x62, 0x8b, 0x42, 0x27, 0x15, 0xad, 0x5f, 0x2f, 0xaa, + 0xd1, 0x3d, 0x89, 0x76, 0xa1, 0x19, 0xb0, 0xb8, 0x6f, 0xd8, 0x24, 0x29, 0xd5, 0x55, 0x55, 0xaa, + 0xf7, 0xca, 0x61, 0x3f, 0xca, 0x81, 0x70, 0x51, 0x04, 0x3d, 0x82, 0xc6, 0xa5, 0xf6, 0xa6, 0xe5, + 0x3a, 0x46, 0x63, 0x6e, 0xb4, 0x72, 0xfd, 0x09, 0x52, 0xf4, 0xbe, 0x83, 0x7e, 0x86, 0x3b, 0x42, + 0x92, 0x78, 0xf2, 0x5c, 0x90, 0x60, 0x42, 0x2d, 0x87, 0x4a, 0xe2, 0x7a, 0xc2, 0x68, 0x29, 0x25, + 0x5f, 0x5c, 0xdd, 0xb7, 0x62, 0xa1, 0xbe, 0x92, 0xd9, 0x4b, 0x44, 0x30, 0x12, 0x33, 0xb4, 0xdd, + 0x35, 0x68, 0xea, 0x74, 0xe4, 0x54, 0x44, 0x9e, 0x34, 0x1f, 0x43, 0xeb, 0xe4, 0xb5, 0x90, 0xd4, + 0xcf, 0x32, 0xf6, 0x0b, 0xb8, 0x9d, 0x35, 0x1f, 0x4b, 0xaf, 0x5b, 0xba, 0xd8, 0xdb, 0x74, 0x5a, + 0xc4, 0x8a, 0x6e, 0xfe, 0xa7, 0x06, 0xb7, 0x67, 0x46, 0x0e, 0xea, 0x43, 0xcd, 0x67, 0x4e, 0xd2, + 0x22, 0x5a, 0xdb, 0xdd, 0x6b, 0x67, 0x54, 0x8e, 0xc2, 0x1c, 0x8a, 0x95, 0xf0, 0x9b, 0x5b, 0x4a, + 0xbc, 0xbe, 0x04, 0x54, 0x48, 0x37, 0x98, 0xa8, 0x6a, 0x68, 0xe2, 0xf4, 0x13, 0x3d, 0x86, 0x5b, + 0xc2, 0xbe, 0xa0, 0x4e, 0xe4, 0x25, 0xe1, 0xaf, 0x5d, 0x1b, 0xfe, 0x46, 0x86, 0xef, 0x49, 0xf4, + 0x13, 0x7c, 0x10, 0x12, 0x4e, 0x03, 0x69, 0x05, 0xcc, 0xa1, 0x56, 0x76, 0x63, 0x9d, 0xf3, 0xe5, + 0xb2, 0x39, 0x62, 0x0e, 0x9d, 0x37, 0x73, 0xd6, 0x13, 0x25, 0x05, 0x36, 0xfa, 0x13, 0xac, 0x73, + 0x3a, 0xa6, 0x9c, 0x06, 0x76, 0x5e, 0x73, 0xfb, 0xad, 0x27, 0x1a, 0xca, 0xd4, 0x4c, 0x95, 0x7f, + 0x0f, 0x6b, 0x42, 0x45, 0x72, 0xda, 0xb2, 0x6e, 0xcf, 0xef, 0xab, 0xc5, 0x80, 0xe3, 0x96, 0x28, + 0x7c, 0x9b, 0x93, 0xdc, 0xec, 0x8a, 0xe3, 0x81, 0x00, 0x96, 0x0f, 0x7b, 0x47, 0x67, 0xbd, 0x83, + 0xf6, 0x02, 0x6a, 0xc2, 0xea, 0x49, 0x7f, 0x38, 0xd8, 0x3b, 0x3b, 0x18, 0xec, 0xb5, 0x2b, 0x31, + 0xeb, 0xe4, 0xf9, 0xc9, 0xe9, 0xe0, 0xb0, 0x5d, 0x45, 0xb7, 0xa0, 0x8e, 0x07, 0x07, 0xbd, 0xb3, + 0xa3, 0xfe, 0xb0, 0xbd, 0x88, 0x10, 0xb4, 0xfa, 0xc3, 0xfd, 0x83, 0x3d, 0xeb, 0xd9, 0x31, 0xfe, + 0xc3, 0x93, 0x83, 0xe3, 0x67, 0xed, 0x5a, 0x2c, 0x8c, 0x07, 0xfd, 0xe3, 0xf3, 0x01, 0x1e, 0xec, + 0xb5, 0x97, 0xcc, 0x73, 0x68, 0xe7, 0xcb, 0x48, 0xcd, 0xc9, 0x99, 0xfa, 0xab, 0xbc, 0x75, 0xfd, + 0x99, 0xff, 0x5b, 0xc9, 0xdd, 0xe0, 0x24, 0x19, 0xe5, 0x8d, 0x64, 0x69, 0xb4, 0x42, 0x8f, 0x04, + 0x57, 0xcc, 0xc7, 0x7c, 0x45, 0x26, 0xe8, 0xa7, 0x1e, 0x09, 0xd0, 0x4e, 0xb6, 0xaf, 0x56, 0x6f, + 0xd2, 0x76, 0x35, 0xf8, 0x1d, 0x77, 0x35, 0x34, 0x2c, 0xfb, 0x61, 0x69, 0xfe, 0x0a, 0x52, 0x76, + 0x60, 0x3c, 0x81, 0x8a, 0xdd, 0xe8, 0x13, 0x68, 0x38, 0xae, 0x20, 0x23, 0x8f, 0x5a, 0xc4, 0xf3, + 0x54, 0x07, 0xae, 0xc7, 0x23, 0x46, 0x13, 0x7b, 0x9e, 0x87, 0x3a, 0xb0, 0xec, 0x91, 0x11, 0xf5, + 0x84, 0x6e, 0xb3, 0x1b, 0x33, 0x93, 0x58, 0x71, 0xb1, 0x46, 0xa1, 0xc7, 0xd0, 0x20, 0x41, 0xc0, + 0xa4, 0x36, 0x2d, 0x69, 0xb0, 0x77, 0x67, 0x26, 0xe3, 0x14, 0x82, 0xf3, 0x78, 0xb4, 0x0f, 0xed, + 0xf4, 0x21, 0x64, 0xd9, 0x2c, 0x90, 0xf4, 0x95, 0x54, 0x73, 0xb8, 0x90, 0xaa, 0xca, 0xb7, 0x27, + 0x1a, 0xd6, 0x4f, 0x50, 0x78, 0x4d, 0x14, 0x09, 0xe8, 0x1b, 0x58, 0x25, 0x91, 0xbc, 0xb0, 0x38, + 0xf3, 0xa8, 0xae, 0x23, 0x63, 0xc6, 0x8e, 0x48, 0x5e, 0x60, 0xe6, 0x51, 0x15, 0x9e, 0x3a, 0xd1, + 0x5f, 0xe8, 0x10, 0xd0, 0x8b, 0x88, 0x78, 0xb1, 0x11, 0x6c, 0x6c, 0x09, 0xca, 0x5f, 0xba, 0x36, + 0xd5, 0x25, 0xf3, 0xa0, 0x64, 0xc7, 0x1f, 0x13, 0xe0, 0xf1, 0xf8, 0x24, 0x81, 0xe1, 0xf6, 0x8b, + 0x12, 0x25, 0x7e, 0x36, 0xf8, 0xe4, 0x95, 0x15, 0x12, 0x4e, 0x3c, 0x8f, 0x7a, 0xae, 0xf0, 0x0d, + 0xb4, 0x55, 0x79, 0xb8, 0x84, 0x5b, 0x3e, 0x79, 0xf5, 0x74, 0x4a, 0x45, 0x3f, 0xc2, 0x06, 0x27, + 0x97, 0x56, 0x6e, 0x2b, 0x88, 0x9d, 0x30, 0x76, 0x27, 0xc6, 0xba, 0x3a, 0xfb, 0x57, 0x65, 0xfb, + 0x31, 0xb9, 0x3c, 0xce, 0xd6, 0x81, 0xbe, 0x82, 0xe2, 0x75, 0x3e, 0x4b, 0x44, 0x4f, 0x01, 0xcd, + 0x3e, 0x8f, 0x8d, 0x3b, 0xf3, 0x93, 0x4f, 0x77, 0xf0, 0x5e, 0x06, 0xc4, 0xb7, 0xed, 0x32, 0x09, + 0x7d, 0x07, 0x4d, 0x37, 0x90, 0x94, 0xf3, 0x28, 0x94, 0xee, 0xc8, 0xa3, 0xc6, 0x07, 0x57, 0x34, + 0xd3, 0x5d, 0xc6, 0xbc, 0xf3, 0x78, 0x9b, 0xc4, 0x45, 0x81, 0x79, 0xaf, 0xa9, 0x8d, 0x79, 0xaf, + 0xa9, 0x5d, 0x03, 0x36, 0xf2, 0x79, 0x6b, 0xc5, 0x6c, 0xee, 0x3a, 0x54, 0xfc, 0x50, 0xab, 0xd7, + 0xda, 0x4b, 0xa6, 0x0f, 0x1f, 0x65, 0xf5, 0x72, 0x4a, 0xb9, 0xef, 0x06, 0xb9, 0xc7, 0xec, 0xbb, + 0xbc, 0x0c, 0xb2, 0x85, 0xb6, 0x9a, 0x5b, 0x68, 0xcd, 0x7b, 0xb0, 0x39, 0xef, 0xb8, 0xe4, 0xb9, + 0x64, 0xfe, 0x0c, 0x0f, 0xe6, 0x3d, 0x79, 0xe2, 0x58, 0xbc, 0x8f, 0x67, 0xcf, 0x5f, 0xab, 0xb0, + 0x75, 0xb5, 0x7e, 0xfd, 0x64, 0xdb, 0x29, 0xef, 0xcf, 0x1f, 0x96, 0x43, 0x7c, 0xc6, 0xbd, 0x74, + 0x71, 0x9e, 0xae, 0xcd, 0x5f, 0x95, 0xda, 0xd9, 0x1b, 0xa5, 0xd2, 0x66, 0xf6, 0x08, 0x1a, 0xe3, + 0xc8, 0xf3, 0x6e, 0xba, 0x7f, 0x62, 0x88, 0xd1, 0xd9, 0xde, 0x79, 0x4b, 0xc9, 0xa6, 0xc6, 0xd6, + 0xae, 0x13, 0x56, 0x47, 0x25, 0xc9, 0x2d, 0xcc, 0x7f, 0xe6, 0xff, 0xc1, 0x38, 0x53, 0x6b, 0xda, + 0xfb, 0x08, 0xfa, 0x6f, 0x61, 0x49, 0x6d, 0x47, 0xca, 0x09, 0xad, 0xd9, 0x11, 0x59, 0xdc, 0xab, + 0x70, 0x02, 0x46, 0x0f, 0xa0, 0x41, 0x5f, 0xba, 0xb6, 0xd4, 0x89, 0xbc, 0xa8, 0x12, 0x19, 0x14, + 0x49, 0x25, 0xb1, 0xf9, 0xaf, 0x0a, 0xdc, 0x7d, 0xc3, 0x4a, 0x36, 0x3d, 0xb6, 0xf2, 0x36, 0xc7, + 0xfe, 0x0e, 0x1a, 0xcc, 0xb6, 0x23, 0xce, 0x93, 0x85, 0xa6, 0x7a, 0xed, 0x42, 0x03, 0x29, 0xbc, + 0x27, 0x8b, 0x6b, 0xd4, 0x62, 0xf9, 0x65, 0x26, 0x73, 0x7f, 0x09, 0xa4, 0xde, 0xd5, 0xf9, 0xf5, + 0x1c, 0x3e, 0x50, 0xd7, 0xb4, 0xd4, 0xfd, 0xe2, 0x92, 0x4c, 0xfe, 0x18, 0xd3, 0x1e, 0xff, 0xb4, + 0xe4, 0x71, 0xe5, 0x80, 0x81, 0x86, 0xaa, 0x37, 0x57, 0x3c, 0x8e, 0xf0, 0xba, 0x3d, 0x43, 0x17, + 0x9f, 0x7f, 0x0b, 0xad, 0xe2, 0x4d, 0xd1, 0x1d, 0x68, 0x0f, 0x7e, 0x1c, 0xf4, 0xcf, 0x4e, 0xf7, + 0x8f, 0x8f, 0xac, 0x5e, 0xff, 0x74, 0xff, 0x7c, 0xd0, 0x5e, 0x40, 0x1b, 0x80, 0x72, 0x54, 0xdc, + 0x1f, 0xee, 0x9f, 0xc7, 0x5b, 0xc7, 0xee, 0xd7, 0x3f, 0xed, 0x4c, 0x5c, 0x79, 0x11, 0x8d, 0x3a, + 0x36, 0xf3, 0xbb, 0xca, 0x0e, 0xc6, 0x27, 0xdd, 0xec, 0xbf, 0xb6, 0x09, 0x0d, 0xba, 0xe1, 0xe8, + 0x37, 0x13, 0xd6, 0x2d, 0xfe, 0x29, 0x38, 0x5a, 0x56, 0xce, 0xfa, 0xea, 0xff, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xae, 0xb6, 0x27, 0x59, 0x86, 0x14, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go index 4b6bbe524c..d25236d491 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go @@ -1804,6 +1804,8 @@ func (m *ExecutionUpdateRequest) Validate() error { // no validation rules for State + // no validation rules for EvictCache + return nil } @@ -1953,6 +1955,16 @@ func (m *ExecutionUpdateResponse) Validate() error { return nil } + if v, ok := interface{}(m.GetCacheEvictionErrors()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ExecutionUpdateResponseValidationError{ + field: "CacheEvictionErrors", + reason: "embedded message failed validation", + cause: err, + } + } + } + return nil } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go index 1057668a07..e76782a1f1 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go @@ -589,6 +589,95 @@ func (m *TaskExecutionGetDataResponse) GetFullOutputs() *core.LiteralMap { return nil } +type TaskExecutionUpdateRequest struct { + // Identifier of the task execution to update + Id *core.TaskExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + // Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the + // execution DAG and remove all stored results from datacatalog. + EvictCache bool `protobuf:"varint,2,opt,name=evict_cache,json=evictCache,proto3" json:"evict_cache,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TaskExecutionUpdateRequest) Reset() { *m = TaskExecutionUpdateRequest{} } +func (m *TaskExecutionUpdateRequest) String() string { return proto.CompactTextString(m) } +func (*TaskExecutionUpdateRequest) ProtoMessage() {} +func (*TaskExecutionUpdateRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_8cde4c3aa101642e, []int{7} +} + +func (m *TaskExecutionUpdateRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_TaskExecutionUpdateRequest.Unmarshal(m, b) +} +func (m *TaskExecutionUpdateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_TaskExecutionUpdateRequest.Marshal(b, m, deterministic) +} +func (m *TaskExecutionUpdateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_TaskExecutionUpdateRequest.Merge(m, src) +} +func (m *TaskExecutionUpdateRequest) XXX_Size() int { + return xxx_messageInfo_TaskExecutionUpdateRequest.Size(m) +} +func (m *TaskExecutionUpdateRequest) XXX_DiscardUnknown() { + xxx_messageInfo_TaskExecutionUpdateRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_TaskExecutionUpdateRequest proto.InternalMessageInfo + +func (m *TaskExecutionUpdateRequest) GetId() *core.TaskExecutionIdentifier { + if m != nil { + return m.Id + } + return nil +} + +func (m *TaskExecutionUpdateRequest) GetEvictCache() bool { + if m != nil { + return m.EvictCache + } + return false +} + +type TaskExecutionUpdateResponse struct { + CacheEvictionErrors *core.CacheEvictionErrorList `protobuf:"bytes,1,opt,name=cache_eviction_errors,json=cacheEvictionErrors,proto3" json:"cache_eviction_errors,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TaskExecutionUpdateResponse) Reset() { *m = TaskExecutionUpdateResponse{} } +func (m *TaskExecutionUpdateResponse) String() string { return proto.CompactTextString(m) } +func (*TaskExecutionUpdateResponse) ProtoMessage() {} +func (*TaskExecutionUpdateResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_8cde4c3aa101642e, []int{8} +} + +func (m *TaskExecutionUpdateResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_TaskExecutionUpdateResponse.Unmarshal(m, b) +} +func (m *TaskExecutionUpdateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_TaskExecutionUpdateResponse.Marshal(b, m, deterministic) +} +func (m *TaskExecutionUpdateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_TaskExecutionUpdateResponse.Merge(m, src) +} +func (m *TaskExecutionUpdateResponse) XXX_Size() int { + return xxx_messageInfo_TaskExecutionUpdateResponse.Size(m) +} +func (m *TaskExecutionUpdateResponse) XXX_DiscardUnknown() { + xxx_messageInfo_TaskExecutionUpdateResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_TaskExecutionUpdateResponse proto.InternalMessageInfo + +func (m *TaskExecutionUpdateResponse) GetCacheEvictionErrors() *core.CacheEvictionErrorList { + if m != nil { + return m.CacheEvictionErrors + } + return nil +} + func init() { proto.RegisterType((*TaskExecutionGetRequest)(nil), "flyteidl.admin.TaskExecutionGetRequest") proto.RegisterType((*TaskExecutionListRequest)(nil), "flyteidl.admin.TaskExecutionListRequest") @@ -597,6 +686,8 @@ func init() { proto.RegisterType((*TaskExecutionClosure)(nil), "flyteidl.admin.TaskExecutionClosure") proto.RegisterType((*TaskExecutionGetDataRequest)(nil), "flyteidl.admin.TaskExecutionGetDataRequest") proto.RegisterType((*TaskExecutionGetDataResponse)(nil), "flyteidl.admin.TaskExecutionGetDataResponse") + proto.RegisterType((*TaskExecutionUpdateRequest)(nil), "flyteidl.admin.TaskExecutionUpdateRequest") + proto.RegisterType((*TaskExecutionUpdateResponse)(nil), "flyteidl.admin.TaskExecutionUpdateResponse") } func init() { @@ -604,59 +695,64 @@ func init() { } var fileDescriptor_8cde4c3aa101642e = []byte{ - // 851 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xdd, 0x6e, 0xdc, 0x44, - 0x14, 0xae, 0x37, 0xd9, 0xbf, 0xb3, 0xf9, 0x21, 0xa3, 0xa8, 0x31, 0x9b, 0x14, 0x56, 0x1b, 0x40, - 0x2b, 0xa4, 0xda, 0x52, 0xaa, 0x40, 0x41, 0x08, 0x91, 0xa5, 0x85, 0x46, 0x4a, 0xa1, 0x4c, 0x13, - 0x2e, 0xb8, 0xb1, 0x66, 0xd7, 0xb3, 0xdb, 0x51, 0x6c, 0x8f, 0x3b, 0x73, 0x5c, 0xb1, 0xf7, 0xbc, - 0x18, 0xcf, 0xc2, 0x1d, 0x4f, 0x81, 0x3c, 0x1e, 0x3b, 0xb1, 0x1b, 0xb2, 0x12, 0xdc, 0x58, 0x3a, - 0xe7, 0x7c, 0xdf, 0xf9, 0x3f, 0x63, 0x38, 0x5e, 0x44, 0x2b, 0xe4, 0x22, 0x8c, 0x7c, 0x16, 0xc6, - 0x22, 0xf1, 0x91, 0xe9, 0xeb, 0x80, 0xff, 0xce, 0xe7, 0x19, 0x0a, 0x99, 0x78, 0xa9, 0x92, 0x28, - 0xc9, 0x4e, 0x09, 0xf2, 0x0c, 0x68, 0x78, 0xd8, 0x20, 0xcd, 0x65, 0x1c, 0x97, 0xe0, 0xe1, 0xa3, - 0xca, 0x38, 0x97, 0x8a, 0xfb, 0x0d, 0x5f, 0xc3, 0x8f, 0xea, 0x66, 0x11, 0xf2, 0x04, 0xc5, 0x42, - 0x70, 0x65, 0xed, 0x47, 0x75, 0x7b, 0x24, 0x90, 0x2b, 0x16, 0x69, 0x6b, 0x1d, 0x56, 0x56, 0xfe, - 0x8e, 0x27, 0x58, 0x7c, 0xad, 0xed, 0xe3, 0xa5, 0x94, 0xcb, 0x88, 0xfb, 0x46, 0x9a, 0x65, 0x0b, - 0x1f, 0x45, 0xcc, 0x35, 0xb2, 0x38, 0x2d, 0x43, 0x37, 0x01, 0x61, 0xa6, 0xd8, 0xad, 0xd4, 0x8e, - 0x9a, 0x76, 0x8d, 0x2a, 0x9b, 0x5b, 0xf7, 0xe3, 0x5f, 0xe0, 0xe0, 0x92, 0xe9, 0xeb, 0xe7, 0x65, - 0x3d, 0x3f, 0x72, 0xa4, 0xfc, 0x6d, 0xc6, 0x35, 0x92, 0x2f, 0xa0, 0x25, 0x42, 0xd7, 0x19, 0x39, - 0x93, 0xc1, 0xc9, 0x67, 0x5e, 0xd5, 0xac, 0xbc, 0x00, 0xaf, 0xc6, 0x39, 0xaf, 0xaa, 0xa5, 0x2d, - 0x11, 0x8e, 0xff, 0x72, 0xc0, 0xad, 0xd9, 0x2f, 0x84, 0xae, 0x9c, 0x52, 0xd8, 0x4b, 0x64, 0xc8, - 0x6f, 0x86, 0x11, 0xfc, 0x6b, 0x8c, 0x9f, 0x64, 0xc8, 0xef, 0x8a, 0xb1, 0x9b, 0xd4, 0x0d, 0x64, - 0x1f, 0xda, 0x91, 0x88, 0x05, 0xba, 0xad, 0x91, 0x33, 0xd9, 0xa6, 0x85, 0x90, 0x6b, 0x51, 0x5e, - 0xf3, 0xc4, 0xdd, 0x18, 0x39, 0x93, 0x3e, 0x2d, 0x04, 0xe2, 0x42, 0x77, 0x21, 0x22, 0xe4, 0x4a, - 0xbb, 0x9b, 0x46, 0x5f, 0x8a, 0xe4, 0x31, 0x74, 0xb5, 0x54, 0x18, 0xcc, 0x56, 0x6e, 0xdb, 0xe4, - 0xb3, 0xef, 0xd5, 0x17, 0xc4, 0x7b, 0x2d, 0x15, 0xd2, 0x4e, 0x0e, 0x9a, 0xae, 0xc6, 0x7f, 0x3a, - 0xb0, 0x5d, 0xab, 0xf2, 0xbf, 0xf6, 0x8b, 0x1c, 0x42, 0x5f, 0x24, 0x69, 0x86, 0x41, 0xa6, 0x84, - 0x29, 0xa1, 0x4f, 0x7b, 0x46, 0x71, 0xa5, 0x04, 0xf9, 0x16, 0xba, 0xf3, 0x48, 0xea, 0x4c, 0x71, - 0x53, 0xc7, 0xe0, 0xe4, 0x93, 0x66, 0x56, 0x35, 0xd7, 0xdf, 0x17, 0x58, 0x5a, 0x92, 0x8c, 0x73, - 0x1d, 0xa4, 0x4c, 0xf1, 0x04, 0x4d, 0xc5, 0x3d, 0xda, 0x13, 0xfa, 0x95, 0x91, 0xc7, 0x6f, 0x61, - 0xef, 0xbd, 0x41, 0x91, 0x1f, 0x60, 0xb7, 0x7e, 0x2e, 0xda, 0x75, 0x46, 0x1b, 0x93, 0xc1, 0xc9, - 0xa3, 0x7b, 0x23, 0xd3, 0x1d, 0xbc, 0x2d, 0xea, 0x9b, 0xfe, 0xb7, 0x6e, 0xf5, 0x7f, 0xfc, 0x77, - 0x1b, 0xf6, 0xef, 0xca, 0x98, 0x1c, 0x03, 0xc8, 0x0c, 0xcb, 0x36, 0xe4, 0x5d, 0xec, 0x4f, 0x5b, - 0xae, 0xf3, 0xe2, 0x01, 0xed, 0x17, 0xfa, 0xbc, 0x1b, 0xa7, 0xd0, 0xe6, 0x4a, 0x49, 0x65, 0x7c, - 0xd6, 0x32, 0x32, 0x5d, 0xae, 0x9c, 0x3e, 0xcf, 0x41, 0x2f, 0x1e, 0xd0, 0x02, 0x4d, 0xbe, 0x83, - 0x81, 0xf5, 0x1d, 0x32, 0x64, 0xee, 0x96, 0x21, 0x7f, 0xd8, 0x20, 0x5f, 0x14, 0x37, 0xf9, 0x92, - 0xa5, 0x36, 0xae, 0xcd, 0xe7, 0x19, 0x43, 0x46, 0x9e, 0x42, 0x3b, 0x7d, 0xc3, 0x74, 0x31, 0x84, - 0x9d, 0x93, 0xf1, 0x7d, 0xe3, 0xf5, 0x5e, 0xe5, 0x48, 0x5a, 0x10, 0xc8, 0xe7, 0xb0, 0x19, 0xc9, - 0x65, 0xbe, 0x6d, 0x79, 0x0f, 0x1f, 0xde, 0x41, 0xbc, 0x90, 0x4b, 0x6a, 0x30, 0xe4, 0x2b, 0x00, - 0x8d, 0x4c, 0x21, 0x0f, 0x03, 0x86, 0x76, 0x0b, 0x87, 0x5e, 0x71, 0xbf, 0x5e, 0x79, 0xbf, 0xde, - 0x65, 0xf9, 0x00, 0xd0, 0xbe, 0x45, 0x9f, 0x21, 0x39, 0x85, 0x5e, 0x79, 0xf7, 0x6e, 0xc7, 0xd6, - 0xd7, 0x24, 0x3e, 0xb3, 0x00, 0x5a, 0x41, 0xf3, 0x88, 0x73, 0xc5, 0x99, 0x8d, 0xd8, 0x5d, 0x1f, - 0xd1, 0xa2, 0xcf, 0x30, 0xa7, 0x66, 0x69, 0x58, 0x52, 0x7b, 0xeb, 0xa9, 0x16, 0x7d, 0x86, 0xe4, - 0x29, 0x0c, 0xe6, 0x99, 0x46, 0x19, 0x07, 0x22, 0x59, 0x48, 0xb7, 0x6f, 0xb8, 0x07, 0xef, 0x71, - 0x5f, 0x9b, 0x87, 0x8a, 0x42, 0x81, 0x3d, 0x4f, 0x16, 0x92, 0x3c, 0x84, 0x8e, 0xe2, 0x4c, 0xcb, - 0xc4, 0x05, 0xb3, 0x55, 0x56, 0xca, 0xd7, 0xdc, 0x2c, 0x2d, 0xae, 0x52, 0xee, 0x0e, 0x8a, 0x1b, - 0xca, 0x15, 0x97, 0xab, 0x94, 0x93, 0x33, 0xe8, 0xc5, 0x1c, 0x99, 0x99, 0xfd, 0x07, 0x26, 0xd6, - 0xa7, 0x37, 0x63, 0x28, 0xde, 0xda, 0xda, 0x00, 0x5f, 0x5a, 0x30, 0xad, 0x68, 0xe4, 0x18, 0xb6, - 0x0d, 0x30, 0x78, 0xc7, 0x95, 0xce, 0x7b, 0xbc, 0x37, 0x72, 0x26, 0x6d, 0xba, 0x65, 0x94, 0xbf, - 0x16, 0xba, 0xe9, 0x2e, 0x6c, 0xdb, 0x35, 0x53, 0x5c, 0x67, 0x11, 0x8e, 0xaf, 0xe0, 0xb0, 0xf9, - 0xb8, 0xe6, 0xdb, 0xf4, 0x7f, 0x1f, 0xd8, 0x3f, 0x5a, 0x70, 0x74, 0xb7, 0x5f, 0x9d, 0xca, 0x44, - 0x73, 0xf2, 0x04, 0x3a, 0xe6, 0x01, 0xd1, 0xd6, 0xf9, 0x41, 0xf3, 0x72, 0xaf, 0x54, 0x34, 0x8d, - 0xe4, 0x2c, 0x5f, 0x74, 0x6a, 0xa1, 0xe4, 0x14, 0xba, 0x45, 0xf6, 0xda, 0x5e, 0xd7, 0xbd, 0xac, - 0x12, 0x4b, 0xbe, 0x86, 0xc1, 0x22, 0x8b, 0xa2, 0xc0, 0x06, 0xdc, 0x58, 0x73, 0x5b, 0x14, 0x72, - 0xf4, 0x79, 0x11, 0xf2, 0x1b, 0xd8, 0x32, 0xdc, 0x32, 0xee, 0xe6, 0x3a, 0xb2, 0x09, 0xf5, 0x73, - 0x81, 0x9e, 0x7e, 0xf9, 0xdb, 0xe9, 0x52, 0xe0, 0x9b, 0x6c, 0xe6, 0xcd, 0x65, 0xec, 0x1b, 0x8e, - 0x54, 0x4b, 0xbf, 0xfa, 0x97, 0x2e, 0x79, 0xe2, 0xa7, 0xb3, 0xc7, 0x4b, 0xe9, 0xd7, 0x7f, 0xec, - 0xb3, 0x8e, 0xd9, 0xb0, 0x27, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x34, 0x93, 0x80, 0x05, 0x26, - 0x08, 0x00, 0x00, + // 930 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x6d, 0x6f, 0x1b, 0x45, + 0x10, 0xae, 0x9d, 0x38, 0xb6, 0xc7, 0x79, 0x21, 0x4b, 0x68, 0x0e, 0x27, 0xa5, 0x96, 0x43, 0x91, + 0x85, 0xd4, 0xb3, 0x94, 0x2a, 0x50, 0x10, 0x42, 0xc4, 0x6d, 0xa0, 0x91, 0x52, 0x28, 0xdb, 0x04, + 0x09, 0xbe, 0x9c, 0xd6, 0x77, 0x6b, 0x67, 0x95, 0xf3, 0xed, 0x75, 0x77, 0x2f, 0xaa, 0xbf, 0xf3, + 0xc7, 0xf8, 0x2d, 0x7c, 0xe3, 0x57, 0xa0, 0x9d, 0xdb, 0x73, 0x72, 0x97, 0x90, 0x48, 0xf4, 0x8b, + 0xa5, 0x9d, 0x79, 0x9e, 0x79, 0x66, 0xe7, 0x65, 0x7d, 0xb0, 0x37, 0x89, 0xe7, 0x86, 0x8b, 0x28, + 0x1e, 0xb2, 0x68, 0x26, 0x92, 0xa1, 0x61, 0xfa, 0x22, 0xe0, 0xef, 0x79, 0x98, 0x19, 0x21, 0x13, + 0x3f, 0x55, 0xd2, 0x48, 0xb2, 0x5e, 0x80, 0x7c, 0x04, 0x75, 0x77, 0x2a, 0xa4, 0x50, 0xce, 0x66, + 0x05, 0xb8, 0xdb, 0x5d, 0x38, 0x43, 0xa9, 0xf8, 0x90, 0x2b, 0x25, 0x95, 0x76, 0xbe, 0x47, 0x15, + 0x5f, 0x59, 0xa7, 0xfb, 0x59, 0xd9, 0x2d, 0x22, 0x9e, 0x18, 0x31, 0x11, 0x5c, 0x39, 0xff, 0x6e, + 0xd9, 0x1f, 0x0b, 0xc3, 0x15, 0x8b, 0xf5, 0x0d, 0x61, 0x7e, 0xc9, 0x13, 0x93, 0xff, 0x3a, 0xdf, + 0xe3, 0xa9, 0x94, 0xd3, 0x98, 0x0f, 0xf1, 0x34, 0xce, 0x26, 0x43, 0x23, 0x66, 0x5c, 0x1b, 0x36, + 0x4b, 0x0b, 0xe9, 0x2a, 0x20, 0xca, 0x14, 0xbb, 0x96, 0xda, 0x6e, 0xd5, 0xaf, 0x8d, 0xca, 0x42, + 0x17, 0xbe, 0xff, 0x2b, 0x6c, 0x9f, 0x32, 0x7d, 0x71, 0x54, 0xdc, 0xe7, 0x27, 0x6e, 0x28, 0x7f, + 0x97, 0x71, 0x6d, 0xc8, 0x57, 0x50, 0x17, 0x91, 0x57, 0xeb, 0xd5, 0x06, 0x9d, 0xfd, 0x2f, 0xfc, + 0x45, 0x21, 0xed, 0x05, 0xfc, 0x12, 0xe7, 0x78, 0x71, 0x5b, 0x5a, 0x17, 0x51, 0xff, 0xef, 0x1a, + 0x78, 0x25, 0xff, 0x89, 0xd0, 0x8b, 0xa0, 0x14, 0x36, 0x13, 0x19, 0xf1, 0xab, 0x46, 0x05, 0xff, + 0xa9, 0xf1, 0xb3, 0x8c, 0xf8, 0x6d, 0x1a, 0x1b, 0x49, 0xd9, 0x41, 0xb6, 0xa0, 0x11, 0x8b, 0x99, + 0x30, 0x5e, 0xbd, 0x57, 0x1b, 0xac, 0xd1, 0xfc, 0x60, 0xad, 0x46, 0x5e, 0xf0, 0xc4, 0x5b, 0xea, + 0xd5, 0x06, 0x6d, 0x9a, 0x1f, 0x88, 0x07, 0xcd, 0x89, 0x88, 0x0d, 0x57, 0xda, 0x5b, 0x46, 0x7b, + 0x71, 0x24, 0x4f, 0xa1, 0xa9, 0xa5, 0x32, 0xc1, 0x78, 0xee, 0x35, 0x30, 0x9f, 0x2d, 0xbf, 0x3c, + 0x3c, 0xfe, 0x5b, 0xa9, 0x0c, 0x5d, 0xb1, 0xa0, 0xd1, 0xbc, 0xff, 0x57, 0x0d, 0xd6, 0x4a, 0xb7, + 0xfc, 0xbf, 0xf5, 0x22, 0x3b, 0xd0, 0x16, 0x49, 0x9a, 0x99, 0x20, 0x53, 0x02, 0xaf, 0xd0, 0xa6, + 0x2d, 0x34, 0x9c, 0x29, 0x41, 0xbe, 0x87, 0x66, 0x18, 0x4b, 0x9d, 0x29, 0x8e, 0xf7, 0xe8, 0xec, + 0x7f, 0x5e, 0xcd, 0xaa, 0x14, 0xfa, 0x45, 0x8e, 0xa5, 0x05, 0x09, 0x83, 0xeb, 0x20, 0x65, 0x8a, + 0x27, 0x06, 0x6f, 0xdc, 0xa2, 0x2d, 0xa1, 0xdf, 0xe0, 0xb9, 0xff, 0x0e, 0x36, 0x6f, 0x34, 0x8a, + 0xfc, 0x08, 0x1b, 0xe5, 0x55, 0xd2, 0x5e, 0xad, 0xb7, 0x34, 0xe8, 0xec, 0x3f, 0xba, 0x53, 0x99, + 0xae, 0x9b, 0xeb, 0x47, 0x7d, 0x55, 0xff, 0xfa, 0xb5, 0xfa, 0xf7, 0xff, 0x69, 0xc0, 0xd6, 0x6d, + 0x19, 0x93, 0x3d, 0x00, 0x99, 0x99, 0xa2, 0x0c, 0xb6, 0x8a, 0xed, 0x51, 0xdd, 0xab, 0xbd, 0x7a, + 0x40, 0xdb, 0xb9, 0xdd, 0x56, 0xe3, 0x00, 0x1a, 0xb8, 0x95, 0x18, 0xb3, 0x94, 0x11, 0x56, 0x79, + 0x11, 0xf4, 0xc8, 0x82, 0x5e, 0x3d, 0xa0, 0x39, 0x9a, 0xfc, 0x00, 0x1d, 0x17, 0x3b, 0x62, 0x86, + 0x79, 0xab, 0x48, 0xfe, 0xb4, 0x42, 0x3e, 0xc9, 0x77, 0xf2, 0x35, 0x4b, 0x9d, 0xae, 0xcb, 0xe7, + 0x25, 0x33, 0x8c, 0x3c, 0x87, 0x46, 0x7a, 0xce, 0x74, 0xde, 0x84, 0xf5, 0xfd, 0xfe, 0x5d, 0xed, + 0xf5, 0xdf, 0x58, 0x24, 0xcd, 0x09, 0xe4, 0x4b, 0x58, 0x8e, 0xe5, 0xd4, 0x4e, 0x9b, 0xad, 0xe1, + 0xc3, 0x5b, 0x88, 0x27, 0x72, 0x4a, 0x11, 0x43, 0xbe, 0x01, 0xd0, 0x86, 0x29, 0xc3, 0xa3, 0x80, + 0x19, 0x37, 0x85, 0x5d, 0x3f, 0xdf, 0x5f, 0xbf, 0xd8, 0x5f, 0xff, 0xb4, 0x78, 0x00, 0x68, 0xdb, + 0xa1, 0x0f, 0x0d, 0x39, 0x80, 0x56, 0xb1, 0xf7, 0xde, 0x8a, 0xbb, 0x5f, 0x95, 0xf8, 0xd2, 0x01, + 0xe8, 0x02, 0x6a, 0x15, 0x43, 0xc5, 0x99, 0x53, 0x6c, 0xde, 0xaf, 0xe8, 0xd0, 0x87, 0xc6, 0x52, + 0xb3, 0x34, 0x2a, 0xa8, 0xad, 0xfb, 0xa9, 0x0e, 0x7d, 0x68, 0xc8, 0x73, 0xe8, 0x84, 0x99, 0x36, + 0x72, 0x16, 0x88, 0x64, 0x22, 0xbd, 0x36, 0x72, 0xb7, 0x6f, 0x70, 0xdf, 0xe2, 0x43, 0x45, 0x21, + 0xc7, 0x1e, 0x27, 0x13, 0x49, 0x1e, 0xc2, 0x8a, 0xe2, 0x4c, 0xcb, 0xc4, 0x03, 0x9c, 0x2a, 0x77, + 0xb2, 0x63, 0x8e, 0x43, 0x6b, 0xe6, 0x29, 0xf7, 0x3a, 0xf9, 0x0e, 0x59, 0xc3, 0xe9, 0x3c, 0xe5, + 0xe4, 0x10, 0x5a, 0x33, 0x6e, 0x18, 0xf6, 0xfe, 0x23, 0xd4, 0x7a, 0x72, 0xd5, 0x86, 0xfc, 0xad, + 0x2d, 0x35, 0xf0, 0xb5, 0x03, 0xd3, 0x05, 0x8d, 0xec, 0xc1, 0x1a, 0x02, 0x83, 0x4b, 0xae, 0xb4, + 0xad, 0xf1, 0x66, 0xaf, 0x36, 0x68, 0xd0, 0x55, 0x34, 0xfe, 0x96, 0xdb, 0x46, 0x1b, 0xb0, 0xe6, + 0xc6, 0x4c, 0x71, 0x9d, 0xc5, 0xa6, 0x7f, 0x06, 0x3b, 0xd5, 0xc7, 0xd5, 0x4e, 0xd3, 0x87, 0x3e, + 0xb0, 0x7f, 0xd6, 0x61, 0xf7, 0xf6, 0xb8, 0x3a, 0x95, 0x89, 0xe6, 0xe4, 0x19, 0xac, 0xe0, 0x03, + 0xa2, 0x5d, 0xf0, 0xed, 0xea, 0xe6, 0x9e, 0xa9, 0x78, 0x14, 0xcb, 0xb1, 0x1d, 0x74, 0xea, 0xa0, + 0xe4, 0x00, 0x9a, 0x79, 0xf6, 0xda, 0x6d, 0xd7, 0x9d, 0xac, 0x02, 0x4b, 0xbe, 0x85, 0xce, 0x24, + 0x8b, 0xe3, 0xc0, 0x09, 0x2e, 0xdd, 0xb3, 0x5b, 0x14, 0x2c, 0xfa, 0x38, 0x97, 0xfc, 0x0e, 0x56, + 0x91, 0x5b, 0xe8, 0x2e, 0xdf, 0x47, 0x46, 0xa9, 0x5f, 0x72, 0x74, 0x3f, 0x83, 0x6e, 0xa9, 0x0a, + 0x67, 0x38, 0x5f, 0x1f, 0x58, 0x5c, 0xf2, 0x18, 0x3a, 0xfc, 0x52, 0x84, 0x26, 0x08, 0x59, 0x78, + 0xce, 0xb1, 0x14, 0x2d, 0x0a, 0x68, 0x7a, 0x61, 0x2d, 0xfd, 0xf7, 0x95, 0xa6, 0x16, 0xb2, 0xae, + 0xf6, 0xbf, 0xc3, 0x27, 0xc8, 0x0c, 0x90, 0x62, 0xff, 0xe0, 0xf2, 0xef, 0x08, 0x97, 0xca, 0x93, + 0x4a, 0x2a, 0x18, 0xf3, 0xc8, 0x41, 0xf1, 0xd9, 0xc2, 0x7f, 0xcb, 0x8f, 0xc3, 0x1b, 0x76, 0x3d, + 0xfa, 0xfa, 0x8f, 0x83, 0xa9, 0x30, 0xe7, 0xd9, 0xd8, 0x0f, 0xe5, 0x6c, 0x88, 0x71, 0xa4, 0x9a, + 0x0e, 0x17, 0x1f, 0x0f, 0x53, 0x9e, 0x0c, 0xd3, 0xf1, 0xd3, 0xa9, 0x1c, 0x96, 0xbf, 0x72, 0xc6, + 0x2b, 0xb8, 0x52, 0xcf, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x7f, 0x0e, 0x85, 0x33, 0x09, + 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go index 15652bacc2..b57984bd06 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go @@ -749,3 +749,160 @@ var _ interface { Cause() error ErrorName() string } = TaskExecutionGetDataResponseValidationError{} + +// Validate checks the field values on TaskExecutionUpdateRequest with the +// rules defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *TaskExecutionUpdateRequest) Validate() error { + if m == nil { + return nil + } + + if v, ok := interface{}(m.GetId()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TaskExecutionUpdateRequestValidationError{ + field: "Id", + reason: "embedded message failed validation", + cause: err, + } + } + } + + // no validation rules for EvictCache + + return nil +} + +// TaskExecutionUpdateRequestValidationError is the validation error returned +// by TaskExecutionUpdateRequest.Validate if the designated constraints aren't met. +type TaskExecutionUpdateRequestValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e TaskExecutionUpdateRequestValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e TaskExecutionUpdateRequestValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e TaskExecutionUpdateRequestValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e TaskExecutionUpdateRequestValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e TaskExecutionUpdateRequestValidationError) ErrorName() string { + return "TaskExecutionUpdateRequestValidationError" +} + +// Error satisfies the builtin error interface +func (e TaskExecutionUpdateRequestValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sTaskExecutionUpdateRequest.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = TaskExecutionUpdateRequestValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = TaskExecutionUpdateRequestValidationError{} + +// Validate checks the field values on TaskExecutionUpdateResponse with the +// rules defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *TaskExecutionUpdateResponse) Validate() error { + if m == nil { + return nil + } + + if v, ok := interface{}(m.GetCacheEvictionErrors()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TaskExecutionUpdateResponseValidationError{ + field: "CacheEvictionErrors", + reason: "embedded message failed validation", + cause: err, + } + } + } + + return nil +} + +// TaskExecutionUpdateResponseValidationError is the validation error returned +// by TaskExecutionUpdateResponse.Validate if the designated constraints +// aren't met. +type TaskExecutionUpdateResponseValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e TaskExecutionUpdateResponseValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e TaskExecutionUpdateResponseValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e TaskExecutionUpdateResponseValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e TaskExecutionUpdateResponseValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e TaskExecutionUpdateResponseValidationError) ErrorName() string { + return "TaskExecutionUpdateResponseValidationError" +} + +// Error satisfies the builtin error interface +func (e TaskExecutionUpdateResponseValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sTaskExecutionUpdateResponse.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = TaskExecutionUpdateResponseValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = TaskExecutionUpdateResponseValidationError{} diff --git a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go index 6e12d3b805..f5f9ae5edd 100644 --- a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go @@ -46,6 +46,28 @@ func (ContainerError_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor_c2a49b99f342b879, []int{0, 0} } +type CacheEvictionError_Code int32 + +const ( + CacheEvictionError_UNKNOWN CacheEvictionError_Code = 0 +) + +var CacheEvictionError_Code_name = map[int32]string{ + 0: "UNKNOWN", +} + +var CacheEvictionError_Code_value = map[string]int32{ + "UNKNOWN": 0, +} + +func (x CacheEvictionError_Code) String() string { + return proto.EnumName(CacheEvictionError_Code_name, int32(x)) +} + +func (CacheEvictionError_Code) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_c2a49b99f342b879, []int{2, 0} +} + // Error message to propagate detailed errors from container executions to the execution // engine. type ContainerError struct { @@ -157,32 +179,197 @@ func (m *ErrorDocument) GetError() *ContainerError { return nil } +// Error returned if eviction of cached output fails and should be re-tried by the user. +type CacheEvictionError struct { + // Error code to match type of cache eviction error encountered. + Code CacheEvictionError_Code `protobuf:"varint,1,opt,name=code,proto3,enum=flyteidl.core.CacheEvictionError_Code" json:"code,omitempty"` + // More detailed error message explaining the reason for the cache eviction failure. + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + // ID of the node execution the cache eviction failed for. + NodeExecutionId *NodeExecutionIdentifier `protobuf:"bytes,3,opt,name=node_execution_id,json=nodeExecutionId,proto3" json:"node_execution_id,omitempty"` + // Source of the node execution. + // + // Types that are valid to be assigned to Source: + // *CacheEvictionError_TaskExecutionId + // *CacheEvictionError_WorkflowExecutionId + Source isCacheEvictionError_Source `protobuf_oneof:"source"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CacheEvictionError) Reset() { *m = CacheEvictionError{} } +func (m *CacheEvictionError) String() string { return proto.CompactTextString(m) } +func (*CacheEvictionError) ProtoMessage() {} +func (*CacheEvictionError) Descriptor() ([]byte, []int) { + return fileDescriptor_c2a49b99f342b879, []int{2} +} + +func (m *CacheEvictionError) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CacheEvictionError.Unmarshal(m, b) +} +func (m *CacheEvictionError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CacheEvictionError.Marshal(b, m, deterministic) +} +func (m *CacheEvictionError) XXX_Merge(src proto.Message) { + xxx_messageInfo_CacheEvictionError.Merge(m, src) +} +func (m *CacheEvictionError) XXX_Size() int { + return xxx_messageInfo_CacheEvictionError.Size(m) +} +func (m *CacheEvictionError) XXX_DiscardUnknown() { + xxx_messageInfo_CacheEvictionError.DiscardUnknown(m) +} + +var xxx_messageInfo_CacheEvictionError proto.InternalMessageInfo + +func (m *CacheEvictionError) GetCode() CacheEvictionError_Code { + if m != nil { + return m.Code + } + return CacheEvictionError_UNKNOWN +} + +func (m *CacheEvictionError) GetMessage() string { + if m != nil { + return m.Message + } + return "" +} + +func (m *CacheEvictionError) GetNodeExecutionId() *NodeExecutionIdentifier { + if m != nil { + return m.NodeExecutionId + } + return nil +} + +type isCacheEvictionError_Source interface { + isCacheEvictionError_Source() +} + +type CacheEvictionError_TaskExecutionId struct { + TaskExecutionId *TaskExecutionIdentifier `protobuf:"bytes,4,opt,name=task_execution_id,json=taskExecutionId,proto3,oneof"` +} + +type CacheEvictionError_WorkflowExecutionId struct { + WorkflowExecutionId *WorkflowExecutionIdentifier `protobuf:"bytes,5,opt,name=workflow_execution_id,json=workflowExecutionId,proto3,oneof"` +} + +func (*CacheEvictionError_TaskExecutionId) isCacheEvictionError_Source() {} + +func (*CacheEvictionError_WorkflowExecutionId) isCacheEvictionError_Source() {} + +func (m *CacheEvictionError) GetSource() isCacheEvictionError_Source { + if m != nil { + return m.Source + } + return nil +} + +func (m *CacheEvictionError) GetTaskExecutionId() *TaskExecutionIdentifier { + if x, ok := m.GetSource().(*CacheEvictionError_TaskExecutionId); ok { + return x.TaskExecutionId + } + return nil +} + +func (m *CacheEvictionError) GetWorkflowExecutionId() *WorkflowExecutionIdentifier { + if x, ok := m.GetSource().(*CacheEvictionError_WorkflowExecutionId); ok { + return x.WorkflowExecutionId + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*CacheEvictionError) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*CacheEvictionError_TaskExecutionId)(nil), + (*CacheEvictionError_WorkflowExecutionId)(nil), + } +} + +// List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request. +type CacheEvictionErrorList struct { + Errors []*CacheEvictionError `protobuf:"bytes,1,rep,name=errors,proto3" json:"errors,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CacheEvictionErrorList) Reset() { *m = CacheEvictionErrorList{} } +func (m *CacheEvictionErrorList) String() string { return proto.CompactTextString(m) } +func (*CacheEvictionErrorList) ProtoMessage() {} +func (*CacheEvictionErrorList) Descriptor() ([]byte, []int) { + return fileDescriptor_c2a49b99f342b879, []int{3} +} + +func (m *CacheEvictionErrorList) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CacheEvictionErrorList.Unmarshal(m, b) +} +func (m *CacheEvictionErrorList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CacheEvictionErrorList.Marshal(b, m, deterministic) +} +func (m *CacheEvictionErrorList) XXX_Merge(src proto.Message) { + xxx_messageInfo_CacheEvictionErrorList.Merge(m, src) +} +func (m *CacheEvictionErrorList) XXX_Size() int { + return xxx_messageInfo_CacheEvictionErrorList.Size(m) +} +func (m *CacheEvictionErrorList) XXX_DiscardUnknown() { + xxx_messageInfo_CacheEvictionErrorList.DiscardUnknown(m) +} + +var xxx_messageInfo_CacheEvictionErrorList proto.InternalMessageInfo + +func (m *CacheEvictionErrorList) GetErrors() []*CacheEvictionError { + if m != nil { + return m.Errors + } + return nil +} + func init() { proto.RegisterEnum("flyteidl.core.ContainerError_Kind", ContainerError_Kind_name, ContainerError_Kind_value) + proto.RegisterEnum("flyteidl.core.CacheEvictionError_Code", CacheEvictionError_Code_name, CacheEvictionError_Code_value) proto.RegisterType((*ContainerError)(nil), "flyteidl.core.ContainerError") proto.RegisterType((*ErrorDocument)(nil), "flyteidl.core.ErrorDocument") + proto.RegisterType((*CacheEvictionError)(nil), "flyteidl.core.CacheEvictionError") + proto.RegisterType((*CacheEvictionErrorList)(nil), "flyteidl.core.CacheEvictionErrorList") } func init() { proto.RegisterFile("flyteidl/core/errors.proto", fileDescriptor_c2a49b99f342b879) } var fileDescriptor_c2a49b99f342b879 = []byte{ - // 283 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4b, 0xc3, 0x30, - 0x14, 0xc6, 0xad, 0xd6, 0x89, 0x6f, 0x6c, 0x93, 0x78, 0x29, 0x83, 0xc1, 0xe8, 0xc5, 0x1d, 0x34, - 0x81, 0x4d, 0x76, 0x15, 0xb7, 0xf5, 0xa4, 0x6c, 0xd0, 0x83, 0x07, 0x2f, 0xb2, 0xb6, 0x31, 0x06, - 0xd7, 0xbc, 0x91, 0xa6, 0xa0, 0x7f, 0xb0, 0xff, 0x87, 0xf4, 0xd5, 0x8a, 0xdd, 0xc1, 0x4b, 0xc8, - 0x7b, 0xef, 0xfb, 0x7d, 0x79, 0xf9, 0x60, 0xf8, 0xba, 0xfb, 0x74, 0x52, 0x67, 0x3b, 0x91, 0xa2, - 0x95, 0x42, 0x5a, 0x8b, 0xb6, 0xe0, 0x7b, 0x8b, 0x0e, 0x59, 0xaf, 0x99, 0xf1, 0x6a, 0x36, 0x1c, - 0x1d, 0x48, 0x3f, 0x64, 0x5a, 0x3a, 0x8d, 0xa6, 0x56, 0x87, 0x5f, 0x1e, 0xf4, 0x97, 0x68, 0xdc, - 0x56, 0x1b, 0x69, 0xa3, 0xca, 0x87, 0x31, 0xf0, 0x53, 0xcc, 0x64, 0xe0, 0x8d, 0xbd, 0xc9, 0x79, - 0x4c, 0x77, 0x16, 0xc0, 0x59, 0x2e, 0x8b, 0x62, 0xab, 0x64, 0x70, 0x4c, 0xed, 0xa6, 0x64, 0x73, - 0xf0, 0xdf, 0xb5, 0xc9, 0x82, 0x93, 0xb1, 0x37, 0xe9, 0x4f, 0x43, 0xde, 0x7a, 0x9d, 0xb7, 0xad, - 0xf9, 0x83, 0x36, 0x59, 0x4c, 0x7a, 0x76, 0x07, 0x1d, 0xb4, 0x5a, 0x69, 0x13, 0xf8, 0x44, 0x5e, - 0x1d, 0x90, 0x51, 0xb3, 0x68, 0x4d, 0xd2, 0x49, 0xf8, 0x0f, 0x16, 0x5e, 0x83, 0x5f, 0xd5, 0xec, - 0x12, 0x06, 0xeb, 0xcd, 0xfa, 0x25, 0x8e, 0x96, 0x9b, 0xa7, 0x28, 0xbe, 0x5f, 0x3c, 0x46, 0x17, - 0x47, 0x6c, 0x00, 0xdd, 0xbf, 0x0d, 0x2f, 0x5c, 0x41, 0x8f, 0x2c, 0x56, 0x98, 0x96, 0xb9, 0x34, - 0x8e, 0xcd, 0xe0, 0x94, 0x62, 0xa3, 0x6f, 0x76, 0xa7, 0xa3, 0x7f, 0x17, 0x8f, 0x6b, 0xed, 0x62, - 0xfe, 0x7c, 0xab, 0xb4, 0x7b, 0x2b, 0x13, 0x9e, 0x62, 0x2e, 0x88, 0x40, 0xab, 0xc4, 0x6f, 0xc4, - 0x4a, 0x1a, 0xb1, 0x4f, 0x6e, 0x14, 0x8a, 0x56, 0xea, 0x49, 0x87, 0xc2, 0x9e, 0x7d, 0x07, 0x00, - 0x00, 0xff, 0xff, 0x79, 0x84, 0xe2, 0xf9, 0xb8, 0x01, 0x00, 0x00, + // 465 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x61, 0x6b, 0xd3, 0x40, + 0x18, 0xc7, 0x1b, 0x9b, 0x75, 0xfa, 0x84, 0xb5, 0xdb, 0x15, 0x25, 0x14, 0x26, 0x35, 0x2f, 0xb4, + 0x88, 0x26, 0xd0, 0xc9, 0x40, 0xdf, 0x88, 0xed, 0x02, 0xca, 0x46, 0x0a, 0x71, 0x3a, 0xf0, 0x4d, + 0x4d, 0x93, 0xa7, 0xd9, 0xd1, 0xf6, 0x9e, 0x71, 0xb9, 0x5a, 0xfd, 0x20, 0x7e, 0x44, 0xbf, 0x87, + 0xf4, 0xd2, 0x86, 0xa5, 0x2d, 0xeb, 0x9b, 0x90, 0xbb, 0xff, 0xf3, 0xff, 0xdd, 0xdd, 0xff, 0xe1, + 0x81, 0xd6, 0x78, 0xfa, 0x47, 0x21, 0x4f, 0xa6, 0x5e, 0x4c, 0x12, 0x3d, 0x94, 0x92, 0x64, 0xe6, + 0xde, 0x49, 0x52, 0xc4, 0x8e, 0xd6, 0x9a, 0xbb, 0xd4, 0x5a, 0xa7, 0x1b, 0xa5, 0xbf, 0x31, 0x9e, + 0x2b, 0x4e, 0x22, 0xaf, 0x6e, 0x3d, 0x2f, 0xcb, 0x3c, 0x41, 0xa1, 0xf8, 0x98, 0xa3, 0xcc, 0x75, + 0xe7, 0x9f, 0x01, 0xf5, 0x3e, 0x09, 0x15, 0x71, 0x81, 0xd2, 0x5f, 0x9e, 0xc3, 0x18, 0x98, 0x31, + 0x25, 0x68, 0x1b, 0x6d, 0xa3, 0xf3, 0x24, 0xd4, 0xff, 0xcc, 0x86, 0xc3, 0x19, 0x66, 0x59, 0x94, + 0xa2, 0xfd, 0x48, 0x6f, 0xaf, 0x97, 0xec, 0x1c, 0xcc, 0x09, 0x17, 0x89, 0x5d, 0x6d, 0x1b, 0x9d, + 0x7a, 0xd7, 0x71, 0x4b, 0xb7, 0x73, 0xcb, 0x68, 0xf7, 0x92, 0x8b, 0x24, 0xd4, 0xf5, 0xec, 0x23, + 0xd4, 0x48, 0xf2, 0x94, 0x0b, 0xdb, 0xd4, 0xce, 0x57, 0x1b, 0x4e, 0x7f, 0xfd, 0x90, 0xdc, 0xa9, + 0xbf, 0xda, 0xbe, 0xb2, 0x39, 0x6f, 0xc0, 0x5c, 0xae, 0x59, 0x13, 0x1a, 0xc1, 0x20, 0x18, 0x86, + 0x7e, 0x7f, 0xf0, 0xdd, 0x0f, 0x3f, 0xf5, 0xae, 0xfc, 0xe3, 0x0a, 0x6b, 0x80, 0x75, 0x7f, 0xc3, + 0x70, 0x2e, 0xe0, 0x48, 0x23, 0x2e, 0x28, 0x9e, 0xcf, 0x50, 0x28, 0x76, 0x06, 0x07, 0x3a, 0x56, + 0xfd, 0x4c, 0xab, 0x7b, 0xfa, 0xe0, 0xc5, 0xc3, 0xbc, 0xd6, 0xf9, 0x5b, 0x05, 0xd6, 0x8f, 0xe2, + 0x5b, 0xf4, 0x7f, 0xf1, 0xb8, 0xb8, 0x1c, 0xfb, 0x70, 0x2f, 0xb1, 0x7a, 0xf7, 0xe5, 0x26, 0x6a, + 0xcb, 0xe0, 0xf6, 0x29, 0xc1, 0xbd, 0xc9, 0x86, 0x70, 0x22, 0x28, 0xc1, 0x61, 0xd1, 0xd2, 0x21, + 0xcf, 0x63, 0xb6, 0xb6, 0x8e, 0x08, 0x28, 0xc1, 0x22, 0xb0, 0x2f, 0x45, 0x8f, 0xc3, 0x86, 0x28, + 0x0b, 0xec, 0x1a, 0x4e, 0x54, 0x94, 0x4d, 0xca, 0x4c, 0x73, 0x27, 0xf3, 0x3a, 0xca, 0x26, 0x3b, + 0x98, 0x9f, 0x2b, 0x61, 0x43, 0x95, 0x25, 0xf6, 0x13, 0x9e, 0x2e, 0x48, 0x4e, 0xc6, 0x53, 0x5a, + 0x94, 0xc9, 0x07, 0x9a, 0xfc, 0x7a, 0x83, 0x7c, 0xb3, 0xaa, 0xdd, 0x4d, 0x6f, 0x2e, 0xb6, 0x65, + 0xa7, 0x09, 0xe6, 0x32, 0x33, 0x66, 0xc1, 0xe1, 0xb7, 0xe0, 0x32, 0x18, 0xdc, 0x04, 0xc7, 0x95, + 0xde, 0x63, 0xa8, 0x65, 0x34, 0x97, 0x31, 0x3a, 0x5f, 0xe1, 0xd9, 0x76, 0xca, 0x57, 0x3c, 0x53, + 0xec, 0x3d, 0xd4, 0xf2, 0xe9, 0xb1, 0x8d, 0x76, 0xb5, 0x63, 0x75, 0x5f, 0xec, 0x6d, 0x4e, 0xb8, + 0x32, 0xf4, 0xce, 0x7f, 0xbc, 0x4b, 0xb9, 0xba, 0x9d, 0x8f, 0xdc, 0x98, 0x66, 0x9e, 0xb6, 0x91, + 0x4c, 0xbd, 0x62, 0xa0, 0x52, 0x14, 0xde, 0xdd, 0xe8, 0x6d, 0x4a, 0x5e, 0x69, 0xc6, 0x46, 0x35, + 0x3d, 0x59, 0x67, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xba, 0xc5, 0x03, 0xc5, 0x03, 0x00, + 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go index 4d091b1e6d..376ac3e429 100644 --- a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go @@ -183,3 +183,194 @@ var _ interface { Cause() error ErrorName() string } = ErrorDocumentValidationError{} + +// Validate checks the field values on CacheEvictionError with the rules +// defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *CacheEvictionError) Validate() error { + if m == nil { + return nil + } + + // no validation rules for Code + + // no validation rules for Message + + if v, ok := interface{}(m.GetNodeExecutionId()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CacheEvictionErrorValidationError{ + field: "NodeExecutionId", + reason: "embedded message failed validation", + cause: err, + } + } + } + + switch m.Source.(type) { + + case *CacheEvictionError_TaskExecutionId: + + if v, ok := interface{}(m.GetTaskExecutionId()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CacheEvictionErrorValidationError{ + field: "TaskExecutionId", + reason: "embedded message failed validation", + cause: err, + } + } + } + + case *CacheEvictionError_WorkflowExecutionId: + + if v, ok := interface{}(m.GetWorkflowExecutionId()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CacheEvictionErrorValidationError{ + field: "WorkflowExecutionId", + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// CacheEvictionErrorValidationError is the validation error returned by +// CacheEvictionError.Validate if the designated constraints aren't met. +type CacheEvictionErrorValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e CacheEvictionErrorValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e CacheEvictionErrorValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e CacheEvictionErrorValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e CacheEvictionErrorValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e CacheEvictionErrorValidationError) ErrorName() string { + return "CacheEvictionErrorValidationError" +} + +// Error satisfies the builtin error interface +func (e CacheEvictionErrorValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sCacheEvictionError.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = CacheEvictionErrorValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = CacheEvictionErrorValidationError{} + +// Validate checks the field values on CacheEvictionErrorList with the rules +// defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *CacheEvictionErrorList) Validate() error { + if m == nil { + return nil + } + + for idx, item := range m.GetErrors() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CacheEvictionErrorListValidationError{ + field: fmt.Sprintf("Errors[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// CacheEvictionErrorListValidationError is the validation error returned by +// CacheEvictionErrorList.Validate if the designated constraints aren't met. +type CacheEvictionErrorListValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e CacheEvictionErrorListValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e CacheEvictionErrorListValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e CacheEvictionErrorListValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e CacheEvictionErrorListValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e CacheEvictionErrorListValidationError) ErrorName() string { + return "CacheEvictionErrorListValidationError" +} + +// Error satisfies the builtin error interface +func (e CacheEvictionErrorListValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sCacheEvictionErrorList.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = CacheEvictionErrorListValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = CacheEvictionErrorListValidationError{} diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go index cf6f18c3dc..480234abeb 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go @@ -30,141 +30,143 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("flyteidl/service/admin.proto", fileDescriptor_5cfa31da1d67295d) } var fileDescriptor_5cfa31da1d67295d = []byte{ - // 2136 bytes of a gzipped FileDescriptorProto + // 2161 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x9a, 0xdf, 0x6f, 0x1d, 0x47, - 0x15, 0xc7, 0x35, 0x36, 0x02, 0x31, 0x4d, 0x62, 0x7b, 0x9a, 0x60, 0x67, 0x63, 0x27, 0xe9, 0xba, - 0x8e, 0x7f, 0xdf, 0x75, 0xd3, 0xb4, 0x51, 0x42, 0x7f, 0xb9, 0xb5, 0x73, 0x65, 0x08, 0x49, 0x31, - 0x29, 0x48, 0x16, 0xd2, 0xd5, 0xfa, 0xee, 0xc4, 0xde, 0xe4, 0xde, 0xbb, 0xb7, 0xbb, 0x63, 0x17, - 0xcb, 0xb2, 0xf8, 0xf1, 0x80, 0xa8, 0x90, 0x78, 0xe0, 0x87, 0xa0, 0x10, 0x51, 0x0a, 0x45, 0xfc, - 0x2c, 0x2f, 0xa0, 0x22, 0x24, 0x54, 0x09, 0xc1, 0x03, 0x2f, 0xbc, 0xc0, 0x3b, 0x2f, 0xf4, 0x99, - 0xbf, 0x01, 0xcd, 0xd9, 0x99, 0xbd, 0x3b, 0xbb, 0x3b, 0xbb, 0xb3, 0x26, 0xe5, 0x89, 0x37, 0xfb, - 0x9e, 0x33, 0x33, 0x9f, 0x73, 0xe6, 0x3b, 0x67, 0x66, 0x67, 0x17, 0x4f, 0xde, 0xed, 0x1c, 0x30, - 0xea, 0x7b, 0x1d, 0x27, 0xa2, 0xe1, 0xbe, 0xdf, 0xa6, 0x8e, 0xeb, 0x75, 0xfd, 0x5e, 0xa3, 0x1f, - 0x06, 0x2c, 0x20, 0xa3, 0xd2, 0xda, 0x10, 0x56, 0x6b, 0x72, 0x27, 0x08, 0x76, 0x3a, 0xd4, 0x71, - 0xfb, 0xbe, 0xe3, 0xf6, 0x7a, 0x01, 0x73, 0x99, 0x1f, 0xf4, 0xa2, 0xd8, 0xdf, 0x1a, 0xf4, 0x06, - 0xbd, 0x38, 0xfd, 0x30, 0xb8, 0x47, 0xdb, 0x4c, 0x58, 0x1b, 0xc5, 0xd6, 0x96, 0x17, 0x74, 0x5d, - 0xbf, 0xd7, 0x72, 0x19, 0x0b, 0xfd, 0xed, 0x3d, 0x46, 0x65, 0x6f, 0xb3, 0x1a, 0xff, 0x9c, 0xe3, - 0xd9, 0x8c, 0x23, 0x73, 0xa3, 0xfb, 0xc2, 0x34, 0x95, 0x31, 0xbd, 0x16, 0x84, 0xf7, 0xef, 0x76, - 0x82, 0xd7, 0x84, 0x79, 0x4e, 0x63, 0xce, 0x8f, 0x71, 0x31, 0xe3, 0xd9, 0x71, 0xf7, 0x7a, 0xed, - 0xdd, 0x56, 0xbf, 0xe3, 0x8a, 0x64, 0x59, 0x56, 0xc6, 0x83, 0xee, 0xd3, 0x9e, 0x0c, 0xfd, 0x7c, - 0xd6, 0xf6, 0x05, 0xda, 0xde, 0xe3, 0x99, 0xd3, 0x84, 0xda, 0x75, 0x59, 0x7b, 0xd7, 0xdd, 0xee, - 0xd0, 0x56, 0x48, 0xa3, 0x60, 0x2f, 0x6c, 0x53, 0xe1, 0x38, 0x9d, 0x71, 0xec, 0x05, 0x1e, 0x6d, - 0x65, 0x7b, 0x9b, 0x2e, 0xc8, 0x47, 0xce, 0x29, 0x3b, 0x57, 0xfb, 0x34, 0x8c, 0x06, 0xd6, 0x73, - 0x19, 0x6b, 0x3b, 0xe8, 0x76, 0xb5, 0xb4, 0x1e, 0x8d, 0xda, 0xa1, 0xdf, 0xe7, 0x9d, 0xb7, 0x68, - 0x8f, 0xf9, 0xec, 0x20, 0x17, 0x76, 0x3b, 0x08, 0xa9, 0xe3, 0x7b, 0xdc, 0x7a, 0xd7, 0xa7, 0x61, - 0x6c, 0xbf, 0xfc, 0xc7, 0x9b, 0xf8, 0xc4, 0x2a, 0xef, 0xe2, 0x33, 0xb1, 0xbc, 0x48, 0x17, 0xe3, - 0x97, 0x42, 0xea, 0x32, 0x7a, 0xc7, 0x8d, 0xee, 0x93, 0xc7, 0x12, 0xc5, 0x34, 0x62, 0x55, 0xf2, - 0x5f, 0x63, 0xfb, 0x26, 0x7d, 0x75, 0x8f, 0x46, 0xcc, 0xb2, 0xcb, 0x5c, 0xa2, 0x7e, 0xd0, 0x8b, - 0xa8, 0x3d, 0xf1, 0x95, 0x7f, 0xbc, 0xff, 0xad, 0x21, 0x62, 0x9f, 0x04, 0xd5, 0xee, 0x3f, 0x01, - 0xf9, 0x88, 0xae, 0xa3, 0x05, 0xf2, 0x35, 0x84, 0x3f, 0xd2, 0xa4, 0x0c, 0x06, 0xbb, 0x98, 0xed, - 0xe9, 0xf6, 0x36, 0x57, 0x5b, 0x93, 0x32, 0x39, 0xd6, 0xe9, 0xa2, 0xb1, 0xec, 0x75, 0xe8, 0xfd, - 0x79, 0xf2, 0xac, 0xd2, 0xbb, 0x73, 0xe8, 0x7b, 0x0d, 0x21, 0xd8, 0x23, 0xf8, 0x27, 0x56, 0x79, - 0xfc, 0x77, 0xcf, 0xed, 0xd2, 0xf8, 0x2f, 0x91, 0xf5, 0x23, 0xf2, 0x5d, 0x84, 0x1f, 0xb9, 0xe9, - 0x47, 0xc0, 0xb2, 0xe1, 0x45, 0x64, 0x25, 0x3b, 0xd8, 0x2d, 0xb7, 0x4b, 0xbd, 0x75, 0xc8, 0xee, - 0x46, 0x92, 0x47, 0xde, 0x42, 0xe2, 0xcd, 0x1b, 0xb7, 0xb0, 0x17, 0x81, 0x79, 0x86, 0x4c, 0xa7, - 0x99, 0x5b, 0xbe, 0x17, 0x39, 0x87, 0x03, 0x66, 0x01, 0x4c, 0x7e, 0x83, 0xf0, 0x47, 0x25, 0x59, - 0x44, 0xa6, 0xb3, 0xa3, 0x6c, 0x0a, 0x81, 0xa6, 0x51, 0x26, 0x8a, 0x32, 0x05, 0x23, 0x6f, 0xc3, - 0xc8, 0x9f, 0x27, 0x2b, 0x75, 0xb3, 0xb5, 0x35, 0x47, 0x2e, 0x99, 0xb5, 0x21, 0x47, 0xf8, 0x54, - 0xac, 0x80, 0xcf, 0x89, 0xd5, 0x4c, 0x66, 0xb2, 0x3c, 0xd2, 0xa2, 0x8a, 0xe9, 0x52, 0x95, 0x9b, - 0x10, 0xd4, 0x24, 0x04, 0xf1, 0x31, 0x7b, 0x4c, 0x02, 0xc9, 0xb2, 0x01, 0xa2, 0xfa, 0x36, 0xc2, - 0x8f, 0x34, 0x29, 0x4b, 0x06, 0xaf, 0x16, 0xd6, 0x84, 0x6e, 0x5c, 0x7b, 0x03, 0x46, 0x7a, 0x89, - 0xac, 0xe6, 0x46, 0xaa, 0x2d, 0xb0, 0x37, 0x11, 0x1e, 0xe1, 0x53, 0x20, 0xfb, 0xfe, 0xc0, 0x45, - 0xe6, 0x00, 0xfb, 0x3c, 0x99, 0xcd, 0xb2, 0xeb, 0x84, 0xf6, 0x1e, 0xc2, 0x27, 0xd3, 0x84, 0x86, - 0x62, 0x9b, 0xd4, 0x65, 0x0f, 0x28, 0xee, 0x01, 0x85, 0x47, 0xae, 0x1c, 0x27, 0x83, 0x5b, 0x4b, - 0x64, 0xc1, 0xbc, 0x1d, 0xf9, 0x2a, 0xc2, 0xa3, 0xb1, 0x54, 0x6e, 0xc2, 0xee, 0xf0, 0x72, 0xc7, - 0xed, 0x91, 0xd9, 0x2c, 0xde, 0xc0, 0xa6, 0xaa, 0x6f, 0xae, 0xda, 0x51, 0xe8, 0xef, 0x02, 0xc4, - 0x74, 0xd6, 0x3e, 0x2d, 0xd9, 0x52, 0x9b, 0x11, 0x48, 0xf0, 0x07, 0x08, 0x9f, 0x6c, 0x52, 0x96, - 0xa2, 0xa8, 0x16, 0xa1, 0xa5, 0x1f, 0xde, 0xbe, 0x09, 0x03, 0xde, 0x20, 0x6b, 0x45, 0x03, 0xd6, - 0x56, 0xe2, 0x8f, 0x11, 0x7e, 0xb4, 0x49, 0xd9, 0x6a, 0x9b, 0xf9, 0xfb, 0xa5, 0x99, 0xca, 0x7a, - 0x98, 0xa0, 0xde, 0x00, 0xd4, 0x17, 0xc8, 0x73, 0x12, 0xd5, 0x85, 0x4e, 0x5a, 0x35, 0x89, 0xc9, - 0x03, 0x84, 0xcf, 0x70, 0x01, 0x65, 0x19, 0x22, 0xb2, 0x58, 0x85, 0x99, 0x16, 0xe7, 0x79, 0x3d, - 0x2a, 0xc8, 0xf3, 0x69, 0xc0, 0x5d, 0x21, 0x8d, 0x52, 0xdc, 0xfc, 0x5a, 0x79, 0x1b, 0xe1, 0x31, - 0xde, 0xc1, 0xa0, 0xbb, 0x0f, 0x7c, 0x3d, 0x5f, 0x06, 0xd4, 0xd4, 0x8a, 0x48, 0x31, 0xea, 0x96, - 0xf4, 0x5f, 0x45, 0xd1, 0x49, 0xe7, 0xcf, 0x68, 0x51, 0x57, 0xe5, 0xad, 0x0f, 0x30, 0xf7, 0xc8, - 0xd5, 0x63, 0x2a, 0x72, 0xcb, 0x21, 0xcb, 0xb5, 0x9a, 0x92, 0x77, 0x11, 0x1e, 0x7d, 0xa5, 0xef, - 0x19, 0x2f, 0xee, 0xd8, 0xd7, 0x60, 0x71, 0x4b, 0x47, 0xb1, 0xb8, 0x6f, 0x43, 0x64, 0x1b, 0xd6, - 0x43, 0x59, 0x6b, 0xbc, 0x18, 0x7c, 0x19, 0xe1, 0x91, 0xb8, 0x80, 0xac, 0xcb, 0x23, 0x20, 0xc9, - 0xed, 0x74, 0x89, 0x49, 0xad, 0x49, 0xb3, 0x95, 0x7e, 0x82, 0x7a, 0x0a, 0xa8, 0xc7, 0x6d, 0x22, - 0xa9, 0x93, 0xe3, 0x26, 0x14, 0xa4, 0x6f, 0x20, 0x3c, 0xb6, 0x49, 0xe3, 0x48, 0x06, 0x14, 0x73, - 0xda, 0xde, 0xa5, 0x6f, 0x6d, 0x8e, 0x4b, 0xc0, 0x71, 0xd1, 0x3e, 0x97, 0xe7, 0x70, 0x42, 0xd1, - 0x29, 0x07, 0xfa, 0x3a, 0xc2, 0xa3, 0x9b, 0xb4, 0x1d, 0xec, 0xd3, 0x70, 0xc0, 0x33, 0x5b, 0xc2, - 0x03, 0xae, 0xb5, 0x71, 0x66, 0x00, 0xe7, 0x82, 0x6d, 0x15, 0xe2, 0x40, 0x9f, 0x9c, 0xe6, 0x3b, - 0x08, 0x9f, 0x68, 0x52, 0x36, 0x20, 0x59, 0xd4, 0xed, 0x69, 0x89, 0x4b, 0xaa, 0x72, 0x9f, 0xd5, - 0xd2, 0xd8, 0xcf, 0xc2, 0xf8, 0x57, 0xc9, 0x53, 0x05, 0xe3, 0x1b, 0x14, 0xc1, 0xb7, 0x11, 0x1e, - 0x89, 0xe5, 0x69, 0x22, 0x1d, 0x55, 0xf1, 0xb3, 0x95, 0x7e, 0x22, 0x47, 0x2f, 0x00, 0xe3, 0x75, - 0xeb, 0x78, 0x8c, 0x3c, 0x7d, 0x7f, 0x40, 0x78, 0x34, 0x9d, 0xbe, 0x35, 0x97, 0xb9, 0xc4, 0x31, - 0x49, 0x21, 0xf7, 0x94, 0xc0, 0x2b, 0xe6, 0x0d, 0x04, 0xf9, 0x8b, 0x40, 0xfe, 0x0c, 0xb9, 0x2e, - 0xc9, 0x3d, 0x97, 0xb9, 0x35, 0x53, 0xfc, 0x3a, 0xc2, 0xa7, 0x78, 0x45, 0x4b, 0x06, 0x31, 0x2c, - 0x90, 0x53, 0xda, 0xf4, 0x42, 0x7d, 0x7c, 0x12, 0xd0, 0x96, 0xc9, 0x62, 0x8d, 0xa4, 0x92, 0x77, - 0x10, 0x26, 0x77, 0x68, 0xd8, 0xf5, 0x7b, 0xca, 0x8c, 0xcf, 0x6b, 0x87, 0x4a, 0x9c, 0x25, 0xd5, - 0x82, 0x89, 0xab, 0x3a, 0xef, 0x0b, 0xc7, 0x9f, 0xf7, 0xbf, 0xc7, 0xf3, 0x7e, 0x2b, 0xf0, 0x68, - 0xc9, 0x22, 0x56, 0xcc, 0xa9, 0x65, 0x33, 0x55, 0xea, 0x68, 0xef, 0x03, 0x5e, 0x9f, 0xf4, 0x24, - 0x9e, 0xfa, 0xa8, 0x1d, 0x33, 0x26, 0xff, 0xb6, 0xb2, 0xc0, 0x8a, 0x25, 0x4d, 0xaf, 0x18, 0x06, - 0x15, 0x1b, 0x7a, 0xf7, 0xbd, 0x23, 0xf2, 0x4f, 0x84, 0x09, 0x9f, 0x42, 0x85, 0x26, 0xca, 0xd7, - 0x4a, 0xc5, 0x9e, 0x56, 0xc6, 0x63, 0x95, 0x9e, 0xf6, 0x21, 0xc4, 0xb6, 0x47, 0x22, 0x6d, 0x6c, - 0xc9, 0x59, 0x5d, 0x13, 0x61, 0xb1, 0x3d, 0x89, 0xb3, 0xd8, 0x1c, 0x2b, 0xfe, 0xa7, 0x1f, 0xc2, - 0x67, 0xf3, 0x01, 0xde, 0x08, 0x42, 0x78, 0x0c, 0x77, 0x4a, 0xe9, 0x85, 0x57, 0xcd, 0x70, 0x7f, - 0x3b, 0x0c, 0xf1, 0xfe, 0x7a, 0x98, 0xfc, 0x62, 0x58, 0x46, 0xdc, 0xde, 0xf5, 0x3b, 0x5e, 0x48, - 0xb3, 0x97, 0x23, 0x91, 0x73, 0xa8, 0xfe, 0xd0, 0x92, 0x73, 0xa3, 0xfc, 0xa2, 0xc9, 0x4a, 0xed, - 0xa6, 0x49, 0xc2, 0x6a, 0xb7, 0x14, 0xca, 0x31, 0x69, 0x27, 0xa5, 0x55, 0xe4, 0x2d, 0x1e, 0xfc, - 0x4b, 0x63, 0x90, 0x3e, 0x25, 0xb0, 0xd2, 0x45, 0x4b, 0x25, 0x1d, 0xe4, 0xc1, 0xa4, 0xc8, 0x27, - 0xa4, 0x2c, 0x3c, 0x68, 0xb9, 0x8c, 0xd1, 0x6e, 0x9f, 0x1d, 0x91, 0x7f, 0x23, 0x7c, 0x3a, 0xbb, - 0xba, 0xa1, 0xb2, 0x2f, 0x56, 0xad, 0xf0, 0x74, 0x55, 0x5f, 0x32, 0x73, 0x16, 0x35, 0x29, 0xb7, - 0x30, 0xa0, 0xa2, 0xff, 0x8f, 0x56, 0xfe, 0x17, 0xf1, 0xc8, 0x26, 0xdd, 0xf1, 0x23, 0x46, 0xc3, - 0x97, 0xe3, 0x0e, 0xf3, 0x9b, 0xad, 0x30, 0x48, 0x3f, 0xed, 0x66, 0x9b, 0xf3, 0x13, 0x01, 0x9e, - 0x83, 0x00, 0xcf, 0xd8, 0xa3, 0x32, 0x40, 0x81, 0x0e, 0xa7, 0xb4, 0x57, 0xf1, 0xc9, 0x78, 0x6f, - 0x96, 0xc3, 0x8f, 0x6b, 0xba, 0xb5, 0x66, 0x34, 0x86, 0xcc, 0xd6, 0x7e, 0x11, 0x46, 0xb3, 0xac, - 0x33, 0xd9, 0xd1, 0x78, 0xe0, 0x50, 0xc2, 0xef, 0xe2, 0x13, 0x7c, 0x89, 0x8a, 0xe6, 0x11, 0xb1, - 0x35, 0x1d, 0x97, 0xde, 0x2e, 0xc9, 0xd6, 0xf2, 0xa6, 0x8f, 0xe4, 0xa2, 0x23, 0x6f, 0x20, 0xfc, - 0xa8, 0x7a, 0x29, 0xb4, 0xbe, 0x4f, 0x7b, 0x8c, 0x2c, 0x57, 0x6e, 0xfa, 0xe0, 0x27, 0x87, 0x6e, - 0x98, 0xba, 0x8b, 0x04, 0x4c, 0x03, 0xd0, 0x94, 0x3d, 0x91, 0xec, 0x71, 0xdc, 0x1c, 0xa9, 0x17, - 0x46, 0xaf, 0x27, 0x07, 0x74, 0xd0, 0x26, 0x70, 0xcd, 0x97, 0xca, 0x56, 0x61, 0x5a, 0x30, 0x71, - 0xd5, 0xdd, 0x1c, 0x08, 0x1e, 0xae, 0xc1, 0x0c, 0x0b, 0xaf, 0xb3, 0x1a, 0x16, 0x30, 0x99, 0xb1, - 0x14, 0xb9, 0x56, 0xb0, 0x24, 0xb7, 0xb3, 0x5f, 0x1a, 0x86, 0xed, 0x5d, 0xe9, 0x22, 0xbf, 0xbd, - 0x2b, 0xe6, 0xb2, 0xed, 0x5d, 0x71, 0xb4, 0x7f, 0x32, 0x04, 0xc3, 0x3f, 0x18, 0x22, 0x6f, 0x0c, - 0x29, 0xb7, 0xa0, 0x99, 0x75, 0x6e, 0x5c, 0xfb, 0x6b, 0x14, 0x7b, 0xe3, 0xea, 0x5e, 0x51, 0xce, - 0x0b, 0xeb, 0x77, 0x51, 0xc1, 0xce, 0x57, 0xe8, 0xc2, 0x92, 0x9c, 0xaf, 0xc1, 0xdf, 0x1b, 0x8a, - 0x0f, 0x23, 0x4a, 0xee, 0x0a, 0x0e, 0x23, 0x8a, 0xbd, 0x74, 0x77, 0xce, 0x79, 0xda, 0xbf, 0x43, - 0x30, 0x13, 0xef, 0x20, 0xf2, 0x4b, 0xa4, 0x9d, 0x09, 0xe3, 0x69, 0x30, 0x9d, 0x03, 0xb3, 0x09, - 0xd0, 0x67, 0x9f, 0x3c, 0x18, 0x86, 0xed, 0x49, 0x89, 0xa7, 0x78, 0x7b, 0xca, 0x2a, 0xb4, 0x74, - 0x7b, 0x2a, 0x76, 0x16, 0x4b, 0xe6, 0xe7, 0xb1, 0x68, 0xdf, 0x1a, 0x22, 0x3f, 0x1c, 0x52, 0x76, - 0xa8, 0xff, 0x2b, 0x37, 0xab, 0xdc, 0x7f, 0x21, 0x3c, 0xa5, 0x6c, 0x66, 0x6b, 0xd0, 0xe5, 0x6a, - 0xf2, 0x5e, 0x8f, 0x5c, 0xd1, 0x6c, 0x23, 0x59, 0x47, 0xf5, 0xb1, 0xf6, 0xa9, 0x9a, 0xad, 0xc4, - 0xcc, 0xbd, 0x02, 0x13, 0x77, 0xdb, 0xfa, 0x44, 0x66, 0x67, 0xca, 0xbf, 0xfc, 0x74, 0x0e, 0xd5, - 0x77, 0x8f, 0x22, 0x39, 0xa9, 0x1f, 0x45, 0x72, 0x78, 0x89, 0xfc, 0x13, 0xc2, 0x56, 0x93, 0x32, - 0x5d, 0x88, 0x4f, 0x18, 0xc2, 0xa6, 0xca, 0xe6, 0xe5, 0x3a, 0x4d, 0x44, 0x70, 0xcf, 0x40, 0x70, - 0x4f, 0x0f, 0xee, 0xd8, 0x4b, 0x82, 0xcb, 0xdf, 0x11, 0xfe, 0x0d, 0xe1, 0xa9, 0x35, 0xda, 0xa1, - 0xff, 0xfd, 0x4c, 0xc5, 0xbd, 0xd4, 0x9d, 0x29, 0xd9, 0x4a, 0x04, 0xf3, 0x3c, 0x04, 0x73, 0x6d, - 0xe1, 0x58, 0xc1, 0xf0, 0x39, 0x79, 0x17, 0xe1, 0x71, 0x45, 0x79, 0xa9, 0x48, 0x1a, 0x1a, 0x26, - 0x9d, 0xda, 0x1c, 0x63, 0x7f, 0x41, 0x7f, 0x1d, 0xe8, 0xaf, 0x58, 0x4e, 0x96, 0xbe, 0x42, 0x60, - 0x1c, 0xfc, 0xcd, 0xf8, 0xc0, 0x9d, 0xa7, 0x5e, 0xac, 0xa4, 0x48, 0x09, 0x68, 0xc9, 0xcc, 0x59, - 0xf0, 0x2e, 0x01, 0xef, 0x25, 0xf2, 0x78, 0x19, 0xaf, 0x84, 0x24, 0xbf, 0x42, 0x78, 0x5c, 0x91, - 0x4a, 0xad, 0xd4, 0xaa, 0xf2, 0x70, 0x8c, 0xfd, 0x05, 0xaa, 0x78, 0x9f, 0xb5, 0x60, 0x84, 0xca, - 0xf3, 0xf9, 0x3e, 0xc2, 0x13, 0xf1, 0xf4, 0xc8, 0x53, 0x62, 0x0a, 0x57, 0x7b, 0x3d, 0xa5, 0x93, - 0xc2, 0x8a, 0x79, 0x03, 0x01, 0x4c, 0x01, 0xb8, 0x65, 0x6d, 0xe5, 0x5e, 0xc0, 0x1d, 0xa3, 0xda, - 0x28, 0xbf, 0xc9, 0x8e, 0x20, 0xcc, 0xdf, 0x23, 0x7c, 0x26, 0xf5, 0xbe, 0x33, 0x15, 0xe3, 0x52, - 0x35, 0x72, 0x4a, 0x38, 0xcb, 0x86, 0xde, 0x22, 0xba, 0x55, 0x88, 0xee, 0xe3, 0xe4, 0x5a, 0x69, - 0x74, 0xb9, 0x15, 0x3a, 0xb8, 0x9b, 0x38, 0x22, 0x7f, 0x46, 0x78, 0x22, 0x9e, 0xe4, 0xe3, 0x4d, - 0x90, 0x2a, 0xa8, 0x15, 0xf3, 0x06, 0x22, 0x84, 0x35, 0x08, 0xe1, 0xb9, 0x85, 0xe3, 0x87, 0xc0, - 0xf3, 0xff, 0x23, 0x84, 0xc7, 0xf9, 0x41, 0xea, 0x53, 0xf2, 0x9b, 0x91, 0xb2, 0x45, 0xa1, 0x71, - 0xd4, 0x2e, 0x0a, 0xad, 0xbf, 0x08, 0xe1, 0x71, 0x08, 0xe1, 0x3c, 0x99, 0x94, 0x21, 0x0c, 0xbe, - 0x5c, 0x19, 0xc4, 0xc0, 0x2b, 0x0b, 0xbc, 0xad, 0x1a, 0xbc, 0x5c, 0xf2, 0x69, 0x94, 0x7f, 0xb8, - 0x4d, 0xbd, 0x7b, 0x4a, 0x9f, 0x21, 0x2f, 0x54, 0xf8, 0xe5, 0xa5, 0xc0, 0x8f, 0x0a, 0x5e, 0xfc, - 0x29, 0x8a, 0xcf, 0x53, 0x28, 0x3f, 0xa2, 0x69, 0xb1, 0x83, 0x3e, 0x3f, 0x43, 0xe4, 0x37, 0xa1, - 0x9f, 0x21, 0x7c, 0xaa, 0x49, 0x53, 0x80, 0x07, 0xf9, 0x8f, 0x06, 0x52, 0xc6, 0x94, 0x6c, 0xcf, - 0x95, 0xb8, 0xd9, 0x9f, 0x06, 0xb2, 0x4f, 0x92, 0x0d, 0x53, 0xb2, 0xea, 0x0b, 0xe3, 0xf7, 0x10, - 0x1e, 0x8b, 0x17, 0x7a, 0x1a, 0x76, 0xae, 0x84, 0x42, 0xad, 0x23, 0xf3, 0x06, 0x9e, 0x62, 0x72, - 0xef, 0x00, 0xfd, 0x2d, 0xeb, 0xe1, 0xd1, 0x73, 0xbd, 0x76, 0x30, 0x6e, 0x52, 0xf6, 0xd9, 0xf8, - 0xec, 0x96, 0xff, 0xc6, 0x67, 0x60, 0xd3, 0x7e, 0xe3, 0x93, 0x76, 0x11, 0xa8, 0xe3, 0x80, 0x3a, - 0x46, 0x46, 0x24, 0xaa, 0x38, 0x1b, 0x92, 0xbf, 0xc4, 0x9b, 0xda, 0xda, 0xe0, 0x13, 0x25, 0x91, - 0xb1, 0xea, 0x37, 0xe2, 0x39, 0xb4, 0x5c, 0x27, 0xf6, 0x0e, 0x0c, 0xeb, 0x92, 0x56, 0x72, 0x1a, - 0xcf, 0x7e, 0x0a, 0x05, 0x79, 0x82, 0xe3, 0x69, 0xcd, 0x54, 0xa9, 0xef, 0xcc, 0xbf, 0x39, 0x14, - 0x2f, 0xf2, 0x2c, 0x82, 0x5f, 0x54, 0x66, 0x73, 0x9c, 0xe9, 0xd5, 0x34, 0x63, 0xe4, 0x6d, 0xbf, - 0x15, 0x3f, 0x95, 0x7d, 0x1f, 0x91, 0xdb, 0xe5, 0xb1, 0xd5, 0x0e, 0x6c, 0xab, 0x49, 0xd6, 0x1f, - 0x4a, 0x97, 0x2f, 0x5e, 0xdb, 0xba, 0xba, 0xe3, 0xb3, 0xdd, 0xbd, 0xed, 0x46, 0x3b, 0xe8, 0x3a, - 0x10, 0x56, 0x10, 0xee, 0x38, 0xc9, 0x47, 0x67, 0x3b, 0xb4, 0xe7, 0xf4, 0xb7, 0x97, 0x77, 0x02, - 0x27, 0xfb, 0x95, 0xe3, 0xf6, 0x87, 0xe1, 0x03, 0xb4, 0x27, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, - 0x20, 0x80, 0x65, 0x97, 0x00, 0x29, 0x00, 0x00, + 0x15, 0xc7, 0x35, 0x36, 0x02, 0x31, 0xcd, 0x0f, 0x7b, 0x92, 0x60, 0x67, 0x63, 0x27, 0xe9, 0xba, + 0x8e, 0x7f, 0xdf, 0x75, 0xd3, 0xb4, 0x51, 0x42, 0x7f, 0xb9, 0xb5, 0x73, 0x65, 0x08, 0x71, 0x31, + 0x29, 0x48, 0x16, 0xd2, 0xd5, 0xfa, 0xee, 0xc4, 0xd9, 0xe4, 0xde, 0xbb, 0xb7, 0xbb, 0x63, 0x17, + 0xcb, 0xb2, 0xf8, 0xf1, 0x80, 0xa8, 0x90, 0x78, 0x80, 0x22, 0x28, 0x44, 0x94, 0x42, 0x11, 0x3f, + 0xcb, 0x0b, 0xa8, 0x88, 0x97, 0x4a, 0x08, 0x1e, 0x78, 0xe1, 0x85, 0xbe, 0xf3, 0x42, 0x9f, 0xf9, + 0x1b, 0xd0, 0x9c, 0x9d, 0xd9, 0xbb, 0xb3, 0xbb, 0xb3, 0x3b, 0x6b, 0x52, 0x9e, 0xfa, 0x66, 0xdf, + 0xf3, 0x9d, 0x99, 0xcf, 0x39, 0x73, 0xe6, 0xcc, 0xec, 0xee, 0xe0, 0x89, 0x3b, 0x9d, 0x7d, 0x46, + 0x7d, 0xaf, 0xe3, 0x44, 0x34, 0xdc, 0xf3, 0xdb, 0xd4, 0x71, 0xbd, 0xae, 0xdf, 0x6b, 0xf4, 0xc3, + 0x80, 0x05, 0x64, 0x44, 0x5a, 0x1b, 0xc2, 0x6a, 0x4d, 0xec, 0x04, 0xc1, 0x4e, 0x87, 0x3a, 0x6e, + 0xdf, 0x77, 0xdc, 0x5e, 0x2f, 0x60, 0x2e, 0xf3, 0x83, 0x5e, 0x14, 0xeb, 0xad, 0x41, 0x6f, 0xd0, + 0x8b, 0xd3, 0x0f, 0x83, 0x7b, 0xb4, 0xcd, 0x84, 0xb5, 0x51, 0x6c, 0x6d, 0x79, 0x41, 0xd7, 0xf5, + 0x7b, 0x2d, 0x97, 0xb1, 0xd0, 0xdf, 0xde, 0x65, 0x54, 0xf6, 0x36, 0xa3, 0xd1, 0xe7, 0x84, 0x67, + 0x33, 0x42, 0xe6, 0x46, 0xf7, 0x85, 0x69, 0x32, 0x63, 0x7a, 0x35, 0x08, 0xef, 0xdf, 0xe9, 0x04, + 0xaf, 0x0a, 0xf3, 0xac, 0xc6, 0x9c, 0x1f, 0xe3, 0x62, 0x46, 0xd9, 0x71, 0x77, 0x7b, 0xed, 0xbb, + 0xad, 0x7e, 0xc7, 0x15, 0xc1, 0xb2, 0xac, 0x8c, 0x82, 0xee, 0xd1, 0x9e, 0x74, 0xfd, 0x7c, 0xd6, + 0xf6, 0x15, 0xda, 0xde, 0xe5, 0x91, 0xd3, 0xb8, 0xda, 0x75, 0x59, 0xfb, 0xae, 0xbb, 0xdd, 0xa1, + 0xad, 0x90, 0x46, 0xc1, 0x6e, 0xd8, 0xa6, 0x42, 0x38, 0x95, 0x11, 0xf6, 0x02, 0x8f, 0xb6, 0xb2, + 0xbd, 0x4d, 0x15, 0xc4, 0x23, 0x27, 0xca, 0xce, 0xd5, 0x1e, 0x0d, 0xa3, 0x81, 0xf5, 0x5c, 0xc6, + 0xda, 0x0e, 0xba, 0x5d, 0x2d, 0xad, 0x47, 0xa3, 0x76, 0xe8, 0xf7, 0x79, 0xe7, 0x2d, 0xda, 0x63, + 0x3e, 0xdb, 0xcf, 0xb9, 0xdd, 0x0e, 0x42, 0xea, 0xf8, 0x1e, 0xb7, 0xde, 0xf1, 0x69, 0x18, 0xdb, + 0x2f, 0xbf, 0xbf, 0x81, 0x8f, 0xad, 0xf0, 0x2e, 0xbe, 0x10, 0xa7, 0x17, 0xe9, 0x62, 0xfc, 0x62, + 0x48, 0x5d, 0x46, 0x6f, 0xbb, 0xd1, 0x7d, 0xf2, 0x68, 0x92, 0x31, 0x8d, 0x38, 0x2b, 0xf9, 0xaf, + 0xb1, 0x7d, 0x93, 0xbe, 0xb2, 0x4b, 0x23, 0x66, 0xd9, 0x65, 0x92, 0xa8, 0x1f, 0xf4, 0x22, 0x6a, + 0x8f, 0x7f, 0xe3, 0xfd, 0x0f, 0xbe, 0x37, 0x44, 0xec, 0xe3, 0x90, 0xb5, 0x7b, 0x8f, 0x43, 0x3c, + 0xa2, 0xeb, 0x68, 0x9e, 0x7c, 0x0b, 0xe1, 0x4f, 0x34, 0x29, 0x83, 0xc1, 0x2e, 0x66, 0x7b, 0xda, + 0xd8, 0xe6, 0xd9, 0xd6, 0xa4, 0x4c, 0x8e, 0x75, 0xba, 0x68, 0x2c, 0x7b, 0x0d, 0x7a, 0x7f, 0x8e, + 0x3c, 0xa3, 0xf4, 0xee, 0x1c, 0xf8, 0x5e, 0x43, 0x24, 0xec, 0x21, 0xfc, 0x13, 0x67, 0x79, 0xfc, + 0x77, 0xcf, 0xed, 0xd2, 0xf8, 0x2f, 0x11, 0xf5, 0x43, 0xf2, 0x03, 0x84, 0x1f, 0xb9, 0xe9, 0x47, + 0xc0, 0xb2, 0xee, 0x45, 0x64, 0x39, 0x3b, 0xd8, 0x2d, 0xb7, 0x4b, 0xbd, 0x35, 0x88, 0xee, 0x7a, + 0x12, 0x47, 0xde, 0x42, 0xe2, 0xcd, 0x19, 0xb7, 0xb0, 0x17, 0x80, 0x79, 0x9a, 0x4c, 0xa5, 0x99, + 0x5b, 0xbe, 0x17, 0x39, 0x07, 0x03, 0x66, 0x01, 0x4c, 0x7e, 0x8f, 0xf0, 0x27, 0x25, 0x59, 0x44, + 0xa6, 0xb2, 0xa3, 0x6c, 0x8a, 0x04, 0x4d, 0xa3, 0x8c, 0x17, 0x45, 0x0a, 0x46, 0xde, 0x86, 0x91, + 0xbf, 0x4c, 0x96, 0xeb, 0x46, 0x6b, 0x6b, 0x96, 0x5c, 0x32, 0x6b, 0x43, 0x0e, 0xf1, 0x89, 0x38, + 0x03, 0xbe, 0x24, 0x56, 0x33, 0x99, 0xce, 0xf2, 0x48, 0x8b, 0x9a, 0x4c, 0x97, 0xaa, 0x64, 0x22, + 0xa1, 0x26, 0xc0, 0x89, 0x4f, 0xd9, 0xa3, 0x12, 0x48, 0x96, 0x0d, 0x48, 0xaa, 0xd7, 0x11, 0x7e, + 0xa4, 0x49, 0x59, 0x32, 0x78, 0x75, 0x62, 0x8d, 0xeb, 0xc6, 0xb5, 0xd7, 0x61, 0xa4, 0x17, 0xc9, + 0x4a, 0x6e, 0xa4, 0xda, 0x09, 0xf6, 0x26, 0xc2, 0x27, 0xf9, 0x14, 0xc8, 0xbe, 0x3f, 0xf4, 0x24, + 0x73, 0x80, 0x7d, 0x8e, 0xcc, 0x64, 0xd9, 0x75, 0x89, 0xf6, 0x1e, 0xc2, 0xc7, 0xd3, 0x84, 0x86, + 0xc9, 0x36, 0xa1, 0x8b, 0x1e, 0x50, 0xdc, 0x03, 0x0a, 0x8f, 0x5c, 0x39, 0x4a, 0x04, 0xb7, 0x16, + 0xc9, 0xbc, 0x79, 0x3b, 0xf2, 0x4d, 0x84, 0x47, 0xe2, 0x54, 0xb9, 0x09, 0xbb, 0xc3, 0x4b, 0x1d, + 0xb7, 0x47, 0x66, 0xb2, 0x78, 0x03, 0x9b, 0x9a, 0x7d, 0xb3, 0xd5, 0x42, 0x91, 0x7f, 0x17, 0xc0, + 0xa7, 0xb3, 0xf6, 0x69, 0xc9, 0x96, 0xda, 0x8c, 0x20, 0x05, 0x7f, 0x8c, 0xf0, 0xf1, 0x26, 0x65, + 0x29, 0x8a, 0xea, 0x24, 0xb4, 0xf4, 0xc3, 0xdb, 0x37, 0x61, 0xc0, 0x1b, 0x64, 0xb5, 0x68, 0xc0, + 0xda, 0x99, 0xf8, 0x33, 0x84, 0x4f, 0x35, 0x29, 0x5b, 0x69, 0x33, 0x7f, 0xaf, 0x34, 0x52, 0x59, + 0x85, 0x09, 0xea, 0x0d, 0x40, 0x7d, 0x9e, 0x3c, 0x2b, 0x51, 0x5d, 0xe8, 0xa4, 0x55, 0x93, 0x98, + 0x3c, 0x40, 0xf8, 0x0c, 0x4f, 0xa0, 0x2c, 0x43, 0x44, 0x16, 0xaa, 0x30, 0xd3, 0xc9, 0x79, 0x5e, + 0x8f, 0x0a, 0xe9, 0xf9, 0x14, 0xe0, 0x2e, 0x93, 0x46, 0x29, 0x6e, 0x7e, 0xad, 0xbc, 0x8d, 0xf0, + 0x28, 0xef, 0x60, 0xd0, 0xdd, 0x87, 0xbe, 0x9e, 0x2f, 0x03, 0x6a, 0x6a, 0x45, 0xa4, 0x18, 0x75, + 0x4b, 0xfa, 0xef, 0xa2, 0xe8, 0xa4, 0xe3, 0x67, 0xb4, 0xa8, 0xab, 0xe2, 0xd6, 0x07, 0x98, 0x7b, + 0xe4, 0xea, 0x11, 0x33, 0x72, 0xcb, 0x21, 0x4b, 0xb5, 0x9a, 0x92, 0x77, 0x11, 0x1e, 0x79, 0xb9, + 0xef, 0x19, 0x2f, 0xee, 0x58, 0x6b, 0xb0, 0xb8, 0xa5, 0x50, 0x2c, 0xee, 0x0d, 0xf0, 0x6c, 0xdd, + 0x7a, 0x28, 0x6b, 0x8d, 0x17, 0x83, 0xaf, 0x23, 0x7c, 0x32, 0x2e, 0x20, 0x6b, 0xf2, 0x08, 0x48, + 0x72, 0x3b, 0x5d, 0x62, 0x52, 0x6b, 0xd2, 0x4c, 0xa5, 0x4e, 0x50, 0x4f, 0x02, 0xf5, 0x98, 0x4d, + 0x24, 0x75, 0x72, 0xdc, 0x84, 0x82, 0xf4, 0x1d, 0x84, 0x47, 0x37, 0x69, 0xec, 0xc9, 0x80, 0x62, + 0x56, 0xdb, 0xbb, 0xd4, 0xd6, 0xe6, 0xb8, 0x04, 0x1c, 0x17, 0xed, 0x73, 0x79, 0x0e, 0x27, 0x14, + 0x9d, 0x72, 0xa0, 0x6f, 0x23, 0x3c, 0xb2, 0x49, 0xdb, 0xc1, 0x1e, 0x0d, 0x07, 0x3c, 0x33, 0x25, + 0x3c, 0x20, 0xad, 0x8d, 0x33, 0x0d, 0x38, 0x17, 0x6c, 0xab, 0x10, 0x07, 0xfa, 0xe4, 0x34, 0xdf, + 0x47, 0xf8, 0x58, 0x93, 0xb2, 0x01, 0xc9, 0x82, 0x6e, 0x4f, 0x4b, 0x24, 0xa9, 0xca, 0x7d, 0x56, + 0x4b, 0x63, 0x3f, 0x03, 0xe3, 0x5f, 0x25, 0x4f, 0x16, 0x8c, 0x6f, 0x50, 0x04, 0xdf, 0x46, 0xf8, + 0x64, 0x9c, 0x9e, 0x26, 0xa9, 0xa3, 0x66, 0xfc, 0x4c, 0xa5, 0x4e, 0xc4, 0xe8, 0x79, 0x60, 0xbc, + 0x6e, 0x1d, 0x8d, 0x91, 0x87, 0xef, 0xcf, 0x08, 0x8f, 0xa4, 0xc3, 0xb7, 0xea, 0x32, 0x97, 0x38, + 0x26, 0x21, 0xe4, 0x4a, 0x09, 0xbc, 0x6c, 0xde, 0x40, 0x90, 0xbf, 0x00, 0xe4, 0x4f, 0x93, 0xeb, + 0x92, 0xdc, 0x73, 0x99, 0x5b, 0x33, 0xc4, 0xaf, 0x21, 0x7c, 0x82, 0x57, 0xb4, 0x64, 0x10, 0xc3, + 0x02, 0x39, 0xa9, 0x0d, 0x2f, 0xd4, 0xc7, 0x27, 0x00, 0x6d, 0x89, 0x2c, 0xd4, 0x08, 0x2a, 0x79, + 0x07, 0x61, 0x72, 0x9b, 0x86, 0x5d, 0xbf, 0xa7, 0xcc, 0xf8, 0x9c, 0x76, 0xa8, 0x44, 0x2c, 0xa9, + 0xe6, 0x4d, 0xa4, 0xea, 0xbc, 0xcf, 0x1f, 0x7d, 0xde, 0xff, 0x19, 0xcf, 0xfb, 0xad, 0xc0, 0xa3, + 0x25, 0x8b, 0x58, 0x31, 0xa7, 0x96, 0xcd, 0x64, 0xa9, 0xd0, 0xde, 0x03, 0xbc, 0x3e, 0xe9, 0x49, + 0x3c, 0xf5, 0x51, 0x3b, 0x66, 0x4c, 0xfe, 0x6d, 0x65, 0x81, 0x15, 0x4b, 0x9a, 0x5e, 0x31, 0x0c, + 0x2a, 0x36, 0xf4, 0xee, 0x7b, 0x87, 0xe4, 0x5f, 0x08, 0x13, 0x3e, 0x85, 0x0a, 0x4d, 0x94, 0xaf, + 0x95, 0x8a, 0x3d, 0x9d, 0x19, 0x8f, 0x56, 0x2a, 0xed, 0x03, 0xf0, 0x6d, 0x97, 0x44, 0x5a, 0xdf, + 0x92, 0xb3, 0xba, 0xc6, 0xc3, 0x62, 0x7b, 0xe2, 0x67, 0xb1, 0x39, 0xce, 0xf8, 0x5f, 0x7c, 0x0c, + 0x9f, 0xcd, 0x3b, 0x78, 0x23, 0x08, 0xe1, 0x31, 0xdc, 0x29, 0xa5, 0x17, 0xaa, 0x9a, 0xee, 0xfe, + 0x61, 0x18, 0xfc, 0xfd, 0xdd, 0x30, 0xf9, 0xf5, 0xb0, 0xf4, 0xb8, 0x7d, 0xd7, 0xef, 0x78, 0x21, + 0xcd, 0xbe, 0x1c, 0x89, 0x9c, 0x03, 0xf5, 0x87, 0x96, 0x9c, 0x1b, 0xe5, 0x17, 0x4d, 0x54, 0x6a, + 0x37, 0x4d, 0x02, 0x56, 0xbb, 0xa5, 0xc8, 0x1c, 0x93, 0x76, 0x32, 0xb5, 0x8a, 0xd4, 0xe2, 0xc1, + 0xbf, 0xd4, 0x07, 0xa9, 0x29, 0x81, 0x95, 0x12, 0x2d, 0x95, 0x14, 0xc8, 0x83, 0x49, 0x91, 0x26, + 0xa4, 0x2c, 0xdc, 0x6f, 0xb9, 0x8c, 0xd1, 0x6e, 0x9f, 0x1d, 0x92, 0xff, 0x20, 0x7c, 0x3a, 0xbb, + 0xba, 0xa1, 0xb2, 0x2f, 0x54, 0xad, 0xf0, 0x74, 0x55, 0x5f, 0x34, 0x13, 0x8b, 0x9a, 0x94, 0x5b, + 0x18, 0x50, 0xd1, 0xff, 0x4f, 0x2b, 0xff, 0xab, 0xf8, 0xe4, 0x26, 0xdd, 0xf1, 0x23, 0x46, 0xc3, + 0x97, 0xe2, 0x0e, 0xf3, 0x9b, 0xad, 0x30, 0x48, 0x9d, 0x76, 0xb3, 0xcd, 0xe9, 0x84, 0x83, 0xe7, + 0xc0, 0xc1, 0x33, 0xf6, 0x88, 0x74, 0x50, 0xa0, 0xc3, 0x29, 0xed, 0x15, 0x7c, 0x3c, 0xde, 0x9b, + 0xe5, 0xf0, 0x63, 0x9a, 0x6e, 0xad, 0x69, 0x8d, 0x21, 0xb3, 0xb5, 0x5f, 0x84, 0xd1, 0x2c, 0xeb, + 0x4c, 0x76, 0x34, 0xee, 0x38, 0x94, 0xf0, 0x3b, 0xf8, 0x18, 0x5f, 0xa2, 0xa2, 0x79, 0x44, 0x6c, + 0x4d, 0xc7, 0xa5, 0x6f, 0x97, 0x64, 0x6b, 0xf9, 0xa6, 0x8f, 0xe4, 0xbc, 0x23, 0x6f, 0x20, 0x7c, + 0x4a, 0x7d, 0x29, 0xb4, 0xb6, 0x47, 0x7b, 0x8c, 0x2c, 0x55, 0x6e, 0xfa, 0xa0, 0x93, 0x43, 0x37, + 0x4c, 0xe5, 0x22, 0x00, 0x53, 0x00, 0x34, 0x69, 0x8f, 0x27, 0x7b, 0x1c, 0x37, 0x47, 0xea, 0x0b, + 0xa3, 0xd7, 0x92, 0x03, 0x3a, 0xe4, 0x26, 0x70, 0xcd, 0x95, 0xa6, 0xad, 0xc2, 0x34, 0x6f, 0x22, + 0xd5, 0xbd, 0x39, 0x10, 0x3c, 0x3c, 0x07, 0x33, 0x2c, 0xbc, 0xce, 0x6a, 0x58, 0xc0, 0x64, 0xc6, + 0x52, 0x24, 0xad, 0x60, 0x49, 0xde, 0xce, 0x7e, 0x6d, 0x18, 0xb6, 0x77, 0xa5, 0x8b, 0xfc, 0xf6, + 0xae, 0x98, 0xcb, 0xb6, 0x77, 0x45, 0x68, 0xff, 0x7c, 0x08, 0x86, 0x7f, 0x30, 0x44, 0xde, 0x18, + 0x52, 0xde, 0x82, 0x66, 0xd6, 0xb9, 0x71, 0xed, 0xaf, 0x51, 0xec, 0x8d, 0xab, 0x7b, 0x45, 0x39, + 0x2f, 0xac, 0xdf, 0x45, 0x05, 0x3b, 0x5f, 0xa1, 0x0b, 0x4b, 0x72, 0xbe, 0x06, 0xff, 0x70, 0x28, + 0x3e, 0x8c, 0x28, 0xb1, 0x2b, 0x38, 0x8c, 0x28, 0xf6, 0xd2, 0xdd, 0x39, 0xa7, 0xb4, 0xff, 0x88, + 0x60, 0x26, 0xde, 0x41, 0xe4, 0x37, 0x48, 0x3b, 0x13, 0xc6, 0xd3, 0x60, 0x3a, 0x07, 0x66, 0x13, + 0xa0, 0x8f, 0x3e, 0x79, 0x30, 0x0c, 0xdb, 0x93, 0xe2, 0x4f, 0xf1, 0xf6, 0x94, 0xcd, 0xd0, 0xd2, + 0xed, 0xa9, 0x58, 0x2c, 0x96, 0xcc, 0xaf, 0xe2, 0xa4, 0x7d, 0x6b, 0x88, 0xfc, 0x64, 0x48, 0xd9, + 0xa1, 0x3e, 0xca, 0xdc, 0x6c, 0xe6, 0xbe, 0x3e, 0x8c, 0x4f, 0xc5, 0xbb, 0x91, 0x5a, 0x3f, 0xca, + 0x2b, 0x94, 0xfa, 0x08, 0xbb, 0x60, 0xa4, 0x15, 0x73, 0xf3, 0x51, 0x41, 0x31, 0x99, 0x96, 0x7f, + 0x23, 0x3c, 0xa9, 0x9c, 0x31, 0x56, 0xa1, 0xcb, 0x95, 0xe4, 0x73, 0x2b, 0xb9, 0xa2, 0xd9, 0xdd, + 0xb3, 0x42, 0x75, 0xaa, 0x9e, 0xac, 0xd9, 0x4a, 0x4c, 0xda, 0xcb, 0x30, 0x67, 0x1b, 0xd6, 0x67, + 0x32, 0x07, 0x86, 0xfc, 0x37, 0x69, 0xe7, 0x40, 0xfd, 0x24, 0x2c, 0x82, 0x93, 0xfa, 0x51, 0x04, + 0x87, 0xef, 0x5c, 0x7f, 0x41, 0xd8, 0x6a, 0x52, 0xa6, 0x73, 0xf1, 0x71, 0x43, 0xd8, 0xd4, 0x6e, + 0x76, 0xb9, 0x4e, 0x13, 0xe1, 0xdc, 0xd3, 0xe0, 0xdc, 0x53, 0x83, 0x4f, 0x1f, 0x25, 0xce, 0xe5, + 0x5f, 0xdd, 0xfe, 0x03, 0xe1, 0xc9, 0x55, 0xda, 0xa1, 0xff, 0xfb, 0x4c, 0xc5, 0xbd, 0xd4, 0x9d, + 0x29, 0xd9, 0x4a, 0x38, 0xf3, 0x1c, 0x38, 0x73, 0x6d, 0xfe, 0x48, 0xce, 0xf0, 0x39, 0x79, 0x17, + 0xe1, 0x31, 0x25, 0xf3, 0x52, 0x9e, 0x34, 0x34, 0x4c, 0xba, 0x6c, 0x73, 0x8c, 0xf5, 0x82, 0xfe, + 0x3a, 0xd0, 0x5f, 0xb1, 0x9c, 0x2c, 0x7d, 0x45, 0x82, 0x71, 0xf0, 0x37, 0xe3, 0xe7, 0xa0, 0x3c, + 0xf5, 0x42, 0x25, 0x45, 0x2a, 0x81, 0x16, 0xcd, 0xc4, 0x82, 0x77, 0x11, 0x78, 0x2f, 0x91, 0xc7, + 0xca, 0x78, 0x25, 0x24, 0xf9, 0x2d, 0xc2, 0x63, 0x4a, 0xaa, 0xd4, 0x0a, 0xad, 0x9a, 0x1e, 0x8e, + 0xb1, 0x5e, 0xa0, 0x8a, 0xcf, 0x8c, 0xf3, 0x46, 0xa8, 0x3c, 0x9e, 0x1f, 0x20, 0x3c, 0x1e, 0x4f, + 0x8f, 0x3c, 0xbc, 0xa7, 0x70, 0xb5, 0x6f, 0x0d, 0x75, 0xa9, 0xb0, 0x6c, 0xde, 0x40, 0x00, 0x53, + 0x00, 0x6e, 0x59, 0x5b, 0xb9, 0xef, 0xa2, 0x47, 0xa8, 0x36, 0xca, 0x6f, 0xb2, 0x23, 0x70, 0xf3, + 0x4f, 0x08, 0x9f, 0x49, 0x7d, 0x86, 0x4e, 0xf9, 0xb8, 0x58, 0x8d, 0x9c, 0x4a, 0x9c, 0x25, 0x43, + 0xb5, 0xf0, 0x6e, 0x05, 0xbc, 0xfb, 0x34, 0xb9, 0x56, 0xea, 0x5d, 0x6e, 0x85, 0x0e, 0x5e, 0x19, + 0x1d, 0x92, 0xbf, 0x22, 0x3c, 0x1e, 0x4f, 0xf2, 0xd1, 0x26, 0x48, 0x4d, 0xa8, 0x65, 0xf3, 0x06, + 0xc2, 0x85, 0x55, 0x70, 0xe1, 0xd9, 0xf9, 0xa3, 0xbb, 0xc0, 0xe3, 0xff, 0x53, 0x84, 0xc7, 0xf8, + 0xf9, 0xf6, 0x73, 0xf2, 0x2a, 0x4f, 0xd9, 0xa2, 0xd0, 0x08, 0xb5, 0x8b, 0x42, 0xab, 0x17, 0x2e, + 0x3c, 0x06, 0x2e, 0x9c, 0x27, 0x13, 0xd2, 0x85, 0xc1, 0x85, 0xa2, 0x81, 0x0f, 0xbc, 0xb2, 0xc0, + 0x47, 0xc4, 0xc1, 0x37, 0x3f, 0x9f, 0x46, 0xf9, 0x77, 0x0e, 0xa9, 0x4f, 0x82, 0xe9, 0xa3, 0xfd, + 0x85, 0x0a, 0x5d, 0x3e, 0x15, 0xf8, 0x51, 0xc1, 0x8b, 0x6f, 0x08, 0xf9, 0x3c, 0x84, 0xf2, 0x6e, + 0x53, 0x8b, 0xed, 0xf7, 0xf9, 0x19, 0x22, 0xbf, 0x09, 0xfd, 0x12, 0xe1, 0x13, 0x4d, 0x9a, 0x02, + 0xdc, 0xcf, 0xdf, 0xe5, 0x48, 0x19, 0x53, 0x69, 0x7b, 0xae, 0x44, 0x66, 0x7f, 0x1e, 0xc8, 0x3e, + 0x4b, 0xd6, 0x4d, 0xc9, 0xaa, 0xdf, 0xe3, 0xbf, 0x87, 0xf0, 0x68, 0xbc, 0xd0, 0xd3, 0xb0, 0xb3, + 0x25, 0x14, 0x6a, 0x1d, 0x99, 0x33, 0x50, 0x8a, 0xc9, 0xbd, 0x0d, 0xf4, 0xb7, 0xac, 0x87, 0x47, + 0xcf, 0xf3, 0xb5, 0x83, 0x71, 0x93, 0xb2, 0x2f, 0xc6, 0x67, 0xb7, 0xfc, 0xd5, 0xab, 0x81, 0x4d, + 0x7b, 0xf5, 0x2a, 0x2d, 0x11, 0xa8, 0x63, 0x80, 0x3a, 0x4a, 0x4e, 0x4a, 0x54, 0x71, 0x36, 0x24, + 0x7f, 0x8b, 0x37, 0xb5, 0xd5, 0xc1, 0xcd, 0x31, 0x11, 0xb1, 0xea, 0x8b, 0x0a, 0x39, 0xb4, 0x5c, + 0x27, 0xf6, 0x0e, 0x0c, 0xeb, 0x92, 0x56, 0xf2, 0x90, 0x94, 0xbd, 0xa1, 0x06, 0x71, 0x82, 0xe3, + 0x69, 0xcd, 0x50, 0xa9, 0x57, 0x19, 0xbe, 0x3b, 0x14, 0x2f, 0xf2, 0x2c, 0x82, 0x5f, 0x54, 0x66, + 0x73, 0x9c, 0xe9, 0xd5, 0x34, 0x6d, 0xa4, 0xb6, 0xdf, 0x8a, 0x1f, 0x96, 0x7f, 0x84, 0xc8, 0x46, + 0xb9, 0x6f, 0xb5, 0x1d, 0xdb, 0x6a, 0x92, 0xb5, 0x87, 0xd2, 0xe5, 0x0b, 0xd7, 0xb6, 0xae, 0xee, + 0xf8, 0xec, 0xee, 0xee, 0x76, 0xa3, 0x1d, 0x74, 0x1d, 0x70, 0x2b, 0x08, 0x77, 0x9c, 0xe4, 0x2e, + 0xe0, 0x0e, 0xed, 0x39, 0xfd, 0xed, 0xa5, 0x9d, 0xc0, 0xc9, 0x5e, 0x3e, 0xdd, 0xfe, 0x38, 0xdc, + 0x0b, 0x7c, 0xe2, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x78, 0x10, 0xee, 0x69, 0x97, 0x2a, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -257,6 +259,8 @@ type AdminServiceClient interface { ListTaskExecutions(ctx context.Context, in *admin.TaskExecutionListRequest, opts ...grpc.CallOption) (*admin.TaskExecutionList, error) // Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. GetTaskExecutionData(ctx context.Context, in *admin.TaskExecutionGetDataRequest, opts ...grpc.CallOption) (*admin.TaskExecutionGetDataResponse, error) + // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + UpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) (*admin.TaskExecutionUpdateResponse, error) // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. UpdateProjectDomainAttributes(ctx context.Context, in *admin.ProjectDomainAttributesUpdateRequest, opts ...grpc.CallOption) (*admin.ProjectDomainAttributesUpdateResponse, error) // Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. @@ -622,6 +626,15 @@ func (c *adminServiceClient) GetTaskExecutionData(ctx context.Context, in *admin return out, nil } +func (c *adminServiceClient) UpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) (*admin.TaskExecutionUpdateResponse, error) { + out := new(admin.TaskExecutionUpdateResponse) + err := c.cc.Invoke(ctx, "/flyteidl.service.AdminService/UpdateTaskExecution", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *adminServiceClient) UpdateProjectDomainAttributes(ctx context.Context, in *admin.ProjectDomainAttributesUpdateRequest, opts ...grpc.CallOption) (*admin.ProjectDomainAttributesUpdateResponse, error) { out := new(admin.ProjectDomainAttributesUpdateResponse) err := c.cc.Invoke(ctx, "/flyteidl.service.AdminService/UpdateProjectDomainAttributes", in, out, opts...) @@ -846,6 +859,8 @@ type AdminServiceServer interface { ListTaskExecutions(context.Context, *admin.TaskExecutionListRequest) (*admin.TaskExecutionList, error) // Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. GetTaskExecutionData(context.Context, *admin.TaskExecutionGetDataRequest) (*admin.TaskExecutionGetDataResponse, error) + // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + UpdateTaskExecution(context.Context, *admin.TaskExecutionUpdateRequest) (*admin.TaskExecutionUpdateResponse, error) // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. UpdateProjectDomainAttributes(context.Context, *admin.ProjectDomainAttributesUpdateRequest) (*admin.ProjectDomainAttributesUpdateResponse, error) // Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. @@ -991,6 +1006,9 @@ func (*UnimplementedAdminServiceServer) ListTaskExecutions(ctx context.Context, func (*UnimplementedAdminServiceServer) GetTaskExecutionData(ctx context.Context, req *admin.TaskExecutionGetDataRequest) (*admin.TaskExecutionGetDataResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTaskExecutionData not implemented") } +func (*UnimplementedAdminServiceServer) UpdateTaskExecution(ctx context.Context, req *admin.TaskExecutionUpdateRequest) (*admin.TaskExecutionUpdateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateTaskExecution not implemented") +} func (*UnimplementedAdminServiceServer) UpdateProjectDomainAttributes(ctx context.Context, req *admin.ProjectDomainAttributesUpdateRequest) (*admin.ProjectDomainAttributesUpdateResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateProjectDomainAttributes not implemented") } @@ -1692,6 +1710,24 @@ func _AdminService_GetTaskExecutionData_Handler(srv interface{}, ctx context.Con return interceptor(ctx, in, info, handler) } +func _AdminService_UpdateTaskExecution_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(admin.TaskExecutionUpdateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AdminServiceServer).UpdateTaskExecution(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/flyteidl.service.AdminService/UpdateTaskExecution", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AdminServiceServer).UpdateTaskExecution(ctx, req.(*admin.TaskExecutionUpdateRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _AdminService_UpdateProjectDomainAttributes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(admin.ProjectDomainAttributesUpdateRequest) if err := dec(in); err != nil { @@ -2128,6 +2164,10 @@ var _AdminService_serviceDesc = grpc.ServiceDesc{ MethodName: "GetTaskExecutionData", Handler: _AdminService_GetTaskExecutionData_Handler, }, + { + MethodName: "UpdateTaskExecution", + Handler: _AdminService_UpdateTaskExecution_Handler, + }, { MethodName: "UpdateProjectDomainAttributes", Handler: _AdminService_UpdateProjectDomainAttributes_Handler, diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go index 796ed9f938..1c62a12b7e 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go +++ b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go @@ -2053,6 +2053,132 @@ func request_AdminService_GetTaskExecutionData_0(ctx context.Context, marshaler } +var ( + filter_AdminService_UpdateTaskExecution_0 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0, "node_execution_id": 1, "execution_id": 2, "project": 3, "domain": 4, "name": 5, "node_id": 6, "task_id": 7, "version": 8, "retry_attempt": 9}, Base: []int{1, 20, 1, 1, 1, 4, 3, 2, 7, 5, 3, 0, 0, 0, 9, 6, 0, 15, 9, 0, 17, 12, 0, 19, 15, 0, 19, 18, 0, 20, 0}, Check: []int{0, 1, 2, 3, 4, 2, 6, 7, 2, 9, 10, 5, 8, 11, 2, 15, 16, 2, 18, 19, 2, 21, 22, 2, 24, 25, 2, 27, 28, 2, 30}} +) + +func request_AdminService_UpdateTaskExecution_0(ctx context.Context, marshaler runtime.Marshaler, client AdminServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq admin.TaskExecutionUpdateRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id.node_execution_id.execution_id.project"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.project") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.project", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.project", err) + } + + val, ok = pathParams["id.node_execution_id.execution_id.domain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.domain") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.domain", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.domain", err) + } + + val, ok = pathParams["id.node_execution_id.execution_id.name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.name") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.name", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.name", err) + } + + val, ok = pathParams["id.node_execution_id.node_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.node_id") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.node_id", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.node_id", err) + } + + val, ok = pathParams["id.task_id.project"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.project") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.project", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.project", err) + } + + val, ok = pathParams["id.task_id.domain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.domain") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.domain", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.domain", err) + } + + val, ok = pathParams["id.task_id.name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.name") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.name", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.name", err) + } + + val, ok = pathParams["id.task_id.version"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.version") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.version", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.version", err) + } + + val, ok = pathParams["id.retry_attempt"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.retry_attempt") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.retry_attempt", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.retry_attempt", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_AdminService_UpdateTaskExecution_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.UpdateTaskExecution(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + func request_AdminService_UpdateProjectDomainAttributes_0(ctx context.Context, marshaler runtime.Marshaler, client AdminServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq admin.ProjectDomainAttributesUpdateRequest var metadata runtime.ServerMetadata @@ -3753,6 +3879,26 @@ func RegisterAdminServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu }) + mux.Handle("GET", pattern_AdminService_UpdateTaskExecution_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_AdminService_UpdateTaskExecution_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_AdminService_UpdateTaskExecution_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("PUT", pattern_AdminService_UpdateProjectDomainAttributes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -4175,6 +4321,8 @@ var ( pattern_AdminService_GetTaskExecutionData_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "data", "task_executions", "id.node_execution_id.execution_id.project", "id.node_execution_id.execution_id.domain", "id.node_execution_id.execution_id.name", "id.node_execution_id.node_id", "id.task_id.project", "id.task_id.domain", "id.task_id.name", "id.task_id.version", "id.retry_attempt"}, "")) + pattern_AdminService_UpdateTaskExecution_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11}, []string{"api", "v1", "task_executions", "id.node_execution_id.execution_id.project", "id.node_execution_id.execution_id.domain", "id.node_execution_id.execution_id.name", "id.node_execution_id.node_id", "id.task_id.project", "id.task_id.domain", "id.task_id.name", "id.task_id.version", "id.retry_attempt"}, "")) + pattern_AdminService_UpdateProjectDomainAttributes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"api", "v1", "project_domain_attributes", "attributes.project", "attributes.domain"}, "")) pattern_AdminService_GetProjectDomainAttributes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"api", "v1", "project_domain_attributes", "project", "domain"}, "")) @@ -4289,6 +4437,8 @@ var ( forward_AdminService_GetTaskExecutionData_0 = runtime.ForwardResponseMessage + forward_AdminService_UpdateTaskExecution_0 = runtime.ForwardResponseMessage + forward_AdminService_UpdateProjectDomainAttributes_0 = runtime.ForwardResponseMessage forward_AdminService_GetProjectDomainAttributes_0 = runtime.ForwardResponseMessage diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json index 0c99664435..80986f6777 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json @@ -2179,13 +2179,13 @@ }, "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}": { "get": { - "summary": "Fetches a :ref:`ref_flyteidl.admin.TaskExecution`.", - "operationId": "GetTaskExecution", + "summary": "Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`.", + "operationId": "UpdateTaskExecution", "responses": { "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/flyteidladminTaskExecution" + "$ref": "#/definitions/adminTaskExecutionUpdateResponse" } } }, @@ -2266,6 +2266,14 @@ "DATASET" ], "default": "UNSPECIFIED" + }, + { + "name": "evict_cache", + "description": "Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the\nexecution DAG and remove all stored results from datacatalog.", + "in": "query", + "required": false, + "type": "boolean", + "format": "boolean" } ], "tags": [ @@ -3188,6 +3196,13 @@ ], "default": "SINGLE" }, + "CacheEvictionErrorCode": { + "type": "string", + "enum": [ + "UNKNOWN" + ], + "default": "UNKNOWN" + }, "CatalogReservationStatus": { "type": "string", "enum": [ @@ -4015,11 +4030,22 @@ "state": { "$ref": "#/definitions/adminExecutionState", "title": "State to set as the new value active/archive" + }, + "evict_cache": { + "type": "boolean", + "format": "boolean", + "description": "Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the\nexecution DAG and remove all stored results from datacatalog." } } }, "adminExecutionUpdateResponse": { - "type": "object" + "type": "object", + "properties": { + "cache_eviction_errors": { + "$ref": "#/definitions/coreCacheEvictionErrorList", + "description": "List of errors encountered during cache eviction (if any).\nWill only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set." + } + } }, "adminFixedRate": { "type": "object", @@ -5108,6 +5134,14 @@ }, "title": "Response structure for a query to list of task execution entities.\nSee :ref:`ref_flyteidl.admin.TaskExecution` for more details" }, + "adminTaskExecutionUpdateResponse": { + "type": "object", + "properties": { + "cache_eviction_errors": { + "$ref": "#/definitions/coreCacheEvictionErrorList" + } + } + }, "adminTaskList": { "type": "object", "properties": { @@ -5593,6 +5627,44 @@ }, "description": "BranchNode is a special node that alter the flow of the workflow graph. It allows the control flow to branch at\nruntime based on a series of conditions that get evaluated on various parameters (e.g. inputs, primitives)." }, + "coreCacheEvictionError": { + "type": "object", + "properties": { + "code": { + "$ref": "#/definitions/CacheEvictionErrorCode", + "description": "Error code to match type of cache eviction error encountered." + }, + "message": { + "type": "string", + "description": "More detailed error message explaining the reason for the cache eviction failure." + }, + "node_execution_id": { + "$ref": "#/definitions/coreNodeExecutionIdentifier", + "description": "ID of the node execution the cache eviction failed for." + }, + "task_execution_id": { + "$ref": "#/definitions/coreTaskExecutionIdentifier", + "description": "ID of the task execution the cache eviction failed for (if the node execution was part of a task execution)." + }, + "workflow_execution_id": { + "$ref": "#/definitions/coreWorkflowExecutionIdentifier", + "description": "ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution)." + } + }, + "description": "Error returned if eviction of cached output fails and should be re-tried by the user." + }, + "coreCacheEvictionErrorList": { + "type": "object", + "properties": { + "errors": { + "type": "array", + "items": { + "$ref": "#/definitions/coreCacheEvictionError" + } + } + }, + "description": "List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request." + }, "coreCatalogArtifactTag": { "type": "object", "properties": { diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md index 9f51012635..79b06ece86 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md @@ -42,7 +42,6 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**GetProjectAttributes**](docs/AdminServiceApi.md#getprojectattributes) | **Get** /api/v1/project_attributes/{project} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**GetProjectDomainAttributes**](docs/AdminServiceApi.md#getprojectdomainattributes) | **Get** /api/v1/project_domain_attributes/{project}/{domain} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**GetTask**](docs/AdminServiceApi.md#gettask) | **Get** /api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Task` definition. -*AdminServiceApi* | [**GetTaskExecution**](docs/AdminServiceApi.md#gettaskexecution) | **Get** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**GetTaskExecutionData**](docs/AdminServiceApi.md#gettaskexecutiondata) | **Get** /api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**GetVersion**](docs/AdminServiceApi.md#getversion) | **Get** /api/v1/version | *AdminServiceApi* | [**GetWorkflow**](docs/AdminServiceApi.md#getworkflow) | **Get** /api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Workflow` definition. @@ -76,6 +75,7 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**UpdateProject**](docs/AdminServiceApi.md#updateproject) | **Put** /api/v1/projects/{id} | Updates an existing :ref:`ref_flyteidl.admin.Project` flyteidl.admin.Project should be passed but the domains property should be empty; it will be ignored in the handler as domains cannot be updated via this API. *AdminServiceApi* | [**UpdateProjectAttributes**](docs/AdminServiceApi.md#updateprojectattributes) | **Put** /api/v1/project_attributes/{attributes.project} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` at the project level *AdminServiceApi* | [**UpdateProjectDomainAttributes**](docs/AdminServiceApi.md#updateprojectdomainattributes) | **Put** /api/v1/project_domain_attributes/{attributes.project}/{attributes.domain} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. +*AdminServiceApi* | [**UpdateTaskExecution**](docs/AdminServiceApi.md#updatetaskexecution) | **Get** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**UpdateWorkflowAttributes**](docs/AdminServiceApi.md#updateworkflowattributes) | **Put** /api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. @@ -181,6 +181,7 @@ Class | Method | HTTP request | Description - [AdminTaskExecutionEventResponse](docs/AdminTaskExecutionEventResponse.md) - [AdminTaskExecutionGetDataResponse](docs/AdminTaskExecutionGetDataResponse.md) - [AdminTaskExecutionList](docs/AdminTaskExecutionList.md) + - [AdminTaskExecutionUpdateResponse](docs/AdminTaskExecutionUpdateResponse.md) - [AdminTaskList](docs/AdminTaskList.md) - [AdminTaskResourceAttributes](docs/AdminTaskResourceAttributes.md) - [AdminTaskResourceSpec](docs/AdminTaskResourceSpec.md) @@ -204,6 +205,7 @@ Class | Method | HTTP request | Description - [AdminWorkflowList](docs/AdminWorkflowList.md) - [AdminWorkflowSpec](docs/AdminWorkflowSpec.md) - [BlobTypeBlobDimensionality](docs/BlobTypeBlobDimensionality.md) + - [CacheEvictionErrorCode](docs/CacheEvictionErrorCode.md) - [CatalogReservationStatus](docs/CatalogReservationStatus.md) - [ComparisonExpressionOperator](docs/ComparisonExpressionOperator.md) - [ConjunctionExpressionLogicalOperator](docs/ConjunctionExpressionLogicalOperator.md) @@ -221,6 +223,8 @@ Class | Method | HTTP request | Description - [CoreBlobType](docs/CoreBlobType.md) - [CoreBooleanExpression](docs/CoreBooleanExpression.md) - [CoreBranchNode](docs/CoreBranchNode.md) + - [CoreCacheEvictionError](docs/CoreCacheEvictionError.md) + - [CoreCacheEvictionErrorList](docs/CoreCacheEvictionErrorList.md) - [CoreCatalogArtifactTag](docs/CoreCatalogArtifactTag.md) - [CoreCatalogCacheStatus](docs/CoreCatalogCacheStatus.md) - [CoreCatalogMetadata](docs/CoreCatalogMetadata.md) diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml index 7667076bef..72a461ec3d 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml @@ -1910,8 +1910,8 @@ paths: : get: tags: - "AdminService" - summary: "Fetches a :ref:`ref_flyteidl.admin.TaskExecution`." - operationId: "GetTaskExecution" + summary: "Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`." + operationId: "UpdateTaskExecution" parameters: - name: "id.node_execution_id.execution_id.project" in: "path" @@ -1988,11 +1988,21 @@ paths: - "DATASET" x-exportParamName: "IdTaskIdResourceType" x-optionalDataType: "String" + - name: "evict_cache" + in: "query" + description: "Indicates the cache of this (finished) task execution should\ + \ be evicted, instructing flyteadmin to traverse the\nexecution DAG and\ + \ remove all stored results from datacatalog." + required: false + type: "boolean" + format: "boolean" + x-exportParamName: "EvictCache" + x-optionalDataType: "Bool" responses: 200: description: "A successful response." schema: - $ref: "#/definitions/flyteidladminTaskExecution" + $ref: "#/definitions/adminTaskExecutionUpdateResponse" ? /api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id} : get: tags: @@ -2825,6 +2835,11 @@ definitions: - "SINGLE" - "MULTIPART" default: "SINGLE" + CacheEvictionErrorCode: + type: "string" + enum: + - "UNKNOWN" + default: "UNKNOWN" CatalogReservationStatus: type: "string" description: "Indicates the status of a catalog reservation operation.\n\n - RESERVATION_DISABLED:\ @@ -4486,8 +4501,75 @@ definitions: state: title: "State to set as the new value active/archive" $ref: "#/definitions/adminExecutionState" + evict_cache: + type: "boolean" + format: "boolean" + description: "Indicates the cache of this (finished) execution should be evicted,\ + \ instructing flyteadmin to traverse the\nexecution DAG and remove all stored\ + \ results from datacatalog." adminExecutionUpdateResponse: type: "object" + properties: + cache_eviction_errors: + description: "List of errors encountered during cache eviction (if any).\n\ + Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest`\ + \ is set." + $ref: "#/definitions/coreCacheEvictionErrorList" + example: + cache_eviction_errors: + errors: + - code: {} + workflow_execution_id: + domain: "domain" + name: "name" + project: "project" + task_execution_id: + task_id: + domain: "domain" + resource_type: {} + name: "name" + project: "project" + version: "version" + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + retry_attempt: 0 + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + message: "message" + - code: {} + workflow_execution_id: + domain: "domain" + name: "name" + project: "project" + task_execution_id: + task_id: + domain: "domain" + resource_type: {} + name: "name" + project: "project" + version: "version" + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + retry_attempt: 0 + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + message: "message" adminFixedRate: type: "object" properties: @@ -16019,6 +16101,66 @@ definitions: uri: "uri" ttl: "ttl" token: "token" + adminTaskExecutionUpdateResponse: + type: "object" + properties: + cache_eviction_errors: + $ref: "#/definitions/coreCacheEvictionErrorList" + example: + cache_eviction_errors: + errors: + - code: {} + workflow_execution_id: + domain: "domain" + name: "name" + project: "project" + task_execution_id: + task_id: + domain: "domain" + resource_type: {} + name: "name" + project: "project" + version: "version" + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + retry_attempt: 0 + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + message: "message" + - code: {} + workflow_execution_id: + domain: "domain" + name: "name" + project: "project" + task_execution_id: + task_id: + domain: "domain" + resource_type: {} + name: "name" + project: "project" + version: "version" + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + retry_attempt: 0 + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + message: "message" adminTaskList: type: "object" properties: @@ -43906,6 +44048,119 @@ definitions: integer: "integer" var: "var" operator: {} + coreCacheEvictionError: + type: "object" + properties: + code: + description: "Error code to match type of cache eviction error encountered." + $ref: "#/definitions/CacheEvictionErrorCode" + message: + type: "string" + description: "More detailed error message explaining the reason for the cache\ + \ eviction failure." + node_execution_id: + description: "ID of the node execution the cache eviction failed for." + $ref: "#/definitions/coreNodeExecutionIdentifier" + task_execution_id: + description: "ID of the task execution the cache eviction failed for (if the\ + \ node execution was part of a task execution)." + $ref: "#/definitions/coreTaskExecutionIdentifier" + workflow_execution_id: + description: "ID of the workflow execution the cache eviction failed for (if\ + \ the node execution was part of a workflow execution)." + $ref: "#/definitions/coreWorkflowExecutionIdentifier" + description: "Error returned if eviction of cached output fails and should be\ + \ re-tried by the user." + example: + code: {} + workflow_execution_id: + domain: "domain" + name: "name" + project: "project" + task_execution_id: + task_id: + domain: "domain" + resource_type: {} + name: "name" + project: "project" + version: "version" + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + retry_attempt: 0 + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + message: "message" + coreCacheEvictionErrorList: + type: "object" + properties: + errors: + type: "array" + items: + $ref: "#/definitions/coreCacheEvictionError" + description: "List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered\ + \ during a cache eviction request." + example: + errors: + - code: {} + workflow_execution_id: + domain: "domain" + name: "name" + project: "project" + task_execution_id: + task_id: + domain: "domain" + resource_type: {} + name: "name" + project: "project" + version: "version" + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + retry_attempt: 0 + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + message: "message" + - code: {} + workflow_execution_id: + domain: "domain" + name: "name" + project: "project" + task_execution_id: + task_id: + domain: "domain" + resource_type: {} + name: "name" + project: "project" + version: "version" + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + retry_attempt: 0 + node_execution_id: + execution_id: + domain: "domain" + name: "name" + project: "project" + node_id: "node_id" + message: "message" coreCatalogArtifactTag: type: "object" properties: diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go index dab31c18d1..d1031b1e8a 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go @@ -1988,120 +1988,6 @@ func (a *AdminServiceApiService) GetTask(ctx context.Context, idProject string, return localVarReturnValue, localVarHttpResponse, nil } -/* -AdminServiceApiService Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param idNodeExecutionIdExecutionIdProject Name of the project the resource belongs to. - * @param idNodeExecutionIdExecutionIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. - * @param idNodeExecutionIdExecutionIdName User or system provided value for the resource. - * @param idNodeExecutionIdNodeId - * @param idTaskIdProject Name of the project the resource belongs to. - * @param idTaskIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. - * @param idTaskIdName User provided value for the resource. - * @param idTaskIdVersion Specific version of the resource. - * @param idRetryAttempt - * @param optional nil or *GetTaskExecutionOpts - Optional Parameters: - * @param "IdTaskIdResourceType" (optional.String) - Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects - -@return FlyteidladminTaskExecution -*/ - -type GetTaskExecutionOpts struct { - IdTaskIdResourceType optional.String -} - -func (a *AdminServiceApiService) GetTaskExecution(ctx context.Context, idNodeExecutionIdExecutionIdProject string, idNodeExecutionIdExecutionIdDomain string, idNodeExecutionIdExecutionIdName string, idNodeExecutionIdNodeId string, idTaskIdProject string, idTaskIdDomain string, idTaskIdName string, idTaskIdVersion string, idRetryAttempt int64, localVarOptionals *GetTaskExecutionOpts) (FlyteidladminTaskExecution, *http.Response, error) { - var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue FlyteidladminTaskExecution - ) - - // create path and map variables - localVarPath := a.client.cfg.BasePath + "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.project"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdProject), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.domain"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdDomain), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.name"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdName), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.node_id"+"}", fmt.Sprintf("%v", idNodeExecutionIdNodeId), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.project"+"}", fmt.Sprintf("%v", idTaskIdProject), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.domain"+"}", fmt.Sprintf("%v", idTaskIdDomain), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.name"+"}", fmt.Sprintf("%v", idTaskIdName), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.version"+"}", fmt.Sprintf("%v", idTaskIdVersion), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.retry_attempt"+"}", fmt.Sprintf("%v", idRetryAttempt), -1) - - localVarHeaderParams := make(map[string]string) - localVarQueryParams := url.Values{} - localVarFormParams := url.Values{} - - if localVarOptionals != nil && localVarOptionals.IdTaskIdResourceType.IsSet() { - localVarQueryParams.Add("id.task_id.resource_type", parameterToString(localVarOptionals.IdTaskIdResourceType.Value(), "")) - } - // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/json"} - - // set Content-Type header - localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) - if localVarHttpContentType != "" { - localVarHeaderParams["Content-Type"] = localVarHttpContentType - } - - // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} - - // set Accept header - localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) - if localVarHttpHeaderAccept != "" { - localVarHeaderParams["Accept"] = localVarHttpHeaderAccept - } - r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) - if err != nil { - return localVarReturnValue, nil, err - } - - localVarHttpResponse, err := a.client.callAPI(r) - if err != nil || localVarHttpResponse == nil { - return localVarReturnValue, localVarHttpResponse, err - } - - localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body) - localVarHttpResponse.Body.Close() - if err != nil { - return localVarReturnValue, localVarHttpResponse, err - } - - if localVarHttpResponse.StatusCode < 300 { - // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { - return localVarReturnValue, localVarHttpResponse, err - } - } - - if localVarHttpResponse.StatusCode >= 300 { - newErr := GenericSwaggerError{ - body: localVarBody, - error: localVarHttpResponse.Status, - } - - if localVarHttpResponse.StatusCode == 200 { - var v FlyteidladminTaskExecution - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v - return localVarReturnValue, localVarHttpResponse, newErr - } - - return localVarReturnValue, localVarHttpResponse, newErr - } - - return localVarReturnValue, localVarHttpResponse, nil -} - /* AdminServiceApiService Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @@ -5750,6 +5636,125 @@ func (a *AdminServiceApiService) UpdateProjectDomainAttributes(ctx context.Conte return localVarReturnValue, localVarHttpResponse, nil } +/* +AdminServiceApiService Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param idNodeExecutionIdExecutionIdProject Name of the project the resource belongs to. + * @param idNodeExecutionIdExecutionIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. + * @param idNodeExecutionIdExecutionIdName User or system provided value for the resource. + * @param idNodeExecutionIdNodeId + * @param idTaskIdProject Name of the project the resource belongs to. + * @param idTaskIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. + * @param idTaskIdName User provided value for the resource. + * @param idTaskIdVersion Specific version of the resource. + * @param idRetryAttempt + * @param optional nil or *UpdateTaskExecutionOpts - Optional Parameters: + * @param "IdTaskIdResourceType" (optional.String) - Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects + * @param "EvictCache" (optional.Bool) - Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. + +@return AdminTaskExecutionUpdateResponse +*/ + +type UpdateTaskExecutionOpts struct { + IdTaskIdResourceType optional.String + EvictCache optional.Bool +} + +func (a *AdminServiceApiService) UpdateTaskExecution(ctx context.Context, idNodeExecutionIdExecutionIdProject string, idNodeExecutionIdExecutionIdDomain string, idNodeExecutionIdExecutionIdName string, idNodeExecutionIdNodeId string, idTaskIdProject string, idTaskIdDomain string, idTaskIdName string, idTaskIdVersion string, idRetryAttempt int64, localVarOptionals *UpdateTaskExecutionOpts) (AdminTaskExecutionUpdateResponse, *http.Response, error) { + var ( + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + localVarReturnValue AdminTaskExecutionUpdateResponse + ) + + // create path and map variables + localVarPath := a.client.cfg.BasePath + "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.project"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdProject), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.domain"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdDomain), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.name"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdName), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.node_id"+"}", fmt.Sprintf("%v", idNodeExecutionIdNodeId), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.project"+"}", fmt.Sprintf("%v", idTaskIdProject), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.domain"+"}", fmt.Sprintf("%v", idTaskIdDomain), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.name"+"}", fmt.Sprintf("%v", idTaskIdName), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.version"+"}", fmt.Sprintf("%v", idTaskIdVersion), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.retry_attempt"+"}", fmt.Sprintf("%v", idRetryAttempt), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + if localVarOptionals != nil && localVarOptionals.IdTaskIdResourceType.IsSet() { + localVarQueryParams.Add("id.task_id.resource_type", parameterToString(localVarOptionals.IdTaskIdResourceType.Value(), "")) + } + if localVarOptionals != nil && localVarOptionals.EvictCache.IsSet() { + localVarQueryParams.Add("evict_cache", parameterToString(localVarOptionals.EvictCache.Value(), "")) + } + // to determine the Content-Type header + localVarHttpContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) + if localVarHttpContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHttpContentType + } + + // to determine the Accept header + localVarHttpHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) + if localVarHttpHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHttpHeaderAccept + } + r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHttpResponse, err := a.client.callAPI(r) + if err != nil || localVarHttpResponse == nil { + return localVarReturnValue, localVarHttpResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body) + localVarHttpResponse.Body.Close() + if err != nil { + return localVarReturnValue, localVarHttpResponse, err + } + + if localVarHttpResponse.StatusCode < 300 { + // If we succeed, return the data, otherwise pass on to decode error. + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); + if err == nil { + return localVarReturnValue, localVarHttpResponse, err + } + } + + if localVarHttpResponse.StatusCode >= 300 { + newErr := GenericSwaggerError{ + body: localVarBody, + error: localVarHttpResponse.Status, + } + + if localVarHttpResponse.StatusCode == 200 { + var v AdminTaskExecutionUpdateResponse + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, nil +} + /* AdminServiceApiService Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go index 681eb05ed9..4ab0289ace 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go @@ -12,4 +12,6 @@ package flyteadmin type AdminExecutionUpdateRequest struct { Id *CoreWorkflowExecutionIdentifier `json:"id,omitempty"` State *AdminExecutionState `json:"state,omitempty"` + // Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. + EvictCache bool `json:"evict_cache,omitempty"` } diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go index 34de2f4ce0..e7d34dcac4 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go @@ -10,4 +10,6 @@ package flyteadmin type AdminExecutionUpdateResponse struct { + // List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. + CacheEvictionErrors *CoreCacheEvictionErrorList `json:"cache_eviction_errors,omitempty"` } diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go new file mode 100644 index 0000000000..becf9ea0cb --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go @@ -0,0 +1,14 @@ +/* + * flyteidl/service/admin.proto + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: version not set + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package flyteadmin + +type AdminTaskExecutionUpdateResponse struct { + CacheEvictionErrors *CoreCacheEvictionErrorList `json:"cache_eviction_errors,omitempty"` +} diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go new file mode 100644 index 0000000000..f27b405536 --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go @@ -0,0 +1,17 @@ +/* + * flyteidl/service/admin.proto + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: version not set + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package flyteadmin + +type CacheEvictionErrorCode string + +// List of CacheEvictionErrorCode +const ( + CacheEvictionErrorCodeUNKNOWN CacheEvictionErrorCode = "UNKNOWN" +) diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go new file mode 100644 index 0000000000..246c0011ad --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go @@ -0,0 +1,24 @@ +/* + * flyteidl/service/admin.proto + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: version not set + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package flyteadmin + +// Error returned if eviction of cached output fails and should be re-tried by the user. +type CoreCacheEvictionError struct { + // Error code to match type of cache eviction error encountered. + Code *CacheEvictionErrorCode `json:"code,omitempty"` + // More detailed error message explaining the reason for the cache eviction failure. + Message string `json:"message,omitempty"` + // ID of the node execution the cache eviction failed for. + NodeExecutionId *CoreNodeExecutionIdentifier `json:"node_execution_id,omitempty"` + // ID of the task execution the cache eviction failed for (if the node execution was part of a task execution). + TaskExecutionId *CoreTaskExecutionIdentifier `json:"task_execution_id,omitempty"` + // ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution). + WorkflowExecutionId *CoreWorkflowExecutionIdentifier `json:"workflow_execution_id,omitempty"` +} diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go new file mode 100644 index 0000000000..75ff771bf5 --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go @@ -0,0 +1,15 @@ +/* + * flyteidl/service/admin.proto + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: version not set + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package flyteadmin + +// List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request. +type CoreCacheEvictionErrorList struct { + Errors []CoreCacheEvictionError `json:"errors,omitempty"` +} diff --git a/flyteidl/gen/pb-go/flyteidl/service/openapi.go b/flyteidl/gen/pb-go/flyteidl/service/openapi.go index 0d16c30ef7..1ebf4a0f21 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/openapi.go +++ b/flyteidl/gen/pb-go/flyteidl/service/openapi.go @@ -78,7 +78,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _adminSwaggerJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x23\x37\x96\x2f\x0c\xff\x3f\x9f\x02\xb7\xfa\x46\xd8\xee\xd6\x62\xbb\x67\xfa\xed\xd1\xc4\x8d\xf7\xa1\x25\x56\x59\xd7\x2a\x49\xad\xc5\x1e\x3f\xc3\x0e\x1a\xcc\x04\x49\xb4\x32\x81\x34\x80\x94\x8a\xee\xe8\xef\xfe\x04\x0e\x96\x44\x6e\x64\x72\x91\x44\x95\x73\x26\xa2\xad\x62\x66\x62\x3d\x38\x38\xeb\xef\xfc\xf3\xdf\x10\x7a\x27\x9f\xf0\x6c\x46\xc4\xbb\x13\xf4\xee\xdb\xa3\xaf\xdf\x1d\xe8\xdf\x28\x9b\xf2\x77\x27\x48\x3f\x47\xe8\x9d\xa2\x2a\x21\xfa\xf9\x34\x59\x28\x42\xe3\xe4\x58\x12\xf1\x48\x23\x72\x8c\xe3\x94\xb2\xa3\x4c\x70\xc5\xe1\x43\x84\xde\x3d\x12\x21\x29\x67\xfa\x75\xfb\x27\x62\x5c\x21\x49\xd4\xbb\x7f\x43\xe8\x5f\xd0\xbc\x8c\xe6\x24\x25\xf2\xdd\x09\xfa\x1f\xf3\xd1\x5c\xa9\xcc\x35\xa0\xff\x96\xfa\xdd\xbf\xc3\xbb\x11\x67\x32\x2f\xbd\x8c\xb3\x2c\xa1\x11\x56\x94\xb3\xe3\x7f\x48\xce\x8a\x77\x33\xc1\xe3\x3c\xea\xf8\x2e\x56\x73\x59\xcc\xf1\x18\x67\xf4\xf8\xf1\x9b\x63\x1c\x29\xfa\x48\xc6\x09\xce\x59\x34\x1f\x67\x09\x66\xf2\xf8\x9f\x34\xd6\x73\xfc\x07\x89\xd4\xbf\xe0\x1f\x31\x4f\x31\x65\xe6\x6f\x86\x53\xf2\x2f\xdf\x0e\x42\xef\x66\x44\x05\xff\xd4\xb3\xcd\xd3\x14\x8b\x85\x5e\x91\xf7\x44\x45\x73\xa4\xe6\x04\x99\x7e\x90\x5b\x22\x3e\x45\x18\x9d\x08\x32\x3d\xf9\x45\x90\xe9\xd8\x2d\xf4\x91\x59\xe0\x0b\x18\xcd\x75\x82\xd9\x2f\x47\x76\x99\xa0\x65\x9e\x11\x01\x73\x3b\x8f\x75\xeb\x1f\x88\x1a\x40\xb3\xc5\xfb\xe1\xdb\x82\xc8\x8c\x33\x49\x64\x69\x78\x08\xbd\xfb\xf6\xeb\xaf\x2b\x3f\x21\xf4\x2e\x26\x32\x12\x34\x53\x76\x2f\x07\x48\xe6\x51\x44\xa4\x9c\xe6\x09\x72\x2d\x85\x83\x31\x53\xd5\x1b\x8b\x6b\x8d\x21\xf4\xee\x7f\x0b\x32\xd5\xed\xfc\xe1\x38\x26\x53\xca\xa8\x6e\x57\x1a\xfa\x09\x46\x5b\xfa\xea\x5f\xff\xd6\xf4\xf7\xbf\x82\x19\x65\x58\xe0\x94\x28\x22\x8a\x1d\x37\xff\x57\x99\x8b\xde\x23\xdd\x79\xb1\x8f\xd5\x81\x57\x66\x7b\x89\x53\xa2\xf7\x44\xef\x94\xfd\x02\xfe\x16\x44\xf2\x5c\x44\x04\x4d\x48\xc2\xd9\x4c\x22\xc5\x6b\x6b\x40\xa1\x05\x4d\x5e\xd5\x27\x82\xfc\x9a\x53\x41\xf4\x5e\x29\x91\x93\xca\x53\xb5\xc8\x60\x90\x52\x09\xca\x66\xe1\x52\xfc\xeb\xa0\xd3\xd4\x0c\x55\xae\x31\x33\xf3\x41\xeb\xc4\x46\x6c\xe0\x5e\x89\x30\x43\x13\x82\xf4\x59\xa4\x31\x11\x24\x46\x58\x22\x8c\x64\x3e\x91\x44\xa1\x27\xaa\xe6\x94\xe9\x7f\x67\x24\xa2\x53\x1a\xb9\x35\xdb\x9f\xb5\x81\x3f\x97\xaf\xcc\xbd\x24\x42\x0f\xfc\x91\xc6\x24\x46\x8f\x38\xc9\x09\x9a\x72\x51\x5a\x9e\xa3\x11\xbb\x9b\xeb\x75\x48\x27\x94\xc1\xc9\xd3\x6b\xe9\x28\xe4\x4f\x6e\xb9\xfe\x84\x74\x7f\x28\x67\xf4\xd7\x9c\x24\x0b\x44\x63\xc2\x14\x9d\x52\x22\xab\xad\xfd\x89\x43\xff\x38\x41\x87\x48\xaf\x33\x11\x0a\xd6\x9b\x33\x45\x3e\x29\x89\x0e\x51\x42\x1f\x08\xfa\xe2\x82\x4a\x85\x06\xd7\xe7\x5f\x1c\xa0\x2f\xcc\x79\x41\xc0\x9b\xbe\x78\x81\x15\xf6\x7f\xff\x3d\x38\x7a\x0a\xcf\xaa\x87\xee\xdd\x40\x9f\xe6\x5b\x73\x35\x14\x2d\xfc\xfd\xdf\xc2\x76\xec\x7e\x2d\xe7\xb7\x05\xb3\xb5\x9c\xb6\x2b\x7f\x85\x65\x2a\xb3\x56\xa9\x77\x68\x5b\xce\xaa\xdb\xad\xb2\x56\xf9\xb6\x78\xab\x9e\xc2\x73\xf3\xd7\x6d\x98\x2b\x56\x40\xf5\x98\x32\x73\x48\xfc\x99\x11\x52\x9f\x13\x47\xbd\x7b\xc2\x52\xb6\xe1\xb5\xc1\xcc\x02\x76\xeb\xb8\x68\xb0\x2a\x7b\x38\xef\x84\xa6\x74\xd5\xfe\x9e\xb3\x58\x8b\x5c\x96\xd9\xb1\x3c\x9d\x10\xa1\x97\xc1\xb1\x3d\x98\xed\x44\xb3\x41\x95\x0b\x46\xe2\x0e\xd3\xfc\x35\x27\x62\xb1\x64\x9e\x53\x9c\xc8\xb6\x89\x52\xa6\x88\x96\x6f\x2b\x8f\xa7\x5c\xa4\x58\xd9\x17\xfe\xf2\xef\xeb\x2e\x84\xe2\x0f\x64\xd5\xfe\x9f\x9b\xdd\x8c\xb0\x04\x32\x48\xf3\x44\xd1\x2c\x21\x28\xc3\x33\x22\xed\x8a\xe4\x89\x92\x07\xf0\x9a\x96\xa9\x89\x38\xf4\x37\x10\xf4\xe0\x6e\xde\x5c\xc2\x2f\x68\xea\x05\x48\x46\x3e\x29\x68\x69\xc4\xe0\xee\x85\x25\x0a\x6f\x94\x67\x58\xca\xcd\x68\x46\x72\xa1\xc6\x93\xc5\xd1\x03\xa9\xf5\xdb\x4a\x39\x98\x21\xac\x94\xa0\x93\x5c\x11\x3d\x6f\xdd\x86\xbb\x3b\x81\x3d\x9a\x0b\xba\x0b\x6b\x78\xbd\x09\xc7\x54\x90\x08\xe6\xb6\xce\x81\xf1\x5f\xe9\x79\x6b\xfd\x65\x61\x66\xff\x40\x16\x20\x8f\x34\xac\x80\xdf\xf2\x11\x1b\x31\x74\x88\xce\x86\xb7\xa7\xc3\xcb\xb3\xf3\xcb\x0f\x27\xe8\xbb\x05\x8a\xc9\x14\xe7\x89\x3a\x40\x53\x4a\x92\x58\x22\x2c\x08\x34\x49\x62\x2d\x73\xe8\xc1\x10\x16\x53\x36\x43\x5c\xc4\x44\x3c\xdf\x32\x56\x9e\x12\x96\xa7\x95\x7b\x05\x7e\x2f\x46\x5f\xf9\x42\x8b\x18\xfe\x51\xe9\xc9\xdf\x6b\x0b\x0c\x33\xd6\x7d\x07\xad\xbd\x98\x50\x13\xcd\x69\x12\x0b\xc2\x8e\x15\x96\x0f\x63\xf2\x89\x44\xb9\xb9\x93\xff\x59\xfe\x61\xac\x25\x53\x1e\x93\xf2\x2f\xa5\x7f\x14\xa2\xd0\xda\x9f\x7a\x2d\x75\xed\x2f\x41\xa7\xed\xf6\x1d\xfc\x42\xe3\xc6\xb7\xe1\x97\x15\x73\x70\xef\x2c\x19\xac\x7b\xa5\x75\x54\xee\x05\x2b\xf1\x35\xbe\x23\x88\x12\x8b\x31\x56\x8a\xa4\x99\x5a\x53\x5f\xc7\x28\xd1\x72\xe5\x32\x39\xf2\x92\xc7\x64\xe8\xfa\xfb\x05\x19\x71\x96\xc4\x68\xb2\xb0\x5c\x6b\x4a\x04\x61\x11\x69\x6f\xe1\x0e\xcb\x87\xa2\x85\x55\xc2\x68\xa9\x3f\xf9\x9e\x0b\xfd\xf9\x5b\x10\x48\x4b\x03\x7f\x09\x99\x74\xd3\x13\xf7\xd9\x59\x08\x36\xe4\x1f\xbd\x3d\x61\xfb\x95\xec\x6a\x7d\xe0\x02\xc9\x85\x54\x24\x5d\x69\x87\x78\x3b\x0b\x61\x2f\x88\x7d\x1d\x70\xe5\x8e\xfa\x1d\x9c\xfa\xf2\x8d\xdb\x1f\xef\x35\x96\x6c\x57\x56\xc4\x7d\x9f\xa7\xf3\xe1\x2c\x9f\xea\xad\xdb\xbe\xc0\x89\xf1\x26\xa6\x59\x92\x05\x77\x3d\xc8\x67\x32\x37\xb4\xee\x95\x5b\xed\x31\x0c\x60\x85\xa2\x59\xb6\x43\xfb\xf3\xa7\x3f\x0d\x2d\x34\xc6\x1c\xa7\xe6\x54\x06\xc6\x2a\x14\x71\x61\x64\xc1\xd8\x9e\x77\xa3\x6b\x0e\xee\x06\xb7\xc3\xbb\x13\x34\x40\x31\x56\x58\x1f\x70\x41\x32\x41\x24\x61\x0a\xf4\x78\xfd\xbd\x5a\xa0\x94\xc7\x24\x31\x1a\xe7\x7b\x2d\xf9\xa2\x33\xac\xf0\x29\x56\x38\xe1\xb3\x23\x34\x80\x7f\xea\x8f\xa9\x44\x38\x91\x1c\x61\x47\x56\x24\x76\x4d\x60\x16\x3b\xd6\x82\x51\xc4\xd3\x8c\x26\xde\x06\xef\x8d\x2b\x94\xc5\xf4\x91\xc6\x39\x4e\x10\x9f\x68\xae\xa2\x35\xe4\xe1\x23\x61\x2a\xc7\x49\xb2\x40\x38\x49\x90\xed\xd6\xbd\x80\xe4\x9c\xe7\x49\xac\xdb\x75\xa3\x94\x34\xa5\x09\x16\x5a\x05\x37\xa3\xbd\xb2\x6d\xa1\xbb\x39\xf1\x63\x85\x71\xe9\xd5\x4c\xf1\x03\x91\x88\x2a\x94\x71\x29\xe9\x24\x29\xce\xfc\xfd\x39\x82\x71\x9f\x5e\x9c\x83\x3e\x1f\x29\xc4\x0d\x0f\x75\x9d\x5b\xfb\x8d\xeb\x31\xc5\x8c\x11\xe8\x98\xab\x39\x11\xb6\x7b\xfb\xf2\x6b\xab\xe6\xf7\x97\xb7\xd7\xc3\xd3\xf3\xf7\xe7\xc3\xb3\xba\x6e\x7e\x37\xb8\xfd\xa1\xfe\xeb\x4f\x57\x37\x3f\xbc\xbf\xb8\xfa\xa9\xfe\xe4\x62\x70\x7f\x79\xfa\xfd\xf8\xfa\x62\x70\x59\x7f\x68\xc9\xaa\xb3\x9a\x1f\x8e\x6c\xcd\xb3\xd5\xdb\x34\x9f\xcb\xa6\x79\xf0\xf9\x1a\x35\xa7\x34\x01\x1d\xb4\xb3\x41\xd3\xdb\x10\xec\x97\x28\xc3\x52\x1a\xc9\xc8\x8c\xe0\x68\xc4\x3e\x72\xa1\x19\xd8\x94\x6b\x1e\xa1\xa5\x27\x25\xf2\x48\x51\x36\xf3\x1f\x9d\xa0\x51\xfe\xf5\xd7\x7f\x8e\x2e\x28\x7b\x80\xbf\xc8\x3e\x2e\x4e\x6f\xf1\xed\x2d\xbe\xbf\x2f\x8b\xaf\x16\x7d\x8e\x43\x43\xef\x6e\x43\x86\xb4\x70\xc1\xb2\x5c\x81\x28\xc1\x73\xa5\xff\xd4\x5d\x02\x79\x2c\x09\x1c\xea\x66\x50\xfc\x40\x94\x7f\x51\x8b\x36\x6f\xc1\x8e\xf8\x13\x17\x0f\xd3\x84\x3f\xf9\x81\x7f\x20\x4a\x8f\xfd\xc6\xf6\xd2\x87\x12\xf5\xa1\x44\xaf\x1b\x4a\xb4\x57\xc6\xbc\xe7\x67\x7e\x65\xcb\x9f\xe1\x80\x2d\x9e\xac\x56\x47\x55\x8b\x1f\x2a\x70\x33\xbd\x08\xd7\x2c\x3b\x73\x56\x70\xce\xd2\xcb\x6f\x85\x7b\x96\x06\xfd\xf2\x9c\xf3\x77\xe1\x6f\xe9\xdd\x29\x1b\x2e\xd4\x9b\x64\xb0\x1d\xef\x8e\x17\x73\x86\x3c\x3f\xc3\xaf\xc5\x36\xac\x13\xcc\xb0\x46\xf4\x42\xe7\x70\x85\x15\xf1\x09\x8d\x01\x09\x4d\x11\x08\xf5\x90\x83\xc6\x18\x83\xed\x82\x0a\x36\xbd\x9b\xba\x87\x09\x7c\x20\xaa\xf4\xf2\x5b\xb9\x9b\x4a\x83\x7e\xf9\xbb\xe9\x77\x1a\x1d\xd0\x87\x03\x3c\xe3\xd2\x7d\xee\x37\xda\xfe\x3a\xfc\x7f\x07\x1e\xfe\xde\xa5\xbf\xd6\x1a\x7d\x5e\x3e\xfc\xcf\xd5\x69\xff\x36\xbd\xf4\xbd\x5b\xbe\x77\xcb\xbf\x86\xff\xe4\xed\xb9\xe5\x9f\x57\x3d\x2d\x8e\xd7\xd8\xd1\x82\xd5\xd7\x82\x43\xf9\xaf\x0e\x4e\x1a\xf8\xcb\xa9\x7c\xeb\x06\x8d\xb7\xea\x70\x67\xc5\xf8\x86\x70\x84\x7e\xb1\x84\xb4\x42\x9d\xab\x7d\xf7\x16\xd4\xb9\xfa\xa0\x9f\x5f\x87\x7b\x35\xe6\xfb\x4c\x97\xe7\x1b\x61\x03\xeb\xdf\x96\x9f\xb1\x4c\xde\xcb\xe2\xcf\x9f\x8d\xbf\x37\x13\x7a\x3b\xb2\xf7\x2b\x5c\xbc\x1d\x6f\xdd\x9d\xe7\x64\x35\x5c\xb3\xc1\xed\xb4\x2a\xc3\xaa\xfa\x35\x25\xf2\xdb\x37\x79\xdf\xbe\x44\x92\x55\x7f\xe1\xf6\x17\xae\x6d\xaa\xbf\x70\x3f\xe3\x0b\x77\xef\xe0\x6f\xf6\x26\x02\xb4\x0f\x22\xef\x81\x31\xfa\x18\xf2\x1d\x2e\x4e\x1f\x43\xde\xc7\x90\xff\xce\x62\xc8\xb7\xd1\x9e\x36\xc5\xa2\x7c\x0d\x3d\xaa\x57\xa3\x7a\x35\x2a\xfc\xbd\x57\xa3\x7a\x35\xaa\x57\xa3\x3e\x73\x14\xd1\x5e\x87\xea\xbe\x10\xbd\x0e\xd5\x79\xa9\x7a\x1d\x6a\xc9\xe2\xf4\x3a\x54\xaf\x43\xfd\xbe\x74\x28\xf2\x48\x98\x92\x90\x8c\x16\x6a\x14\xef\x32\x2e\xdb\x35\xa1\x90\x3b\x34\x68\x41\xd0\x66\x39\x29\x0c\x02\x97\x7e\x41\x73\x2c\x11\x8f\xa2\x5c\x54\xce\x40\x55\x0f\x3a\x15\x04\x2b\x02\x2d\xe8\x0f\xdf\x82\xfe\x53\x9f\xee\x4b\xc5\xe0\x4f\x78\x5c\xa3\x76\x73\x10\x9a\x9e\x2c\x97\x47\x76\x36\xf5\x5f\x73\xd2\x4d\xfd\x7b\x46\xa2\x56\x58\x3e\xec\x98\xa8\x4b\xb9\x16\x1b\x11\x35\xb4\xf0\x56\x88\xba\x3e\xdd\xdf\x0d\x51\x37\x4d\x7d\x1f\x88\xfa\xc9\xe6\xf1\xef\x98\xb0\x6b\xf0\x00\x1b\x11\xb7\x6f\xe5\xad\x10\x78\xf3\xb4\x7f\x37\x44\xde\x36\xfd\xd7\x25\x74\x9f\x22\xd9\x99\xc4\xef\x04\x9d\xcd\xb4\x9a\x01\x1a\x9e\x26\xc5\xd5\x35\x82\x8a\xa4\xc0\x95\x64\xed\x5f\x7d\x0b\x24\xed\x07\x6b\xc6\xfe\xbb\xa1\xe5\xda\xbc\xf7\x84\x88\x8f\x05\x89\xf8\x23\xd4\x0b\xeb\x46\xcc\x37\x04\x28\x18\xf8\x75\x26\xc8\x23\xe5\xb9\x4c\x16\x87\x22\x67\xc8\x31\x7f\xe4\x9b\x37\xd6\xea\x27\x9a\x24\x88\x33\xad\x7f\x29\x2c\x94\x7b\xac\xf5\x6f\xc1\x53\x38\x15\x09\x96\x0a\x3d\x30\xfe\xc4\xd0\x14\xd3\x24\x17\x04\x65\x9c\x32\x75\x34\x62\xe7\x0c\xdd\x98\x31\x42\xde\xc0\x01\xca\xa5\x3e\x4b\x11\x66\x8c\x2b\x14\xcd\x31\x9b\x11\x84\xd9\xc2\x26\xe0\x16\x94\x81\xb8\x40\x79\x16\x63\xad\xf8\xce\x49\x35\x4a\xcf\x8f\x11\xcc\x77\x54\x22\x2a\x11\xf9\xa4\x04\x49\x49\xb2\xd0\x7d\x68\xda\x57\x1c\xd9\xf5\x31\x43\xb5\xe9\x7c\x44\x08\x2e\x24\x64\x1c\x4c\x16\xbf\x61\xa6\x28\x23\x08\x14\x25\x69\x4c\x73\x87\xe8\x82\x4b\x30\xdb\xfc\xf0\x57\x89\xa2\x24\x97\x8a\x88\x03\x34\xc9\x67\x52\x6b\x8a\x59\x82\xd5\x94\x8b\x54\x8f\x90\x32\xa9\xf0\x84\x26\x54\x2d\x0e\x50\x8a\xa3\xb9\x69\x0b\xd6\x40\x1e\x8c\x58\xcc\x9f\x98\x54\x82\x60\xdf\xbb\x7b\x88\xbe\x0c\x9f\x19\x02\x90\x5f\x1d\x40\xda\x21\x4d\xb5\xba\x1b\x0c\xbf\xd8\x71\xb3\x27\xba\x11\x12\xa3\x09\x89\x70\x2e\xad\x87\x41\x89\x05\x22\x9f\xe6\x38\x97\xb0\x77\x7a\x7a\x36\x67\x23\xe2\x69\x96\x10\x45\x10\x9d\x22\x25\x28\x89\x11\x9e\x61\xaa\x97\xee\x96\x2c\x01\x41\xf7\x44\x6f\x37\xd0\x52\xfd\x2f\xa0\x7e\xa7\x5c\x10\x14\x13\x85\x69\xb2\xd4\xeb\x64\xbf\xed\xb9\xdc\x5b\xe2\x72\xe5\x0d\xdf\x0b\x36\x67\x40\xfc\x77\x70\x69\x33\x6b\xba\x8f\x70\xb2\xe5\xfd\x7d\x63\x07\xd5\xd3\xf6\xdb\xa2\x6d\xb3\x6b\xfb\x43\xdc\x2f\x16\x83\xdd\xbd\xa2\x45\x51\xcd\xe2\x4d\xd1\xf4\x4b\x84\x05\xf4\x0e\xe7\xde\xe1\xdc\xba\x32\x6f\xd3\xe1\xbc\x37\x1e\xa3\xde\xe7\xfc\x4c\x3e\x67\x2a\x7b\xa7\x73\xef\x74\xee\xba\x40\xbd\xd3\xb9\x77\x3a\xbf\x5d\xa7\xf3\x73\xe2\x3e\xef\x14\xdd\xf9\x4d\x89\xd6\xbd\x58\xdd\x8b\xd5\x3d\x84\xb3\x9f\xda\xae\x58\x98\xfb\xfa\x5d\x4c\x12\xa2\x48\xbb\x3d\x8b\x88\x54\x6b\x0b\xe6\x7a\xa6\x4c\xcb\x71\x33\x41\xa4\xdc\x96\x21\xf9\x86\xdf\x26\x5b\xf2\xc3\xef\xa1\xe6\x7b\x3e\xd5\xf3\xa9\x4d\xa6\xb6\x3f\xa6\xd9\xe0\x30\xbf\x94\x6d\xd6\xf3\xdf\x2c\x6f\x97\xfe\xee\x8d\x1b\xb2\xf0\x8b\x1a\x0a\xd7\x52\xbb\xe2\xfe\x70\x5b\x3a\xdf\x92\x1f\x9b\xbe\xde\x26\x33\x36\x63\xef\x39\x71\xcf\x89\x7b\x4e\xfc\xb6\x39\xb1\x3b\xc9\xaf\xea\x22\x33\x7e\xba\x71\x96\x60\x36\xa6\xb1\x3c\xfe\x67\xa1\xcb\x3f\x97\x87\x4c\x1f\xa8\xd8\xa4\x98\xfa\x94\x4e\xf1\x8b\xfe\x24\x29\x0c\xe6\x1e\x33\x73\x85\x13\xcd\xd8\xd8\xaf\x13\xcc\xce\xe3\x37\xe1\x47\x6b\x9c\xfd\x4b\xf8\xd4\xb6\xe1\xe3\x58\x81\xa7\x03\x53\x66\x4c\x78\x45\x5e\x6d\xc9\x40\xb9\x1f\x27\x7c\x1b\xae\x1e\x4c\x2c\x60\xec\x8e\x5f\x07\x8b\xb2\x7f\xd3\xee\xfd\x3a\x7d\x2e\x61\xef\xb9\xe8\x38\xe1\xde\x73\xb1\xbf\x9e\x8b\xd7\x72\x47\xbe\xf0\xf1\x7c\x29\xb1\xae\x7b\x10\xbe\x89\x56\x83\xa0\xd6\x3c\x4b\x38\x8e\x97\xb9\x62\x0a\xc1\x2b\x04\x47\x59\x19\x89\x5f\x7c\xf6\x16\x84\xb5\x62\xb4\xbf\xb3\x48\xbe\xfa\xc4\xf7\x45\x4b\x79\xc1\x50\xbe\x66\x12\x5f\x43\x25\x79\x1b\xf8\xa9\xc5\x78\xfb\xd0\xbe\xde\xa2\xf4\xfa\x16\xa5\x3e\xb4\xaf\x57\x01\xf7\x4c\x05\xec\x43\xfb\xfa\xd0\xbe\x5e\x41\x5e\x3e\xed\x5e\x41\xfe\x2c\x42\xfb\x3a\x89\xda\xcf\x88\xbd\xb9\xbd\xd0\xdd\xcb\xdc\xee\xbd\x5e\xe6\xee\x65\xee\xcf\x54\xe6\xde\x8f\x15\xee\x05\xee\x5e\xe0\xee\x05\xee\x5e\xe0\xee\x05\xee\x9d\x2f\x63\x2f\x70\xbf\x64\x81\xce\x66\xa9\x7b\x45\x92\xcd\x5b\xf5\xe5\xf4\xe2\x76\x2f\x6e\xef\xb7\xb8\xbd\x37\x13\x7a\x3b\x65\x1e\xbb\xcd\xa7\x2f\x52\xde\x17\x29\xef\x8b\x94\x3f\x7b\x91\x72\xf7\x75\x87\x8c\x0f\x7b\xb8\x14\x56\xb9\x34\x80\x8f\x82\xcc\xa8\x54\xc0\xfe\xbb\xc8\x2b\xab\x13\x3d\xde\xaa\x9c\xd2\xa7\x7a\xf8\xa7\xbd\xd4\xd2\x4b\x2d\xbf\x53\xa9\x65\x8f\x62\xc1\xf6\x22\x63\x25\xc5\x2a\x9a\xe3\x49\x42\xc6\xde\xe8\x23\xbb\xea\xc1\x17\x54\x2a\x89\xa2\x5c\x2a\x9e\xb6\x5f\x2e\x1f\x5d\x0f\x03\xdf\xc1\x29\x67\x53\x3a\xcb\xcd\xdd\x62\xc0\x39\x83\x13\x5d\x48\x82\x8b\x8c\xac\xf2\x54\x35\xb4\xfe\x26\xae\xa5\xe6\xa1\xbf\xd4\xed\xb4\x8e\xe0\x5e\x18\xf9\xac\xd4\xad\x65\xad\xf1\xcd\xf0\xf6\xea\xfe\xe6\x74\x78\x82\x06\x59\x96\x50\x63\x77\x37\xa4\x40\x7f\xd3\x93\x42\x0a\xcb\x87\x62\x2f\x85\x21\x73\x83\x61\x0b\x86\x7e\x2d\x1b\xa3\x43\x74\x7a\x71\x7f\x7b\x37\xbc\x69\x69\xd0\x12\x0a\xe4\xad\x92\x34\x4b\xb0\x22\x31\x7a\xc8\x27\x44\x30\xa2\xa5\x1d\x8b\x74\x5b\x98\xff\x4d\xa3\xc3\xff\x1e\x9e\xde\xdf\x9d\x5f\x5d\x8e\xff\x76\x3f\xbc\x1f\x9e\x20\x47\x71\xba\x59\x3d\x2e\x3d\x8a\x78\xc1\x70\xaa\x35\x10\xfd\x43\x91\x29\xfb\x6b\x4e\x72\x82\xb0\x94\x74\xc6\x52\x02\x88\xc0\xa5\x16\xdd\x80\x2f\x06\xdf\x0d\x2f\xca\x2d\xcf\x49\x08\xbf\x8b\x12\x3c\x21\x89\xf5\x47\x80\x89\x5d\x13\x7a\x00\x55\x6c\x1c\x15\xb9\x59\xd5\xbf\xdd\x0f\x2e\xce\xef\x7e\x1e\x5f\xbd\x1f\xdf\x0e\x6f\x7e\x3c\x3f\x1d\x8e\xad\x54\x79\x3a\xd0\xfd\x96\x7a\xb2\xc2\x27\xfa\x35\xc7\x89\xd6\x4e\xf8\xd4\xe1\xf1\xa2\xa7\x39\x61\x28\x67\x40\x71\x46\xe5\xd1\x7a\x90\xef\x54\x9f\x32\x33\xa3\xeb\x8b\xfb\x0f\xe7\x97\xe3\xab\x1f\x87\x37\x37\xe7\x67\xc3\x13\x74\x4b\x12\x50\x0a\xdc\xa2\xc3\x2e\x66\x49\x3e\xa3\x0c\xd1\x34\x4b\x88\x5e\x0d\x6c\xb3\x89\xe7\xf8\x91\x72\x61\x8f\xee\x8c\x3e\x12\x66\xd6\x11\xce\x2c\xb4\xef\x84\xef\x71\xb0\x74\x57\x97\xef\xcf\x3f\x9c\xa0\x41\x1c\xfb\x39\x48\x68\xa3\x44\x39\x0e\xd6\xf9\xb0\x3c\x6c\xcd\x1c\xa0\x7b\x43\x44\xfc\x91\x08\x41\x63\x52\xa1\xa3\xc1\xed\xed\xf9\x87\xcb\x8f\xc3\xcb\x3b\x58\x31\x25\x78\x22\xd1\x9c\x3f\x81\x29\x1b\x66\x08\x16\xee\x47\x4c\x13\xe8\xcc\x6d\x16\x67\xe8\x69\x4e\xc1\xfd\x01\xc0\xcc\xbe\x67\xa3\x9f\x89\x9c\xbd\xba\x75\xb6\x74\xf0\xea\x6a\x4b\xf5\x24\xd5\xdf\xa8\x1c\x8b\x65\x2f\x94\xa8\xbc\xfe\xe2\x2a\x6a\xad\x7f\x51\x21\xb7\x76\x65\xad\x46\x2f\xed\x33\x2d\xf6\xba\xb3\xae\x56\x5e\xc3\x17\xbb\x66\x35\xe3\x8d\x5f\xa2\x2a\xeb\x0d\xf8\x3d\x97\xc2\x3e\x05\x39\x93\xbf\x58\xe5\x7e\x85\x69\x3a\xf8\xe2\x2d\x5c\xae\xe1\x70\xf7\xe8\x22\xbd\x09\xe5\x1a\x27\x1e\xa7\x44\xe1\x18\x2b\xac\xd9\xd3\x8c\xa8\x23\x74\xc5\xe0\xd9\x1d\x96\x0f\x07\xc8\x15\xa4\x40\x5c\xa0\x42\x70\x7c\x81\x6c\xc9\x37\x62\x93\x59\x5f\x99\xe9\x95\xf2\x5e\x29\x6f\x5e\x99\x3e\x72\xa7\x65\x85\x77\x75\x31\xae\x65\xc6\xdc\xdd\xfd\x65\x5a\x7c\xbb\x57\xd8\xcb\xda\x2d\x77\x7a\xa1\x99\x62\x28\xfd\x6d\x65\xfe\xaf\xbf\xad\xfa\xdb\xaa\xbf\xad\xf6\x60\x85\x5f\xdd\x06\xdc\xc0\xdd\x5f\xd5\x08\xbc\x4a\x3b\xdd\x18\xc5\xa8\xd0\x46\xd7\xc1\x31\xfa\xa5\x2b\x5c\x51\xf1\x0d\x7d\x1b\x66\xdf\x60\x92\x2f\x91\xa9\xb0\xd3\xcb\xdc\x84\x00\xf7\xfa\xe9\x33\xde\xf8\x3d\xa8\xd4\x4e\x41\xa5\xf6\x63\xae\xcf\x92\xd5\xb0\x7b\x53\xf4\xdb\xc8\x64\xe8\xd1\xa3\xfa\x58\xfd\x3e\x56\x1f\x7e\xef\xd1\xa3\x76\x47\xad\xcf\x2b\x5d\xf3\x98\x8c\x2b\x35\x3e\xfc\x3f\xc7\x55\xcf\x4f\xe9\x49\xe8\x06\x2a\x3d\x28\x92\x17\xa0\x75\x1a\xef\xb2\x2e\xc8\x25\x8f\x49\xe7\xda\x20\xa5\x97\xf7\x5c\x06\x77\xf3\x34\xb2\x78\x69\xe0\xcf\x2c\x89\xb7\x6c\xf9\xe7\x68\xd8\x69\x20\xe0\xde\xca\xb3\x72\xa1\x3e\x57\x80\xe8\x82\x43\xbd\x21\x4f\x45\x37\x36\xee\xc2\x54\xc6\x2d\xcc\xbc\xf9\xb9\x67\xe9\xcd\x8f\x9f\x07\x06\xa2\x3b\x47\x07\xb3\x4a\xf8\xf6\xdb\xb0\xab\x84\x23\x7e\x09\xcb\xca\xd2\xbd\xff\xec\xb8\xfa\x32\x4a\xee\x79\x7b\xc7\xe5\xfa\x5c\x39\x7c\x8f\xda\xb0\xcc\xd6\xd1\xc3\x22\xf4\xa6\x96\xfd\x99\x70\x6f\x6a\x79\xd3\xa6\x16\xe3\xa2\x1d\x67\x58\x10\xa6\x1a\x44\xea\xea\x75\x02\xaf\x87\x69\xb4\x4e\xea\x80\x06\x90\x96\x68\x91\xbd\x90\xfd\x55\xf5\x79\xd9\x5e\xac\x60\x10\x24\xb7\x1c\xff\xb3\xf8\xdb\x0b\xeb\x25\x50\xef\x25\xd1\x49\x06\xbe\x59\xea\x3b\x3a\xb7\x81\x4a\xdb\xa7\xbf\x60\x55\x12\x05\x13\xf2\x48\x92\x95\xf1\x4c\xd7\xe6\xed\xb7\x95\xf5\x52\x1b\xf4\xcb\xc6\x36\xd5\x37\xbe\xdb\x01\x72\x3b\x43\x4d\x06\x47\x90\x26\xa0\xa5\x51\x3e\x2d\x2e\x06\x89\x9e\x68\x92\x40\x92\x38\x24\xb1\xb4\xdd\x00\xbf\xbb\x88\x87\xd6\x9d\x7f\xd5\xb8\x87\x26\xee\xd0\xc4\x12\xba\xd8\x53\x77\x95\x06\xe7\x88\x0d\x32\x94\x40\x1b\x5a\x61\x80\xfd\x3c\x38\xc1\x07\xa2\x5e\x8a\x0d\x6c\x7a\xf6\x97\x9e\x7b\x41\xa6\x44\x10\x16\x91\x3d\xf4\xb6\xaf\x13\x06\xf2\x93\x99\xa4\x8d\x01\xf1\xd9\xa1\xe1\x54\x15\xb7\x7a\x5a\x49\xd4\xed\x93\x03\xfb\xe4\xc0\x3e\x39\xb0\x7a\xd4\xfb\xe4\xc0\x3e\x39\x70\x93\xe2\xe9\x67\xf0\xf8\xb5\xa4\x0a\xd3\xfb\xe7\x21\x58\x98\xb9\xf4\xb2\xc5\xef\x46\xb3\x70\x1b\xbe\x17\x9a\x85\x39\x6b\xab\xcc\x0f\xa5\x1f\x1b\x42\xac\x5f\xdc\x24\xb1\x09\xd3\x28\xd9\x25\xce\xe0\xf5\x37\xc9\x3a\xaa\x43\xef\x6d\x14\x28\xd8\xba\xe7\xe3\x24\xb5\x23\xd0\x6d\xe2\xd6\x63\xf8\x76\xe7\xbd\x2f\x1c\xb4\x8d\xee\xf7\x95\x8f\x6e\x57\x5a\x7b\x0f\x2c\x36\x9f\x11\x8f\xec\xad\x37\xaf\x9c\x2b\x51\x63\x86\x6f\x76\xba\xbd\xb1\xaa\x37\x56\xf5\xc6\xaa\xde\x58\xd5\x1b\xab\x50\x6f\xac\x5a\xdb\x58\xf5\x19\xc9\x54\xbd\xe1\xaa\x17\xab\x76\x37\xdd\x7d\xd5\x32\xf7\xc9\x5a\xd7\x19\xf8\xb6\xc8\xa1\x5a\x19\x79\x6f\xa7\xfd\xcb\x8a\x90\xfb\x6b\x37\x82\xb7\xc3\xaf\xe4\x73\xb3\xa4\x6d\x02\x8b\xdd\x8e\x7e\xb6\x71\xc5\x7d\x35\xb8\xc6\xb5\xea\xc3\x9e\x97\x2c\x4e\x1f\xf6\xdc\x87\x3d\xef\x5d\xd8\xf3\xce\x95\x95\x8c\xcb\x65\x80\x44\xa6\x1a\xca\xd2\xfc\x67\x77\x67\x43\xa2\x11\x90\x82\x29\x84\x13\x93\x2c\xe1\x0b\xb0\xa4\x2c\xb9\xce\x5d\x17\xd7\x35\x89\x7a\xdf\x6f\x74\x37\xf2\x97\xd2\x39\xf6\x45\x26\x2d\xe6\xbd\x17\x52\xe8\xf1\x3f\x2b\xe9\xfc\x9d\xf0\x32\x19\x22\x9f\xa8\x84\x5b\x69\x35\x61\x8f\x58\xf3\x93\xa0\x1a\x95\xbd\x07\x27\xb9\x0a\x72\xf7\xa4\x16\xac\x32\x22\xd4\x22\x78\x93\xa4\x99\x5a\xfc\xd7\x88\x51\xe5\x3d\x6c\x74\xc6\xb8\x30\x5c\x4d\x7f\x3c\xc7\x2c\x4e\x88\xd0\x97\xaa\x6b\x27\xc2\x8c\x71\x05\xe2\x06\xcc\x20\x46\x8f\x14\x1b\xe1\x64\x70\x7d\xde\xd9\xcf\xfc\x86\x4e\xd7\x4b\xd7\x1f\x5a\x71\xd7\x7d\x48\xf8\x04\x8a\x92\xe5\x65\x9d\x5e\x37\xd0\x7b\x46\x4b\x3b\xf7\x5a\x0c\x41\x61\xf9\x50\x05\x0e\x29\x67\xa1\x8f\x97\x42\x89\xac\x78\xb7\x84\x31\xbf\xfc\xd5\x0a\xdc\x48\xf9\x99\x05\x20\x81\xc7\x30\xe4\xea\x38\xdc\x8f\x61\x87\xee\xb7\xa2\x65\xf7\x8b\xab\xc6\x0a\x3f\x0a\xa2\xc4\x62\x8c\x95\xd2\x4c\x66\x97\x18\x27\x77\x58\x3e\x74\xc6\x38\x29\xbd\xbc\xe7\x2c\xa7\x84\x71\x52\x1e\xf8\xb3\xb3\x9c\x8e\xd4\xb9\x82\x33\xbd\xbd\xfc\xf8\xae\x67\x6d\x8d\x89\xff\x5e\x72\xe5\xbb\xf1\x9e\x55\x66\xda\xb7\x98\x37\xbf\x8c\x99\xee\xcd\x08\x2b\xfc\xfc\x73\x3c\xb9\xe5\xdb\xa9\x3f\xa2\xcb\xd6\xe8\xb3\xab\x6d\x58\x11\x3a\x56\xcc\xed\x8d\xd4\x38\xac\xca\x4d\xbb\x1e\xd5\xf3\x98\xb9\x83\xdd\xe8\xeb\x4a\xf7\x75\xa5\xfb\xba\xd2\xcf\x5e\x57\xba\x9b\xd2\xd9\x59\xe3\xec\xaa\x6e\x76\xd3\x35\xdb\x15\xcd\x67\xf0\xd2\x76\xd7\x06\x2f\xa8\x2c\xab\x83\x6f\xc2\x65\x5b\x1a\xf1\x4b\xe0\xa3\xfd\x4e\x15\xc1\x5e\x0b\x7c\x96\x75\xfb\x5c\x55\xc0\x3d\xd7\xff\x7a\x64\xb7\x1e\xc5\xbe\x0f\xc0\xd8\xe1\xe2\xf4\x01\x18\x7d\x00\xc6\x67\x1b\x80\xd1\xae\x4d\xd0\x78\xeb\x74\xbd\x35\x2b\x48\x79\xa3\x80\xf8\x05\x44\x29\x2c\x1f\xba\xd6\x94\xd2\xa2\xf2\x79\xfc\x26\xa4\xfa\xc6\x09\xbf\x84\x74\xdf\xd7\x29\xda\x69\x9d\xa2\xbd\x9b\x76\x2f\xf8\xf5\x82\x5f\x2f\xdb\x74\x9c\x70\x2f\xdb\xec\xaf\x6c\xf3\x5a\x0a\xcb\xe7\x04\xa1\xab\x85\xa7\x52\x66\xcc\xd2\x00\x5b\x03\x47\x03\xee\x81\x3c\x4b\x38\x8e\x57\x05\xe1\xfc\x82\x0a\xb9\x66\x89\x68\x66\xda\xd5\x1f\xbc\x05\xc9\x4c\x8f\xd3\x8c\xf8\x77\x13\x4b\x1b\x4e\xf9\x55\xc3\x68\x81\x5e\x21\x78\xac\x14\x84\xf6\x5c\x5a\x47\x95\x86\x3b\x29\x18\xf2\xdb\xb7\x42\xc5\x2f\xa1\x4e\x7c\xc6\x0e\x81\xde\xe8\xff\xfb\x2c\x74\xbe\x37\x52\x6a\xaf\xca\xf5\x59\x94\xbd\x11\xbf\x57\x74\x7b\x45\x77\xe7\xcb\xb8\x4f\x8a\xee\x2b\x4a\xd4\x26\x2d\xe4\x59\xca\x16\x6e\x26\x5b\xf7\xa2\x75\x2f\x5a\xf7\xa2\xf5\x67\x2b\x5a\xef\xc7\x0a\xf7\x72\x75\x2f\x57\xf7\x72\x75\x2f\x57\xf7\x72\xf5\xce\x97\xb1\x97\xab\x2b\x72\x35\xfc\xe5\xd2\xa2\xd7\x15\xb2\x3b\x0b\xd7\x1d\x72\xa0\xdf\x8a\x64\xdd\x4b\xd5\xbd\x54\xbd\xdf\x52\xf5\xde\x4c\xe8\xf3\x4b\x7c\xec\x53\x07\xfb\xd4\xc1\x3e\x75\xf0\x35\x52\x07\x1d\x2f\x59\x26\xa1\xd4\x05\x8b\x1f\x6b\x1c\x68\x6f\x65\x8b\x62\xb4\x9b\x86\x75\xec\x6a\xa9\x1d\xb0\xfc\x26\x95\xa5\x4a\xbf\xb9\x86\xf6\xa8\xde\xd4\x81\x93\x16\x34\xa3\x70\xe3\x5b\x8d\x08\xf6\x93\x7d\xf3\x6d\x81\x7f\xd7\x47\xdd\xd7\x9b\x42\xc1\xae\xf5\xf5\xa6\x9e\x71\xde\xee\x70\xad\x98\xb9\xa3\x51\x63\xe3\x7d\xa3\xd3\x7e\xf5\x00\xb9\xf6\x93\xfe\xaa\xe1\x72\x8d\x37\x49\x2d\x59\xe7\xf8\x9f\x8d\x17\xc5\x2b\x94\xd9\x5a\xfb\x76\xf8\x40\xd4\xe7\x72\x35\xf4\x65\xb6\xfa\x7a\x10\x3b\x9a\xee\x46\xac\xff\xcd\xce\xb6\x2f\x2a\xd6\x17\x15\xeb\x8b\x8a\xf5\x45\xc5\xfa\xa2\x62\xe8\x77\x5e\x54\x6c\x6d\xf1\xd1\x8c\xe3\x73\x91\x20\xfb\xa2\x62\xbd\x10\xb9\xbb\xe9\xfe\xbe\x84\xc8\x3d\xb4\x20\xec\x45\xf5\x34\x6f\x41\x78\x75\x9c\x0f\x37\x92\xae\x58\x1f\x6e\x41\x7b\xbc\x0f\xfb\x7f\x3d\xde\x47\x8f\xf7\xd1\x32\xeb\x3e\x98\xb5\xc7\xfb\x40\x7d\xb8\x66\x1f\xae\xb9\xcf\xe1\x9a\x1d\xb6\xb1\xc7\xfb\xe8\x28\xce\x3d\x13\xe6\x87\x93\xb9\xd6\xc2\xfd\xf8\xa9\xae\x68\xec\xad\x94\xe6\xc6\xfa\x3b\xc3\xff\xa8\x4e\x7b\x2f\x54\x92\x17\xc4\x01\x69\xa2\xeb\xce\x0a\xc8\xdb\xc0\x03\x71\xa3\xed\x13\x17\xfb\x10\xeb\xfd\x0f\xb1\xde\xbb\xc4\xc5\xbd\x91\x64\x7b\x75\xaf\xcf\x5d\xec\x73\x17\x7b\x65\xb8\x57\x86\x77\xbe\x8c\xfb\xa4\x0c\xbf\xb2\x84\xfd\x8c\xb8\x20\xdb\xc9\xda\xbd\xa8\x6d\xde\xeb\x45\xed\x5e\xd4\xfe\x4c\x45\xed\xfd\x58\xe1\x5e\xce\xee\xe5\xec\x5e\xce\xee\xe5\xec\x5e\xce\xde\xf9\x32\xf6\x72\xf6\x8b\xe1\x84\x34\x09\xdb\x1d\xf3\x6d\xde\x92\xa4\xdd\x4b\xd9\xbd\x94\xbd\xdf\x52\xf6\xde\x4c\xa8\xc7\x0c\xe9\x31\x43\x7a\xcc\x90\x1e\x33\x64\x23\xf9\xe6\xdf\xec\xb1\x7c\x17\xdc\xc4\xfe\xca\x7e\xf7\x5d\xc2\x27\x77\x8b\x8c\xe8\xff\x9e\xd1\x94\x30\x09\xd2\x28\x55\x8b\x50\x9e\x69\x59\xf9\xfa\x9a\xbf\xbb\x3d\xbf\xfc\x70\x11\x66\xd3\xbc\xfb\x78\x7f\x71\x77\x7e\x3d\xb8\xf1\xeb\xe2\x67\x15\xae\x85\xfd\xae\x24\x92\x59\x92\xbf\x21\x5a\xf7\x84\x53\x73\xab\xb0\xca\xe5\x66\x23\xbb\x19\xde\x0e\x6f\x7e\x84\x6c\xa0\xf1\xd9\xf9\xed\xe0\xbb\x8b\x12\x41\x94\x9e\x0f\x4e\xff\x76\x7f\x7e\xd3\xfe\x7c\xf8\xdf\xe7\xb7\x77\xb7\x6d\x4f\x6f\x86\x17\xc3\xc1\x6d\xfb\xd7\xef\x07\xe7\x17\xf7\x37\xc3\xa5\xeb\xb1\x74\xb4\xcb\x95\x10\x09\x8b\x04\x71\xfe\x28\xb2\x5c\x43\x14\x6b\x88\xbc\xf8\xe8\xd8\x61\x53\x5f\x27\xe8\xde\xea\xf4\xd4\x36\x6e\x18\x6c\xd0\x90\x51\x46\x62\x2a\xf1\x24\x21\x71\xad\x25\xb7\x86\x6d\x2d\xe1\xd2\xa0\x9e\xb4\xf6\xec\x45\x4e\xcd\xf3\x22\xc3\x0b\x10\xe4\x28\x2a\xc2\xe2\x86\x3e\xcc\x3e\xb4\xf6\xc0\x34\xef\xa2\x8f\xa4\xd4\x53\x94\x0b\x41\x98\x4a\x16\x88\x7c\xa2\x52\xc9\x5a\xa3\x6e\xfb\xda\x9a\xb5\x77\xaa\x6f\x70\x8e\x25\x9a\x10\xc2\xca\xe3\x17\x24\x21\x58\x36\x8c\xd9\xee\x7e\xb7\x65\xf1\x7b\x65\xad\x31\xe6\x32\x9a\x62\x9a\xe4\x82\x54\x4e\x0b\x4f\x33\x2c\xa8\xe4\x6c\xf8\x49\xdf\x65\xfa\x20\x5f\xc1\xe7\x5c\x6c\x76\x62\x86\x7f\x0b\x29\xf8\xb2\xfc\xcf\x0f\x77\xe5\x7f\x95\xce\xfc\xc5\x5d\xf9\x5f\xcb\x69\x3d\x68\xb8\x4a\xd9\x87\xe8\xc3\xdd\x09\xfa\x00\x21\x4e\x02\xdd\xcd\xb1\xa1\xd8\x8b\xbb\x13\x74\x41\xa4\x84\x5f\x8a\x8f\x15\x55\x09\xcc\xed\x3b\xca\xb0\x58\x20\x37\x7d\x93\xe8\x8a\xa3\x39\x22\x7e\x69\xaa\x8b\xc7\xfe\x91\x33\x50\xdd\x8b\xd5\xbb\xe0\x33\x1a\xe1\x64\xbb\x45\x1c\x5c\x96\xf8\xc0\xd5\xcd\xd2\xa5\x08\xdf\xae\xaf\xc5\xe0\xf2\x0c\x92\x48\xdd\x50\x1b\x66\x7e\x49\xa4\x26\x92\x88\xb3\xd8\x7a\x69\xf4\xed\xbf\x08\x84\xfa\x7f\x70\x48\xc4\xcd\x25\x65\x33\xdd\x22\x3a\x46\x57\x37\x23\x76\x25\x62\x63\x08\x25\x5a\x1a\x36\x34\x47\x25\x62\x5c\x21\x9a\x66\x5c\x28\xcc\x94\x56\x04\x40\x0c\xb0\x2b\x62\x38\xc0\x29\x4f\xd3\x5c\x61\x7d\xd0\x6a\x8b\xca\x8c\x39\xe4\x96\xa8\xf3\x18\x5c\x2b\x0d\x6b\x68\xe4\x84\x62\x2e\x99\xd0\xed\x6b\x19\xa5\xac\x43\xd3\xb8\xa6\xca\xba\x26\xb0\x10\xb8\x2c\x4d\xbc\xa3\x8a\xa4\xd5\xf7\x3b\x06\x79\xfe\xab\xd1\x40\x70\x6a\x92\x2a\x88\x18\x88\x68\x4e\x15\x89\x94\x3e\x82\x1b\xd1\xc4\xfd\xe5\x0f\x97\x57\x3f\x85\x12\xc4\xbb\xc1\xc7\xb3\xbf\xfc\x7b\xe9\x87\x9b\x8f\xb5\x1f\xc6\x3f\xfe\xa5\xf6\xcb\xff\x6f\x29\x3d\x55\x7b\xaa\xe9\xf9\xc1\x5c\x0e\x41\xa4\x06\x9b\xb0\x9b\x2a\xa2\x29\x9e\x11\x24\xf3\x4c\x53\x80\x3c\x2a\xef\xaf\x16\x29\x2f\x38\x8e\x29\x9b\x99\x0c\xd0\x0b\xaa\x88\xc0\xc9\x47\x9c\xbd\x77\xf6\xeb\x0d\x56\xe7\xff\xde\x96\xf2\x75\xdf\xfd\x3c\xf8\x18\x66\xfc\xbe\xbb\xbe\xb9\xba\xbb\x5a\x3a\xeb\x52\x0b\xf5\x63\xa4\x1f\x9f\xc0\xff\xa2\x63\xa4\x5b\xf7\x92\x6f\x4a\x14\xd6\x1a\x01\xfa\xd2\x24\xcd\xf9\x44\x1a\xca\x12\x38\x35\x99\xa0\x29\x85\x2b\xc5\x58\xf0\xbe\x32\xc2\xb5\xd7\x1e\xfc\xb9\x31\x1f\x80\xb6\xec\x2e\x65\x16\x63\x11\xa3\x7f\xc8\x6a\xfa\x38\x18\x8e\xcd\x0f\x24\x46\x87\x68\xae\x54\x26\x4f\x8e\x8f\x9f\x9e\x9e\x8e\xf4\xdb\x47\x5c\xcc\x8e\xf5\x1f\x87\x84\x1d\xcd\x55\x9a\x98\x74\x79\xbd\x0a\x27\xe8\x5a\x70\x7d\x85\x80\x82\x4e\x04\xc5\x09\xfd\x8d\xc4\x68\x62\xf8\x1f\x9f\xa2\x5f\x22\x2e\xc8\x51\xb1\x31\xd6\xa8\x64\xef\x11\x6b\x78\x3a\xd6\x2f\x35\x30\x93\xea\x7e\xa2\x98\x44\x34\xb6\x62\x06\x61\x11\x07\xcb\xa3\xf1\x55\xe8\xf6\x5c\xa6\xa1\xd6\x68\xb2\x5c\x15\xcb\x19\x28\x2b\x38\x26\x41\xb6\xbb\xe2\x65\x82\xd3\x8a\xcf\xb9\x51\x5b\x73\xad\xa2\xeb\xbb\x15\xc3\xad\xea\x5e\xcd\xf4\x84\x23\x9e\xa0\x49\x3e\x9d\x12\x11\x3a\xa4\x0f\xb4\x36\x43\x25\x12\x24\xe2\x69\x0a\x12\x83\xfe\x2a\x97\x86\xaa\x61\xc5\xec\x68\x8f\x46\x0c\xf6\x5f\xab\x39\x40\x01\x31\x07\x56\xc7\x08\x89\x11\x66\x0b\xd3\xcd\x24\x9f\x86\xed\x1b\x18\x0a\x1c\x23\xaa\x46\x6c\x90\x24\x48\x90\x94\x2b\x12\xe4\x50\x82\xf3\xac\xbc\xe0\xc0\x22\x05\xc9\x12\x1c\x91\xd8\xd0\x43\xc2\x23\x9c\xa0\x29\x4d\x88\x5c\x48\x45\xd2\xb0\x81\x2f\xc1\x56\xa3\xd7\x8c\x4a\x14\xf3\x27\x96\x70\x6c\xe7\x51\xfd\xec\xab\xf2\x69\x1c\x3a\x88\x80\xa1\x10\x5c\xc0\xff\xfc\x40\x59\xbc\x33\x0e\x75\x7f\x3b\xbc\x09\xff\x7d\xfb\xf3\xed\xdd\xf0\xe3\x7a\xdc\xc7\x53\x16\x0c\x0f\x74\xf8\x13\x74\x6b\x16\x81\x0b\x2d\x11\x89\x96\x49\x7d\xb4\xa4\x54\xfc\xc0\xe3\x0d\xb9\xef\xc7\xc1\xe5\xfd\xa0\xc4\x51\x6e\x4f\xbf\x1f\x9e\xdd\x57\xf4\x01\x3b\xbf\x92\x0c\x6f\xd4\xbf\xf0\xb7\xd3\xef\xcf\x2f\xce\xc6\x0d\x0a\xe3\xbb\x9b\xe1\xe9\xd5\x8f\xc3\x9b\x42\xb7\x6b\x5c\xa2\xca\x60\xaa\xcc\xea\xce\x30\xa5\x39\x8f\xd1\x64\xd1\x0c\x08\xa1\x25\xe7\x04\x7c\xb1\x05\x24\x8a\x69\xf5\x04\x78\x93\xc3\xe6\x28\xbe\x48\x79\x4c\x0e\xec\x3b\x80\xa4\x61\x8c\x2b\x46\x62\x6e\x6e\x58\xf7\x8e\x59\x60\xa8\x30\x20\x17\x7e\xe1\x4e\xd0\x00\x49\xfd\x62\xae\x0f\xb5\xa0\xb3\x19\x18\x0e\x2b\x43\x35\xad\xd9\x4f\x61\x79\xe1\x3b\xb3\xff\x99\xe0\x70\xce\x75\xb7\xd6\xe2\xec\xad\x12\xe6\x43\x40\x5d\x29\xb7\x28\x30\x18\x1c\x1a\x86\xe6\x36\x4b\x2f\x42\xeb\x7a\x99\xf3\x68\xec\x45\xfa\x70\x01\xdb\x92\xc6\xde\x99\x09\xf2\x48\x79\x1e\x7c\x6a\x81\x3d\x4a\x3b\xde\xd8\x7c\xb1\x00\xb0\x6c\xc6\x28\x52\x69\xc6\x93\x47\x63\x0b\x9a\x85\x3d\x42\x0b\x53\xc1\xd3\x86\x36\xca\xc7\xe4\xfc\xea\x56\x09\xac\xc8\x6c\x71\x66\x59\xc6\xe6\xc7\xe3\xec\xea\xa7\xcb\x8b\xab\xc1\xd9\x78\x38\xf8\x50\x3e\xf1\xfe\xc9\xed\xdd\xcd\x70\xf0\xb1\xfc\x68\x7c\x79\x75\x37\x76\x6f\x2c\x25\xf9\x96\x0e\xea\xf7\x74\xf9\xc5\x13\xa4\x59\x2e\xb0\x46\x07\x78\x17\xf0\xc7\x09\x99\x72\x61\xf8\x7c\xea\x42\x17\xac\x08\xe3\xd6\xd6\xea\x62\x95\x59\x9c\x80\x65\xac\xa9\x49\x63\xf5\x56\x82\xe0\x14\xee\x09\xcc\xd0\x90\xc5\x87\x57\xd3\xc3\x5b\xf3\x63\x8a\xc5\x03\x11\xfe\xd3\x27\x41\x95\x22\xac\xa4\xd2\x61\x37\x64\xaf\x24\x16\x1d\x1c\xa1\x1b\xcd\xf7\xf5\xfb\xfe\x52\xd3\xc4\x1e\x13\x85\x69\x22\xed\x60\x4b\xeb\x7a\x82\x2e\xb0\x98\x15\x76\xb8\x2f\xf9\x74\x6a\x1a\xfb\xca\x0c\x43\xdf\x61\xa5\x59\x34\xf0\x5e\x4d\x1a\xee\x5e\x84\xfe\xec\xcb\x5e\x1e\xae\x53\xd5\x7d\xb6\x1d\x4d\xdd\x5f\xc3\x8a\x1b\x8d\xbd\xa4\x1b\xda\x27\x0d\xb4\x06\x13\x37\x8f\x97\x5f\x32\xcd\x6d\xd7\xc9\xa9\xfc\x62\x03\x39\x99\x5c\x2a\xbd\xf3\x53\xad\x6d\x36\xd0\x12\xf9\x44\xad\xc1\x20\x1c\x77\x85\x84\x8a\x66\xc0\xbc\x8a\xb3\x8c\x60\x21\x9b\x76\xbb\x2c\x06\xb6\xec\xbd\xe9\x29\xec\xc3\x6e\xb2\xeb\xe7\x00\x71\x06\x06\x07\x2f\x44\x54\x28\xb2\x03\x0d\x98\xb6\x6a\x14\x70\x0d\x68\x4b\x57\x16\xd9\xe8\x23\x95\x5a\x69\x34\x3f\x7e\x67\x21\x97\x36\x23\x88\xf7\x83\xf3\x8b\x8a\x70\x31\x3e\x1b\xbe\x1f\xdc\x5f\x2c\x37\x13\x96\xbe\xab\x6e\x31\x3a\x44\xfa\x79\xd9\x6f\x4e\xa7\xe6\xce\x70\xc0\x51\x46\xa5\x25\x0c\x8c\x56\x16\xaa\xc6\xd8\xab\x63\x92\x25\x7c\x91\x12\x06\x26\x9e\xd2\x4d\xa8\xd7\x73\x8a\xa9\xbd\x5a\x82\xc1\x82\x15\xc7\x9a\xdd\xe0\x1a\x3b\x74\x68\x55\x24\xf6\x37\x6f\x19\xac\xaa\xc2\xba\xaf\x8d\xf7\xcc\xfe\xe7\x56\x61\xb5\xe1\x19\x1b\x9c\xde\x9d\xff\x38\x2c\xeb\x87\xa7\xdf\x9f\xff\xd8\x24\xd5\x8c\x3f\x0c\x2f\x87\x37\x83\xbb\x15\xc2\x49\xa5\xc9\x26\xe1\x44\xea\x01\x57\xbd\xa7\x54\xfa\x88\xa0\xc8\x40\x5e\x21\xaa\x24\x7a\xa4\x92\x4e\x28\x00\x84\x59\x4f\xe4\xfd\x39\x70\xd6\x47\x9c\xd0\x98\xaa\x85\x13\x5f\x4c\xbf\xe5\x7d\xd4\x9c\xd4\xb6\x6f\xcc\x0e\xa1\x7f\x12\xac\x7c\x66\x73\xdc\xa4\x4f\x10\xe8\xb6\x8f\xa0\xb4\x05\x9f\x31\x2d\x48\xb3\x19\x11\x66\x38\xe0\x7d\x09\xc7\x12\x3c\xd7\xa3\x0a\x85\x95\x62\xd5\xbc\xd0\x3a\x23\x8c\x08\x00\x81\xf3\x9d\x18\x41\x4a\x10\xf6\x85\x96\xb9\xb2\x84\x46\x54\x25\x0b\x14\x81\x0d\x0b\xcc\x99\x29\x66\x78\x66\x85\x03\x50\x73\x2a\x24\xf1\x37\x83\xa2\x76\x35\xb5\xa6\xfd\x3b\x4a\x36\x3c\x66\xf7\x97\x67\xc3\xf7\xe7\x97\x65\x12\xf8\xfe\xfc\x43\x49\x84\xfd\x38\x3c\x3b\xbf\x2f\xdd\xe6\x5a\x92\x5d\x2e\xd7\x57\x9b\x6d\x38\x8a\xfe\xa5\x13\x74\x66\x3e\x3d\xd1\x8b\xdb\x00\x11\xe7\x95\xdf\xca\x3a\xdc\xb8\x90\x3c\xf7\xc7\x90\x29\xd1\xe8\x97\xe8\x6a\x42\xb2\x3e\xc8\x92\x0d\xa9\x39\x54\xa1\xd6\xf7\x65\xd5\xa9\x5c\x9d\xb2\x7b\x11\x82\x2e\x8f\x0a\xcb\x52\x18\xc3\x00\x46\x83\x36\x23\x56\x83\x5b\xab\x60\xd8\x3f\x82\x8b\x3a\xcd\xa5\x32\xae\x44\x20\x4e\xf4\xf0\x57\xa9\x17\x14\x5c\x8d\x47\xe8\x96\x90\x11\x73\xd6\x83\x19\x55\xf3\x7c\x72\x14\xf1\xf4\xb8\xc0\x27\x3c\xc6\x19\x4d\xb1\x96\xa4\x89\x58\x1c\x4f\x12\x3e\x39\x4e\xb1\x54\x44\x1c\x67\x0f\x33\x88\x80\x71\xee\xd4\x63\xdf\xec\x8c\xff\xe1\xe2\xcf\x5f\x1f\x5e\xfc\xf5\xeb\x77\x75\x0b\x59\xdb\xfe\x0f\x59\x84\x33\x99\x27\x36\x62\x4e\x84\x6b\xe3\x8e\x7c\x4e\x56\xed\xf7\x65\x79\xbb\xb6\xd3\x5f\x4f\xaf\xef\x4b\x16\xeb\xf2\x3f\x3f\x0e\x3f\x5e\xdd\xfc\x5c\xe2\x94\x77\x57\x37\x83\x0f\x25\x86\x3a\xbc\xfe\x7e\xf8\x71\x78\x33\xb8\x18\xbb\x87\xdb\xd8\xde\x7e\x60\xfc\x89\x95\x97\x46\x3a\x0e\x58\xeb\xe9\x04\xbd\xe7\x02\xfd\xe0\x77\xf2\x70\x82\x25\x5c\x31\xee\xce\x92\x07\x28\xe3\x31\x30\x5e\x44\xb2\x39\x49\x89\xc0\x89\xb5\x19\x48\xc5\x05\x9e\x99\x9b\x5e\x46\x02\xab\x68\x8e\x64\x86\x23\x72\x80\x22\xa0\x86\xd9\x01\x6c\x0a\xa8\x5a\x7c\x56\xb5\xf3\xdd\xe4\x4c\xd1\x94\x38\x15\xdc\xfe\xf3\xce\x6c\xc6\x06\x9b\x73\x75\xf7\x7d\x59\xd8\x7b\x7f\xf1\xf3\xdd\x70\x7c\x7b\xf6\xc3\xd2\xf5\x34\x9f\x95\x46\x76\x0b\x01\x48\xa7\x3c\xc9\x53\x16\xfe\xbd\xf9\xd8\xce\x2f\xef\x86\x1f\xaa\xa3\xbb\x1a\xdc\x95\x29\xe3\xa6\x1c\xe0\xf6\xee\xbb\xab\xab\x8b\x61\xc9\x25\xfc\xee\x6c\x70\x37\xbc\x3b\xff\x58\xa2\x9f\xb3\xfb\x1b\x83\x46\xb8\x6c\x9a\x6e\x04\x0d\x13\xd5\xd3\x0a\xa7\xb9\x6b\x56\xd8\x89\x13\x0d\x6c\x40\xb9\x39\xcb\x87\x01\xdc\x8e\x09\x07\x03\xab\xce\xa1\x37\xa9\x46\x66\xa4\x8d\xec\x50\x95\xb7\x09\xb5\xb3\xe3\xa5\x1b\xbd\x8c\x2b\xdf\xf9\x21\x18\x28\x50\xa3\x6c\xe3\x24\xe1\x4f\x26\x94\x37\xa5\xfa\x56\xb6\xc0\x68\xfa\x15\x59\x78\x08\x8f\x1a\x38\x5e\x79\x5b\x48\x24\x88\xfa\xc8\x73\xa6\x36\x27\xb9\xc1\x65\x89\xef\x0c\x2f\x7f\x1c\xff\x38\x28\x53\xe0\xf9\xc5\x72\x56\x13\x36\xd1\x70\x15\x0f\x2e\x7f\xf6\x97\x30\x04\x7c\x1f\x78\x0d\xd5\xc8\xae\x51\x42\xb5\xd8\x1b\x61\xad\xbd\x26\x20\xd1\x20\x42\xc1\xe4\x90\xea\xc9\x41\x80\x69\x66\xfc\x49\x86\x3f\x99\x41\x9e\xb8\x3f\x2a\xed\x49\x58\x17\xb0\xa6\xba\x78\x7a\x68\xc7\x6a\xd5\x0c\x11\xf6\x48\x05\x07\x3c\x5b\xf4\x88\x05\xd5\xd2\xb8\x69\x59\xcf\xf5\x04\xfe\x77\xbd\x36\xc1\x30\x5a\x61\x5c\xb7\x5c\xa8\x33\x1f\xc8\xbb\x99\x35\xa4\x29\xa0\xb5\x1e\xca\xda\x6c\xe8\xa8\x7f\xdb\xb0\x39\x5b\x06\xfc\x96\x27\xfc\x6b\x72\x46\x71\xa2\x19\xc0\xee\xe4\xc5\xc1\xe5\xed\x79\x59\x7e\x2c\xab\x19\x01\x5f\xde\x58\x5e\x04\x43\xa5\x19\xb9\x53\x26\x6e\xff\x76\x61\xb4\x0b\x00\x3d\x36\xe7\x36\x50\x2c\x40\x00\x72\x28\x28\x19\x16\xb2\xf2\x85\x44\x00\x84\x56\x04\x5c\xe9\x3b\x0b\xc2\x99\x1e\x39\x8d\x47\x8c\x7c\xca\x08\x93\x10\x1c\x60\xee\xb3\xc2\xd7\x2e\x8f\xd0\xf9\x14\x58\x82\x7e\x9d\xa1\x9c\x59\x07\x98\xbe\x70\xcd\x20\x0f\xb4\x28\x6b\x87\xe0\x35\x44\x30\xbc\x30\xe2\x82\xa5\x8a\xc1\x8f\xd8\x4f\xde\x89\x06\x8f\xa6\x5c\x33\x20\xbd\x8b\xb6\xbd\x13\x84\x99\xa4\x07\x48\x2b\x2c\xd5\x3d\x85\xd4\x01\xad\x50\xda\x10\x2e\xcd\x69\xec\x9f\x2f\x7f\x0d\xd4\xe2\x84\xc3\xcb\xa0\xf9\x2e\xa8\x5c\x05\x2d\xa2\x71\x62\x3c\x26\xe3\xee\x77\x42\xc4\x05\xb1\x7e\x96\xb5\xaf\x81\x55\x8c\xfd\x0e\xcb\x87\x9a\xef\xe1\x9c\x49\x85\x59\x44\x4e\x13\x2c\x37\x0c\x42\x72\x36\x8e\x83\xb2\xc4\x71\x73\x73\x7f\x7d\x77\xfe\xdd\x0a\x2e\x5f\xfd\xb8\x1e\x06\x14\x25\xb9\x73\xcf\x4d\x04\xc7\x31\xd2\xec\x73\xc6\x8d\x2b\xd0\x0a\xfe\x05\xf4\xb7\xc9\xeb\xf1\x01\x95\x25\xd8\xf1\x22\x1d\xc1\xda\x39\x42\x57\x02\xb5\x0b\x81\x22\xbd\x12\x28\x30\x79\xb8\xad\x06\xcf\xa2\x29\x48\x62\xad\x5b\x59\x82\xd5\x94\x8b\xd4\x70\xf9\xd2\xa4\x4d\xe3\xcb\x1b\xa5\x4c\x11\x21\xf2\x4c\x51\x87\xe5\x5e\x95\x52\xa1\xc2\x3b\x9f\x7d\x24\x52\xe2\x19\xd9\xc6\x01\xdd\xa4\x3c\xdc\xfe\x18\xfe\x13\x1c\xcc\x5d\x64\xff\xd2\x08\x5d\xe4\xbb\xa3\xa7\x2b\xf6\xde\x04\xf2\x5c\xf3\x84\x46\x1b\x06\xdc\xbd\x1f\x9c\x5f\x8c\xcf\x3f\x6a\x25\x7e\x70\x37\xbc\x28\x89\x12\xf0\x6c\xf0\xfe\x6e\x78\x63\x41\xac\x07\xdf\x5d\x0c\xc7\x97\x57\x67\xc3\xdb\xf1\xe9\xd5\xc7\xeb\x8b\xe1\x8a\xc8\x9c\xd6\xc6\xeb\xd6\xd5\xea\xab\x27\xb5\x5f\x60\x87\x35\x2f\x0b\xed\x65\x90\x35\x86\x69\x02\x4e\x70\x6e\x9c\xe1\x18\x31\x1e\x13\xf8\x59\x3a\xeb\x8c\x47\x8e\x46\xe7\xea\x8b\x24\x41\x38\x57\x3c\xc5\xe0\xb5\x49\x16\x23\x86\x27\x9a\xb5\xe2\x24\x09\xc2\xbb\x44\xce\x98\x66\xb1\xba\x31\x03\xd1\x1e\x25\x44\xb3\xf3\x2c\x48\xf6\xb3\x7e\x83\x29\x65\x10\x69\x9b\x62\xf1\x60\xdc\x4c\x45\x97\xc5\xa1\x90\x08\xcb\x11\xd3\xe3\x22\xd6\x30\xd4\x65\x85\x4f\x3a\xbd\xd5\xba\x3a\x29\x7e\x20\x7a\x55\xd2\x3c\x9a\xa3\x4c\xf0\x99\x20\x52\x5a\xdb\x72\x84\x99\x09\x40\xb0\xaf\xeb\x6b\x68\xc4\x18\xd7\x4b\xe1\x4c\xd8\x31\xc9\x08\x8b\x09\x8b\xa8\x49\xeb\x03\xdf\xbd\x37\x6d\xce\x04\xce\xe6\x48\x72\x70\x7a\xc3\xb2\x83\xfd\xca\x7c\xe4\x6e\x32\x33\x63\xf3\x38\xb4\x40\x8b\x5c\xf3\x89\x2b\x90\x13\xcd\x2a\xc3\xc7\xee\x32\x74\x6e\x17\x63\x07\x4c\xb3\x84\x28\x03\xd6\x0f\x4b\x0e\x9b\xa1\xd7\xba\xb4\x1f\x7a\x9b\x9a\x36\x41\x5f\xd8\x6e\xcc\x58\xda\x11\x1d\x35\x58\xb6\xed\x91\x42\xdf\x63\x16\x27\xba\x15\xe7\xc3\x28\x9f\x45\x48\x45\x19\x68\xaa\x71\xa7\x71\x9b\x5b\x34\xc2\xb9\xdc\xe6\x1a\xad\xe4\x62\x1a\xab\xe0\x61\x11\x14\x02\xe4\x6d\x13\x31\x61\x75\x33\xcd\x22\x71\xc2\xed\x2a\x99\xd7\x73\x53\xff\x09\xc1\x68\x5a\xae\xd9\x4c\x50\x16\xd1\x0c\x27\x1b\xe9\x7e\x95\x60\x7c\x1b\xe3\xfe\x25\x9d\x6a\xf2\xf9\xaa\xe6\xb6\x55\x44\xa4\x90\xa0\x6c\x87\xe9\xb7\x70\x0d\x4b\x92\xcd\x6a\x20\xb2\x88\x26\xc1\x82\xe7\xc6\x1f\x07\xeb\x42\xe2\x86\xa3\x7a\xd4\xb4\xdd\xfa\x64\xe0\x72\x00\xf4\x06\x9b\x6d\x22\x7f\xda\xd6\xaf\xd2\x8a\xed\xdd\x04\xe3\xe1\xe4\xba\xb9\xcd\xa6\x1d\x08\x1e\xfe\x6b\x19\xed\x7c\xc4\x99\xa6\x19\x0b\xdb\x8f\x8b\x39\x5a\x25\xc9\x56\x05\x73\xf1\x33\x81\xef\xdc\xe7\x85\x74\xdf\x8d\x62\x09\x6d\x00\x54\xbd\x93\x52\x0c\x41\x90\x63\x6e\x69\x7c\x9a\x6b\x59\x16\x61\x88\x42\x40\x5f\x92\xa3\xd9\x11\x72\x45\x18\x0e\xd0\xe0\xfa\x7a\x78\x79\x76\x80\x88\x8a\xbe\x72\x31\x8b\x36\x60\x69\xc4\x14\xb7\xd2\xca\xc2\x15\xd0\x48\x89\x98\x91\xd2\x9c\x5d\x74\x13\x84\x2a\xcf\xa8\x54\x36\x7c\x56\xf3\x95\xa0\xd4\x09\x4d\xab\x62\xb6\xa1\x90\x5c\xcd\xb7\x21\x0d\x2c\x65\x9e\x6a\x5d\x76\x4c\x71\x3a\x16\x3c\xd9\x86\x29\x9c\xc1\x54\x40\x5d\xf6\xe9\xf9\x14\xa7\x48\x37\x6b\x43\x41\xbc\xcb\xd1\x8b\x74\x5a\x30\xd2\x7c\x59\xdf\x9b\xc1\xbd\xe5\xbc\x0f\x36\x1e\x8d\xba\x10\x08\x48\xdf\x6f\x61\x15\x85\xd9\x78\x6c\x2d\xf5\x63\x1c\x45\x5a\xe5\xde\xf1\xa4\x82\xfa\x39\xce\x25\x60\x3b\x7a\xb6\x69\xae\xa2\x73\x37\xcc\x4c\x73\x30\x08\x06\xd6\x57\xae\xe4\x11\x2d\xda\x6f\xe8\x77\xb2\xa8\xf5\xea\x2a\xdc\xdc\x4b\x6f\x52\x31\x97\xb0\x24\xb0\x93\xd2\x54\xc8\x51\x73\xb2\x40\x73\xfc\x48\x4a\x5d\xba\x84\x18\xdd\xf0\x82\xe7\xa2\x89\xd1\x8d\xd8\x19\xc9\x04\xd1\x92\x7e\xd5\x81\xe2\x69\xfa\xa6\x4c\x89\x3d\x5d\xf7\x74\xfd\xe6\xe9\xfa\xd4\x14\x4a\x1a\xf8\xc2\x58\x5b\x09\x70\xa6\xb1\x71\xc6\x79\x32\xee\x60\x13\xe9\xbe\xe2\x25\x4f\x58\xa5\x6c\x14\x40\x02\xf0\x1c\xe4\xa3\xd2\xb5\xc9\xf5\x5d\x17\xa4\xd8\xda\xe1\x2d\x59\x06\xe7\x32\x0b\xea\xe5\x6c\x73\xde\x9b\x5a\x59\xd6\x12\x7a\x76\x31\xe7\xd4\xc8\x37\xde\x5d\x16\xd6\x3f\x2d\x1d\x26\x27\x8a\x50\x56\xab\xc6\x66\xe8\x59\x2f\xb0\x91\x3b\x7e\xcd\xb9\xc2\xf2\xab\xa3\x11\xd3\x42\xd4\x03\x59\x18\x73\xab\x16\x53\xfe\xa8\x65\xf1\x43\x49\x98\x84\x70\xef\x3f\x1a\xf7\x9c\x26\x71\x67\xae\x36\xaa\xa9\x29\x02\x07\x41\xd7\xbe\x17\x08\xd1\xb5\x8d\x5a\x29\xa9\x08\x80\x06\x39\xdf\xcc\xc5\x3e\x33\xc3\x9f\x11\x05\x29\xd6\x8a\x2a\xd0\x99\x62\x53\x65\xae\x36\xf4\x95\xa6\x2b\x43\x15\x82\x83\x9f\x24\xce\xb7\x63\xfc\xb2\xde\xc6\x4a\xce\xe8\xb5\x85\x5b\x1b\xf3\x7e\xec\xec\x46\x91\xe0\xb5\xd2\x6d\x58\x22\xb3\xd3\x13\xc3\x0e\x9c\xff\x9a\xb0\xa3\x27\xfa\x40\x33\x12\x53\x0c\x11\xf0\xfa\x5f\xc7\x7a\x5e\x7f\x38\xbd\xb9\xba\x1c\x17\x99\x3c\xff\x35\x62\x83\x44\x72\x9f\xa5\x80\x18\x67\x3e\xdc\x3e\x13\xc4\x89\x84\x76\x2e\x60\x75\x2d\xcc\x88\x23\xd6\x36\x82\x98\x47\xf2\x08\x3f\xc9\x23\x9c\xe2\xdf\x38\x03\x57\xfa\x00\xfe\x3c\x4d\x78\x1e\xff\x84\x55\x34\x3f\x86\x73\xad\x8e\xc9\x23\x61\xca\xb8\xa9\xf4\x72\xc5\x90\xbc\x2b\x21\x5a\xff\x0f\x7a\xcc\x45\x52\x91\xd4\x9a\x6c\x44\x32\x85\xfe\x1f\x41\x26\x9c\xab\xe6\x4b\x8a\x4f\xa7\x92\xac\x75\x21\x15\x4a\xda\xed\x15\xfa\xeb\x5f\xbe\xfe\x46\x93\xd0\x26\x6b\x7c\x7e\x7b\x35\xd6\xdf\xff\xe1\xcc\x7e\x2f\xd7\x60\x77\x57\x59\xc1\xda\x1c\xf1\x98\xc0\xf9\x9c\xc1\xed\x27\xc0\x79\x01\xec\x0d\xc8\xa1\xd8\xc7\x26\xee\x76\x56\x6a\x7d\x3b\x95\x6d\xa3\xc5\x04\x15\x3b\x98\x23\x3a\x44\x8c\xa3\xd4\xc4\x9a\x62\x86\xfe\xfd\x87\xef\x9a\x37\x30\x17\x74\xa3\x0e\xa9\x85\x6b\x08\xba\x94\xf4\x37\x22\x91\xa6\x1a\x4d\xc5\x3c\xd5\x5d\x0b\x22\xe7\x3c\x89\xd1\x13\x01\x35\xc9\xc6\x81\x7a\xad\x5c\x90\x11\x0b\x9b\x80\x90\x43\x84\x13\xc5\x67\x04\xee\x6a\xa7\xa8\x29\x22\xb4\xa8\x62\xb2\x34\x14\x17\xe4\xc0\x40\x7d\xdd\xfe\xd9\xc5\x56\xc3\x34\xe1\x91\x4b\x6a\xb1\x26\xb9\x78\xd2\x3c\xf3\x69\xd5\xf4\x8a\xda\x6d\xf8\xd5\x4d\xb6\x66\xdb\xe6\xa5\xb1\x49\x28\xd6\x86\x55\xdd\x99\xe6\xc1\xd0\x88\xb3\x71\x42\xd9\xc3\x46\x9b\x71\xe5\x44\x39\xdd\x82\x5d\x33\xdd\xa2\xb7\x73\x1b\x0b\xc8\x1a\xe7\xe3\x7d\x9e\x24\x26\xb5\x25\xdc\x1e\x90\xbb\xcc\xba\x81\x30\x90\x99\x1c\x50\x12\x5b\xbf\x97\xd5\x84\x05\x61\x10\xf0\x36\x62\x93\x85\xf5\xd9\xca\x03\x24\xf3\x68\xee\x32\xf3\x22\xce\xa4\x16\xa3\xb9\x40\x11\x4f\x53\x53\xdc\x94\x11\xa4\x38\x4f\xa4\x8d\x76\x67\x87\x0a\x47\x6a\xc4\x8a\xfe\x56\x9c\x3c\x53\x01\x69\xbb\xd4\xbd\xee\x2e\x9d\xa2\xd2\xd2\x52\x81\x9b\xc6\x21\x66\x03\x18\xc1\x8c\x27\x2a\x40\x7f\xe0\xf5\xb3\x64\x36\xac\x45\x33\x90\x73\x2e\xd4\x38\x6e\xe4\x39\x2b\x89\xa6\xca\x08\x19\x39\x4c\x20\x68\x98\x3f\x6a\xe1\x9f\x3c\x79\xe3\xeb\xb2\x21\x68\xaa\x5e\x36\x82\x6e\xc7\x68\xe9\xc8\xd6\x25\xc1\x96\xb5\x32\x08\x1e\x51\x39\x26\x7c\xd5\x18\x6f\xe1\xab\x53\xfd\xd1\xd2\xc5\xab\x9e\x3b\x27\x04\xf1\xb8\x00\x9b\x33\xf7\xba\xcd\x08\x59\xb6\xa6\x16\x3a\xe1\xf9\x32\x47\x97\x4d\xe5\xbe\x6c\xc9\xd5\x63\x01\x93\xbd\x24\x20\x6b\x62\x31\xa1\x4a\x60\x51\x42\x0a\xf1\xfa\xa0\x24\x58\x40\x7c\xd6\x88\x19\xdc\x38\xa3\x29\xc4\x28\xa6\x12\x12\x44\xe0\x2e\x0d\x9c\x61\xa8\x9b\x12\x58\x39\xda\x45\x9e\xa3\x89\x3f\x87\xc0\xb2\x82\x34\x1c\xb3\xd3\x1d\x79\x7c\x2c\xad\x9f\xf1\x28\x2f\x04\xb9\x08\x24\x5c\x8b\xa9\x83\x28\x93\x74\x36\x57\x88\x32\x6b\x77\xc4\xc9\x8c\x0b\xaa\xe6\xa9\x3c\x40\x93\x5c\x6a\x2d\xd4\x04\xab\x99\x78\x14\xa2\xa2\x4e\x5c\x68\xdb\x24\xe2\xb8\xd2\x60\x5d\x45\xd9\x80\x34\xba\x1d\xca\x61\xe5\xae\x58\x41\x38\x03\x8f\x33\x58\x6d\x83\x42\xdd\x46\x03\x4f\x89\x4c\x1c\x20\x77\xc8\x4e\x50\x05\xa4\xed\x1c\x00\x2a\xe4\xce\xbc\x14\x2f\x51\x88\x0b\x99\x64\x50\x41\x5c\xec\x36\x48\x5e\x65\x64\x4a\x83\xde\xe4\x9d\x4e\x69\xa6\x1a\x03\xb7\xea\xae\xa2\x9b\x00\xf3\xa7\xdb\x62\x43\x32\x16\x50\x33\x20\xb5\x8d\xd8\x2d\x21\xed\x40\x6e\xb5\xbd\x37\xa5\x71\x61\x0a\x36\xd1\x63\x39\xc9\x6f\xe3\xc4\x3e\x1b\xde\x9e\xde\x9c\x5f\x1b\xc8\x89\xab\x9b\x8f\x83\xbb\x71\x83\x5f\xbb\xe1\xad\x8f\x83\x9b\x1f\xce\x56\xbf\xf6\xfd\x5d\x39\x2b\xbb\xe1\x95\x9b\xdb\xe5\xc9\x1c\x1d\x86\xd8\x90\x14\xd6\xd8\xcf\x09\xca\x16\x6a\xce\x99\x0f\x51\x88\x4b\xbc\xe9\x10\x99\x8c\x60\x05\x21\x44\x42\xaa\x06\xc7\xe1\x1d\xc4\xe5\xac\x96\x30\xcb\x9b\x65\x60\xd8\x76\x2a\x1a\xad\x71\x22\x3f\x24\x7c\x02\x7e\xeb\xbc\x54\xe2\x76\x49\x04\xfa\x96\xf1\x3e\x67\x54\x66\x09\x5e\xd4\x7a\x58\x75\xe5\x5c\xe2\x94\x40\xc4\x71\x81\x1f\xe7\x92\x45\xf4\xce\x40\x02\x93\xbf\xd7\xe9\x14\x32\x99\x14\xc5\x8a\xa0\x09\x51\x4f\x90\x37\xe7\x7e\xf5\xb6\x54\x17\x30\x22\x8f\x46\x0c\xcc\x39\x23\xbd\xc8\x71\x0e\xd1\x7e\xa3\x77\x07\x68\xf4\x2e\x26\x8f\x24\xe1\x99\xde\x79\xfd\x43\xcb\x25\x33\x4c\x31\x4d\x2e\xb9\xf2\x96\xb9\x6d\xf6\x53\x90\x88\x66\x20\x99\x8f\x89\x6e\xf7\xe5\x04\x8f\x12\x25\x3b\x76\x06\x63\x40\x38\x8e\xb5\x92\x0d\xac\xcc\x0d\xaf\x08\x01\x62\xc1\xd4\x4b\xb5\x32\xd7\x11\x29\xbc\xf9\xdb\xf4\x18\xb6\x59\x36\x7b\x36\xee\x80\x77\x0c\xbf\x90\x92\xe1\x42\x71\x7c\xc7\x1d\xb5\x8e\xfb\x36\x1d\xa3\xd5\x03\x5d\x3d\x80\x7a\x2d\xd6\x10\x98\xfd\x00\x6f\xf5\x77\x2b\x05\x4d\x7f\xdb\x46\x61\x49\x76\x10\x19\x6d\x6e\x73\x35\x9d\x9a\xac\x1c\x71\x94\x70\x59\x86\x3a\xe9\x3c\xe8\x53\xfb\xe9\xb2\x71\x0f\x43\x67\xb1\xbe\xd6\xd7\xf2\x47\x37\x2c\x7c\x05\xcb\xcf\xb0\x09\x65\x1d\x1c\xf6\xed\x03\x44\x21\x58\x0e\xe4\xe9\xa4\x48\xfc\x66\x31\x2a\xac\xd8\x23\x56\x84\x1c\x48\xf4\x44\x12\x88\x52\x8a\x78\x9a\x81\x85\xd6\x0e\xd7\xb6\x44\x62\x13\xf0\x79\x80\x78\xae\x74\x63\x26\xa5\xc2\xd9\xe0\x6c\xbe\x46\x61\xb5\x36\xae\x13\x1b\xbb\xec\x71\x81\x0d\xad\x1b\x56\x48\x19\xfa\x40\x14\xb4\x02\xb8\xeb\xe1\x04\x41\xcc\xab\x46\xc0\x35\xaf\xfd\x16\x27\xca\xce\x64\x8d\x9d\x2f\x70\x2f\xbe\x4b\xf8\x64\xb9\x8e\x07\x8d\xa3\xfb\x9b\x73\x67\x50\x2a\xc2\x5f\x02\xf0\xd9\x92\x43\x68\x78\x7d\x33\x3c\x1d\xdc\x0d\xcf\x8e\xd0\xbd\x24\x7a\x79\xfc\x74\x21\x3d\xd6\x4b\x94\x66\xe4\x16\x48\x83\x49\x45\x70\x9b\x1e\x4b\x84\x28\x25\xb1\xae\x60\x1c\x65\x94\x8d\xe5\x84\x0d\x18\x17\xd4\xda\x59\x00\x17\xa6\x3a\x4f\x1b\x58\xb5\xea\x04\x42\x98\xcb\xf8\xed\x04\x19\x99\xf1\xa6\xf5\xc0\xaa\x55\xe4\x53\x0e\xc8\x7a\xee\xc9\xc0\xd1\x52\x73\x42\x05\xea\x34\x2d\x43\x54\xe3\xee\x73\x0a\x22\x94\x3f\xe2\x6c\x79\xf6\x20\x7e\x2a\x11\xad\x91\x64\x02\xd7\xeb\x73\x9f\x03\xc7\xd6\xc6\x86\x15\x6e\x3f\xc1\xc2\x1f\x61\x78\xab\xe7\x9b\x26\x60\x5f\x3a\x1b\x47\x38\xb1\xca\x20\x6c\x18\xa2\x44\x70\x76\xe0\x17\xca\x50\xe9\x4a\x3c\x40\x53\xfa\xc9\x36\x5a\x84\x27\xbb\x57\x03\x7f\x75\x4b\x38\xdc\x1c\xd7\xcf\xd4\x1a\x62\xc3\x35\x7c\xbf\x34\x3c\x8b\x4b\xa5\xa5\x2e\x2d\xb9\x0a\x12\x71\xa1\x6f\x0a\xe8\xb6\x30\x22\xaf\x12\x19\x14\x16\x7a\x51\xea\x46\xf5\x65\xa7\xbf\x28\x21\x11\x63\x45\x0e\x15\x5d\x99\xbf\x6a\x53\x1c\x20\x19\x02\xab\x00\xcd\xa9\xb8\x79\x26\x64\x86\x99\x8b\xac\x6d\x19\xae\xbb\xf2\xb6\x60\x55\x5a\x82\xc5\x90\xdd\x03\xf2\x15\x64\x6e\x94\xc6\x21\x33\x58\xcf\xa5\xe3\xb0\xc1\x0b\xfb\xb0\x6c\x4f\xd8\xc7\x52\xb4\x0c\x36\xcf\xe2\x7d\x1a\x6c\x82\xa5\x42\x76\x4c\x6d\x9a\x64\x20\xe1\x3f\xaf\x0d\xad\xa4\x9a\x75\x35\x9f\x69\x12\x2a\x2b\x21\x04\x0c\xdb\xd2\xc1\x5e\x18\x90\x8f\x94\x88\x99\x13\x84\x4d\x25\x5d\x7f\xb6\x6d\x49\x5d\x77\x4b\x84\xcc\x04\x62\xac\xeb\x4d\x1f\xa1\x01\xab\xc1\x1d\xb9\xb0\x9a\xd2\x7a\x99\x3b\x09\x27\x4f\x78\x21\x51\x26\x0c\x32\x88\x09\xbc\x76\x93\x87\x78\xc7\xf2\x47\xde\x93\xad\x5c\xe4\x3b\x02\x55\x7a\x75\xcc\x93\x93\x7b\xc7\xcf\xe0\x89\xa9\x04\x05\x7b\x81\xbc\x68\xae\x50\x35\x3b\xb0\x3a\x45\xc6\xd1\x1c\xb3\x19\x19\x3b\x1b\xd9\x26\xda\x92\x6e\xe7\x14\x9a\x39\xb3\xad\x34\x5f\x4e\xd7\x46\x61\xb2\xe5\x3b\xcc\xab\xde\xfe\xa3\x0f\x81\x54\x78\x46\x90\x19\x51\x27\xab\x62\x29\xe0\xc7\x62\xc5\x82\x9e\x60\x5b\x1d\x96\x83\xa0\xdb\x84\x77\x88\x5c\xb9\xc0\x13\x92\xbc\x8e\xe3\x1b\xba\xb6\xb6\x55\x70\xb6\x98\x60\x6e\x82\x9e\xc0\x1c\x5b\x61\x19\xd6\xf8\x2a\xf2\xa6\xd0\xee\x65\xf3\x2c\x15\xaf\xde\x62\xa2\xae\xd4\xc3\x26\x53\x6d\x2b\x00\x11\x5e\x7b\x41\xa1\x84\x26\xfb\x48\x78\xfd\x55\x4d\x82\x9b\x0d\x24\xa8\xd7\xd0\x32\x8e\xad\x0b\x36\xac\x9c\xca\xc6\x39\xe2\x1d\x8b\x98\x9d\x4f\x11\xe3\x8c\x20\x2a\x8b\x97\x55\x39\x9b\xc5\x23\xac\x68\x11\xdf\x18\x5f\x7c\x91\x25\x5f\x3b\xe7\xb9\x2d\x2d\x45\xee\xbb\xb7\x0d\xb8\xf4\x5c\x46\xb4\xa2\x8a\xc5\x02\x10\x1a\x0d\x1f\x2e\xcb\x74\x2b\xc7\xb9\x73\x81\xfb\xce\x01\x70\x06\x81\x96\x8a\x23\x10\x23\x2b\x83\x43\x06\xc6\xd2\xbe\x64\x3f\xb2\x28\x23\x23\xe6\x2d\x1b\x40\x88\x54\xa2\x14\x67\xe0\x92\x61\x5c\x15\x5f\x19\xd4\x1c\xe5\xb7\xf0\xc0\x09\xe2\xd2\x94\x40\x6a\x59\x81\x55\xa6\x1d\x77\xfd\x16\xeb\x5a\x46\x27\x74\xc8\xaa\x33\xfa\x48\x98\xa3\xe9\x03\x77\x26\xf4\xa0\x5c\xa7\xc9\xe2\x10\x43\x94\x28\x89\x43\xc3\xf5\x72\x8e\x64\x0c\x32\xfb\x60\x8f\xec\xbe\x64\x77\x8d\x51\x10\x06\xe3\xaa\x04\x4e\xee\xe2\x7a\x43\x2a\xb5\xb0\xab\x26\x91\x17\x4b\xf4\x47\xc6\xd5\x1f\x03\x60\x5a\x67\xbc\x80\x4f\x9d\x09\xea\xa0\x56\x71\x03\x0e\xad\x25\x1c\x84\x03\x80\xa4\x95\x2b\xbf\xad\x6b\xb7\x88\x5b\x7e\x56\x69\x74\x58\x4f\x62\x6a\x2b\x59\xd4\x3b\x5c\x51\xf5\x5a\xa8\x1a\x3c\x4d\x55\xb4\xe2\xa4\x97\x0c\x9d\x72\x95\x87\xd5\xef\x45\x27\xcf\x6a\x2d\xa1\x7b\x1b\x6a\x4b\x3b\x07\xbe\xac\xc0\xb0\x6d\xb6\x4b\x6c\x92\xa6\xd7\x26\x97\x8b\x72\xe4\x91\xad\x62\xd0\x02\xd2\x7a\x34\x62\xef\xb9\xb0\x57\xb0\xb4\x30\xf1\x13\x1c\x3d\x1c\x12\x16\x23\x9c\xab\xb9\x01\x4b\xb5\x7e\x85\x85\xa5\x06\x2d\x69\x00\xd9\x78\x24\x04\x2a\x23\x2c\x62\x57\xb0\xe0\x91\xbb\x51\x8c\x58\xd0\x08\x00\xd1\x43\x9d\x1e\xa8\x34\xda\xa6\x6a\x12\xa9\xf5\xab\xb6\xb5\x68\xaa\xa1\x59\xab\xa0\xb9\xfc\x9c\x95\x6a\x82\x02\x84\x3e\xc4\xa7\xf0\x69\x7d\x75\xce\x9d\xb5\xd1\xe9\x77\x9a\x9e\xeb\x5e\x88\x03\xab\x51\x18\x93\x94\x9d\x81\x96\x74\xbe\x76\xbc\xb6\x04\xfa\x3a\xcd\x05\x44\x5b\x36\xb5\xf9\x65\x34\xa7\x49\xe1\xbb\xf8\xea\xc0\x0f\x53\x37\x99\x90\x47\x92\x18\xc8\xf1\x48\x40\x60\xb5\xb1\x1a\x7e\x8d\xfe\x8f\xa9\x2b\x89\xbe\x19\xb1\x0f\xc0\x86\x93\x64\x01\x80\x88\xbe\x65\xac\x2a\xcd\x3c\x34\x0e\x40\xd9\x4c\x0e\x54\x1e\x88\xd9\xeb\x39\x7e\x24\x23\xe6\x9a\xf9\x3f\xe8\x01\xfd\x09\x7d\xd3\xa6\xde\xb9\xf8\xe8\x67\xb6\x73\xbc\x0f\xa2\x8f\x83\x5b\xce\x32\x4a\xcb\x6f\x9c\x19\xa4\x64\x84\x6c\x00\x46\xf0\xb8\xc6\x94\x3d\xf2\xa8\x16\x84\x1f\x9e\x5a\x2c\x08\x53\x63\xc6\x63\x32\x26\x0d\x2e\xcd\x25\x4c\x42\x0b\x01\x97\x3c\x26\x2b\x1d\x92\x9e\x99\xfe\x04\xa6\x1b\x99\x4f\xfc\x76\x40\x7e\xb6\x4f\xc6\xf5\xd6\x87\x32\xa5\x35\x8f\xdc\x83\x87\x6e\x32\xee\x4d\x9d\xa9\x2e\xca\xef\x00\x2e\x04\x3b\x80\x66\x87\x5e\x82\x95\x4b\x61\xad\x1e\xc7\xaa\x23\x40\xbf\xac\x67\x6e\x2f\xab\x00\x16\x15\x4a\x57\x08\x3a\xa3\x5a\x7e\xef\xee\xb0\x05\x4e\xb8\x89\x37\xc3\x60\x44\x76\x72\x67\x14\x4b\xe1\x70\x32\x0e\x3d\xfd\x15\x4e\xc8\x09\xcf\xab\x02\xbc\x5d\x00\x2a\xc3\xe4\x5a\x2b\xab\x2f\x34\x1f\x9e\x99\x04\x2e\x32\xa7\x26\x65\x7a\x70\x7a\x81\xf4\xe9\xe0\xa9\xc1\x15\x82\x45\xcb\xd5\x9c\x0b\xfa\x5b\x6b\x82\x49\xbb\x8c\x5e\x78\x5a\x8b\x7c\x1c\x33\xce\xb2\xb4\x0e\xc4\x6a\x44\x0a\x55\xd2\x4a\x9a\x74\x26\x34\xc9\x01\x42\x53\xb3\xd9\x69\x9e\x18\xdc\xfd\x88\x8b\xd8\x14\xbe\x96\xa5\xec\x1f\x88\xa2\x74\xe2\x3d\x56\xbe\x41\x6a\x91\x06\x2d\xb2\xbf\xb1\xe0\x2c\x15\x40\xff\x96\x93\x7c\x47\x09\x54\xaf\x1a\x72\x7a\x87\x67\xb2\x88\x21\x35\x6b\xa3\x79\x73\xb1\xbe\xbf\xea\x99\xca\x20\xe5\xd0\x59\x16\x3d\x82\x8f\x51\xc9\x4d\x5d\xc7\xb5\x2c\x3a\x37\x06\xb9\x7c\x07\x26\x9d\x97\x88\xe7\xa8\xcb\x48\x0d\xec\xc7\x92\xdf\xa3\x4f\xc0\xab\xb2\x88\x67\xb2\x93\x38\x08\xf8\x8a\xf4\xf1\x8c\x26\x93\x0d\x98\x5c\x5d\xa8\x5e\x1a\xd4\x5a\x18\x50\x3c\x5b\x6b\xc8\x85\x55\x1c\xa2\xe6\x9f\x04\x05\x80\xaf\x45\xf1\xb2\x2f\x61\xea\xae\x8b\x90\xc7\x68\x29\xc5\x88\xb5\x10\xd7\xe1\x96\x70\xd1\xcc\xe3\xd7\x30\x40\xd8\x86\xca\x5d\xd7\xfd\xf6\x6d\x27\xc2\xb0\xa4\x7d\x3d\x12\x75\x74\x8f\x95\x87\xc1\x17\x72\x78\x1d\x03\xa2\x17\x6d\x5e\xee\x64\x78\x72\x1c\x47\x38\x9a\xb7\x4e\x6a\xc2\x79\x42\x30\x6b\x93\x5e\x1b\x1f\x57\x8f\x88\xc1\xa6\x04\xd6\x9d\x24\x00\xd0\xea\x96\xc0\x16\xf5\x2b\xc4\x77\x16\x03\xb0\xb6\xe1\xe1\x06\x89\xc3\x0d\x54\x11\xe6\x2c\x3f\x94\xcd\x12\x52\x5d\x2b\x8b\x80\x7e\x60\x3b\x49\xa2\x3c\x09\xaa\xfa\x65\x44\xe8\x51\xeb\x25\x7e\x24\x4c\xeb\x0c\x76\x1c\xce\x99\xf1\xe4\xf2\x59\x7d\x2d\x9f\x03\xdf\xb5\xf3\xa7\x41\xd2\x58\x3c\x62\x70\x70\x79\xf9\xb0\x6a\x5a\x95\x5a\xcd\x08\xed\x52\x1b\x9f\xce\x40\x88\x58\xfb\x78\xde\x96\xcd\xc4\x6b\x9f\x49\xd3\xf7\x18\x62\x0c\xb6\x76\xad\x05\xee\x97\x22\xd3\xde\x6c\xac\x43\x53\x7a\x21\x23\x32\x44\x6d\x94\x41\x5e\x82\xa0\x8d\x36\x34\x9f\x67\xbd\x4b\x8a\xea\x05\xee\x36\xe8\x38\x94\xa5\xae\xea\x8e\x8e\x67\xb0\x4e\x2e\x3b\xb7\x17\x36\xe2\xb6\xec\xb2\xf5\xe9\x19\x45\x98\xa3\xad\xcf\xa9\x04\x86\xe4\x72\x48\x09\xfe\xc9\x68\xd8\x54\x1a\x0b\x98\xab\x52\x90\x66\x6a\x61\x8b\x5a\xc1\xbd\x18\xa6\x64\x1a\xc0\xae\x26\xf7\x70\xf5\x8e\x8c\x4b\x0e\xe2\xa6\xce\xa0\x23\x6b\x56\x68\x6c\xd2\x2d\x74\x08\x00\x51\x49\xb8\x6f\x8b\x06\x31\xf5\x41\xc7\x38\x69\xb5\x65\xed\x80\x69\x42\x96\x64\x91\x64\x6f\xb1\x3b\x95\xc8\x89\xe6\x5d\x38\x49\x2a\xf3\xc2\x90\xcd\xaa\x7c\x8d\xb0\x49\x51\xc8\xb4\xbb\xb3\x3a\xc1\x13\xb2\x96\x7b\xfa\xc2\x7c\xb0\x94\x8a\xe0\x15\x48\x35\xcd\xb2\x64\xd1\x0d\xb5\x29\x0c\xbd\x6b\xc4\xb8\x5a\x35\xb0\x10\x19\x6b\xe9\xdd\x54\x46\x97\xda\x6c\x88\x92\x44\xb9\xa0\x6a\x31\xb6\x46\xbf\xee\x4c\xeb\xd6\x7e\x79\x6a\x3f\xec\xa2\x51\x9f\x20\xd7\x9f\x33\x32\xc2\x3d\x25\xa8\x29\x80\x62\xa7\xd0\x65\xbb\xb5\x96\xdc\x88\x7d\xb3\x6c\x61\x1d\xf8\x4e\xb7\xa1\xea\x2e\x36\x1d\x9e\x2d\xac\x30\xe6\x53\x07\x6b\xd3\x7d\x61\xab\x15\x27\xd6\xb0\x96\x3a\xf4\xdc\x4c\x50\x2e\x6c\x61\x87\x2e\x41\x6d\x29\xfe\x34\xce\xb0\xc0\x49\x42\x12\x2a\xd3\xcd\x6d\xbb\x7f\xfe\x76\xe9\x68\x4f\x4d\x01\x12\x69\xcb\xf9\x7c\xa2\x69\x9e\x22\x96\xa7\x13\x2b\xe5\x62\xf9\x10\x62\x17\xba\x4c\x6b\x03\xc1\xe3\x06\x58\xca\xf7\x16\x01\x1a\xe5\x88\x05\xb8\xc4\xd6\x54\x81\xa3\x39\x25\x8f\x80\x9a\x28\x18\x91\xf2\x08\x5d\x72\x45\x4e\xd0\x47\x9c\xdd\x81\xa0\x66\x2a\x02\xce\x8c\x75\x1c\x4b\xa4\xa5\xd6\x9c\x51\x75\x30\x62\x16\xcc\xd8\xad\xca\x71\xc4\x99\x01\xb4\x8c\x60\x61\x7d\x13\x60\xee\x75\xc8\x8e\xca\xe5\xa5\x51\xd9\xb2\xd8\x02\x3f\x8d\x83\xe8\xd5\xb1\xc9\x0e\x58\x83\x8e\x6f\xf0\x93\x89\xd7\x86\x0a\xf8\xe6\xeb\x25\x92\xbb\x0d\x88\xb2\x05\x60\x0c\x8e\xab\x0b\x1c\xe1\x16\x4c\xc0\x97\xae\x32\xd1\xa9\x5f\xd2\x23\x72\x84\xbe\x4b\xf8\x44\x1e\x20\xe9\x31\x8f\x5d\x81\x7e\x79\x60\x1c\x54\xf0\x6f\x93\xc9\xf3\x95\x5b\xfd\x82\xef\x43\xd5\xb6\x29\xfd\x64\x30\x0c\xe4\x9f\x4f\x8e\x8f\xd3\xc5\xe1\x24\x8f\x1e\x88\xd2\x7f\x81\x4c\xd1\xb8\x42\x0e\x00\x08\x37\xc1\x09\xad\x5a\x9d\x3a\x14\x51\x27\x8a\xb4\x20\x76\x92\x00\xec\xb5\xbe\xd2\x7d\x5d\x4c\x87\x5c\xc3\x59\x73\xd1\x3f\x3b\x65\x91\xb7\x1d\xaf\x12\x5e\xee\xcb\x68\x2b\xa6\xee\x67\x08\xd3\x3b\x4d\xf0\xac\xa2\xb2\xac\xa1\xa4\x5c\xa5\xd4\x52\x91\x9e\x3b\xc4\x5b\xe8\x53\x56\x8e\x32\xfb\xc2\xb9\x23\xc1\xad\x68\xdd\x2d\x47\x23\x36\x90\xe8\x89\x98\x72\x9e\x90\x52\x06\xde\x89\x9c\xca\xb9\x4f\x28\x03\x7b\x29\x34\x6a\xd0\x4c\x4d\xd2\xbb\x55\x1c\x9d\x66\xe5\xfc\x37\x56\x03\xc5\x89\x24\x07\xba\x61\x40\xb4\x72\x81\x84\xe8\x49\xe0\x2c\x23\x62\xc4\x2c\x32\x25\xe0\x2f\x73\x6e\x83\x44\xda\xa2\xc9\x7b\x8d\x72\xbf\x34\xca\x41\x25\xb4\x1c\x2a\xdc\xa6\xa0\xf4\xc8\xa2\x90\x9f\xb3\x4f\x79\x95\xb3\x74\x35\x03\x18\x2f\x7c\x1c\x73\x22\x03\xc3\x33\xf2\xf6\xa3\x84\x4e\x89\xbe\x31\x47\x4c\x2f\x7d\x68\x24\x37\x98\xbe\x0e\xe2\x57\x77\x1a\x09\x2e\xa5\x8d\x16\x37\xed\x2c\xcf\xf9\xd9\xa2\x7c\x98\x01\x26\x36\x85\xfb\xab\x85\xc4\x82\x67\xae\xa4\x98\x7d\xd8\x5c\xcf\xbd\xad\xa9\x95\x05\xc4\x8a\xb5\x58\xa3\x84\xd8\xf1\xe9\xc5\xb9\xaf\x9b\x53\xe9\xba\x5e\x43\x2c\x04\x73\x6e\xaf\x22\x56\x9f\x71\x50\x4f\xac\xd2\xc4\x92\x8a\x62\xab\x37\xab\x1c\xa3\xba\x0d\x52\x57\x65\xeb\x57\xdd\x59\x15\x9a\x59\x15\x4a\xbd\xa3\x6d\x6a\x61\x85\x11\x08\x39\xcf\xed\x15\x06\x61\x41\xbf\x25\x15\x4e\xb3\x30\x4d\xd0\x41\x15\xda\x69\x9a\xa3\xd6\xc6\xb8\x5f\x14\x42\x39\xc2\x26\x02\xa3\x3a\xb8\xda\x56\xac\xe7\xa5\xb9\xb3\xc8\xcc\xbb\x08\xbd\x7d\xb9\xbc\xdb\x64\x51\x44\x9a\x49\x2b\x6f\xb8\xaa\xbf\x2d\xb6\xea\x09\xf1\x28\xd4\xad\x1b\xba\x6d\x62\x9d\x47\xab\x11\x04\x4b\x1b\x42\x00\xf9\x67\x95\xdc\x94\x35\x4c\x9a\x7e\xcc\x26\x83\xf5\xd0\xe3\xbe\x07\x57\x8d\x2d\x65\x14\xb9\x83\x48\x85\x20\x8f\x44\x00\xed\xd8\x38\x15\x56\x3e\xaa\x38\x11\x04\xc7\x8b\x60\x45\xbc\x93\xdc\xf4\x0c\x26\x1d\x49\x53\xad\x74\x82\x38\xcd\xf8\x21\xcf\x9c\x9c\x5d\x7a\x0b\x40\xfb\xe9\x54\xdf\x58\x81\x8b\x5d\x7f\xc1\x0e\xc9\x27\x2a\x95\xd6\x4b\x1a\xe2\x0b\x5d\x23\x70\x4b\x43\x29\x9f\x39\xb1\x37\xdc\xe8\xdd\xe0\xbb\xab\x9b\xbb\xe1\xd9\xe8\x5d\x11\x51\xee\x52\xa6\x3c\x08\x8d\xc3\x14\xe7\x6c\xc4\x7c\x10\xa8\xc7\x5c\x85\xbd\x44\x38\x8e\x0b\xc4\x6b\xab\xf8\x18\x39\x63\x29\x47\x0e\x4e\xc5\xca\xf0\xcf\x25\xcd\xdc\x43\xde\xcc\xbe\x9e\xac\x25\xee\x9e\xd2\xc9\x31\xd9\x3f\x4b\xd2\x34\x76\x74\xd9\x84\x70\x91\xca\xe8\x87\x44\x39\x3c\x33\x46\x9e\x9c\x7c\x0f\xb7\xf3\x31\x36\x97\xf0\x7a\xdc\xce\x6d\xc8\x06\x9b\xfa\x9e\x7e\x22\xf1\x4d\x8b\x54\xb5\x93\x2c\x8c\x4e\xd1\x6b\x8d\xbb\x90\x33\xba\x8e\x96\xea\xa7\x72\xaf\xbf\xeb\xce\x96\xae\x0a\x14\xa8\x02\xd1\x11\xe0\x1c\x15\xc2\x28\x22\x42\x61\xca\xd0\x14\x0e\x36\x8b\x16\x08\xb0\x38\x08\xf8\x5d\xbf\x45\x29\x65\x90\xed\xbe\x6c\x69\xef\xcb\xf3\x58\xa7\x94\xff\xf9\xe5\xfd\x5d\x49\x54\xfd\xfe\xea\xbe\x5c\x47\x7a\xf0\xf3\x52\x59\xb5\xd2\xc2\xb2\x00\x97\x60\x8a\x45\xe6\x9c\x05\xb6\xf4\x2b\xd3\x34\xd1\x0f\x44\xfd\xa8\xf9\x32\x67\xbb\x08\x2b\xb7\x72\x16\x38\x9c\xc8\xf8\xd1\x34\xbc\x06\x19\xd8\xa1\x2c\xc9\x1d\x70\x92\x1c\xf4\x80\x6c\x0f\x61\x22\xfb\x91\xa9\x98\x3c\xd0\xcd\x81\xca\xe8\x02\xb4\xb4\xbe\xc4\x99\x5e\x2e\x03\x2f\xe8\x30\x09\x83\xe6\xf8\xd4\x7c\xdc\x11\xa1\x29\x08\x13\xd6\x6d\x15\x4b\x89\x06\xd7\xe7\x0d\x6b\x7d\x51\xb5\xc9\x7f\x5e\xe5\x1d\x12\xef\x1e\xd8\x75\x65\x87\x20\xdf\x6b\x2f\x8a\x3a\xd8\x99\x6e\x57\xcf\xc1\x78\x51\xaf\xcb\xae\xd9\x7d\x40\xaf\x6c\x92\x67\x4b\x79\x9c\x2b\x80\x2a\xd7\x4b\x6d\x2a\x96\x61\x4d\x14\x99\x70\x40\x36\xae\x3e\x44\x4e\xa9\x07\x6d\x1e\x84\x48\x2a\xdc\x14\x90\xb4\xce\xda\x9d\xa1\xcb\x14\xb3\xe9\x02\x2f\xf3\xa3\xa1\x68\x8f\x3e\x00\x78\x0a\xae\x40\x99\x0b\xb6\xb4\xc9\xc0\xe1\x74\x43\x6a\x5b\x0f\x91\xa6\x18\x9f\xb3\x27\x5a\x6c\x56\x9c\x61\xab\x14\x83\x84\xef\x90\xc3\x9b\x0a\x4d\x1d\x8d\x58\x10\x01\x20\x8d\x4c\xae\xcf\x88\x03\xeb\x87\x0a\x90\x0c\x80\x5e\x21\xeb\xc1\xdf\xcc\xa5\x1d\xa8\xe6\x1c\xab\x79\x19\x6e\xbf\xd6\x8f\x3d\x9d\x72\x8e\x5d\x66\x97\x53\xef\x6d\x60\x55\x68\xfc\x80\xf6\x02\x80\x6d\xdb\x31\xd8\xf7\x40\xa3\xc6\x41\xf9\xa6\x20\x1b\x38\xe6\x44\xb2\x2f\x94\xcf\x9d\xa3\x89\x2d\x11\x80\xab\xf6\x56\x2d\x72\x60\x6a\x5b\x5e\x7e\xc0\x77\x00\x77\xb3\xae\x54\x1b\x1c\xab\x95\x36\x14\xe7\x34\x03\x4a\x08\x83\x3b\xa0\xd3\x36\x6c\x9a\x4f\x19\x89\x36\xc1\xe4\xb8\xc6\x02\xa7\x44\x11\xb1\x2c\xbe\xa3\x5c\x5c\x15\x62\x17\xdc\x0e\xda\x7e\xcd\x2e\x1a\xe4\xf9\x6a\x89\x02\xaf\x7a\x5d\xac\xc2\xd8\xf0\xb3\x58\x0b\x4e\x48\x4f\xe3\x47\x0b\xb5\xbf\xe6\x2c\x6c\x3f\xc5\x34\x6c\xf8\x4a\x00\xa9\xb2\xed\x9c\x5e\x06\x5b\xe2\xae\x86\xd2\x50\x8a\xbf\xd8\x13\x50\x89\xd5\xa3\x6c\x43\x93\x58\xc5\x4b\x77\xc2\xbb\x5d\xc8\xb8\xcb\x49\xac\x1c\xaa\x52\x30\x3a\x50\x09\xc8\xfb\x06\x58\xa1\x19\x11\x02\x84\x96\xa6\x90\xb3\xc0\x8f\x62\xf1\xc2\x0a\x6b\xa3\x95\xac\xaa\xc5\x56\x2a\xcb\xb5\x82\xc7\xed\x2a\x5b\xbe\x97\x68\x76\x2d\xd1\xac\x61\xdb\x33\xd4\x49\x44\x05\xb8\xc3\x16\x41\xb5\x19\xd7\xe5\x09\x42\x32\x87\xbd\x22\x6d\x25\x45\xb8\xfa\x29\xf3\xff\x2a\x73\x70\x47\xd4\x21\xa9\x36\x65\xa9\x1d\x05\xfe\x11\x70\x8f\x24\xa1\x34\x60\x03\x15\x60\xb4\x26\xae\xcc\x98\xa0\xcf\x2f\x8d\x77\x05\xb2\x45\x17\x3c\x47\x4f\x54\x6a\x5d\x78\xc4\x20\xf0\xca\x9b\xaa\x15\x47\xe6\xc5\x03\x78\x0b\xf2\xca\x65\x3e\x49\xa9\x42\x38\x98\x61\xc9\x5e\x76\x60\xcf\xb3\xfe\x00\x66\xdc\x98\xb8\xdc\x84\x79\xb2\xe2\xd0\x6c\x60\xfc\x29\x1a\xd9\x36\x37\x39\x08\x12\x7d\xde\xec\xe4\x40\xe3\x09\x35\xcc\xc6\x33\xd7\xa7\x27\xa3\x66\x6b\x83\x45\x61\x04\xa8\x4c\x2a\x55\xe5\x6e\xb1\xd8\x8b\x2b\x52\x93\x8b\x8d\xe8\x94\x9b\x5c\xbc\xbe\x8b\xe4\xe4\xb6\xb2\x3d\xcb\x92\xd5\xdc\x27\x2d\xc6\x59\x97\x04\xa9\xb8\x8b\x44\x0e\x25\xa5\xeb\x56\x49\x69\xdf\x60\xa2\x8a\x08\xeb\xcd\xe3\x75\xd7\x51\x07\x8b\x84\x97\x90\x8a\x82\xfc\xb5\x32\xc8\x06\xa9\x72\x7e\xc6\x15\x24\x29\x44\x50\xd2\xb8\x96\x38\x37\x62\xcd\x12\xc8\x72\x9e\xb8\x6d\xcc\xfb\x4e\xe1\xa4\x82\xf3\xe7\x66\x61\x2d\x5a\x3f\xf9\xa8\x21\xa3\x2c\xdb\xe2\xc4\x55\x11\xb3\xf0\x3f\xb5\x28\x20\x20\x78\x6c\x92\xc1\xd9\x70\x2a\x3b\x46\xa4\xaf\x3c\x17\xf6\xd2\xdd\xa1\x6a\x57\xe3\xce\x9d\x03\xf8\xbd\x8c\x6c\xb9\xb1\x8b\x40\x75\x6a\x7c\xc5\x8d\xb8\x49\xd1\x45\x40\x69\xdc\x19\xb6\x64\x35\xdd\x5b\x37\x7e\x00\xae\x47\x3b\x74\x6c\xc2\x30\x3c\xe2\x71\x65\x4b\x4a\x13\xb6\xc5\xac\x9f\x61\xd2\xeb\x16\xca\x0c\x5c\x61\xc2\x86\x4f\xd2\xd0\x6e\x00\x15\x32\x6d\xd4\x59\x85\x0f\x7b\xd1\x2e\x67\x31\x11\x8c\x60\x35\x7f\xb9\xa0\xf5\xd3\x6d\x8d\xd3\x2f\x16\xc0\x7e\xba\x93\x2a\xc9\x95\xa0\xf0\x35\xe3\xc1\xd7\x08\xae\x2e\x6a\x66\xd6\x14\xc7\xa6\xea\xf4\x05\xa6\xc7\x3a\x54\xba\x55\x5c\x7b\xb3\x32\xf7\x3c\x11\xfe\x0d\x56\x9f\x5a\x6c\xbf\x3e\xec\x61\xa5\xd1\x15\x4b\xf2\x59\x84\xd2\x3f\x7f\x74\xf7\xb2\x9a\xa6\x79\x10\xf0\x0d\x85\x65\x15\xa6\xcc\x72\xaf\x65\x31\xde\x5a\xa2\x4c\x71\x53\x58\xf7\xde\x27\x0c\x7c\xf6\xf9\x02\x7d\xf4\x78\x1f\x3d\xde\x47\x8f\xaf\x15\x3d\xbe\xcc\xcc\xe8\x3d\x5f\x50\xe3\xad\x54\x99\xc3\xac\xe3\x0a\x6d\x6d\xf3\xa8\x6e\x67\xa9\x0b\x43\x62\xec\x2f\xf6\x87\xc6\xa8\x98\xda\x67\xd5\xd9\x86\x56\x43\xb6\xa8\x1a\xdf\xb1\x88\x13\x0b\x9f\x65\x63\x56\xcb\x56\x9e\x65\x06\xc9\x11\xfb\x9e\x3f\x91\x47\x22\x0e\x10\x56\x28\xe5\x5a\x49\x0f\xa2\x50\x80\xe0\x4a\x48\xcc\x26\xda\x00\xa3\x4b\x9c\x92\xd8\xd4\xd9\x0a\x22\xdb\xac\x59\xd4\x3a\x34\x9b\x50\x22\x01\xf0\xd0\x6c\x83\x8b\x4e\x18\x31\x13\x6d\x66\x22\x9c\xe0\x4e\xa6\x6e\x62\x40\xd7\x7f\xf4\xee\xd6\x3f\x1e\xa1\x3b\x7d\x0f\x50\x59\x1e\x6f\x00\x1a\xd5\x36\xb6\x11\x9b\x09\x9e\x67\xde\x52\xc5\x27\xa6\xe0\xa2\x01\x9c\xae\xbb\x5b\x61\x30\xce\xd7\x1a\xe1\x58\x6b\xbc\xcb\x09\xe7\x55\x02\x11\x37\x42\x5e\x09\x09\x48\x73\x09\x1f\x5d\x65\xa3\x9d\x8d\x97\x34\xc0\x9b\x58\x86\x1f\xfd\x4c\x2e\xdc\x33\x22\xc1\xf6\xe2\x6d\xdb\xa5\xf4\xd7\x72\x8a\x75\xe3\x38\x97\x59\x1e\xbd\x77\xc0\x59\xd0\x9b\xb3\xb7\x8b\xce\x6d\x64\x95\xc9\xad\xb3\xfc\xf8\xd9\x6c\x92\x9d\x03\x28\xdb\xf8\xc5\x75\x2e\x32\x0e\x12\x4f\xb2\x70\xd9\xe6\x16\xa0\x2a\xe3\x59\x6e\xa2\xc7\x68\x18\x4c\xd4\x48\xd9\x54\xaa\x8f\x58\x45\x73\xcd\xdf\x0b\xa0\xa6\x1d\x45\xd5\x15\x5c\xf9\x79\xed\x94\x0d\x33\x38\x0d\x7b\x6f\x31\xdc\x77\xb0\x5b\x9b\xfb\xd5\x45\x58\xbb\x1b\x3b\xd5\xfd\x95\x6a\xc9\x07\xd6\x47\xf7\x89\x7d\xa2\x27\xba\x8a\x8a\x56\x8d\xbf\x1b\x6d\x95\x0b\x05\xed\x3c\x5e\x6f\x0b\xe4\x8b\x33\x8b\x33\x54\xbc\x68\xeb\x02\xb6\x38\xd9\x37\x2c\xf4\x6d\xbd\x27\x50\x39\xbe\xb0\x6b\xa6\x38\xd3\xc2\xba\xe2\xfa\x96\x14\x33\x23\x2f\x9a\xfa\x93\x08\xa3\x5c\x50\x77\xf6\x2b\xa9\xac\xed\xd4\x01\x76\xc0\xe3\xb0\x10\x4c\x84\x83\x1a\x59\xc6\xad\x8e\x23\x95\x63\x1f\xfe\x07\x34\xe1\x4a\xef\x9a\xb4\x5d\xe7\xbe\x16\x4e\x8c\x6a\xd8\xd3\x95\x84\xbd\xc5\x2e\xe3\x26\x58\xb6\x4e\x27\x8d\xb2\x59\x80\xe9\xd6\x6c\x8b\xed\x02\xd9\xde\xf8\x65\x37\xd8\xf9\xc6\x4f\x9d\xec\xb3\xc9\xb7\x4b\x30\x67\x5a\x3f\x5f\x25\xc0\x96\x42\x9d\x6d\xb8\xa9\x95\x9e\x42\xb4\x3d\x6b\x27\x03\xd0\x4c\x0a\xee\x70\x6c\xa5\xa9\xff\xf2\x7f\x99\x12\x3f\x66\x69\xfe\x0b\x71\x31\x62\xe6\xf7\x03\x0f\xaf\xaf\x5f\x28\x70\x2b\x71\x4a\x0a\x64\x3f\x51\xc6\x00\x03\x24\x04\x8b\xe1\x64\x30\x4a\x3d\xba\xb8\x1e\xc3\x43\x3e\x21\x82\x11\x3d\x34\x97\x33\xed\x99\x59\x8a\x19\x9e\x01\x22\xea\x01\xc4\x9f\x81\xb8\x5a\x88\xfc\x86\xa4\x4d\x99\x36\xe0\x56\x9a\x59\xda\x94\xcb\xa2\xda\x24\xf4\x69\x44\x59\x0b\xc8\x58\x04\x31\x34\x53\xff\x8d\xed\x7f\x33\x89\xfd\x6e\x70\xfb\xc3\xf8\x66\x78\x7b\x75\x7f\x73\x5a\x12\xdb\x4f\x2f\xee\x6f\xef\x86\x37\x8d\xcf\x8a\x74\xc5\xbf\xdd\x0f\xef\x5b\x1e\xb9\x06\x2e\x06\xdf\x0d\x4b\xa5\x5b\xff\x76\x3f\xb8\x38\xbf\xfb\x79\x7c\xf5\x7e\x7c\x3b\xbc\xf9\xf1\xfc\x74\x38\xbe\xbd\x1e\x9e\x9e\xbf\x3f\x3f\x1d\xe8\x2f\xc3\x77\xaf\x2f\xee\x3f\x9c\x5f\x8e\x5d\x70\x6f\xf8\xe8\xa7\xab\x9b\x1f\xde\x5f\x5c\xfd\x34\x0e\xba\xbc\xba\x7c\x7f\xfe\xa1\x69\x16\x83\xdb\xdb\xf3\x0f\x97\x1f\x87\x97\xcb\x4b\xc4\x36\xaf\x46\x6b\xf5\xc9\xe0\x22\x0b\x8c\x33\x81\x98\x34\x59\x58\xd2\xa6\xbf\x81\x8b\xe0\xda\xd0\xe3\xe1\x81\xfb\xcb\x14\x74\x3d\xd4\x2c\xd0\x79\x9f\x0a\xee\x31\x62\xde\x3d\xe8\x2f\x55\x28\xe8\x6d\xb3\x4f\x4b\xa3\x3d\x41\x03\x38\x2b\xa0\x30\x94\x3a\x05\xcc\x09\x3f\x52\xe7\x50\x46\xa6\x58\x7f\x4a\xc1\xb7\x8c\x0e\x51\x75\xc3\xcb\x0d\xda\x39\xc1\x10\xac\x77\x2c\x5e\x76\x1a\x64\x35\xb1\x15\x28\xe5\x04\x39\x0e\x4d\x8c\xda\x6e\x20\x33\x17\x0c\xa7\x34\x32\x3f\x54\x50\x23\x51\x81\x90\x50\x6d\xb1\x44\x60\xe5\x96\xe7\x04\xfd\xf0\xd7\x62\x50\xe0\x29\xb0\x06\x82\xbc\x56\x08\xcc\x3e\x10\xb9\x59\xd5\x55\xe4\x59\xea\xc9\x1d\x73\x6b\xc2\x85\x73\x6b\xeb\xc5\x82\x5b\x27\x67\x01\x4a\x52\xc9\xc7\xa3\x8f\xb7\x99\x51\x85\xc6\x4f\xd0\x2d\x20\x34\xc8\x42\x75\xd7\xbb\x98\x25\xf9\x8c\x32\x44\xd3\x2c\x21\x45\xa5\xe1\x09\x99\xe3\x47\xca\x1d\xea\xbe\x29\x4e\x00\xeb\x68\x45\x2b\x74\x88\x5a\x0f\xca\x09\x1a\xc4\xb1\x2c\x33\xb8\x12\xe5\x38\x96\x79\x58\x1e\x76\x08\x6c\xc4\x62\xcf\x36\x2b\x74\x54\x1c\x39\x58\xb1\xdd\x63\x50\xd4\xd9\x61\xf9\xee\xdd\x0a\x4f\x55\x3e\x8c\x1d\x29\x8f\x37\x12\x06\xee\xb0\x7c\x70\xac\x79\x95\x40\xe0\xd0\x40\xb6\xeb\xd1\xc2\x82\x74\xed\xd4\xaf\xec\x18\x0e\xda\x66\x7d\xb6\x82\xd9\xae\xe8\xd2\xcd\x38\xa9\x54\x1c\xea\xdc\x5f\xa9\x62\x51\x63\x67\x3b\xf5\xaa\x34\x4b\x63\x70\x24\xc7\x9e\xfe\xd7\x98\xc7\x35\x7c\x7a\xe5\xbf\x5c\x2a\xb2\x8d\x83\x75\x5b\xd7\xd7\x52\xcb\xd3\xb4\xfe\x96\xa5\x74\xb8\x23\x54\x9a\xee\xc2\x20\xe0\xc5\xd3\x08\xdc\x6a\x98\x32\x5b\x45\x84\x78\xbf\x8f\xab\x9b\xab\xcf\xb1\xaf\x6c\x85\x27\xfc\xb1\xa4\x5c\xa6\x44\x4a\xdc\x82\x59\x11\x98\xc4\xb6\x61\x0c\xfe\x84\xda\x0f\x3b\xd2\x93\x3b\x93\x77\xfa\xab\x65\x46\x9f\x9b\x50\x33\x76\x13\xd5\x02\x6b\xec\xe2\x59\xd1\x95\xc9\x6a\xd3\xfc\xe5\xa0\x08\x59\xe1\x22\x88\xe4\x69\x73\xb3\x74\x34\xab\x55\x17\xac\xb1\x38\x4c\xe8\x2a\x5b\x3f\xd2\x25\x68\x7d\x63\x20\x5f\xeb\xbf\xc0\xe5\xf5\x59\x83\xea\x4a\x7e\xc5\xb0\x70\xae\xa9\x11\x0f\x36\xb7\xd0\x96\x7a\x80\xb0\x49\x26\x2c\xa4\x29\x99\x47\x73\xe3\xcd\xd1\x57\xc6\xc1\x88\x3d\x05\x1b\x52\x0a\xb7\x1d\x84\x2d\x01\x08\xe2\x27\x7d\xdc\xe8\x63\x29\x88\x19\x44\x46\x0a\x11\xb5\x01\x21\x18\xc7\x5b\x51\xf5\x66\x05\x81\x07\xfb\xb5\x05\xa9\x6f\x50\xe2\xac\xa1\x0a\x7f\x53\xa1\x33\x3f\xb7\xa0\xbe\xd8\x16\x9a\x72\xd7\x21\x04\x25\xce\x9a\x46\xb0\x83\x0a\x67\x2f\x8a\x4a\xec\x93\x22\x4d\x0e\x6d\x3a\xb1\x30\x05\x7a\xba\x6e\xb5\xff\xe4\x66\xf4\x27\xe3\x77\xc8\x5b\x70\x2d\x82\xd6\x3c\x30\x31\x3a\xd4\x32\xab\xcb\xb7\xb6\x01\x0f\x12\x1d\x1a\xb0\xb3\x2f\x20\x9e\x71\x70\x7d\xfe\xc5\x01\xfa\x22\xcc\xe9\xfa\x62\xa3\x03\x68\xc7\x6d\xab\x9c\x81\x36\x55\x0a\xec\x2f\x1f\x3b\xd8\xab\xca\x49\xb4\x7b\x66\x0f\x22\x6a\x3b\x87\xfa\xcb\xd2\x37\xe0\x04\x86\xaa\x5d\xc6\x4f\xea\xc3\x8a\xad\x0b\xc8\xc8\xb8\x54\x36\xac\x5d\x3c\x62\x93\x45\xd5\xc9\x73\xe0\xbd\x3c\x9d\x4f\xe9\xd6\x95\xa8\x74\x7b\xf5\x24\xe0\x1d\x87\xbb\x2e\xbf\x0f\x56\xa4\x15\x0f\x4c\x64\x33\x9f\x06\x5c\xac\x2d\x1a\xa0\x8f\x13\x6f\x9a\x55\xc9\x5e\xe6\x16\xb3\x71\x53\x56\xc9\x3f\x6f\x8d\xdc\x3a\x04\x57\x0f\x9a\x56\xc4\xc6\xd5\xb7\x08\xd7\x3d\x95\x3d\x2f\x95\xed\x22\xaf\xa0\x3c\xb8\xf5\x2f\xd0\x53\x23\xc7\x05\xcd\x38\x83\xab\x56\x26\x3c\x83\x2f\x95\x2b\x5b\x5d\xe7\x73\x4d\x9f\x6f\xb0\x26\xab\x9d\xbe\xb7\x26\x70\xc0\xb8\x5d\xeb\x63\xad\x0e\x75\xa0\x6c\xed\x14\x4e\x4d\x0e\xa1\xa2\x29\x39\x40\x9c\x25\x8b\x20\xd8\xc1\x9e\x57\x20\x37\x13\x0b\x34\x27\x54\xb8\x4e\x2c\xcc\xdc\x5a\x49\xe7\x6b\x4a\xe3\x6d\x34\xb2\x45\xa4\xc9\xe5\xe0\xe3\xf0\x6c\x3c\xbc\xbc\x3b\xbf\xfb\xb9\x01\x42\xb0\xfc\xd8\xa1\x08\x06\x2f\xdc\xfe\x7c\x7b\x37\xfc\x38\xfe\x30\xbc\x1c\xde\x0c\xee\x56\x20\x0c\x2e\xeb\xac\x0d\xbd\x2e\x97\x4d\xea\xdb\x3a\x08\x76\xce\xcc\xdb\xd0\x7b\x1d\x67\x30\xe8\x84\x92\x16\xac\x41\x93\x60\xcf\x62\x22\x50\x4c\x1e\x49\xc2\xb3\xc2\xac\xda\xb8\x60\x01\x08\x61\x43\xfb\xcb\x80\x08\xa1\xcd\xea\x1a\x9f\x20\x53\xa2\x2a\xa8\xd2\xe9\x1b\x04\x91\x0f\x0b\xc2\xbe\x50\x88\x7c\xca\x12\x1a\x51\x15\x24\xe0\x71\x61\xdd\x2b\xc6\x7d\x08\x51\xa0\x2b\x88\x6b\x67\xd1\x28\x3b\xd7\xf9\x43\x4f\x7a\x5d\xdb\xf7\x27\xca\x83\x62\xad\xac\x7b\xb2\x03\xc5\xbe\xc5\x69\x5c\xc3\xec\xda\x60\x74\xcf\x61\x1e\xa8\x67\xc2\xd8\x24\xba\x16\x3c\xaf\xe6\x41\xae\xbe\x0d\x97\xc5\xc9\x94\xce\xf5\xf2\x40\x99\x6e\x94\xfa\xca\xe1\x2e\xa5\x7a\x80\x3b\xc0\xb7\xb0\x31\xe2\x6b\x06\x2c\xd4\xca\x5c\x30\x13\xdb\x89\x91\x20\x29\x57\x5a\x01\x33\x11\x01\x07\x5a\xa8\xa2\x38\xa1\xbf\x01\x12\x94\x20\x47\x41\x04\x05\x24\xda\xc5\x61\xc4\xa5\x45\x69\x38\x1a\xb1\xb3\xe1\xf5\xcd\xf0\x54\x33\xa4\x23\x74\x2f\x01\xe4\xa9\x34\xf5\x33\x4b\xde\x46\x1c\x0b\x23\x19\x28\x93\x8a\xe0\xb6\x60\x30\x22\x04\x17\xdd\xf9\x83\xef\x6f\x08\xdf\x35\x93\x37\x3c\x2b\xd9\xa6\x9c\x01\xe0\xb2\xb5\x98\x6b\x10\x9b\xbf\xf3\xd4\xa7\x1b\xfc\x54\x5a\x91\x10\xe4\x02\x24\x91\xf2\xaa\x3f\xe3\x6a\x03\x86\x63\xf7\xf9\x95\xfa\xbc\x86\x6f\x97\xcd\xf3\x0e\x42\xec\xa4\x2a\x00\x21\x0d\x66\xa4\x2f\xd6\x51\x99\x67\xab\xa8\x28\x5e\x03\x10\xa3\x42\xfa\x13\x32\xc3\x0c\x89\x9c\xb1\x0a\x42\x68\x68\x69\xab\x07\xcd\xac\x7b\x54\xf5\x9a\xe1\x94\xe7\x0c\x94\x06\x08\x63\x6d\x18\x8c\xcc\x08\x53\x2b\x06\xf3\x5a\x70\x27\x95\xa1\xee\x2f\xe2\x49\xc3\x40\xdb\x40\x4f\x9a\xfc\x49\x50\x31\x76\xbd\x6b\xd9\x05\xe5\x95\x9c\x4a\xfa\x50\xf9\xfb\xb9\x59\xcb\xc6\xf2\x61\xeb\xee\xee\xb0\x7c\x58\xdd\x55\x4c\xa2\x87\x75\x2f\x9b\x6a\x06\x64\x62\x0b\xee\xd6\x8c\x7d\x0b\xfd\xd4\x56\x94\x80\x3a\xcb\xd1\x03\xfa\xfe\xee\xe3\x05\x9a\x52\x2d\xf7\xea\x6b\xe5\x12\x6b\x19\xfb\x5e\x24\xbe\x88\xbd\x91\x41\x72\x91\xf8\xbb\x17\x36\xde\x89\x52\x81\x94\xa0\x6f\x34\x3c\x23\xce\xd8\x2b\x2c\xa6\x5d\xa5\xa2\x84\xc0\x2c\xe6\xa9\x99\xc7\xb1\xcc\xa7\x53\xfa\xe9\x48\x61\xf1\xd5\x1a\x12\xcd\x69\xc9\xc1\x56\x21\x23\x1b\x3e\x69\x21\x16\xc1\xaa\xb0\x52\x4e\x18\x3e\x12\xa6\x76\x22\x64\x43\x13\x0d\x19\xde\xdd\x4c\xe5\xa6\xbc\xde\xf9\x59\xc1\xa1\x7d\x99\xf7\x20\x34\x47\x09\x0c\x97\x95\xcd\xaa\xb1\x7e\xe1\x36\x6f\xf5\x63\x67\x07\x28\xbc\x5a\x5f\x97\x15\xf1\xdd\x76\xb5\x8b\x32\xbb\x45\x6c\xa6\x83\x28\xdf\x10\xf3\x45\x12\xa3\x8a\x07\x58\x03\x56\xc3\xaa\xee\xb9\xe9\x73\x8e\x65\xb5\xcb\x95\x5b\xbe\x01\xc0\x49\xa9\x99\x0f\x04\xf2\xff\x76\x11\x4d\xbd\x4e\x9e\x37\x0c\xe4\x5e\x24\x10\x07\xbc\xd4\x14\x63\x4a\xfc\xea\xe3\xeb\xc5\x13\xdc\x41\xd0\x34\x83\xd1\x92\x0f\xc9\x04\x81\xa2\xf3\x27\xe8\x3a\x21\x5a\x7c\xc8\xb5\x08\x91\x27\x89\x03\x83\x5a\x2e\xe2\xac\x05\x60\xf6\xec\xf3\x0a\x04\xe8\x25\x13\x73\x60\x68\xcb\x67\x16\xac\xc1\xee\xb3\xf3\x83\xf5\x05\x3b\x28\x58\xc3\xca\xaa\x10\x30\xe0\x85\x09\xfe\x04\x7b\x08\x2e\x71\x63\xfa\x9b\x66\xf3\x82\xc8\x39\x6f\xcd\x88\x0b\x67\xfb\x3c\x73\x70\x4b\xf9\x8c\x93\xb0\x91\x77\xe3\xb6\xe0\xe0\x0e\x97\xf3\x99\x69\xa2\x51\x24\x58\x36\x45\x8f\x62\xef\x43\x18\x2c\x34\xa7\x0d\x65\xb3\x43\x03\xc7\x5c\x61\x2f\x0a\x61\xb2\x0a\xfb\x7b\x21\x91\x2f\x8c\x03\xd1\x7f\x5e\x58\x41\x8b\xb8\x76\xaa\x64\x51\xf1\x09\xe9\x3b\x7d\x3d\x2e\x6b\xb3\x1f\x8a\x26\xf4\x80\x9b\x59\x9b\x05\xb0\x07\xb9\xcd\xc6\xb6\xc8\x12\xc0\x97\xdd\x62\x33\xe5\x46\x9d\xa2\x9d\x81\x6e\xeb\xc7\x01\xb1\xac\x48\xf8\x7a\x2e\x77\x4e\x89\x5a\x4a\x13\xe8\x21\xa3\xd6\x87\x8c\xb2\xd5\x0c\x3c\xed\x01\xc0\x9b\x12\x90\xd1\x5d\x78\x6c\xaa\x97\xbc\xb5\xb2\xae\x4a\xb5\x29\xed\x4e\xa7\xbc\x9a\xd2\x17\xfa\xdc\x9f\x6d\xe9\xf2\xd1\x93\x59\x8c\x21\x53\x71\x9b\xb0\x8f\xd2\xfc\x8d\xb9\x1a\xda\x24\x31\x32\x69\xe9\x06\xd0\xd6\xae\x9d\x37\xd5\x67\x58\x10\xa6\x46\xec\x46\x8f\xc2\x7c\x51\xb8\xfe\x8b\x6a\xf5\xa4\xa8\xed\x38\x45\xd8\x7e\x05\x8b\xde\x16\x79\x25\xc7\xe6\x25\xd0\x85\x9e\x31\x7b\xfa\x3b\xf3\x8e\x49\x66\xb7\x60\x2e\x7a\xaa\x74\x5a\xe8\x8d\x5a\xd8\x8b\xe6\x14\x72\xc9\x63\x22\xed\xe5\x41\x95\x05\x0b\xf0\xa2\x72\x4e\x1c\xac\x2e\x7c\xe6\xf9\x57\x13\x73\x75\x9a\x29\x73\x16\x21\x39\x62\x41\x1f\x4b\x50\x18\x8d\x76\xb8\xa1\xd8\x0f\xfb\x4c\x63\xef\x69\x81\x7f\x9a\x1d\xe2\x82\xce\x28\x0b\x0a\xb5\xd8\xe9\xa5\x38\x03\x7b\xa2\x39\x83\x7c\xea\xef\x9f\x3b\x1b\xd6\x7e\x04\x23\xfe\x9f\xff\xfe\xfb\x11\x6d\x33\xb7\xcb\xb1\x5d\x81\x7d\xd8\xc9\xf5\xb6\x25\xdc\xf9\x00\x1e\xa2\x05\x76\x40\xe6\x13\x8f\xdd\x5c\x0a\xd5\x2f\x7e\xb5\x97\x9b\x26\x1a\xae\xe6\xc6\xbf\x58\x26\x77\x30\xc6\x8b\x7c\xf9\x2d\x1b\xb0\xb8\xc2\x03\x5d\xb8\x19\x83\x28\x4f\x07\xfe\x6f\xa2\xf3\x74\xfb\x95\x0b\xa5\xc2\xa0\x02\x94\xb6\x6d\xa2\xe1\xe6\x58\x3e\x5f\xc8\x43\x63\x45\x15\x63\xa5\x0c\xef\xc8\x55\xc1\x0f\x66\x90\x26\x8b\x4e\xef\x4a\x2e\x89\x30\x07\xda\xc3\xf9\xa0\x7a\xd1\x65\x88\x7d\x5b\xe1\xc3\x21\x29\xa6\x6b\xc5\x69\xeb\xf7\x9b\x11\xf2\x4a\x46\x5c\x3c\x23\x62\x1c\xe7\xa5\xa0\xdc\x55\x6d\x5f\xeb\x8f\xce\x72\xb5\x58\xdd\xbe\x4c\x70\xf4\xb0\x0e\x2a\xa1\x7e\xbf\xa5\xd9\xd5\x82\x61\x10\x3a\x51\x16\x0e\x5b\x30\xff\x48\x05\xf3\xcf\xc6\xf2\x95\xb4\x76\xb8\x68\x18\x54\xcd\x0e\x84\x7b\x7b\x13\x19\x64\x62\x18\x39\x9a\xe4\x85\x95\xc3\x63\xbd\xc7\x47\x23\xf6\xde\x14\x4b\x00\xc5\xc3\x0c\x20\x82\x44\x0a\xf2\x29\xe3\x92\x94\x32\x7b\x1a\xf0\xdb\x6d\x66\x9e\x1d\x46\xb3\x4c\x5a\xa9\x5a\xbe\x95\x48\xfa\xea\xe8\x8d\xf5\x0d\xaf\x4f\xb9\x99\x02\xb7\x92\x7a\x22\x9a\x51\x4d\x3b\xe3\xc6\x93\xb6\xfe\xd4\xbb\x96\xff\x28\x62\x65\x00\xc7\x47\x25\x8b\x03\xe4\xa7\x57\x21\x88\x84\x3c\x12\x30\x53\xc2\x18\x43\x94\xfe\xb2\xa9\xa9\x85\x9d\xac\x3a\x40\x45\x5a\x1d\xb0\x05\x14\x57\x47\x50\x4e\x3e\x6a\xa2\xc5\x72\x5a\xc5\xd6\x19\x40\x4d\x0e\xff\x35\xa4\xd0\x41\x58\xad\x60\x41\x14\x22\x9f\x14\xb1\xc5\xf6\xee\x5c\x8e\x56\x3d\xac\x1b\x35\xa7\x99\xb4\x8b\x48\xbb\xa7\x8a\xda\x44\x6c\x66\xae\x4b\x42\x8b\xdd\xbd\x6f\x93\xb2\xe6\x98\xc5\x36\xd3\xd0\xca\xd2\x5a\xa6\x80\xd9\x19\x3b\x90\x8f\xc1\xb6\xf9\x72\x01\xcc\xb3\x69\xd3\xe0\x51\xc3\x45\xe6\xf4\x22\x2d\x99\x83\xdb\x9a\x0b\x2d\xa0\xe6\x4c\xd1\x44\x13\x87\x1d\x83\xd6\x9a\x73\xe6\x81\xd6\x20\x62\xb8\x0d\xcb\x8b\x4a\x49\xd9\x6c\x6c\x57\xd2\x25\xcd\x75\xbb\x18\xca\x34\xf5\xd1\x34\x65\x7e\xfc\xce\x35\xb4\xdc\xce\x6b\xc8\x1a\x70\x96\x5c\xba\x1e\x08\xd6\x8c\xbb\xc9\x58\x80\x2c\x97\xe5\x37\xa6\xb1\x59\x0a\x6a\x6a\xba\xc2\x44\xd7\x31\x52\x80\x58\x57\xcf\x8f\x2f\xae\x10\x69\x53\xf0\x4c\x62\x0d\x44\x40\xab\x96\x1c\x43\xd9\x9a\x5b\x78\xce\xbc\x88\x66\x8b\xf6\xf8\x0c\xea\x4a\x9a\x22\x76\xdd\xd9\x30\x6f\x9c\x24\x13\x1c\x3d\x78\x65\xc3\xab\xdc\x5c\x38\xd0\x73\x2d\xa0\x42\x55\x27\x43\x5c\x7a\xa0\x11\x48\x37\xa1\x17\xc6\x20\xa4\xd8\x61\x17\x9d\x9b\x55\xb3\x10\x4f\x06\x12\xc7\x8c\xde\xc4\x8c\xc7\x24\x4b\xf8\x22\x6d\xb9\xcf\xaa\xa9\x59\xdb\x44\x40\xb4\x65\x86\xed\xf4\x2a\xab\x30\xbd\xb5\x2f\xb3\x5a\x9e\xc7\x0e\xf0\x7a\xd6\xe0\x92\x1f\x12\x3e\x01\x2b\x9f\xd5\xb2\x5d\xee\x42\x10\x42\x5f\x3d\xcf\xeb\x66\x54\x54\x4f\x24\x95\x59\x82\x17\xcb\x7a\x30\xb1\xfc\xcf\xbb\x6f\x26\xf7\x7b\xb5\x11\xac\x7b\x14\x6c\xe3\xe7\xcf\x81\xc0\x7a\xe1\x24\x01\xf3\xae\xe1\x5f\x15\x63\x92\x49\xa2\x3a\xca\x04\xd7\x82\x02\x1f\x31\x85\x67\x6e\x73\xad\x70\xc9\x9f\x18\x11\x72\x4e\xb3\x52\xb5\xb7\xad\xc3\x6e\x2d\x45\xdb\xff\x98\x20\xd3\x35\x78\x27\xcf\x0e\x0d\xf2\x83\xa6\x0f\x99\xe1\xa8\x30\xfe\x45\x09\x96\x92\x4e\x17\x01\x60\x83\x8f\x60\x84\xb4\x98\xb2\xb6\x1c\x14\x58\x6a\x62\x34\x66\x7c\xbb\xc9\x58\xde\x3e\x5b\xeb\xbe\x7c\xfc\x68\x1c\x22\x63\xe9\xfb\xa4\x8e\xce\xe1\x6e\x6a\x8b\xd2\xd1\x8a\xa4\x69\x52\xb3\x37\xcb\x30\x5e\x0a\xaa\xd2\x6e\x46\x28\x84\x49\x3b\x6c\xab\xc8\x78\x20\x85\x10\x64\x44\x95\x52\xd4\x60\xf3\xb5\xe2\xe4\xcc\x9f\x9a\x38\x3d\x08\x03\xe4\xaa\x17\x1f\x1f\x20\xb9\x15\x78\x51\x17\xba\x38\x23\x09\xd9\x49\x24\xeb\x06\x44\x52\xf5\xb0\x07\xe4\xb1\x94\x34\x0a\x90\xf4\xd5\xc6\x85\x0d\x02\x6c\x5b\x20\x50\x9a\x87\xfe\x93\x19\xa8\x8d\xb1\x6d\xda\x45\xb0\x7f\xc1\x2a\x77\xd5\x5d\x9a\xb0\xd4\x4c\x0b\x96\xe4\x8a\x6e\x4a\x74\x55\x74\xea\xe5\x95\x7d\x24\xb5\x57\x0e\x45\xad\x8d\xeb\x03\xe9\x12\x71\xb0\xf2\x00\x6c\xc4\x81\xea\x7c\xba\x1b\x5d\x58\x3f\xa1\xe2\x68\x46\x94\x29\xac\xed\xab\x87\xbf\x25\x9a\xd8\x59\x20\xfd\x8e\x56\xbf\xf9\x90\xaf\x77\x6a\x6f\x89\x92\xee\x4a\xa8\xc1\xd3\xd9\xcd\xd9\xc3\x2d\xd8\x8f\x63\x69\x04\xd7\xcf\x5e\x6e\xd9\x3a\xf9\xdc\x8e\xcc\xa6\x60\xff\x8e\x04\x2a\x33\xc7\xd8\x7e\xe1\xd3\xad\x4b\x40\x43\xb8\x04\xce\x66\xd6\xe8\xf5\xb9\x5e\x95\xb4\x3f\x77\xd1\x6b\x7d\x1a\xaf\x8e\xaa\xa0\xee\x5e\x1e\x5c\x4f\x1e\x74\xe0\x85\x7b\x78\xf9\xb7\x1d\x83\xfd\xbc\x7f\xf6\x40\x38\xac\x5d\x89\xbb\x13\x11\xdf\x10\x99\xec\x85\xa4\x58\xdb\x8a\x97\x92\x17\x0f\x1d\x7a\x4c\x81\xc5\xb2\xbf\x5b\xb4\x1f\x27\xf9\xc6\xba\x81\x9e\xef\x82\x5d\x4d\x2f\x3b\xa1\x0f\x00\x52\xc4\x90\x6f\x9a\xdb\xca\x0c\x70\x78\x83\x90\xb1\x9a\xef\x61\x45\x30\x9e\x1d\x5e\xa7\x30\xbc\xda\x72\x3e\xc7\xf6\xda\xe4\xa2\xce\x9b\xfb\x9c\xa4\xb6\xee\x58\x76\xa1\xa3\x3c\xb3\x17\xc7\x52\x63\xf0\x41\x1f\x13\xdb\xed\x16\x6d\x80\x2c\x71\x5b\xb6\xcb\x43\xd6\x54\xb6\x6a\xfb\xf4\x68\x97\x72\x36\xce\x04\x99\xd2\x4f\x1b\x89\xe2\xd7\xf0\xa9\x55\x2f\xf5\x32\x57\x0a\x61\x81\x7b\x06\x0a\x67\x05\x71\x7b\x76\xa5\x6d\xb1\x9c\x11\x2b\x32\xce\x6c\xba\xd9\x03\x59\x20\x2e\x4a\x3f\x6d\x0a\xae\xb7\xfb\xa2\x5d\x66\x5f\xe7\x4a\x65\xf2\xe4\xf8\x78\x46\xd5\x3c\x9f\x1c\x45\x3c\x35\xe1\xe6\x5c\xcc\xcc\x1f\xc7\x54\xca\x9c\xc8\xe3\x6f\xbf\xf9\xa6\xd8\xe2\x09\x8e\x1e\x66\x06\xae\xa4\xee\x77\x2a\x6d\xf9\x6d\xbd\xb0\xed\xfa\xa5\x1e\x04\x67\x63\xf2\x49\x13\xa9\xdc\x14\xc8\xe6\x5e\x12\x89\x06\x3f\xdd\x22\xb9\x60\x0a\x7f\x3a\x41\x1f\x29\x03\x01\xe4\x7b\x9e\x0b\x89\xce\xf0\xe2\x90\x4f\x0f\x53\xce\xd4\x1c\x7d\x84\xff\xb5\x3f\x3d\x11\xf2\x80\x7e\x26\x58\xd8\xfd\xb5\x25\x91\x7c\x75\xdd\x39\x86\x5c\x5c\x89\xc8\xa3\x5e\xe1\x6f\xfe\x03\xa5\xa6\xe5\x13\xf4\xf5\xf1\x37\xff\x81\xfe\x08\xff\xff\xff\x47\x7f\x6c\xd1\xd4\xd6\x83\xc2\x81\xc2\x99\x37\x65\x77\xdc\x41\x65\xa5\x36\xa8\x25\x7c\x2a\x78\xb1\x53\x8d\x2d\x3f\xd0\xe8\x81\x4f\xa7\x63\x45\x53\x62\x72\x83\xc6\x58\xd4\x60\x54\x37\xc4\x15\xa4\xb6\xf2\xa9\xa0\x06\x6e\xdb\xd5\x56\xb0\x9d\x9a\x4c\x68\x77\xdc\x64\x5e\x54\x7e\x84\x20\x90\x52\x35\x4d\x2a\xe1\x2b\x12\xeb\x53\xb1\x4e\xc0\x87\xb3\xce\xd4\xeb\xb3\x17\xc8\x01\x61\x35\x5f\x1f\xb8\x15\x46\x21\x9a\x40\x0d\xbb\x90\x8d\xc7\xa1\x16\x1e\xf9\xd9\xc4\xbc\xc1\xd4\x5e\x2b\xde\x4d\xd6\x3a\x5f\x1d\xea\x76\xcb\xc5\x56\xf2\xf2\x03\xa9\xc5\xdc\x76\xac\x23\xe2\x6a\x48\x86\x75\xa5\x21\xe9\x94\x0b\x8f\xef\x69\xf4\x5a\x5b\x6d\x6c\xb5\x15\x8a\x0a\x13\x1c\xd4\xed\xd0\xeb\xa9\x9f\xf9\x4f\x56\x0d\x13\x22\x85\xdc\xdb\x45\x1d\x25\x18\xad\xbe\xe2\x34\x4b\x6c\x18\x71\x03\x08\xd8\xaa\x0d\xbd\xf5\x79\xdf\xd0\x38\x84\xad\x41\xc8\x3e\x73\x92\x89\xcd\x49\x6e\xde\xcf\x5c\x44\xe4\x94\x6f\x17\xb6\x98\x50\x56\x8b\x77\xee\x5e\xa2\x23\x28\x56\x6e\x8a\xb1\x38\x9c\x4c\x1e\x17\xc2\x9e\x31\xeb\x5a\x74\xf6\x00\xa0\xaf\x3c\x1b\x00\x7a\xda\x05\x06\x5c\x0d\x33\x7c\x0b\xae\x6d\x0c\x7f\x05\xc3\x73\x90\xf3\x15\xa4\x79\x81\x35\x2f\xdc\x10\x36\xcf\xd4\x0e\x39\x40\x02\x43\x1c\x9b\x9a\x63\x66\x54\xc2\x29\x8e\x28\x9b\x1d\x04\x88\x69\x90\xf8\x1d\x72\xe0\x26\xba\xb8\xc3\xf2\x61\xb7\xb1\x59\x5b\xd7\x52\xa3\x71\x51\xcf\xc7\x62\x1c\x18\x5b\x30\xad\xc1\x45\x29\x2c\x1f\xda\x40\x3e\x6a\x08\x43\x4b\x46\xe7\x97\xc2\xe1\x12\x2d\x1b\x9f\x4b\x24\x25\xa1\x08\x0a\xf0\xe1\xae\x8a\xa6\xc5\x1b\x73\xb9\x40\x18\xee\x4d\x9a\x90\xb8\x0a\xb4\xb7\x64\xfc\x72\xce\x85\x1a\x6f\x08\x51\x58\x4d\x86\x65\xe4\x30\x01\x58\x06\xfe\x48\xc4\x23\x25\x4f\x65\xa4\xbf\x75\x68\xd1\xd8\x19\x82\x40\x24\x80\x82\x4b\xb5\x26\x1d\x1b\x7b\x37\x5b\x18\xde\xa4\xcf\x33\x96\x0f\xd2\xd7\x14\x44\x32\xc5\x49\x72\x80\x04\xc9\xa5\xa9\x69\x29\x49\x32\x3d\x74\xa8\xec\x31\x4a\xf8\x8c\x46\x38\x41\x93\x84\x47\x0f\x72\xc4\xf4\xdd\xcc\x66\x86\x2f\x64\x82\x47\x44\xca\x40\x98\x29\xf2\x5c\x6d\xf6\x11\x14\x14\x54\x44\xa4\x94\x51\xa9\x68\xe4\xa4\x94\x22\xb5\xdc\x94\x8f\xd5\xea\x65\xc4\x4d\x19\x44\x18\xae\x16\xae\x88\xc1\x89\xcb\x99\xad\xdf\x01\x37\xa4\x85\x7f\x72\x71\xb5\x6d\x07\x68\x07\x68\x56\x8e\x42\xc6\xaa\x7c\x20\x57\x1c\xa9\x53\xfb\x19\x1c\xe3\x65\x24\x70\x53\x3e\x51\x9e\x20\xfd\x49\xf3\x20\xc9\x8e\x2e\x8b\xa8\xe1\x92\xb0\xe0\x83\x69\xf7\x0c\x5c\x07\x86\xdc\x02\xa9\xb3\x8a\xa6\xf5\x2a\x82\x94\x01\x25\x63\xaa\x8e\x46\xca\xa2\x24\x8f\x7d\xd1\x30\x7d\xeb\x3e\x6a\x22\x71\xcb\xa3\xd7\x5e\xdf\xcd\x07\x08\x4b\xf4\x44\x92\x44\xff\xd7\x04\x0d\x1f\x7a\x0c\x6f\xcd\x92\x0d\xce\x3a\x74\xe2\xb8\x74\x2b\x45\xc1\x24\xf6\xa4\xd6\xa5\xbf\xb7\xd7\xe5\xcc\x2b\x25\x33\xbd\x3c\x6b\x72\x68\xbd\xd2\xad\x78\x87\xa5\xb1\x95\xc9\x16\x80\x5b\xda\x07\xd5\xd1\x00\x24\x9a\x32\xa4\x0d\xc5\xc1\xd3\x47\x5a\xd4\x75\xb5\xbd\x2d\x35\x10\xe9\x19\x75\xb2\x0e\x85\x44\xb1\xb1\xc5\xb3\x32\x95\x1a\xd2\x00\x35\x05\xc1\xcd\x84\x40\x4d\xc8\xa3\x88\x90\xb8\x31\xbe\x54\x8f\x68\xef\xf0\xfc\xae\xb1\x9a\x9b\xa4\xf5\x94\x2b\x53\x56\xd0\xe0\xf9\x39\xcb\x95\x01\x80\x9b\x24\x7c\x02\x17\x12\x40\xfd\xb9\xa4\xd7\x20\x61\xce\xcc\x9b\xc4\xe8\xcb\xe0\x7e\xf1\x80\x0a\x5f\x35\x03\xcf\x95\x56\x64\x0f\x60\xfe\xaa\x26\xb3\x56\xb0\xbf\x72\x65\xac\x23\x74\x5d\x41\x01\x09\x2b\x4b\x63\x7d\x6d\x2c\x45\x94\x79\x25\x68\xc0\xca\x24\x9e\x6f\x87\xd6\x84\x06\x2c\xf5\xb9\x03\x68\xc0\xca\x3c\x5b\xa2\xf2\xf9\xec\x59\xb3\x89\xf5\xa4\x2e\x78\xf7\x14\x2f\x83\x46\x65\x44\xbc\x12\x09\xba\x03\xb9\x68\x22\xc4\xfd\x82\x3d\xac\xd4\x8f\x7b\x5d\xd8\xc3\xca\x60\xf6\x19\xf6\xb0\x32\xd4\xfd\x85\x3d\x6c\x18\x68\x07\xd8\x43\xe3\xb6\x1f\x6b\xa2\xee\xc6\x14\x20\x65\x65\x92\x4f\x6f\xe1\xde\x5d\x3a\xc6\x53\x13\x12\x60\xae\x31\x27\x4a\x5a\x14\x60\x18\xad\xcd\x6e\x6c\x0b\x74\xc2\x72\x2b\xda\xf3\x7e\x35\x2a\x8d\x21\x21\x4b\x30\x2b\x5f\x1d\x50\x22\x5e\x90\x48\x93\x9f\x61\x54\x4a\x60\x26\x61\xaa\x07\xd6\x5c\xa7\x47\x61\x2c\xd4\x11\xce\x6c\xb6\x78\x5b\x71\x8e\xfd\xc9\x8b\x5d\x0f\x51\x12\x80\xee\x4a\xac\xbe\x13\x4c\xd5\xc7\x0a\xbe\xfd\x9c\x3f\x59\xc9\x11\xc8\xcf\x10\x63\x2b\xe9\x41\xa7\x63\x6b\x53\x68\x5b\x31\xca\x14\x99\x55\x45\xfa\xe2\xb0\x50\xa6\xfe\xfc\xed\x4a\x0e\x64\x70\xfc\x9c\xf5\x22\x40\x99\xb7\xd0\x21\xbe\x9e\x0d\x89\x6d\x91\x7b\xa9\xb5\x6b\x3d\x1d\x73\xa3\x4a\x94\x62\xea\xf4\xfc\x5c\x82\x73\x6e\x4e\xe5\x88\x99\x04\x2e\x5b\x5b\xed\x08\xbd\x87\xd2\x99\x38\xcd\x12\x72\x80\xfc\xfc\xa8\xa6\xa0\x51\xfe\xf5\xd7\x7f\x26\xe8\x6b\x94\x12\xcc\x4a\x26\x16\xd0\xea\xf5\x95\x07\x40\x71\x6a\x4e\x46\xac\x71\x2b\xd0\xf0\x93\xa9\xc6\xe3\x22\xf8\xce\xd9\x94\x3b\x93\x0d\x94\x84\xc3\xd1\x1c\xc9\x7c\x62\x6a\x9a\x06\x26\x36\xa7\xe7\x5d\xf0\x19\xb8\x9e\xe1\x26\x76\x83\xde\x18\x20\xb3\xc2\x70\x3a\x02\x64\x96\xa6\xd6\x03\x64\x36\x9f\xbe\xbd\x05\xc8\xac\xec\x79\x37\x80\xcc\xa6\x2d\xdf\x00\x20\xb3\xd4\xcc\x67\x03\x90\x59\x59\xd1\xcf\x06\x20\xb3\x32\xaf\x1e\x20\xf3\x33\x01\xc8\x5c\xcd\x47\x1a\x21\x20\x9b\x0f\xef\x7a\x10\x90\x8d\xfa\x55\x3b\x8b\xd8\x16\x6f\x07\xa4\xb9\x17\x86\x80\x2c\x4d\xa0\x0f\x77\x5b\x3f\xdc\xad\x91\xf8\x6c\xdf\x7a\x78\x2e\x06\xae\x7a\x91\x75\x04\x81\x2c\xed\x4f\x67\xd3\xe7\x2e\x28\xf1\x79\x03\x2c\xc1\x03\xd3\xd5\x1c\x32\x28\xad\xa2\xb4\xd0\xb1\x5a\x32\x72\xe0\x5d\x46\x73\x0a\xdd\xf9\x3d\xe5\x6e\x10\xa8\x59\x59\x5e\xef\xb3\x31\xb4\xb8\x4b\xe3\x7c\x43\x5d\xf4\x2d\xe8\xd5\xe5\xb2\xad\xe9\x1c\x71\x83\x00\x27\x49\xb3\x61\x90\xa6\x74\x57\xcd\xae\xba\xc8\x3c\x34\x11\x68\x53\xb5\x34\x3d\x7d\x3d\x99\xe1\x18\xd9\xb8\x92\x9d\x08\xb8\x09\xe6\xcb\x19\x95\x4a\xb4\x86\x2a\xd5\x46\xb8\x8d\x1b\x36\xcb\x37\x01\x41\x99\x6d\xf6\x59\x4a\x52\x2e\x56\xc5\x49\x35\x7e\x69\x2b\x3a\x6c\xf2\x29\xc9\xe6\x24\xd5\x42\xd0\x78\xdd\x46\xba\xee\xb7\xcf\xe1\xb4\xa9\x44\x26\x6e\xb1\x44\x04\x81\x93\x55\xbf\x1b\x1b\x80\xc0\xce\xdb\xbd\xed\x36\x5b\x08\xc3\x35\xad\xf8\x0e\xc2\x75\xb9\xb5\xc4\xbe\x54\x72\xa5\x03\x7d\x37\xc6\x8b\xf8\x70\x9d\xd5\x11\x21\x4b\x62\x41\x96\xc1\x00\x15\x5f\xd9\x7a\xa7\x6b\x84\x09\xd4\x5d\xa8\x61\xb1\xcb\xf5\x83\x47\x5a\x40\x2c\xeb\xcb\x03\xbe\x65\x49\xc4\x61\x28\x51\x97\x06\x53\x5f\xaf\x12\x95\x38\x4d\x6c\x0b\x22\xc9\x45\x6b\xd0\x68\x17\x2b\x64\xa4\x72\x9c\x80\x9a\x17\x16\x69\xab\x6e\xea\x64\xd1\x90\x85\xd6\xcd\xcc\x4d\x99\xfa\xcb\xbf\xaf\xb5\x9b\x5a\x25\xb1\xeb\x06\x85\x65\x70\x14\x11\x69\x0c\xa3\x36\xa8\x18\x4f\xf8\x23\xd4\x94\xd9\x66\x57\xf5\x51\xd6\xf3\xd6\x0c\xde\x23\xc3\xc6\x05\xa9\x1b\x71\x61\x2e\x78\x3e\x9b\x3b\xdb\x8b\x3e\x33\x7a\x6a\x4d\x7b\xf9\x63\xcd\xc0\xb9\xf6\x5e\x7e\x97\xd3\x64\x33\xcb\xd6\x6d\xa9\xda\xce\x87\xf3\x3b\x24\xe7\xfe\xb4\x4e\xa0\xd9\xc6\x8d\xad\x0f\xba\x7b\x9f\xf6\x5b\x6f\x64\x87\x6e\x0e\x1c\x1a\xe2\x94\x27\x09\x98\x89\x25\x49\x1f\xc3\x22\xd9\x61\xf7\x30\xe1\x3b\xba\x61\x69\x78\xf8\x1a\x9c\x4d\x52\xe1\x34\xeb\x24\x7f\x5d\x1b\xd1\x50\x22\x37\xfa\xaa\xa7\xd9\x84\xc1\x71\x46\x58\x93\x6d\xea\xa7\x7a\x8d\x88\x37\x16\x8c\xe8\x22\xd3\x76\x16\x90\xe8\x96\xe4\x85\x83\x12\x57\xcc\x63\x5f\x03\x13\x2b\xcc\xce\xc7\x09\x16\xd7\x8c\x8b\xf6\x30\x8a\xcf\x40\x2f\xf1\x88\x0d\x4a\xe9\x11\xae\x20\xec\x64\x51\xc4\x57\x1b\x1d\x22\x64\x66\x80\xee\x6f\x0d\x2b\xe0\x03\xd1\x7f\x81\xa6\x63\xb0\x44\x4d\xb8\xa2\x0b\x49\x84\xe0\x70\x12\x1f\xe2\x68\x11\x25\x34\x0a\x74\xe6\x99\xc0\xd9\xbc\x89\xe3\xb9\x9d\xef\x41\x50\x5e\x0b\x04\xa5\xad\x64\xcd\x3a\xe1\xe0\x8e\xae\x18\x4e\x49\x0f\xce\xd2\x04\xce\x72\xe0\xe1\x07\x58\x51\x7c\xe7\x15\xb3\xda\xeb\xe7\xae\x47\x68\x79\x05\x84\x96\x4d\x0e\x5f\x01\xbf\x52\x3a\x76\x3d\x6a\xcc\xbb\x4e\xa8\x31\xfe\x12\xdc\x2b\x20\x90\xf6\xf3\xf8\xca\x00\x13\xf5\x81\xbd\x26\x4a\x4c\x83\xb8\xb0\x8e\xdc\xb4\x0c\x26\x66\x19\x5d\x74\x5a\x97\xd7\x05\x6d\x59\x6f\x65\xd6\xc2\x63\x69\xbc\xbb\xf6\x04\x9d\xa5\x7d\x1b\xf6\xe4\xdc\xec\x32\x63\x66\xbd\xea\x82\x61\xd6\xcc\x3a\x0a\xd6\x7a\x09\x34\x9e\x1e\xde\x56\x12\x4d\x51\xda\x69\xb3\x44\x9a\x81\xf3\x41\x13\x81\xe6\x3c\x89\x4d\x98\x57\xb0\x5a\xbe\x03\x1f\xbe\xed\x17\xc8\x6d\xc6\x6d\x46\x22\xa3\x6d\x15\xf5\x99\x96\xa5\xcb\xf8\x4d\x7c\xeb\x29\x33\x81\xfc\xbb\xdb\xb4\x99\x70\x65\x37\x4d\x9d\x59\x31\xb8\x65\xa2\xc7\x86\xe9\x33\x41\x8f\x4b\xbd\x74\x6e\x76\x9d\x3c\x75\x55\x62\xd9\x20\x88\xaa\x56\x48\x6b\x7b\xac\x96\x14\x7f\x1a\x67\x58\xe0\x24\x21\x09\x95\xe9\xb3\x45\x72\x9e\x96\xdd\xb5\xfa\xac\x0a\x6e\x4c\x44\x2c\x4f\x27\x86\x14\xdd\x40\x6c\xf9\x3e\xc5\x91\xc8\x59\x88\x34\xe5\x37\x06\xb9\xf2\x6e\x39\xdc\x0b\x60\x55\x8a\xe6\x50\x2b\x72\x8a\xa9\x60\x44\xb6\x56\xe6\x23\x51\x2e\xa8\x5a\x8c\x6d\xa1\xc3\xee\x07\xee\xd6\x7e\x79\x6a\x3f\x5c\xee\xe1\x76\x49\xfa\xae\x3f\x5f\x58\x31\x23\x02\xaa\xb6\xb8\xfa\x23\x41\x31\x47\x0b\xc2\x40\x7c\xe9\x17\x88\x5d\xad\x5d\xdb\x6d\x31\xd7\xf8\x69\x1c\xa4\xc1\x8c\xa3\x2a\x71\xac\x3a\xac\x4d\x30\x40\xcb\x26\xf9\xcc\x40\x38\x2d\x5e\xe4\x67\x28\xfa\x60\x63\xdd\x4d\xd3\x7a\xc0\x81\x2b\x18\xec\x95\xc5\xc6\x04\xb9\xf4\x56\xa9\x6a\x19\x27\x66\x8c\xab\xe6\x72\x5f\x4b\x06\x3b\x08\xbe\xea\x30\xe2\xa0\x93\x1d\x0d\x5b\x1f\x74\x21\xf2\x4c\xd1\x49\x1d\xa9\x46\xed\xae\x08\xe4\x20\x81\x14\x6e\xe7\x66\x28\x75\x6b\x2a\x43\x96\x38\xb1\x9d\x9d\x96\xff\x2d\xac\x93\x03\xfc\xa1\x6c\x96\x90\x52\xf2\xd5\x55\x4a\x81\x0a\xcd\xf9\x01\x03\xb4\xa6\xce\xb2\x6d\xf6\x0b\x17\xee\x81\xa1\xbe\xa4\x31\x11\x1d\x8d\xd8\x40\xa2\x27\x82\x18\xb1\x88\x10\x0d\x95\x23\xbd\x55\x1b\x4a\xf1\x4c\x88\xee\xc9\xc7\xa6\x68\xe1\x81\x2a\xe9\xab\x41\x99\x3e\xa6\x38\x91\xe4\x40\x37\x0c\x45\x24\x15\x87\xa0\x49\x8c\x9e\x04\xce\x32\x22\x46\xcc\x86\xe0\x83\xc3\x85\xf3\xc4\xb4\xdf\x16\x1a\x6a\xd7\x80\x8c\x23\x1c\xcd\x5f\x68\x8f\x30\x64\x50\x44\x73\x12\xbb\x5c\xe4\xf2\xf6\xb8\x79\x1b\x83\xf5\x1a\x9b\x75\x3e\x75\xd5\x8c\x0e\x6c\x27\x49\xa4\x39\x8a\x2f\x6e\x9b\x11\xa1\x47\xad\x69\xf8\x91\x30\x44\xa7\x6e\x1c\x36\x76\x07\x3d\x81\x67\x4a\x93\xfe\x23\xa6\x89\x49\xee\x77\x5d\x3b\x21\xd0\x98\xdf\x47\xcc\xb8\xbb\x59\x54\x4a\x2b\xa4\x8c\xca\xb9\xe6\xd4\x39\xf8\x24\x41\xcd\x58\x4b\xf2\x8c\x63\x59\x36\x32\x1a\xf5\x8d\xfe\x56\x32\x6f\x1c\x96\x52\xa6\xa2\x00\x8d\x07\x82\x25\x5d\x41\xa5\x65\x72\x66\x1f\x7a\x5f\x0f\xbd\x6f\x5e\x9b\x7d\x0c\xbf\xf7\x87\x65\xdd\x10\xfc\xb6\xed\xdf\x85\x04\xb9\xc3\x50\xfc\x57\x8e\x59\x7f\x9e\x70\xf5\xd7\xcd\x2f\x78\x8e\xd4\x82\x3e\x00\xff\xed\x05\xe0\xb7\x1f\xdb\xb5\x82\xf0\x57\x00\x32\xb9\x5e\xb6\x8d\x78\xf6\x08\x3d\xcf\x1a\xf5\xec\xa3\x36\x82\x2f\x3a\x46\x3e\x17\x10\x42\x7d\xf4\xf3\x33\x45\x3f\x37\x2c\xf1\x7a\x11\xd0\x1b\xd9\x56\x5e\x3e\x38\xb3\x5a\x63\xff\x39\x03\x34\x57\x45\xc7\xe4\x93\xf1\xb3\x1f\xbd\xc6\x39\x77\x3d\x81\x3f\x79\xa2\x30\x22\x91\xd0\x74\x36\x21\x71\x0c\xf6\x7b\xc5\x6d\x85\xd4\x82\x76\x9c\x1e\xa6\x99\x2f\x96\x9a\xd8\x71\xc2\xd9\x4c\xd2\xd8\x40\x11\x98\x5a\xfc\x25\x2d\x11\x52\x70\x61\x7f\x93\x84\x08\x67\xfe\x15\xe8\x4b\x49\xb5\xdc\x1f\x98\x84\x05\x8a\x39\x91\xec\x0b\x65\xb4\x32\xcc\x16\xe8\x81\xf1\xa7\x84\xc4\x33\xd8\xa1\xea\x60\x0e\x11\x25\x07\x88\x2a\xff\x99\x80\x9c\x5d\x9e\xab\x91\x1e\x3b\x04\xf5\x18\x11\x90\xd8\x6f\x83\x5a\xc0\xbe\x99\xaf\x8e\x10\x3a\x67\x68\x8a\x23\x75\x80\x64\x3e\x29\xda\x8f\xb9\x29\xee\xaa\xd5\x9c\x60\xe2\x45\x23\x7d\x70\x6e\x43\xe7\xcd\x67\xc3\x71\x07\x4d\xae\x83\x84\xe2\xad\x82\x98\x1e\xf1\x36\xd0\x8c\x1f\x73\x69\xbd\xdd\x88\x33\x7f\xf4\x2d\xf8\x88\xc7\xd6\x85\x8a\x9c\x06\xa7\x96\xf1\xb8\xd5\xa8\x54\x99\xca\xba\x63\x29\x22\xce\x6c\x21\x50\xeb\x11\x80\x76\xcd\x72\xc7\xfc\x89\x49\x25\x08\x4e\xad\x15\x56\x5f\x35\x10\xad\x60\xe2\xcd\xf4\xe8\xa9\x30\x22\xc6\x3a\x5b\x7c\x41\xd9\x83\xde\xdd\x02\x4d\x18\xea\x2a\x43\xcf\x4d\x9b\x96\xe9\x1b\x8f\x9c\x72\x66\x3c\x31\xdb\xec\x9f\xa4\x33\x86\x93\x35\x95\xdc\xda\xca\xd5\x9d\x27\xce\x78\x65\xc5\x05\x2d\x45\x18\xab\x0a\x32\x3d\xae\x65\x44\xa8\xcc\x37\x74\xdd\x60\x14\x93\x8c\xb0\x98\xb0\x68\x01\x24\xc2\x00\x57\x42\x30\x9c\x20\x0c\xdf\xe1\xe4\x08\x9d\x99\x44\x06\x2f\xe1\xd9\x6b\x1d\x2e\xf4\x14\x33\x3a\xd5\x82\x22\x58\xbb\xec\x28\x47\xcc\x0c\xd3\x19\x9b\x83\x62\xd5\x7e\xc5\x1a\x76\xe6\x3b\xca\x70\x29\x73\x64\x83\xf3\x94\xe4\x6b\x05\x07\x07\x66\xab\x45\x1b\xc4\xb6\xc2\xab\x50\xaf\xd7\xd8\x0c\x24\xa1\xcc\x37\xd2\xdd\x21\xb8\x32\xcd\x22\x61\xa4\x30\x58\xb4\xe7\x24\xc9\x82\x52\xb9\x19\x16\x4a\xba\xa3\x6d\x70\x52\xf5\x2d\x93\xe6\xcc\x20\x54\x18\x4b\xc3\x93\xc5\xa2\xb4\xce\x8c\xa2\xf1\xa3\x11\x3b\x57\x5f\x48\xcd\xf9\x38\x9b\x25\x0b\x84\xe3\x47\x2a\x0b\xcc\xed\x88\x33\x99\xa7\x44\x54\x2a\xd0\x5b\xbc\x5a\xec\x48\x53\x8f\x4d\xcb\xfc\x8f\x38\xa1\xb1\xee\xd6\xc8\x18\x33\x34\x21\x53\x2d\x3f\x65\x58\x48\x67\x11\x6b\x70\x69\xda\xcd\x8d\xf5\x5a\xbd\x1a\xb7\xfc\x31\x64\x88\x28\x2d\x78\x27\xb6\x3a\xf0\x71\x95\x73\xda\x55\x5f\xc2\x35\x27\xb5\x49\xa1\xe5\x02\x8e\x5d\x85\xb3\x55\x10\x2a\x0e\xc6\x2b\x37\x21\x2c\xba\x1f\x27\x4b\x9b\xc1\xad\xc5\x01\x2a\x13\xb4\xa3\x36\x86\xd6\x90\x6b\x12\x0a\xc2\x85\x54\x58\xd1\xc8\x8a\xed\x5c\xd8\x8b\xc3\x5e\x2c\xed\x5b\x7b\xb6\x25\x6a\xb1\x8c\x70\x52\xdf\xe1\x25\x5e\x33\xf3\xfe\x72\xde\x6a\x8f\x9b\x69\x7b\x69\xd2\x4a\xc4\x93\x64\x1d\x44\xed\xca\xcc\x4f\x8b\xcf\x97\x8f\xa8\xe8\x47\x6f\x80\xdb\x0b\x38\x35\xc6\xf7\x88\x13\x2b\xa1\x4a\x65\x77\x29\x7c\xc9\xdc\x6e\x0b\xeb\xdb\x1c\x31\x3e\x35\x05\x51\xdb\xbc\x92\x99\xe0\x29\x5d\x07\xda\xcd\x38\xea\x6e\x5c\x14\xe1\x0a\xe1\xcd\xc5\x1a\xea\x53\x64\xc9\xcb\xf6\x08\xf1\xe6\x98\x19\x79\x75\xc9\x19\x4a\x71\xb6\xd1\x82\xaf\xb2\xb6\x0c\x50\x6a\x4c\x5d\x76\xf5\x00\xb2\x97\x00\x7c\x39\x2c\xf2\x13\x5e\x14\xa9\x3d\x6d\xa0\x5d\x6c\x2d\x72\xb8\xd7\xaf\x9f\xb3\x29\x5f\xe3\x70\x16\xa9\x38\xf6\xf4\x61\x47\xb3\xc1\xf9\xf3\x31\x9d\x66\xf7\xcd\x9a\x76\x39\x8f\xa7\x4d\x44\xbd\xf6\xc9\x74\x2b\xf8\x9c\xaa\x5f\xc8\x44\x42\xad\x6f\x9d\xbb\xb5\x7c\xb4\x82\x16\x11\x0c\x67\xf9\x52\x7d\x2c\xd1\xe1\xce\xd7\xa8\xd2\x0e\x32\x16\x06\x17\x0c\x74\xdd\xdc\xea\x0b\xac\x99\x3d\x24\x9d\x16\x6b\xcb\xdc\xc3\xf5\xc0\xc7\x5c\x8f\x1e\x72\xac\xf9\x84\xae\x44\x56\x5d\x47\x57\x9c\x6a\x49\xc8\xa8\x0f\x45\x64\x81\x0d\xb1\x9e\xd2\x84\xc8\x23\x74\xde\xa0\x37\xba\x00\x67\xef\x10\x34\xa1\x5e\x4e\x7a\xca\x05\x0d\xea\x0c\x39\x19\x09\x51\x00\xef\x0e\x6d\x67\x82\xe8\x31\x47\xc6\x77\xc7\x0d\xd2\x18\x44\x57\x09\xaa\x79\x96\x11\x56\x15\x48\xd1\x9a\x17\x50\x9b\x5e\x6e\x64\x78\xff\x01\x37\x3e\x6f\x6c\x4b\xa9\x15\xa3\x6a\xd9\xd2\x5d\x54\x1c\xe8\x1e\x3f\xee\x7a\xbd\xd3\x5f\xd4\xf7\xa6\x71\x84\x77\xe5\xd6\xd7\x1e\x9d\x97\xf2\xd7\x77\x44\xbe\x87\x4f\x9d\x55\x14\xa3\xa9\x20\x60\x38\x4f\x7d\x4e\x28\x8b\x89\x90\x8a\x73\xb8\xef\x6e\xcf\x7e\x38\xbe\x3f\x47\x44\x45\x28\xa1\x0f\x64\xc4\x22\xf9\x78\xa0\xc5\xe3\x5f\x73\xa2\xf4\xcf\x2d\x86\x16\x9a\x12\x26\x81\x13\x50\x55\xcb\x9d\x6f\x5e\x48\xb7\x30\xfa\xbf\x67\xe5\xef\x97\x90\x7c\x2d\xfd\x05\x68\xd7\x61\xc1\x03\x99\x02\x8e\xb0\x59\x5a\xd9\x40\x31\x46\xc5\x1b\x36\x15\x67\xda\x20\xdc\x95\xfd\x23\x67\x6b\x0a\x5d\xa7\xc5\x47\xc1\x28\x5a\x64\xba\x34\xc3\x00\xb4\xb7\x5e\x1c\xad\xf9\xa6\xb1\xf5\x55\x4c\xa4\x48\x2b\x72\x2a\x7b\x51\xc7\x0a\x29\x41\x08\xb0\x10\x4f\x4f\xf6\xae\xb7\x99\xa4\x7e\x62\xc1\x47\x47\x23\xf6\xd1\x19\xf2\x8b\x5f\xa5\x6b\xc2\xc4\x66\x7b\xfc\xc1\x72\x2b\xd0\x6c\x4c\xa5\xff\x01\x50\xa4\x65\x9e\x28\x53\x60\x65\x4a\xb5\x96\xee\x06\x6a\x9e\x34\x71\x09\x81\x59\x34\xbf\xdc\xb2\xce\x0a\x9d\x8e\x49\xb2\x8e\x24\x7a\x3e\x1d\x26\x52\xd3\x77\xf4\xd0\x72\x3a\x37\x29\x21\x54\x4c\x06\xe4\x40\x57\x13\xc1\xe8\x38\xc6\x7a\x9c\x98\x02\x27\x04\x81\xe9\xb7\x1a\xfd\x6c\x12\x1c\xf5\x2e\x5a\x49\xdd\x58\x7e\x4d\xd8\xa1\x0f\x29\x82\x5e\x10\x56\x23\x26\x72\x06\x08\xb7\xde\x11\x84\x91\x24\x82\x1a\x8f\x4c\xe4\xcc\x32\xd6\x48\x36\xd3\x6c\x42\x4b\x7e\xe0\x0d\xe4\x0c\xf4\x33\x9e\x4b\x88\x60\x4c\x89\xd2\x17\xd4\x97\x50\x96\xcc\xb8\xe2\x0e\x50\x26\x68\x4a\x15\x7d\x24\xf2\xab\x86\xad\x3b\xc5\x0a\x27\x7c\x36\x10\x8a\x4e\x71\xa4\xee\xf0\x56\x1a\x38\xb6\xcd\x6c\x1a\xd6\xe1\x86\x81\xce\xcf\xf4\xe2\xcf\x08\x23\x02\x26\xaa\x75\xf2\xe6\x23\x0c\x4f\x36\xe2\xdc\x50\xd3\x23\x32\x55\x10\xa4\xb7\x58\xe0\x5c\xf1\x54\xeb\xb7\x38\x49\x16\x50\xdd\x40\x3f\x99\x63\x39\x77\x1b\x6d\xc2\x90\xba\xdc\x4d\x76\x71\x4f\x71\x34\x27\xb7\x0a\xab\xbc\xd1\x18\x5c\x19\xe5\x3b\xc2\xf2\xf4\xdd\x09\xfa\x9f\x62\x8e\xa7\x83\xd3\xef\x87\xe3\xb3\xf3\xdb\xc1\x77\x17\xc3\xb3\x60\x3e\xf6\xc9\xc7\xf3\xdb\xdb\xfa\xaf\xdf\x9f\xdf\xd5\x7f\xbc\xbe\xba\xbe\xbf\x18\xdc\x35\xb5\x72\x71\x75\xf5\xc3\xfd\xf5\xf8\xfd\xe0\xfc\xe2\xfe\x66\xd8\xf0\xe9\xfd\x5d\xfb\xc3\xdb\x1f\xce\xaf\xaf\x87\x67\x6e\x55\xfe\x1e\x9c\x2e\x08\x4f\x82\xd0\xc1\xe6\x69\x54\x0f\xe0\x21\x2a\xbf\x78\x82\xee\xab\xb8\xab\x36\xc6\xc7\xe4\x61\x3e\x61\xa9\x79\x18\x84\x72\x8d\x18\x72\x9f\xeb\x45\x69\xfb\xd4\x78\x41\xa3\x39\x41\x09\xe7\x0f\x79\x66\x59\x9b\x49\xe6\x60\xdc\x18\x7e\x88\x0c\x5a\xfb\xfe\xfc\xee\xa4\x8e\xff\xea\x1b\x0b\x10\x1f\xdc\x19\x80\x71\x61\xc7\x4e\xc1\x96\x92\x09\xf2\x08\x87\xd5\x9b\x4a\x83\x1e\xfc\xce\x2c\xeb\xc7\xb4\x86\x99\xaa\x74\x13\xc7\xb6\x06\x9d\x9b\x58\xd0\x70\x79\x5f\x97\xad\xa6\x5f\x0e\x03\x78\x8f\x26\x24\xc2\xb9\xf1\x15\xeb\x7b\x4a\x08\x2e\xc2\x01\x17\xf4\xb0\xbb\x46\x2d\x1d\x35\x36\x58\xd9\x33\x3d\x71\xf9\x40\xb3\x8c\xc4\xef\xea\xf2\x4b\xb9\x58\x99\x84\xd3\xa7\xfb\x0c\xce\xa4\xd6\xeb\x41\xe7\x77\x68\xcd\x73\x8b\xaa\x4f\xa5\xf1\x87\x15\x1e\x42\x00\x22\xd4\x77\x82\x47\xd5\xa5\xe0\xbd\xc6\x0a\x3d\x11\x48\x09\xca\x2d\x5c\xbd\xd1\xbd\xf5\xd9\x86\xee\x8c\x27\xc3\xd5\x48\x29\xa5\x0a\xb5\x32\xe3\x5d\x08\xdc\xfa\x7b\x49\x9a\x18\xf1\x16\x79\x1d\x67\xa6\x51\xe0\xce\x2e\x94\x00\x46\xdc\xe2\x33\x72\xb7\x41\x83\x85\x7c\x89\x7c\x55\xbf\x91\x56\x5c\x16\x9a\x6d\x77\x19\x8f\xcb\x65\x2d\x01\x34\x76\x1f\x58\x09\xc4\x6f\xe5\x5a\xdd\xf1\x18\x2f\x34\x71\x40\x0c\x8f\xcc\xb3\x8c\x0b\x85\x5a\xda\x30\xde\x11\x33\x3e\xb8\x73\xec\x3c\x3c\x8f\x83\x46\xb4\x84\x21\x1b\x30\x94\xbb\xa5\xf7\xd9\x75\x2d\x18\x47\x08\x55\x02\x8a\xa0\x07\x5b\x4f\x4b\x2a\x75\x89\x42\x9b\x84\xdf\x6d\x22\xf7\x32\x7d\xc1\x77\xad\xfd\xd1\xd4\xfb\x95\x6b\xa1\x71\xcb\x13\x32\x55\xe3\x46\xaf\xcf\x12\x03\xa7\x6e\x91\xb5\x65\x44\xd3\xd9\x7c\x07\x2d\x76\xd7\x12\xbe\xb5\xfe\x52\xad\x1a\x04\x16\x02\xc1\xb9\x32\xf2\x69\xa1\xc3\x20\xb7\x9a\x60\x5e\xb0\x9d\xda\x58\x66\x2f\x04\x6a\x99\xff\x81\xf1\x27\xe6\x2d\xfb\xf2\x68\xc4\x86\x18\x8a\xf8\x79\x45\xc4\x85\x38\x83\x16\xb0\x52\xfe\x2f\x15\xe4\x7a\xd1\x20\x98\x76\x84\xb2\x82\xee\x6d\xf9\xd6\x64\x81\x8a\xa2\x6b\xa5\xef\xba\x9c\x1e\x63\xf5\x76\x22\xa0\x99\xb0\x2d\x17\xa4\x48\x66\x2d\xf3\x66\x9e\x85\x03\x15\xdc\xee\xba\xab\x23\xf4\x93\xb3\xfc\x40\x3c\x51\x51\xaf\x50\x99\x1b\x27\xc1\x0b\x07\x6a\xd4\xb4\xb0\xbb\xc0\x09\xda\x75\x84\xd1\xf2\x05\xf6\x80\x04\x0d\xab\x5c\x52\xc0\x19\x33\x16\xd9\x35\xc2\x29\x4f\xfd\x47\xb7\x64\x79\xbc\xf5\x7b\xa8\xfd\x63\x1d\xd6\x20\x74\xb0\x64\xf1\xbf\xcc\x66\x99\x4c\x0a\x87\xea\x6f\x6b\xb1\x58\x0f\xaa\x3e\x3f\xe0\x01\x34\x89\x16\x68\x4a\x93\x04\xe4\x80\x23\x34\x80\xd2\x79\x90\x88\xa0\xaf\x42\x17\xb5\x46\x67\x8c\xaf\x8a\xdd\x6e\x21\xa6\x28\x20\xa6\xdb\x76\x62\x92\x40\x4d\x45\x1e\xda\x6e\x28\x6a\x07\x39\xc9\x9a\xb7\xe0\x3a\xa2\x63\xf7\x4c\xe4\x35\x94\xf7\xd7\x08\x3a\xab\x0d\x37\xf8\xf0\x5f\xcd\x43\xff\x90\x63\x81\x99\x82\x50\x2a\x2b\xba\x0b\x12\x84\xf4\x92\x4f\x10\xac\xc8\x8c\x21\x18\x7e\x0a\x37\xd7\xb9\xfc\x67\x14\x12\x4f\xe2\x03\x44\x8f\xc8\xd1\x81\x2d\x28\x2e\xf3\x49\xf1\xe6\x5c\x4b\x0e\x23\x56\x0b\x11\x39\x42\x83\x44\x72\xfb\x05\x61\x51\x02\xa5\x2a\x83\xa8\x2f\x4f\xf9\xd6\xad\x34\x59\x80\x82\x02\x5b\x59\x34\xcf\xed\x83\xe0\xc3\x11\xc3\xd2\xf8\xc4\x13\x38\xe9\xc5\xef\x4d\xf5\x7d\x4b\x71\x12\xcf\x08\x47\x5c\xbb\x86\x9e\x6d\x93\x4c\x9d\x92\x65\x1b\x04\x6f\xc0\xc6\x14\xa1\x3b\x41\x06\x31\xfa\x12\x2b\x94\x10\x2c\x15\xfa\xe6\xab\xb5\x62\x43\xdc\x04\x0b\xee\x6a\x8f\x6f\x11\x80\xed\x22\x38\xdb\x8a\x94\x43\x1d\x29\x84\x11\x23\x4f\x61\xc0\x0e\x87\x18\xab\x47\x2a\x73\xa8\xfe\x19\xe4\x8c\x98\xfa\x8d\x26\xb3\x0c\x82\x60\x8d\xca\xd4\xc2\x47\x1c\x5c\x9f\x75\x9f\xda\x61\x35\x50\x96\x55\x9e\xa8\x51\xcf\x00\x52\xa2\x88\xa5\x9c\x63\x35\x62\x96\xb3\xba\xb0\x91\xa0\x52\xdb\x20\x49\xca\xf1\x8b\x18\x42\x74\x99\x9e\x30\xd4\x2e\x3d\xf2\x0b\x74\x09\xea\x97\x0f\x22\x2b\x17\x86\xf7\x87\x45\x6b\x6a\x23\xe6\xf3\xf5\xc3\xb6\x1b\xa5\x9d\x26\xfb\xf2\x0b\x0a\xc1\x0d\xdd\x5f\x98\x22\xb2\x1d\x84\x61\xd2\x34\xe4\x15\x07\xab\x6e\xd3\x5f\x22\x1b\xef\xba\x83\xee\xa2\x72\xb3\x7d\x1c\xae\xd9\x27\xde\x60\x6e\x6f\xd9\xdc\x40\xb6\xd8\x46\x01\xf7\xd1\x8c\x2f\xe5\xf1\x2d\x0d\xfd\x3c\x86\x5c\x8a\xd5\x5c\xb0\xc8\x4d\x70\xac\x03\x0c\xdd\x34\x0e\x42\xa5\x83\xc8\x4c\x08\xa5\x77\x8c\xcf\xbe\xd9\xe2\x79\xcd\xde\xf6\xf4\x0f\x8a\xf9\xbb\xa9\xf8\x20\xb8\xfa\xc4\xdb\x85\xbd\x41\xfc\x0f\x1c\x41\x00\x25\xf4\xe4\x42\x37\xeb\x80\x02\x0e\x86\x11\x83\x31\xbf\x51\x3c\xb4\xf5\xa0\x8f\xd0\x10\x2e\x1a\x57\x1e\x1a\x4f\x9d\x43\x22\x78\x79\xc4\xb4\x66\xe2\xf2\x8f\x83\xf6\xcb\x24\xde\x74\x02\x0c\x98\xc9\x56\xbe\x9c\x74\x35\xc6\x76\x9b\x36\xe1\xb0\x54\xa0\x0d\x80\xe5\x45\xc3\xd9\x09\x8a\x79\xf4\x40\xc4\xb1\x20\x31\x95\x27\xe0\x5b\x57\xad\x4e\xbd\x54\x6b\xdb\x5b\x4b\x1a\x6d\x81\x02\x2b\x72\x0d\x4e\x4d\xff\x36\x88\xde\x55\x33\x3b\x40\x74\x0a\xea\x84\x0b\x75\x35\x49\x36\x2e\x5d\x9b\x30\x25\x16\x19\xa7\x4c\x79\x53\x56\x65\x21\x9c\xa6\xa1\x85\xb6\xb6\x20\x6d\xb1\x8b\x18\x9c\x0d\xa7\x7d\x37\x27\x92\xb8\x80\x03\x33\x29\xc5\x91\xf1\xb2\x18\x76\x91\x61\x35\x97\x90\x11\x54\x5e\x03\xab\x74\xc1\xa7\x7a\x85\x70\x06\xf1\x0a\xc6\x4a\x51\x7c\xe4\xf3\x56\xa4\xa2\x49\x32\x62\x8c\x90\x58\x22\x48\xde\xf9\xa2\x31\xf3\x4c\x7f\x7a\x80\x70\x1c\xa3\xff\xfd\xe5\xfb\x8b\x9f\xef\x86\xe3\xf3\x4b\x30\x5a\x9f\x5f\x0c\xbf\x3a\xf0\x3f\x5e\xdd\xdf\xf9\x5f\x8d\x85\xe5\x91\x08\x94\xe2\x07\x50\xf1\x98\x34\xf2\x1f\x64\x77\x84\x23\x75\x39\x79\xfa\x89\x24\x2e\xd2\xd5\x8a\x29\x1e\x02\xc8\xee\x61\x6b\xb1\x42\x63\xf3\x5b\x43\xf9\xbd\xf1\x9f\x2c\xa7\x41\x47\x3c\xbe\x0b\x27\x06\xa6\x84\x41\x34\xb6\xb5\xf6\x15\xba\x6f\x41\x70\x84\xcd\x28\x6b\x8b\xc7\x23\xec\xf1\x39\x85\xf8\x1f\xc8\xe2\x47\xad\x5e\x5f\x63\x2a\x3a\xd3\xde\x90\x3d\x52\xc1\x19\x4c\xcd\x9b\xb5\xfc\x89\xd1\x7a\x3a\x96\xd5\x43\x25\x8d\x2c\x0c\x31\x1a\x59\x6b\xcc\x67\x13\x90\xc9\xab\x4f\xd7\xc2\x23\x90\x4f\x4a\xb8\xec\x4f\x8f\xc2\xe1\xa0\x08\xfc\x45\x53\xd0\xe0\x88\xdd\x5d\x9d\x5d\x9d\x20\x92\xe0\x09\x17\x90\x0d\x66\x42\x82\x5c\x13\x76\xc1\x22\x9e\x06\x0d\x95\x32\x7f\x0f\x50\x56\x64\xfe\x86\x46\xb4\x23\xd3\xc6\xaa\x2a\xc2\x5c\xd4\xf3\x66\x77\xab\x02\xda\xc9\x5e\x73\xd1\xe5\xfa\xd7\xaf\xc1\xd2\xf1\x4c\x2b\x72\x15\xce\x6b\xef\xe6\x29\xc1\xa6\x80\xa7\x71\x0b\x59\x5b\xbe\x0d\x60\x4d\x92\x52\x3d\x20\x7d\x70\xe4\x91\x75\xc1\x17\x6f\x72\x86\x7e\xf8\xab\x44\x93\x5c\x8d\x58\xb9\x0d\xce\xd0\xe0\xa7\x5b\xf4\x1d\x56\xd1\xfc\xab\x11\xbb\xd2\x6a\xe6\x0f\x7f\x6d\x81\x28\x58\x1b\x5d\x47\xaf\xc9\x19\x56\xf8\x82\xe3\x98\xb2\x59\x13\xb4\x4e\x81\x7f\x3e\xbc\x1b\x9c\xa0\x2b\xab\xc3\xfb\xac\xe2\x22\xd3\x2a\x68\x08\x18\x32\x4c\xc4\x71\x11\x60\xe5\xac\x0c\x3f\x62\x34\x33\xb8\xb0\x46\xec\xce\x60\x0a\x69\xae\x4a\x15\xca\xb8\xc5\xe0\xd7\x5a\x99\x41\x5b\x32\xa6\x6c\x6b\x49\xd4\xab\x03\x64\xec\x37\xc3\xca\x63\x20\xcf\xd4\x99\xfd\x88\x81\x82\xee\x33\x3d\x13\x1e\xe1\x04\x62\xf2\x0e\x03\x9b\x9e\x56\xdb\x79\x0e\x69\x77\x10\x0c\xc3\x16\xe5\xd0\x59\x9f\x09\xea\x85\xb2\x70\xa3\xc0\x00\x00\xfb\x68\xbd\xb1\x29\xd7\x1c\xc7\x60\x89\x80\xf1\x2d\x31\xab\xa3\x3f\xf4\xd8\x22\x66\x59\xf4\x53\xc7\x8f\xa0\xb0\xb1\x71\x2b\xe2\x08\xcc\xf7\x6c\x01\xe1\xdb\x00\x9a\xcd\x21\xf4\xa3\xe0\xce\x96\x28\x6b\xbb\xe8\xef\xc4\xe0\xb3\x11\x33\x91\x82\xa5\x7d\x09\xb3\xe2\x83\xde\x39\x83\x40\xc6\xe2\xba\xf4\x02\x46\x66\x03\x1b\xad\xac\x9f\x09\x72\x18\x13\x45\x44\x0a\xf6\x9e\x70\x4d\xf5\x0d\x7b\x84\x6e\x42\xf5\x3a\xe6\x51\x9e\x3a\x64\x40\x48\x4f\xb4\x11\x70\xf6\x12\xf5\x14\x62\x2e\xf6\x55\x14\x8f\x45\x34\xa7\x8a\x40\x56\x5e\x67\xfd\xd8\x10\xcc\x20\xfc\xb4\x2e\xa9\xb7\x0b\xbe\xc0\x3b\xb6\x8b\x5a\x33\x0d\x8d\xb3\x72\x4b\xa5\xd6\x56\x03\x9b\xad\x28\x74\x71\x59\xa0\x97\x71\x01\xc2\x16\xf9\x94\x71\x30\x72\x9b\x9c\x2a\x1e\x7f\x21\xd1\xf9\xb5\x96\x80\xb4\xc6\xeb\xcf\x60\x2e\x95\x09\x2e\x83\x74\x1d\xf3\xb5\x49\x17\x38\x40\x5f\x9b\x8a\xb3\x11\xfa\xe4\xfe\xf8\xcb\x7f\xfc\xc7\x9f\xff\xb2\x4e\x3a\x89\x53\xc8\xa1\xdd\x62\x8d\x7c\x39\x84\xb2\x48\x14\xee\x40\x9d\x53\x6d\xb1\x0b\xf6\x00\xb6\x2d\xff\x26\x28\x45\x41\xec\x10\x9e\xd9\x13\x2e\xc3\x93\x89\x4a\x47\xb3\x88\x24\x90\x44\x1d\x94\x39\x84\x17\x76\xad\x44\xff\xbf\x96\x80\x80\x8c\xf5\x51\xd9\x2c\xc6\x89\x26\x5e\xbc\xd6\x8d\xa0\x2f\xad\xfd\x4f\x81\x03\xf1\x2b\x77\xc1\xf1\x24\x26\xc2\x56\xab\x76\x26\x3b\x6f\x48\x04\xe6\x40\x3e\x65\x09\x8f\x1d\xbc\x97\x24\x19\x06\x01\x42\x33\x83\xa3\x11\x1b\xba\xe2\xc5\x06\x9e\xc2\x7c\x64\x3c\x2f\x53\x1c\x19\x54\x2b\x89\xbe\xfc\x74\xa2\x7f\x3b\x40\x8b\x13\x08\x22\x3d\x40\xbf\x9d\x58\x10\x02\x2c\xd4\x58\xff\xf4\x95\x93\xb5\x6d\x13\x30\x68\x2a\xd1\x17\xc7\x8f\x58\x98\x9a\x87\xc7\x66\x44\x5f\x58\xce\xea\xeb\xba\x84\xb2\x79\xc2\xf9\x83\x0d\xb0\xad\x7d\x78\xec\x00\x4d\x80\xbc\xbd\xdf\xc4\x6c\xbd\xcf\x77\x54\xe8\xd0\x96\x5e\x3e\xca\x26\xe8\xe8\x1f\x92\x33\x74\xb4\xc0\x69\x62\x7f\x75\x4f\x6d\xfc\x2f\x96\xc8\x15\xdf\x76\x41\x3e\xc9\xc2\x58\x4a\xbf\x4b\xf8\x04\x66\xf5\xd1\xcd\xd4\x44\xd0\xc2\x40\x8b\xdb\xa7\xb8\xb0\xec\x44\xac\x24\x65\x60\x19\x52\xae\xcc\x2b\xc0\xe3\x9a\x66\xf5\xc9\x0f\xe9\xbf\x8d\x5f\x18\x16\xc5\x25\xf1\x19\xe3\xb0\x8f\x5e\xd3\x8d\x7e\x42\x5f\x5a\x16\xf4\x95\xbe\x63\x6c\xb8\xb2\x59\x86\xa6\x0e\x16\xbe\x83\x9f\x83\x0e\x28\x43\x26\x2d\x73\xc9\x97\xbf\x1d\x1f\x1d\x1d\xf9\xaf\x2f\xf5\x54\xfe\x5f\x44\x95\x24\xc9\xd4\xb4\xe4\x6e\xb0\xc5\x88\x7d\x74\xc0\xc1\xce\x78\x5d\x40\x25\x41\xd1\xec\x88\x27\xe8\xb0\x30\xe8\xc6\x3c\x92\xe8\x0f\x5a\xac\x0d\x96\x12\x7e\xd4\x7a\x5c\x0b\x8c\x99\x41\x2a\x7c\xa1\x43\x65\x0d\xe2\xd5\x63\x15\xa2\xa3\x78\xc5\x16\xcb\x10\x85\x1a\x68\x41\x53\xce\xb1\x45\x50\x11\x42\xbf\x4c\x3e\x29\x78\xd4\x02\x50\xd3\x18\xca\xde\x7c\x53\xd6\xd8\x6d\x81\x53\x63\xc8\xba\x65\x01\x2c\x8c\x88\xe5\x0c\x66\x9e\x07\xa1\xfb\x44\x5f\x2e\x2c\x84\xb2\x95\x79\x9a\x62\xb1\x38\x2e\x4e\x5b\x9d\x38\x0b\x5c\x7a\xe0\x31\x89\x5b\x00\x70\xe1\x26\xf6\x68\xd9\x28\x06\x2b\x5e\xba\x1b\xcd\x9f\xdd\x08\x6a\xf1\x40\x40\x9e\xa9\x44\x45\x58\xc4\x63\x4b\xd7\x45\xf6\x69\x59\x62\xf1\xef\xd4\x65\x15\x17\x11\x23\x0b\x63\x1c\x53\x26\x33\xda\xbe\xe1\x3e\x6e\x61\xdf\x7c\x0c\x55\xdd\xc8\x6c\x0d\xf7\xe8\xf9\xd5\xad\xfb\xa6\xfb\xa5\x0b\xeb\x50\x16\xd9\xb1\xd3\x12\x9d\x45\x42\xe0\xa7\xe2\xfa\x85\xd8\x0e\x63\x9d\xc9\x7d\x6e\xae\xf9\xf7\x29\xbf\xa6\x89\xbe\xb5\x80\xc6\x8f\x46\xac\xf4\xf3\x01\x22\x09\x4d\x29\xf3\xb1\x75\x86\xb9\xf3\xa9\x91\x9e\x1f\xa8\xd2\x5b\x26\xe3\x07\xcd\xc1\x1c\x5c\x46\xa0\x52\x0d\xd8\xc2\x91\x8e\x77\x4c\x59\x0b\x44\x2e\xf5\xb8\x0a\x1d\x5d\x0b\xb3\xba\x89\x43\x2b\x90\xd2\x80\xf0\xe0\xfc\x8e\x98\x6e\xcd\x9d\xa5\x22\x5c\x38\x68\x2f\x68\xee\xd0\x01\xba\x06\x1c\x00\xfa\x28\xc5\xfc\x7a\xf9\xb7\x41\x40\x19\xb2\x3c\xdd\x36\xd9\xc4\x86\x0f\xbf\x96\x99\xee\x5a\x10\x77\x53\xd9\xc4\x25\xc2\xf2\xd4\x1d\xa8\x35\x28\x6e\x68\xc5\x9f\x98\x44\x09\x36\x00\x00\xba\x21\x88\x7c\x3c\x30\x0e\xd2\x2c\xe8\xcb\x5c\x2f\xa6\x1b\x83\x11\x9f\x10\xf6\xa5\xf9\xf7\x57\xc8\xde\x0d\x5f\x1f\xd8\xfb\x5c\x48\x87\x60\x69\xf7\x1c\x6a\x0c\x91\xd8\xd8\xd0\x01\xed\x6f\x86\x45\x6c\xac\xe5\xa1\x56\x61\x32\x78\xb5\xfc\xb5\xe0\x39\x7a\xa2\x72\x3e\x62\x77\xdc\x19\x1c\x11\xe3\x1e\x2f\xf1\x00\x94\xd1\x5a\x7f\x58\x02\x13\x80\x51\x37\x51\x80\x66\xc2\x5b\xe5\x1a\x41\x14\xec\x98\xf1\x98\x6c\x87\x0b\x71\x57\xf8\x2a\x9c\xff\x5a\x10\x93\x0f\x06\x37\x45\x5b\x3a\x2d\x91\x72\x4d\xdb\x7c\x75\xe3\xe1\x1e\xb2\xed\x40\x49\xbb\x27\xb6\x29\xe4\x8a\xbf\xd5\xa0\x15\xa7\x71\x06\xd9\xc0\xa5\xb5\xf7\x28\x84\xdb\x6e\x42\x54\x4e\x55\x59\xb9\x02\xfe\xea\x33\x73\x8f\x60\xd9\x7d\x80\x31\x46\x33\xc1\xf3\xcc\xa7\xcc\xbb\x74\x3f\xb3\x0d\x56\xa6\x39\x67\x53\x7e\x62\x75\xaa\x0b\xca\x1e\x0c\xc5\x3f\xd7\x1e\x19\xa0\x49\x12\x97\xd0\x71\x5c\x95\x31\x98\xc3\x21\xa2\x2c\x4a\x72\xb8\xf8\xa4\xc2\xd1\x83\x01\xcb\x6c\x33\xfa\xea\x6f\xc6\xab\x93\x29\x5b\x24\xa6\x3c\x49\x6c\xb7\xc5\x05\x5a\x94\x61\x7c\xa4\x18\x61\x74\x7f\x73\xde\xdc\xf7\x03\xad\x3b\x73\x9a\x6f\xcf\x32\x81\xc0\xff\xfc\x40\xd7\x8a\xbb\xac\xa0\x0d\x91\x12\xa9\x7b\xe3\x52\x1b\x96\x9d\x26\xd2\x0f\x58\x91\x6d\x33\xa1\x0c\xb4\xca\x1a\x91\x7a\x35\xcc\x9a\xa5\xd6\xe3\x2d\x01\x5f\x0a\xb0\x16\x08\x0d\x6a\x47\x9e\x09\x83\xb5\xe0\xe1\x1a\xd8\x0d\xf0\x7e\xb7\xf9\x54\xde\x5d\x31\x9d\xe5\xc3\x4c\x08\x59\x03\x6d\xe0\x56\xbf\xde\x71\x90\xa5\x57\x97\x8d\xf1\x09\x1b\xf4\x60\x27\xb1\x16\x96\xc0\x38\x2f\x15\x08\xee\x44\xd0\x8e\x1c\x8d\x78\x2d\x7d\x8e\x88\x1f\x89\x0b\xc3\xf1\xb2\x98\xeb\x77\x06\xbe\x2d\x5e\x02\x27\xf6\x16\xda\x06\xc2\x0f\xc4\xd6\x2d\xc3\x26\xb4\xf8\x35\x4e\x1b\x58\x74\xf3\x4e\x14\x1d\x9f\xd9\x8f\x3f\xea\x6f\x9b\x59\xd1\x47\xc8\xe2\xf3\xc0\x29\x29\x66\xfa\x64\xbb\x5e\x5b\x8c\x90\x46\x22\xdc\x68\x48\xf7\xd9\x46\x03\x32\x3d\x76\xac\xdb\x63\xbb\x72\xad\x3c\x19\x3b\x3c\x4e\x8c\x9d\x49\xcd\xc1\x04\x51\xe0\xdd\x6b\x8e\x56\x36\x45\x18\x6c\xfc\x04\x8b\x99\x51\x90\x24\x51\xf2\xab\x86\x1d\x2e\x72\x1e\xb6\xd8\xe1\x0d\x6a\x8a\x85\x7e\x4f\x10\xbf\x97\x9d\x34\x3f\xca\x32\x66\x9b\xbf\x95\x7d\x75\x3e\x2b\x34\x51\x19\x22\x6b\x45\x5c\x08\x40\x42\x8d\xf5\x59\x69\xc7\x4c\xd9\xb2\xb6\xe4\x25\x4e\x3d\x22\x80\xab\x70\x67\xf3\xbb\xcc\xe0\x26\x04\xe0\x06\xdb\xc7\xb0\x75\x11\xc9\x70\x08\xb6\xa8\x53\xdb\x08\x46\x6c\xe0\x5e\xf1\x59\xc5\xa0\xdb\x09\x23\x80\x43\x7c\xa8\x89\x86\x06\xfd\x0a\x17\xab\x6e\x27\xd7\x32\x89\x75\x93\x37\xab\x75\x30\xb5\x7e\xe7\x6f\x23\x8b\x78\xef\xa1\xd1\x96\x56\x1b\x78\x5c\xbf\x52\x71\x33\x30\x4b\x54\xad\x24\xdb\xd4\xf1\x6a\x5d\xca\x21\x46\xd8\x86\xc2\xe2\xb5\x26\x86\x34\x59\x14\x64\xaa\x57\xdc\xe8\xe4\x95\xce\xea\xa7\x55\x6d\xc5\x8d\x29\x4e\xc7\x82\xb7\x97\x63\xe8\xb0\x4c\xae\x89\x92\x7d\x67\x6e\x60\xa3\x17\xe8\xd7\x1c\x27\xe6\x72\x63\x96\x1c\xdd\xb0\x41\x54\xfe\xf6\x2f\x68\x00\xb7\x0f\xfa\x08\x7c\x11\x1c\xfc\xd0\x9a\xe2\x88\xa6\x19\x11\x92\x33\xdc\x5a\x97\xe4\xe1\xaf\x72\x6c\x31\xdf\xc7\x38\x8a\x78\x5e\xc7\x77\x5f\x63\x26\x0d\xad\x85\x93\xc2\xe8\x21\x9f\x10\xc1\x88\xa9\xbd\x02\xef\x21\xf7\x5e\xa7\xe1\x72\x9c\xab\xf9\xb7\xe3\x28\xa1\x9d\x81\xe8\x21\xbb\x68\xa0\x3f\x3b\x35\x5f\x2d\x9b\x40\xa9\xfd\xd2\xd0\x19\x32\xcf\x90\x79\x76\x84\xbe\xc3\xd1\x03\x61\x31\xca\x92\x7c\x46\x2d\x98\x00\xdc\x50\xc0\x2e\x03\xf3\x6c\x79\x62\x46\xb6\x30\xed\xeb\x6b\x68\xc4\x52\xfc\x60\xb0\x01\xad\x10\x19\xe1\x24\x59\xcb\xcc\xe0\xe9\xa1\x86\xaa\xe2\x32\xdf\x7d\x9d\x1b\x73\x3e\x94\x39\x1f\x60\x50\x05\x04\xc9\x9c\x21\x0c\xc0\x2c\x5f\x48\x94\x67\x4e\x02\x02\x4b\x5f\x02\x7e\x57\x33\x49\x28\x60\x4c\xb5\x1e\x34\x27\x23\x06\xb1\xac\xae\xc5\x85\xe7\x2a\xa1\xab\xdf\x87\x9c\x34\x1d\xbe\xa9\x81\x25\xd8\xce\x8b\x58\x03\xa0\x5c\x41\x09\x1d\xe3\x74\xd5\x9c\x30\x30\x40\x74\x6f\x19\x34\x9a\xee\x9b\x56\x8a\xc9\xb5\x82\xa6\xb7\x98\xfa\x25\xcc\x19\xb5\xa5\x0f\xac\x91\x3c\x08\x97\x73\x9e\xa4\xe2\x7b\x2a\x91\xc4\x8a\xca\x29\x6d\x34\xcc\x84\x60\x10\xdb\xac\x3a\x5e\x0f\x81\xa2\x01\x7d\xa2\xb2\x16\x3e\xee\xff\x08\xbd\x07\x3b\x53\x20\x7b\x73\x8f\xe5\xd0\xc6\x12\xd4\x9c\xb4\x82\x1a\xee\x22\x60\xc6\xcd\x20\x78\x7f\xa9\xf9\xd0\xe7\x78\x1c\xa1\x41\x61\xdf\x37\x68\x16\xc6\x72\xbf\x62\x46\x24\x91\x64\x13\xe2\xeb\x64\x0a\x03\x1f\x38\x10\x10\x02\x59\x45\xea\xdf\x0b\xe8\x5b\x3f\xcc\x27\x48\xa3\xc4\x0f\x84\x2d\xb3\x77\x74\x1f\xa1\x31\x48\x2d\x55\xba\xbd\xa5\x8b\x1b\x63\xd7\x26\x03\xec\x7e\xec\x0a\x00\x11\x3a\x3d\xd6\x4b\xae\x05\xfd\xe8\xc1\x26\x6f\x18\x7b\xa7\x85\x20\x79\x9a\x73\x19\x9e\x33\xb7\x7f\x46\x57\x14\x39\x71\x49\x1a\x90\xfc\xe2\x17\xd8\x44\xbd\x30\x1e\x22\x94\xc0\xa8\xfd\x21\x35\xb6\x5c\xbf\xdf\xc8\xb1\x50\x58\x06\xf0\x13\xb9\xa6\xea\xa7\xf9\x87\xbf\xca\x2b\x38\xb1\xbb\xc8\x85\x6f\x2e\xdc\xb5\x7d\x1c\xfa\x86\x16\x78\x1f\x61\x55\x54\xfd\xc2\xb1\x47\x6f\xc8\x78\x8c\x0a\xf2\x5a\xbf\xc4\xd7\xeb\x4f\xab\x52\x1a\xac\xd3\xdc\x56\x51\xf6\xc7\xc0\x4d\x8f\x26\x39\x35\x55\x36\x4b\x22\x97\xcd\x97\x04\xed\xd7\x5e\xff\x54\xfa\xfb\xa4\x99\xc6\xae\x79\xbc\x0d\x61\xad\x0f\x58\x57\xa7\xeb\x0e\x51\xbc\xb2\xa9\x2a\xe8\x92\x95\xc8\x78\x7b\xfc\x65\x3c\xee\x5e\x47\x13\x1c\xee\x93\x7c\x7a\x0b\xb0\xe8\x6d\x98\x10\x0e\x27\x6c\x4e\x7c\x92\x97\xde\x67\xdd\x8d\x4f\x39\x68\xdb\x14\xeb\xbf\x2d\xae\x7f\x8c\xfe\xef\xed\xd5\xe5\x61\x8a\x85\x9c\x63\xc8\xb9\x75\x6d\x1d\xb8\x52\x23\x46\x01\x75\x7e\x25\xca\x46\xec\x10\xcd\xf8\x81\xf1\x62\x9e\xa0\xb9\x52\x99\x3c\x39\x3e\x9e\x51\x35\xcf\x27\x47\x11\x4f\x8f\x8b\xa5\x39\xc6\x19\x3d\x9e\x24\x7c\x72\x2c\x08\xc4\xb1\x1e\x7e\x73\xf4\xed\x37\xb0\x33\xc7\x8f\xdf\x1c\x83\xef\xea\x68\xc6\xff\x70\xf1\xed\x7f\xfe\xf9\x2f\xba\xe1\x6c\xa1\xe6\x9c\x9d\x58\x17\xe9\xd2\xb6\x0f\x8d\xdc\x7b\x6c\x3e\xa9\xf4\xf2\x9f\x47\x5f\x87\xc3\xb0\xaf\xa6\x3c\x26\x89\x3c\x7e\xfc\x66\xec\x36\xe6\x28\x5b\xc7\xe9\x5b\xf0\x7b\xbf\xe2\x95\x1a\xb2\xfa\x77\x4f\x31\xce\xd4\xb7\x6a\x57\x1a\x8e\x4a\x18\xa5\xbc\xc5\x81\x79\x20\x35\x3f\xf8\x1a\x0a\x98\x17\xa4\x5a\x54\xfa\x75\xc1\xbd\x5b\x45\x9b\xb5\x92\x32\xc1\xeb\x4c\x23\x00\x8e\x35\x26\x88\x0c\xd3\xa6\xe8\x36\x1b\x5d\xb1\xcd\xfa\x3d\x27\x04\xf2\xae\xb1\x8f\xed\x74\x37\xc4\x3d\x4e\xcc\xd7\x2e\x16\x84\x3f\x39\xbc\xe3\x5d\xa0\x04\x77\xac\xc7\xe4\xc1\x4f\x0d\xf1\xc0\x58\xdc\xb8\x5a\x86\x31\xc7\x72\xb3\xa0\xa2\x81\x81\x18\xf3\x7e\x01\x5f\x45\xd2\x76\xe8\x58\xa5\xcb\xda\x86\x62\x7f\x16\x1c\x26\x33\x55\xca\xe5\x11\x7a\x5f\x29\x58\x53\x04\x4a\xdd\xbc\x3f\x45\xdf\xfc\xf5\x3f\xff\x3c\x62\x5f\x36\x70\x31\x88\xdc\xe0\x62\x66\xe3\xb6\x80\x77\xa5\x58\x2a\x22\x8e\xc5\x34\x3a\x36\x81\x20\xc7\xfa\xfb\x43\xdb\xe9\x21\x9f\x1e\x7a\x08\xd4\x43\x8b\x06\x79\x94\xc6\xeb\x25\x34\x97\x48\xcf\x84\x4d\xd9\x80\x6b\x09\xc1\xd9\x06\xfa\x84\x4f\x3d\xd8\xb5\x89\xab\x37\xb8\xf8\x7c\xda\xf0\x07\xd4\x76\xfd\xca\x03\x2e\x61\xe9\xfa\x28\x10\x50\xda\x8f\xe6\x6e\xd0\x90\x1d\x89\x3c\xa7\xda\xe6\x78\x49\x28\x9c\xad\xb3\xf0\xcd\x87\xad\x08\x7b\x37\xf9\xdf\xb6\x38\xa8\x41\x93\xe5\x8c\xf0\x29\x44\x0d\x81\x5c\xe0\xbc\xa2\x60\x1b\x62\x5c\x05\xb9\xde\x82\x64\xe6\x82\x09\x8b\x89\x36\x2c\xf7\x96\x88\xca\xab\xd6\xf9\x39\x10\x95\xb7\x5d\x77\xcb\x50\x5e\x69\xc1\xb7\x0d\x5d\x32\x47\x69\x1d\x2f\xae\x7e\x7f\xa5\xc7\xc6\xf3\x01\x70\xd1\x84\xf5\x3b\x0d\xb6\x11\x24\x2b\x90\x43\xc5\x0f\x01\x24\x03\xa0\x17\x0c\xc6\x79\x9b\x1b\x17\x3c\x5d\xeb\x5c\x93\xfa\xfd\x0e\xe3\x34\xee\xcf\x4f\xc1\x40\xad\x4c\x62\xab\x65\xdb\x10\x10\xca\x18\x11\xd6\x86\xbf\xf2\x46\x5d\xd3\x0f\x16\x6e\xe5\xf2\x08\x90\x42\x2e\x0f\xf1\xa7\x7d\xfc\x2f\x0e\x98\xc0\x11\x82\x2c\x8c\x39\x4f\xb9\x16\x67\x78\x2e\x83\x87\x26\x8b\x07\x2e\xe1\x56\xd9\x2b\xc5\x99\x01\xc5\x7a\xbd\xd9\xe8\xa3\xa5\x1f\x19\x13\x47\xf8\xd2\x5a\x90\xfe\x93\x32\x88\xf9\x8a\xf1\x7b\xf4\xe9\xe5\x74\x03\x5e\xd6\x14\x4c\xca\x50\xf1\xcb\x62\xca\xd2\xdf\xb4\x06\xa3\x49\xca\x67\xcc\xf8\x9b\xdb\x04\x05\x18\xec\xb7\x10\x5e\xd2\x49\xf3\xad\xd9\x99\x79\xba\xe6\x1e\xf8\xa0\xc6\x2e\x1b\x80\x99\x09\xf3\x73\xf1\x7d\x87\x8d\x01\x7e\x6d\xe7\xd2\xd5\xd7\x8a\xc7\x0e\x9f\x70\xbd\xa1\xde\xfa\x06\x2c\x14\x61\x7d\xdc\x05\xbc\x0b\x44\x83\x9a\x35\x36\x0c\xc1\xc9\x16\x2d\x4e\x7e\xb6\xfe\x61\x84\x82\x0e\xeb\xac\x1d\x74\x62\x88\xb3\xb6\x82\xc1\x59\x68\x5b\xc0\xf5\x0c\x0e\xcb\xf4\xf7\xa6\xf0\x61\x83\x88\x55\x64\x0b\xe8\x51\xd6\x94\x47\xff\xe1\x63\x51\x4c\x70\x91\x91\x03\x34\xc9\xe1\xf9\xe5\xd5\x5d\xe8\x1d\xfe\xff\xd8\x7b\xb7\xe6\x36\x72\x24\x6d\xf8\x7e\x7e\x05\x22\xbe\x0b\xdb\x5f\x50\xf4\x1c\x62\x23\x36\x3a\x62\x2f\xd8\x92\x3c\xcd\x19\x59\xd2\xe8\xd0\xee\x7d\x97\x1b\x34\x58\x05\x92\x58\x15\x01\xba\x0e\x92\xb9\x3b\xf3\xdf\xdf\x40\x66\xe2\x50\x47\x56\x91\x94\xdb\x3b\x6f\x5f\x74\xdb\x96\x48\x14\x0a\x87\x44\x22\xf3\xc9\xe7\x91\xf8\xb6\x67\xd1\x5a\x44\x4f\x50\x38\x88\x47\x1e\x6e\x06\x2b\x24\xb9\xd8\xcd\x94\x97\x1a\xca\xb5\x4d\x75\xee\x1c\xfb\xb2\x63\x20\xd7\x29\x8b\x65\xb6\x4d\xf8\x0e\x92\x4a\x0a\x71\xc1\x3e\x21\xe5\x00\xf5\xc6\x14\xec\x8b\x9e\xf5\x9f\x69\x33\x2b\x5e\x22\x7f\xf0\x58\xf2\x74\x21\xf3\x94\xa7\x3b\xe6\x07\xb3\x6e\x0f\x58\x26\x36\x5c\xe5\x32\x9a\xa9\x8d\xe0\x2a\x44\x01\x51\x52\xcd\x0c\x72\xac\x05\xf1\x93\x2e\x97\x22\xca\x3d\xc1\x19\x38\xef\x6e\xa4\xf6\xed\xc1\x61\xef\xee\x76\x5e\xe7\xab\xff\x24\x15\x96\xd3\xca\x0d\x60\xcc\x68\x0d\xd1\xd1\x78\x60\x28\x1b\xa4\xa9\xe8\xc8\xb5\x97\x41\xf8\x97\x5d\x53\x4e\xdf\xdb\x15\x1c\x35\xf9\xf8\x47\xd3\x93\x1f\x27\xe2\xd6\x2c\x7f\x17\x20\x4f\x70\x83\x85\xe0\x15\x47\x34\xa2\x2a\x8c\x21\x6f\xa8\x04\x0a\xa2\x3d\x6f\x08\xfe\xfe\x06\x8e\x69\x73\x7b\x4c\x9f\x45\x3c\x53\x65\x1a\x17\xf2\x19\xfd\x86\x63\x5e\x78\xe7\x34\xd6\xc6\x8e\x71\xaf\xc8\xe6\x25\x94\xae\x7b\xd2\x3a\x57\xe4\xd3\x21\x04\xd4\xac\x1c\xfd\x0a\x1a\x33\xbd\x43\xde\x5e\x9b\x87\x84\x35\x48\x87\xab\x94\x5d\x76\x8b\xd2\x91\x54\x20\x83\x95\x03\xdc\x51\x31\x44\xad\xe2\xb7\xa9\x8d\x99\xb2\xd5\x9b\xcb\x22\x41\x56\xc2\x36\x69\x22\xe2\xac\xb1\x48\xf3\x5f\xaf\xe2\xc0\xc5\xd5\x58\xa0\x65\xe4\x92\xc0\x01\xf8\xd1\x49\xf9\xc3\xd2\x15\x2a\x43\x5d\x41\x2b\x63\x02\x05\xd8\x2b\x91\xc3\x69\x1e\x17\x09\x16\x23\x42\x7a\x1f\xf8\x6f\x78\x92\x30\x99\x67\x33\xe5\xe8\x7a\x90\x7c\x19\x2c\xac\x05\x2e\xc6\x74\xe5\x82\x47\x40\xb3\x24\xc1\x0a\x7e\x98\x8c\x64\x5e\x83\x8c\xee\x42\xea\xff\xed\x56\x70\xac\x9d\xc1\x69\x9b\xa9\xf0\xce\x55\x9d\x04\x2a\x34\x01\xa9\xc9\x53\xd4\x7c\x74\x20\x80\x41\x9f\x73\xf0\x94\x8c\xd9\x04\xdf\xce\x5c\xb8\xac\xaa\x1f\xf6\x96\xea\x75\x09\xd9\x65\x6e\x35\x79\xe6\x04\xee\xdd\xbd\x75\xcb\xd3\x5c\x46\x45\xc2\xd3\x04\x38\xb0\x97\x45\xc2\xe4\x32\x10\x28\x84\x39\x40\xb2\x16\x33\x5d\x91\x86\xb3\xda\x66\x84\x32\xbe\x11\x41\x9d\x28\x85\x77\x92\x20\xa3\x8c\x0c\xb4\x98\xaa\x34\x6d\xbd\x1b\xb3\x8b\xaa\x50\x28\xec\x89\x80\xe4\x4d\x66\x68\xfe\x5c\x7f\x83\x12\x27\x14\x1c\x95\x4b\x73\xa5\x7c\x13\xec\xba\x36\xc9\x6d\x9e\x3d\x0d\x4c\x57\x5b\xaa\xf0\x6e\x94\x62\x63\x89\xe3\x03\xc8\x32\x97\x92\xd8\x6e\x43\xb4\x74\xd0\x9e\x0a\x03\x3b\x19\x12\xe4\x1d\xd0\xd1\x4f\x81\xee\x71\xb5\xb3\x9b\x0e\x3d\x44\x98\xc7\x81\x5d\x0d\xd4\x45\x86\x77\x34\x58\x39\x21\x38\xa1\xcf\xc8\xae\x78\x3e\x14\xa9\xe0\xc0\xff\xc3\x3b\xda\x88\x0a\x69\xed\xe6\xfe\x48\xd3\xa7\x92\x1c\x09\x33\xbd\x32\xb7\x7c\x81\xa8\x1b\xbd\x0c\x4c\x30\x9d\x37\xa4\x5b\x02\x54\xd0\xce\x26\x2c\x04\x4b\xa4\x7a\xb2\x85\xdf\x66\x81\x8e\x18\xf7\xad\x83\x8d\xc0\x41\xc6\x3d\xd7\xe2\x79\x35\x11\xa7\x1f\xe1\x8c\xf5\x2b\x9f\x6a\xbe\x21\xdb\x9e\x0c\xe2\xc6\xb7\x2f\xdc\xf4\x1e\xfd\xa7\xa5\x13\xe7\xe9\xee\x3c\x16\xdc\x89\xc7\x60\x80\x38\x0b\xc4\xad\x5b\xc7\xf7\x76\x5d\x46\x30\x0d\x90\x19\x79\xbc\xbe\xb8\xfc\x30\xbd\x2e\x6b\x83\xfc\xed\xf1\xf2\xb1\xfc\x93\xbb\xc7\xeb\xeb\xe9\xf5\x9f\xc3\x1f\xdd\x3f\x9e\x9f\x5f\x5e\x5e\x94\x3f\xf7\x61\x32\xbd\xaa\x7c\xce\xfc\xa8\xfc\xa1\xc9\x8f\x37\x77\x15\x35\x12\x2b\x25\x12\xfc\xe8\x61\xfa\xf1\xf2\x62\x7e\xf3\x58\x12\x34\xb9\xf8\xf7\xeb\xc9\xc7\xe9\xf9\xbc\xa1\x3f\x77\x97\xe7\x37\x3f\x5f\xde\xed\xd1\x23\xf1\xef\xdb\x38\xa4\xa7\x80\x9e\x1c\xac\x4e\x33\x61\xcb\x54\x0a\x15\x27\x3b\x44\xc6\xda\x7b\x60\x05\x88\x17\x9e\x54\x72\x23\x74\x71\x0c\xc0\xf5\x61\x2d\x98\x7e\x16\x29\xd4\xa8\x63\x6b\x54\xd0\xc6\xb3\xa7\x56\x06\xb3\x3c\xad\xc7\xd0\x3b\x71\xfc\x79\xba\x73\x95\x22\x5d\xdd\xf1\xfc\x26\xf4\x10\xb6\x15\x69\x57\x5f\xc0\x8f\x48\x8b\x6d\x2e\x17\xed\x90\xe5\x9e\xbc\x1f\xc3\x6f\xaa\xc8\xc6\xd5\x4c\x5d\x70\xdd\x6c\x18\x4b\xc8\xdd\x63\x40\x8b\xd0\xc2\xa1\xa2\x4b\xee\xdb\x16\xe8\xb5\x2d\x16\x89\x8c\x98\x8c\xab\xd1\x07\x2c\x30\xc1\x00\x6b\x95\xb4\x6f\x2b\x52\x70\xec\x8c\xbf\xbc\x4d\xc5\x19\x2f\xf2\xb5\xd5\x83\x76\x75\x46\x48\xa2\x27\xa2\x54\xe4\x81\x76\x39\xa9\xed\x04\x4f\x82\xce\x50\x7d\x65\x0c\x54\x0e\xe3\x80\x40\xb9\x25\xa2\x8e\xdf\xc4\xd6\x07\x84\x14\xf1\xf3\x9d\x43\x43\x3d\x96\x59\x55\x6a\x15\x5c\x58\xfc\xa5\xd5\xec\x31\xef\x6d\x2c\xb5\xd3\xac\xc1\x49\xb6\xc8\xea\xe6\xd7\xd8\xb7\xc6\xc2\x85\x52\x06\x42\x53\xeb\xf4\xab\xf3\x54\xc0\x21\x42\x89\x73\x7b\xdb\x07\xa0\x07\x21\xb1\x01\x80\x6d\x2e\x36\x0b\xb1\xe6\xc9\x12\x63\x78\x66\x6a\xfc\xbe\xaa\x2f\xd1\x07\xfd\x24\xd4\x1d\x4e\xd8\xaf\x62\x0e\x15\xde\x13\x7c\xc5\xad\x8b\x9f\xf8\x80\x9f\xe9\xa3\x5d\x55\xb6\x12\x05\x25\xcb\xd1\xab\x0e\x7e\x8d\x70\x70\xcf\xa7\x69\x8b\x58\x96\x4b\xf9\xd5\x34\x38\x53\xa2\x91\x51\x10\xd0\x35\x96\xfb\xc4\xd9\x65\x60\xd4\x42\x02\x89\x27\xa1\x40\xed\x07\xc5\x40\xf7\xae\xd9\x61\xd1\xe6\xfa\x5c\x74\x84\xbf\x21\x42\x26\x4b\x22\x48\x61\x4e\xc4\x8e\x13\x94\x9c\x3d\x89\x31\xbb\xa0\xb2\x78\xf3\x93\xf3\xab\xe9\xe5\xf5\xc3\xfc\xfc\xee\xf2\xe2\xf2\xfa\x61\x3a\xb9\xba\xef\xbb\xfd\x4e\x51\xb5\x50\xd9\x7d\xd5\xc2\x11\x67\x21\xde\xd3\xce\xf3\xc5\x73\xee\xa5\xfc\xb6\x83\x29\xd9\xdf\x7b\x19\x6f\xe7\xb1\xcc\x22\x73\xfc\xed\xe6\x42\xc5\x40\xc5\x7a\xd0\x52\x6d\x6e\xaa\xfa\x16\xee\x13\xcc\x7d\xc2\x5a\x10\x3c\xed\x9e\xed\x8a\x76\xbf\x07\xae\x36\x08\xda\xa5\xc2\x6c\xfe\x78\xa6\x82\xd3\x66\xbc\x9f\x7f\xdf\x34\x77\xdc\xbb\x95\x9b\xa8\xbe\x13\xf6\x57\x66\x59\xc1\x8d\x7d\xb4\x1f\x03\x36\x86\x96\x51\x21\x7e\xac\x90\x0f\x56\x06\x5a\x86\xcc\xdc\xe4\x37\x5c\xc5\x3c\xd7\xe9\xae\xe5\x15\xfb\x19\xcf\x70\xdb\x94\x4d\x68\x78\x64\x2b\x21\x62\x3b\x0b\xf8\x51\xae\xaa\x4b\x09\x59\x63\x1f\x6e\xfe\x7a\x79\x7d\x3f\xbf\xbc\xfe\x79\x7e\x7b\x77\xf9\x61\xfa\x8b\xa3\xbe\xd9\xf2\xac\x49\xbb\x6c\x9b\x0a\x63\x5d\x6c\x11\x7e\xa3\x7d\x41\x41\x31\xdb\x0e\x89\xc8\xc8\xe5\x4c\x59\xcb\x92\xfa\xe6\xd7\xa9\x2e\x56\xeb\xe6\x86\xaa\xbd\xbc\x9d\x3c\xfc\x74\x50\x37\x81\x22\x05\x55\x87\x70\xb7\xd5\x79\x04\xe5\x92\xec\x1e\x92\x0f\x56\xba\x07\x44\x3f\xf0\xd1\xa6\x98\x7c\x8b\x45\x3b\xe8\xf6\x52\x37\x5a\x9d\xce\x7f\xc3\xc7\xdb\x16\xd0\x43\x60\x37\x4b\xc7\x08\x20\x58\x51\xbc\xae\xd6\xda\x0f\x0d\x3f\x2b\x9d\x60\x7f\x3c\x4b\xc4\x6a\x25\x62\x5c\x5e\xd5\x86\x29\x62\x45\x26\x30\xf2\xe7\x7a\xd3\x28\x92\xbc\xd4\x11\x07\xb3\x43\x47\xf5\x37\xe0\xb7\xee\x2b\xcd\xb6\xe2\xdc\x4a\xd8\x46\x5a\x65\x39\x57\x2d\x69\xd7\xe7\x3a\x9e\xb1\x97\x29\xba\x49\x99\x2b\x9c\xa0\x00\x89\x0d\xb0\xfb\x7d\x70\x48\xc2\x89\x64\xb4\x14\x45\x3c\x02\x79\xad\x40\x73\xb7\x61\x12\x20\xd2\x78\x67\x2d\xe2\xeb\x07\x37\x3a\xaf\x4e\xc4\x0b\x03\x81\x51\xd4\x31\x21\xca\x52\x8c\x06\x81\x38\x50\x2b\x8c\x76\xd0\x84\x54\x9e\xfc\x33\x0d\x3d\xde\x5a\xcb\x81\x59\x6e\x99\x97\xdc\x04\x39\xe7\x6d\x78\x7c\xab\xe4\x87\xfb\x96\xb7\xa9\x8e\x8b\xc8\x72\x53\x40\xb3\x1e\x0f\x42\x01\x2d\x7b\xc0\xc6\xec\xcc\x4c\x33\x5d\x52\x44\x7c\x06\x0c\x1f\x33\xd5\x96\x7c\xb1\x36\xa0\x25\xcc\x75\x6b\x4f\xad\x63\xe6\xbe\x61\xf4\xdb\xb7\xa0\x1d\xec\x7e\xf5\x67\xcc\x7e\x1c\x9c\xbd\x16\x38\x0d\xcd\xcb\x82\x63\x66\xb5\x7c\x1c\xb7\x95\xa2\x3b\xab\x3a\x0c\xf5\xd3\x0f\x34\x51\xa6\x76\xc2\x23\x72\xcd\x33\xf4\x5c\xf3\x68\x5d\xee\x38\xbc\x4d\x99\xbe\xa9\xda\x5d\xe7\x09\x1e\x17\x21\xe8\x95\x5f\x19\xe1\x9d\x5a\x66\xd4\xfb\x50\x8a\xc7\xe9\x8a\x0d\x5b\xf8\xa1\x73\xe4\x2e\x2f\x68\xf7\xc0\x60\x25\xbc\x50\xd1\x9a\x6d\x13\x8e\x35\x97\x6b\x9e\xe1\x92\xb6\x20\x03\xbe\x90\x89\xcc\x81\x2e\x02\x73\x5f\x95\x11\x36\x37\x1a\x9e\x3e\x59\x86\x46\xee\xb9\x41\xba\x16\xfd\x91\x60\x4e\x2f\x5f\xfd\x2d\xe1\x9c\x7e\xcb\x06\xdf\xe8\xcc\x9c\xf9\x65\x49\x50\x4e\x3f\x1d\xc6\xe2\xc1\xb2\xf4\xef\x32\x6c\x66\xa9\xc5\xdb\xea\xd7\x4b\xe3\xdd\x70\x50\x0f\x87\x32\x10\xf5\xf0\x00\x33\x5f\x25\x26\x6e\xdc\x59\xcb\x44\xf3\x16\x71\x4c\xdb\x36\xf2\x0c\xb7\xb5\x1d\xeb\x62\xd1\xc6\x6c\x89\xbd\xea\x6e\xbd\x2b\xee\x6f\xf7\xed\xa9\xe2\x82\xa1\x01\xe4\xb9\xc8\xe5\xb0\xd0\x46\xf0\xd2\x3c\x17\x67\xf0\xf5\xe6\xc6\x89\xf5\xa7\xf7\x3b\xd7\x16\x9a\x67\xbb\x77\xfc\x99\x00\x32\xab\xaf\xae\xbf\x15\xdc\x98\x86\x9b\xe5\x3d\xf2\x17\x1c\xb3\xc8\x72\x59\x5f\x61\xcd\x3b\xb1\xfa\xd4\x87\x72\x52\x25\x5c\x03\xbd\x6b\xd7\x9a\xde\xe6\xde\x7c\xbb\xff\x86\x2c\x2b\x48\x6f\x53\xa9\x81\x65\x80\x74\xab\x3b\x28\xc0\x1a\x9f\x7b\xc4\x48\x7e\x29\x44\x21\xcc\xda\x5f\x14\xf1\xaa\x1e\xdb\x1c\xe0\x9d\xf9\x57\x5a\xeb\x17\xb6\x29\xa2\x35\xb3\x8d\xb3\x58\x24\x7c\x57\x7a\x35\xf0\x97\x72\x9d\x00\xa9\xe6\x81\x0c\x7f\x51\x91\xe5\x7a\x03\x20\x4c\xdf\x6e\x5a\x28\x58\xf0\x8c\xe7\x79\x2a\x17\x45\xde\x08\xd8\x2a\x31\xfe\x1c\x98\xd0\xba\xbf\xbd\x3c\x9f\x7e\x98\x56\xb2\x49\x93\xfb\xbf\x86\xff\xfe\x74\x73\xf7\xd7\x0f\x57\x37\x9f\xc2\x9f\x5d\x4d\x1e\xaf\xcf\x7f\x9a\xdf\x5e\x4d\xae\x4b\x39\xa7\xc9\xc3\xe4\xfe\xf2\x61\x4f\x5a\xa9\xfe\xd4\xf6\x89\xe0\x01\x21\x91\x85\x85\x5a\x66\x56\x7b\xbb\xa4\xa7\xfe\xc0\x26\x96\x9e\xa9\x44\x20\x66\x53\x83\x90\x79\x47\x9d\x52\xca\x20\x5e\xf0\x9c\x93\xee\xf3\x98\x4d\x98\xd5\xef\x06\x30\x74\x66\x9c\x05\xe2\xae\x31\xb3\x83\x4d\x18\x8f\x21\xf2\x37\x37\x2f\x3d\xa5\x97\xc4\x1a\x95\x88\x90\xa4\xd8\x56\xfe\xcc\xd4\xe5\xb3\x50\x79\x01\x0c\xaa\x3c\x49\xac\xce\xba\xfd\x40\x50\xe3\x69\x7b\x99\xc9\x8d\x4c\x78\xea\x55\x82\x6e\xa8\x2d\x70\xd8\x6d\x5f\x1d\xa5\x47\x5d\x3a\xc2\x5e\x1e\x1e\xa7\x0c\xfa\x7d\x7e\x35\x05\x17\x28\xca\x2d\x05\xbe\x7d\xf8\x4c\x21\x2b\x11\x3d\x71\xc3\x01\xa0\x9f\x6b\x8a\xa7\xe1\xe3\xe9\xc3\xed\x0b\x31\x3b\x66\x13\xdb\xc8\xf3\x6b\x81\x80\x5c\x27\xed\x5f\x2e\x55\x9e\xee\x7a\xfb\x35\x0f\xc0\xa1\x9a\x81\x6f\x4a\x78\x9f\xb2\x72\x10\x86\x3b\x98\x6d\xfd\x1a\x9c\x1d\x0b\x46\xa3\x68\xbc\x0b\xba\x0b\xe0\x69\x6d\xf1\xbf\x13\x73\x08\x7d\xaf\xe3\x10\x52\x28\xc0\x28\x2c\x74\xa1\xe2\x8c\x90\x49\x1b\xa9\xde\x6f\xf8\xd7\x77\xf6\x4d\xb1\x24\xd9\xf1\x77\x03\xdd\x8c\x48\xcc\x4d\x64\x67\x8c\x5c\xf7\x70\xcd\x54\xc7\x78\xed\xf7\x16\xad\x65\x85\x6b\x8f\xbf\xa3\x22\xc6\xea\x59\xec\x9a\xe6\xaf\xa6\xc1\x80\x38\x2e\xda\xf0\xd0\xc8\x36\x15\xe6\x83\x0e\xc0\x95\x20\x2e\xcf\xfd\x1b\x80\xda\x25\x9d\xa8\x66\xdb\x1d\x66\x79\x8f\xda\x36\x8d\xf9\xe5\x57\x10\xd1\xa0\x27\x99\x39\xc3\x6c\xb3\x0d\x74\x12\x30\x9d\xd2\x68\x66\xb2\xfe\x4b\x2f\xd8\x12\xaa\x34\x48\x07\x36\x15\x10\xd8\x86\xa9\xb0\xac\xaf\x40\x4a\x52\x4b\x61\xdb\x25\x90\x88\x0c\xc2\xbd\xca\x5c\xb7\xc4\x97\x82\x32\x76\x7f\xf8\xfd\xb0\x73\x36\x4f\x77\xcc\x32\x8c\x87\x55\x22\x54\x24\x45\x67\x2e\xf4\xab\x50\xb2\x89\xa9\xe8\xae\x50\xe6\x28\x3e\x05\xd8\xa1\x7f\x36\xab\xf2\x50\xfa\xe7\xde\x42\x0a\x1b\x88\x4d\xf1\xf3\xaf\x46\xed\xf6\x73\x85\xd1\x8d\x1e\x07\xb0\x5d\x6a\x3d\x3c\xd0\x16\x3c\x7a\x7a\xe1\x69\x8c\xb1\x42\x40\x1f\x8c\xd9\x4f\xfa\x45\x3c\x8b\x74\xc4\x22\x91\xe6\x9c\xc8\x5e\x32\x48\xbf\xc2\x86\xa2\x76\x66\x0a\x50\xec\xc8\x9c\xa3\x40\x42\x37\x97\xab\xb5\xb9\x4f\x06\xc9\x73\x9d\x1a\x73\x94\x23\x93\xd6\x56\x44\x44\xaf\xd1\x32\x00\xcb\x84\x3f\xd7\xd9\x6b\x0e\xa9\x84\x67\x53\x57\x8a\x67\xb3\x53\x96\x49\xbb\x0b\xee\x40\x03\x46\x46\x13\x09\x11\x46\x6c\xa5\x13\xae\x56\xe3\xf1\x98\x89\x3c\x1a\xbf\x1b\xb4\xd0\xa9\xc1\x30\xdf\xe5\x20\xa8\x89\xd6\x99\x48\x76\x8e\x12\xc2\x15\x09\x98\x61\x86\x1a\x91\x4c\x62\xc8\xa3\x61\xf9\xdf\x57\x2b\xea\xbf\x6d\xe8\xbc\xf9\xa6\x3a\xb8\x04\xad\xa5\x1d\x10\xe6\x18\xd0\x12\x7e\xbe\xf9\xe6\x75\x50\x49\x65\x0b\xeb\xa3\x56\x43\xeb\x04\x7f\xd6\x6d\x32\xb3\x07\x31\x35\x35\xb6\x44\x44\x0e\x07\xd5\x56\xb5\x45\x2c\x2a\xe5\x6e\x47\x54\xba\x75\x14\xad\x0d\xac\x57\x6b\xd8\x77\x0d\xdb\xa2\x32\xdd\x83\xb7\xc5\x7e\xae\xf0\xc6\x17\x1a\x58\x0f\xe8\x0b\x77\x87\xb8\x4e\x58\x52\x94\xec\xe0\xc6\xe5\xaa\x03\x21\xb2\x1c\x07\x91\xf1\x52\xe0\x1f\xea\x54\x7c\xe6\xc0\x71\x81\x07\x89\x82\x2c\xd7\x29\x5f\x09\xb6\x11\xb1\x2c\x36\x8d\xc6\xc6\x75\xf7\x18\xb4\x97\x4e\x8a\x4d\x3b\xf1\xd3\xb1\x0e\xb4\xef\x24\xfe\xed\x1c\x1e\xd7\xdb\x81\xf6\x82\xca\x56\xb2\x81\xfa\x8b\x61\x70\x1a\x6b\x73\x52\xa6\x32\x03\x8a\xb2\x43\xca\xc2\x5c\x33\xd8\x34\x64\xeb\x76\x5b\x0c\xbf\x96\x66\xf7\xcc\x66\x77\xe8\x2b\x19\xce\x2a\xa4\xf8\xda\x0f\x85\x2a\x86\x6c\xf0\x1c\x81\x20\xc0\x41\x79\x4d\x70\x1b\x03\x6a\x5e\x02\xb9\x40\x83\x94\x89\xcf\x35\x5b\xda\x42\xa3\x27\x11\x48\x18\xc6\x40\xda\xfb\x82\x3c\x20\x7f\xfd\xd7\xcc\xe6\xec\x09\x56\xe1\x3d\x96\xdc\x3f\x04\x73\x03\xcf\x7f\xb0\x68\x1a\x7c\x43\x6c\x02\x54\x81\x62\xae\xf2\xc6\x06\x3c\xd8\x0c\xda\xc2\xaf\xfc\xcc\x8b\xa4\xf9\xe3\xd4\x3e\x7c\x14\x05\x40\x26\x9f\xee\x19\x0e\x35\xd1\xbb\xa6\x5d\x1d\x0d\x1a\xd9\x8f\xe7\x81\xe1\x9a\x1f\xe0\x09\x96\xe6\x01\x07\xdd\xf2\xfb\x9a\x61\x17\x79\xb4\xf6\x9e\x47\x59\xc9\x93\xd4\x9d\xe8\x3d\x37\x9e\xb0\x16\xa1\x92\x21\xe6\x4c\xae\x94\x0e\xb9\xd6\xb5\x12\x90\xa4\x31\x06\x48\x87\xcd\x32\x99\xef\x07\xf6\x0c\x64\x55\xda\xb7\xd4\x72\x8d\x80\x0d\x7a\xcf\x52\xae\x0d\xae\x14\x12\xb9\x58\x2c\x2a\x12\xef\x44\x24\x16\x54\xa5\x59\x2d\x57\xb7\xcf\x54\xf9\x51\xb5\x41\xb2\xc8\x1b\x99\x0a\x64\x47\xcc\x8c\xf7\x96\xcb\x67\xb3\x51\xeb\xcb\xda\x2d\x50\xb0\x00\xf5\xb5\x37\x53\xd8\xed\x80\x62\xf1\x49\xec\xb2\x50\x99\x88\x56\x14\x6b\x5b\x90\xd2\xbc\x0f\xcd\xd7\xfe\xa9\x80\x81\x9b\x07\x4a\xcb\xfd\xce\x32\x7c\xe8\x47\xf3\xe5\x0e\x48\x5f\xad\x71\xb3\x06\x7d\x25\x97\x8f\x29\x92\x99\xf0\xe3\x4c\x73\xe8\x51\x3b\x0d\x2a\xdc\x3e\x3c\x0b\x17\x5f\x73\xbf\x9d\x29\x62\x61\x0d\x0e\x39\x63\x70\xea\xd3\x46\xe5\xa5\xc8\xfd\xb8\x2b\x51\x63\x00\x43\xae\x95\x8b\x6d\x16\x3f\xb7\xc2\x76\x33\x45\xf2\xe1\xa0\xff\x4d\x31\xbc\xc6\x07\x1e\x08\x05\xa3\xc9\x6d\x85\x7f\xf9\x2b\x0c\x0d\x1c\xb1\xa3\xa1\xc4\x15\xde\x7e\x22\x61\x86\x6f\xa2\x1a\x91\x57\x16\x77\x75\x7f\x79\x7e\x77\xf9\xf0\xcd\xe0\x61\x16\x9b\x35\x18\x1f\x66\xfb\x79\x71\xf9\x61\xf2\x78\xf5\x30\xbf\x98\xde\xbd\x06\x40\x8c\x7e\x75\x00\x42\xec\x9e\xc8\x9d\xcf\xb5\xca\xc5\xd7\xa3\xce\xe4\xb4\x50\x73\x3e\xa0\x52\xc1\x11\xa8\x77\xb9\x3b\xd8\x68\x9d\x9c\xda\x31\x47\x13\x37\x1f\x9e\x68\x8e\x8b\x3a\x50\xb3\x5f\xca\x24\x81\x32\x47\x17\x5e\xa7\xa2\x20\x33\xa8\x60\x7f\xac\x2c\x2f\xd9\xd4\x99\x5a\x94\xd8\xb9\x21\xe4\xb7\x36\x97\x60\x2c\x70\xdc\x9a\x01\x48\x25\x94\x8f\x75\xf1\x57\xaf\xa4\x12\xbe\x1b\x28\x47\x59\x28\xd6\x4a\x3a\x4a\x93\xf8\x9a\x55\xac\xe4\x78\xf5\xf5\x35\xed\x8a\x2b\xad\x4f\xeb\x7e\xda\x5f\xba\x37\xc4\x4d\x2c\x15\x3a\xa6\xa5\xdd\x7c\xdf\xbc\x74\xdf\xfb\x2d\x00\xe3\x6e\x66\x92\x43\x0e\x02\x14\x1f\xfd\x44\xd2\x44\xa0\x72\x84\x4f\x4e\x3c\x49\x44\xd1\xe8\x65\x65\x9c\x8d\x29\x34\x63\x2d\x21\x53\xc1\x89\xb9\x21\x4a\x8a\x2c\x17\x29\x85\x4d\x26\x9f\xee\x67\x0a\x65\xc1\xe9\x14\x22\x75\x01\x7c\x04\x62\x38\x74\xe9\xf9\xd6\x43\x09\x2d\xd8\x5b\x8c\x51\x6f\x04\x57\x19\xaa\xf1\x26\x89\x48\xfd\xca\xc0\xfe\x08\x11\x93\x22\x13\x48\x36\xfb\xef\x93\x20\xab\x86\x5d\x6b\xfa\x4b\xbf\x25\x49\xd2\xea\x7a\x6a\xab\xa2\x05\x80\xe8\x6b\xae\x9c\x86\x3a\x85\xbe\xab\x88\xb0\xb5\x8d\x8b\xa8\x5c\x35\xd0\x6b\x2d\x3d\x60\x73\xbf\x2d\xa5\x13\x2e\xa5\x1e\xe7\x7a\x78\x4a\xb0\xb5\x36\x06\xd4\x09\x03\xf8\x34\xb3\xab\xe2\x4f\x00\xff\x64\x86\xb1\xf1\xd4\xa9\xc8\x4f\x1d\x71\xea\xa0\xde\xd4\x71\x70\xce\x49\x03\x5d\x88\xd7\x39\xb1\xb9\x9d\x4e\x65\xab\xd7\xa1\xe5\x9a\x58\xbc\x9d\xd2\xb9\x2d\xb0\x77\x10\x37\xc2\xeb\x99\x0f\x38\x66\x87\xce\x3e\x12\x5b\x82\xf5\x52\xe6\x47\xaa\xc3\x3c\x84\xb8\xc0\x52\x11\x25\xf6\x22\x14\x98\x24\x04\xb1\x27\x38\x18\xb2\xf8\x0e\xd7\x1f\x2b\xaf\x39\x47\x96\x77\x10\xd8\xe1\xfa\xe6\xfa\x32\x84\x2a\x4c\xaf\x1f\x2e\xff\x7c\x79\x57\x2a\xbf\xbd\xba\x99\x94\x4a\x68\xef\x1f\xee\x2a\x95\xb3\x3f\xde\xdc\x5c\x5d\xd6\x30\x0f\x97\x0f\xd3\x8f\xa5\xc6\x2f\x1e\xef\x26\x0f\xd3\x9b\xd2\xe7\x7e\x9c\x5e\x4f\xee\xfe\x3d\xfc\xc9\xe5\xdd\xdd\xcd\x5d\xe5\x79\x8f\xe7\xdd\xe8\x89\xd2\x6b\x34\x87\x7f\x7c\x72\x36\xe0\x0d\x6c\xdc\xc6\x65\x7d\xb6\x23\x76\x71\x4f\x10\xd6\xbe\xe5\x68\xab\x6b\x6d\x73\xc1\xc6\x30\x5d\x1d\xb4\xea\x4e\x2f\x28\x57\x1a\xba\x2f\xc7\x11\x15\xe7\x3c\x6f\xbc\xff\xf6\x0e\x4c\x90\x80\xf3\x97\x42\xa4\x3b\xe2\x79\xc1\x4b\x23\xfe\x24\xe2\x0a\xd1\xab\xb9\xd8\x6c\xa1\x1a\x2a\x84\x5d\xce\xd4\x27\xc8\x58\x21\xb2\xe3\x4d\xc6\xfe\x0c\xb9\x27\xfb\x61\x2f\x74\x0e\x83\xf2\x37\x7c\x86\xfb\xdd\x78\xa6\x4a\x02\xd1\xc1\xb7\x62\x1d\x15\x2e\x9a\x31\x9e\x29\xcb\xa5\x1b\xeb\x28\x1b\xc3\xd1\x3b\xd6\xe9\xea\x3d\xa9\x5e\x19\x63\xaa\x9f\x16\x5a\x3f\xbd\x17\xea\x3d\x5c\x0e\xf2\xf7\xbc\xc8\xf5\x7b\xc8\x5b\xe3\xe0\x67\xef\xad\x38\x8e\x55\x17\xca\xde\xaf\xe5\xb3\x80\xff\x8d\xd7\xf9\x26\xf9\xff\xb2\xed\xfa\xeb\xd9\x2a\x49\xcf\xcc\x77\xcf\xc2\xef\x9e\xd9\xef\x9e\xd9\xef\x9e\x99\xaf\xe1\xff\xb6\x3b\x8c\xb3\x09\x52\xe7\x9f\x29\xa9\x32\x91\xe6\xb0\x0c\x5f\x52\x99\x0b\xaf\xbc\xce\xde\xfc\xcf\xff\xb0\x71\xca\x5f\xb0\x8e\xe1\x82\xe7\xfc\x16\x2f\x7a\xff\xf8\xc7\x1b\x88\x6c\x23\xd0\x78\xcb\xd3\x2f\x85\xc8\xcd\x95\x33\x11\x51\xce\xfe\xff\x99\x82\x50\xf8\x66\x37\xcf\xf1\x02\x8c\x97\xc1\x38\x63\xff\x86\x6d\x4e\x91\xf3\x28\xce\x4c\x4b\x2d\x10\x47\xc9\x93\x06\x3d\xb5\x96\x58\xc9\x97\xe4\x82\x3e\x3f\x60\xb7\x7c\x49\xca\x5b\xc4\xb2\x76\x67\x5f\x12\x20\xd6\x4a\x34\xb7\x59\x73\xe6\x16\x2f\x38\x2c\xd4\xb9\xa6\x3d\x52\xcb\xd1\xbc\x6a\xbe\xa4\x79\xaf\xdc\x23\xef\xa2\x0d\xa1\xd4\xd4\xc2\x20\x68\xe3\x03\x42\x90\xc6\x90\x66\x87\xdc\xe3\x95\x14\xb5\xeb\xe1\xcd\xc1\x38\x50\x0e\xc3\xb5\x87\x1e\x64\xf6\xa7\x1f\xde\xbf\x1f\xb1\x55\x06\x7f\x2c\xbe\xc0\x1f\x90\xc6\x3d\x15\x75\x58\x6d\x30\x1d\x22\xa1\x3e\xcb\xfb\x67\xe2\x14\x70\x86\x6f\xc1\x56\x59\x59\xa6\x3f\x16\x2a\x4e\x84\x2f\xcb\x28\xc5\xa6\x12\x6d\xf5\x1c\xf1\x86\x52\xe5\x05\x87\x39\x5e\x88\x88\x1b\xc3\x57\x7b\x36\xa2\x7c\xf4\x32\x17\x0a\xaf\x25\xa9\x17\x51\xe0\x78\x85\x80\x14\x3b\x60\x52\x40\x97\x7f\xb3\x05\x91\x7e\x09\xf1\xfa\x07\xa4\x7f\x1c\x55\x7f\x05\x32\xdb\xc8\x64\x08\xfc\x5c\xa8\x06\x2e\x6c\xe0\x0c\xcb\x59\x8b\xd4\xdc\x4c\xb6\x5c\xc5\x3c\x83\x15\xb8\x4c\x21\xec\x9c\x32\x5e\xef\xe8\x08\x71\x51\xba\xc8\x81\x4b\x00\x53\x3c\xe1\x48\x20\xd5\x64\xd0\xe7\x51\xd0\x09\x3c\x13\x80\xf1\xae\xf6\xc5\xf1\x4c\x39\x89\x7a\x04\x25\xe0\x95\x25\xd2\xdb\x1d\x55\x8a\x57\x07\x5d\xda\x2b\x0c\x0d\xf7\xc8\x27\xfe\xaa\x9f\x1d\x31\x59\x8e\x71\x02\xab\x65\x1e\x08\x95\x59\x31\xb5\xb7\x42\x45\x3a\x16\x69\xf6\xce\x6c\x43\xe0\x7a\xce\x3d\x67\xa4\xcc\xfc\x64\x38\x45\x7b\xba\xb6\x99\xe6\x1d\xfd\xbb\x19\x9d\x12\x0f\x62\x93\xfb\xb0\x7f\xab\x7c\xef\xe9\xc8\xa6\xfe\xd2\x5f\xbf\x69\x6a\x32\x04\xd8\x58\x80\xd9\xe1\xbe\x20\x6e\xd9\xd0\xe2\x62\xa3\x24\x80\x8f\xce\x89\x55\x85\x92\xe6\xc8\xca\xcd\x85\x3d\x9f\x29\x3a\x81\x47\x6c\x29\x78\xbe\x06\x84\x51\xf6\x8c\xc6\x18\x8f\xfb\xfc\x45\xfb\x64\xa8\x25\xd1\x06\x54\x52\xa9\x71\x7f\x5b\xc7\x8f\x41\x6a\x87\x47\x39\x66\x7a\xda\xe8\x85\x9d\xab\x02\x83\xd5\x68\x10\x0f\x18\x07\xcb\xc9\x5c\xd5\x3f\x08\x29\xc1\x61\x24\x76\x18\xb1\x67\xd5\x7e\xe0\x2f\x8c\xe1\xc1\xb7\xc3\x7c\x5c\x60\x1c\xa1\xac\x93\x40\x4d\xb8\xcf\x7c\x30\x3d\x24\xc6\x04\x27\xb9\x6d\x53\x75\x0c\x04\x74\xe0\xb0\xfa\x0f\xf3\xd5\xbd\x37\x87\x4c\xa4\x96\x30\x1a\xdf\x15\x89\x79\xd6\x32\x8d\xcf\xb6\x3c\xcd\x77\x76\xf9\x26\x72\x01\x3c\xb3\x89\x7c\x12\x6c\x92\xa6\xfa\xe5\xd4\xa3\xd0\x6a\x5a\x1e\x78\xf6\x74\x62\x9e\x2f\xa0\xdf\x1b\xc2\xd3\xd5\x48\xcb\x55\xc2\x1e\xc5\x62\x7e\x18\x05\x58\x1b\x8d\x59\xe3\x73\x52\x91\xa7\xbb\xb9\x59\x88\x9b\x6d\xab\xa5\xe8\x85\x5e\xed\xef\xe4\x0e\x63\x17\x83\xf3\xb9\x07\xbb\x58\x69\x56\xbf\x1f\x76\xb1\x06\xe2\xb0\x3a\xbb\xd8\xf4\x7a\xfa\x30\x9d\x5c\x4d\xff\x4f\xa5\xc5\x4f\x93\xe9\xc3\xf4\xfa\xcf\xf3\x0f\x37\x77\xf3\xbb\xcb\xfb\x9b\xc7\xbb\xf3\xcb\x6e\xba\x80\x7a\xef\xbd\x0b\x7e\xc6\xc2\xe7\xfc\xc0\x1e\x82\x8c\x19\xa2\x3e\xc9\xff\x26\xa1\x25\x58\x55\x66\x33\x4b\xb5\x1a\xc1\x46\xfd\x81\x5d\xa6\xe9\x74\xc3\x57\xe2\xb6\x48\x12\xc8\x6b\x23\xc4\xfa\x3c\x15\x70\xf1\x1c\xb1\x5b\x1d\x4f\x83\xef\x41\x5d\x48\xe3\x6b\xc0\xf3\x79\x1c\xa7\x22\xcb\xf0\xf1\x23\x7a\x7e\x90\xc5\x75\x35\x27\x84\x62\xe0\xcf\x5c\x26\xe6\xfe\xf6\x03\x48\xbf\xea\xe5\x12\x71\xcc\x23\x87\x60\x67\x5f\x0a\x9d\x73\x26\xbe\x46\x40\x91\xd1\xbc\x4e\xae\xf4\xea\x57\xc0\x8c\xf5\x88\x13\xb6\x5c\x52\x40\x50\x63\xde\x7c\x9c\x37\x1b\x02\x7a\xcb\x8f\xf8\xd5\x0f\xf8\xcd\xc6\xd6\xf3\x3c\x39\x41\xc9\xde\x95\x5e\x35\xd3\x9b\x83\x77\x4d\x9c\xec\x5e\xe3\x1c\x0a\x80\xf5\x8a\x65\x52\x3d\xcd\xd4\xa7\xb5\x50\x4c\x17\x29\xfe\x08\xae\xf9\xc6\xcd\x4c\x8a\x6c\x2d\x62\xa6\x8b\x7c\xc4\x5e\x04\xdb\xf0\x1d\xba\xcd\x70\x27\x70\x9c\xcc\xb0\x64\xe0\x14\x31\xdf\x4e\xa4\x32\xd6\x62\x2b\x2d\x40\xb4\x3a\xf5\xa7\xb8\x71\x59\x82\x18\x7e\x3c\x7f\x5b\xd7\x79\x5a\x02\x4a\x40\x01\x90\x07\xb0\xd8\x4c\x2d\x59\x6e\x90\x7c\xd2\xfa\xa9\xd8\x7a\x2a\xa9\x37\x36\x4a\x0c\xc3\xfd\xac\x65\xcc\xe2\x62\x9b\xc8\xc8\xd9\xdd\x17\x9d\xb6\xf2\xe5\x21\x92\xb9\xff\xa9\x53\xc5\xe7\x77\xbd\x58\x03\x4c\x3a\x80\x34\x74\x30\xe7\xbd\x32\x77\x20\x93\x2a\x4a\x0a\x10\xb3\x28\x32\x91\x9e\xe5\xa9\x5c\xad\xc0\x01\xb7\x45\x17\xdf\x3f\xb9\xa0\x27\x2f\x3a\xbe\xbe\x20\xac\xfe\x4b\xf4\x4a\x46\x3c\x09\x51\x66\x3e\x3d\xe5\xd8\xcb\xec\xb6\x27\xa9\x2f\x00\xa4\xda\x0e\xb5\xb2\x32\x6c\x53\x01\x04\x7a\x73\x30\xe5\x73\x32\x77\xc7\xf4\x7b\xc9\xcc\x05\xdd\xaa\x80\xfb\xf2\x58\x70\xcf\x6d\x5f\x41\x24\xc2\x3e\xdb\xea\x3d\xa0\xde\xab\x82\x5c\x8c\x7e\x51\x22\x05\x0f\x16\xf2\x6f\xe6\x4d\x95\x06\xdf\xc4\x69\x40\x38\xa0\x98\xd5\x40\x59\x3a\x44\x1c\x96\x30\xad\xe4\xb3\x50\xdf\x9e\x0c\x32\x78\x40\xc4\xa3\xb5\x98\x5b\xbf\xfc\xd4\x26\xcb\x1d\x00\x03\x8d\x95\x25\x63\x0e\x4d\x29\x93\x40\xc0\x13\xe1\xd5\x09\x7b\x5c\xb7\x5d\x28\x30\xd0\x01\x8d\x37\x9d\x98\xc7\xa2\xa4\xaf\x7d\xf4\x7b\xf6\x32\xcd\x3e\xdb\x6d\x3b\xc2\x38\xbb\x10\xd1\x13\x7b\xbc\x9b\x62\x59\x96\xcc\x99\x31\x05\xd9\xda\x93\xcb\xb7\xde\xdd\x72\xbe\xfa\x15\x65\x73\x3d\xc5\xab\xd3\x04\x31\x1d\xa2\xcc\x34\x14\xae\x18\x23\x99\x39\xc1\xf4\x6d\xc2\x73\xcb\x99\x0e\x81\x78\x96\x6d\x80\x22\xbd\xc8\x03\x5d\x11\x12\x39\xee\xe3\x53\x00\xcb\x78\x39\xbc\x5a\x3d\xcd\x8f\x15\xcb\x70\x90\xe4\x43\x2f\x6f\xdd\x71\x9c\x55\xa2\x17\x50\x69\xdc\x9e\x17\xef\x30\x0d\x66\x5f\xa4\x32\x1e\x72\xb0\xd8\x31\xb9\x71\x5f\xed\xea\xa0\x93\x42\x76\x4f\x02\x9b\x2e\x31\xd4\x5a\xb9\x78\x55\x2b\xd9\xf6\xdd\xf2\x20\x35\x95\xb9\xdc\x94\xf3\x03\x2d\xcf\x2c\xc4\x95\x74\x87\xb6\x76\xfd\x5d\x8e\x9a\xe8\x7a\x6d\xf4\x9e\xb1\xf4\xe5\xd4\xdd\x93\x7c\x44\x81\x2b\x56\xe3\xba\x2a\xd7\x21\x64\x81\x76\xea\x10\xe6\x03\xba\xe5\x6e\x12\x4b\xf8\xcb\x5e\x33\x5a\x1d\xf7\x07\xca\x56\x1e\xc5\xde\xf2\x0a\x3b\xaa\xc8\xb5\x0f\x36\xc3\xfb\x4c\x81\x42\x2b\x44\x76\x83\xd9\x98\xc6\xb5\x0c\x93\x13\xab\x81\x61\xb0\x5b\x73\x00\x0e\x65\x10\x12\x66\x9b\x0a\x9b\xb6\xd8\x89\xdc\xd5\xf7\x25\x56\x3c\x01\xa2\xf2\xee\xad\xcb\x05\xce\xb6\x86\xd1\x91\x52\x40\x0c\x9d\x3c\x8d\x48\x6f\xb6\x5a\x09\x45\x58\x2c\xa5\x67\x8a\x1a\xb7\x12\x78\x2e\xb0\x5f\x82\xbc\x8f\x28\x9e\x82\x00\x4a\x91\xe9\xe4\x99\x32\x38\x01\xf7\x2c\x88\x67\x98\x0e\x9e\x1b\xd7\xd4\x5c\xc4\x20\xb5\x48\xf8\x67\x40\x84\x55\x74\xe0\x52\xb1\x92\x59\x2e\xc2\x2a\x81\xf0\xfb\x27\x93\xec\x29\xdd\xdd\xba\x86\xbe\x55\xb2\x67\x9f\x13\x66\x76\xed\x80\xfe\xec\xb6\x22\x9e\xba\xef\x75\x2f\x86\x4a\x21\x97\x37\x12\xa5\x53\x00\xd7\x00\x3a\x9f\x19\x52\x3e\x64\x8e\x35\xd6\x4d\x12\x15\xe3\x73\xa7\xb3\x04\x53\xb4\x2a\x78\xca\x55\x2e\x44\x36\x53\x94\xf7\x42\xea\x92\xb0\x3a\x17\x17\xd0\x4b\xa0\x89\x81\xae\x55\xa4\xb3\x1c\x99\x00\xe0\x2b\x4b\x2e\x93\x22\x6d\xbd\xed\xe0\xaa\x3c\xa8\xfc\xb0\x6b\x94\xce\xa1\x59\xd6\x34\x69\xae\x90\x25\xd8\x45\xae\x7a\xb6\x9a\xb5\x2a\xd7\x79\xb4\xbc\x82\x35\xb9\xfd\xe7\xdb\x85\xba\x5a\x6a\x5b\xfe\x35\x9b\x6f\xf5\x00\x8b\x47\xaa\xfe\x8d\x8d\x65\x5f\x6a\x21\x99\x8e\xec\xed\x97\x36\x1e\x5d\x9e\x3d\x41\xe2\x63\xdf\x4d\x70\x7f\x78\xf7\x4f\x7f\xdc\x9f\x1e\x69\xb5\x5d\xb0\x6a\xd7\x5c\xc5\x89\xb9\x21\xf1\xbc\x72\x02\x79\xbc\x0f\xdf\x58\x3f\xa1\x5d\x13\xcf\x62\x25\xe7\x51\x0d\x68\xbf\x6f\x9c\x2a\x08\xfd\xae\x17\xaa\x3e\xa5\x8c\x9b\x6f\xc2\x6b\xfa\x93\x9d\xb4\x9e\xdc\x86\x6d\x5f\x82\x4b\xb9\xfa\x0e\xdc\xfb\x8f\x75\x4b\x19\xd1\x56\xa4\xf3\xcb\x81\xbf\x8e\xdc\x8c\x80\xb3\x35\xc6\x2c\xa4\xea\x9b\x29\x92\x82\xc3\x9c\x1f\x24\x7b\x90\x8e\x22\x63\x7f\x70\xc5\x17\x7f\xf8\x17\x4b\x46\xb0\x63\x4b\x18\x6b\x60\xfc\xd0\x51\x54\xa4\x90\x90\xa3\xa0\x01\x13\x78\x36\x0d\x61\x54\x9d\xe0\x89\xec\x60\x14\xe8\x3e\x35\x79\x0f\x2e\x4a\x54\x7a\xa9\x07\x08\x0e\xa0\xa8\x9d\x3b\x0b\x89\x7d\x3d\xcd\x72\x96\xe5\x62\xdb\x68\x95\x4a\x4e\x57\x59\xb7\xf1\x08\xb7\xcb\xab\x46\xf6\xf4\x75\x07\xd8\xe8\x49\x70\x91\xfb\xcb\xfd\xcd\x35\xdb\xf2\x1d\x20\x92\x72\x4d\x82\x9b\xc0\xc7\x54\xdd\xbf\xfb\x66\xa0\xfc\xf2\xe5\xcd\x86\x63\x4a\x30\xc4\x96\xa8\x21\x77\x82\xba\x15\x3b\x04\x6b\x86\x96\xa4\xd9\xca\xa9\x4e\xce\xb6\x09\x57\x02\xb9\x73\xe1\xfd\xc7\xac\xf2\xf8\x30\xcb\xe8\xf2\x0d\x84\xe3\x80\x0e\xc0\x45\x9e\xd6\x42\x5a\xa8\x26\x44\x67\x59\x8a\xf2\xa8\xc4\x62\xab\x8d\xe8\x84\x5b\x7d\x44\x46\x5d\x1e\x99\x6d\x82\xc5\x85\x36\x59\xea\xf2\xed\x3c\x03\x28\xdc\x80\x89\xea\xd6\xcd\x9c\x29\x2b\x8b\xa6\x5f\x32\x16\x63\xf9\x65\x21\x33\x94\x9b\xc6\x50\x34\xc0\x52\xc8\xbe\x60\xce\x3c\xe5\x2a\x33\x13\x0a\xd1\x34\xf1\x2c\x14\xab\x17\xf3\x4d\x2f\xae\x5c\x66\x19\x27\x89\xb4\x38\x5a\x86\x3e\x70\xcc\x8e\xb9\xc0\x34\x0a\x39\xee\xa7\xb9\xfd\xc8\xb7\x5d\xc0\xf1\xa3\x5b\xdc\x37\x4b\xae\xf8\xbc\xea\x75\x82\xc4\x1c\xd0\xf3\x97\xd0\xe3\xe1\xe8\x3d\xaa\x23\xcd\x4f\x23\xef\xe5\x00\xa1\xfa\xd3\x14\x03\x0c\xb0\x3d\x01\x0f\x8c\x43\x75\x38\x7f\xd9\xec\x72\x20\x3f\x47\x41\x64\x78\xb9\x31\xbb\x17\x82\x7d\x76\x9a\xca\x9f\x49\x5c\x03\x80\x6a\x20\x8a\xdd\x36\xae\x53\xb5\xd4\xc7\x19\x83\x74\x55\x03\x42\x1d\x35\x2a\xcd\xfd\x3c\x16\x6a\x05\xd5\x0c\xea\x75\x4b\xf0\x1a\xdf\x6b\x0f\xb0\xea\xd6\xdf\xc9\x09\x98\x6f\x7b\x6a\xce\x67\x98\xe2\xc3\xb4\x7f\x4b\x8b\x24\x07\x99\x69\x20\x2e\x7c\x52\xfa\x45\xa1\x2f\x40\x4f\x62\x6f\xcd\xfe\x83\x03\x0c\x18\x08\x09\x5b\x55\xa0\x35\x7c\x07\x4c\x8a\x13\xf7\x6f\x76\x8f\x59\x0a\xec\x33\x50\x85\x67\xe0\xfc\x10\xc9\x37\x58\xf3\xb7\x93\x11\xfb\x71\xc4\xce\x47\x6c\x3c\x1e\xbf\x1b\x31\xc1\xa3\xb5\xed\x11\x7e\x05\x31\x4b\x39\x5f\x99\xb6\x9d\x14\xbd\x7f\x00\x30\xdf\x9b\xc3\xca\x12\x86\xf0\x40\xb0\xde\x47\x1e\xec\x2b\x60\x19\x03\xaa\x2b\xd9\x8c\x6e\xb4\xd6\xd2\x77\x0a\xc0\x81\x22\xd2\xa9\x85\x17\x66\xb9\x4e\x2d\x54\xea\x99\xa7\x5c\x2a\xa8\xee\xe2\x75\xa0\x28\x3d\x39\xe0\x77\x14\x5f\xf9\x06\xde\x5f\x2a\x47\x71\x65\x86\xe9\xc1\xf5\x3f\xdf\x6d\x65\x04\xe3\xf9\x92\xca\x3c\x37\xa7\x73\x36\x53\xf7\xec\x87\x7f\x63\x93\xed\x36\x11\x6c\xc2\xfe\xce\x7e\xe4\x8a\x2b\xce\x7e\x64\x7f\x67\xe7\x5c\xe5\x3c\xd1\xc5\x56\xb0\x73\xf6\x77\x33\x6c\xa6\xbd\x6b\x6d\x8e\xc3\xdd\x88\x71\xa6\x8a\x04\x4f\xfd\xb7\x16\x86\xf4\xce\xbd\x17\xf7\xb3\x63\xf5\x9c\x33\xbd\xa1\xa3\xf0\x17\x17\x0d\xcf\xa4\x5a\x25\x22\xb7\x2a\xea\x25\xc0\x18\x3e\xe0\x0c\xde\xf4\x87\x99\x72\xb1\xbc\x5f\x4c\x8f\x7f\x61\x7f\x67\xd7\x45\x92\x98\x2e\x19\x43\x63\x16\xd2\x0f\xcc\x02\xf8\x85\x1a\xbf\xc8\x27\xb9\x15\xb1\xe4\x00\xe1\x37\xff\x7a\xff\x00\xb3\x3d\x2f\x3c\x6d\x4e\xb8\xa7\x1d\xfd\xfa\x31\xa6\xe7\x55\xea\xb2\x1c\x0b\xbf\x9d\xfc\x8e\x9b\x5f\xf9\xab\xc3\x3d\x22\x4f\x16\x46\xfb\x81\x1c\x56\xa4\xce\x0f\xd9\xfe\x0f\x32\x01\x95\xc3\xd6\xb6\xd5\x70\x14\x84\x87\xfa\xb1\x46\x16\xc4\x23\x4e\x7e\x87\xec\xc1\xe4\xdf\xd7\xe4\xd6\x78\xc8\x4b\x95\x6e\xe0\x4b\xfa\x6a\xff\x5e\x59\x21\xc7\x3f\xfe\x73\x59\x3d\xa3\x34\xc4\x5a\xf6\x92\x19\xa9\x74\xf6\x91\x62\x17\x50\x27\x68\x2e\x32\x4a\x26\xef\xcd\x56\x7d\x7f\xad\x95\xb9\xb6\x66\x72\x85\x0c\x05\x00\x60\xc9\x80\x93\xcd\x3a\x05\x0f\x65\x97\x35\xd8\x02\xe0\x1f\x98\x2e\x21\xa8\x2a\x37\x56\xc0\x4c\x41\xb2\x9b\x29\xf3\x0d\x3a\x91\x00\x60\x2d\x1d\x91\x1d\x3e\xcd\x0a\x9a\xd2\xb3\xc8\x20\x07\x8d\x37\x2c\xb0\x2e\x0d\xd0\x23\x16\x1c\x15\x0b\x1d\x11\x15\xbf\x0e\x48\x5c\xa8\x35\x5b\xe1\x8b\xd8\xad\x85\x48\xb4\x5a\x99\x55\xd1\x66\x04\xf4\x86\xcb\x63\x20\x0d\x61\x17\xb0\xb1\xd6\x1e\x98\xc3\x92\x3e\x42\x53\x62\xce\x49\x19\xfb\xfb\x3d\x69\x4e\xbb\x88\xac\x3b\x0d\xe9\xe5\x5a\x5e\xe2\xc8\x7a\xd1\xc7\x4c\xa4\xc0\xb4\x88\xb9\x75\x17\xed\xc7\x83\xd3\xd7\xdb\xe2\x1b\xf5\xdb\x54\x9d\x90\xcc\xe6\x50\x08\x65\x13\x6c\x30\xd9\x05\xf5\x7a\xac\xc7\x5f\x13\x9d\xf9\x9a\x8a\xb0\x8d\xf2\xaf\xf0\x39\xd3\x1a\xfd\x68\xa8\xc4\xab\x1d\xbd\x53\x00\xd7\xbe\x20\xe3\xfb\x5c\x2f\x6d\x0d\x5f\xff\x33\xbd\xc6\xb9\xdf\x0f\x1f\x11\xf2\x6c\x86\xdc\xf4\xf5\x85\xd3\x96\x6f\xd0\x6a\x4e\x19\x89\x7e\x9d\xad\x0e\xd8\x8d\xfa\x80\x5f\xbf\xd5\x89\x8c\xba\xe1\x56\xf6\xb8\x5a\xeb\x97\x06\xfc\xca\x42\x00\xfe\x90\xe2\x3f\xd4\x29\xf4\xd0\x73\x11\xe5\x3e\xe3\x56\x7f\xb9\xdf\x20\x1e\x9d\x77\x70\x8c\x28\xbb\x61\x03\xdd\x27\x97\xc3\x83\xb3\x15\x38\xb6\x80\x5a\x16\x63\xad\x50\xc5\x05\xb9\xed\x88\x53\x08\xba\x34\xf2\x60\xa0\x5f\xd6\x3a\x31\x77\x31\x15\x13\x5f\xd9\x4c\x6d\x45\x1a\xe9\x84\xe7\xc6\xfc\xbf\x10\x27\x8d\x4c\x62\xcf\xdf\xfe\x16\xb0\xa4\x80\xf8\x7a\x47\x22\x35\xc2\xe5\x98\x6d\xf3\x1d\xa7\xae\x5d\x76\x56\xa8\xf2\xb8\x08\xd4\xe9\xc0\x61\x5d\xcb\xfe\x13\x81\x98\x70\x28\x88\x61\xa0\x92\x2d\x34\x83\x5e\xea\xcf\xa0\x08\x2f\x48\x49\x2e\xad\x14\x96\xbd\x38\xe5\x95\x79\xa5\x65\x56\x1d\x4a\xe0\x9d\xc3\x3a\x24\x04\x90\x64\x02\xba\xb3\x11\x1c\x7d\x31\xcf\x02\x45\x93\x3a\x53\x3e\x3f\xfa\x26\x0b\xfd\xb2\xc6\x79\x46\x5a\x35\x0b\x3f\x1b\xb1\x37\xa5\x17\x7d\x03\xbc\x64\x4a\xc3\xf3\x28\x87\x55\x1a\x1a\x58\xae\x23\x26\xf3\x99\x92\x19\xae\xcc\x54\x24\xe2\xd9\xf4\x2e\x0c\x16\x13\xd6\xc5\xde\x9d\xed\x6b\x03\x82\x99\xdb\xc2\x57\xa7\x6f\x0a\x9b\x30\x0d\xf9\xad\x38\x04\xa6\x63\x91\x19\xbf\x11\x98\xb9\xc5\x57\xb3\x01\x24\xe4\x42\x10\xfe\x11\x0b\x65\xfb\x07\xa8\x10\x94\x50\x9b\xa9\xe9\x12\xaa\x0f\xa1\xe6\x31\x8e\xf1\x16\x6a\xb9\x9a\x1d\xd9\x88\xa4\xe0\xb0\xa6\x3b\xb9\x93\xcf\x47\x8d\x25\xdc\x49\xe2\x59\xa4\xbb\x1c\x82\xba\x30\xae\x4a\xf0\x7c\xcd\x64\x3e\x02\x96\x18\x6b\x29\x67\x8a\xc7\x24\x51\x49\xcd\x99\xa1\x81\x75\xdf\x31\xcf\xf4\xfb\x85\x7e\xee\x72\x6c\x8f\x45\x7d\xe1\xae\xde\x26\x5c\xcd\xf1\x04\xf9\x15\x70\x5f\x81\xfc\x55\x5b\xaa\xb3\x58\xcc\xed\x12\x3b\x4d\x3f\x9d\xbd\xbf\x2b\x89\xd2\x19\x3f\xd6\x3e\x68\x84\x8b\xc1\x33\x5b\xda\xeb\x89\x8b\xd3\x10\xba\x20\x65\x36\x03\xdb\xdf\x0a\x78\x48\x18\xaf\x20\x11\xec\x6a\xdd\x87\x09\xb3\x2b\xe0\x7b\xc5\x27\xf5\x99\xf9\xca\x19\x52\x9d\xf6\xe1\xd0\x98\x9a\x87\x78\x10\x3c\x66\x4f\xb7\x5e\x17\x22\xd3\x1a\x47\xa9\x43\x65\xec\xdb\x06\xe9\x3e\x84\xed\x0b\x8c\xc3\xb9\x30\x4f\xb3\xbc\x59\x78\x0f\xd3\x0d\xd8\xca\x53\xc6\xa8\xc1\x4e\xf5\x8d\x94\xf8\xaa\x5f\xe8\xd7\x98\x4d\x15\xb3\xee\xde\x88\xbd\xc1\x85\x95\xbd\xa1\x10\x24\x69\xe4\x51\xee\x3c\xa6\xdd\x43\x75\x92\x55\x28\x06\xa2\xd5\xfd\x76\xc3\x4c\x50\x27\xbb\xd1\xab\x8e\xcb\x8f\x12\xd0\xf2\x87\x14\x44\x63\x16\x71\x81\x0d\xd0\x21\x89\xd7\xee\x1d\x3a\xed\xda\x47\xb3\xfd\x0b\xdb\x7c\x17\xfb\xd1\x7e\xd1\x0c\xd1\xb6\xa0\xf3\xd4\xfe\x9e\xe9\x74\xa6\x6c\x6b\x14\x92\xcc\x50\x4e\xa1\xda\x54\xc0\x4e\x43\x3e\x7f\xb0\x52\x01\xc4\x60\x15\x34\x40\x98\xc5\x53\xb0\x55\xad\x00\x80\x22\x16\xc2\xab\x7b\x8e\xd9\xc4\x3f\xcd\x38\x1e\x66\x81\x6f\xf0\x98\xaf\xd2\x34\x25\x89\x19\x14\x99\x5b\x56\xa8\x00\x58\x9f\x15\xc0\x6d\xb6\x2c\x8c\x31\x0a\x08\xe0\x66\xca\x0c\x1e\x5b\x4a\xc0\xfd\xd2\xb8\xcc\xd4\x47\x9d\xd9\x3a\xee\xcc\x8f\x87\xc5\x90\xd2\xb0\xbd\x71\x42\x22\xf4\x83\x0b\x38\xb4\x29\xe6\x5f\x51\x96\x85\x8a\x0a\x22\x63\xd8\xe9\x22\xf5\x2f\x15\x71\x35\x53\xff\x65\x86\x07\x75\x1d\x9d\x28\xaa\x5e\xe2\x16\xb6\x4a\xbc\xec\xed\x67\x6c\xf4\xed\xbf\xbc\xfb\xfc\x0e\xf9\x14\x8a\x0c\xb4\x9b\x46\xe5\x03\xc4\x71\x81\x16\x49\x02\x99\x68\xfb\x06\x8e\x06\xc1\x3f\x82\x77\xc1\x72\xe8\x52\x37\x57\x65\x17\xa3\xcf\x46\xef\x5a\xc1\x3e\xf8\x3c\x61\x11\xcf\xa3\xf5\x99\xf5\xe5\xc8\x8c\xd9\xd3\x8f\xa6\x0f\x45\x5c\x8c\xa7\xd5\x4c\x87\x69\x2e\x9c\xe9\xc6\x31\xc0\x97\xd6\x8b\x79\x05\x00\xd6\x3c\x54\xb9\xe1\x1d\x7f\x18\x2e\x4e\x2f\x4b\xea\xfd\x3c\xf7\x71\xab\xcc\xe2\x6f\x9c\x14\x25\x57\x7c\x23\x62\xf6\x06\x6a\x75\xde\xd8\xc9\x9f\xa9\xed\x62\x9c\xec\x96\x39\x91\x0b\x99\x41\x19\x83\x86\xc1\x9e\x53\x6e\x1e\xd7\xaf\x49\x7b\x06\xbb\xf5\xa2\xd5\xec\xeb\xb8\xb1\x71\x4f\xea\xef\xb0\x60\x8c\xcb\x8d\xce\x7d\x19\x22\x54\x26\x53\xe5\xd9\xd3\x88\x2d\x52\xae\x80\x7e\x3a\x0e\x9d\x2a\xbf\x3b\xe1\xf2\x8c\xcc\x3d\x94\xb1\xe2\x8a\x27\x3b\xc0\x8e\x8f\x66\x0a\x69\x8e\x80\x98\x70\x17\x25\x32\x42\x19\xe4\x8a\x1f\x24\x9e\x85\xca\x2f\xa9\xae\xdf\x82\xd4\x8f\x4d\x2d\x3b\x9e\x80\xa3\x08\x00\xa7\x65\x6f\x87\x7b\x02\x04\x1f\x61\x8d\x52\x01\xe0\xed\xc5\x2e\x00\xb5\xba\x05\x3e\x22\x35\x14\x60\x82\x62\x7f\x2b\x16\x3a\xb1\x54\x5a\xd3\x0b\xa6\x53\xa0\x13\xce\x35\xfd\x48\xc6\x6d\xa7\x98\x54\xb1\xf8\x7a\x54\x3d\x7b\xf7\x81\x64\xdd\x3b\xf3\x98\x80\xb5\xb6\xfa\xb2\xb0\x8b\x52\x61\x0e\x8b\xdc\xde\xe0\x6a\x9f\xca\xaa\x08\xbb\x49\x92\xaf\x01\xf6\x86\x80\x6b\x3f\xa8\x1b\xbe\x63\xd1\x9a\xab\x55\x70\x85\x06\x14\x92\xd8\xea\x14\x65\x77\x9e\x81\x38\x4a\xa7\xb6\x5e\x90\xaa\xe0\x08\xf5\xed\x02\xde\x08\xb6\xd4\xb6\xd4\x8d\xaf\x56\xa9\x58\x41\x09\xf7\x4c\x95\xea\x78\x81\x34\xcb\x32\xfe\xe2\x73\xba\xca\x20\x4f\xc3\x25\xd0\x76\x6b\xc9\xd3\x9d\x2b\x22\x23\xcd\x2a\x37\x74\xb5\x61\x1d\x31\x29\xc6\x23\xf6\x47\x0f\x30\x15\x91\x56\xae\x0a\xad\xf9\x1d\xb6\x95\xd0\xf4\x1e\x5b\xd4\x40\x3a\xd0\xdc\x77\xf8\x5d\x4d\xf9\xaa\x71\xd1\x74\x96\xf1\xe5\x3c\x2f\x06\xd8\x4a\x52\x37\x3c\x37\x5f\xbe\xc7\xef\x76\x62\xb0\xf9\xd6\x98\x37\x4b\xf8\x62\x3e\x6f\x2c\xbc\x79\xb6\x67\xe6\x6b\x1a\xeb\xbd\x81\xce\x44\xb7\x07\x3a\x4f\xe1\x52\xda\xaa\xfe\xfd\xb1\xce\xa4\xa5\x52\xbd\xe3\x9d\x86\x86\x32\x2d\x18\x95\x60\xe6\x59\xf5\xba\xd5\x60\x01\x9c\x1e\xbc\x4e\xd1\x6f\x47\xe4\x86\x2b\x98\x2f\x19\xc9\xa6\x03\xa1\xc4\xfa\x01\x1a\x97\xdf\xea\x6e\xdc\xc6\x37\xd2\x3c\xfc\x8f\x2d\xf7\x62\xeb\x99\x34\x0d\x7a\xb8\x3f\x71\x9c\xd2\x81\xe7\x94\x7b\x3c\x72\x9e\xdb\xe0\xa6\x4e\xe5\x4a\x2a\x9e\xeb\x94\xbd\xbd\xb5\x44\xc1\xef\x1c\xb9\x3d\x8c\xe2\x29\xcc\x44\x69\x88\xd0\x4c\x34\xdf\xbd\x00\xcf\x2c\xe2\xf9\x30\xd6\xa6\x26\x8d\xe6\xbd\x78\x7d\xf3\xa9\x2c\xe7\x9b\x6d\x48\x38\xe8\xa4\x03\x69\x64\x12\x1c\x04\x66\x3b\x06\x31\x3e\x99\xf9\x1a\xac\x99\xa2\xc8\x38\xce\x9b\x4e\xed\xe0\x81\x6f\xdb\x76\x36\x6f\x8b\x7c\x7e\x20\x89\x06\x91\xef\x0e\xa4\x21\xac\xa6\x50\xef\xae\x6c\xc2\xc0\xdf\x0b\x4a\x8e\x36\xbc\x28\xf2\x9f\x65\x70\x6a\xe3\x15\xcf\x99\x0d\x73\x4a\x5a\xae\x80\xf3\x44\x17\x31\x23\xa3\x41\xe9\xd8\x74\x8c\xa7\x0f\x10\x12\x8e\xc7\x6d\xec\x4c\x03\x45\xc1\xdc\xfe\x86\xef\x35\xaf\x70\xf8\x5d\x8b\x85\xeb\xdc\x5a\x34\xb2\xc3\x62\x4f\x84\x44\xf8\xc8\xb7\xdd\x8c\x0f\xdc\xde\x9c\xb1\xc0\xc7\x99\x3b\xeb\x05\x96\xf7\x7e\xcb\x70\xb9\x68\x28\xb0\x23\x0d\x0b\x94\xc1\xbd\x44\xc6\x09\xac\xe7\x30\x90\xdc\xc0\xdf\x58\x4a\xd0\x65\x4f\x47\x3f\xce\x56\xb2\x76\x3f\x6a\xcb\x53\xa1\xf2\x39\x3c\x71\xd8\xc3\xe0\x21\xb7\xf0\xf5\x92\x43\xd2\x2b\x20\xf8\x1f\x0f\x1a\xe3\xbc\x96\x0a\xe1\x3f\xd9\x3d\xc5\x36\x32\x2b\x1c\x6b\x4e\x9f\xb7\x12\xb0\x27\x41\x4e\xcc\x4d\x5c\xcb\x74\xd1\x0b\x1d\x30\x7a\xc1\x0b\x95\x4c\x67\xaf\x17\xf2\xbd\x47\xe1\x0f\xd3\x0a\x85\x79\xa8\x82\xd2\x98\x32\xfb\x33\xbf\xe6\xb0\x2a\xd9\xa7\xa3\x19\xcf\x99\x99\xbf\x84\xfd\xb7\x48\xb5\x2f\x0b\xc0\xa0\x45\xd8\x70\xa7\x3f\x7c\xb8\xc4\x16\xfa\xbb\x28\xee\x14\xaa\x9b\xc0\x4f\x88\x6d\x02\x6f\x96\x8b\x9d\x75\xf7\x5b\x52\x09\x5b\x11\xe1\x3c\x1c\x78\x6c\x06\x17\xbb\xc0\xbe\xdb\xd0\x97\x3b\x2c\xec\x06\x7d\x0f\xf7\x56\xe2\x73\xdb\xf0\x2d\xe1\xbc\x08\x52\x5a\x0d\xe2\x8f\xe1\x25\xfe\xe3\x97\xff\x1c\xb7\x89\x27\x42\xd7\x87\xc2\x66\x5c\xe7\x3f\xa4\x52\xa8\x18\x92\x72\x3c\xae\xb3\xac\xab\x52\x94\xb6\x64\x9e\xcd\x32\x3c\x49\xf5\x5c\xf3\x39\x98\xcd\x71\x11\x7d\x83\xcc\xae\x37\xb2\x6e\xfb\x96\xf2\x3e\x6d\x47\x75\x36\x8f\x77\x8a\x6f\xea\x72\x93\xaf\xda\xc7\x9d\x14\x49\x0c\x5d\xa4\xa7\xef\xcb\x4e\xc4\x22\x7a\x1a\xea\x13\x1c\x4c\x4d\x2c\xa2\x27\xf6\xd3\xc3\xc7\x2b\x94\x04\x92\xd9\x4c\x5d\xf3\x5c\x3e\x8b\xc7\x34\x71\x61\x61\x34\x3e\x45\x9a\xd8\x3d\x52\xa6\xca\xc4\xea\xbf\x02\x54\xcc\x89\x57\xd3\x3a\x0e\x21\x93\xf1\x66\x77\xb6\x28\xa2\x27\x91\xbf\x4f\xb9\x8a\xf5\x06\x5f\xe3\x7d\x56\x2c\x97\xf2\xeb\x38\xe7\xe9\xbb\x7d\x98\xfe\xbd\x96\xf4\x88\x4b\xc2\x31\x06\xa5\x7e\x0d\x70\x42\x4d\xde\x36\xcb\x38\x94\x6a\x77\x96\xd9\xf3\x44\x3a\x93\x02\xf1\xc6\x96\x8b\xc8\x98\xfa\xd9\xf0\x84\x01\xa3\xd7\x7c\xb0\x7e\xa3\x2b\x56\x1b\x63\x65\x9f\xee\xdb\x08\xe1\xad\xd6\xc9\xb1\x51\x42\x9e\xd8\x4d\x32\x07\xc5\x99\x63\x5c\x70\x5c\x00\xee\xb2\x3d\xbd\x70\xf9\x2a\x47\x01\x49\xb1\x06\xa7\xf7\x06\x50\x0a\xea\x02\x00\x18\xa0\x13\x1d\x28\xcb\x6c\xdb\x90\xb0\x1c\x88\x16\x85\x36\x10\xe9\xe0\x74\xf4\x6b\x61\xcb\xa0\xfe\x97\xfb\x3e\x02\x4d\x56\xa5\x87\x83\x02\x08\xa8\x0f\x53\x79\x94\x0b\x26\x84\x74\x7a\x6e\x1c\x83\x67\xdb\xf1\x44\x55\x3a\x63\x73\xc8\xf3\x99\xa9\xc0\xcb\x41\x26\x12\x0b\xc7\x75\xa3\xd6\x14\x63\x28\x2d\xc3\xa3\x63\x0c\xc7\x70\xa6\x76\x06\xa1\x2f\x42\xf5\x21\xc8\xa3\x46\x7a\xb3\x30\xf7\x7c\x2c\xef\xa4\xc0\x1b\xb8\x67\x13\x4b\x49\xe5\x82\xa4\xd6\xcd\x42\x4e\xec\xca\xd8\xbb\xa3\x21\x64\xf7\x0a\x4d\xd6\xbe\x2b\x4c\xe8\x13\x9f\x96\xde\xb5\x05\xd9\x57\x7d\x03\x69\xae\xb3\x2f\x7c\x97\x81\x54\x93\x30\x56\x71\x89\xc1\xa6\x72\xff\x47\x3e\x04\xe2\xe8\xce\x48\xf7\xb0\x20\x05\x37\x7a\x17\x89\x35\xef\x22\xb1\xa2\x54\x9e\x4b\xe4\x4d\xd6\x3c\x38\xbf\x4e\xfc\x38\xed\x8c\x1f\x63\x02\xe7\x7f\x47\xc8\xb8\x23\x30\x75\x64\x7c\x2c\x38\x26\x53\x1d\x89\xcc\xa6\xd8\xa1\xe8\x01\xcc\xb1\x79\xf6\x88\x6d\xb8\x54\xb4\x0d\xf2\xd4\x18\xc8\x58\x2c\x8a\xd5\xaa\x35\x6c\xf3\xfd\xc7\x7f\xcb\xfb\xe4\x9f\x3e\x3e\xd7\xc9\x86\x73\x8a\x08\xdb\xd4\x3e\x09\xd3\xc6\xc6\x57\xfe\x36\x41\xb5\x13\x45\x08\xa7\x7d\x22\x84\x16\x77\x00\xe5\x1f\xe4\xe2\xdb\xdc\xf0\x6f\xa1\xc3\x6f\x13\x3a\x6c\xcc\x8d\x54\x7b\x88\x94\x03\x73\x59\x76\x80\x3b\x7a\x78\x20\x73\x91\xa3\xb8\x83\x5e\x91\x48\x61\x26\x54\x9c\xb1\x05\x8f\x5e\x81\xca\x08\x4e\x9f\xe3\x63\x14\x7b\x12\xde\xf7\x7a\x23\x18\x3c\x2a\x43\x26\x70\x46\x15\x36\x23\x40\x52\x99\x17\xf4\x59\x62\xca\x41\xc3\x71\x85\xd9\xea\xd8\x3b\xad\x6f\x95\x78\x61\xe6\x34\x18\x85\xd0\x92\x60\x7a\x40\x22\xe2\x1d\xa9\x8c\x7b\x1c\xaa\x2b\x27\x4e\xc5\x8a\xa7\x31\xa0\x9f\x69\x4b\x26\x3c\x7a\x32\x7f\x87\xfe\xd1\x13\x09\xfe\x62\xd9\x6a\x11\x92\xe5\x5b\x93\x2a\x42\xc5\x67\x42\xda\xf8\xfe\xe1\xd7\x33\xc6\xa3\x54\x67\x78\x8b\x77\x2a\x68\x50\x7d\x07\x0e\xe2\xb3\x8c\x0b\x9e\xe0\x13\x5b\xa3\x7f\x3c\x3b\x8a\x7d\x77\x12\x88\x20\x88\xaf\xdb\x84\xab\xf2\x9e\xc4\xd7\x05\xfe\x0c\xd9\x59\x62\x42\x34\x50\xdf\x94\xce\x2e\x54\x0e\xf6\xdb\x0a\xbd\xcf\x54\xf0\x78\x17\x92\xe5\x48\x45\x72\xa0\x3c\xde\x48\x65\xa6\xde\x6a\xdc\x38\xfb\x0a\x4d\x47\x3c\x41\x10\x18\x50\xc1\x27\x49\x65\xeb\x67\x4c\x09\xe3\xb2\xf0\x54\x26\x3b\xf0\x52\xb7\xa9\x38\x0b\x9e\x13\xec\x6f\xc2\xa0\xcb\x6c\xa6\x6c\x61\x77\x91\x89\x65\x91\xa0\x2f\x0b\xb7\x3d\xf7\x02\xb4\x0f\x1f\xa7\x23\x73\x8c\xe5\x44\xc0\x1c\x3c\x18\x65\x4d\x4e\x81\xe7\xad\xdf\xb3\x7a\xc5\xbc\x3d\x89\x53\x0a\x70\xc3\xb5\x7e\xb1\x45\x07\x2f\xdc\xa3\xca\xda\xce\x92\x93\xc5\x39\xbb\xbd\x1a\x7b\x9f\xb0\xbb\x12\x07\xbd\x2c\xdd\x4d\xbf\x13\xb1\xdb\x89\x52\xc1\xeb\x90\x22\x18\x61\x50\x44\xcc\x8a\x0c\x6b\x17\xcc\x1c\x82\xb5\xb6\xd7\x66\xac\xe6\xb0\x6a\x72\xcc\xbd\x9d\xcc\xb4\x62\xb3\xe2\xf7\xbf\xff\x93\x60\xbf\x27\x79\x58\xb0\x32\x18\xa1\x06\x1a\x27\x6c\x1d\x0c\x94\x7b\x80\x40\x8e\xa7\xda\x8c\xb0\x26\x10\x96\xad\x9c\x04\x18\x13\x8f\xd6\x2c\x2b\x16\x88\xd1\xe1\x14\xe4\xe4\xca\xb1\x24\x5e\x69\x80\xdb\xe0\x39\x66\x7b\x3f\x20\x58\x70\x4b\xe7\x8b\x0d\x04\x04\x38\x41\x18\xe8\x50\x54\x0a\x06\x05\x5f\x12\x0c\xf8\x2d\x28\x4b\x8d\xd8\x4f\xf2\x59\x8c\xd8\xfd\x96\xa7\x4f\x23\x76\x81\xe1\xd6\xbf\xe8\xc5\xde\xfb\xff\x29\x62\x60\xce\x4d\x3d\x56\x43\x15\xa3\x49\xa3\x80\x1b\x34\x08\xf1\xd7\xa3\x35\x16\x61\x01\x5a\x3d\x28\x52\xbe\x4f\x3f\xa7\x95\x40\xf6\x54\xb7\x98\x76\x58\x5f\xeb\x9d\xa6\x6a\xa5\xfd\x79\x4a\x55\x53\x4d\x48\x13\x73\x8e\xc1\x4a\x34\x2f\x7e\x06\x9e\x89\x4e\x5d\x65\x5f\x46\xe1\x67\x5c\x15\x88\xbf\xc3\x13\xb9\x52\x0b\xd7\xd7\xf1\xb2\x0f\x9e\x6f\xb5\x4e\x1a\xfd\xaf\x93\x0e\x60\x2d\xda\xd9\x77\xf0\xa6\x58\x43\x90\x85\x5e\x89\x1d\x45\x1f\x39\xf3\x71\x36\x0c\xaa\x01\x19\x00\xac\xa6\xb8\x80\x24\x82\x1f\x8e\x50\xce\xc8\x98\x15\x44\x3d\xa2\x23\x62\xd5\xef\xb8\xf5\x10\x8d\x13\x45\x21\xc4\x10\x6d\x57\x8b\xe9\x65\xf5\xe7\xb4\xb8\x85\xd0\xee\x5c\x36\x55\xfe\x0f\xdd\x5c\x80\x23\xae\x07\xea\xb1\xe7\xd6\x80\x5b\xdc\xf9\x3e\xde\x43\x5b\x64\x37\x8f\x12\x9e\xf5\x44\xb2\x35\xda\x9d\x29\x35\x74\x0e\xed\xf4\xb7\x99\x3f\x41\x4c\x75\xd3\xf3\xc0\x9c\xa9\x89\xe3\xfd\xf3\xae\x96\x73\x0f\xd1\xcc\xa2\x63\x5c\x9b\x1a\x04\xb3\x7b\x92\xc8\x11\xcb\x8a\x68\x0d\x70\xfd\xb2\x9d\x0a\xed\x56\x7d\xc7\x8e\x66\xca\x38\x2b\xa8\x7a\xc2\x21\x21\xfc\x02\x04\xf9\xf2\xbf\x85\xf3\x86\x08\x15\x1a\x3a\x40\x0b\x6e\xa6\x46\xab\x46\x67\xd1\x56\x4e\xf0\xf4\x49\xc4\x41\xa8\xaf\xd8\xc6\x3c\x37\xde\xb3\x3b\xe4\x60\xfd\x3a\xc2\x54\xeb\x7d\x66\xe1\x8b\x85\xce\x72\xc5\xd2\x26\x72\x29\xa2\x5d\x54\x23\x42\x29\xc1\x30\x4e\x17\x53\x3e\x2c\xa4\xda\x45\x98\xd1\x7c\x53\xfe\x54\x2b\xf0\x66\x6d\xb9\xeb\xff\x9d\x88\xb5\x16\xce\x86\x7f\xf6\xa8\xd8\x9e\x34\xf3\x6f\xe0\xb3\x7f\xca\x08\x52\x37\x5d\xc3\xef\xc2\x3f\xad\xfd\xb2\xf8\x2e\xb8\xb1\x92\xd7\xdc\x88\x2a\xfb\xbe\x0a\x54\x65\x1c\xee\x1b\x64\xd9\x6c\x49\xc4\xef\xd9\x0a\x54\x06\x1c\xbb\x12\xe5\x01\xa0\x74\xfa\xaa\x1d\xaf\xf3\x44\x67\x45\xda\xbd\xf9\xef\xca\xbd\xb6\x4f\x6f\xa0\x6c\x84\xc5\xb6\x59\x08\xa8\x3e\xef\x82\x8f\xec\x73\x14\xcc\x7d\xa9\xfa\x7d\xc2\x5b\xbd\x08\x16\x21\x54\xbe\x45\xc3\xaa\xf6\xbd\x20\x06\x02\x27\xef\x4a\x84\x5e\x40\xe5\x70\x2c\x2d\xae\x52\xbe\xef\xbb\xc2\x74\x37\xde\xc1\x2a\x34\x41\xa5\x70\x59\xaf\x0c\xe9\x29\xb2\x0f\xb7\x3c\x5f\x63\x20\x67\xa3\x73\x12\x13\x47\xbe\x12\x84\xf1\x60\x4a\x62\x91\xe8\x05\xc8\xd2\x81\x6a\x7c\xdb\x3a\xa7\xc5\xd9\x6b\xe8\xea\x13\xd6\x67\x6d\x9b\xfd\x00\x35\x7f\xa9\xc8\x80\xfa\xa1\x9e\xf3\xeb\x8b\x90\x1d\x16\x6c\xaa\x77\xd7\x98\xad\x8b\x5a\xb0\xa9\xce\x15\x6e\xac\x3a\xc0\x25\x2f\x0f\xa8\x91\xb8\x0c\xeb\xe6\xcc\xf1\x46\xb4\xa9\x94\x54\x47\xe6\xc4\xca\xfb\x5a\xdd\xcf\x99\x9a\xe0\x6f\x4a\x2a\xf9\x4e\x13\xc3\x21\x12\x49\xe2\xcd\xed\x3f\x2c\xa4\x63\x93\x10\x03\x47\x7e\xfd\xc8\xdf\xb8\x20\x3c\x32\x82\xba\x35\x95\xcb\xd4\xf8\xd3\x19\xb8\x0b\x59\xb1\x38\xf3\x14\x09\x3a\x05\x07\x03\x18\x34\xb6\x1c\x74\x9e\x80\x39\xe5\xac\xe1\x20\xc1\x38\xb4\xe7\xb6\xb7\x54\x62\x3c\x21\xf3\x05\xf7\x42\xac\xd1\x75\xef\xee\xda\x31\xee\x3d\x44\x91\x6c\x7d\x28\x9a\xeb\x2e\x7b\x51\xba\x2c\xfd\xda\x00\xa5\x1e\x08\xa0\x16\x4d\xa4\x7f\x7e\x3b\x51\x1a\xb3\x3e\x76\xe2\xa1\x7c\xb5\xb2\xbb\xc6\x5c\x0e\xc9\x72\xb4\xa3\x38\xbf\x2d\xd0\x14\x26\x30\xdb\xf2\x17\x45\xd4\x04\xdd\xdc\x8e\x07\xd9\x87\x66\x5d\x60\x63\x1f\x6a\xd0\x2c\x6f\x29\x14\x91\xfc\xe4\xd2\x09\x08\x8d\x02\xd5\x47\x9e\x24\x21\x4d\xb6\x0f\x05\xcd\x94\x0f\x18\x98\xe3\x3f\x49\xcc\x9f\x51\xd5\x70\x13\x11\x45\x0c\xb5\x73\x62\x64\xeb\xe8\x89\x81\x8a\xd2\x48\x67\x78\x31\xf7\xd7\xe7\x7d\xbb\xf9\x54\xfe\xe4\x77\x56\x42\xb8\x27\x61\x8b\x8f\x9d\x3f\x89\xdd\xe0\xbe\x36\xa7\x4c\xbc\xae\x1c\xa8\xe8\xbb\x5a\xee\x88\xa7\xa9\x05\xec\xd2\x53\x19\x4f\x73\xb9\xe4\x51\x29\x82\xde\xd2\xcf\xb5\x88\x9e\xb6\x5a\xaa\xc1\xb6\x28\xe8\x8f\x39\x91\x72\x91\xe5\xcc\xb7\xe6\xe0\xc8\xbd\xf8\x1b\x4b\x07\x33\xbe\x48\x06\xa8\x04\x8b\x58\xf4\xfc\x3a\x9c\x39\xe1\xbc\xf6\x65\x77\xea\xab\x8c\xf0\x67\xc3\x2b\x84\x65\xba\xe3\x95\x68\x35\xea\x47\x73\x29\xa0\xcd\x6b\x85\x1c\x3d\x07\x9b\xb3\x12\x2b\x55\xe3\x90\x42\x34\xe2\xb7\x4b\xe2\xff\x7b\x97\x44\xc0\x45\xbc\xe6\x0d\xb1\xb9\xbc\xec\xb7\x33\xe2\xfb\x3a\x23\x90\xa5\x09\x71\xf3\x43\x86\x96\xba\x7a\xe7\xbf\x7e\xdc\xe0\x0a\x16\xf4\x24\x1b\x30\xce\xdf\xf0\x8c\x0b\x1e\x4b\x5b\x64\xa0\xf1\xe8\x6d\x74\xbb\xb3\x81\xfe\x14\xf5\x1e\x6d\x50\x3a\x55\xdb\xbe\x61\x48\x28\x0f\x97\x8e\xb9\x48\xf4\x0e\x27\xb6\x57\xa7\x7e\x57\x49\x91\x3e\xa7\xa4\xb1\x8c\x2e\x4d\x72\x6d\x2d\xa2\x12\x98\x2e\xec\xb0\x8c\x01\x2b\x20\xcf\xdf\x64\x6e\xd4\xcb\x16\xd0\xe2\xf3\xae\x64\x96\xff\x5c\xd1\x9c\x39\x4c\xb4\xe6\xd5\x32\xfb\xb6\xab\xd8\xcd\xe0\x1b\x9d\x09\xe9\xbb\x72\xca\x58\x2f\xed\x9a\x03\xda\x20\xab\x32\x60\xfa\x3d\xe4\xbc\xfa\xec\xc6\xeb\x33\x3a\x83\x2f\x29\xdf\x6e\x45\x6a\xf3\xa0\xb5\x54\x35\x50\xf6\xc3\x53\x40\x73\x63\x2d\x50\xf8\xab\x72\xa4\x1a\x53\x52\x69\x1a\x3e\x06\x43\x37\x6e\x9e\xb9\xeb\x22\x49\x5a\x67\x6e\x3f\x13\xf8\xf5\xe3\xd5\xd5\xfc\xe7\xc9\xd5\xe3\x65\x27\xb3\x76\xf0\xb1\xd6\x31\x71\x3d\xa1\x31\xf1\xda\x1d\xe6\xb1\xc2\x8a\x8f\x69\xff\xd6\xe8\x51\x17\x49\x52\x66\x5d\x9f\xa9\xcf\xd4\x0e\x80\xca\x50\x51\xc6\x8c\x1b\xeb\x1c\xb8\xf2\xf3\xe1\x63\x9f\x4d\xe3\x9f\xf1\xbb\x67\xcc\xbf\xc4\x0f\xa0\x0d\x42\x9a\x03\xcd\xe3\x4a\x88\xd5\x23\xb6\x03\x42\x98\xda\xb6\xc3\xa9\x75\x25\x0e\xdb\x1e\x8f\x0a\x18\xed\x44\x6c\xe5\x20\x4e\xb2\x3b\x70\xec\x3e\x97\xa3\x8b\xce\x96\xc7\x18\x21\x82\x76\x47\xa8\x06\x00\x1a\x67\x9e\x30\x7f\xa6\xf0\xc2\x65\xfa\x94\xeb\xf6\x3e\xb1\x29\xa1\x03\x12\xae\x56\x05\x5f\x89\x6c\xc4\xec\xc3\x67\x6a\x23\x57\x6b\xe0\x0e\xcc\x8a\x2d\x81\xdd\xf0\x8a\x02\x65\xa6\x95\x25\x54\x41\xbb\x49\x35\x53\xf4\x4e\x6a\xe5\x9b\x47\xcc\xd7\x5f\xee\xdd\xeb\x10\x94\x0e\x1b\x22\x41\x03\x35\x53\x38\xb9\x48\x50\x6c\xc3\x2e\xe0\x2f\xf3\xbc\xba\x74\x39\x08\x5e\xa1\xe8\x9f\xb1\xe9\x2b\x08\x00\xcd\x94\x2b\x53\x41\x50\x1e\xbd\x43\x40\x7c\x8b\x5d\xda\x6f\x4f\xec\x64\xd8\x3d\x41\x7d\x6b\x5e\xf5\x47\x9f\x01\x66\xc3\xcd\x07\xa8\x97\xd5\xcd\x58\xcf\xab\x09\x0f\x0c\x47\x5b\xed\x22\xd4\x26\x35\xf7\xc6\xbe\x17\x7e\xa6\x35\xa5\xae\x8b\x45\x32\xa0\x4b\xf8\xf9\xce\x4e\xa1\x49\xee\xee\x54\x8f\x98\xeb\x5d\x65\x6b\x99\x65\xda\xf5\xd8\x85\xd6\x2d\xf3\x72\xc2\xe8\x65\xa9\x53\xf4\x85\x7d\x83\x51\x44\xf9\x21\xeb\xa5\x47\x41\x41\x75\x88\xac\xf5\xe9\xea\x50\x22\xb3\x83\xba\xe3\xfd\xa7\xde\x3d\x72\x1e\x02\x1d\x76\x83\x2c\x2c\x9d\x73\x25\x03\xdb\x62\x26\x29\x78\x65\x65\xc0\x24\x9a\x17\xb3\x79\x50\xa3\xcb\xac\xff\x91\x5b\x44\x23\x3f\x73\x23\xe8\x64\x54\xa4\x99\x31\x97\x64\xef\xc8\x6a\xeb\x94\xf1\x99\xb2\x7c\xb2\xd6\x1c\x4f\x2c\x28\x20\x75\x3f\xc5\x22\x8d\x2d\xf2\x31\x82\xc7\x9a\x33\xad\x84\xb5\x86\x33\x65\xb5\xe3\x46\x8c\x2f\x32\x2b\xc9\xc6\xd5\xce\xe9\xa4\x49\x27\x82\xc1\x15\x03\xb4\xc5\x7e\x9b\x57\x71\x03\x4a\xe7\xfc\xef\xcc\x7f\xff\xf8\xdd\xff\x0d\x00\x00\xff\xff\x24\xee\xa6\x9d\x9a\x77\x04\x00") +var _adminSwaggerJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x23\x37\x96\x2f\x0c\xff\x3f\x9f\x02\xb7\xfa\x46\xd8\xd5\xa3\xc5\x76\xcf\xf4\xdb\x57\x13\x37\xde\x87\x96\x58\x65\x5d\xab\x24\xb5\x16\x7b\xfc\x5c\x76\xd0\x60\x26\x48\xa2\x95\x09\x64\x03\x48\xa9\xe8\x8e\xfe\xee\x4f\xe0\x60\x49\xe4\x46\x26\x17\x49\x54\x39\x67\x22\xda\x2a\x66\x26\xd6\x83\x83\xb3\xfe\xce\x3f\xff\x0d\xa1\x77\xf2\x09\xcf\x66\x44\xbc\x3b\x41\xef\xbe\x3b\xfa\xe6\xdd\x81\xfe\x8d\xb2\x29\x7f\x77\x82\xf4\x73\x84\xde\x29\xaa\x12\xa2\x9f\x4f\x93\x85\x22\x34\x4e\x8e\x25\x11\x8f\x34\x22\xc7\x38\x4e\x29\x3b\xca\x04\x57\x1c\x3e\x44\xe8\xdd\x23\x11\x92\x72\xa6\x5f\xb7\x7f\x22\xc6\x15\x92\x44\xbd\xfb\x37\x84\xfe\x05\xcd\xcb\x68\x4e\x52\x22\xdf\x9d\xa0\xff\x6b\x3e\x9a\x2b\x95\xb9\x06\xf4\xdf\x52\xbf\xfb\x37\x78\x37\xe2\x4c\xe6\xa5\x97\x71\x96\x25\x34\xc2\x8a\x72\x76\xfc\x77\xc9\x59\xf1\x6e\x26\x78\x9c\x47\x1d\xdf\xc5\x6a\x2e\x8b\x39\x1e\xe3\x8c\x1e\x3f\x7e\x7b\x8c\x23\x45\x1f\xc9\x38\xc1\x39\x8b\xe6\xe3\x2c\xc1\x4c\x1e\xff\x93\xc6\x7a\x8e\x7f\x27\x91\xfa\x17\xfc\x23\xe6\x29\xa6\xcc\xfc\xcd\x70\x4a\xfe\xe5\xdb\x41\xe8\xdd\x8c\xa8\xe0\x9f\x7a\xb6\x79\x9a\x62\xb1\xd0\x2b\xf2\x81\xa8\x68\x8e\xd4\x9c\x20\xd3\x0f\x72\x4b\xc4\xa7\x08\xa3\x13\x41\xa6\x27\xbf\x0a\x32\x1d\xbb\x85\x3e\x32\x0b\x7c\x01\xa3\xb9\x4e\x30\xfb\xf5\xc8\x2e\x13\xb4\xcc\x33\x22\x60\x6e\xe7\xb1\x6e\xfd\x23\x51\x03\x68\xb6\x78\x3f\x7c\x5b\x10\x99\x71\x26\x89\x2c\x0d\x0f\xa1\x77\xdf\x7d\xf3\x4d\xe5\x27\x84\xde\xc5\x44\x46\x82\x66\xca\xee\xe5\x00\xc9\x3c\x8a\x88\x94\xd3\x3c\x41\xae\xa5\x70\x30\x66\xaa\x7a\x63\x71\xad\x31\x84\xde\xfd\x4f\x41\xa6\xba\x9d\x3f\x1c\xc7\x64\x4a\x19\xd5\xed\x4a\x43\x3f\xc1\x68\x4b\x5f\xfd\xeb\xdf\x9a\xfe\xfe\x57\x30\xa3\x0c\x0b\x9c\x12\x45\x44\xb1\xe3\xe6\xff\x2a\x73\xd1\x7b\xa4\x3b\x2f\xf6\xb1\x3a\xf0\xca\x6c\x2f\x71\x4a\xf4\x9e\xe8\x9d\xb2\x5f\xc0\xdf\x82\x48\x9e\x8b\x88\xa0\x09\x49\x38\x9b\x49\xa4\x78\x6d\x0d\x28\xb4\xa0\xc9\xab\xfa\x44\x90\x7f\xe4\x54\x10\xbd\x57\x4a\xe4\xa4\xf2\x54\x2d\x32\x18\xa4\x54\x82\xb2\x59\xb8\x14\xff\x3a\xe8\x34\x35\x43\x95\x6b\xcc\xcc\x7c\xd0\x3a\xb1\x11\x1b\xb8\x57\x22\xcc\xd0\x84\x20\x7d\x16\x69\x4c\x04\x89\x11\x96\x08\x23\x99\x4f\x24\x51\xe8\x89\xaa\x39\x65\xfa\xdf\x19\x89\xe8\x94\x46\x6e\xcd\xf6\x67\x6d\xe0\xcf\xe5\x2b\x73\x2f\x89\xd0\x03\x7f\xa4\x31\x89\xd1\x23\x4e\x72\x82\xa6\x5c\x94\x96\xe7\x68\xc4\xee\xe6\x7a\x1d\xd2\x09\x65\x70\xf2\xf4\x5a\x3a\x0a\xf9\x77\xb7\x5c\xff\x8e\x74\x7f\x28\x67\xf4\x1f\x39\x49\x16\x88\xc6\x84\x29\x3a\xa5\x44\x56\x5b\xfb\x77\x0e\xfd\xe3\x04\x1d\x22\xbd\xce\x44\x28\x58\x6f\xce\x14\xf9\xac\x24\x3a\x44\x09\x7d\x20\xe8\xab\x0b\x2a\x15\x1a\x5c\x9f\x7f\x75\x80\xbe\x32\xe7\x05\x01\x6f\xfa\xea\x05\x56\xd8\xff\xfd\xb7\xe0\xe8\x29\x3c\xab\x1e\xba\x77\x03\x7d\x9a\x6f\xcd\xd5\x50\xb4\xf0\xb7\x7f\x0b\xdb\xb1\xfb\xb5\x9c\xdf\x16\xcc\xd6\x72\xda\xae\xfc\x15\x96\xa9\xcc\x5a\xa5\xde\xa1\x6d\x39\xab\x6e\xb7\xca\x5a\xe5\xdb\xe2\xad\x7a\x0a\xcf\xcd\x5f\xb7\x61\xae\x58\x01\xd5\x63\xca\xcc\x21\xf1\x67\x46\x48\x7d\x4e\x1c\xf5\xee\x09\x4b\xd9\x86\xd7\x06\x33\x0b\xd8\xad\xe3\xa2\xc1\xaa\xec\xe1\xbc\x13\x9a\xd2\x55\xfb\x7b\xce\x62\x2d\x72\x59\x66\xc7\xf2\x74\x42\x84\x5e\x06\xc7\xf6\x60\xb6\x13\xcd\x06\x55\x2e\x18\x89\x3b\x4c\xf3\x1f\x39\x11\x8b\x25\xf3\x9c\xe2\x44\xb6\x4d\x94\x32\x45\xb4\x7c\x5b\x79\x3c\xe5\x22\xc5\xca\xbe\xf0\xe7\xff\x58\x77\x21\x14\x7f\x20\xab\xf6\xff\xdc\xec\x66\x84\x25\x90\x41\x9a\x27\x8a\x66\x09\x41\x19\x9e\x11\x69\x57\x24\x4f\x94\x3c\x80\xd7\xb4\x4c\x4d\xc4\xa1\xbf\x81\xa0\x07\x77\xf3\xe6\x12\x7e\x41\x53\x2f\x40\x32\xf2\x59\x41\x4b\x23\x06\x77\x2f\x2c\x51\x78\xa3\x3c\xc3\x52\x6e\x46\x33\x92\x0b\x35\x9e\x2c\x8e\x1e\x48\xad\xdf\x56\xca\xc1\x0c\x61\xa5\x04\x9d\xe4\x8a\xe8\x79\xeb\x36\xdc\xdd\x09\xec\xd1\x5c\xd0\x5d\x58\xc3\xeb\x4d\x38\xa6\x82\x44\x30\xb7\x75\x0e\x8c\xff\x4a\xcf\x5b\xeb\x2f\x0b\x33\xfb\x07\xb2\x00\x79\xa4\x61\x05\xfc\x96\x8f\xd8\x88\xa1\x43\x74\x36\xbc\x3d\x1d\x5e\x9e\x9d\x5f\x7e\x3c\x41\xdf\x2f\x50\x4c\xa6\x38\x4f\xd4\x01\x9a\x52\x92\xc4\x12\x61\x41\xa0\x49\x12\x6b\x99\x43\x0f\x86\xb0\x98\xb2\x19\xe2\x22\x26\xe2\xf9\x96\xb1\xf2\x94\xb0\x3c\xad\xdc\x2b\xf0\x7b\x31\xfa\xca\x17\x5a\xc4\xf0\x8f\x4a\x4f\xfe\x56\x5b\x60\x98\xb1\xee\x3b\x68\xed\xc5\x84\x9a\x68\x4e\x93\x58\x10\x76\xac\xb0\x7c\x18\x93\xcf\x24\xca\xcd\x9d\xfc\xcf\xf2\x0f\x63\x2d\x99\xf2\x98\x94\x7f\x29\xfd\xa3\x10\x85\xd6\xfe\xd4\x6b\xa9\x6b\x7f\x09\x3a\x6d\xb7\xef\xe0\x17\x1a\x37\xbe\x0d\xbf\xac\x98\x83\x7b\x67\xc9\x60\xdd\x2b\xad\xa3\x72\x2f\x58\x89\xaf\xf1\x1d\x41\x94\x58\x8c\xb1\x52\x24\xcd\xd4\x9a\xfa\x3a\x46\x89\x96\x2b\x97\xc9\x91\x97\x3c\x26\x43\xd7\xdf\xaf\xc8\x88\xb3\x24\x46\x93\x85\xe5\x5a\x53\x22\x08\x8b\x48\x7b\x0b\x77\x58\x3e\x14\x2d\xac\x12\x46\x4b\xfd\xc9\x0f\x5c\xe8\xcf\xdf\x82\x40\x5a\x1a\xf8\x4b\xc8\xa4\x9b\x9e\xb8\x2f\xce\x42\xb0\x21\xff\xe8\xed\x09\xdb\xaf\x64\x57\xeb\x03\x17\x48\x2e\xa4\x22\xe9\x4a\x3b\xc4\xdb\x59\x08\x7b\x41\xec\xeb\x80\x2b\x77\xd4\xef\xe0\xd4\x97\x6f\xdc\xfe\x78\xaf\xb1\x64\xbb\xb2\x22\xee\xfb\x3c\x9d\x0f\x67\xf9\x54\x6f\xdd\xf6\x05\x4e\x8c\x37\x31\xcd\x92\x2c\xb8\xeb\x41\x3e\x93\xb9\xa1\x75\xaf\xdc\x6a\x8f\x61\x00\x2b\x14\xcd\xb2\x1d\xda\x9f\x3f\xfd\x69\x68\xa1\x31\xe6\x38\x35\xa7\x32\x30\x56\xa1\x88\x0b\x23\x0b\xc6\xf6\xbc\x1b\x5d\x73\x70\x37\xb8\x1d\xde\x9d\xa0\x01\x8a\xb1\xc2\xfa\x80\x0b\x92\x09\x22\x09\x53\xa0\xc7\xeb\xef\xd5\x02\xa5\x3c\x26\x89\xd1\x38\x3f\x68\xc9\x17\x9d\x61\x85\x4f\xb1\xc2\x09\x9f\x1d\xa1\x01\xfc\x53\x7f\x4c\x25\xc2\x89\xe4\x08\x3b\xb2\x22\xb1\x6b\x02\xb3\xd8\xb1\x16\x8c\x22\x9e\x66\x34\xf1\x36\x78\x6f\x5c\xa1\x2c\xa6\x8f\x34\xce\x71\x82\xf8\x44\x73\x15\xad\x21\x0f\x1f\x09\x53\x39\x4e\x92\x05\xc2\x49\x82\x6c\xb7\xee\x05\x24\xe7\x3c\x4f\x62\xdd\xae\x1b\xa5\xa4\x29\x4d\xb0\xd0\x2a\xb8\x19\xed\x95\x6d\x0b\xdd\xcd\x89\x1f\x2b\x8c\x4b\xaf\x66\x8a\x1f\x88\x44\x54\xa1\x8c\x4b\x49\x27\x49\x71\xe6\xef\xcf\x11\x8c\xfb\xf4\xe2\x1c\xf4\xf9\x48\x21\x6e\x78\xa8\xeb\xdc\xda\x6f\x5c\x8f\x29\x66\x8c\x40\xc7\x5c\xcd\x89\xb0\xdd\xdb\x97\x5f\x5b\x35\xbf\xbf\xbc\xbd\x1e\x9e\x9e\x7f\x38\x1f\x9e\xd5\x75\xf3\xbb\xc1\xed\x8f\xf5\x5f\x7f\xbe\xba\xf9\xf1\xc3\xc5\xd5\xcf\xf5\x27\x17\x83\xfb\xcb\xd3\x1f\xc6\xd7\x17\x83\xcb\xfa\x43\x4b\x56\x9d\xd5\xfc\x70\x64\x6b\x9e\xad\xde\xa6\xf9\x5c\x36\xcd\x83\x2f\xd7\xa8\x39\xa5\x09\xe8\xa0\x9d\x0d\x9a\xde\x86\x60\xbf\x44\x19\x96\xd2\x48\x46\x66\x04\x47\x23\xf6\x89\x0b\xcd\xc0\xa6\x5c\xf3\x08\x2d\x3d\x29\x91\x47\x8a\xb2\x99\xff\xe8\x04\x8d\xf2\x6f\xbe\xf9\x53\x74\x41\xd9\x03\xfc\x45\xf6\x71\x71\x7a\x8b\x6f\x6f\xf1\xfd\x7d\x59\x7c\xb5\xe8\x73\x1c\x1a\x7a\x77\x1b\x32\xa4\x85\x0b\x96\xe5\x0a\x44\x09\x9e\x2b\xfd\xa7\xee\x12\xc8\x63\x49\xe0\x50\x37\x83\xe2\x47\xa2\xfc\x8b\x5a\xb4\x79\x0b\x76\xc4\x9f\xb9\x78\x98\x26\xfc\xc9\x0f\xfc\x23\x51\x7a\xec\x37\xb6\x97\x3e\x94\xa8\x0f\x25\x7a\xdd\x50\xa2\xbd\x32\xe6\x3d\x3f\xf3\x2b\x5b\xfe\x0c\x07\x6c\xf1\x64\xb5\x3a\xaa\x5a\xfc\x50\x81\x9b\xe9\x45\xb8\x66\xd9\x99\xb3\x82\x73\x96\x5e\x7e\x2b\xdc\xb3\x34\xe8\x97\xe7\x9c\xbf\x0b\x7f\x4b\xef\x4e\xd9\x70\xa1\xde\x24\x83\xed\x78\x77\xbc\x98\x33\xe4\xf9\x19\x7e\x2d\xb6\x61\x9d\x60\x86\x35\xa2\x17\x3a\x87\x2b\xac\x88\x4f\x68\x0c\x48\x68\x8a\x40\xa8\x87\x1c\x34\xc6\x18\x6c\x17\x54\xb0\xe9\xdd\xd4\x3d\x4c\xe0\x23\x51\xa5\x97\xdf\xca\xdd\x54\x1a\xf4\xcb\xdf\x4d\xbf\xd3\xe8\x80\x3e\x1c\xe0\x19\x97\xee\x4b\xbf\xd1\xf6\xd7\xe1\xff\x3b\xf0\xf0\xf7\x2e\xfd\xb5\xd6\xe8\xcb\xf2\xe1\x7f\xa9\x4e\xfb\xb7\xe9\xa5\xef\xdd\xf2\xbd\x5b\xfe\x35\xfc\x27\x6f\xcf\x2d\xff\xbc\xea\x69\x71\xbc\xc6\x8e\x16\xac\xbe\x16\x1c\xca\x7f\x75\x70\xd2\xc0\x5f\x4e\xe5\x5b\x37\x68\xbc\x55\x87\x3b\x2b\xc6\x37\x84\x23\xf4\xab\x25\xa4\x15\xea\x5c\xed\xbb\xb7\xa0\xce\xd5\x07\xfd\xfc\x3a\xdc\xab\x31\xdf\x67\xba\x3c\xdf\x08\x1b\x58\xff\xb6\xfc\x82\x65\xf2\x5e\x16\x7f\xfe\x6c\xfc\xbd\x99\xd0\xdb\x91\xbd\x5f\xe1\xe2\xed\x78\xeb\xee\x3c\x27\xab\xe1\x9a\x0d\x6e\xa7\x55\x19\x56\xd5\xaf\x29\x91\xdf\xbd\xc9\xfb\xf6\x25\x92\xac\xfa\x0b\xb7\xbf\x70\x6d\x53\xfd\x85\xfb\x05\x5f\xb8\x7b\x07\x7f\xb3\x37\x11\xa0\x7d\x10\x79\x0f\x8c\xd1\xc7\x90\xef\x70\x71\xfa\x18\xf2\x3e\x86\xfc\x77\x16\x43\xbe\x8d\xf6\xb4\x29\x16\xe5\x6b\xe8\x51\xbd\x1a\xd5\xab\x51\xe1\xef\xbd\x1a\xd5\xab\x51\xbd\x1a\xf5\x85\xa3\x88\xf6\x3a\x54\xf7\x85\xe8\x75\xa8\xce\x4b\xd5\xeb\x50\x4b\x16\xa7\xd7\xa1\x7a\x1d\xea\xf7\xa5\x43\x91\x47\xc2\x94\x84\x64\xb4\x50\xa3\x78\x97\x71\xd9\xae\x09\x85\xdc\xa1\x41\x0b\x82\x36\xcb\x49\x61\x10\xb8\xf4\x2b\x9a\x63\x89\x78\x14\xe5\xa2\x72\x06\xaa\x7a\xd0\xa9\x20\x58\x11\x68\x41\x7f\xf8\x16\xf4\x9f\xfa\x74\x5f\x2a\x06\x7f\xc2\xe3\x1a\xb5\x9b\x83\xd0\xf4\x64\xb9\x3c\xb2\xb3\xa9\xff\x23\x27\xdd\xd4\xbf\x67\x24\x6a\x85\xe5\xc3\x8e\x89\xba\x94\x6b\xb1\x11\x51\x43\x0b\x6f\x85\xa8\xeb\xd3\xfd\xdd\x10\x75\xd3\xd4\xf7\x81\xa8\x9f\x6c\x1e\xff\x8e\x09\xbb\x06\x0f\xb0\x11\x71\xfb\x56\xde\x0a\x81\x37\x4f\xfb\x77\x43\xe4\x6d\xd3\x7f\x5d\x42\xf7\x29\x92\x9d\x49\xfc\x4e\xd0\xd9\x4c\xab\x19\xa0\xe1\x69\x52\x5c\x5d\x23\xa8\x48\x0a\x5c\x49\xd6\xfe\xd5\xb7\x40\xd2\x7e\xb0\x66\xec\xbf\x1b\x5a\xae\xcd\x7b\x4f\x88\xf8\x58\x90\x88\x3f\x42\xbd\xb0\x6e\xc4\x7c\x43\x80\x82\x81\x5f\x67\x82\x3c\x52\x9e\xcb\x64\x71\x28\x72\x86\x1c\xf3\x47\xbe\x79\x63\xad\x7e\xa2\x49\x82\x38\xd3\xfa\x97\xc2\x42\xb9\xc7\x5a\xff\x16\x3c\x85\x53\x91\x60\xa9\xd0\x03\xe3\x4f\x0c\x4d\x31\x4d\x72\x41\x50\xc6\x29\x53\x47\x23\x76\xce\xd0\x8d\x19\x23\xe4\x0d\x1c\xa0\x5c\xea\xb3\x14\x61\xc6\xb8\x42\xd1\x1c\xb3\x19\x41\x98\x2d\x6c\x02\x6e\x41\x19\x88\x0b\x94\x67\x31\xd6\x8a\xef\x9c\x54\xa3\xf4\xfc\x18\xc1\x7c\x47\x25\xa2\x12\x91\xcf\x4a\x90\x94\x24\x0b\xdd\x87\xa6\x7d\xc5\x91\x5d\x1f\x33\x54\x9b\xce\x47\x84\xe0\x42\x42\xc6\xc1\x64\xf1\x1b\x66\x8a\x32\x82\x40\x51\x92\xc6\x34\x77\x88\x2e\xb8\x04\xb3\xcd\x8f\x7f\x91\x28\x4a\x72\xa9\x88\x38\x40\x93\x7c\x26\xb5\xa6\x98\x25\x58\x4d\xb9\x48\xf5\x08\x29\x93\x0a\x4f\x68\x42\xd5\xe2\x00\xa5\x38\x9a\x9b\xb6\x60\x0d\xe4\xc1\x88\xc5\xfc\x89\x49\x25\x08\xf6\xbd\xbb\x87\xe8\xeb\xf0\x99\x21\x00\xf9\xfe\x00\xd2\x0e\x69\xaa\xd5\xdd\x60\xf8\xc5\x8e\x9b\x3d\xd1\x8d\x90\x18\x4d\x48\x84\x73\x69\x3d\x0c\x4a\x2c\x10\xf9\x3c\xc7\xb9\x84\xbd\xd3\xd3\xb3\x39\x1b\x11\x4f\xb3\x84\x28\x82\xe8\x14\x29\x41\x49\x8c\xf0\x0c\x53\xbd\x74\xb7\x64\x09\x08\xba\x27\x7a\xbb\x81\x96\xea\x7f\x05\xf5\x3b\xe5\x82\xa0\x98\x28\x4c\x93\xa5\x5e\x27\xfb\x6d\xcf\xe5\xde\x12\x97\x2b\x6f\xf8\x5e\xb0\x39\x03\xe2\xbf\x83\x4b\x9b\x59\xd3\x7d\x84\x93\x2d\xef\xef\x1b\x3b\xa8\x9e\xb6\xdf\x16\x6d\x9b\x5d\xdb\x1f\xe2\x7e\xb1\x18\xec\xee\x15\x2d\x8a\x6a\x16\x6f\x8a\xa6\x5f\x22\x2c\xa0\x77\x38\xf7\x0e\xe7\xd6\x95\x79\x9b\x0e\xe7\xbd\xf1\x18\xf5\x3e\xe7\x67\xf2\x39\x53\xd9\x3b\x9d\x7b\xa7\x73\xd7\x05\xea\x9d\xce\xbd\xd3\xf9\xed\x3a\x9d\x9f\x13\xf7\x79\xa7\xe8\xce\x6f\x4a\xb4\xee\xc5\xea\x5e\xac\xee\x21\x9c\xfd\xd4\x76\xc5\xc2\xdc\xd7\xef\x62\x92\x10\x45\xda\xed\x59\x44\xa4\x5a\x5b\x30\xd7\x33\x65\x5a\x8e\x9b\x09\x22\xe5\xb6\x0c\xc9\x37\xfc\x36\xd9\x92\x1f\x7e\x0f\x35\xdf\xf3\xa9\x9e\x4f\x6d\x32\xb5\xfd\x31\xcd\x06\x87\xf9\xa5\x6c\xb3\x9e\xff\x66\x79\xbb\xf4\x77\x6f\xdc\x90\x85\x5f\xd4\x50\xb8\x96\xda\x15\xf7\x87\xdb\xd2\xf9\x96\xfc\xd8\xf4\xf5\x36\x99\xb1\x19\x7b\xcf\x89\x7b\x4e\xdc\x73\xe2\xb7\xcd\x89\xdd\x49\x7e\x55\x17\x99\xf1\xd3\x8d\xb3\x04\xb3\x31\x8d\xe5\xf1\x3f\x0b\x5d\xfe\xb9\x3c\x64\xfa\x40\xc5\x26\xc5\xd4\xa7\x74\x8a\x5f\xf5\x27\x49\x61\x30\xf7\x98\x99\x2b\x9c\x68\xc6\xc6\x7e\x9d\x60\x76\x1e\xbf\x09\x3f\x5a\xe3\xec\x5f\xc2\xa7\xb6\x0d\x1f\xc7\x0a\x3c\x1d\x98\x32\x63\xc2\x2b\xf2\x6a\x4b\x06\xca\xfd\x38\xe1\xdb\x70\xf5\x60\x62\x01\x63\x77\xfc\x3a\x58\x94\xfd\x9b\x76\xef\xd7\xe9\x73\x09\x7b\xcf\x45\xc7\x09\xf7\x9e\x8b\xfd\xf5\x5c\xbc\x96\x3b\xf2\x85\x8f\xe7\x4b\x89\x75\xdd\x83\xf0\x4d\xb4\x1a\x04\xb5\xe6\x59\xc2\x71\xbc\xcc\x15\x53\x08\x5e\x21\x38\xca\xca\x48\xfc\xe2\xb3\xb7\x20\xac\x15\xa3\xfd\x9d\x45\xf2\xd5\x27\xbe\x2f\x5a\xca\x0b\x86\xf2\x35\x93\xf8\x1a\x2a\xc9\xdb\xc0\x4f\x2d\xc6\xdb\x87\xf6\xf5\x16\xa5\xd7\xb7\x28\xf5\xa1\x7d\xbd\x0a\xb8\x67\x2a\x60\x1f\xda\xd7\x87\xf6\xf5\x0a\xf2\xf2\x69\xf7\x0a\xf2\x17\x11\xda\xd7\x49\xd4\x7e\x46\xec\xcd\xed\x85\xee\x5e\xe6\x76\xef\xf5\x32\x77\x2f\x73\x7f\xa1\x32\xf7\x7e\xac\x70\x2f\x70\xf7\x02\x77\x2f\x70\xf7\x02\x77\x2f\x70\xef\x7c\x19\x7b\x81\xfb\x25\x0b\x74\x36\x4b\xdd\x2b\x92\x6c\xde\xaa\x2f\xa7\x17\xb7\x7b\x71\x7b\xbf\xc5\xed\xbd\x99\xd0\xdb\x29\xf3\xd8\x6d\x3e\x7d\x91\xf2\xbe\x48\x79\x5f\xa4\xfc\xd9\x8b\x94\xbb\xaf\x3b\x64\x7c\xd8\xc3\xa5\xb0\xca\xa5\x01\x7c\x14\x64\x46\xa5\x02\xf6\xdf\x45\x5e\x59\x9d\xe8\xf1\x56\xe5\x94\x3e\xd5\xc3\x3f\xed\xa5\x96\x5e\x6a\xf9\x9d\x4a\x2d\x7b\x14\x0b\xb6\x17\x19\x2b\x29\x56\xd1\x1c\x4f\x12\x32\xf6\x46\x1f\xd9\x55\x0f\xbe\xa0\x52\x49\x14\xe5\x52\xf1\xb4\xfd\x72\xf9\xe4\x7a\x18\xf8\x0e\x4e\x39\x9b\xd2\x59\x6e\xee\x16\x03\xce\x19\x9c\xe8\x42\x12\x5c\x64\x64\x95\xa7\xaa\xa1\xf5\x37\x71\x2d\x35\x0f\xfd\xa5\x6e\xa7\x75\x04\xf7\xc2\xc8\x67\xa5\x6e\x2d\x6b\x8d\x6f\x86\xb7\x57\xf7\x37\xa7\xc3\x13\x34\xc8\xb2\x84\x1a\xbb\xbb\x21\x05\xfa\x9b\x9e\x14\x52\x58\x3e\x14\x7b\x29\x0c\x99\x1b\x0c\x5b\x30\xf4\x6b\xd9\x18\x1d\xa2\xd3\x8b\xfb\xdb\xbb\xe1\x4d\x4b\x83\x96\x50\x20\x6f\x95\xa4\x59\x82\x15\x89\xd1\x43\x3e\x21\x82\x11\x2d\xed\x58\xa4\xdb\xc2\xfc\x6f\x1a\x1d\xfe\xf7\xf0\xf4\xfe\xee\xfc\xea\x72\xfc\xd7\xfb\xe1\xfd\xf0\x04\x39\x8a\xd3\xcd\xea\x71\xe9\x51\xc4\x0b\x86\x53\xad\x81\xe8\x1f\x8a\x4c\xd9\x7f\xe4\x24\x27\x08\x4b\x49\x67\x2c\x25\x80\x08\x5c\x6a\xd1\x0d\xf8\x62\xf0\xfd\xf0\xa2\xdc\xf2\x9c\x84\xf0\xbb\x28\xc1\x13\x92\x58\x7f\x04\x98\xd8\x35\xa1\x07\x50\xc5\xc6\x51\x91\x9b\x55\xfd\xeb\xfd\xe0\xe2\xfc\xee\x97\xf1\xd5\x87\xf1\xed\xf0\xe6\xa7\xf3\xd3\xe1\xd8\x4a\x95\xa7\x03\xdd\x6f\xa9\x27\x2b\x7c\xa2\x7f\xe4\x38\xd1\xda\x09\x9f\x3a\x3c\x5e\xf4\x34\x27\x0c\xe5\x0c\x28\xce\xa8\x3c\x5a\x0f\xf2\x9d\xea\x53\x66\x66\x74\x7d\x71\xff\xf1\xfc\x72\x7c\xf5\xd3\xf0\xe6\xe6\xfc\x6c\x78\x82\x6e\x49\x02\x4a\x81\x5b\x74\xd8\xc5\x2c\xc9\x67\x94\x21\x9a\x66\x09\xd1\xab\x81\x6d\x36\xf1\x1c\x3f\x52\x2e\xec\xd1\x9d\xd1\x47\xc2\xcc\x3a\xc2\x99\x85\xf6\x9d\xf0\x3d\x0e\x96\xee\xea\xf2\xc3\xf9\xc7\x13\x34\x88\x63\x3f\x07\x09\x6d\x94\x28\xc7\xc1\x3a\x1f\x96\x87\xad\x99\x03\x74\x6f\x88\x88\x3f\x12\x21\x68\x4c\x2a\x74\x34\xb8\xbd\x3d\xff\x78\xf9\x69\x78\x79\x07\x2b\xa6\x04\x4f\x24\x9a\xf3\x27\x30\x65\xc3\x0c\xc1\xc2\xfd\x88\x69\x02\x9d\xb9\xcd\xe2\x0c\x3d\xcd\x29\xb8\x3f\x00\x98\xd9\xf7\x6c\xf4\x33\x91\xb3\x57\xb7\xce\x96\x0e\x5e\x5d\x6d\xa9\x9e\xa4\xfa\x1b\x95\x63\xb1\xec\x85\x12\x95\xd7\x5f\x5c\x45\xad\xf5\x2f\x2a\xe4\xd6\xae\xac\xd5\xe8\xa5\x7d\xa6\xc5\x5e\x77\xd6\xd5\xca\x6b\xf8\x62\xd7\xac\x66\xbc\xf1\x4b\x54\x65\xbd\x01\xbf\xe7\x52\xd8\xa7\x20\x67\xf2\x57\xab\xdc\xaf\x30\x4d\x07\x5f\xbc\x85\xcb\x35\x1c\xee\x1e\x5d\xa4\x37\xa1\x5c\xe3\xc4\xe3\x94\x28\x1c\x63\x85\x35\x7b\x9a\x11\x75\x84\xae\x18\x3c\xbb\xc3\xf2\xe1\x00\xb9\x82\x14\x88\x0b\x54\x08\x8e\x2f\x90\x2d\xf9\x46\x6c\x32\xeb\x2b\x33\xbd\x52\xde\x2b\xe5\xcd\x2b\xd3\x47\xee\xb4\xac\xf0\xae\x2e\xc6\xb5\xcc\x98\xbb\xbb\xbf\x4c\x8b\x6f\xf7\x0a\x7b\x59\xbb\xe5\x4e\x2f\x34\x53\x0c\xa5\xbf\xad\xcc\xff\xf5\xb7\x55\x7f\x5b\xf5\xb7\xd5\x1e\xac\xf0\xab\xdb\x80\x1b\xb8\xfb\xab\x1a\x81\x57\x69\xa7\x1b\xa3\x18\x15\xda\xe8\x3a\x38\x46\xbf\x76\x85\x2b\x2a\xbe\xa1\x6f\xc3\xec\x1b\x4c\xf2\x25\x32\x15\x76\x7a\x99\x9b\x10\xe0\x5e\x3f\x7d\xc6\x1b\xbf\x07\x95\xda\x29\xa8\xd4\x7e\xcc\xf5\x59\xb2\x1a\x76\x6f\x8a\x7e\x1b\x99\x0c\x3d\x7a\x54\x1f\xab\xdf\xc7\xea\xc3\xef\x3d\x7a\xd4\xee\xa8\xf5\x79\xa5\x6b\x1e\x93\x71\xa5\xc6\x87\xff\xe7\xb8\xea\xf9\x29\x3d\x09\xdd\x40\xa5\x07\x45\xf2\x02\xb4\x4e\xe3\x5d\xd6\x05\xb9\xe4\x31\xe9\x5c\x1b\xa4\xf4\xf2\x9e\xcb\xe0\x6e\x9e\x46\x16\x2f\x0d\xfc\x99\x25\xf1\x96\x2d\xff\x12\x0d\x3b\x0d\x04\xdc\x5b\x79\x56\x2e\xd4\x97\x0a\x10\x5d\x70\xa8\x37\xe4\xa9\xe8\xc6\xc6\x5d\x98\xca\xb8\x85\x99\x37\x3f\xf7\x2c\xbd\xf9\xf1\xf3\xc0\x40\x74\xe7\xe8\x60\x56\x09\xdf\x7e\x1b\x76\x95\x70\xc4\x2f\x61\x59\x59\xba\xf7\x5f\x1c\x57\x5f\x46\xc9\x3d\x6f\xef\xb8\x5c\x5f\x2a\x87\xef\x51\x1b\x96\xd9\x3a\x7a\x58\x84\xde\xd4\xb2\x3f\x13\xee\x4d\x2d\x6f\xda\xd4\x62\x5c\xb4\xe3\x0c\x0b\xc2\x54\x83\x48\x5d\xbd\x4e\xe0\xf5\x30\x8d\xd6\x49\x1d\xd0\x00\xd2\x12\x2d\xb2\x17\xb2\xbf\xaa\xbe\x2c\xdb\x8b\x15\x0c\x82\xe4\x96\xe3\x7f\x16\x7f\x7b\x61\xbd\x04\xea\xbd\x24\x3a\xc9\xc0\x37\x4b\x7d\x47\xe7\x36\x50\x69\xfb\xf4\x17\xac\x4a\xa2\x60\x42\x1e\x49\xb2\x32\x9e\xe9\xda\xbc\xfd\xb6\xb2\x5e\x6a\x83\x7e\xd9\xd8\xa6\xfa\xc6\x77\x3b\x40\x6e\x67\xa8\xc9\xe0\x08\xd2\x04\xb4\x34\xca\xa7\xc5\xc5\x20\xd1\x13\x4d\x12\x48\x12\x87\x24\x96\xb6\x1b\xe0\x77\x17\xf1\xd0\xba\xf3\xaf\x1a\xf7\xd0\xc4\x1d\x9a\x58\x42\x17\x7b\xea\xae\xd2\xe0\x1c\xb1\x41\x86\x12\x68\x43\x2b\x0c\xb0\x5f\x06\x27\xf8\x48\xd4\x4b\xb1\x81\x4d\xcf\xfe\xd2\x73\x2f\xc8\x94\x08\xc2\x22\xb2\x87\xde\xf6\x75\xc2\x40\x7e\x36\x93\xb4\x31\x20\x3e\x3b\x34\x9c\xaa\xe2\x56\x4f\x2b\x89\xba\x7d\x72\x60\x9f\x1c\xd8\x27\x07\x56\x8f\x7a\x9f\x1c\xd8\x27\x07\x6e\x52\x3c\xfd\x0c\x1e\xbf\x96\x54\x61\x7a\xff\x32\x04\x0b\x33\x97\x5e\xb6\xf8\xdd\x68\x16\x6e\xc3\xf7\x42\xb3\x30\x67\x6d\x95\xf9\xa1\xf4\x63\x43\x88\xf5\x8b\x9b\x24\x36\x61\x1a\x25\xbb\xc4\x19\xbc\xfe\x26\x59\x47\x75\xe8\xbd\x8d\x02\x05\x5b\xf7\x7c\x9c\xa4\x76\x04\xba\x4d\xdc\x7a\x0c\xdf\xee\xbc\xf7\x85\x83\xb6\xd1\xfd\xbe\xf2\xd1\xed\x4a\x6b\xef\x81\xc5\xe6\x0b\xe2\x91\xbd\xf5\xe6\x95\x73\x25\x6a\xcc\xf0\xcd\x4e\xb7\x37\x56\xf5\xc6\xaa\xde\x58\xd5\x1b\xab\x7a\x63\x15\xea\x8d\x55\x6b\x1b\xab\xbe\x20\x99\xaa\x37\x5c\xf5\x62\xd5\xee\xa6\xbb\xaf\x5a\xe6\x3e\x59\xeb\x3a\x03\xdf\x16\x39\x54\x2b\x23\xef\xed\xb4\x7f\x5d\x11\x72\x7f\xed\x46\xf0\x76\xf8\x95\x7c\x6e\x96\xb4\x4d\x60\xb1\xdb\xd1\x2f\x36\xae\xb8\xaf\x06\xd7\xb8\x56\x7d\xd8\xf3\x92\xc5\xe9\xc3\x9e\xfb\xb0\xe7\xbd\x0b\x7b\xde\xb9\xb2\x92\x71\xb9\x0c\x90\xc8\x54\x43\x59\x9a\xff\xec\xee\x6c\x48\x34\x02\x52\x30\x85\x70\x62\x92\x25\x7c\x01\x96\x94\x25\xd7\xb9\xeb\xe2\xba\x26\x51\xef\xfb\x8d\xee\x46\xfe\x52\x3a\xc7\xbe\xc8\xa4\xc5\xbc\xf7\x42\x0a\x3d\xfe\x67\x25\x9d\xbf\x13\x5e\x26\x43\xe4\x33\x95\x70\x2b\xad\x26\xec\x11\x6b\x7e\x12\x54\xa3\xb2\xf7\xe0\x24\x57\x41\xee\x9e\xd4\x82\x55\x46\x84\x5a\x04\x6f\x92\x34\x53\x8b\xff\x1a\x31\xaa\xbc\x87\x8d\xce\x18\x17\x86\xab\xe9\x8f\xe7\x98\xc5\x09\x11\xfa\x52\x75\xed\x44\x98\x31\xae\x40\xdc\x80\x19\xc4\xe8\x91\x62\x23\x9c\x0c\xae\xcf\x3b\xfb\x99\xdf\xd0\xe9\x7a\xe9\xfa\x43\x2b\xee\xba\x8f\x09\x9f\x40\x51\xb2\xbc\xac\xd3\xeb\x06\x7a\xcf\x68\x69\xe7\x5e\x8b\x21\x28\x2c\x1f\xaa\xc0\x21\xe5\x2c\xf4\xf1\x52\x28\x91\x15\xef\x96\x30\xe6\x97\xbf\x5a\x81\x1b\x29\x3f\xb3\x00\x24\xf0\x18\x86\x5c\x1d\x87\xfb\x31\xec\xd0\xfd\x56\xb4\xec\x7e\x71\xd5\x58\xe1\x47\x41\x94\x58\x8c\xb1\x52\x9a\xc9\x74\xf6\xf0\x9a\xa3\x16\x98\xbe\x4d\x96\x31\xf8\x5e\xb8\xa7\x74\x6b\xd5\x69\xe5\x96\x77\x58\x3e\x74\x4b\x9a\x37\xfd\x95\xde\x7f\x0b\x8c\xa9\x34\xe0\x17\x2f\x8f\xd6\x8d\x92\x57\x70\xb1\xb7\x97\x4b\xdf\xf5\x5c\xae\x31\xf1\xdf\x4b\x5e\x7d\x37\x3e\xb5\xca\xa4\xfb\x16\x73\xec\x97\x31\xde\xbd\x19\x61\x85\xf7\x7f\x89\x27\xb7\x7c\x93\xf5\x47\x74\xd9\x1a\x7d\x71\x75\x10\x2b\x02\xca\x8a\xb9\xbd\x91\x7a\x88\x55\x19\x6b\xd7\xa3\x7a\x1e\x93\x78\xb0\x1b\x7d\x0d\xea\xbe\x06\x75\x5f\x83\xba\xb5\x06\x75\x87\xc3\x44\x1e\x69\xa4\xc6\x11\x8e\xe6\x2b\xcf\x4f\xc9\x3e\x0e\x5f\x18\xb6\x46\x25\xfa\x5a\x2b\x17\x72\x4e\xe2\xf7\xd5\x30\xb4\xc0\x52\xa4\x7b\x22\xf1\x01\xa2\xa1\x0f\x45\x6f\x30\xe8\x23\x7a\xd3\x95\xc0\x9a\xee\xf5\x11\x24\x23\x56\x34\x72\x36\xf8\x08\x74\x24\x48\xca\x1f\x09\x50\xb1\x54\x60\x63\xb2\x9e\x2d\x34\x15\x3c\x85\x23\x18\xd9\x43\xb5\x7b\x62\x99\x70\x9e\x10\x5c\xe3\xfc\x05\x33\x73\x2f\xbc\x9e\x89\xa0\xb3\x7d\xa0\xab\x71\xa0\x9b\x65\xa0\xdd\x2c\xf0\x0c\x3e\xf5\xee\x8a\xf9\x05\x95\xaa\xf4\xf6\x9b\x70\xb0\x97\x46\xfc\x12\x68\x76\xbf\x53\x55\xbc\xd7\xc3\x9f\x65\xdd\xbe\x54\x25\x7c\xcf\x35\xf0\x1e\x87\xaf\xaf\x39\xd0\x87\xcb\xec\x70\x71\xfa\x70\x99\x3e\x5c\xe6\x8b\x0d\x97\x69\xd7\x26\x68\xbc\x75\x72\xe5\x9a\xf5\xbe\xbc\x59\x46\xfc\x0a\xa2\x94\x56\x1f\x3b\x56\x00\xd3\xa2\xf2\x79\xfc\x26\xa4\xfa\xc6\x09\xbf\x84\x74\xdf\x57\x95\xda\x69\x55\xa9\xbd\x9b\x76\x2f\xf8\xf5\x82\x5f\x2f\xdb\x74\x9c\x70\x2f\xdb\xec\xaf\x6c\xf3\x5a\x0a\xcb\x97\x04\x78\xac\x85\xa7\x52\x1e\xd3\xd2\x70\x68\x03\x1e\x04\x86\xf5\x3c\x4b\x38\x8e\x97\x85\x45\x6b\x59\xeb\x57\x54\xc8\x35\x4b\x44\x33\xd3\xae\xfe\xe0\x2d\x48\x66\x7a\x9c\x66\xc4\xbf\x9b\xc8\xe7\x70\xca\xaf\x1a\xf4\x0c\xf4\x0a\xa1\x7e\xa5\x90\xc1\xe7\xd2\x3a\xaa\x34\xdc\x49\xc1\x90\xdf\xbd\x15\x2a\x7e\x09\x75\xe2\x0b\x76\x08\xf4\x46\xff\xdf\x67\x59\xfa\xbd\x91\x52\x7b\x55\xae\xcf\x79\xed\x8d\xf8\xbd\xa2\xdb\x2b\xba\x3b\x5f\xc6\x7d\x52\x74\x5f\x51\xa2\x36\x49\x3c\xcf\x52\x64\x72\x33\xd9\xba\x17\xad\x7b\xd1\xba\x17\xad\xbf\x58\xd1\x7a\x3f\x56\xb8\x97\xab\x7b\xb9\xba\x97\xab\x7b\xb9\xba\x97\xab\x77\xbe\x8c\xbd\x5c\x5d\x91\xab\xe1\x2f\x97\xc4\xbe\xae\x90\xdd\x59\xb8\x5e\x01\x31\xfe\x96\x5c\x2f\xbd\x54\xdd\x4b\xd5\xfb\x2d\x55\xef\xcd\x84\xbe\xbc\xd4\xd3\x3e\x79\xb3\x4f\xde\xec\x93\x37\x5b\x92\x37\x9f\x55\x9e\x71\xbc\x64\x99\x84\x52\x17\x2c\x7e\xaa\x71\xa0\xbd\x95\x2d\x8a\xd1\x6e\x1a\xd6\xb1\xab\xa5\x76\x65\x00\x36\xa9\x03\x56\xfa\xcd\x35\xb4\x47\xd5\xc1\x0e\x9c\xb4\xa0\x19\x85\x1b\xdf\x6a\xb0\xa4\x9f\xed\x9b\x6f\x0b\xaa\xbd\x3e\xea\xbe\x3a\x18\x0a\x76\xad\xaf\x0e\xf6\x8c\xf3\x76\x87\x6b\xc5\xcc\x1d\x8d\x1a\x1b\xef\x1b\x9d\xf6\xab\x07\xc8\xb5\x9f\xf4\x57\x0d\x97\x6b\xbc\x49\x6a\xc9\x3a\xc7\xff\x6c\xbc\x28\x5e\xa1\x28\xda\xda\xb7\xc3\x47\xa2\xbe\x94\xab\xa1\x2f\x8a\xd6\x57\xef\xd8\xd1\x74\x37\x62\xfd\x6f\x76\xb6\x7d\x09\xb8\xbe\x04\x5c\x5f\x02\xae\x2f\x01\xd7\x97\x80\x43\xbf\xf3\x12\x70\x6b\x8b\x8f\x66\x1c\x5f\x8a\x04\xd9\x97\x80\xeb\x85\xc8\xdd\x4d\xf7\xf7\x25\x44\xee\xa1\x05\x61\x2f\x6a\xdd\x79\x0b\xc2\xab\xe3\x7c\xb8\x91\x74\xc5\xfa\x70\x0b\xda\xe3\x7d\xd8\xff\xeb\xf1\x3e\x7a\xbc\x8f\x96\x59\xf7\xc1\xac\x3d\xde\x07\xea\xc3\x35\xfb\x70\xcd\x7d\x0e\xd7\xec\xb0\x8d\x3d\xde\x47\x47\x71\xee\x99\x30\x3f\x9c\xcc\xb5\x16\xee\xc7\xcf\x75\x45\x63\x6f\xa5\x34\x37\xd6\xdf\x19\xfe\x47\x75\xda\x7b\xa1\x92\xbc\x20\x0e\x48\x13\x5d\x77\x56\x40\xde\x06\x1e\x88\x1b\x6d\x9f\xb8\xd8\x87\x58\xef\x7f\x88\xf5\xde\x25\x2e\xee\x8d\x24\xdb\xab\x7b\x7d\xee\x62\x9f\xbb\xd8\x2b\xc3\xbd\x32\xbc\xf3\x65\xdc\x27\x65\xf8\x95\x25\xec\x67\xc4\x05\xd9\x4e\xd6\xee\x45\x6d\xf3\x5e\x2f\x6a\xf7\xa2\xf6\x17\x2a\x6a\xef\xc7\x0a\xf7\x72\x76\x2f\x67\xf7\x72\x76\x2f\x67\xf7\x72\xf6\xce\x97\xb1\x97\xb3\x5f\x0c\x27\xa4\x49\xd8\xee\x98\x6f\xf3\x96\x24\xed\x5e\xca\xee\xa5\xec\xfd\x96\xb2\xf7\x66\x42\x3d\x66\x48\x8f\x19\xd2\x63\x86\xf4\x98\x21\x1b\xc9\x37\xff\x66\x8f\xe5\xbb\xe0\x26\xf6\x57\xf6\xbb\xef\x13\x3e\xb9\x5b\x64\x44\xff\xf7\x8c\xa6\x84\x49\x90\x46\xa9\x5a\x84\xf2\x4c\xcb\xca\xd7\xd7\xfc\xdd\xed\xf9\xe5\xc7\x8b\x30\x9b\xe6\xdd\xa7\xfb\x8b\xbb\xf3\xeb\xc1\x8d\x5f\x17\x3f\xab\x70\x2d\xec\x77\x25\x91\xec\x14\x47\x73\x32\x7c\xa4\x20\x51\x0f\x85\xe0\xe2\x94\xc7\x64\xb3\x71\xdd\x5f\xfe\x78\x79\xf5\xf3\xe5\xd2\x31\x94\xde\x29\x06\x01\xe7\xee\x86\x68\x05\x18\x8e\xee\xad\xc2\x2a\x97\x9b\x0d\xe3\x66\x78\x3b\xbc\xf9\x09\x52\x92\xc6\x67\xe7\xb7\x83\xef\x2f\x4a\x54\x59\x7a\x3e\x38\xfd\xeb\xfd\xf9\x4d\xfb\xf3\xe1\x7f\x9f\xdf\xde\xdd\xb6\x3d\xbd\x19\x5e\x0c\x07\xb7\xed\x5f\x7f\x18\x9c\x5f\xdc\xdf\x0c\x97\x2e\xc8\xd2\xd1\x2e\xd7\x84\x24\x2c\x12\x24\x1b\x20\x5b\xcd\x5f\xb3\x6a\xb7\x86\xc8\xcb\xb0\x8e\x27\x37\xf5\x75\x82\xee\xad\x61\x81\xda\xc6\x0d\x97\x0f\x1a\x32\x1a\x51\x4c\x25\x9e\x24\x24\xae\xb5\xe4\xd6\xb0\xad\x25\x5c\x1a\xd4\x93\x56\xe1\xbd\xdc\xab\x19\x6f\x64\x18\x12\x82\x44\x49\x45\x58\xdc\xd0\x87\xd9\x87\xd6\x1e\x98\x66\xa0\xf4\x91\x94\x7a\x8a\x72\x21\x08\x53\xc9\x02\x91\xcf\x54\x2a\x59\x6b\xd4\x6d\x5f\x5b\xb3\xf6\x62\xf7\x0d\xce\xb1\x44\x13\x42\x58\x79\xfc\x82\x24\x04\xcb\x86\x31\xdb\xdd\xef\xb6\x2c\x7e\xaf\xac\x49\xc8\xdc\x88\x53\x4c\x93\x5c\x90\xca\x69\xe1\x69\x86\x05\x95\x9c\x0d\x3f\xeb\x0b\x55\x73\x93\x2b\xf8\x9c\x8b\xcd\x4e\xcc\xf0\xaf\x21\x05\x5f\x96\xff\xf9\xf1\xae\xfc\xaf\x12\xe3\xb9\xb8\x2b\xff\x6b\x39\xad\x07\x0d\x57\x29\xfb\x10\x7d\xbc\x3b\x41\x1f\x21\xce\x4a\xa0\xbb\x39\x36\x14\x7b\x71\x77\x82\x2e\x88\x94\xf0\x4b\xf1\xb1\xa2\x2a\x81\xb9\x7d\x4f\x19\x16\x0b\xe4\xa6\x6f\xb2\x6d\x71\x34\x47\xc4\x2f\x4d\x75\xf1\xd8\xdf\x73\x66\xb8\x9d\x7f\xe5\x82\xcf\x68\x84\x93\xed\x16\x71\x70\x59\xe2\x03\x57\x37\x4b\x97\x22\x7c\xbb\xbe\x16\x83\xcb\x33\xc8\x64\x75\x43\x6d\x98\xf9\x25\x91\x9a\x48\x22\xce\x62\xeb\x2a\xd2\x22\xc8\x22\xd0\x2c\xfe\xce\x21\x1b\x38\x97\x94\xcd\x74\x8b\xe8\x18\x5d\xdd\x8c\xd8\x95\x88\x8d\x35\x96\x68\x91\xdc\xd0\x1c\x95\x88\x71\x85\x68\x9a\x71\xa1\x30\x53\x5a\x1b\x01\x59\xc4\xae\x88\xe1\x00\xa7\x3c\x4d\x73\x85\xf5\x41\xab\x2d\x2a\x33\x36\x99\x5b\xa2\xce\x63\xf0\xef\x34\xac\xa1\x11\x56\x8a\xb9\x64\x42\xb7\xaf\x05\xa5\xb2\x22\x4f\xe3\x9a\x3e\xed\x9a\xc0\x42\xe0\xb2\x48\xf3\x8e\x2a\x92\x56\xdf\xef\x18\x69\xfa\xaf\x46\x2b\xc5\xa9\xc9\xec\x20\x62\x20\xa2\x39\x55\x24\x52\xfa\x08\x6e\x75\x23\x06\x74\x31\xf8\x74\xf6\xe7\xff\x28\xfd\x70\xf3\xa9\xf6\xc3\xf8\xa7\x3f\xd7\x7e\xf9\xff\x75\xba\x57\xdb\x68\x2a\x9c\xcb\x21\xc8\xf5\x60\x98\x76\x53\x45\x34\xc5\x33\x82\x64\x9e\x69\x0a\x90\x47\xe5\xfd\xd5\x72\xed\x05\xc7\x31\x65\x33\x93\x86\x7a\x41\x15\x11\x38\xf9\x84\xb3\x0f\xce\x88\xbe\xc1\xea\xfc\x9f\xdb\x52\xd2\xf0\xbb\x5f\x06\x9f\xc2\xb4\xe3\x77\xd7\x37\x57\x77\x57\x4b\x67\x5d\x6a\xa1\x7e\x8c\xf4\xe3\x13\xf8\x5f\x74\x8c\x74\xeb\x5e\xfc\x4e\x89\xc2\x5a\x2d\x41\x5f\x9b\xcc\x3d\x9f\xcd\x43\x59\x02\xa7\x26\x13\x34\xa5\x70\xa5\x18\x33\xe2\x7b\x23\xe1\x7b\x15\xc6\x9f\x1b\xf3\x01\xa8\xec\xee\x52\x66\x31\x16\x31\xfa\xbb\xac\xe6\xb0\x83\xf5\xda\xfc\x40\x62\x74\x88\xe6\x4a\x65\xf2\xe4\xf8\xf8\xe9\xe9\xe9\x48\xbf\x7d\xc4\xc5\xec\x58\xff\x71\x48\xd8\xd1\x5c\xa5\x89\xc9\xd9\xd7\xab\x70\x82\xae\x05\xd7\x57\x08\x58\x09\x88\xa0\x38\xa1\xbf\x91\x18\x4d\x0c\xff\xe3\x53\xf4\x6b\xc4\x05\x39\x2a\x36\xc6\x5a\xb6\xec\x3d\x62\xad\x5f\xc7\xfa\xa5\x06\x66\x52\xdd\x4f\x14\x93\x88\xc6\x56\xcc\x20\x2c\xe2\x60\xfe\x34\x0e\x13\xdd\x9e\x4b\x77\xd4\x6a\x55\x96\xab\x62\x39\x03\x8d\x09\xc7\x24\x48\xb9\x57\xbc\x4c\x70\x5a\xfb\x3a\x37\xba\x73\x2e\x89\x80\xbb\x15\xc3\xad\xea\x5e\xcd\xf4\x84\x23\x9e\xa0\x49\x3e\x9d\x12\x11\x7a\xc5\x0f\xb4\x4a\x45\x25\x12\x24\xe2\x69\x0a\x12\x83\xfe\x2a\x97\x86\xaa\x61\xc5\xec\x68\x8f\x46\x0c\xf6\x5f\xeb\x5a\x40\x01\x31\x07\x56\xc7\x08\x89\x11\x66\x0b\xd3\xcd\x24\x9f\x86\xed\x1b\x2c\x0c\x1c\x23\xaa\x46\x6c\x90\x24\x48\x90\x94\x2b\x12\x24\x72\x82\x07\xaf\xbc\xe0\xc0\x22\x05\xc9\x12\x1c\x91\xd8\xd0\x43\xc2\x23\x9c\xa0\x29\x4d\x88\x5c\x48\x45\xd2\xb0\x81\xaf\xc1\x60\xa4\xd7\x8c\x4a\x14\xf3\x27\x96\x70\x6c\xe7\x51\xfd\xec\x7d\xf9\x34\x0e\x1d\x4e\x01\x88\xeb\xf0\x3f\x3f\x52\x16\xef\x8c\x43\xdd\xdf\x0e\x6f\xc2\x7f\xdf\xfe\x72\x7b\x37\xfc\xb4\x1e\xf7\xf1\x94\x05\xc3\x03\x43\xc2\x09\xba\x35\x8b\xc0\x85\x96\x88\x44\xcb\xa4\x3e\x59\x52\x2a\x7e\xd8\x58\x1f\xf9\x34\xb8\xbc\x1f\x94\x38\xca\xed\xe9\x0f\xc3\xb3\xfb\x8a\x3e\x60\xe7\x57\x92\xe1\x8d\x0e\x1a\xfe\x76\xfa\xc3\xf9\xc5\xd9\xb8\x41\x6b\x7d\x77\x33\x3c\xbd\xfa\x69\x78\x53\x28\x98\x8d\x4b\x54\x19\x4c\x95\x59\xdd\x19\xa6\x34\xe7\x31\x9a\x2c\x9a\x51\x29\xb4\xe4\x9c\x80\x43\xb8\xc0\x65\x31\xad\x9e\x00\x6f\x72\x00\x21\xc5\x17\x29\x8f\xc9\x81\x7d\x07\xe0\x3c\x8c\x85\xc7\x48\xcc\xcd\x0d\xeb\xde\x31\x0b\xac\x25\x06\x69\xc3\x2f\xdc\x09\x1a\x20\xa9\x5f\xcc\xf5\xa1\x16\x74\x36\x03\xeb\x65\x65\xa8\xa6\x35\xfb\x29\x2c\x2f\x7c\x67\xf6\x3f\x13\x1c\xce\xb9\xee\xd6\x9a\xbd\xbd\x69\xc4\x7c\x08\xd0\x2f\xe5\x16\x05\x06\xab\x47\xc3\xd0\xdc\x66\xe9\x45\x68\x5d\x2f\x73\x1e\x8d\xd1\x4a\x1f\x2e\x60\x5b\xd2\x18\x5d\x33\x41\x1e\x29\xcf\x83\x4f\x2d\xba\x48\x69\xc7\x1b\x9b\x2f\x16\x00\x96\xcd\x58\x66\x2a\xcd\x78\xf2\x68\x6c\x41\xb3\xb0\x47\x68\x61\x2a\x78\xda\xd0\x46\xf9\x98\x9c\x5f\xdd\x2a\x81\x15\x99\x2d\xce\x2c\xcb\xd8\xfc\x78\x9c\x5d\xfd\x7c\x79\x71\x35\x38\x1b\x0f\x07\x1f\xcb\x27\xde\x3f\xb9\xbd\xbb\x19\x0e\x3e\x95\x1f\x8d\x2f\xaf\xee\xc6\xee\x8d\xa5\x24\xdf\xd2\x41\xfd\x9e\x2e\xbf\x78\x82\x34\xcb\x05\xd6\xe8\x50\xf7\x02\xfe\x38\x21\x53\x2e\x0c\x9f\x4f\x5d\xfc\x84\x15\x61\xdc\xda\x5a\x5d\xac\x32\x8b\x13\x30\xcf\x35\x35\x69\x4c\xef\x4a\x10\x9c\xc2\x3d\x81\x19\x1a\xb2\xf8\xf0\x6a\x7a\x78\x6b\x7e\x4c\xb1\x78\x20\xc2\x7f\xfa\x24\xa8\x52\x84\x95\x54\x3a\xec\x86\xec\x95\xc4\xa2\x83\x23\x74\xa3\xf9\xbe\x7e\xdf\x5f\x6a\x9a\xd8\x63\xa2\x30\x4d\xa4\x1d\x6c\x69\x5d\x4f\xd0\x05\x16\xb3\xc2\x18\xf8\x35\x9f\x4e\x4d\x63\xef\xcd\x30\xf4\x1d\x56\x9a\x45\x03\xef\xd5\xa4\xe1\xee\x45\xe8\xcf\xbe\xec\xe5\xe1\x3a\x55\xdd\x67\xdb\xd1\xd4\xfd\x35\xac\xb8\xd1\xd8\x4b\xba\xa1\x7d\xd2\x40\x6b\x30\x71\xf3\x78\xf9\x25\xd3\xdc\x76\x9d\x9c\xca\x2f\x36\x90\x93\x49\xe8\xd2\x3b\x3f\xd5\xda\x66\x03\x2d\x91\xcf\xd4\x1a\x0c\xc2\x71\x57\x48\xa8\x68\x06\x6c\xbc\x38\xcb\x08\x16\xb2\x69\xb7\xcb\x62\x60\xcb\xde\x9b\x9e\xc2\x3e\xec\x26\xbb\x7e\x0e\x10\x67\x60\x70\xf0\x42\x44\x85\x22\x3b\xd0\x80\x69\xab\x46\x01\xd7\x00\xf9\x74\x65\xe1\x95\x3e\x51\xa9\x95\x46\xf3\xe3\xf7\x16\xf7\x69\x33\x82\xf8\x30\x38\xbf\xa8\x08\x17\xe3\xb3\xe1\x87\xc1\xfd\xc5\x72\x5b\x65\xe9\xbb\xea\x16\xa3\x43\xa4\x9f\x97\x9d\xf7\x74\x6a\xee\x0c\x87\x5e\x65\x54\x5a\xc2\xc0\x68\x65\xf1\x72\x8c\xd1\x3c\x26\x59\xc2\x17\x29\x61\x60\xe2\x29\xdd\x84\x7a\x3d\xa7\x98\xda\xab\x25\x18\x2c\x58\x71\xac\xd9\x0d\xae\xb1\x43\x07\x99\x45\x62\x7f\xf3\x96\x11\xb3\x2a\xac\xfb\xda\xb8\xf0\xec\x7f\x6e\x15\x56\x1b\x9e\xb1\xc1\xe9\xdd\xf9\x4f\xc3\xb2\x7e\x78\xfa\xc3\xf9\x4f\x4d\x52\xcd\xf8\xe3\xf0\x72\x78\x33\xb8\x5b\x21\x9c\x54\x9a\x6c\x12\x4e\xa4\x1e\x70\xd5\x85\x4b\xa5\x0f\x4b\x8a\x0c\xee\x16\xa2\x4a\xa2\x47\x2a\xe9\x84\x02\x4a\x99\x75\x87\xde\x9f\x03\x67\x7d\xc4\x09\x8d\xa9\x5a\x38\xf1\xc5\xf4\x5b\xde\x47\xcd\x49\x6d\xfb\xc6\xec\x10\x3a\x49\xc1\xca\x67\x36\xc7\x4d\xfa\x04\x81\x6e\xfb\x08\x4a\x5b\xf0\x19\xd3\x82\x34\x9b\x11\x61\x86\x03\x2e\xa0\x70\x2c\xc1\x73\x3d\xaa\x50\x58\x29\x56\xcd\x0b\xad\x33\xc2\x88\x00\x24\x3a\xdf\x89\x11\xa4\x04\x61\x5f\x69\x99\x2b\x4b\x68\x44\x55\xb2\x40\x11\xd8\xb0\xc0\x9c\x99\x62\x86\x67\x56\x38\x00\x35\xa7\x42\x12\x7f\x35\x50\x6e\x57\x53\xeb\x5f\xb8\xa3\x64\xc3\x63\x76\x7f\x79\x36\xfc\x70\x7e\x59\x26\x81\x1f\xce\x3f\x96\x44\xd8\x4f\xc3\xb3\xf3\xfb\xd2\x6d\xae\x25\xd9\xe5\x72\x7d\xb5\xd9\x86\xa3\xe8\x5f\x3a\x41\x67\xe6\xd3\x13\xbd\xb8\x0d\x38\x75\x5e\xf9\xad\xac\xc3\x8d\x8b\x0b\x74\x7f\x0c\x99\x12\x8d\xce\x91\xae\x26\x24\xeb\x08\x2d\xd9\x90\x9a\xe3\x25\x6a\x7d\x5f\x56\x3d\xdb\xd5\x29\xbb\x17\x21\xf2\xf3\xa8\xb0\x2c\x85\x81\x14\x60\x34\x68\x33\x62\x35\xf8\xd6\x0a\x86\xfd\x13\xf8\xc9\xd3\x5c\x2a\xe3\xcf\x04\xe2\x44\x0f\x7f\x91\x7a\x41\xc1\xdf\x79\x84\x6e\x09\x19\x31\x67\x3d\x98\x51\x35\xcf\x27\x47\x11\x4f\x8f\x0b\x90\xc4\x63\x9c\xd1\x14\x6b\x49\x9a\x88\xc5\xf1\x24\xe1\x93\xe3\x14\x4b\x45\xc4\x71\xf6\x30\x83\x30\x1c\xe7\xd3\x3d\xf6\xcd\xce\xf8\x1f\x2e\xfe\xf4\xcd\xe1\xc5\x5f\xbe\x79\x57\xb7\x90\xb5\xed\xff\x90\x45\x38\x93\x79\x62\xc3\xf6\x44\xb8\x36\xee\xc8\xe7\x64\xd5\x7e\x5f\x96\xb7\x6b\x3b\xfd\xf5\xf4\xfa\xbe\x64\xb1\x2e\xff\xf3\xd3\xf0\xd3\xd5\xcd\x2f\x25\x4e\x79\x77\x75\x33\xf8\x58\x62\xa8\xc3\xeb\x1f\x86\x9f\x86\x37\x83\x8b\xb1\x7b\xb8\x8d\xed\xed\x47\xc6\x9f\x58\x79\x69\xa4\xe3\x80\xb5\x9e\x4e\xd0\x07\x2e\xd0\x8f\x7e\x27\x0f\x27\x58\xc2\x15\xe3\xee\x2c\x79\x80\x32\x1e\x03\xe3\x45\x24\x9b\x93\x94\x08\x9c\x58\x9b\x81\x54\x5c\xe0\x99\xb9\xe9\x65\x24\xb0\x8a\xe6\x48\x66\x38\x22\x07\x28\x02\x6a\x98\x1d\xc0\xa6\x80\xaa\xc5\x67\x55\x3b\xdf\x4d\xce\x14\x4d\x89\x53\xc1\xed\x3f\xef\xcc\x66\x6c\xb0\x39\x57\x77\x3f\x94\x85\xbd\x0f\x17\xbf\xdc\x0d\xc7\xb7\x67\x3f\x2e\x5d\x4f\xf3\x59\x69\x64\xb7\x10\x05\x75\xca\x93\x3c\x65\xe1\xdf\x9b\x8f\xed\xfc\xf2\x6e\xf8\xb1\x3a\xba\xab\xc1\x5d\x99\x32\x6e\xca\x51\x76\xef\xbe\xbf\xba\xba\x18\x96\xfc\xd2\xef\xce\x06\x77\xc3\xbb\xf3\x4f\x25\xfa\x39\xbb\xbf\x31\x90\x88\xcb\xa6\xe9\x46\xd0\x30\x51\x3d\xad\x70\x9a\xbb\x66\x85\x9d\x38\xd1\xc0\x46\xb5\x9b\xb3\x7c\x18\x60\xfe\x98\x98\x34\xb0\xea\x1c\x7a\x93\x6a\x64\x46\xda\xc8\x0e\x55\x79\x9b\x50\x3b\x3b\x5e\xba\xd1\xcb\xb8\xf2\x9d\x1f\x82\xc1\x23\x35\xca\x36\x4e\x12\xfe\x64\xe2\x89\x53\xaa\x6f\x65\x8b\xce\xa6\x5f\x91\x85\x87\xf0\xa8\x81\xe3\x95\xb7\x85\x44\x82\xa8\x4f\x3c\x67\x6a\x73\x92\x1b\x5c\x96\xf8\xce\xf0\xf2\xa7\xf1\x4f\x83\x32\x05\x9e\x5f\x2c\x67\x35\x61\x13\x0d\x57\xf1\xe0\xf2\x17\x7f\x09\x43\xd4\xf9\x81\xd7\x50\x8d\xec\x1a\x25\x54\x8b\xbd\x11\xd6\xda\x6b\x02\x12\x0d\x22\x14\x4c\x0e\xa9\x9e\x1c\x44\xb9\x66\xc6\x9f\x64\xf8\x93\x19\xe4\x89\xfb\xa3\xd2\x9e\x84\x75\x01\x6b\xaa\x0b\xea\x87\x76\xac\x56\xcd\x10\x61\x8f\x54\x70\x00\xd5\x45\x8f\x58\x50\x2d\x8d\x9b\x96\xf5\x5c\x4f\xe0\x7f\xd7\x6b\x13\x0c\xa3\x15\xc6\x75\xcb\x85\x3a\xf3\xd1\xc4\x9b\x59\x43\x9a\xa2\x6a\xeb\xf1\xb4\xcd\x86\x8e\xfa\xb7\x0d\x9b\xb3\x65\xd4\x71\x79\xc2\xff\x48\xce\x28\x4e\x34\x03\xd8\x9d\xbc\x38\xb8\xbc\x3d\x2f\xcb\x8f\x65\x35\x23\xe0\xcb\x1b\xcb\x8b\x60\xa8\x34\x23\x77\xca\xc4\xed\x5f\x2f\x8c\x76\x01\xc8\xcb\xe6\xdc\x06\x8a\x05\x08\x40\x0e\x8a\x25\xc3\x42\x56\xbe\x90\x08\xd0\xd8\x8a\xa8\x2f\x7d\x67\x41\x4c\xd5\x23\xa7\xf1\x88\x91\xcf\x19\x61\x12\x82\x03\xcc\x7d\x56\xf8\xda\xe5\x11\x3a\x9f\x02\x4b\xd0\xaf\x33\x94\x33\xeb\x00\xd3\x17\xae\x19\xe4\x81\x16\x65\xed\x10\xbc\x86\x08\x86\x17\x46\x5c\xc4\x56\x31\xf8\x11\xfb\xd9\x3b\xd1\xe0\xd1\x94\x6b\x06\xa4\x77\xd1\xb6\x77\x82\x30\x93\xf4\x00\x69\x85\xa5\xba\xa7\x90\xbf\xa0\x15\x4a\x1b\x47\xa6\x39\x8d\xfd\xf3\xe5\xaf\x81\x5a\xb0\x72\x78\x19\x34\xdf\x05\x95\xab\xa0\x45\x34\x4e\x8c\xc7\x64\xdc\xfd\x4e\x88\xb8\x20\xd6\xcf\xb2\xf6\x35\xb0\x8a\xb1\xdf\x61\xf9\x50\xf3\x3d\x9c\x33\xa9\x30\x8b\xc8\x69\x82\xe5\x86\x41\x48\xce\xc6\x71\x50\x96\x38\x6e\x6e\xee\xaf\xef\xce\xbf\x5f\xc1\xe5\xab\x1f\xd7\xc3\x80\xa2\x24\x77\xee\xb9\x89\xe0\x38\x46\x9a\x7d\xce\xb8\x71\x05\x5a\xc1\xbf\xc0\x1f\x37\xc9\x45\x3e\xaa\xb3\x84\x7d\x5e\xe4\x44\x58\x3b\x47\xe8\x4a\xa0\x76\x21\x50\xa4\x57\x02\x05\x26\x0f\xb7\xd5\xe0\x59\x34\x55\x51\xac\x75\x2b\x4b\xb0\x9a\x72\x91\x1a\x2e\x5f\x9a\xb4\x69\x7c\x79\xa3\x94\x29\x22\x44\x9e\x29\xea\x00\xe5\xab\x52\x2a\x94\x99\xe7\xb3\x4f\x44\x4a\x3c\x23\xdb\x38\xa0\x9b\x94\x87\xdb\x9f\xc2\x7f\x82\x83\xb9\x8b\xec\x5f\x1a\xa1\x0b\xbf\x77\xf4\x74\xc5\x3e\x98\x40\x9e\x6b\x9e\xd0\x68\xc3\xa8\xbf\x0f\x83\xf3\x8b\xf1\xf9\x27\xad\xc4\x0f\xee\x86\x17\x25\x51\x02\x9e\x0d\x3e\xdc\x0d\x6f\x2c\x92\xf6\xe0\xfb\x8b\xe1\xf8\xf2\xea\x6c\x78\x3b\x3e\xbd\xfa\x74\x7d\x31\x5c\x11\x99\xd3\xda\x78\xdd\xba\x5a\x7d\xf5\xa4\xf6\x0b\xec\xb0\xe6\x65\xa1\xbd\x0c\x52\xd7\x30\x4d\xc0\x09\xce\x8d\x33\x1c\x23\xc6\x63\x02\x3f\x4b\x67\x9d\xf1\xf0\xd5\xe8\x5c\x7d\x95\x24\x08\xe7\x8a\xa7\x18\xbc\x36\xc9\x62\xc4\xf0\x44\xb3\x56\x9c\x24\x41\x78\x97\xc8\x19\xd3\x2c\x56\x37\x66\x70\xe2\xa3\x84\x68\x76\x9e\x05\x19\x87\xd6\x6f\x30\xa5\x0c\xc2\x7d\x53\x2c\x1e\x8c\x9b\xa9\xe8\xb2\x38\x14\x12\x61\x39\x62\x7a\x5c\xc4\x1a\x86\xba\xac\xf0\x49\xa7\xb7\x5a\x57\x27\xc5\x0f\x44\xaf\x4a\x9a\x47\x73\x94\x09\x3e\x13\x44\x4a\x6b\x5b\x8e\x30\x33\x01\x08\xf6\x75\x7d\x0d\x8d\x18\xe3\x7a\x29\x9c\x09\x3b\x26\x19\x61\x31\x61\x11\x35\xb9\x85\xe0\xbb\xf7\xa6\xcd\x99\xc0\xd9\x1c\x49\x0e\x4e\x6f\x58\x76\xb0\x5f\x99\x8f\xdc\x4d\x66\x66\x6c\x1e\x87\x16\x68\x91\x6b\x3e\x71\x05\x72\xa2\x59\x65\xf8\xd8\x5d\x86\xce\xed\x62\xec\x80\x69\x96\x10\x65\x2a\x06\xc0\x92\xc3\x66\xe8\xb5\x2e\xed\x87\xde\xa6\xa6\x4d\xd0\x17\xb6\x1b\x33\x96\x76\x44\x47\x0d\x96\x6d\x7b\xa4\xd0\x0f\x98\xc5\x89\x6e\xc5\xf9\x30\xca\x67\x11\xf2\x61\x06\x9a\x6a\xdc\x69\xdc\xe6\x16\x8d\x70\x2e\xb7\xb9\x46\x2b\x09\xa1\xc6\x2a\x78\x58\x04\x85\x00\x79\xdb\x6c\x50\x58\xdd\x4c\xb3\x48\x9c\x70\xbb\x4a\xe6\xf5\xdc\x14\xa1\x42\x30\x9a\x96\x6b\x36\x13\x94\x45\x34\xc3\xc9\x46\xba\x5f\x25\x23\xc0\x06\xda\x7f\x4d\xa7\x9a\x7c\xde\xd7\xdc\xb6\x8a\x88\x14\xb2\xa4\xed\x30\xfd\x16\xae\x61\x49\xb2\xa9\x15\x44\x16\xd1\x24\x58\xf0\xdc\xf8\xe3\x60\x5d\x48\xdc\x70\x54\x8f\x9a\xb6\x5b\x9f\x0c\x5c\x8e\xc2\xde\x60\xb3\x4d\xe4\x4f\xdb\xfa\x55\x5a\xb1\xbd\x9b\x60\x3c\x9c\x5c\x37\xb7\xd9\xb4\x03\xc1\xc3\x7f\x2d\xa3\x9d\x4f\x38\xd3\x34\x63\x6b\x07\xe0\x62\x8e\x56\x49\xb2\xa5\xc9\x5c\xfc\x4c\xe0\x3b\xf7\xc9\x29\xdd\x77\xa3\x58\x42\x1b\x00\x55\xef\xa4\x14\x43\x10\x24\xba\x5b\x1a\x9f\xe6\x5a\x96\x45\x18\xa2\x10\xd0\xd7\xe4\x68\x76\x84\x5c\x25\x88\x03\x34\xb8\xbe\x1e\x5e\x9e\x1d\x20\xa2\xa2\xf7\x2e\x66\xd1\x06\x2c\x8d\x98\xe2\x56\x5a\x59\xb8\x2a\x1e\x29\x11\x33\x52\x9a\xb3\x8b\x6e\x82\x50\xe5\x19\x95\xca\x86\xcf\x6a\xbe\x12\xd4\x5b\xa1\x69\x55\xcc\x36\x14\x92\xab\xf9\x36\xa4\x81\xa5\xcc\x53\xad\xcb\x8e\x29\x4e\xc7\x82\x27\xdb\x30\x85\x33\x98\x0a\xa8\xcb\x1e\x23\x80\xe2\x14\xe9\x66\x6d\x28\x88\x77\x39\x7a\x91\x4e\x0b\x46\x9a\x2f\xeb\x7b\x33\xb8\xb7\x9c\xf7\xc1\xc6\xa3\x51\x17\x02\x01\x18\x02\x2d\xac\xa2\x30\x1b\x8f\xad\xa5\x7e\x8c\xa3\x48\xab\xdc\x3b\x9e\x54\x50\xc4\xc7\xb9\x04\x6c\x47\xcf\x36\xcd\x55\x74\xee\x86\x99\x69\x0e\x06\xc1\xc0\xfa\xca\x95\x3c\xa2\x45\xfb\x0d\xfd\x4e\x16\xb5\x5e\x5d\x99\x9d\x7b\xe9\x4d\x2a\xe6\x12\x96\x04\x76\x52\x9a\x32\x3d\x6a\x4e\x16\x68\x8e\x1f\x49\xa9\x4b\x97\x95\xa3\x1b\x5e\xf0\x5c\x34\x31\xba\x11\x3b\x23\x99\x20\x5a\xd2\xaf\x3a\x50\x3c\x4d\xdf\x94\x29\xb1\xa7\xeb\x9e\xae\xdf\x3c\x5d\x9f\x9a\x6a\x4d\x03\x5f\x9d\x6b\x2b\x01\xce\x34\x36\xce\x38\x4f\xc6\x1d\x6c\x22\xdd\x57\xbc\xe4\x09\xab\xd4\xae\x02\x5c\x02\x9e\x83\x7c\x54\xba\x36\xb9\xbe\xeb\x82\x3c\x5f\x3b\xbc\x25\xcb\xe0\x5c\x66\x41\xd1\x9e\x6d\xce\x7b\x53\x2b\xcb\x5a\x42\xcf\x2e\xe6\x9c\x1a\xf9\xc6\xbb\xcb\xc2\x22\xac\xa5\xc3\xe4\x44\x11\xca\x6a\x25\xe1\x0c\x3d\xeb\x05\x36\x72\xc7\x3f\x72\xae\xb0\x7c\x7f\x34\x62\x5a\x88\x7a\x20\x0b\x63\x6e\xd5\x62\xca\x1f\xb5\x2c\x7e\x28\x09\x93\x10\xee\xfd\x47\xe3\x9e\xd3\x24\xee\xcc\xd5\x46\x35\x35\x95\xe8\x20\xe8\xda\xf7\x02\x21\xba\xb6\x51\x2b\x25\x15\x01\xd0\x20\xe7\x9b\xb9\xd8\x67\x66\xf8\x33\xa2\x20\xcf\x5b\x51\x05\x3a\x53\x6c\x4a\xdd\xd5\x86\xbe\xd2\x74\x65\xa8\x42\x70\xf0\x93\xc4\xf9\x76\x8c\x5f\xd6\xdb\x58\xc9\x19\xbd\xb6\x70\x6b\x63\xde\x8f\x9d\xdd\x28\x12\xbc\x56\x3f\x0e\x4b\x64\x76\x7a\x62\xd8\x81\xf3\x5f\x13\x76\xf4\x44\x1f\x68\x46\x62\x8a\x21\x02\x5e\xff\xeb\x58\xcf\xeb\x0f\xa7\x37\x57\x97\xe3\x22\x93\xe7\xbf\x46\x6c\x90\x48\xee\xb3\x14\x10\xe3\xcc\x87\xdb\x67\x82\x38\x91\xd0\xce\x05\xac\xae\x85\x19\x71\xc4\xda\x46\x10\xf3\x48\x1e\xe1\x27\x79\x84\x53\xfc\x1b\x67\xe0\x4a\x1f\xc0\x9f\xa7\x09\xcf\xe3\x9f\xb1\x8a\xe6\xc7\x70\xae\xd5\x31\x79\x24\x4c\x19\x37\x95\x5e\xae\x18\x32\x88\x25\x44\xeb\xff\x41\x8f\xb9\x48\x2a\x92\x5a\x93\x8d\x48\xa6\xd0\xff\x23\xc8\x84\x73\xd5\x7c\x49\xf1\xe9\x54\x92\xb5\x2e\xa4\x42\x49\xbb\xbd\x42\x7f\xf9\xf3\x37\xdf\x6a\x12\xda\x64\x8d\xcf\x6f\xaf\xc6\xfa\xfb\x3f\x9c\xd9\xef\xe5\x1a\xec\xee\x2a\x2b\x58\x9b\x23\x1e\x13\x38\x9f\x33\xb8\xfd\x04\x38\x2f\x80\xbd\x01\x39\x14\xfb\xd8\xc4\xdd\xce\x4a\xad\x6f\xa7\xb2\x6d\xb4\x98\xa0\x62\x07\x73\x44\x87\x88\x71\x94\x9a\x58\x53\xcc\xd0\x7f\xfc\xf8\x7d\xf3\x06\xe6\x82\x6e\xd4\x21\xb5\x98\x11\x41\x97\x92\xfe\x46\x24\xd2\x54\xa3\xa9\x98\xa7\xba\x6b\x41\xe4\x9c\x27\x31\x7a\x22\xa0\x26\xd9\x38\x50\xaf\x95\x0b\x32\x62\x61\x13\x10\x72\x88\x70\xa2\xf8\x8c\xc0\x5d\xed\x14\x35\x45\x84\x16\x55\x4c\x96\x86\xe2\x82\x1c\x18\xbc\xb1\xdb\x3f\xb9\xd8\x6a\x98\x26\x3c\x72\x49\x2d\xd6\x24\x17\x4f\x9a\x67\x3e\xad\x9a\x5e\x51\xbb\x0d\xbf\xba\xc9\xd6\x6c\xdb\xbc\x34\x36\x09\xc5\xda\xb0\xaa\x3b\xd3\x3c\x18\x1a\x71\x36\x4e\x28\x7b\xd8\x68\x33\xae\x9c\x28\xa7\x5b\xb0\x6b\xa6\x5b\xf4\x76\x6e\x63\x01\x59\xe3\x7c\x7c\xc8\x93\xc4\xa4\xb6\x84\xdb\x03\x72\x97\x59\x37\x10\x06\x32\x93\x03\x4a\x62\xeb\xf7\xb2\x9a\xb0\x20\x0c\x02\xde\x46\x6c\xb2\xb0\x3e\x5b\x79\x80\x64\x1e\xcd\x5d\x66\x5e\xc4\x99\xd4\x62\x34\x17\x28\xe2\x69\x6a\x2a\xac\x32\x82\x14\xe7\x89\xb4\xd1\xee\xec\x50\xe1\x48\x8d\x58\xd1\xdf\x8a\x93\x67\xca\x30\x6d\x97\xba\xd7\xdd\xa5\x53\x94\x7b\x5a\x2a\x70\xd3\x38\x04\x8e\x00\x23\x98\xf1\x44\x05\x10\x14\xbc\x7e\x96\xcc\x86\xb5\x68\x06\x72\xce\x85\x1a\xc7\x8d\x3c\x67\x25\xd1\x54\x19\x21\x23\x87\x09\x04\x0d\xf3\x47\x2d\xfc\x93\x27\x6f\x7c\x5d\x36\x04\x4d\xd5\xcb\x46\xd0\xed\x18\x2d\x1d\xd9\xba\x24\xd8\xb2\x56\x06\x46\x24\x2a\xc7\x84\xaf\x1a\xe3\x2d\x7c\x05\x58\x02\x4b\x17\xaf\x7a\xee\x9c\x10\xc4\xe3\x02\xf1\xce\xdc\xeb\x36\x23\x64\xd9\x9a\x5a\xfc\x86\xe7\xcb\x1c\x5d\x36\x95\xfb\xb2\x25\x57\x8f\x05\x4c\xf6\x92\x80\xac\x89\xc5\x84\x2a\x81\x45\x09\xae\xc4\xeb\x83\x92\x60\x01\xf1\x59\x23\x66\xc0\xeb\x8c\xa6\x10\xa3\x98\x4a\x48\x10\x81\xbb\x34\x70\x86\xa1\x6e\x4a\x60\xe5\x68\x17\x79\x8e\x26\xfe\x1c\x02\xcb\x0a\xd2\x70\xcc\x4e\x77\xe4\x41\xba\xb4\x7e\xc6\xa3\xbc\x10\xe4\x22\x90\x70\x2d\xb0\x0f\xa2\x4c\xd2\xd9\x5c\x21\xca\xac\xdd\x11\x27\x33\x2e\xa8\x9a\xa7\xf2\x00\x4d\x72\xa9\xb5\x50\x13\xac\x66\xe2\x51\x88\x8a\x3a\x71\xa1\x6d\x93\x88\xe3\x4a\x83\x75\x15\x65\x03\xd2\xe8\x76\x28\x87\x95\xbb\x62\x05\xe1\x0c\x3c\xd8\x61\xb5\x0d\x0a\xc5\x23\x0d\x46\x26\x32\x71\x80\xdc\xc1\x4b\x41\x29\x92\xb6\x73\x00\xd0\x94\x3b\xf3\x52\xbc\x44\x35\x30\x64\x92\x41\x05\x71\xb1\xdb\x20\x79\x95\xe1\x31\x0d\x84\x94\x77\x3a\xa5\x99\x6a\x0c\xdc\xaa\xbb\x8a\x6e\x02\xe0\xa1\x6e\x8b\x0d\xc9\x58\x40\xcd\x00\x17\x37\x62\xb7\x84\xb4\xa3\xc9\xd5\xf6\xde\xd4\xe7\x85\x29\xd8\x44\x8f\xe5\x24\xbf\x8d\x13\xfb\x6c\x78\x7b\x7a\x73\x7e\x6d\x20\x27\xae\x6e\x3e\x0d\xee\xc6\x0d\x7e\xed\x86\xb7\x3e\x0d\x6e\x7e\x3c\x5b\xfd\xda\x0f\x77\xe5\xac\xec\x86\x57\x6e\x6e\x97\x27\x73\x74\x18\x62\x43\x52\x58\x63\x3f\x27\x28\x5b\xa8\x39\x67\x3e\x44\x21\x2e\xf1\xa6\x43\x64\x32\x82\x15\x84\x10\x09\xa9\x1a\x1c\x87\x77\x10\x97\xb3\x5a\xc2\x2c\x6f\x96\xc1\x82\xdb\xa9\x68\xb4\xc6\x89\xfc\x98\xf0\x09\xf8\xad\xf3\x52\x9d\xdd\x25\x11\xe8\x5b\xc6\xfb\x9c\x51\x99\x25\x78\x51\xeb\x61\xd5\x95\x73\x89\x53\x02\x11\xc7\x05\x88\x9d\x4b\x16\xd1\x3b\x03\x09\x4c\xfe\x5e\xa7\x53\xc8\x64\x52\x14\x2b\x82\x26\x44\x3d\x41\xde\x9c\xfb\xd5\xdb\x52\x5d\xc0\x88\x3c\x1a\x31\x30\xe7\x8c\xf4\x22\xc7\x39\x44\xfb\x8d\xde\x1d\xa0\xd1\xbb\x98\x3c\x92\x84\x67\x7a\xe7\xf5\x0f\x2d\x97\xcc\x30\xc5\x34\xb9\xe4\xca\x5b\xe6\xb6\xd9\x4f\x41\x22\x9a\x81\x64\x3e\x26\xba\xdd\x97\x13\x3c\x4a\x94\xec\xd8\x19\x8c\x01\xe1\x38\xd6\x4a\x36\xb0\x32\x37\xbc\x22\x04\x88\x05\x53\x2f\x15\xec\x5c\x47\xa4\xf0\xe6\x6f\xd3\x63\xd8\x66\xd9\xec\xd9\xb8\x03\xde\x31\xfc\x42\x4a\x86\x0b\xc5\xf1\x1d\x77\xd4\x3a\xee\xdb\x74\x8c\x56\x0f\x74\xf5\x00\xea\xb5\x58\x43\x60\xf6\x03\xbc\xd5\xdf\xad\x14\x34\xfd\x6d\x1b\x85\x75\xe1\x41\x64\xb4\xb9\xcd\xd5\x74\x6a\xb2\x72\xc4\x51\xc2\x65\x19\xea\xa4\xf3\xa0\x4f\xed\xa7\xcb\xc6\x3d\x0c\x9d\xc5\xfa\x5a\x5f\xcb\x1f\xdd\xb0\xf0\x15\x40\x41\xc3\x26\x94\x75\x70\xd8\xb7\x0f\x10\x85\x60\x39\x90\xa7\x93\x22\xf1\x9b\xc5\xa8\xb0\x62\x8f\x58\x11\x72\x20\xd1\x13\x49\x20\x4a\x29\xe2\x69\x06\x16\x5a\x3b\x5c\xdb\x12\x89\x4d\xc0\xe7\x01\xe2\xb9\xd2\x8d\x99\x94\x0a\x67\x83\xb3\xf9\x1a\x85\xd5\xda\xb8\x4e\x6c\xec\xb2\x07\x27\x36\xb4\x6e\x58\x21\x65\xe8\x23\x51\xd0\x0a\x80\xbf\x87\x13\x04\x31\xaf\x1a\x01\xd7\xbc\xf6\x5b\x9c\x28\x3b\x93\x35\x76\xbe\xc0\xbd\xf8\x3e\xe1\x93\xe5\x3a\x1e\x34\x8e\xee\x6f\xce\x9d\x41\xa9\x08\x7f\x09\x10\x70\x4b\x0e\xa1\xe1\xf5\xcd\xf0\x74\x70\x37\x3c\x3b\x42\xf7\x92\xe8\xe5\xf1\xd3\x85\xf4\x58\x2f\x51\x9a\x91\x5b\x20\x0d\x26\x15\xc1\x6d\x7a\x2c\x11\xa2\x94\xc4\xba\x82\x71\x94\x51\x36\x96\x13\x36\x60\x5c\x50\x6b\x67\x01\x5c\x98\xea\x3c\x6d\x60\xd5\xaa\x13\x08\x61\x2e\xe3\xb7\x13\x64\x64\xc6\x9b\xd6\x03\xab\x56\x91\x4f\x39\x20\xeb\xb9\x27\x03\x47\x4b\xcd\x09\x15\xa8\xd3\xb4\x0c\x51\x8d\xbb\xcf\x29\x88\x50\xfe\x84\xb3\xe5\xd9\x83\xf8\xa9\x44\xb4\x46\x92\x09\x5c\xaf\xcf\x7d\x0e\x1c\x5b\x1b\x1b\x56\xb8\xfd\x04\x0b\x7f\x84\xe1\xad\x9e\x6f\x9a\x80\x7d\xe9\x6c\x1c\xe1\xc4\x2a\x83\xb0\x61\x88\x12\xc1\xd9\x81\x5f\x28\x43\xa5\x2b\xf1\x00\x4d\xe9\x67\xdb\x68\x11\x9e\xec\x5e\x0d\xfc\xd5\x2d\xe1\x70\x73\x5c\x3f\x53\x6b\x88\x0d\xd7\xf0\xfd\xd2\xf0\x2c\x2e\x95\x96\xba\xb4\xe4\x2a\x48\xc4\x85\xbe\x29\xa0\xdb\xc2\x88\xbc\x4a\x64\x50\x58\xe8\x45\xa9\x1b\xd5\x97\x9d\xfe\xa2\x8e\x45\x8c\x15\x39\x54\x74\x65\xfe\xaa\x4d\x71\x80\x64\x08\xac\x02\x34\xa7\xe2\xe6\x99\x90\x19\x66\x2e\xb2\xb6\x65\xb8\xee\xca\xdb\x82\x55\x69\x09\x16\x43\x76\x0f\xc8\x57\x90\xb9\x51\x1a\x87\xcc\x60\x3d\x97\x8e\xc3\x06\x2f\xec\xc3\xb2\x3d\x61\x1f\x4b\xd1\x32\xd8\x3c\x8b\xf7\x69\xb0\x09\x96\x0a\xd9\x31\xb5\x69\x92\x81\x84\xff\xbc\x36\xb4\x92\x6a\xd6\xd5\x7c\xa6\x49\xa8\xac\x84\x10\x30\x6c\x4b\x07\x7b\x61\x40\x3e\x52\x22\x66\x4e\x10\x36\xe5\x7c\xfd\xd9\xb6\x75\x7d\xdd\x2d\x11\x32\x13\x88\xb1\xae\x37\x7d\x84\x06\xac\x06\x77\xe4\xc2\x6a\x4a\xeb\x65\xee\x24\x9c\x3c\xe1\x85\x44\x99\x30\xc8\x20\x26\xf0\xda\x4d\x1e\xe2\x1d\xcb\x1f\x79\x4f\xb6\x72\x91\xef\x08\x54\xe9\xd5\x31\x4f\x4e\xee\x1d\x3f\x83\x27\xa6\x12\x14\xec\x05\xf2\xa2\xb9\x42\xd5\xec\xc0\xea\x14\x19\x47\x73\xcc\x66\x64\xec\x6c\x64\x9b\x68\x4b\xba\x9d\x53\x68\xe6\xcc\xb6\xd2\x7c\x39\x5d\x1b\x85\xc9\xd6\x10\x31\xaf\x7a\xfb\x8f\x3e\x04\x52\xe1\x19\x41\x66\x44\x9d\xac\x8a\xa5\x80\x1f\x8b\x15\x0b\x7a\x82\x6d\x75\x58\x0e\x82\x6e\x13\xde\x21\x72\xe5\x02\x4f\x48\xf2\x3a\x8e\x6f\xe8\xda\xda\x56\xc1\xd9\x62\x82\xb9\x09\x7a\x02\x73\x6c\x85\x65\x58\xe3\xab\xc8\x9b\x42\xbb\x97\xcd\xb3\x54\x41\x7b\x8b\x89\xba\x7a\x13\x9b\x4c\xb5\xad\x0a\x45\x78\xed\x05\xd5\x1a\x9a\xec\x23\xe1\xf5\x57\x35\x09\x6e\x36\x90\xa0\x68\x44\xcb\x38\xb6\xae\x1a\xb1\x72\x2a\x1b\xe7\x88\x77\xac\xa4\x76\x3e\x45\x8c\x33\x82\xa8\x2c\x5e\x56\xe5\x6c\x16\x8f\xb0\xa2\x45\x7c\x63\x7c\xf1\x95\x9e\x7c\x01\x9f\xe7\xb6\xb4\x14\xb9\xef\xde\x36\xe0\xd2\x73\x19\xd1\x8a\x2a\x16\x0b\x40\x68\x34\x7c\xb8\x2c\xd3\xad\x1c\xe7\xce\x05\xee\x3b\x07\xc0\x19\x04\x5a\x2a\x8e\x40\x8c\xac\x0c\x0e\x19\x18\x4b\xfb\x92\xfd\xc8\xa2\x8c\x8c\x98\xb7\x6c\x00\x21\x52\x89\x52\x9c\x81\x4b\x86\x71\x55\x7c\x65\x50\x73\x94\xdf\xc2\x03\x27\x88\x4b\x53\x87\xa9\x65\x05\x56\x99\x76\xdc\xf5\x5b\xac\x6b\x19\x9d\xd0\x21\xab\xce\xe8\x23\x61\x8e\xa6\x0f\xdc\x99\xd0\x83\x72\x9d\x26\x8b\x43\x0c\x51\xa2\x24\x0e\x0d\xd7\xcb\x39\x92\x31\xc8\xec\x83\x3d\xb2\xfb\x92\xdd\x35\x46\x41\x18\x8c\xab\x12\x38\xb9\x8b\xeb\x0d\xa9\xd4\xc2\xae\x9a\x44\x5e\x2c\xd1\x1f\x19\x57\x7f\x0c\x80\x69\x9d\xf1\x02\x3e\x75\x26\xa8\x83\x5a\xd9\x0f\x38\xb4\x96\x70\x10\x0e\x00\x92\x56\xae\xfc\xb6\xae\xdd\x22\x6e\xf9\x59\xa5\xd1\x61\x3d\x89\xa9\xad\x6e\x52\xef\x70\x45\xd5\x6b\xa1\x6a\xf0\x34\xa5\xd9\x8a\x93\x5e\x32\x74\xca\x55\x1e\x56\xbf\x17\x9d\x3c\xab\xb5\x84\xee\x6d\xa8\x2d\xed\x1c\xf8\xb2\x02\xc3\xb6\xd9\x2e\xb1\x49\x9a\x5e\x9b\x5c\x2e\xca\x91\x47\xb6\x8a\x41\x0b\x48\xeb\xd1\x88\x7d\xe0\xc2\x5e\xc1\xd2\xc2\xc4\x4f\x70\xf4\x70\x48\x58\x8c\x70\xae\xe6\x06\x2c\xd5\xfa\x15\x16\x96\x1a\xb4\xa4\x01\x64\xe3\x91\x10\xa8\x8c\xb0\x88\x5d\xc1\x82\x47\xee\x46\x31\x62\x41\x23\x00\x44\x0f\xc5\x82\xa0\xdc\x69\x9b\xaa\x49\xa4\xd6\xaf\xda\xd6\xa2\xa9\x90\x67\xad\x8c\xe7\xf2\x73\x56\x2a\x4c\x0a\x10\xfa\x10\x9f\xc2\xa7\xf5\xd5\x39\x77\xd6\x46\xa7\xdf\x69\x7a\xae\x7b\x21\x0e\xac\x46\x61\x4c\x52\x76\x06\x5a\xd2\xf9\xc6\xf1\xda\x12\xe8\xeb\x34\x17\x10\x6d\xd9\xd4\xe6\xd7\xd1\x9c\x26\x85\xef\xe2\xfd\x81\x1f\xa6\x6e\x32\x21\x8f\x24\x31\x90\xe3\x91\x80\xc0\x6a\x63\x35\xfc\x06\xfd\x6f\x53\xdc\x12\x7d\x3b\x62\x1f\x81\x0d\x27\xc9\x02\x00\x11\x7d\xcb\x58\x55\x9a\x79\x68\x1c\x80\xb2\x99\x1c\xa8\x3c\x10\xb3\xd7\x73\xfc\x48\x46\xcc\x35\xf3\xbf\xd1\x03\xfa\x77\xf4\x6d\x9b\x7a\xe7\xe2\xa3\x9f\xd9\xce\xf1\x21\x88\x3e\x0e\x6e\x39\xcb\x28\x2d\xbf\x71\x66\x90\x92\x11\xb2\x01\x18\xc1\xe3\x1a\x53\xf6\xc8\xa3\x5a\x10\x7e\x78\x6a\xb1\x20\x4c\x8d\x19\x8f\xc9\x98\x34\xb8\x34\x97\x30\x09\x2d\x04\x5c\xf2\x98\xac\x74\x48\x7a\x66\xfa\x33\x98\x6e\x64\x3e\xf1\xdb\x01\xf9\xd9\x3e\x19\xd7\x5b\x1f\xca\x94\xd6\x3c\x72\x0f\x1e\xba\xc9\xb8\x37\x75\xa6\xba\x28\xbf\x03\xb8\x10\xec\x00\x9a\x1d\x7a\x09\x56\x2e\x85\xb5\x7a\x1c\xab\x8e\x00\xfd\xb2\x9e\xb9\xbd\xac\x02\x58\x54\x28\x5d\x21\xe8\x8c\x6a\xf9\xbd\xbb\xc3\x16\x38\xe1\x26\xde\x0c\x83\x11\xd9\xc9\x9d\x51\x2c\x85\xc3\xc9\x38\xf4\xf4\x57\x38\x21\x27\x3c\xaf\x0a\xf0\x76\x01\xa8\x0c\x93\x6b\xad\xac\xbe\xd0\x7c\x78\x66\x12\xb8\xc8\x9c\x9a\x94\xe9\xc1\xe9\x05\xd2\xa7\x83\xa7\x06\x57\x08\x16\x2d\x57\x73\x2e\xe8\x6f\xad\x09\x26\xed\x32\x7a\xe1\x69\x2d\xf2\x71\xcc\x38\xcb\xd2\x3a\x10\xab\x11\x29\x54\x49\x2b\x69\xd2\x99\xd0\x24\x07\x08\x4d\xcd\x66\xa7\x79\x62\x70\xf7\x23\x2e\x62\x53\x7d\x5b\x96\xb2\x7f\x20\x8a\xd2\x89\xf7\x58\xf9\x06\xa9\x45\x1a\xb4\xc8\xfe\xc6\x82\xb3\x54\x00\xfd\x6b\x4e\xf2\x1d\x25\x50\xbd\x6a\xc8\xe9\x1d\x9e\xc9\x22\x86\xd4\xac\x8d\xe6\xcd\xc5\xfa\xfe\x43\xcf\x54\x06\x29\x87\xce\xb2\xe8\x11\x7c\x8c\x4a\x6e\x8a\x4b\xae\x65\xd1\xb9\x31\xc8\xe5\x3b\x30\xe9\xbc\x44\x3c\x47\x5d\x46\x6a\x60\x3f\x96\xfc\x1e\x7d\x02\x5e\x95\x45\x3c\x93\x9d\xc4\x41\xc0\x57\xa4\x8f\x67\x34\x99\x6c\xc0\xe4\xea\x42\xf5\xd2\xa0\xd6\xc2\x80\xe2\xd9\x5a\x43\x2e\xac\xe2\x10\x35\xff\x24\x28\x00\x7c\x2d\x8a\x97\x7d\x1d\x55\x77\x5d\x84\x3c\x46\x4b\x29\x46\xac\x85\xb8\x0e\xb7\x84\x8b\x66\x1e\xbf\x86\x01\xc2\x36\x54\xee\xba\xee\xb7\x6f\x3b\x11\x86\x25\xed\xeb\x91\xa8\xa3\x7b\xac\x3c\x0c\xbe\x90\xc3\xeb\x18\x10\xbd\x68\xf3\x72\x27\xc3\x93\xe3\x38\xc2\xd1\xbc\x75\x52\x13\xce\x13\x82\x59\x9b\xf4\xda\xf8\xb8\x7a\x44\x0c\x36\x25\xb0\xee\x24\x01\x80\x56\xb7\x04\xb6\xa8\x5f\x21\xbe\xb3\x18\x80\xb5\x0d\x0f\x37\x48\x1c\x6e\xa0\x8a\x30\x67\xf9\xa1\x6c\x96\x90\xea\x5a\x59\x04\xf4\x03\xdb\x49\x12\xe5\x49\x50\xd5\x2f\x23\x42\x8f\x5a\x2f\xf1\x23\x61\x5a\x67\xb0\xe3\x70\xce\x8c\x27\x97\xcf\xea\x6b\xf9\x1c\xf8\xae\x9d\x3f\x0d\x92\xc6\xe2\x11\x83\x83\xcb\xcb\x87\x55\xd3\xaa\xd4\x6a\x46\x68\x97\xda\xf8\x74\x06\x42\xc4\xda\xc7\xf3\xb6\x6c\x26\x5e\xfb\x4c\x9a\xbe\xc7\x10\x63\xb0\xb5\x6b\x2d\x70\xbf\x14\x99\xf6\x66\x63\x1d\x9a\xd2\x0b\x19\x91\x21\x6a\xa3\x0c\xf2\x12\x04\x6d\xb4\xa1\xf9\x3c\xeb\x5d\x52\x54\x2f\x70\xb7\x41\xc7\xa1\x2c\x75\x55\x77\x74\x3c\x83\x75\x72\xd9\xb9\xbd\xb0\x11\xb7\x65\x97\xad\x4f\xcf\x28\xc2\x1c\x6d\x7d\x4e\x25\x30\x24\x97\x43\x4a\xf0\xcf\x46\xc3\xa6\xd2\x58\xc0\x5c\x95\x82\x34\x53\x0b\x5b\xd4\x0a\xee\xc5\x30\x25\xd3\x00\x76\x35\xb9\x87\xab\x77\x64\x5c\x72\x10\x37\x75\x06\x1d\x59\xb3\x42\x63\x93\x6e\xa1\x43\x00\x88\x4a\xc2\x7d\x5b\x34\x88\xa9\x0f\x3a\xc6\x49\xab\x2d\x6b\x07\x4c\x13\xb2\x24\x8b\x24\x7b\x8b\xdd\xa9\x44\x4e\x34\xef\xc2\x49\x52\x99\x17\x86\x6c\x56\xe5\x6b\x84\x4d\x8a\x42\xa6\xdd\x9d\xd5\x09\x9e\x90\xb5\xdc\xd3\x17\xe6\x83\xa5\x54\x04\xaf\x40\xaa\x69\x96\x25\x8b\x6e\xa8\x4d\x61\xe8\x5d\x23\xc6\xd5\xaa\x81\x85\xc8\x58\x4b\xef\xa6\x32\xba\xd4\x66\x43\x94\x24\xca\x05\x55\x8b\xb1\x35\xfa\x75\x67\x5a\xb7\xf6\xcb\x53\xfb\x61\x17\x8d\xfa\x04\xb9\xfe\x9c\x91\x11\xee\x29\x41\x4d\x01\x14\x3b\x85\x2e\xdb\xad\xb5\xe4\x46\xec\x9b\x65\x0b\xeb\xc0\x77\xba\x0d\x55\x77\xb1\xe9\xf0\x6c\x61\x85\x31\x9f\x3a\x58\x9b\xee\x0b\x5b\xad\x38\xb1\x86\xb5\xd4\xa1\xe7\x66\x82\x72\x61\x0b\x3b\x74\x09\x6a\x4b\xf1\xe7\x71\x86\x05\x4e\x12\x92\x50\x99\x6e\x6e\xdb\xfd\xd3\x77\x4b\x47\x7b\x6a\x0a\x90\x48\x5b\xce\xe7\x33\x4d\xf3\x14\xb1\x3c\x9d\x58\x29\x17\xcb\x87\x10\xbb\xd0\x65\x5a\x1b\x08\x1e\x37\xc0\x52\xbe\xb7\x08\xd0\x28\x47\x2c\xc0\x25\xb6\xa6\x0a\x1c\xcd\x29\x79\x04\xd4\x44\xc1\x88\x94\x47\xe8\x92\x2b\x72\x82\x3e\xe1\xec\x0e\x04\x35\x53\x11\x70\x66\xac\xe3\x58\x22\x2d\xb5\xe6\x8c\xaa\x83\x11\xb3\x60\xc6\x6e\x55\x8e\x23\xce\x0c\xa0\x65\x04\x0b\xeb\x9b\x00\x73\xaf\x43\x76\x54\x2e\x2f\x8d\xca\x96\xc5\x16\xf8\x69\x1c\x44\xaf\x8e\x4d\x76\xc0\x1a\x74\x7c\x83\x9f\x4c\xbc\x36\x94\xe1\x37\x5f\x2f\x91\xdc\x6d\x40\x94\x2d\x00\x63\x70\x5c\x5d\xe0\x08\xb7\x60\x02\xbe\x74\x95\x89\x4e\xfd\x9a\x1e\x91\x23\xf4\x7d\xc2\x27\xf2\x00\x49\x8f\x79\x0c\x0f\x25\x51\xf2\xc0\x38\xa8\xe0\xdf\x26\x93\xe7\xbd\x5b\xfd\x82\xef\x43\xd5\xb6\x29\xfd\x6c\x30\x0c\xe4\x9f\x4e\x8e\x8f\xd3\xc5\xe1\x24\x8f\x1e\x88\xd2\x7f\x81\x4c\xd1\xb8\x42\x0e\x00\x08\x37\xc1\x09\xad\x5a\x9d\x3a\x14\x51\x27\x8a\xb4\x20\x76\x92\x00\xec\xb5\xbe\xd2\x7d\x5d\x4c\x87\x5c\xc3\x59\x73\xd1\x3f\x3b\x65\x91\xb7\x1d\xaf\x12\x5e\xee\xcb\x68\x2b\xa6\xee\x67\x08\xd3\x3b\x4d\xf0\xac\xa2\xb2\xac\xa1\xa4\x5c\xa5\xd4\x52\x91\x9e\x3b\xc4\x5b\xe8\x53\x56\x8e\x32\xfb\xca\xb9\x23\xc1\xad\x68\xdd\x2d\x47\x23\x36\x90\xe8\x89\x98\x72\x9e\x90\x52\x06\xde\x89\x9c\xca\xb9\x4f\x28\x03\x7b\x29\x34\x6a\xd0\x4c\x4d\xd2\xbb\x55\x1c\x9d\x66\xe5\xfc\x37\x56\x03\xc5\x89\x24\x07\xba\x61\x40\xb4\x72\x81\x84\xe8\x49\xe0\x2c\x23\x62\xc4\x2c\x32\x25\xe0\x2f\x73\x6e\x83\x44\xda\xa2\xc9\x7b\x8d\x72\xbf\x34\xca\x41\x25\xb4\x1c\x2a\xdc\xa6\xa0\xf4\xc8\xa2\x90\x9f\xb3\x4f\x79\x95\xb3\x74\x35\x03\x18\x2f\x7c\x1c\x73\x22\x03\xc3\x33\xf2\xf6\xa3\x84\x4e\x89\xbe\x31\x47\x4c\x2f\x7d\x68\x24\x37\x98\xbe\x0e\xe2\x57\x77\x1a\x09\x2e\xa5\x8d\x16\x37\xed\x2c\xcf\xf9\xd9\xa2\x7c\x98\x01\x26\x36\x85\xfb\xab\x85\xc4\x82\x67\xae\xa4\x98\x7d\xd8\x5c\xcf\xbd\xad\xa9\x95\x05\xc4\x8a\xb5\x58\xa3\x84\xd8\xf1\xe9\xc5\xb9\xaf\x9b\x53\xe9\xba\x5e\x43\x2c\x04\x73\x6e\xaf\x22\x56\x9f\x71\x50\x4f\xac\xd2\xc4\x92\x8a\x62\xab\x37\xab\x1c\xa3\xba\x0d\x52\x57\x65\xeb\x57\xdd\x59\x15\x9a\x59\x15\x4a\xbd\xa3\x6d\x6a\x61\x85\x11\x08\x39\xcf\xed\x15\x06\x61\x41\xbf\x25\x15\x4e\xb3\x30\x4d\xd0\x41\x15\xda\x69\x9a\xa3\xd6\xc6\xb8\x5f\x14\x42\x39\xc2\x26\x02\xa3\x3a\xb8\xda\x56\xac\xe7\xa5\xb9\xb3\xc8\xcc\xbb\x08\xbd\x7d\xb9\xbc\xdb\x64\x51\x44\x9a\x49\x2b\x6f\xb8\xaa\xbf\x2d\xb6\xea\x09\xf1\x28\xd4\xad\x1b\xba\x6d\x62\x9d\x47\xab\x11\x04\x4b\x1b\x42\x00\xf9\x67\x95\xdc\x94\x35\x4c\x9a\x7e\xcc\x26\x83\xf5\xd0\xe3\xbe\x07\x57\x8d\x2d\x65\x14\xb9\x83\x48\x85\x20\x8f\x44\x00\xed\xd8\x38\x15\x56\x3e\xaa\x38\x11\x04\xc7\x8b\x60\x45\xbc\x93\xdc\xf4\x0c\x26\x1d\x49\x53\xad\x74\x82\x38\xcd\xf8\x21\xcf\x9c\x9c\x5d\x7a\x0b\x40\xfb\xe9\x54\xdf\x58\x81\x8b\x5d\x7f\xc1\x0e\xc9\x67\x2a\x95\xd6\x4b\x1a\xe2\x0b\x5d\x23\x70\x4b\x43\x29\x9f\x39\xb1\x37\xdc\xe8\xdd\xe0\xfb\xab\x9b\xbb\xe1\xd9\xe8\x5d\x11\x51\xee\x52\xa6\x3c\x08\x8d\xc3\x14\xe7\x6c\xc4\x7c\x10\xa8\xc7\x5c\x85\xbd\x44\x38\x8e\x0b\xc4\x6b\xab\xf8\x18\x39\x63\x29\x47\x0e\x4e\xc5\xca\xf0\xcf\x25\xcd\xdc\x43\xde\xcc\xbe\x9e\xac\x25\xee\x9e\xd2\xc9\x31\xd9\x3f\x4b\xd2\x34\x76\x74\xd9\x84\x70\x91\xca\xe8\x87\x44\x39\x3c\x33\x46\x9e\x9c\x7c\x0f\xb7\xf3\x31\x36\x97\x70\x4b\x2e\xef\x23\x8d\xd4\xb3\x8b\xd3\x65\xfb\x07\xf4\xe6\x03\xc5\xbe\xb6\x52\x68\xfc\xbe\xae\xac\x4d\x08\x82\x01\xea\x53\xe7\x8a\x3d\x68\xd6\x0e\x31\x8d\xb0\x4c\xc6\x66\x89\xf5\x21\x26\x26\x54\xae\x68\xe4\x6c\xf0\x11\xa4\x73\x41\x52\xfe\x68\x0a\x4b\x1b\x69\xd8\x0b\xd0\x60\x04\xd0\x32\x6a\x84\x15\x4e\x78\x23\xeb\xe9\x40\xb5\xdb\x07\x3e\xc3\x92\x8c\x61\xae\x94\xb3\x31\x64\x58\xaf\xe1\x9a\x38\xd5\x9f\x0f\xed\xd7\x90\x44\xdd\xd9\xf6\x6e\xba\x02\xc1\x3d\xd7\x9a\x68\x81\xa3\x6a\xb6\xc9\x8d\xc9\xdf\xb7\x47\x23\xf6\xb3\xe6\x34\x00\x40\x32\x21\x28\xe3\x59\x6e\x62\x8d\xe8\x14\xfd\x1a\xd0\xd3\xaf\xba\xf9\xd5\x71\xa8\xa5\xa3\xff\xab\xe6\xb9\x92\x74\x8c\xa0\xf8\x40\x3f\x93\xf8\xa6\x45\x7e\xdf\x49\xbe\x4f\xa7\x38\xc9\xc6\x83\x95\x33\xba\x8e\x3d\xc4\x4f\xe5\x5e\x7f\xd7\xfd\x02\xbc\x2a\xf0\xc6\x0a\xec\x50\x00\x0e\x55\x08\xa3\x88\x08\x85\x29\x43\x53\xb8\x42\x58\xb4\x40\x80\xfa\x42\xc0\xc3\xff\x1d\x4a\x29\x03\x5c\x85\x06\xce\x5c\x1e\xcf\x46\xea\xd1\xa7\xf3\xcb\xfb\xbb\x92\x52\xf4\xc3\xd5\x7d\xb9\x62\xf9\xe0\x97\xa5\x5a\x51\xa5\x85\x65\xa1\x54\xc1\x14\x8b\x1c\x4d\x0b\xa1\xea\x57\xa6\x69\xa2\x1f\x89\xfa\x49\x4b\x00\x9c\xed\xe4\x1c\x1b\x89\x1e\x5c\x9b\x64\xfc\x68\x1a\x5e\x83\x0c\xec\x50\x96\x64\xa9\x38\x9d\x01\x7a\x40\xb6\x87\x10\x32\xe1\xc8\xd4\xe6\x1e\x00\x77\x34\xec\xcf\x1c\x4f\xad\x99\x73\xa6\x97\xcb\x00\x59\x3a\xf4\xcb\xa0\x39\x3e\x35\x1f\x77\xc4\x02\x0b\x02\xd2\x75\x5b\xc5\x52\xa2\xc1\xf5\x79\xc3\x5a\x5f\x54\xbd\x3f\x5f\x56\x21\x91\xc4\x3b\xa2\x76\x5d\x43\x24\xc8\x2c\xdc\x8b\xf2\x21\x76\xa6\xdb\x55\x0e\x31\xfe\xfa\xeb\x72\x10\xc0\x3e\xe0\xa4\x36\x69\x4e\xa5\x8c\xe1\x15\x90\xa8\xeb\x25\xd1\x15\xcb\xb0\x26\x5e\x51\x38\x20\x9b\xc1\x11\x62\xf4\xd4\xc3\x83\x0f\x42\xcc\x1e\x6e\x4a\x95\xda\xb0\x80\x9d\xe1\x18\x15\xb3\xe9\x02\x64\xf4\x93\xa1\x68\x8f\x73\x01\xc8\x1d\xae\x14\x9e\x0b\xeb\xb5\x69\xe7\xe1\x74\x43\x6a\x5b\x0f\xfb\xa8\x18\x9f\xb3\x5c\x3b\x99\x34\xc3\xd6\xfc\x02\xba\xa4\xc3\xa8\x6f\x2a\x69\x76\x34\x62\x41\xac\x89\x34\xda\x9f\x3e\x23\xae\x2c\x04\xd4\x1a\x65\x00\x29\x0c\xf9\x35\xfe\x66\x2e\xed\x40\x35\xbb\x5d\xcd\xcb\x85\x1d\x6a\xfd\xd8\xd3\x29\xe7\xd8\xe5\x10\x3a\x43\x92\x0d\xe1\x0b\xcd\x6c\xd0\x5e\x00\xe5\x6e\x3b\x06\x4b\x32\xd8\x6e\x70\x50\x28\x2c\xc8\x3b\x8f\x39\x91\xec\x2b\xe5\xb3\x34\x69\x62\x8b\x51\xe0\xaa\x65\x5f\x8b\x1c\x98\xda\x96\x97\x1f\xf0\x1d\x00\x2b\xad\xab\x3f\x05\xc7\x6a\xa5\xb5\xce\xa9\x27\x40\x09\x61\x18\x11\x74\xda\x86\x82\xf4\x39\x23\xd1\x26\xe8\x2f\xd7\x58\xe0\x94\x28\x22\x96\x45\x12\x95\xcb\xf8\x82\xa4\xee\x76\xd0\xf6\x6b\x76\xd1\xd4\x38\xa8\x16\xc3\xf0\x4a\xfe\xc5\x2a\x34\x17\x3f\x8b\xb5\x80\xab\xf4\x34\x7e\xb2\x45\x1d\xd6\x9c\x85\xed\xa7\x98\x86\x0d\x94\x0a\xc0\x7b\xb6\x9d\xd3\xcb\xa0\x98\xdc\xd5\xf0\x40\x4a\x91\x3e\x7b\x02\x5f\xb2\x7a\x94\x6d\xb8\x25\xab\x78\xe9\x4e\x78\xb7\x4b\x4e\x70\xd9\xaf\x95\x43\x55\x4a\x7b\x00\x2a\x01\x79\xdf\x40\x78\x34\x63\x8f\x80\xd0\xd2\x14\xdc\x18\x78\xec\x2c\x32\x5d\x61\xd7\xb6\x92\x55\xb5\xac\x4f\x65\xb9\x56\xf0\xb8\x5d\xe1\x32\xf4\x12\xcd\xae\x25\x9a\x55\xa4\x5c\x0a\x8c\xd5\xd4\x49\x44\x05\x22\xc6\x96\xdb\xb5\xb9\xfd\xe5\x09\x42\xda\x90\xbd\x22\x6d\xcd\x4e\xb8\xfa\x29\xf3\xff\x2a\x73\x70\x47\xd4\x21\xa9\x36\xe5\x43\x1e\x05\x9e\x38\xb0\x5e\x25\xa1\x34\x60\x43\x62\x60\xb4\x26\x82\xd1\x38\x3b\xce\x2f\x8d\x1f\x0f\xf2\x92\x17\x3c\x47\x4f\x54\x6a\x5d\x78\xc4\x20\xc4\xcf\x3b\x45\x14\x47\xe6\xc5\x03\x78\x0b\x10\x0c\x64\x3e\x49\xa9\x42\x38\x98\x61\xc9\x3c\x73\x60\xcf\xb3\xfe\x00\x66\xdc\x98\x22\xdf\x84\xae\xb3\xe2\xd0\x6c\x60\x3b\x2e\x1a\xd9\x36\x0b\x3e\x08\x47\x7e\xde\x3c\xf8\x40\xe3\x09\x35\xcc\xc6\x33\xd7\x27\xc2\xa3\x66\x6b\x83\xc5\xfb\x04\x50\x56\x2a\x55\xe5\x6e\xb1\x28\x9f\x2b\x92\xe0\x8b\x8d\xe8\x94\x05\x5f\xbc\xbe\x8b\x34\xf8\xb6\x02\x51\xcb\xd2\x22\xdd\x27\x2d\x6e\x00\x97\x6e\xab\xb8\x8b\x79\x0f\x25\xa5\xeb\x56\x49\x69\xdf\x00\xc9\x8a\x58\xfe\xcd\x23\xc3\xd7\x51\x07\x8b\xd4\xaa\x90\x8a\x82\x4c\xc9\x32\x9c\x0b\xa9\x72\x7e\xc6\x15\xa4\xc3\x44\x50\x3c\xbb\x96\xa2\x39\x62\xcd\x12\xc8\x72\x9e\xb8\x6d\x76\xc5\x4e\x81\xcb\x82\xf3\xe7\x66\x61\x2d\x5a\x3f\xfb\xf8\x34\xa3\x2c\xdb\x32\xd8\x55\x11\xb3\xf0\x74\xb6\x28\x20\x20\x78\x6c\x92\x2b\xdc\x70\x2a\x3b\xe6\x3e\xac\x3c\x17\xf6\xd2\xdd\xa1\x6a\x57\xe3\xce\x9d\x53\x45\xbc\x8c\x6c\xb9\xb1\x8b\x75\x76\x6a\x7c\xc5\x61\xbd\x49\x79\x4f\xc0\x03\xdd\x19\x8a\x69\x15\x58\x40\x37\x7e\x00\x4e\x6e\x3b\x74\x6c\x02\x7e\x3c\xb6\x76\x65\x4b\x4a\x13\xb6\x65\xd3\x9f\x61\xd2\xeb\x96\x64\x0d\x9c\xae\xc2\x06\xea\xd2\xd0\x6e\x00\xb5\x58\x6d\x7c\x63\x85\x0f\x7b\xd1\x2e\x67\x31\x11\x8c\x60\x35\x7f\xb9\xf4\x88\xd3\x6d\x8d\xd3\x2f\x96\x2a\x71\xba\x93\x7a\xdc\x95\xf4\x83\x35\x33\x0f\xd6\x70\x63\x17\xd5\x59\x6b\x8a\x63\x83\xd1\x30\x40\x8f\x59\x87\x4a\xb7\xca\xa0\x68\x56\xe6\x9e\x27\x97\xa4\xc1\xea\x53\xcb\x22\xd1\x87\x3d\xac\x69\xbb\x62\x49\xbe\x88\xa4\x8d\xe7\xcf\x23\x58\x56\x3d\x37\x0f\x52\x0b\xa0\x84\xb1\xc2\x94\x59\xee\xb5\x2c\x9b\x40\x4b\x94\x29\x6e\x4a\x20\xd8\xfb\xd4\x94\x2f\x3e\x33\xa5\xcf\x53\xe8\xf3\x14\x1a\xf6\xa8\xcf\x53\x68\x57\xf4\x96\x99\x19\xbd\xe7\x0b\xaa\x09\x96\x6a\xc0\x98\x75\x5c\xa1\xad\x6d\x9e\x3f\xe0\x2c\x75\x61\x48\x8c\xfd\xc5\xfe\xd0\x18\x15\x53\xfb\xac\x3a\xdb\xd0\x6a\xc8\x16\x55\xe3\x3b\x16\x71\x62\x81\xda\x6c\x74\x74\xd9\xca\xb3\xcc\x20\x39\x62\x3f\xf0\x27\xf2\x48\xc4\x01\xc2\x0a\xa5\x5c\x2b\xe9\x41\x14\x0a\x10\x5c\x09\xf3\xdb\x44\x1b\x60\x74\x89\x53\x12\x9b\x8a\x6e\x41\x0c\xa5\x35\x8b\x5a\x87\x66\x13\x1e\x29\x40\x6b\x9a\x6d\x70\xd1\x09\x23\x66\xe2\x1a\x4d\x84\x13\xdc\xc9\xd4\x4d\x0c\xe8\xfa\x8f\xde\xdd\xfa\xc7\x23\x74\xa7\xef\x01\x2a\xcb\xe3\x0d\xe0\xc9\xda\xc6\x36\x62\x33\xc1\xf3\xcc\x5b\xaa\xf8\xc4\x94\xf6\x34\xd0\xe6\x75\x77\x2b\x0c\xc6\xf9\x5a\x23\x1c\x6b\x8d\x77\x39\xe1\xbc\x4a\xc8\xeb\x46\x18\x3f\x21\x01\x69\x2e\xe1\xa3\xab\x6c\x5c\xbd\xf1\x92\x06\xc8\x26\xcb\x90\xca\x9f\xc9\x85\x7b\x46\x24\xd8\x5e\xbc\x6d\xbb\x94\x68\x5d\x4e\xe6\x6f\x1c\xe7\x32\xcb\xa3\xf7\x0e\x38\x0b\x7a\x33\x4e\x40\xd1\xb9\x8d\xac\x32\x59\x9c\x96\x1f\x3f\x9b\x4d\x72\xfd\x28\xd4\xca\xda\x5d\xe7\x22\xe3\x20\xf1\x24\x0b\x87\x6b\x60\xa1\xd0\x82\xe0\xce\x30\x98\xa8\x91\xb2\xa9\x54\x9f\xb0\x8a\xe6\x9a\xbf\x17\x90\x60\x3b\x8a\xaa\x2b\xb8\xf2\xf3\xda\x29\x1b\x66\x70\x1a\xf6\xde\x62\xb8\xef\x60\xb7\x36\xf7\xab\x8b\xe5\x77\x37\x76\xaa\xfb\x33\xce\x2d\x5b\xb0\x37\xb0\x3e\xba\x4f\xec\x13\x3d\xd1\x55\x54\xb4\x6a\xfc\xdd\x68\xab\x5c\x92\x6a\xe7\xf1\x7a\x5b\x60\xac\x9c\x59\x44\xab\xe2\x45\x5b\x81\xb2\xc5\xc9\xbe\x61\x49\x79\xeb\x3d\xd1\xf2\x8c\x2a\xec\x9a\x29\xce\xb4\xb0\xae\xb8\xbe\x25\xc5\xcc\xc8\x8b\xa6\xd2\x29\xc2\x28\x17\xd4\x9d\xfd\x4a\xd2\x74\x3b\x75\x80\x1d\xf0\x38\x2c\x39\x14\xe1\xa0\x1a\x9b\x71\xab\xe3\x48\xe5\xd8\x87\xff\x01\x4d\xb8\x22\xcf\x26\x41\xdc\xb9\xaf\x85\x13\xa3\x1a\xf6\x74\x25\x61\x6f\xb1\xcb\xb8\x09\x00\xb0\xd3\x49\xa3\x6c\x16\xa0\x07\x36\xdb\x62\xbb\x14\x07\x68\xfc\xb2\x5b\x81\x83\xc6\x4f\x9d\xec\xb3\xc9\xb7\x4b\xd0\x8d\x5a\x3f\x5f\x25\xc0\x96\x42\x9d\x6d\xb8\xa9\x95\x9e\x42\x5c\x47\x6b\x27\x03\x78\x56\x0a\xee\x70\x6c\xa5\xa9\xff\xf2\x7f\x99\x62\x52\x66\x69\xfe\x0b\x71\x31\x62\xe6\xf7\x03\x5f\xc8\x41\xbf\x50\x20\xa4\xe2\x94\x14\x18\x92\xa2\x8c\x36\x07\x98\x1b\x16\x2d\xcc\xa0\xe1\x7a\x1c\x7b\x3d\x86\x87\x7c\x42\x04\x23\x7a\x68\x2e\x3b\xdf\x33\xb3\x14\x33\x3c\x03\xec\xdd\x03\x88\x3f\x03\x71\xb5\x10\xf9\x0d\x49\x9b\x82\x80\xc0\xad\x34\xb3\xb4\xc9\xbd\x45\x5d\x53\xe8\xd3\x88\xb2\x16\xfa\xb3\x08\x62\x68\xa6\xfe\x1b\xdb\xff\x66\x12\xfb\xdd\xe0\xf6\xc7\xf1\xcd\xf0\xf6\xea\xfe\xe6\xb4\x24\xb6\x9f\x5e\xdc\xdf\xde\x0d\x6f\x1a\x9f\x15\x89\xb1\x7f\xbd\x1f\xde\xb7\x3c\x72\x0d\x5c\x0c\xbe\x1f\x96\x8a\x04\xff\xf5\x7e\x70\x71\x7e\xf7\xcb\xf8\xea\xc3\xf8\x76\x78\xf3\xd3\xf9\xe9\x70\x7c\x7b\x3d\x3c\x3d\xff\x70\x7e\x3a\xd0\x5f\x86\xef\x5e\x5f\xdc\x7f\x3c\xbf\x1c\xbb\xe0\xde\xf0\xd1\xcf\x57\x37\x3f\x7e\xb8\xb8\xfa\x79\x1c\x74\x79\x75\xf9\xe1\xfc\x63\xd3\x2c\x06\xb7\xb7\xe7\x1f\x2f\x3f\x0d\x2f\x97\x17\x23\x6e\x5e\x8d\xd6\x3a\xa7\xc1\x45\x16\x18\x67\x02\x31\x69\xb2\xb0\xa4\x4d\x7f\x03\x17\xc1\xb5\xa1\xc7\xc3\x03\xf7\x97\x29\x1d\x7c\xa8\x59\xa0\xf3\x3e\x15\xdc\x63\xc4\xbc\x7b\xd0\x5f\xaa\x50\x3a\xde\xe6\x39\x97\x46\x7b\x82\x06\x70\x56\x40\x61\x28\x75\x0a\xe8\x26\x7e\xa4\xce\xa1\x0c\x74\x98\xd0\x94\x82\x6f\x19\x1d\xa2\xea\x86\x97\x1b\xb4\x73\x82\x21\x58\xef\x58\xbc\xec\x34\xc8\x6a\x0a\x35\x50\xca\x09\x72\x1c\x9a\x18\xb5\xdd\x80\xb3\x2e\x18\x4e\x69\x64\x7e\xa8\xe0\x93\xa2\x02\x8b\xa3\xda\x62\x89\xc0\xca\x2d\xcf\x09\xfa\xf1\x2f\xc5\xa0\xc0\x53\x60\x0d\x04\x79\xad\xe4\x9c\x7d\x20\x72\xb3\xaa\xab\xc8\xb3\xd4\x93\x3b\xe6\xd6\x84\x0b\xe7\xd6\x56\x26\x06\xb7\x4e\xce\x02\x3c\xae\x92\x8f\x47\x1f\x6f\x33\xa3\x0a\x8d\x9f\xa0\x5b\xc0\x02\x91\x85\xea\xae\x77\x31\x4b\xf2\x19\x65\x88\xa6\x59\x42\x8a\x9a\xd6\x13\x32\xc7\x8f\x94\xbb\xfa\x0e\xa6\x0c\x06\xac\xa3\x15\xad\xd0\x21\x6a\x3d\x28\x27\x68\x10\xc7\xb2\xcc\xe0\x4a\x94\xe3\x58\xe6\x61\x79\xd8\x21\x84\x16\x8b\x3d\xdb\xac\xd0\x51\x71\xe4\x60\xc5\x76\x8f\x76\x52\x67\x87\xe5\xbb\x77\x2b\xe4\x5e\xf9\x30\x76\xa4\x3c\xde\x48\x18\xb8\xc3\xf2\xc1\xb1\xe6\x55\x02\x81\xc3\x9d\xd9\xae\x47\x0b\x40\xd3\xb5\x53\xbf\xb2\x63\x38\x68\x9b\xf5\xd9\x0a\x9b\xbc\xa2\x4b\x37\xe3\xa4\x52\xdb\xaa\x73\x7f\xa5\xda\x58\x8d\x9d\xed\xd4\xab\xd2\x2c\x8d\xc1\x91\x1c\x7b\xfa\x5f\x63\x1e\xd7\xf0\xe9\x95\xff\x72\xa9\xc8\x36\x0e\xd6\x6d\x5d\x5f\x4b\x2d\x23\xd8\xfa\x5b\x96\xd2\xe1\x8e\xf0\x8f\xba\x0b\x83\x50\x99\x80\x46\xe0\x56\xc3\x94\xd9\x7a\x35\xc4\xfb\x7d\x5c\x85\x66\x7d\x8e\x7d\x0d\x35\x3c\x81\x1c\xd8\x42\x58\x4c\x89\x94\xb8\x05\x1d\x25\x30\x89\x6d\xc3\x18\xfc\x09\xb5\x1f\x76\xa4\x27\x77\x26\xef\xf4\x57\xcb\x8c\x3e\x37\xa1\x66\xec\x26\xaa\x05\xd6\xd8\xc5\xb3\xa2\x2b\x93\xd5\xa6\xf9\xcb\x41\x11\xb2\xc2\x45\x10\xc9\xd3\xe6\x66\xe9\x68\x56\xab\x2e\x58\x63\x19\xa2\xd0\x55\xb6\x7e\xa4\x4b\xd0\xfa\xc6\x90\xd1\xd6\x7f\x81\xcb\xeb\xb3\x06\xd5\x95\xfc\x8a\x61\x89\xe6\x88\xa7\xa9\x91\x0b\x4a\xb6\xd4\x03\x84\x4d\x32\x61\x21\x4d\xc9\x3c\x9a\x1b\x6f\x8e\xbe\x32\x0e\x46\xec\x29\xd8\x90\x52\xb8\xed\x20\x6c\x09\xe0\x36\x3f\xeb\xe3\x46\x1f\x4b\x41\xcc\x20\x32\x52\x88\xa8\x0d\x08\xc1\x38\xde\x8a\xfa\x4a\x2b\x08\x3c\xd8\xaf\x2d\x48\x7d\x83\x62\x7a\x95\xf5\x6d\x2b\xa9\xe7\xe7\x16\x54\xb2\xdb\x42\x53\xee\x3a\x84\xa0\x98\x5e\xd3\x08\x76\x50\x4b\xef\x45\xf1\xaf\x7d\x52\xa4\xc9\xa1\x4d\x27\x16\x10\x43\x4f\xd7\xad\xf6\xbf\xbb\x19\xfd\xbb\xf1\x3b\xe4\x2d\x08\x2a\x41\x6b\x1e\x02\x1b\x1d\x6a\x99\xd5\xe5\x5b\xdb\x80\x07\x89\x0e\x0d\xac\xde\x57\x10\xcf\x38\xb8\x3e\xff\xea\x00\x7d\x15\xe6\x74\x7d\xb5\xd1\x01\xb4\xe3\xb6\xf5\xf4\x40\x9b\x2a\x05\xf6\x97\x8f\x1d\xec\x55\xe5\x24\xda\x3d\xb3\x07\x11\xb5\x9d\x43\xfd\x65\xe9\x1b\x70\x02\x43\x7d\x38\xe3\x27\xf5\x61\xc5\xd6\x05\x64\x64\x5c\x2a\x1b\xd6\x2e\x1e\xb1\xc9\xa2\xea\xe4\x39\xf0\x5e\x9e\xce\xa7\x74\xeb\x9a\x67\xba\xbd\x7a\x12\xf0\x8e\xc3\x5d\x97\xdf\x07\x2b\xd2\x8a\x07\x26\xb2\x99\x4f\x03\x2e\xd6\x16\x0d\xd0\xc7\x89\x37\xcd\xaa\x64\x2f\x73\x8b\xd9\xb8\x29\xab\xe4\x9f\xb7\x46\x6e\x1d\x82\xab\x07\x4d\x2b\x62\xe3\xea\x5b\x84\xeb\x9e\xca\x9e\x97\xca\x76\x91\x57\x50\x1e\xdc\xfa\x17\xe8\xa9\x91\xe3\x82\x66\x9c\xc1\x55\x2b\x13\x9e\xc1\x97\x0a\xe3\xad\xae\x28\xbb\xa6\xcf\x37\x58\x93\xd5\x4e\xdf\x5b\x13\x38\x60\xdc\xae\xf5\xb1\x56\x87\x3a\x50\xb6\x4a\x0f\xa7\x26\x87\x50\xd1\x94\x1c\x18\x20\x9b\x22\xd8\xc1\x9e\x57\x20\x37\x13\x0b\x34\x27\x54\xb8\x4e\x2c\xa0\xe1\x5a\x49\xe7\x6b\x4a\xe3\x6d\x34\xb2\x45\xa4\xc9\xe5\xe0\xd3\xf0\x6c\x3c\xbc\xbc\x3b\xbf\xfb\xa5\x01\xac\xb2\xfc\xd8\xe1\x55\x06\x2f\xdc\xfe\x72\x7b\x37\xfc\x34\xfe\x38\xbc\x1c\xde\x0c\xee\x56\x60\x59\x2e\xeb\xac\x0d\x27\x31\x97\x4d\xea\xdb\x3a\x58\x89\xce\xcc\xdb\xd0\x7b\x1d\xd1\x32\xe8\x84\x92\x16\x54\x4b\x93\x60\xcf\x62\x22\x50\x4c\x1e\x49\xc2\xb3\xc2\xac\xda\xb8\x60\x01\xdc\x65\x43\xfb\xcb\x20\x2f\xa1\xcd\xea\x1a\x9f\x20\x53\x0c\x2d\xa8\x07\xeb\x1b\x04\x91\x0f\x0b\xc2\xbe\x52\x88\x7c\xce\x12\x1a\x51\x15\x24\xe0\x71\x61\xdd\x2b\xc6\x7d\x08\x51\xa0\x2b\x88\x6b\x67\xd1\x28\x3b\xd7\xf9\x43\x4f\x7a\x5d\xdb\xf7\x27\xca\xc3\xaf\xad\xac\xb0\xb3\x03\xc5\xbe\xc5\x69\x5c\x43\x87\xdb\x60\x74\xcf\x61\x1e\xa8\x67\xc2\xd8\x24\xba\x16\xe4\xb8\xe6\x41\xae\xbe\x0d\x97\xc5\xc9\x94\xce\xf5\xf2\x40\x99\x6e\x94\xfa\xca\xe1\x2e\xa5\xca\x93\x3b\xc0\xb7\xb0\x31\xe2\x6b\x06\x2c\xd4\x40\xdd\x98\x89\xed\xc4\x00\x7a\xa7\xb4\x02\x66\x22\x02\x0e\xb4\x50\x45\x71\x42\x7f\x03\x24\x28\x41\x8e\x82\x08\x0a\x48\xb4\x8b\xc3\x88\x4b\x8b\xd2\x70\x34\x62\x67\xc3\xeb\x9b\xe1\xa9\x66\x48\x47\xe8\x5e\x02\xc8\x53\x69\xea\x67\x96\xbc\x8d\x38\x16\x46\x32\x50\x26\x15\xc1\x6d\xc1\x60\x80\x3b\xd7\x9d\x3f\xf8\xfe\x00\xdd\xae\x85\xbc\xe1\x59\xc9\x36\xe5\x0c\x00\x97\xad\x65\x83\x83\xd8\xfc\x9d\xa7\x3e\xdd\xe0\xa7\xd2\x8a\x84\x20\x17\x20\x89\x94\x57\xfd\x19\x57\x1b\xd0\x42\xbb\xcf\xaf\xd4\xe7\x35\x7c\xbb\x6c\x9e\x77\x10\x62\x27\x55\x01\x3d\x6a\xd0\x49\x7d\x59\x98\xca\x3c\x5b\x45\x45\xf1\x1a\x80\x18\x15\xd2\x9f\x90\x19\x66\x48\xe4\x8c\x55\xb0\x68\x43\x4b\x5b\x3d\x68\x66\xdd\xa3\xaa\xd7\x0c\xa7\x3c\x67\xa0\x34\x40\x18\x6b\xc3\x60\x64\x46\x98\x5a\x31\x98\xd7\x82\x3b\xa9\x0c\x75\x7f\x11\x4f\x1a\x06\xda\x06\x7a\xd2\xe4\x4f\x82\xda\xc4\xeb\x5d\xcb\x2e\x28\xaf\xe4\x54\xd2\x87\xca\xdf\xcf\xcd\x5a\x36\x96\x0f\x5b\x77\x77\x87\xe5\xc3\xea\xae\x62\x12\x3d\xac\x7b\xd9\x54\x33\x20\x13\x5b\xda\xb9\x66\xec\x5b\xe8\xa7\xb6\x76\x09\x54\xf4\x8e\x1e\xd0\x0f\x77\x9f\x2e\xd0\x94\x6a\xb9\x57\x5f\x2b\x97\x58\xcb\xd8\xf7\x22\x71\x76\x61\x6b\x5b\xcd\x45\xe2\xef\x5e\xd8\x78\x27\x4a\x05\x52\x82\xbe\xd1\xf0\x8c\x38\x63\xaf\xb0\x98\x76\x95\xda\x25\x02\xb3\x98\xa7\x66\x1e\xc7\x32\x9f\x4e\xe9\xe7\x23\x85\xc5\xfb\x35\x24\x9a\xd3\x92\x83\xad\x42\x46\x36\x7c\xd2\x42\x2c\x82\x55\x61\xa5\x9c\x30\x7c\x24\x4c\xed\x44\xc8\x86\x26\x1a\x32\xbc\xbb\x99\xca\x4d\x21\xc7\xf3\xb3\x82\x43\xbb\xb8\xd4\x30\x34\x47\x09\x0c\x97\x95\xcd\xaa\xb1\x7e\xe1\x36\x6f\xf5\x63\x67\x07\x28\xbc\x5a\x5f\x97\x15\xf1\xdd\x76\xb5\x8b\x82\xce\x45\x6c\xa6\x03\xc3\xdf\x10\xf3\x45\x12\xa3\x8a\x07\x58\x03\x56\xc3\xaa\xee\xb9\xe9\x73\x8e\x65\xb5\xcb\x95\x5b\xbe\x01\xc0\x49\xa9\x99\x8f\x04\xf2\xff\x76\x11\x4d\xbd\x4e\x9e\x37\x0c\xe4\x5e\x24\x10\x07\xbc\xd4\x14\x63\x8a\x49\xeb\xe3\xeb\xc5\x13\xdc\x41\xd0\x34\x83\xd1\x92\x0f\xc9\x04\x89\x34\x3f\x3e\x41\xd7\x09\xd1\xe2\x43\xae\x45\x88\x3c\x49\x1c\x18\xd4\x72\x11\x67\x2d\x00\xb3\x67\x9f\x57\x20\x40\x2f\x99\x98\x03\x43\x5b\x3e\xb3\x60\x0d\x76\x9f\x9d\x1f\xac\xef\x53\x2b\xac\xb3\x9a\x93\x85\x09\xfe\x04\x7b\x08\x2e\x71\x63\xfa\x9b\x66\xf3\x82\xc8\x39\x6f\xcd\x88\x0b\x67\xfb\x3c\x73\x70\x4b\xf9\x8c\x93\xb0\x91\x77\xe3\xb6\xe0\xe0\x0e\x97\xf3\x99\x69\xa2\x51\x24\x58\x36\x45\x5f\x2f\xc1\x87\x30\x58\x68\x4e\x1b\xca\x66\x87\x06\x8e\xb9\xc2\x5e\x14\xc2\x64\x15\xf6\xf7\x42\x22\x5f\x18\x07\xa2\xff\xbc\xb0\x82\x16\x71\xed\x54\xc9\xa2\xb6\x18\xd2\x77\xfa\x7a\x5c\xd6\x66\x3f\x14\x4d\xe8\x01\x37\xb3\x36\x5b\x2a\x01\xe4\x36\x1b\xdb\x22\x4b\x00\x5f\x76\x8b\xcd\x94\x1b\x75\x8a\x76\x06\xba\xad\x1f\x07\xc4\xb2\x22\xe1\xeb\xb9\xdc\x39\x25\x6a\x29\x4d\xa0\x87\x8c\x5a\x1f\x32\xca\xd6\xcd\xf0\xb4\x07\x00\x6f\x4a\x40\x46\x77\xe1\xb1\xa9\x5e\xf2\xd6\xca\xba\x2a\xd5\xa6\xb4\x3b\x9d\xf2\x6a\x4a\x5f\xe8\x73\x7f\xb6\xa5\xcb\x47\x4f\x66\x31\x86\x4c\xc5\x6d\xc2\x3e\x4a\xf3\x37\xe6\x6a\x68\x93\xc4\xc8\xa4\xa5\x1b\x40\x5b\xbb\x76\xde\x54\x9f\x61\x41\x98\x1a\xb1\x1b\x3d\x0a\xf3\x45\xe1\xfa\x77\x81\x1f\x0e\x64\x1c\xaa\x88\x4e\x11\xb6\x5f\xc1\xa2\xb7\x45\x5e\xc9\xb1\x79\x09\x74\xa1\x67\xcc\x9e\xfe\xde\xbc\x63\x92\xd9\x2d\x98\x8b\x9e\x2a\x9d\x16\x7a\xa3\x16\xf6\xa2\x39\x85\x5c\xf2\x98\x48\x7b\x79\x50\x65\xc1\x02\xbc\xa8\x9c\x13\x07\xab\x0b\x9f\x79\xfe\xd5\xc4\x5c\x9d\x66\xca\x9c\x45\x48\x8e\x58\xd0\xc7\x12\x14\x46\xa3\x1d\x6e\x28\xf6\xc3\x3e\xd3\xd8\x7b\x5a\xe0\x9f\x66\x87\xb8\xa0\x33\xca\x82\x92\x40\x76\x7a\x29\xce\xc0\x9e\x68\xce\x20\x9f\xfa\xfb\xe7\xce\x86\xb5\x1f\xc1\x88\xff\xef\x7f\xff\xed\x88\xb6\x99\xdb\xe5\xd8\xae\xc0\x3e\xec\xe4\x7a\xdb\x12\xee\x7c\x00\x0f\xd1\x02\x3b\x20\xf3\x89\xc7\x6e\x2e\x85\xea\x17\xbf\xda\xcb\x4d\x13\x0d\x57\x73\xe3\x5f\x2c\x93\x3b\x18\xe3\x45\xbe\xfc\x96\x0d\x58\x5c\xe1\x81\x2e\xdc\x8c\x41\x94\xa7\x03\xff\x37\xd1\x79\xba\xfd\xca\x85\x52\x61\x50\x01\x4a\xdb\x36\xd1\x70\x73\x2c\x9f\x2f\xe4\xa1\xb1\x76\x8f\xb1\x52\x86\x77\xe4\xaa\xe0\x07\x33\x48\x93\x45\xa7\x77\x25\x97\x44\x98\x03\xed\xe1\x7c\x50\xbd\xbc\x37\xc4\xbe\xad\xf0\xe1\x90\x14\xd3\xb5\xe2\xb4\xf5\xfb\xcd\x08\x79\x25\x23\x2e\x9e\x11\x31\x8e\xf3\x52\x50\xee\xaa\xb6\xaf\xf5\x47\x67\xb9\x5a\xac\x6e\x5f\x26\x38\x7a\x58\x07\x95\x50\xbf\xdf\xd2\xec\x6a\xc1\x30\x08\x9d\x28\x0b\x87\x2d\x98\x7f\xa4\x82\xf9\x67\x63\xf9\x4a\x5a\x3b\x5c\x34\x0c\xea\xb3\x07\xc2\xbd\xbd\x89\x0c\x32\xb1\xa9\x1a\x34\xc9\x0b\x2b\x87\xc7\x7a\x8f\x8f\x46\xec\x83\x29\x96\x00\x8a\x87\x19\x40\x04\x89\x14\xe4\x73\xc6\x25\x29\x65\xf6\x34\xe0\xb7\xdb\xcc\x3c\x3b\x8c\x66\x99\xb4\x52\x1f\x7f\x2b\x91\xf4\xd5\xd1\x1b\xeb\x1b\x5e\x9f\x72\x33\x05\x6e\x25\xf5\x44\x34\xa3\x9a\x76\xc6\x8d\x27\x6d\xfd\xa9\x77\x2d\xff\x51\xc4\xca\x00\x8e\x8f\x4a\x16\x07\xc8\x4f\xaf\x42\x10\x09\x79\x24\x60\xa6\x84\x31\x86\x28\xfd\x65\x53\x53\x0b\x3b\x59\x75\x80\x8a\xb4\x3a\x60\x0b\x28\xae\x8e\xa0\x9c\x7c\xd4\x44\x8b\xe5\xb4\x8a\xad\x33\x80\x9a\x1c\xfe\x6b\x48\xa1\x83\xb0\x5a\xc1\x82\x28\x44\x3e\x2b\x62\xcb\x3a\xde\xb9\x1c\xad\x7a\x58\x37\x6a\x4e\x33\x69\x17\x91\x76\x4f\x15\xb5\x89\xd8\xcc\x5c\x97\x84\x16\xbb\x7b\xdf\x26\x65\xcd\x31\x8b\x6d\xa6\xa1\xf4\x65\xd0\xcc\xec\x8c\x1d\xc8\xc7\x60\xdb\x7c\xb9\x00\xe6\xd9\xb4\x69\xf0\xa8\xe1\x22\x73\x7a\x91\x96\xcc\xc1\x6d\xcd\x85\x16\x50\x73\xa6\x68\xa2\x89\xc3\x8e\x41\x6b\xcd\x39\xf3\x40\x6b\x10\x31\xdc\x86\xe5\x45\xa5\xa4\x6c\x36\xb6\x2b\xe9\x92\xe6\xba\x5d\x0c\x65\x9a\xfa\x64\x9a\x32\x3f\x7e\xef\x1a\x5a\x6e\xe7\x35\x64\x0d\x38\x4b\x2e\x5d\x0f\x04\x6b\xc6\xdd\x64\x2c\x40\x96\xcb\xf2\x1b\xd3\xd8\x2c\x05\x35\xd5\x83\x61\xa2\xeb\x18\x29\x40\xac\xab\xe7\xc7\x17\x57\x88\xb4\x29\x78\x26\xb1\x06\x22\xa0\x55\x4b\x8e\xa1\x6c\xcd\x2d\x3c\x67\x5e\x44\xb3\x45\x7b\x7c\x06\x75\x25\x4d\x11\xbb\xee\x6c\x98\x37\x4e\x92\x09\x8e\x1e\xbc\xb2\xe1\x55\x6e\x2e\x1c\xe8\xb9\x16\x50\xa1\xaa\x93\x21\x2e\x53\xbe\x4d\x4b\x37\xa1\x17\xc6\x20\xa4\xd8\x61\x17\x9d\x9b\x55\xb3\x10\x4f\x06\x12\xc7\x8c\xde\xc4\x8c\xc7\x24\x4b\xf8\x22\x6d\xb9\xcf\xaa\xa9\x59\xdb\x44\x40\xb4\x65\x86\xed\xf4\x2a\xab\x30\xbd\xb5\x2f\xb3\x5a\x9e\xc7\x0e\xf0\x7a\xd6\xe0\x92\x1f\x13\x3e\x01\x2b\x9f\xd5\xb2\x5d\xee\x42\x10\x42\x5f\x3d\xcf\xeb\x66\x54\x54\x4f\x24\x95\x59\x82\x17\xcb\x7a\x30\xb1\xfc\xcf\xbb\x6f\x26\xf7\x7b\xb5\x11\xac\x7b\x14\x6c\xe3\xe7\xcf\x81\xc0\x7a\xe1\x24\x01\xf3\xae\xe1\x5f\x15\x63\x92\x49\xa2\x3a\xca\x04\xd7\x82\x02\x1f\x31\x85\x67\x6e\x73\xad\x70\xc9\x9f\x18\x11\x72\x4e\xb3\x52\xb5\xb7\xad\xc3\x6e\x2d\x45\xdb\xff\x98\x20\xd3\x35\x78\x27\xcf\x0e\x0d\xf2\x83\xa6\x0f\x99\xe1\xa8\x30\xfe\x45\x09\x96\x92\x4e\x17\x01\x60\x83\x8f\x60\x84\xb4\x98\xb2\xb6\x1c\x14\x58\x6a\x62\x34\x66\x7c\xbb\xc9\x58\xde\x3e\x5b\xeb\xbe\x7c\xfc\x68\x1c\x22\x63\xcd\x4d\x11\xcb\x0a\x3a\x87\xbb\xa9\x2d\x4a\x47\x2b\x92\xa6\x49\xcd\xde\x2c\xc3\x78\x29\xa8\x4a\xbb\x19\xa1\x10\x26\xed\xb0\xad\x22\xe3\x81\x14\x42\x90\x11\x55\x4a\x51\x83\xcd\xd7\x8a\x93\x33\x7f\x6a\xe2\xf4\x20\x0c\x90\xab\x5e\x7c\x7c\x80\xe4\x56\xe0\x45\x5d\xe8\xe2\x8c\x24\x64\x27\x91\xac\x1b\x10\x49\xd5\xc3\x1e\x90\xc7\x52\xd2\x28\x40\xd2\x57\x1b\x17\x36\x08\xb0\x6d\x81\x40\x69\x1e\xfa\xcf\x66\xa0\x36\xc6\xb6\x69\x17\xc1\xfe\x05\xab\xdc\x55\x77\x69\xc2\x52\x33\x2d\x58\x92\x2b\xba\x29\xd1\x55\xd1\xa9\x97\x57\xf6\x91\xd4\x5e\x39\x14\xb5\x36\xae\x8f\xa4\x4b\xc4\xc1\xca\x03\xb0\x11\x07\xaa\xf3\xe9\x6e\x74\x61\xfd\x84\x8a\xa3\x19\x51\xa6\x84\xbb\xaf\x53\xff\x96\x68\x62\x67\x81\xf4\x3b\x5a\xfd\xe6\x43\xbe\xde\xa9\xbd\x25\x4a\xba\x2b\xa1\x06\x4f\x67\x37\x67\x0f\xb7\x60\x3f\x8e\xa5\x11\x5c\xbf\x78\xb9\x65\xeb\xe4\x73\x3b\x32\x9b\x82\xfd\x3b\x12\xa8\xcc\x1c\x63\xfb\x85\x4f\xb7\x2e\x01\x0d\xe1\x12\x38\x9b\x59\xa3\xd7\xe7\x7a\x55\xd2\xfe\xd2\x45\xaf\xf5\x69\xbc\x3a\xaa\x82\xba\x7b\x79\x70\x3d\x79\xd0\x81\x17\xee\xe1\xe5\xdf\x76\x0c\xf6\xf3\xfe\xd9\x03\xe1\xb0\x76\x25\xee\x4e\x44\x7c\x43\x64\xb2\x17\x92\x62\x6d\x2b\x5e\x4a\x5e\x3c\x74\xe8\x31\x05\x16\xcb\xfe\x6e\xd1\x7e\x9c\xe4\x1b\xeb\x06\x7a\xbe\x0b\x76\x35\xbd\xec\x84\x3e\x00\x48\x11\x43\xbe\x69\x6e\x2b\x33\xc0\xe1\x0d\x42\xc6\x6a\xbe\x87\x15\xc1\x78\x76\x78\x9d\xc2\xf0\x6a\xcb\xf9\x1c\xdb\x6b\x93\x8b\x3a\x6f\xee\x73\x92\xda\xba\x63\xd9\x85\x8e\xf2\xcc\x5e\x1c\x4b\x8d\xc1\x07\x7d\x4c\x6c\xb7\x5b\xb4\x01\xb2\xc4\x6d\xd9\x2e\x0f\x59\x53\xd9\xaa\xed\xd3\xa3\x5d\xca\xd9\x38\x13\x64\x4a\x3f\x6f\x24\x8a\x5f\xc3\xa7\x56\xbd\xd4\xcb\x5c\x29\x84\x05\xee\x19\x28\x9c\x15\xc4\xed\xd9\x95\xb6\xc5\x72\x46\xac\xc8\x38\xb3\xe9\x66\x0f\x64\x81\xb8\x28\xfd\xb4\x29\xb8\xde\xee\x8b\x76\x99\x7d\x9d\x2b\x95\xc9\x93\xe3\xe3\x19\x55\xf3\x7c\x72\x14\xf1\xd4\x84\x9b\x73\x31\x33\x7f\x1c\x53\x29\x73\x22\x8f\xbf\xfb\xf6\xdb\x62\x8b\x27\x38\x7a\x98\x19\xb8\x92\xba\xdf\xa9\xb4\xe5\xb7\xf5\xc2\xb6\xeb\x97\x7a\x10\x9c\x8d\xc9\x67\x4d\xa4\x72\x53\x20\x9b\x7b\x49\x24\x1a\xfc\x7c\x8b\xe4\x82\x29\xfc\xf9\x04\x7d\xa2\x0c\x04\x90\x1f\x78\x2e\x24\x3a\xc3\x8b\x43\x3e\x3d\x4c\x39\x53\x73\xf4\x09\xfe\xd7\xfe\xf4\x44\xc8\x03\xfa\x85\x60\x61\xf7\xd7\x96\x44\xf2\xd5\x75\xe7\x18\x72\x71\x25\x22\x8f\x7a\x85\xbf\xfd\x4f\x94\x9a\x96\x4f\xd0\x37\xc7\xdf\xfe\x27\xfa\x23\xfc\xff\xff\x1f\xfd\xb1\x45\x53\x5b\x0f\x0a\x07\x0a\x67\xde\x94\xdd\x71\x07\x95\x95\xda\xa0\x96\xf0\xa9\xe0\xc5\x4e\x35\xb6\xfc\x40\xa3\x07\x3e\x9d\x8e\x15\x4d\x89\xc9\x0d\x1a\x63\x51\x83\x51\xdd\x10\x57\x90\xda\xca\xa7\x82\x1a\xb8\x6d\x57\x5b\xc1\x76\x6a\x32\xa1\xdd\x71\x93\x79\x51\xf9\x11\x82\x40\x4a\xd5\x34\xa9\x84\xaf\x48\xac\x4f\xc5\x3a\x01\x1f\xce\x3a\x53\xaf\xcf\x5e\x20\x07\x84\xd5\x7c\x7d\xe0\x56\x18\x85\x68\x02\x35\xec\x42\x36\x1e\x87\x5a\x78\xe4\x17\x13\xf3\x06\x53\x7b\xad\x78\x37\x59\xeb\x7c\x75\xa8\xdb\x2d\x17\x5b\xc9\xcb\x0f\xa4\x16\x73\xdb\xb1\x8e\x88\xab\x21\x19\xd6\x95\x86\xa4\x53\x2e\x3c\xbe\xa7\xd1\x6b\x6d\xb5\xb1\xd5\x56\x28\x2a\x4c\x70\x50\xb7\x43\xaf\xa7\x7e\xe6\x3f\x59\x35\x4c\x88\x14\x72\x6f\x17\x75\x94\x60\xb4\xfa\x8a\xd3\x2c\xb1\x61\xc4\x0d\x20\x60\xab\x36\xf4\xd6\xe7\x7d\x43\xe3\x10\xb6\x06\x21\xfb\xcc\x49\x26\x36\x27\xb9\x79\x3f\x73\x11\x91\x53\xbe\x5d\xd8\x62\x42\x59\x2d\xde\xb9\x7b\x89\x8e\xa0\x58\xb9\x29\xc6\xe2\x70\x32\x79\x5c\x08\x7b\xc6\xac\x6b\xd1\xd9\x03\x80\xbe\xf2\x6c\x00\xe8\x69\x17\x18\x70\x35\xcc\xf0\x2d\xb8\xb6\x31\xfc\x15\x0c\xcf\x41\xce\x57\x90\xe6\x05\xd6\xbc\x70\x43\xd8\x3c\x53\x3b\xe4\x00\x09\x0c\x71\x6c\x6a\x8e\x99\x51\x09\xa7\x38\xa2\x6c\x76\x10\x20\xa6\x41\xe2\x77\xc8\x81\x9b\xe8\xe2\x0e\xcb\x87\xdd\xc6\x66\x6d\x5d\x4b\x8d\xc6\x45\x3d\x1f\x8b\x71\x60\x6c\xc1\xb4\x06\x17\xa5\xb0\x7c\x68\x03\xf9\xa8\x21\x0c\x2d\x19\x9d\x5f\x0a\x87\x4b\xb4\x6c\x7c\x2e\x91\x94\x84\x22\x28\xc0\x87\xbb\x2a\x9a\x16\x6f\xcc\xe5\x02\x61\xb8\x37\x69\x42\xe2\x2a\xd0\xde\x92\xf1\xcb\x39\x17\x6a\xbc\x21\x44\x61\x35\x19\x96\x91\xc3\x04\x60\x19\xf8\x23\x11\x8f\x94\x3c\x95\x91\xfe\xd6\xa1\x45\x63\x67\x08\x02\x91\x00\x0a\x2e\xd5\x9a\x74\x6c\xec\xdd\x6c\x61\x78\x93\x3e\xcf\x58\x3e\x48\x5f\x53\x10\xc9\x14\x27\xc9\x01\x12\x24\x97\xa6\xa6\xa5\x24\xc9\xf4\xd0\xa1\xb2\xc7\x28\xe1\x33\x1a\xe1\x04\x4d\x12\x1e\x3d\xc8\x11\xd3\x77\x33\x9b\x19\xbe\x90\x09\x1e\x11\x29\x03\x61\xa6\xc8\x73\xb5\xd9\x47\x50\x50\x50\x11\x91\x52\x46\xa5\xa2\x91\x93\x52\x8a\xd4\x72\x53\x3e\x56\xab\x97\x11\x37\x65\x10\x61\xb8\x5a\xb8\x22\x06\x27\x2e\x67\xb6\x7e\x07\xdc\x90\x16\xfe\xc9\xc5\xd5\xb6\x1d\xa0\x1d\xa0\x59\x39\x0a\x19\xab\xf2\x81\x5c\x71\xa4\x4e\xed\x67\x70\x8c\x97\x91\xc0\x4d\xf9\x44\x79\x82\xf4\x27\xcd\x83\x24\x3b\xba\x2c\xa2\x86\x4b\xc2\x82\x0f\xa6\xdd\x33\x70\x1d\x18\x72\x0b\xa4\xce\x2a\x9a\xd6\xab\x08\x52\x06\x94\x8c\xa9\x3a\x1a\x29\x8b\x92\x3c\xf6\x45\xc3\xf4\xad\xfb\xa8\x89\xc4\x2d\x8f\x5e\x7b\x7d\x37\x1f\x20\x2c\xd1\x13\x49\x12\xfd\x5f\x13\x34\x7c\xe8\x31\xbc\x35\x4b\x36\x38\xeb\xd0\x89\xe3\xd2\xad\x14\x05\x93\xd8\x93\x5a\x97\xfe\xde\x5e\x97\x33\xaf\x94\xcc\xf4\xf2\xac\xc9\xa1\xf5\x4a\xb7\xe2\x1d\x96\xc6\x56\x26\x5b\x00\x6e\x69\x1f\x54\x47\x03\x90\x68\xca\x90\x36\x14\x07\x4f\x1f\x69\x51\xd7\xd5\xf6\xb6\xd4\x40\xa4\x67\xd4\xc9\x3a\x14\x12\xc5\xc6\x16\xcf\xca\x54\x6a\x48\x03\xd4\x14\x04\x37\x13\x02\x35\x21\x8f\x22\x42\xe2\xc6\xf8\x52\x3d\xa2\xbd\xc3\xf3\xbb\xc6\x6a\x6e\x92\xd6\x53\xae\x4c\x59\x41\x83\xe7\xe7\x2c\x57\x06\x00\x6e\x92\xf0\x09\x5c\x48\x00\xf5\xe7\x92\x5e\x83\x84\x39\x33\x6f\x12\xa3\xaf\x83\xfb\xc5\x03\x2a\xbc\x6f\x06\x9e\x2b\xad\xc8\x1e\xc0\xfc\x55\x4d\x66\xad\x60\x7f\xe5\xca\x58\x47\xe8\xba\x82\x02\x12\x56\x96\xc6\xfa\xda\x58\x8a\x28\xf3\x4a\xd0\x80\x95\x49\x3c\xdf\x0e\xad\x09\x0d\x58\xea\x73\x07\xd0\x80\x95\x79\xb6\x44\xe5\xf3\xd9\xb3\x66\x13\xeb\x49\x5d\xf0\xee\x29\x5e\x06\x8d\xca\x88\x78\x25\x12\x74\x07\x72\xd1\x44\x88\xfb\x05\x7b\x58\xa9\x1f\xf7\xba\xb0\x87\x95\xc1\xec\x33\xec\x61\x65\xa8\xfb\x0b\x7b\xd8\x30\xd0\x0e\xb0\x87\xc6\x6d\x3f\xd6\x44\xdd\x8d\x29\x40\xca\xca\x24\x9f\xde\xc2\xbd\xbb\x74\x8c\xa7\x26\x24\xc0\x5c\x63\x4e\x94\xb4\x28\xc0\x30\x5a\x9b\xdd\xd8\x16\xe8\x84\xe5\x56\xb4\xe7\xfd\x6a\x54\x1a\x43\x42\x96\x60\x56\xbe\x3a\xa0\x44\xbc\x20\x91\x26\x3f\xc3\xa8\x94\xc0\x4c\xc2\x54\x0f\xac\xb9\x4e\x8f\xc2\x58\xa8\x23\x9c\xd9\x6c\xf1\xb6\xe2\x1c\xfb\x93\x17\xbb\x1e\xa2\x24\x00\xdd\x95\x58\x7d\x27\x98\xaa\x4f\x15\x7c\xfb\x39\x7f\xb2\x92\x23\x90\x9f\x21\xc6\x56\xd2\x83\x4e\xc7\xd6\xa6\xd0\xb6\x62\x94\x29\x32\xab\x8a\xf4\xc5\x61\xa1\x4c\xfd\xe9\xbb\x95\x1c\xc8\xe0\xf8\x39\xeb\x45\x80\x32\x6f\xa1\x43\x7c\x3d\x1b\x12\xdb\x22\xf7\x52\x6b\xd7\x7a\x3a\xe6\x46\x95\x28\xc5\xd4\xe9\xf9\xb9\x04\xe7\xdc\x9c\xca\x11\x33\x09\x5c\xb6\xb6\xda\x11\xfa\x00\xa5\x33\x71\x9a\x25\xe4\x00\xf9\xf9\x51\x4d\x41\xa3\xfc\x9b\x6f\xfe\x44\xd0\x37\x28\x25\x98\x95\x4c\x2c\xa0\xd5\xeb\x2b\x0f\x80\xe2\xd4\x9c\x8c\x58\xe3\x56\xa0\xe1\x67\x53\x8d\xc7\x45\xf0\x9d\xb3\x29\x77\x26\x1b\x28\x09\x87\xa3\x39\x92\xf9\xc4\xd4\x34\x0d\x4c\x6c\x4e\xcf\xbb\xe0\x33\x70\x3d\xc3\x4d\xec\x06\xbd\x31\x40\x66\x85\xe1\x74\x04\xc8\x2c\x4d\xad\x07\xc8\x6c\x3e\x7d\x7b\x0b\x90\x59\xd9\xf3\x6e\x00\x99\x4d\x5b\xbe\x01\x40\x66\xa9\x99\x2f\x06\x20\xb3\xb2\xa2\x5f\x0c\x40\x66\x65\x5e\x3d\x40\xe6\x17\x02\x90\xb9\x9a\x8f\x34\x42\x40\x36\x1f\xde\xf5\x20\x20\x1b\xf5\xab\x76\x16\xb1\x2d\xde\x0e\x48\x73\x2f\x0c\x01\x59\x9a\x40\x1f\xee\xb6\x7e\xb8\x5b\x23\xf1\xd9\xbe\xf5\xf0\x5c\x0c\x5c\xf5\x22\xeb\x08\x02\x59\xda\x9f\xce\xa6\x4f\xff\xc5\xfa\x51\x9f\xad\x1e\x17\x1c\xcd\xc9\x98\x3c\x52\xf0\xdc\x8f\xc1\xee\xb6\x06\x27\x39\xd5\x9f\x0f\xed\xd7\x60\x5a\x83\xd3\x52\x5f\xe3\xe6\x09\xed\xe2\x68\x3d\x6f\xc4\x28\xb8\x94\xba\xda\x77\x06\x25\xb2\x90\x16\x0b\x57\x8b\x7a\x0e\x8d\xcc\xa8\x82\x61\x7c\x42\x7f\x14\x37\x88\x3c\xad\x2c\xaf\x77\x42\x99\xc3\xb5\x4b\x6f\x43\x43\xa1\xf7\x2d\xe8\xd5\x25\xe7\xad\xe9\xed\x71\x83\x00\xaf\x4f\x23\xd5\x24\x34\xa5\xbb\x6a\x76\xd5\xcd\xec\xb1\x96\x40\x3d\xac\xe5\x1d\xea\xfb\xd6\x0c\xc7\x08\xfb\x95\x74\x4b\x00\x82\x30\x5f\xce\xa8\x54\xa2\x35\xf6\xaa\x36\xc2\x6d\xb8\x5c\x96\x77\x0e\xd8\x09\x56\x75\xb6\xd9\x67\x29\x49\xb9\x58\x15\xf8\xd5\xf8\xa5\x2d\x51\xb1\xc9\xa7\x24\x9b\x93\x54\x4b\x75\xe3\x75\x1b\xe9\xba\xdf\x3e\x29\xd5\xe6\x46\x99\x40\xcc\x12\x11\x04\x5e\x63\xfd\x6e\x6c\x10\x0f\x3b\x6f\xf7\xb6\xdb\x6c\x31\x19\xd7\x74\x4b\x38\x4c\xda\xe5\xe6\x1f\xfb\x52\x29\x36\x00\xe8\xbb\x31\x00\xc6\xc7\x1f\xad\x0e\x71\x59\x12\xdc\xb2\x0c\xd7\xa8\xf8\xca\x16\x70\x5d\x23\xee\xa1\xee\x13\x0e\xab\x77\xae\x1f\x0d\xd3\x82\xca\x59\x5f\x1e\x70\x96\x4b\x22\x0e\x43\x15\xa1\x34\x98\xfa\x7a\x95\xa8\xc4\xa9\x96\x5b\x10\x49\x2e\x5a\xa3\x60\xbb\x98\x55\x23\x95\xe3\x04\xf4\xd6\xb0\xea\x5c\x75\x53\x27\x8b\x86\xb4\xba\x6e\x76\x7b\xca\xd4\x9f\xff\x63\xad\xdd\xd4\x3a\x96\x5d\x37\xa8\x94\x83\xa3\x88\x48\x63\xe9\xb5\x51\xd2\x78\xc2\x1f\xa1\x48\xce\x36\xbb\xaa\x8f\xb2\x9e\xb7\x66\xf0\x1e\xea\x36\x2e\x48\xdd\x88\x0b\x73\xc1\xf3\xd9\xdc\x19\x93\xf4\x99\xd1\x53\x6b\xda\xcb\x9f\x6a\x16\xdb\xb5\xf7\xf2\xfb\x9c\x26\x9b\x99\xea\x6e\x4b\xe5\x83\x3e\x9e\xdf\x21\x39\xf7\xa7\x75\x02\xcd\x36\x6e\x6c\x7d\xd0\xdd\xfb\xb4\xdf\x7a\xaf\x01\x74\x73\xe0\xe0\x1d\xa7\x3c\x49\xc0\xee\x2d\x49\xfa\x18\x56\xfd\x0e\xbb\x87\x09\xdf\xd1\x0d\x6b\xdd\xc3\xd7\xe0\x3d\x93\x0a\xa7\x59\x27\xf9\xeb\xda\x88\x86\x12\xb9\xd1\x57\x5d\xe7\x26\xae\x8f\x33\xc2\x9a\x8c\x6d\x3f\xd7\x8b\x5e\xbc\xb1\xe8\x4a\x17\x6a\xb7\xb3\x08\x4b\xb7\x24\x2f\x1c\x65\xb9\x62\x1e\xfb\x1a\x69\x59\x61\x76\x3e\xf0\xb1\xb8\x66\x5c\xf8\x8a\x51\x7c\x06\x7a\x89\x47\x6c\x50\xca\xf7\x70\x15\x6e\x27\x8b\x22\x60\xdc\xe8\x10\x21\x33\x83\x72\x05\xd6\x52\x04\x4e\x1d\xfd\x17\x68\x3a\x06\x1c\xd5\xc4\x5f\xba\x18\x4b\x88\x76\x27\xf1\x21\x8e\x16\x51\x42\xa3\xc0\x08\x30\x13\x38\x9b\x37\x71\x3c\xb7\xf3\x3d\xaa\xcb\x6b\xa1\xba\xb4\xd5\xe0\x59\x27\xbe\xdd\xd1\x15\xc3\x29\xe9\xd1\x66\x9a\xd0\x66\x0e\x3c\x9e\x02\x2b\xaa\x09\xbd\x62\x9a\x7e\xfd\xdc\xf5\x90\x33\xaf\x00\x39\xb3\xc9\xe1\x2b\xf0\x64\x4a\xc7\xae\x87\xc1\x79\xd7\x09\x06\xc7\x5f\x82\x7b\x85\x6c\xd2\x7e\x1e\x5f\x19\x31\xa3\x3e\xb0\xd7\x84\xbd\x69\x10\x17\xd6\x91\x9b\x96\xe1\xde\x2c\xa3\x8b\x4e\xeb\xf2\xba\x28\x34\xeb\xad\xcc\x5a\x00\x33\x8d\x77\xd7\x9e\xc0\xcd\xb4\x6f\xc3\x9e\x9c\x9b\x5d\xa6\x00\xad\x57\x2e\x31\x4c\x03\x5a\x47\xc1\x5a\x2f\x23\xc8\xd3\xc3\xdb\xca\x0a\x2a\x6a\x55\x6d\x96\x19\x34\x70\x4e\x75\x22\xd0\x9c\x27\xb1\x89\x5b\x0b\x56\xcb\x77\xe0\xe3\xd1\xfd\x02\xb9\xcd\xb8\xcd\x48\x64\xb4\xad\xa2\xe0\xd4\xb2\xfc\x1f\xbf\x89\x6f\x3d\x07\x28\x90\x7f\x77\x9b\x07\x14\xae\xec\xa6\xb9\x40\x2b\x06\xb7\x4c\xf4\xd8\x30\x1f\x28\xe8\x71\xa9\x97\xce\xcd\xae\x93\xa7\xae\x4a\x2c\x1b\x44\x85\xd5\x2a\x83\x6d\x0f\x3e\x93\xe2\xcf\xe3\x0c\x0b\x9c\x24\x24\xa1\x32\x7d\xb6\xd0\xd4\xd3\xb2\xbb\x56\x9f\x55\xc1\x8d\x89\x88\xe5\xe9\xc4\x90\xa2\x1b\x88\xad\x47\xa8\x38\x12\x39\x0b\xa1\xb3\xfc\xc6\x20\x57\xaf\x2e\x87\x7b\x01\xac\x4a\xd1\x1c\x8a\x5f\x4e\x31\x15\x8c\xc8\xd6\x52\x83\x24\xca\x05\x55\x8b\xb1\xad\xdc\xd8\xfd\xc0\xdd\xda\x2f\x4f\xed\x87\xcb\x3d\xdc\x0e\x75\xc0\xf5\xe7\x2b\x45\x66\x44\x40\x19\x1a\x57\x50\x25\xa8\x4e\x69\x51\x25\x88\xaf\x65\x03\xc1\xb8\xb5\x6b\xbb\x2d\x88\x1c\x3f\x8d\x83\xbc\x9e\x71\x54\x25\x8e\x55\x87\xb5\x09\xd7\x68\xd9\x24\x9f\x19\xd9\xa7\xc5\x8b\xfc\x0c\x55\x2c\x6c\xf0\xbe\x69\x5a\x0f\x38\x70\x05\x83\xbd\xb2\xd8\x98\x00\x1c\xc0\x2a\x55\x2d\xe3\xc4\x8c\x71\xd5\x5c\xbf\x6c\xc9\x60\x07\xc1\x57\x1d\x46\x1c\x74\xb2\xa3\x61\xeb\x83\x2e\x44\x9e\x29\x3a\xa9\x43\xef\xa8\xdd\x55\xb5\x1c\x24\x90\x93\xee\xdc\x0c\xa5\x6e\x4d\xa9\xcb\x12\x27\xb6\xb3\xd3\xf2\xbf\xc5\xa9\x72\x08\x46\x94\xcd\x12\x52\xca\x26\xbb\x4a\x29\x50\xa1\x39\x3f\x60\x80\xd6\xd4\x59\xb6\xcd\x7e\xe5\xc2\x3d\x30\x14\xcc\x34\x26\xa2\xa3\x11\x1b\x48\xf4\x44\x10\x23\x16\xe2\xa2\xa1\x14\xa6\xb7\x6a\x43\x6d\xa1\x09\xd1\x3d\xf9\xd8\x14\x2d\x3c\x50\x25\x7d\x79\x2b\xd3\xc7\x14\x27\x92\x1c\xe8\x86\xa1\x2a\xa6\xe2\x10\x05\x8a\xd1\x93\xc0\x59\x46\xc4\x88\xd9\x9c\x02\x70\xb8\x70\x9e\x98\xf6\xdb\x62\x5d\xed\x1a\x90\x31\xc4\x45\xbd\xcc\x1e\x61\x48\x09\x89\xe6\x24\x76\xc9\xd5\xe5\xed\x71\xf3\x36\x06\xeb\x35\x36\xeb\x7c\xea\xca\x33\x1d\xd8\x4e\x92\x48\x73\x14\x5f\xad\x37\x23\x42\x8f\x5a\xd3\xf0\x23\x61\x88\x4e\xdd\x38\x6c\xec\x0e\x7a\x02\xcf\x94\x26\xfd\x47\x4c\x13\x83\x56\xe0\xba\x76\x42\xa0\x31\xbf\x8f\x98\x71\x77\xb3\xa8\x94\x27\x49\x19\x95\x73\xcd\xa9\x73\xf0\x49\x82\x9a\xb1\x96\xe4\x19\xc7\xb2\x6c\x64\x34\xea\x1b\xfd\xad\x64\xde\x38\x2c\xe5\x80\x45\x01\xbc\x10\x44\x7f\xba\x0a\x51\xcb\xe4\xcc\x3e\x97\xa0\x9e\x4b\xd0\xbc\x36\xfb\x98\x4f\xe0\x0f\xcb\xba\x39\x05\x6d\xdb\xbf\x0b\x09\x72\x87\xb9\x05\xaf\x1c\x84\xff\x3c\xf1\xf7\xaf\x9b\x30\xf1\x1c\xb9\x12\x7d\x46\xc1\xdb\xcb\x28\x68\x3f\xb6\x6b\x65\x15\xac\x40\x98\x72\xbd\x6c\x1b\xf1\xec\x21\x87\x9e\x35\xea\xd9\x47\x6d\x04\x5f\x74\x8c\x7c\x2e\x30\x91\xfa\xe8\xe7\x67\x8a\x7e\x6e\x58\xe2\xf5\x22\xa0\x37\xb2\xad\xbc\x7c\x70\xa6\xeb\xf9\x25\x02\x34\x57\x45\xc7\xe4\x93\xf1\xb3\x1f\xbd\xc6\x39\x77\x3d\x81\x3f\x7b\xa2\x30\x22\x91\xd0\x74\x36\x21\x71\x0c\xf6\x7b\xc5\x6d\xc9\xd7\x82\x76\x9c\x1e\xa6\x99\x2f\x96\x9a\xd8\x71\xc2\xd9\x4c\xd2\xd8\x60\x2b\x64\x18\x4a\x2f\x86\x5a\x22\xe4\x14\xc3\xfe\x26\x09\x11\xce\xfc\x2b\xd0\xd7\x92\x6a\xb9\x3f\x30\x09\x0b\x14\x73\x22\xd9\x57\xca\x68\x65\x98\x2d\xd0\x03\xe3\x4f\x09\x89\x67\xb0\x43\xd5\xc1\x1c\x22\x4a\x0e\x10\x55\xfe\x33\x01\x49\xc8\x3c\x57\x23\x3d\x76\x08\xea\x31\x22\x20\xb1\xdf\x06\xc5\x8d\x7d\x33\xef\x8f\x10\x3a\x67\x68\x8a\x23\x75\x80\x64\x3e\x29\xda\x8f\xb9\xa9\x56\xab\xd5\x9c\x60\xe2\x45\x23\x7d\x70\x6e\x43\xe7\xcd\x67\xc3\x71\x07\x4d\xae\x83\x84\xe2\xad\x82\x98\x1e\xf1\x36\x58\x93\x9f\x72\x69\xbd\xdd\x88\x33\x7f\xf4\x2d\x9a\x8a\x07\x0b\x86\x12\xa3\x06\x78\x97\xf1\xb8\xd5\xa8\x54\x99\xca\xba\x63\x29\x22\xce\x6c\x65\x53\xeb\x11\x80\x76\xcd\x72\xc7\xfc\x89\x49\x25\x08\x4e\xad\x15\x56\x5f\x35\x10\xad\x60\xe2\xcd\xf4\xe8\xa9\x30\x22\xc6\x3a\x5b\x7c\x41\xd9\x83\xde\xdd\x02\x1e\x19\x0a\x45\x43\xcf\x4d\x9b\x96\xe9\x1b\x8f\x9c\x72\x66\x3c\x31\xdb\xec\x9f\xa4\x33\x86\x93\x35\x95\xdc\xda\xca\xd5\x9d\x27\xce\x78\x65\xc5\x05\x2d\x45\x18\xab\x0a\x32\x3d\xae\x65\x44\xa8\xcc\x37\x74\xdd\x60\x14\x93\x8c\xb0\x98\xb0\x68\x01\x24\xc2\x00\x28\x43\x30\x9c\x20\x0c\xdf\xe1\xe4\x08\x9d\x99\x44\x06\x2f\xe1\xd9\x6b\x1d\x2e\xf4\x14\x33\x3a\xd5\x82\x22\x58\xbb\xec\x28\x47\xcc\x0c\xd3\x19\x9b\x83\xea\xdb\x7e\xc5\x1a\x76\xe6\x7b\xca\x70\x29\x73\x64\x83\xf3\x94\xe4\x6b\x05\x07\x07\x66\xab\x45\x1b\x66\xb8\xc2\xab\x60\xbc\xd7\xd8\x0c\x24\xa1\x6e\x39\xd2\xdd\x21\xb8\x32\xcd\x22\x61\xa4\x30\x58\xb4\xe7\x24\xc9\x82\xda\xbf\x19\x16\x4a\xba\xa3\x6d\x80\x5f\xf5\x2d\x93\xe6\xcc\x40\x6e\x18\x4b\xc3\x93\x05\xd7\xb4\xce\x8c\xa2\xf1\xa3\x11\x3b\x57\x5f\x49\xcd\xf9\x38\x9b\x25\x0b\x84\xe3\x47\x2a\x0b\x10\xf1\x88\x33\x99\xa7\x44\x54\x4a\xea\x5b\x00\x5e\xec\x48\x53\x8f\x4d\xcb\xfc\x8f\x38\xa1\xb1\xee\xd6\xc8\x18\x33\x34\x21\x53\x2d\x3f\x65\x58\x48\x67\x11\x6b\x70\x69\xda\xcd\x8d\xf5\x5a\xbd\x1a\xb7\xfc\x29\x64\x88\x28\x2d\x78\x27\xb6\x3a\xf0\x71\x95\x73\xda\x55\x5f\xc2\x35\x27\xb5\x49\xa1\xe5\x02\x8e\x5d\x85\xb3\x55\x98\x30\x0e\x97\x2c\x37\x21\x2c\xba\x1f\x27\x4b\x9b\xc1\xad\xc5\x01\x2a\x13\xb4\xa3\x36\x86\xd6\x90\x6b\x12\x0a\xc2\x85\x54\x58\xd1\xc8\x8a\xed\x5c\xd8\x8b\xc3\x5e\x2c\xed\x5b\x7b\xb6\x25\x0c\xb3\x8c\x70\x52\xdf\xe1\x25\x5e\x33\xf3\xfe\x72\xde\x6a\x8f\x9b\x69\x7b\x69\xd2\x4a\xc4\x93\x64\x1d\x88\xf0\xca\xcc\x4f\x8b\xcf\x97\x8f\xa8\xe8\x47\x6f\x80\xdb\x0b\x38\x35\xc6\xf7\x88\x13\x2b\xa1\x4a\x65\x77\x29\x7c\xc9\xdc\x6e\x0b\xeb\xdb\x1c\x31\x3e\x35\x15\x5e\xdb\xbc\x92\x99\xe0\x29\x5d\x07\xab\xce\x38\xea\x6e\x5c\x14\xe1\x0a\xe1\xcd\xc5\x1a\xea\x53\x64\xc9\xcb\xf6\x08\xf1\xe6\x98\x19\x79\x75\xc9\x19\x4a\x71\xb6\xd1\x82\xaf\xb2\xb6\x0c\x50\x6a\x4c\x5d\x76\xf5\x00\x83\x98\x00\x1e\x3b\x2c\xf2\x13\x5e\x14\xa9\x3d\x6d\x28\x64\x6c\x2d\x72\xb8\xd7\xaf\x9f\xb3\x29\x5f\xe3\x70\x16\xa9\x38\xf6\xf4\x61\x47\xb3\xc1\xf9\xf3\x31\x9d\x66\xf7\xcd\x9a\x76\x39\x8f\xa7\x4d\x44\xbd\xf6\xc9\x74\x2b\xf8\x9c\xaa\x5f\xc8\x44\x42\xad\x6f\x9d\xbb\xb5\x7c\xb4\x82\x16\x11\x0c\x67\xf9\x52\x7d\x2a\xd1\xe1\xce\xd7\xa8\xd2\x0e\x32\x16\x06\x17\x0c\x74\xdd\xdc\xea\x0b\xac\x99\x3d\x24\x9d\x16\x6b\xcb\xdc\xc3\xf5\xd0\xd4\x5c\x8f\x1e\x43\xad\xf9\x84\xae\x84\x8a\x5d\x47\x57\x9c\x6a\x49\xc8\xa8\x0f\x45\x64\x81\x0d\xb1\x9e\xd2\x84\xc8\x23\x74\xde\xa0\x37\xba\x00\x67\xef\x10\x34\xa1\x5e\x4e\x7a\xca\x05\x0d\x0a\x27\x39\x19\x09\x51\x40\x23\x0f\x6d\x67\x82\xe8\x31\x47\xc6\x77\xc7\x0d\x74\x1a\x44\x57\x09\xaa\x79\x96\x11\x56\x15\x48\xd1\x9a\x17\x50\x9b\x5e\x6e\x64\x78\xff\x01\x37\x3e\x6f\x6c\x6b\xc3\x15\xa3\x6a\xd9\xd2\x5d\x94\x50\xe8\x1e\x3f\xee\x7a\xbd\xd3\x5f\xd4\xf7\xa6\x71\x84\x77\xe5\xd6\xd7\x1e\x9d\x97\xf2\xd7\x77\x44\x7e\x80\x4f\x9d\x55\x14\xa3\xa9\x20\x60\x38\x4f\x7d\x4e\x28\x8b\x89\x90\x8a\x73\xb8\xef\x6e\xcf\x7e\x3c\xbe\x3f\x47\x44\x45\x28\xa1\x0f\x64\xc4\x22\xf9\x78\xa0\xc5\xe3\x7f\xe4\x44\xe9\x9f\x5b\x0c\x2d\x34\x25\x4c\x02\x27\xa0\xaa\x96\x3b\xdf\xbc\x90\x6e\x61\xf4\x7f\xcf\xca\xdf\x2f\x21\xf9\x5a\xfa\x0b\xd0\xae\x03\xb7\x07\x32\x05\x60\x64\xb3\xb4\xb2\x81\x62\x8c\x8a\x37\x6c\xaa\x36\xb5\x41\xb8\x2b\xfb\x7b\xce\xd6\x14\xba\x4e\x8b\x8f\x82\x51\xb4\xc8\x74\x69\x86\x01\x39\x70\xbd\x38\x5a\xf3\x4d\x63\xeb\xab\x98\x48\x91\x56\xe4\x54\xf6\xa2\x30\x17\x52\x82\x10\x60\x21\x9e\x9e\xec\x5d\x6f\x33\x49\xfd\xc4\x82\x8f\x8e\x46\xec\x93\x33\xe4\x17\xbf\x4a\xd7\x84\x89\xcd\xf6\x80\x8a\xe5\x56\xa0\xd9\x98\x4a\xff\x03\xc0\x62\xcb\x3c\x51\xa6\x62\xcc\x94\x6a\x2d\xdd\x0d\xd4\x3c\x69\xe2\x12\x02\xb3\x68\x7e\xb9\x65\xe1\x18\x3a\x1d\x93\x64\x1d\x49\xf4\x7c\x3a\x4c\xa4\xa6\xef\xe8\xa1\xe5\x74\x6e\x52\x13\xa9\x98\x0c\xc8\x81\xae\xc8\x83\xd1\x71\x8c\xf5\x38\x31\x15\x5b\x08\x02\xd3\x6f\x35\xfa\xd9\x24\x38\xea\x5d\xb4\x92\xba\xb1\xfc\x9a\xb0\x43\x1f\x52\x04\xbd\x20\xac\x46\x4c\xe4\x0c\x20\x7b\xbd\x23\x08\x23\x49\x04\x35\x1e\x99\xc8\x99\x65\xac\x91\x6c\xa6\xd9\x84\x96\xfc\xc0\x1b\xc8\x19\xe8\x67\x3c\x97\x10\xc1\x98\x12\xa5\x2f\xa8\xaf\xa1\xce\x9a\x71\xc5\x1d\xa0\x4c\xd0\x94\x2a\xfa\x48\xe4\xfb\x86\xad\xab\x43\x14\x6d\x77\x5e\xe3\x8e\xfb\x57\xef\x17\xea\x0e\x2d\x0d\xfa\x03\x6c\x72\x28\x04\xa4\xb8\xd5\xcd\xdd\xcd\x0a\x91\x39\xc8\x01\x35\x21\x00\x6a\xd2\xf7\x30\xcf\xd9\x32\x03\xb6\x45\xe7\xdc\xc6\xc6\x5a\xb8\x87\x48\x6c\xfb\xb5\xad\x1a\x2c\x5c\x1b\x8a\x58\x80\xdc\x3a\xdb\x5d\x65\xc8\x53\x4c\x93\x22\x7f\xa0\x3a\x50\x4d\x7c\x05\x4a\x5a\x83\x41\xb1\xfd\x94\x68\x4a\xf6\xde\xdb\x8e\x09\xe0\xe7\x67\xa1\x71\x23\x08\x06\x68\x19\xb8\xa9\x87\xb2\x0c\xaf\x77\xb3\xb1\x97\x60\xbd\xd6\x1e\x7b\x05\x7d\x6c\xe9\xd8\xd1\xd7\xb4\x71\xc2\x4f\x18\x8e\x96\x2a\xca\x35\x14\x0f\xdb\x02\x45\x1d\x27\xd8\x70\xd2\x35\x97\xfb\xda\x13\x6f\x88\xf7\xd9\xc1\xe4\xeb\xad\xbe\x5f\xc7\xca\x64\x8e\xaf\xf7\xc9\xd2\x69\x31\x12\xee\x43\xeb\xac\x89\x60\xea\x31\x6e\x2d\xfc\x03\x78\xa3\x0e\x95\xa0\x0e\xcc\xdf\x20\xa5\x74\x62\x68\xdb\x06\x15\x34\xa3\xbe\xed\x52\xb7\x6d\x60\xc2\x9b\xa9\x6b\x17\xd6\x07\xde\xe0\xdb\x86\x18\x9f\x7a\x47\xbf\x86\x5c\xd2\x41\x12\xe1\x2a\xa9\x34\x17\x8d\x33\x43\x57\x38\xe1\xb3\x81\x50\x74\x8a\x23\x75\x87\xb7\xb2\xe0\x62\xdb\xcc\xa6\x61\x81\x6e\x18\xe8\xfc\x4c\x5f\xde\x33\xc2\x88\x80\x8b\x92\xe1\xb4\xc5\x7a\x0f\x4f\x36\x92\xfc\xa1\xc8\x55\x64\xca\x02\x49\x6f\xf1\xc6\xb9\xe2\x29\x56\x34\xc2\x49\xb2\x80\x72\x3f\xfa\xc9\x1c\xcb\xb9\x3b\x9d\x26\x8c\xb5\x8b\x6e\x63\x17\x17\x76\xed\x56\x61\x95\x37\x3a\x13\x2b\xa3\x7c\x47\x58\x9e\xbe\x3b\x41\xff\xb7\x98\xe3\xe9\xe0\xf4\x87\xe1\xf8\xec\xfc\x76\xf0\xfd\xc5\xf0\x2c\x98\x8f\x7d\xf2\xe9\xfc\xf6\xb6\xfe\xeb\x0f\xe7\x77\xf5\x1f\xaf\xaf\xae\xef\x2f\x06\x77\x4d\xad\x5c\x5c\x5d\xfd\x78\x7f\x3d\xfe\x30\x38\xbf\xb8\xbf\x19\x36\x7c\x7a\x7f\xd7\xfe\xf0\xf6\xc7\xf3\xeb\xeb\xe1\x99\x5b\x95\xbf\x05\x14\x0e\xe1\xad\x10\x7a\xde\x3c\x8d\xea\x21\x38\x44\xe5\x17\x4f\xd0\x7d\x15\x88\xdc\xc6\x88\x9a\x3c\x7e\xcd\xe5\x62\xe3\xf4\x88\x47\x0c\xb9\xcf\xf5\xa2\xb4\x7d\x5a\x70\xd3\x84\xf3\x87\x3c\xb3\xa2\xb1\x49\x06\x64\x56\x38\x21\x32\x68\xed\x87\xf3\xbb\x93\x3a\x20\xba\x6f\x2c\x40\x0c\x72\x67\x00\xc6\x85\x9d\x38\x0e\x1c\x38\x13\xe4\x11\x84\x3d\xcf\x81\x83\x1e\xfc\xce\x2c\xeb\xc7\xb4\x86\x99\xaa\x74\x13\xc7\xb6\x28\xab\x9b\x58\xd0\x70\x79\x5f\x97\xad\xa6\x5f\x0e\x7b\xb5\x4c\x48\x84\x73\x13\x6b\x84\xad\x50\x16\x0e\xb8\xa0\x87\xdd\x35\x6a\xe9\xa8\xb1\xc1\xca\x9e\xe9\x89\xcb\x07\x9a\x65\x24\x7e\x57\xd7\x7f\xcb\xd5\x3b\x25\x9c\x3e\xdd\x67\x70\x26\x29\x9b\x19\x9b\xb1\x2b\x5f\x30\xb7\x65\x66\xa8\x34\xf1\x14\x45\x84\x09\x20\xf3\x6a\x49\xcc\xc3\xcc\x53\x88\x7e\xc2\x0a\x3d\x11\x48\x29\xcd\x6d\xfd\x16\x63\xbb\xd5\x67\x1b\xba\x33\x9e\x70\x57\x34\xac\x94\x6a\xda\xca\x8c\x77\x61\xb0\xd1\xdf\x4b\xd2\xc4\x88\xb7\xc8\x0b\x3c\x33\x8d\x02\x77\x76\x22\x09\x8c\xb8\x25\xe6\xc0\xdd\x06\x0d\x1e\xd6\x65\x97\x69\xed\x46\x5a\x71\x59\x68\xb6\xdd\x65\x3c\x0e\x0b\xa1\x24\xcf\xee\x58\x98\xf5\xa3\xbb\xe3\x31\x5e\x68\xe2\x80\x18\x50\x99\x67\x19\x17\x0a\xb5\xb4\x61\xbc\xeb\x66\x7c\x70\xe7\xd8\x79\x78\x1e\x07\x8d\x68\x01\x4e\x36\x14\x15\xe8\x96\x1e\x6e\xd7\xb5\x60\x1c\x21\xd4\x15\x18\x12\x7d\xf5\x91\xb4\x64\x92\x2d\x51\x68\x93\xf1\x64\x9b\xc8\xef\x4c\x5f\xf0\x5d\x8b\x61\x35\xf5\x7e\xe5\x5a\x68\xdc\xf2\x84\x4c\xd5\xb8\x31\x6a\x60\x89\x83\x4c\xb7\xc8\xda\x10\x35\xe8\x6c\xbe\x83\x16\xbb\x5b\x99\xbe\xb3\xf1\x36\x4a\x10\x12\x58\x98\x05\xe7\xca\xd8\x37\x0a\x1b\x18\x72\xab\x09\x92\xb7\xed\xd4\xe6\xc2\x78\x23\x02\xe2\x02\x82\xd5\x98\xf7\x0c\xcb\xa3\x11\x1b\x62\xa8\x6a\xeb\x0d\x59\x2e\x45\x06\xac\x48\x2b\xed\x47\xa5\x0a\x95\x2f\x1a\x44\xd9\x8e\x70\x59\xd0\xbd\xad\x67\x9e\x2c\x50\x51\x85\xb4\xf4\x5d\x97\xd3\x63\xbc\xa6\x4e\x04\x34\x13\xb6\xf5\xf3\x14\xc9\xac\x67\xd7\xcc\xb3\x08\xc0\x81\xb0\x2d\xdd\xd5\x11\xfa\xd9\x79\x0e\x20\x1e\xb5\x28\xe0\xab\xcc\x8d\x93\xe0\x85\x03\xc5\x6b\x5a\xd8\x5d\xe0\xcc\xed\x3a\x42\x75\xf9\x02\x7b\x40\x9b\x86\x55\x2e\x19\x70\x19\x33\x1e\xbd\x75\x60\xb9\xfd\x47\xb7\x64\x79\xbe\xce\x07\x28\x86\x67\x03\x9e\x40\xe8\x60\xc9\xe2\x7f\x98\xcd\x32\x99\x78\xae\xcc\x8d\x55\x4a\x6d\x04\x8e\x3e\x3f\x10\x41\x62\x12\xf5\xd0\x94\x26\x09\xc8\x01\x47\x68\x00\xb5\x64\x21\x91\x4d\x5f\x85\x2e\xea\x99\xce\x18\x5f\x95\xfb\xd3\x42\x4c\x51\x40\x4c\xb7\xed\xc4\x24\x81\x9a\x8a\x3c\xe6\xdd\x50\xd4\x0e\x30\x2d\x34\x6f\xc1\x75\x44\xe0\xee\x48\x16\x6b\x18\x7f\x5f\x23\x68\xb9\x36\xdc\x50\xb7\x6f\x1e\xfa\xc7\x1c\x0b\xcc\x14\x84\xe2\x5a\xd1\x5d\x90\x20\x25\x84\x7c\x06\x45\x9f\x19\x47\x22\xfc\x14\x6e\xae\x0b\x19\x9b\x51\x48\x5c\x8c\x0f\x10\x3d\x22\x47\x50\x2b\x49\x68\x59\x62\x52\xbc\x39\xd7\x92\xc3\x88\xd5\x42\x0c\x8f\xd0\x20\x91\xdc\x7e\x41\x58\x94\x40\xed\xe6\x20\x6a\xd8\x53\xbe\x0d\x4b\x98\x2c\x40\x41\x81\xad\x2c\x9a\xe7\xf6\x41\xf0\xe1\x88\x61\x69\x62\xaa\x12\x38\xe9\xc5\xef\x4d\x05\xef\x2b\x76\xc4\x17\xd9\xa8\xe5\xa8\xf6\xdb\x6e\x92\x29\xdc\xb5\x6c\x83\xe0\x0d\xd8\x98\x22\xf4\x33\x40\xa0\x40\x5f\x63\x85\x12\x82\xa5\x42\xdf\xbe\x5f\x2b\xb6\xd0\x4d\xb0\xe0\xae\xf6\xf8\x16\x09\x3c\x2e\x03\x20\x14\xee\x7c\xc7\x8a\x23\x28\xac\x88\x30\x62\xe4\x29\x0c\xf8\xe4\x10\xa3\xfb\x48\x65\x0e\xe5\xb0\x03\x6b\xa1\x29\x68\x6c\x32\x93\x21\x89\xc2\xa8\x4c\x2d\x7c\xc4\xd9\xfb\x6c\xf8\x8d\x1d\x56\x03\x65\x59\xe5\x89\x1a\xf5\x0c\x20\x89\x8a\x58\xfc\x39\x56\x23\x66\x39\xab\xb3\xbe\x07\xa5\x4b\x07\x49\x52\x8e\x7f\xc7\x60\xc3\x67\x7a\xc2\x50\xcc\xfb\xc8\x2f\xd0\x25\xa8\x5f\x3e\x08\xb9\x64\x5c\x2d\x0e\x8b\xd6\xd4\x46\xcc\xe3\xbd\x84\x6d\x37\x4a\x3b\x4d\xfe\xc9\x17\x14\x82\x1b\xba\xbf\x30\x55\xd5\x3b\x08\xc3\xa4\x69\xc8\x2b\x0e\x56\xdd\x27\xbc\x44\x36\xde\x75\x07\xdd\x45\xe5\x66\xff\x2a\x5c\xb3\x4f\xbc\xc1\x5d\xdb\xb2\xb9\x81\x6c\xb1\x8d\x02\xee\xa3\xe1\x5f\x2a\x62\xa8\x34\xf4\xf3\xb8\x5c\xaa\xa4\x95\x0b\x16\xb9\x6d\x8e\x75\x80\x13\x81\xc6\x41\xaa\x4d\x10\xd9\x0f\xa9\x58\x8e\xf1\xd9\x37\x5b\x22\x77\xb2\xb7\x3d\xfd\x83\x62\xfe\x6e\x2a\x3e\x88\xba\x3e\xf1\x76\x61\x6f\x10\xff\x1d\x47\x10\x80\x0f\x3d\x39\xf7\x61\x1d\x90\xc6\xc1\xf8\x06\x4e\x9b\xaa\x78\x98\x09\x1e\x11\x29\x8f\xd0\x10\x2e\x1a\xfb\x4f\x84\xa7\xce\xa1\x1d\xbc\x3c\x62\x5a\x33\x71\xf8\x15\x41\xfb\x65\x12\x6f\x3a\x01\x06\x0c\x6b\xab\x58\x80\x74\x4d\xb7\x6c\xa0\x4d\x38\x2c\x2e\x68\x03\x60\xdd\xd1\x70\x76\x82\x62\x1e\x3d\x10\x71\x2c\x48\x4c\xe5\x09\xc4\x66\xa9\xd6\xa0\x90\x54\x6b\xdb\x5b\x4b\x1a\x6d\x81\x66\x2b\x72\xd5\x4e\x4d\xff\x36\x09\xcb\x95\xf7\x3c\x40\x74\x0a\xea\x84\x4b\x95\x30\x49\x9a\x0e\xee\x83\x30\x25\x16\x19\xa7\x4c\x79\x53\x56\x65\x21\x9c\xa6\xa1\x85\xb6\xb6\x24\x1f\xb1\x8b\x18\xce\x0d\xa7\x7d\x37\x27\x92\xb8\x80\x35\x33\x29\xc5\x91\xf1\xb2\x18\x76\x91\x61\x35\x97\x90\x51\x5a\x5e\x03\xab\x74\xc1\xa7\x7a\x85\x70\x06\xf1\x6e\xc6\x4a\x51\x7c\xe4\x5d\xc2\x52\xd1\x24\x19\x31\x46\x48\x2c\x11\x38\xc8\xbe\x6a\xcc\x5c\xd6\x9f\x1e\x20\x1c\xc7\xe8\x7f\x7e\xfd\xe1\xe2\x97\xbb\xe1\xf8\xfc\x12\x8c\xd6\xe7\x17\xc3\xf7\x07\xfe\xc7\xab\xfb\x3b\xff\xab\xb1\xb0\x3c\x12\x81\x52\xfc\x00\x2a\x1e\x93\x46\xfe\x83\xec\xc0\x70\xa4\x2e\xa7\x5b\x3f\x91\xc4\x65\x4a\x58\x31\xc5\x43\xc8\xd9\x3d\x6c\xad\xde\x6b\x6c\x7e\x6b\x28\xbf\x37\xfe\x93\xe5\x34\xe8\x88\xc7\x77\xe1\xc4\xc0\x94\x30\xc8\xe6\xb1\xd6\xbe\x42\xf7\x2d\x08\x8e\xb0\x19\x65\x6d\xa1\x0c\x84\x3d\x3e\xa7\x10\xff\x23\x59\xfc\xa4\xd5\xeb\x6b\x4c\x45\x67\xda\x1b\xb2\x47\x2a\x38\x83\xa9\x79\xb3\x96\x3f\x31\x5a\x4f\xc7\xb2\x7a\xa8\xa4\x91\x85\x21\xc6\x2f\x6b\xcd\x19\x68\x02\xc2\x7a\xf5\xe9\x5a\x78\x1d\xf2\x59\x09\x87\x1e\xe0\x51\x9c\x1c\x94\x4d\x11\xa7\xe2\x69\x70\xc4\xee\xae\xce\xae\x4e\x10\x49\xf0\x84\x0b\xc8\x26\x36\x21\xa5\xae\x09\xbb\x60\x11\x4f\x83\x86\x4a\xc8\x11\x07\x28\x2b\x90\x23\x42\x23\xda\x91\x69\x63\x55\x59\x7d\x2e\xea\xb8\x0b\xbb\x55\x01\xed\x64\xaf\xb9\xe8\x72\xfd\xeb\xd7\x60\xe9\x78\xa6\x15\xb9\x0a\xe7\xb5\x77\xf3\x94\x60\x53\xd1\xda\xb8\x85\xac\x2d\xdf\x26\x40\x24\x49\xa9\x40\x9e\x3e\x38\xf2\xc8\x86\x70\x15\x6f\x72\x86\x7e\xfc\x8b\x44\x93\x5c\x8d\x58\xb9\x0d\xce\xd0\xe0\xe7\x5b\xf4\x3d\x56\xd1\xfc\xfd\x88\x5d\x69\x35\xf3\xc7\xbf\xb4\x40\xdc\xac\x8d\xce\xa6\xd7\xe4\x0c\x2b\x7c\xc1\x71\x4c\xd9\xac\x09\x9a\xad\xa8\x9f\x31\xbc\x1b\x9c\xa0\x2b\xab\xc3\x7b\x54\x8a\x22\x53\x37\x68\x08\x18\x32\x4c\xc4\x71\x11\x60\xe5\xac\x0c\x5f\x65\x34\x33\xb8\xb0\x46\xec\xce\x60\xd2\x69\xae\x4a\x15\xca\xb8\xad\xe1\xa2\xb5\x32\x83\xd6\x67\x4c\xd9\xd6\x92\xa8\x57\x07\xc8\xd8\x6f\x86\x95\xc7\x40\x9e\xa9\x33\xfb\x11\x03\x05\xdd\x23\x05\x24\x3c\xc2\x09\xc4\x74\x1f\x06\x36\x3d\xad\xb6\xf3\x1c\xd2\xb6\x21\x4e\x82\x2d\xca\xa9\x17\x3e\xda\xc2\x0b\x65\xe1\x46\x81\x01\x00\xf6\xd1\x7a\x63\x53\xae\x39\x8e\xc1\xa2\x02\xe3\x5b\x62\x56\x47\x7f\xe8\xb1\xa9\xcc\xb2\xe8\xa7\x8e\x1f\x41\xa5\x7f\xe3\x56\xc4\x11\x98\xef\xd9\x02\xd2\x7f\xa0\xe8\x02\x87\xd0\xc1\x82\x3b\x5b\xa2\xac\xed\xa2\xbf\x13\x83\xcf\x46\xcc\x44\x9a\x97\xf6\x25\x44\x55\x09\x7a\xe7\x0c\x02\xe1\x8b\xeb\xd2\x0b\x18\x99\x0d\x8c\xb7\xb2\x7e\x26\xc8\x61\x4c\x14\x11\x29\xd8\x7b\xc2\x35\xd5\x37\xec\x11\xba\x09\xd5\xeb\x98\x47\x79\xea\x90\x65\x21\xbd\xdd\x46\x50\xdb\x4b\xd4\x53\x88\xb9\xd8\x57\x51\x3c\x16\xd1\x9c\x2a\x02\x59\xdd\x9d\xf5\x63\x43\x30\x83\xf0\xd3\xba\xa4\xde\x2e\xf8\x02\xef\xd8\x2e\xea\xd9\x34\x34\xce\xca\x2d\x95\x5a\x5b\x0d\x8c\xb9\xa2\x50\xd2\x65\x81\x7e\xc9\x05\x08\x5b\xe4\x73\xc6\xc1\xc8\x6d\x72\x72\x79\xfc\x95\x44\xe7\xd7\x5a\x02\xd2\x1a\xaf\x3f\x83\xb9\x54\x26\x38\x19\xd2\x3d\xcd\xd7\x26\xdd\xec\x00\x7d\x63\x4a\xb0\x47\xe8\xb3\xfb\xe3\xcf\xff\xf9\x9f\x7f\xfa\xf3\x3a\x81\x62\x4e\x21\x87\x76\x8b\x35\xf2\xe5\x74\xca\x22\x51\xb8\x03\x75\x4e\xb5\x4d\xd8\x97\x39\x80\x6d\xcb\xbf\x09\xca\x5d\x10\x3b\x84\x67\xf6\x84\xcb\xf0\x64\xa2\xd2\xd1\x2c\x22\x09\x24\x51\x07\x65\x0e\xe1\x85\x5d\x2b\xd1\xff\x8f\x25\x20\x52\x63\x7d\x54\x36\x8b\x71\xa2\x89\x17\xaf\x75\x23\xe8\x6b\x6b\xff\x53\xe0\x40\x7c\xef\x2e\x38\x9e\xc4\x44\x98\x31\x79\x93\x9d\x37\x24\x02\x73\x20\x9f\xb3\x84\xc7\x0e\x1e\x52\x92\x0c\x83\x00\xa1\x99\xc1\xd1\x88\x0d\x5d\x35\x7f\x1b\x87\x08\x1f\x19\xcf\xcb\x14\x47\x06\x15\x51\xa2\xaf\x3f\x9f\xe8\xdf\x0e\xd0\xe2\x04\x92\x10\x0e\xd0\x6f\x27\x16\xc4\x06\x0b\x35\xd6\x3f\xbd\x77\xb2\xb6\x6d\x02\x06\x4d\x25\xfa\xea\xf8\x11\x0b\x53\x04\xf8\xd8\x8c\xe8\x2b\xcb\x59\x7d\x5d\xb0\x50\x36\x4f\x38\x7f\xb0\x09\x1a\xb5\x0f\x8f\x1d\x20\x16\x90\xb7\xf7\x9b\x98\xad\xf7\xf9\xf2\x0a\x1d\xc2\x0b\x04\x1d\x65\x13\x74\xf4\x77\xc9\x19\x3a\x5a\xe0\x34\xb1\xbf\xba\xa7\x36\x7f\x04\x4b\x9b\x53\x1d\xfb\x20\x9f\x64\x61\x2c\xa5\xdf\x27\x7c\x02\xb3\xfa\xe4\x66\x6a\x32\x30\x60\xa0\xc5\xed\x53\x5c\x58\x76\x22\x56\x92\x32\xb0\x3e\x29\x57\xe6\x15\xe0\x71\x4d\xb3\xfa\xec\x87\xf4\xdf\xc6\x2f\x0c\x8b\xe2\x92\xc0\x8d\x71\xd8\x47\xaf\xe9\x46\x3f\xa3\xaf\x2d\x0b\x7a\xaf\xef\x18\x9b\xee\x62\x96\xa1\xa9\x83\x85\xef\xe0\x97\xa0\x03\xca\x90\x49\xeb\x5f\xf2\xe5\x6f\xc7\x47\x47\x47\xfe\xeb\x4b\x3d\x95\xff\x17\x51\x25\x49\x32\x35\x2d\xb9\x1b\x6c\x31\x62\x9f\x1c\xf0\xbc\x33\x5e\x17\x50\x7b\x99\xe0\x8a\x47\x3c\x41\x87\x85\x41\x37\xe6\x91\x44\x7f\xd0\x62\x6d\xb0\x94\xf0\xa3\xd6\xe3\x5a\x60\x30\x0d\xd2\xed\x0b\x1d\x2a\x6b\x10\xaf\x1e\xab\x10\x5d\xcb\x2b\xb6\x58\x86\x55\x0c\x80\x16\x34\xe5\x1c\x5b\x04\x2e\x08\xc0\x05\x24\x60\xfd\xa8\x05\xe0\xac\x31\x15\xaa\xf9\xa6\xac\xb1\xdb\x02\xe7\xcc\x90\x75\xcb\x02\x58\x18\x2a\xcb\x19\xcc\x3c\x0f\x42\xf7\x89\xbe\x5c\x58\x08\x85\x2e\xf3\x34\xc5\x62\x71\x5c\x9c\xb6\x3a\x71\x16\x75\x4d\x80\xc7\x24\x6e\x01\xc0\x85\x9b\xd8\xa3\x65\xa3\x18\xac\x78\xe9\x6e\x34\x7f\x76\x23\xa8\xe5\x06\x01\x79\xa6\x92\x21\x61\x11\x8f\x2d\x5d\x17\xe8\x05\x65\x89\xc5\xbf\x53\x97\x55\x5c\x44\x8c\x2c\x8c\x71\x4c\x19\x64\x0d\xfb\x86\xfb\xb8\x85\x7d\xf3\x31\x54\x05\x25\xb3\x35\xdc\xa3\xe7\x57\xb7\xee\x9b\xee\x97\x2e\xac\x43\x59\x64\xc7\x4e\x4b\x74\x16\x09\x81\x9f\x8a\xeb\x17\x62\x3b\x8c\x75\x26\xf7\xd8\x0e\xe6\xdf\xa7\xfc\x9a\x26\xfa\xd6\x02\x1a\x3f\x1a\xb1\xd2\xcf\x07\x88\x24\x34\xa5\xcc\xc7\xd6\x19\xe6\xce\xa7\x46\x7a\x7e\xa0\x4a\x6f\x99\x8c\x1f\x34\x07\x73\x70\x4b\x81\x4a\x35\x60\x0b\x47\x3a\xde\x31\x15\x84\x84\xcb\x40\x47\xd7\xc2\xac\x6e\xe2\xd0\x0a\xa4\x34\x20\x3c\x38\xbf\x23\xa6\x5b\x73\x67\xa9\x08\x17\x0e\xda\x0b\x9a\x3b\x74\x80\xe0\x01\x07\x80\x3e\x4a\x31\xbf\x5e\xfe\x6d\x10\x50\x86\x2c\x4f\xb7\x4d\x56\xb4\xe1\xc3\xaf\x65\xa6\xbb\x16\xc4\xdd\x54\x36\xf1\x95\xb0\x3c\x75\x07\x6a\x9d\x7c\x00\x2b\xfe\xc4\x24\x4a\xb0\x01\x90\xd1\x0d\x41\xe4\xe3\x81\x71\x90\x66\x41\x5f\xe6\x7a\x31\xdd\x98\x1a\x23\x09\x61\x5f\x9b\x7f\xbf\x47\xf6\x6e\xf8\xe6\xc0\xde\xe7\x42\x3a\x04\x64\xbb\xe7\x50\xa3\x8e\xc4\xc6\x86\x0e\x68\xb1\x33\x2c\x62\x63\x2d\x0f\xb5\x0a\x83\x00\xa1\xe5\xaf\x05\xcf\xd1\x13\x95\xf3\x11\xbb\xe3\xce\xe0\x88\x18\xf7\x78\xbb\x07\xa0\x8c\xd6\xfa\xc3\x12\x98\x00\x8c\xba\x89\x02\xb6\x4d\xb1\x32\x51\xb0\x63\x48\x08\xda\x0a\x57\xe8\xae\xf0\x55\x38\xff\xb5\x20\x26\x9f\x18\x6e\x8a\x67\x4b\x99\x1a\x96\x92\xa4\xd4\x5c\xf0\x27\xb6\x29\x64\x97\xbf\xd5\xa0\x15\xa7\x71\x06\x68\x12\xa5\xb5\xf7\x28\xb6\xcf\x91\xe7\xd6\xe9\xee\x0f\x72\xd8\xa8\x0f\x30\xc6\x68\x26\x78\x9e\x79\xc8\x15\x97\xd4\x66\xb6\xc1\xca\x34\xe7\x6c\xca\x4f\xac\x4e\x75\x41\xd9\x83\xa1\xf8\xe7\xda\xa3\x33\x97\xd1\x16\xa2\xab\xb9\x2a\x95\x30\x87\x43\x44\x59\x94\xe4\x70\xf1\x49\x85\xa3\x07\x03\xb6\xdc\x66\xf4\xd5\xdf\x8c\x57\x27\xe3\xb7\x48\x4c\x79\x92\xd8\x6e\x8b\x0b\xb4\x28\xe3\xfb\x48\x31\xc2\xe8\xfe\xe6\xbc\xb9\xef\x07\x5a\x77\xe6\x34\xdf\x9e\x65\x02\x81\xff\xf9\x91\xae\x15\x77\x59\x41\xab\x2b\xe7\x03\x7a\xe3\x52\x1b\x16\xaa\x26\xd2\x8f\x58\x91\x6d\x33\x69\x0d\x34\xd7\x1a\x91\x7a\x35\xcc\xb3\xa5\xd6\xe3\x2d\x01\xc3\x0a\xb0\x2f\x08\x0d\x6a\x47\x2e\x0b\x83\xb5\xe0\xe1\x1a\xd8\x3f\xf0\x7e\xb7\xf9\x54\xde\x5d\x31\x9d\xe5\xc3\x4c\x08\x59\x03\xad\xe6\x56\xbf\xde\x71\x90\xa5\x57\x97\x8d\xf1\x09\x1b\xf4\x79\x27\xb1\x16\x96\xc0\x38\x2f\x15\x98\xef\x44\xd0\x8e\x1c\x8d\x78\x2d\x7d\x8e\x88\x1f\x89\x0b\xc3\xf1\xb2\x98\xeb\x77\x06\xbe\x2d\x5e\x02\xb7\xf7\x16\xda\x06\xc2\x0f\xc4\xd6\x2d\xc3\x26\xb4\xf8\x35\x4e\x3b\xa7\x22\x17\x1d\x9f\xd9\x8f\x3f\xd5\x52\x91\x3d\x2b\xfa\x64\xd3\x8f\x2d\xf0\x56\x8a\x99\x3e\xd9\xae\xd7\x16\x23\xa4\x91\x08\x37\x1a\xd2\x7d\xb6\xd1\x80\x4c\x8f\x1d\xeb\xbe\xd9\xae\x5c\x2b\x4f\xc6\x0e\x8f\x13\x63\x67\x52\x73\x30\x41\x14\xf5\x52\x34\x47\x2b\x9b\x22\x4c\x6d\x95\x04\x8b\x99\x51\x90\x24\x51\xf2\x7d\xc3\x0e\x17\x39\x0f\x5b\xec\xf0\x06\x35\x29\x43\xbf\x27\x88\xdf\xcb\x4e\x9a\x1f\x65\x19\xf3\xd3\xdf\xca\xbe\xba\xab\x15\x9a\xa8\x0c\x91\x19\x23\x2e\x04\x20\x69\xc7\xfa\xac\xb4\x63\x6e\x6d\x59\x9b\xf8\x12\xa7\x1e\x51\xc6\x55\x48\xb5\xf9\x5d\x66\x70\x13\x02\x70\xb5\xed\x63\xd8\xba\x08\x71\x38\x04\x5b\x14\xb0\x6d\x04\x23\x36\x70\xaf\x78\x54\x0a\xd0\xed\x84\x11\xc0\x21\x3e\xd4\x44\x43\x83\x7e\x85\x8b\x55\xb7\x93\x6b\x4b\x8b\x5f\x33\x79\xb3\x5a\x47\x59\xeb\x77\xfe\x36\xb2\x15\x53\x3c\xb4\xe6\xd2\x6a\x35\x8f\xeb\x57\xba\x6f\x06\xf6\x8a\xaa\x95\xc8\x9b\x3a\x5e\xad\x4b\x39\xc4\x21\xdb\x50\x58\xfc\xdc\xc4\x90\x26\x8b\x82\x4c\xf5\x8a\x1b\x9d\xbc\xd2\x59\xfd\xb4\xaa\xad\xb8\x31\xc5\xe9\x58\xf0\xf6\x72\x3e\x1d\x96\xc9\x35\x51\xb2\xef\xcc\x4d\xd9\x81\x05\xfa\x47\x8e\x13\x73\xb9\x31\x4b\x8e\x6e\xd8\x20\x2a\x7f\xf7\x67\x34\x80\xdb\x07\x7d\x02\xbe\x08\x0e\x7e\x68\x4d\x71\x44\xd3\x8c\x08\xc9\x19\x6e\xad\x6b\xf5\xf0\x17\x39\xb6\x35\x43\xc6\x38\x82\x34\xe9\x2d\x66\xd2\xd0\x5a\x38\x29\x8c\x1e\xf2\x09\x11\x8c\x98\xda\x5d\xf0\x1e\x72\xef\x75\x1a\x2e\xc7\xb9\x9a\x7f\x37\x8e\x12\xda\xb9\x90\x09\x64\x17\x0d\xf4\x67\xa7\xe6\xab\x65\x13\x28\xb5\x5f\x1a\x3a\x43\xe6\x19\x32\xcf\x8e\xd0\xf7\x38\x7a\x20\x2c\x46\x59\x92\xcf\xa8\x05\xa3\x81\x1b\x0a\xd8\x65\x60\x9e\x2d\x4f\xcc\xc8\x16\xa6\x7d\x7d\x0d\x8d\x58\x8a\x1f\x0c\xb6\xac\x15\x22\x23\x9c\x24\x6b\x99\x19\x3c\x3d\xd4\x50\xb9\x1c\x72\x8a\xaf\x93\x66\xce\x87\x32\xe7\x03\x0c\xaa\x80\x40\x9c\x33\x84\x01\xd8\xeb\x2b\x89\xf2\xcc\x49\x40\x60\xe9\x4b\xc0\xef\x6a\x26\x09\x05\xf0\xa9\xd6\x83\xe6\x64\xc4\x20\x96\xd5\xb5\xb8\xf0\x5c\x25\x74\xf5\xfb\x90\x93\xa6\xc3\x37\x35\xb0\x36\xdb\x79\x11\x6b\x00\xc6\x2b\x28\xa1\x63\x9c\xae\x9a\x13\x06\x06\x88\xf5\x40\x48\x36\x8d\xc9\xb5\x82\xa6\xb7\x98\xfa\x25\xcc\x19\xb5\xa5\x73\x0a\x94\x08\x17\x2e\xe7\x3c\x49\xc5\xf7\x54\x22\x89\x15\x95\x53\xda\x68\x98\x09\xc1\x84\xb6\x59\x75\xbc\x1e\x82\x51\x03\x7a\x51\x65\x2d\x7c\xdc\xff\x11\xfa\x00\x76\xa6\x40\xf6\xe6\x1e\x0b\xa8\x8d\x25\xa8\x39\x69\x05\xc5\xdd\x45\xc0\x8c\x9b\x41\xf0\xfe\x52\xf3\xa1\xcf\xf1\x38\x42\x83\xc2\xbe\x6f\xd0\x90\x8c\xe5\x7e\xc5\x8c\x48\x22\xc9\x26\xc4\xd7\xc9\x14\x06\x3e\x70\x20\x20\x04\xb2\x8a\xd4\xbf\x17\xd0\xe9\x7e\x98\x4f\x90\x46\x89\x1f\x08\x5b\x66\xef\xe8\x3e\x42\x63\x90\x5a\xaa\x74\x7b\x4b\x17\x37\xc6\xae\x4d\x06\xd8\xfd\xd8\x15\x00\x54\x74\x7a\xac\x97\x5c\x0b\xfa\xd1\x83\x4d\xde\x30\xf6\x4e\x0b\x61\xf5\x34\xe7\x32\x3c\x67\x6e\xff\x8c\xae\x28\x72\xe2\x92\x34\x20\xf9\xc5\x2f\xb0\x89\x7a\x61\x3c\x44\xb8\x82\x51\xfb\x43\x6a\x6c\xb9\x7e\xbf\x91\x63\xa1\xb0\x0c\xe0\x27\x72\x4d\xd5\x4f\xf3\x8f\x7f\x91\x57\x70\x62\x77\x91\x0b\xdf\x5c\xf8\x71\xfb\x38\xf4\x0d\x2d\xf0\x3e\xc2\xaa\xa8\x1a\x89\x63\x8f\xde\x90\xf1\x18\x15\xe4\xb5\x7e\x89\xc8\xd7\x9f\x56\xa5\xb4\x64\xa7\xb9\xad\xa2\xec\x4f\x81\x9b\x1e\x4d\x72\x6a\xaa\x34\x97\x44\x2e\x9b\x2f\x09\xda\xaf\xbd\xfe\xa9\xf4\xf7\x49\x33\x8d\x5d\xf3\x78\x1b\xc2\x5a\x1f\xf0\xb4\x4e\xd7\x1d\xa2\x78\x65\x53\x55\xe9\x25\x2b\x91\xf1\xf6\xf8\xcb\x78\xdc\xbd\x0e\x33\x38\xdc\x27\xf9\xf4\x16\xca\x6a\xb4\x61\x42\x38\x9c\xc9\x39\xf1\x49\x5e\x7a\x9f\x75\x37\x3e\xe5\xa0\x6d\x53\xac\xff\xb6\xb8\xfe\x31\xfa\x3f\xb7\x57\x97\x87\x29\x16\x72\x8e\x21\xe7\xd6\xb5\x75\xe0\x4a\x55\x19\x05\xd4\xf9\x95\x28\x1b\xb1\x43\x34\xe3\x07\xc6\x8b\x79\x82\xe6\x4a\x65\xf2\xe4\xf8\x78\x46\xd5\x3c\x9f\x1c\x45\x3c\x3d\x2e\x96\xe6\x18\x67\xf4\x78\x92\xf0\xc9\xb1\x20\x10\xc7\x7a\xf8\xed\xd1\x77\xdf\xc2\xce\x1c\x3f\x7e\x7b\x0c\xbe\xab\xa3\x19\xff\xc3\xc5\x77\xff\xeb\x4f\x7f\xd6\x0d\x67\x0b\x35\xe7\xec\xc4\xba\x48\x97\xb6\x7d\x68\xe4\xde\x63\xf3\x49\xa5\x97\xff\x75\xf4\x4d\x38\x0c\xfb\x6a\xca\x63\x92\xc8\xe3\xc7\x6f\xc7\x6e\x63\x8e\xb2\x75\x9c\xbe\x05\xbf\xf7\x2b\x5e\xa9\x41\xae\x7f\xff\xff\xd8\xfb\xb6\xe6\x46\x72\x23\xdd\xf7\xfd\x15\x88\x38\x0f\xdd\x7d\x82\xa2\x7c\x89\x8d\xf0\x99\x88\x7d\xe0\x48\x6a\x0f\x6d\xb5\xd4\xd6\x65\xda\x7b\x96\x1b\x1c\xb0\x0a\x24\xb1\x2a\x02\xec\xba\x48\x4d\xaf\xfd\xdf\x4f\x20\x33\x71\xa9\x2b\xab\x48\xaa\xbb\xd7\x67\x1e\xec\x99\x11\x49\x14\x0a\x97\x44\x22\xf3\xcb\xef\x73\x2b\xc6\x86\xfa\xf6\xcd\x4a\xc3\x56\x09\x51\xca\x47\x6c\x98\x27\x51\xcb\x83\x0f\xb8\x80\x39\x47\xaa\xe5\x4a\x3f\x54\x1c\xa2\xd5\xb5\x19\x54\x94\x09\x59\x67\x19\x01\xf1\x38\x86\x20\xb6\x5c\x36\xa1\xdb\x08\x5d\x71\xcc\xf8\xbd\x26\x85\xfe\xa9\xb9\xf3\xe9\x75\x0f\xe4\xcd\x4f\xf0\xd7\x16\x0b\xa2\x5f\x2c\x5f\xfe\x29\x58\xe6\x7b\xea\xf9\x39\xf2\x6c\x5c\x3c\xd0\x17\xdb\xaf\x96\x6e\xac\x79\x76\x18\xa8\x68\x82\x14\x63\x2e\x2f\xe0\x54\x88\xe9\x81\xd6\x54\xda\xaa\x6d\x10\x8b\x25\x72\x98\x6d\x91\x6e\x75\x26\xb2\x31\x7b\x5f\x11\x3c\xf3\x40\xa9\xbb\xf7\x17\xec\xb7\x7f\xf8\x3f\xbf\x9f\xa9\xb7\x0d\x56\x0c\x90\x1b\x3a\x5d\x11\x6e\x0b\x6c\xd7\x86\x67\xb9\x48\xcf\xd3\x65\x74\x8e\x40\x90\x73\xf3\xfb\x33\x7a\xe8\x99\x5e\x9e\x39\x0a\xed\x33\x62\x13\x1e\x6f\xe2\x61\x05\xcd\xa5\xa5\x87\xb0\x29\x02\x5c\x67\x00\xce\x46\xea\x13\xbd\x74\x62\x09\x88\xab\x47\x5d\x15\xbd\x6c\xf8\x17\xd0\x06\x7f\xe7\x08\x97\x78\x66\x9f\xe1\x19\x50\xda\xb7\xe6\x69\xd8\xf4\xed\x12\x79\xcd\x6b\x9b\xb5\x25\xa1\x73\x36\x64\xe0\x9b\x37\x9b\x87\xbd\x63\xfd\x37\x89\x4b\x23\x1b\xb9\x56\x42\x2f\x01\x35\x04\x7e\x81\xcd\x8a\x42\x6c\x48\xe9\x3c\xa8\xf5\x4e\xc5\x16\x0f\x98\x50\x8c\xba\x61\xb8\x8f\x64\xe4\xdf\x37\xce\xaf\xc1\xc8\x7f\xec\xb8\x93\x41\xf9\x46\x03\x7e\x2c\x74\x09\xb7\xd2\x90\x2c\xae\xf9\xfe\xde\x8c\x8d\xb3\x03\x90\xa2\x09\xf5\x9f\x91\xdb\x08\x8a\x15\xc4\x59\xae\xcf\x80\x24\x03\xa8\x17\x50\x23\xa3\x2d\x8d\x0b\x99\xae\x21\xc7\xa4\xf9\x7e\x8f\x7e\x62\xfa\xf3\x4b\xd0\x51\xf2\x49\x32\xa4\x0c\x24\x08\x88\x54\x4a\xa4\x14\xc3\xdf\x7b\xa2\x0e\xcc\x83\x85\x53\xd9\x8d\x00\xf1\x7e\x79\xa8\x5f\xe0\xf0\xbf\x3c\x30\x02\x63\x06\x55\x18\x6b\xbd\xd1\xc6\x9d\xd1\x45\x16\x7c\x88\x55\x3c\x70\x08\xb7\x13\x31\xf3\x2d\x92\x62\x7d\xbb\xb7\x31\x5b\xcb\x7c\x84\x21\x8e\xf0\x4b\x83\x24\x61\x16\x65\x11\x8c\x3d\xfd\x77\xea\x05\xdd\xeb\x06\xb2\xac\x1b\x08\x29\x83\x62\x24\x71\x92\xcb\xbf\x99\x1b\x8c\x59\x52\xae\x62\xc6\x9d\xdc\x08\x0a\x40\xee\xb7\x90\x5e\xd2\x7a\xf3\xad\xd5\x99\xc5\x66\xe0\x1c\x38\x50\x63\x9f\x09\xe0\x0a\x61\x7e\x16\xdf\x77\xd6\x08\xf0\x6b\xdb\x97\x56\x9f\x31\x9e\x5b\x7e\xc2\x61\x5d\xbd\x77\x0d\x10\x15\x61\xbd\xdf\x9e\xde\x05\xd0\xa0\x38\xc6\x68\x10\xac\x6f\xd1\x92\xe4\x57\xc3\x37\x23\x08\x02\x0d\x19\x3b\x78\x08\x2e\xce\xda\x08\x06\x7b\xa1\x6d\x00\x87\x05\x1c\xba\xee\xef\x4d\xf0\x61\x64\xc4\xf2\xd5\x02\xa6\x97\xb5\xcb\xa3\xfb\xe1\xb3\x17\xa3\xdd\x6d\xc5\x88\x2d\x0a\xf8\xfc\xe6\xf6\x21\xcc\x0e\x4b\x7c\xdb\xb3\x68\x2d\xa2\x27\x28\x1c\xc4\x23\x0f\x37\x83\x15\x22\x5e\xec\x66\xca\x4b\xd5\xe5\xda\xa6\x3a\x77\x8e\xbd\xdf\x29\x58\xe8\x94\xc5\x32\xdb\x26\x7c\x07\x49\x25\x85\xb8\x60\x9f\x90\x72\x80\x7a\x63\x0a\xf6\x45\xcf\xfa\xcf\xb4\x99\x95\x89\xff\xdd\xd0\xb1\xe4\xe9\x42\xe6\x29\x4f\x77\xcc\x0f\x66\xdd\x1e\xb0\x4c\x6c\xb8\xca\x65\x34\x53\x1b\xc1\x55\x88\x02\xa2\xa4\x9a\x19\xe4\x58\x0b\xe2\x27\x5d\x2e\x45\x94\x7b\x82\x33\x70\xde\xdd\x48\xed\xdb\x83\xc3\xde\xdd\xed\xbc\xce\x57\xff\x49\x2a\x2c\xa7\x95\x1b\xc0\x98\xd1\x1a\xa2\xa3\xf1\xc0\x50\x36\x48\x1b\xd2\x91\x6b\x2f\x83\xf0\x5f\x76\x4d\xb1\x85\xc8\x5f\x04\xd4\xef\x52\xc1\x51\x93\x8f\x7f\xb4\xbc\xc5\x71\x22\xa0\xcd\xf2\xa9\x01\xf2\x04\x37\x58\x08\x5e\x71\x44\x23\xaa\xc2\x18\xf2\x86\x4a\xa0\x20\xda\xf3\x86\xe0\xef\x6f\xe0\x98\x36\xb7\xc7\xf4\x59\xc4\x33\x55\xa6\x71\x21\x9f\xd1\x6f\x38\xe6\x85\xdb\x4e\x63\x6d\xec\x18\xf7\x8a\x6c\x5e\x41\xe9\xba\x27\xad\x73\x45\x3e\x1d\x42\x72\xf8\xd2\xaf\x79\xab\xb2\x1a\x96\xa1\x77\xdf\x03\x02\x22\x32\x2b\xcc\x44\x3a\x8e\xa5\xec\xb2\x5b\x94\x8e\xa4\x02\x19\xac\x1c\xe0\x8e\x8a\x21\x6a\x15\xbf\x4d\x6d\xcc\x94\xad\xde\x5c\x16\x09\xb2\x12\xb6\x49\xdb\x11\x67\x8d\x45\x9a\x7f\xbb\x8a\x03\x17\x57\x63\x81\x16\x9e\x4b\x02\x07\xe0\x47\xb4\x75\x76\xd5\x0b\x95\x21\x9b\xbd\x95\xc1\x82\x02\xec\x95\xc8\xe1\x34\x8f\x8b\x04\x8b\x11\x21\xbd\x0f\xfc\x37\x3c\x49\x98\xcc\xb3\x99\x72\x74\x3d\x48\xbe\x0c\x16\xd6\x02\x17\x63\xba\x72\xc1\x23\xa0\x59\x92\xf0\x06\x3f\x4c\x46\x32\xaf\x41\x46\x77\xa1\x74\xcc\x76\x2b\x38\xd6\xce\xe0\xb4\xcd\x54\x78\xe7\xaa\x4e\x02\x15\x9a\x80\x54\xf1\x29\x6a\x3e\x3a\x10\xc0\xa0\xef\x3c\x78\x4a\xc6\x6c\x82\x6f\x67\x2e\x5c\x56\x15\x16\x7b\x4b\xf5\xba\x84\xec\x32\xb7\x9a\x3c\xb3\xa5\x36\xfe\xde\xba\xe5\x69\x2e\xa3\x22\xe1\x69\x02\x1c\xd8\xcb\x22\x61\x72\x19\x08\xdc\xc2\x1c\x20\x59\x8b\x99\xae\x48\xc3\x59\x6d\x33\x42\x19\xdf\x88\xa0\x4e\x94\xc2\x3b\x49\x90\x51\x46\x06\x5a\x4c\x55\x9a\xb6\xde\x8d\xd9\x65\x55\x68\x1a\xf6\x44\x40\xf2\x26\x33\x34\x7f\xae\xbf\x41\x89\x13\x0a\x56\xcb\xa5\xb9\x52\xbe\x09\x76\x5d\x97\xf8\xc9\xb0\x74\xb5\xa5\x0a\xef\x46\x29\x36\x96\x38\x3e\x80\xac\x7f\x29\x89\xed\x36\xc4\x3e\xb1\x92\x61\x9d\x0c\x09\xf2\x0e\xe8\xe8\xa7\x40\x37\xbf\xda\xd9\x4d\x87\x9e\x2e\xcc\xe3\xc0\xae\x06\xea\x54\xc3\x3b\x1a\xac\x9c\x10\x9c\xd0\x67\x64\x57\x3c\x1f\x8a\x54\x70\xe0\xff\xe1\x1d\x6d\x44\x85\xb4\x76\x73\x7f\xa4\xe9\x53\x49\xce\x8a\x99\x5e\x99\x5b\xbe\x40\xd4\x8d\x5e\x06\x26\x98\xce\x1b\xd2\xbd\x02\x2a\x68\x67\x13\x16\x82\x25\x52\x3d\xd9\xc2\x6f\xb3\x40\x47\x8c\xfb\xd6\xc1\x46\xe0\x20\xe3\x9e\x6b\xf1\xbc\x9a\x88\xd3\x8f\x70\xc6\xfa\x95\x4f\x35\xdf\x90\x4f\x2e\xea\xd3\x7f\x5a\x3a\x71\x9e\xee\xce\x63\xc1\x9d\x15\x35\x1f\x84\xa2\xed\x1b\xdf\x8f\xeb\x32\x82\x69\x80\xcc\xc8\xe3\xcd\xe5\xd5\xfb\xe9\x4d\x59\x1b\xe4\x2f\x8f\x57\x8f\xe5\xbf\xdc\x3d\xde\xdc\x4c\x6f\xfe\x18\xfe\xe9\xfe\xf1\xe2\xe2\xea\xea\xb2\xfc\xbd\xf7\x93\xe9\x75\xe5\x7b\xe6\x4f\xe5\x2f\x4d\x7e\xbc\xbd\xab\xa8\x91\x58\x29\x91\xe0\x4f\x0f\xd3\x0f\x57\x97\xf3\xdb\xc7\x92\xa0\xc9\xe5\xbf\xdf\x4c\x3e\x4c\x2f\xe6\x0d\xfd\xb9\xbb\xba\xb8\xfd\xf9\xea\x6e\x8f\x1e\x89\x7f\xdf\xc6\x21\x3d\x05\xf4\xe4\x60\x75\x9a\x09\x5b\xa6\x52\xa8\x38\xd9\x21\x32\xd6\xde\x03\x2b\x40\xbc\xf0\xa4\x92\x1b\xa1\x8b\x63\x00\xae\x0f\x6b\xc1\xf4\xb3\x48\xa1\x46\x1d\x5b\xf3\xb2\x59\xad\x0c\x66\x79\x5a\x8f\xa1\x77\xe2\xf8\xf3\x74\xe7\x2a\x45\xba\xba\xe3\xf9\x4d\xe8\x21\x6c\x2b\xd2\xae\xbe\x80\x1f\x91\x16\xdb\x5c\x2e\xda\x21\xcb\x3d\x79\x3f\x86\xdf\x54\x91\x8d\xab\x99\xba\xe0\xa6\xd9\x30\x96\x90\xbb\xc7\x80\x16\xa1\x85\x43\x45\x97\xdc\xaf\x2d\xd0\x6b\x5b\x2c\x12\x19\x31\x19\x57\xa3\x0f\x58\x60\x82\x01\xd6\x2a\x69\xdf\x56\xa4\xe0\xd8\x19\x7f\x79\x9b\x8a\x33\x5e\xe4\x6b\x24\x98\x21\xa0\x30\x51\x2c\xcf\x54\x26\xa2\x54\xe4\x56\x93\x4a\xc4\x56\x6d\x27\x78\x12\x74\x86\xea\x2b\x63\xa0\x72\x18\x07\x04\xca\x2d\x11\x75\xfc\x25\xb6\x3e\x20\xa4\x88\xdf\xef\x1c\x1a\xea\xb1\xcc\xaa\x52\xdd\xe0\xc2\xe2\x87\x56\xb3\xc7\xbc\xb7\xb1\xd4\x4e\xb3\x06\x27\xd9\x22\xab\x9b\x5f\x63\xdf\x1a\x0b\x17\x4a\x19\x08\x4d\xad\xd3\x47\x17\xa9\x80\x43\x84\x12\xe7\xf6\xb6\x0f\x40\x0f\x42\x62\x03\x00\xdb\x5c\x6c\x16\x62\xcd\x93\x25\xc6\xf0\xcc\xd4\xf8\x7d\x55\x5f\xa2\x0f\xfa\x49\xa8\x3b\x9c\xb0\x6f\x62\x0e\x15\xde\x13\x7c\xc5\xad\x8b\x9f\xf8\x80\x9f\xe9\xa3\x5d\x55\xb6\x12\x05\x9c\xa7\x1c\xbd\xea\xe0\x63\x84\x83\x7b\x3e\x4d\x5b\xc4\xb2\x5c\xca\x2f\xa6\xc1\x99\x12\x8d\x8c\x82\x80\xae\xb1\xdc\x27\xce\x2e\x03\xa3\x16\x12\x48\x3c\x09\x05\x6a\x3f\x28\x26\xbd\x77\xcd\x0e\x8b\x36\xd7\xe7\xa2\x23\xfc\x0d\x11\x32\x59\x12\x41\x0a\x73\x22\x76\x9c\xa0\xe4\xec\x49\x8c\xd9\x25\x95\xc5\x9b\xbf\x5c\x5c\x4f\xaf\x6e\x1e\xe6\x17\x77\x57\x97\x57\x37\x0f\xd3\xc9\xf5\x7d\xdf\xed\x77\x8a\xaa\x85\xca\xee\xab\x16\x8e\x38\x0b\x71\x4e\x3b\xcf\x17\xcf\xb9\x97\xf2\xdb\x0e\xa6\x64\x7f\xef\x65\xbc\x9d\xc7\x32\x8b\xcc\xf1\xb7\x9b\x0b\x15\x03\x15\xeb\x41\x4b\xb5\xb9\xa9\xea\x5b\xb8\x6f\x30\xf7\x0d\x6b\x41\xf0\xb4\x7b\xb6\x2b\xda\x7d\x0e\x5c\x6d\x10\xb4\x4b\x85\xd9\xfc\xf1\x4c\x05\xa7\xcd\x78\x3f\xff\xbe\x69\xee\xb8\x77\x2b\x37\x51\x7d\x27\xec\xaf\xcc\xb2\x82\x1b\xfb\x68\xbf\x06\x6c\x0c\x2d\xa3\x42\xfc\x58\x21\x1f\xac\x0c\xb4\x70\x99\xb9\xc9\x6f\xb8\x8a\x79\xae\xd3\x5d\xcb\x2b\xf6\x33\x9e\xe1\xb6\x29\x9b\xd0\xf0\xc8\x56\x42\xc4\x76\x16\xf0\xab\x5c\x55\x97\x12\xb2\xc6\x3e\xdc\xfe\xf9\xea\xe6\x7e\x7e\x75\xf3\xf3\xfc\xe3\xdd\xd5\xfb\xe9\x5f\x1d\xf5\xcd\x96\x67\x4d\xda\x65\xdb\x54\x18\xeb\x62\x8b\xf0\x1b\xed\x0b\x0a\x8a\xd9\x76\x48\x44\x46\x2e\x67\xca\x5a\x96\xd4\x37\xbf\x4e\x75\xb1\x5a\x37\x37\x54\xed\xe5\xc7\xc9\xc3\x4f\x07\x75\x13\x28\x52\x50\x75\x08\x77\x5b\x9d\x47\x50\x2e\xc9\xee\x21\xf9\x60\xa5\x7b\x40\xf4\x03\x5f\x6d\x8a\xc9\xb7\x58\xb4\x83\x6e\x2f\x75\xa3\xd5\xe9\xfc\x37\x7c\xbd\x6d\x01\x3d\x04\x76\xb3\x74\x8c\x00\x82\x15\xc5\xeb\x6a\xad\xfd\xd0\xf0\xb7\xd2\x09\xf6\xbb\xb3\x44\xac\x56\x22\xc6\xe5\x55\x6d\x98\x22\x56\x64\x02\x23\x7f\xae\x37\x8d\x22\xc9\x4b\x1d\x71\x30\x3b\x74\x54\x7f\x03\xfe\xd1\xfd\xa4\xd9\x56\x5c\x58\x09\xf4\x48\xab\x2c\xe7\xaa\x25\xed\xfa\x5c\xc7\x33\xf6\x32\x45\xb7\x29\x73\x85\x13\x14\x20\xb1\x01\x76\xbf\x0f\x0e\x49\x38\x91\x8c\x96\xa2\x88\x47\x20\xaf\x15\x68\xb6\x37\x4c\x02\x44\x1a\xef\xac\x45\x7c\xfd\xe0\x46\xe7\xd5\x89\x78\x61\x20\x30\x8a\x3a\x26\x44\x59\x8a\xd1\x20\x10\x07\x6a\x85\xd1\x0e\x9a\x90\xca\x93\x7f\xa6\xa1\xc7\x5b\x6b\x39\x30\xcb\x2d\xf3\x92\x9b\x20\xe7\xbc\x0d\x8f\x6f\x95\xfc\x70\xdf\xf2\x36\xd5\x71\x11\x59\x6e\x0a\x68\xd6\xe3\x41\x28\xa0\x65\x0f\xd8\x98\x9d\x99\x69\xa6\x4b\x8a\x88\xcf\x80\xe1\x63\xa6\xda\x92\x2f\xa1\xa6\x76\xc3\x0a\xf8\x68\x4f\xad\x63\xe6\xbe\x61\xf4\xdb\xb7\xa0\x1d\xec\x7e\xf5\x67\xcc\x7e\x1d\x9c\xbd\x16\x38\x0d\xcd\xcb\x82\x63\x66\xb5\x7c\x1c\xb7\x95\xa2\x3b\xab\x3a\x0c\xf5\xd3\x0f\x34\x51\xa6\x76\xc2\x23\x72\xcd\xb3\x40\x43\x3e\xec\x38\xbc\x4d\x99\xbe\xa9\xda\x5d\xe7\x09\x1e\x17\x21\xe8\x95\x5f\x19\xe1\x9d\x5a\x66\xd4\xfb\x50\x8a\xc7\xe9\x8a\x0d\x5b\xf8\xa1\x73\xe4\x2e\x2f\x68\xf7\xc0\x60\x25\xbc\x50\xd1\x9a\x6d\x13\x8e\x35\x97\x6b\x9e\xe1\x92\xb6\x20\x03\xbe\x90\x89\xcc\x81\x2e\x02\x73\x5f\x95\x11\x36\x37\x1a\x9e\x3e\x59\x86\x46\xee\xb9\x41\xba\x16\xfd\x91\x60\x4e\xf7\x56\x5f\x15\xce\xe9\xb7\x6c\xf0\x8b\xce\xcc\x99\x5f\x96\x04\xe5\xf4\xd3\x61\x2c\x1e\x2c\x4b\xff\x2e\xc3\x66\x96\x5a\xfc\x58\xfd\x79\x69\xbc\x1b\x0e\xea\xe1\x50\x06\xa2\x1e\x1e\x60\xe6\xab\xc4\xc4\x8d\x3b\x6b\x99\x68\xde\x22\x8e\x69\xdb\x46\x9e\xe1\xb6\xb6\x63\x5d\x2c\xda\x98\x2d\xb1\x57\xdd\xad\x77\xc5\xfd\xed\xbe\x3d\x55\x5c\x30\x34\x80\x3c\x17\xb9\x1c\x16\xda\x08\x5e\x9a\xe7\xe2\x0c\x7e\xde\xdc\x38\xb1\xfe\xf4\x7e\xe7\xda\x42\xf3\x6c\xf7\x8e\x3f\x13\x40\x66\xf5\xd5\xf5\x97\x82\x1b\xd3\x70\xbb\xbc\x47\xfe\x82\x63\x16\x59\x2e\xeb\x2b\xac\x79\x27\x56\x9f\xfa\x50\x4e\xaa\x84\x6b\xa0\x77\xed\x5a\xd3\xdb\xdc\x9b\x5f\xf7\xdf\x90\x65\x05\xe9\x6d\x2a\x35\xb0\x0c\x90\x6e\x75\x07\x05\x58\xe3\x73\x8f\x18\xc9\xcf\x85\x28\x84\x59\xfb\x8b\x22\x5e\xd5\x63\x9b\x03\xbc\x33\xff\x4a\x6b\xfd\xc2\x36\x45\xb4\x66\xb6\x71\x16\x8b\x84\xef\x4a\xaf\x06\xfe\x52\xae\x13\x20\xd5\x3c\x90\xe1\x2f\x2a\xb2\x5c\x6f\x00\x84\xe9\xdb\x4d\x0b\x05\x0b\x9e\xf1\x3c\x4f\xe5\xa2\xc8\x1b\x01\x5b\x25\xc6\x9f\x03\x13\x5a\xf7\x1f\xaf\x2e\xa6\xef\xa7\x95\x6c\xd2\xe4\xfe\xcf\xe1\x7f\x7f\xba\xbd\xfb\xf3\xfb\xeb\xdb\x4f\xe1\xdf\xae\x27\x8f\x37\x17\x3f\xcd\x3f\x5e\x4f\x6e\x4a\x39\xa7\xc9\xc3\xe4\xfe\xea\x61\x4f\x5a\xa9\xfe\xd4\xf6\x89\xe0\x01\x21\x91\x85\x85\x5a\x66\x56\x7b\xbb\xa4\xa7\xfe\xc0\x26\x96\x9e\xa9\x44\x20\x66\x53\x83\x90\x79\x47\x9d\x52\xca\x20\x5e\xf2\x9c\x93\xee\xf3\x98\x4d\x98\xd5\xef\x06\x30\x74\x66\x9c\x05\xe2\xae\x31\xb3\x83\x4d\x18\x8f\x21\xf2\x37\x37\x2f\x3d\xa5\x97\xc4\x1a\x95\x88\x90\xa4\xd8\x56\xfe\xcc\xd4\xd5\xb3\x50\x79\x01\x0c\xaa\x3c\x49\xac\xce\xba\xfd\x42\x50\xe3\x69\x7b\x99\xc9\x8d\x4c\x78\xea\x55\x82\x6e\xa9\x2d\x70\xd8\x6d\x5f\x1d\xa5\x47\x5d\x3a\xc2\x5e\x1e\x1e\xa7\x0c\xfa\x7d\x71\x3d\x05\x17\x28\xca\x2d\x05\xbe\x7d\xf8\x4c\x21\x2b\x11\x3d\x71\xc3\x01\xa0\x9f\x6b\x8a\xa7\xe1\xe3\xe9\xcb\xed\x0b\x31\x3b\x66\x13\xdb\xc8\xf3\x6b\x81\x80\x5c\x27\xed\xbf\x5c\xa9\x3c\xdd\xf5\xf6\x6b\x1e\x80\x43\x35\x03\xdf\x94\xf0\x3e\x65\xe5\x20\x0c\x77\x30\xdb\xfa\x0d\x38\x3b\x16\x8c\x46\xd1\x78\x17\x74\x17\xc0\xd3\xda\xe2\x7f\x27\xe6\x10\xfa\x5e\xc7\x21\xa4\x50\x80\x51\x58\xe8\x42\xc5\x19\x21\x93\x36\x52\x9d\x6f\xf8\x97\x77\xf6\x4d\xb1\x24\xd9\xf1\x77\x03\xdd\x8c\x48\xcc\x4d\x64\x67\x8c\x5c\xf7\x70\xcd\x54\xc7\x78\xed\xf7\x16\xad\x65\x85\x6b\x8f\xbf\xa3\x22\xc6\xea\x59\xec\x9a\xe6\xaf\xa6\xc1\x80\x38\x2e\xda\xf0\xd0\xc8\x36\x15\xe6\x8b\x0e\xc0\x95\x20\x2e\xcf\xfd\x37\x00\xb5\x4b\x3a\x51\xcd\xb6\x3b\xcc\xf2\x1e\xb5\x6d\x1a\xf3\xcb\xaf\x20\xa2\x41\x4f\x32\x73\x86\xd9\x66\x1b\xe8\x24\x60\x3a\xa5\xd1\xcc\x64\xfd\x97\x5e\xb0\x25\x54\x69\x90\x0e\x6c\x2a\x20\xb0\x0d\x53\x61\x59\x5f\x81\x94\xa4\x96\xc2\xb6\x4b\x20\x11\x19\x84\x7b\x95\xb9\x6e\x89\xcf\x05\x65\xec\x7e\xfb\x9b\x61\xe7\x6c\x9e\xee\x98\x65\x18\x0f\xab\x44\xa8\x48\x8a\xce\x5c\xe8\x57\xa1\x64\x13\x53\xd1\x5d\xa1\xcc\x51\x7c\x0a\xb0\x43\xff\x6c\x56\xe5\xa1\xf4\x9f\x7b\x0b\x29\x6c\x20\x36\xc5\xef\xbf\x1a\xb5\xdb\xcf\x15\x46\x37\x7a\x1c\xc0\x76\xa9\xf5\xf0\x40\x5b\xf0\xe8\xe9\x85\xa7\x31\xc6\x0a\x01\x7d\x30\x66\x3f\xe9\x17\xf1\x2c\xd2\x11\x8b\x44\x9a\x73\x22\x7b\xc9\x20\xfd\x0a\x1b\x8a\xda\x99\x29\x40\xb1\x23\x73\x8e\x02\x09\xdd\x5c\xae\xd6\xe6\x3e\x19\x24\xcf\x75\x6a\xcc\x51\x8e\x4c\x5a\x5b\x11\x11\xbd\x46\xcb\x00\x2c\x13\xfe\x5c\x67\xaf\x39\xa4\x12\x9e\x4d\x5d\x29\x9e\xcd\x4e\x59\x26\xed\x2e\xb8\x03\x0d\x18\x19\x4d\x24\x44\x18\xb1\x95\x4e\xb8\x5a\x8d\xc7\x63\x26\xf2\x68\xfc\x6e\xd0\x42\xa7\x06\xc3\x7c\x97\x83\xa0\x26\x5a\x67\x22\xd9\x39\x4a\x08\x57\x24\x60\x86\x19\x6a\x44\x32\x89\x21\x8f\x86\xe5\x7f\x5f\xad\xa8\xff\xba\xa1\xf3\xe6\x9b\xea\xe0\x12\xb4\x96\x76\x40\x98\x63\x40\x4b\xf8\xfd\xe6\x9b\xd7\x41\x25\x95\x2d\xac\x8f\x5a\x0d\xad\x13\xfc\x59\xb7\xc9\xcc\x1e\xc4\xd4\xd4\xd8\x12\x11\x39\x1c\x54\x5b\xd5\x16\xb1\xa8\x94\xbb\x1d\x51\xe9\xd6\x51\xb4\x36\xb0\x5e\xad\x61\xdf\x35\x6c\x8b\xca\x74\x0f\xde\x16\xfb\xb9\xc2\x1b\x5f\x68\x60\x3d\xa0\x2f\xdc\x1d\xe2\x3a\x61\x49\x51\xb2\x83\x1b\x97\xab\x0e\x84\xc8\x72\x1c\x44\xc6\x4b\x81\x7f\xa8\x53\xf1\x99\x03\xc7\x05\x1e\x24\x0a\xb2\x5c\xa7\x7c\x25\xd8\x46\xc4\xb2\xd8\x34\x1a\x1b\xd7\xdd\x63\xd0\x5e\x3a\x29\x36\xed\xc4\x4f\xc7\x3a\xd0\xbe\x93\xf8\x6f\x17\xf0\xb8\xde\x0e\xb4\x17\x54\xb6\x92\x0d\xd4\x5f\x0c\x83\xd3\x58\x9b\x93\x32\x95\x19\x50\x94\x1d\x52\x16\xe6\x9a\xc1\xa6\x21\x5b\xb7\xdb\x62\xf8\xb5\x34\xbb\x67\x36\xbb\x43\x3f\xc9\x70\x56\x21\xc5\xd7\x7e\x28\x54\x31\x64\x83\xe7\x08\x04\x01\x0e\xca\x6b\x82\xdb\x18\x50\xf3\x12\xc8\x05\x1a\xa4\x4c\x7c\xae\xd9\xd2\x16\x1a\x3d\x89\x40\xc2\x30\x06\xd2\xde\x17\xe4\x01\xf9\xf3\x1f\x32\x9b\xb3\x27\x58\x85\xf7\x58\x72\xff\x10\xcc\x0d\x3c\xff\xd6\xa2\x69\xf0\x0d\xb1\x09\x50\x05\x8a\xb9\xca\x1b\x1b\xf0\x60\x33\x68\x0b\x7f\xf2\x33\x2f\x92\xe6\xaf\x53\xfb\xf0\x55\x14\x00\x99\x7c\xba\x67\x38\xd4\x44\xef\x9a\x76\x75\x34\x68\x64\x3f\x9e\x07\x86\x6b\x7e\x80\x27\x58\x9a\x07\x1c\x74\xcb\xef\x6b\x86\x5d\xe4\xd1\xda\x7b\x1e\x65\x25\x4f\x52\x77\xa2\xf7\xdc\x78\xc2\x5a\x84\x4a\x86\x98\x33\xb9\x52\x3a\xe4\x5a\xd7\x4a\x40\x92\xc6\x18\x20\x1d\x36\xcb\x64\xbe\x1f\xd8\x33\x90\x55\x69\xdf\x52\xcb\x35\x02\x36\xe8\x3d\x4b\xb9\x36\xb8\x52\x48\xe4\x62\xb1\xa8\x48\xbc\x13\x91\x58\x50\x95\x66\xb5\x5c\xdd\x3e\x53\xe5\x47\xd5\x06\xc9\x22\x6f\x64\x2a\x90\x1d\x31\x33\xde\x5b\x2e\x9f\xcd\x46\xad\x2f\x6b\xb7\x40\xc1\x02\xd4\xd7\xde\x4c\x61\xb7\x03\x8a\xc5\x27\xb1\xcb\x42\x65\x22\x5a\x51\xac\x6d\x41\x4a\xf3\x3e\x34\x5f\xfb\xa7\x02\x06\x6e\x1e\x28\x2d\xf7\x3b\xcb\xf0\xa1\x1f\xcc\x8f\x3b\x20\x7d\xb5\xc6\xcd\x1a\xf4\x95\x5c\x3e\xa6\x48\x66\xc2\x8f\x33\xcd\xa1\x47\xed\x34\xa8\x70\xfb\xf0\x2c\x5c\x7c\xcd\xfd\x76\xa6\x88\x85\x35\x38\xe4\x8c\xc1\xa9\x4f\x1b\x95\x97\x22\xf7\xe3\xae\x44\x8d\x01\x0c\xb9\x56\x2e\xb6\x59\xfc\xdc\x0a\xdb\xcd\x14\xc9\x87\x83\xfe\x37\xc5\xf0\x1a\x1f\x78\x20\x14\x8c\x26\xb7\x15\xfe\xe5\xaf\x30\x34\x70\xc4\x8e\x86\x12\x57\x78\xfb\x89\x84\x19\xbe\x89\x6a\x44\x5e\x59\xdc\xd5\xfd\xd5\xc5\xdd\xd5\xc3\x57\x83\x87\x59\x6c\xd6\x60\x7c\x98\xed\xe7\xe5\xd5\xfb\xc9\xe3\xf5\xc3\xfc\x72\x7a\xf7\x1a\x00\x31\xfa\xe8\x00\x84\xd8\x3d\x91\x3b\x5f\x68\x95\x8b\x2f\x47\x9d\xc9\x69\xa1\xe6\x7c\x40\xa5\x82\x23\x50\xef\x72\x77\xb0\xd1\x3a\x39\xb5\x63\x8e\x26\x6e\x3e\x3c\xd1\x1c\x17\x75\xa0\x66\xbf\x94\x49\x02\x65\x8e\x2e\xbc\x4e\x45\x41\x66\x50\xc1\xfe\x58\x59\x5e\xb2\xa9\x33\xb5\x28\xb1\x73\x43\xc8\x6f\x6d\x2e\xc1\x58\xe0\xb8\x35\x03\x90\x4a\x28\x1f\xeb\xe2\xaf\x5e\x49\x25\x7c\x37\x50\x8e\xb2\x50\xac\x95\x74\x94\x26\xf1\x35\xab\x58\xc9\xf1\xea\xeb\x6b\xda\x15\x57\x5a\x9f\xd6\xfd\xb4\x1f\xba\x37\xc4\x4d\x2c\x15\x3a\xa6\xa5\xdd\x7c\xdf\xbc\x74\xcf\xfd\x16\x80\x71\x37\x33\xc9\x21\x07\x01\x8a\x8f\x7e\x22\x69\x22\x50\x39\xc2\x27\x27\x9e\x24\xa2\x68\xf4\xb2\x32\xce\xc6\x14\x9a\xb1\x96\x90\xa9\xe0\xc4\xdc\x10\x25\x45\x96\x8b\x94\xc2\x26\x93\x4f\xf7\x33\x85\xb2\xe0\x74\x0a\x91\xba\x00\x3e\x02\x31\x1c\xba\xf4\x7c\xeb\xa1\x84\x16\xec\x2d\xc6\xa8\x37\x82\xab\x0c\xd5\x78\x93\x44\xa4\x7e\x65\x60\x7f\x84\x88\x49\x91\x09\x24\x9b\xfd\xef\x49\x90\x55\xc3\xae\x35\xfd\xa5\x4f\x49\x92\xb4\xba\x9e\xda\xaa\x68\x01\x20\xfa\x9a\x2b\xa7\xa1\x4e\xa1\xef\x2a\x22\x6c\x6d\xe3\x22\x2a\x57\x0d\xf4\x5a\x4b\x0f\xd8\xdc\xaf\x4b\xe9\x84\x4b\xa9\xc7\xb9\x1e\x9e\x12\x6c\xad\x8d\x01\x75\xc2\x00\x3e\xcd\xec\xaa\xf8\x13\xc0\x3f\x99\x61\x6c\x3c\x75\x2a\xf2\x53\x47\x9c\x3a\xa8\x37\x75\x1c\x9c\x73\xd2\x40\x17\xe2\x75\x4e\x6c\x6e\xa7\x53\xd9\xea\x75\x68\xb9\x26\x16\x6f\xa7\x74\x6e\x0b\xec\x1d\xc4\x8d\xf0\x7a\xe6\x0b\x8e\xd9\xa1\xb3\x8f\xc4\x96\x60\xbd\x94\xf9\x91\xea\x30\x0f\x21\x2e\xb0\x54\x44\x89\xbd\x08\x05\x26\x09\x41\xec\x09\x0e\x86\x2c\xbe\xc3\xf5\xc7\xca\x6b\xce\x91\xe5\x1d\x04\x76\xb8\xb9\xbd\xb9\x0a\xa1\x0a\xd3\x9b\x87\xab\x3f\x5e\xdd\x95\xca\x6f\xaf\x6f\x27\xa5\x12\xda\xfb\x87\xbb\x4a\xe5\xec\x8f\xb7\xb7\xd7\x57\x35\xcc\xc3\xd5\xc3\xf4\x43\xa9\xf1\xcb\xc7\xbb\xc9\xc3\xf4\xb6\xf4\xbd\x1f\xa7\x37\x93\xbb\x7f\x0f\xff\x72\x75\x77\x77\x7b\x57\x79\xde\xe3\x45\x37\x7a\xa2\xf4\x1a\xcd\xe1\x1f\x9f\x9c\x0d\x78\x03\x1b\xb7\x71\x59\x9f\xed\x88\x5d\xdc\x13\x84\xb5\x6f\x39\xda\xea\x5a\xdb\x5c\xb0\x31\x4c\x57\x07\xad\xba\xd3\x0b\xca\x95\x86\xee\xf3\x71\x44\xc5\x39\xcf\x1b\xef\xbf\xbd\x03\x13\x24\xe0\xfc\xb9\x10\xe9\x8e\x78\x5e\xf0\xd2\x88\x7f\x89\xb8\x42\xf4\x6a\x2e\x36\x5b\xa8\x86\x0a\x61\x97\x33\xf5\x09\x32\x56\x88\xec\x78\x93\xb1\x3f\x42\xee\xc9\x7e\xd9\x0b\x9d\xc3\xa0\xfc\x05\x9f\xe1\x3e\x1b\xcf\x54\x49\x20\x3a\xf8\x55\xac\xa3\xc2\x45\x33\xc6\x33\x65\xb9\x74\x63\x1d\x65\x63\x38\x7a\xc7\x3a\x5d\x9d\x93\xea\x95\x31\xa6\xfa\x69\xa1\xf5\xd3\xb9\x50\xe7\x70\x39\xc8\xcf\x79\x91\xeb\x73\xc8\x5b\xe3\xe0\x67\xe7\x56\x1c\xc7\xaa\x0b\x65\xe7\x6b\xf9\x2c\xe0\xff\xc6\xeb\x7c\x93\xfc\xaf\x6c\xbb\xfe\x72\xb6\x4a\xd2\x33\xf3\xdb\xb3\xf0\xb7\x67\xf6\xb7\x67\xf6\xb7\x67\xe6\x67\xf8\x7f\xdb\x1d\xc6\xd9\x04\xa9\xf3\xcf\x94\x54\x99\x48\x73\x58\x86\x2f\xa9\xcc\x85\x57\x5e\x67\x6f\xfe\xfb\xbf\xd9\x38\xe5\x2f\x58\xc7\x70\xc9\x73\xfe\x11\x2f\x7a\xff\xf8\xc7\x1b\x88\x6c\x23\xd0\x78\xcb\xd3\xcf\x85\xc8\xcd\x95\x33\x11\x51\xce\xfe\xf7\x4c\x41\x28\x7c\xb3\x9b\xe7\x78\x01\xc6\xcb\x60\x9c\xb1\x7f\xc3\x36\xa7\xc8\x79\x14\x67\xa6\xa5\x16\x88\xa3\xe4\x49\x83\x9e\x5a\x4b\xac\xe4\x73\x72\x49\xdf\x1f\xb0\x5b\x3e\x27\xe5\x2d\x62\x59\xbb\xb3\xcf\x09\x10\x6b\x25\x9a\xdb\xac\x39\x73\x8b\x17\x1c\x16\xea\x5c\xd3\x1e\xa9\xe5\x68\x5e\x35\x5f\xd2\xbc\x57\xee\x91\x77\xd1\x86\x50\x6a\x6a\x61\x10\xb4\xf1\x01\x21\x48\x63\x48\xb3\x43\xee\xf1\x4a\x8a\xda\xf5\xf0\xe6\x60\x1c\x28\x87\xe1\xda\x43\x0f\x32\xfb\xfd\x0f\xe7\xe7\x23\xb6\xca\xe0\x1f\x8b\xcf\xf0\x0f\x48\xe3\x9e\x8a\x3a\xac\x36\x98\x0e\x91\x50\x9f\xe5\xfd\x33\x71\x0a\x38\xc3\xd7\x60\xab\xac\x2c\xd3\x1f\x0b\x15\x27\xc2\x97\x65\x94\x62\x53\x89\xb6\x7a\x8e\x78\x43\xa9\xf2\x82\xc3\x1c\x2f\x44\xc4\x8d\xe1\xab\x3d\x1b\x51\x3e\x7a\x99\x0b\x85\xd7\x92\xd4\x8b\x28\x70\xbc\x42\x40\x8a\x1d\x30\x29\xa0\xcb\xbf\xd9\x82\x48\xbf\x84\x78\xfd\x03\xd2\x3f\x8e\xaa\x1f\x81\xcc\x36\x32\x19\x02\x3f\x17\xaa\x81\x0b\x1b\x38\xc3\x72\xd6\x22\x35\x37\x93\x2d\x57\x31\xcf\x60\x05\x2e\x53\x08\x3b\xa7\x8c\xd7\x3b\x3a\x42\x5c\x94\x2e\x72\xe0\x12\xc0\x14\x4f\x38\x12\x48\x35\x19\xf4\x79\x14\x74\x02\xcf\x04\x60\xbc\xab\xfd\x70\x3c\x53\x4e\xa2\x1e\x41\x09\x78\x65\x89\xf4\x76\x47\x95\xe2\xd5\x41\x97\xf6\x0a\x43\xc3\x3d\xf2\x89\xbf\xea\x77\x47\x4c\x96\x63\x9c\xc0\x6a\x99\x07\x42\x65\x56\x4c\xed\xad\x50\x91\x8e\x45\x9a\xbd\x33\xdb\x10\xb8\x9e\x73\xcf\x19\x29\x33\x3f\x19\x4e\xd1\x9e\xae\x6d\xa6\x79\x47\xff\x6e\x46\xa7\xc4\x83\xd8\xe4\x3e\xec\xdf\x2a\xdf\x7b\x3a\xb2\xa9\xbf\xf4\xaf\x5f\x35\x35\x19\x02\x6c\x2c\xc0\xec\x70\x5f\x10\xb7\x6c\x68\x71\xb1\x51\x12\xc0\x47\xe7\xc4\xaa\x42\x49\x73\x64\xe5\xe6\xc2\x9e\xcf\x14\x9d\xc0\x23\xb6\x14\x3c\x5f\x03\xc2\x28\x7b\x46\x63\x8c\xc7\x7d\xfe\xa2\x7d\x32\xd4\x92\x68\x03\x2a\xa9\xd4\xb8\xbf\xad\xe3\xd7\x20\xb5\xc3\xa3\x1c\x33\x3d\x6d\xf4\xc2\xce\x55\x81\xc1\x6a\x34\x88\x07\x8c\x83\xe5\x64\xae\xea\x1f\x84\x94\xe0\x30\x12\x3b\x8c\xd8\xb3\x6a\x3f\xf0\x03\x63\x78\xf0\xed\x30\x1f\x17\x18\x47\x28\xeb\x24\x50\x13\xee\x33\x1f\x4c\x0f\x89\x31\xc1\x49\x6e\xdb\x54\x1d\x03\x01\x1d\x38\xac\xfe\xc3\xfc\x74\xef\xcd\x21\x13\xa9\x25\x8c\xc6\x77\x45\x62\x9e\xb5\x4c\xe3\xb3\x2d\x4f\xf3\x9d\x5d\xbe\x89\x5c\x00\xcf\x6c\x22\x9f\x04\x9b\xa4\xa9\x7e\x39\xf5\x28\xb4\x9a\x96\x07\x9e\x3d\x9d\x98\xe7\x0b\xe8\xf7\x86\xf0\x74\x35\xd2\x72\x95\xb0\x47\xb1\x98\x1f\x46\x01\xd6\x46\x63\xd6\xf8\x9c\x54\xe4\xe9\x6e\x6e\x16\xe2\x66\xdb\x6a\x29\x7a\xa1\x57\xfb\x3b\xb9\xc3\xd8\xc5\xe0\x7c\xee\xc1\x2e\x56\x9a\xd5\xef\x87\x5d\xac\x81\x38\xac\xce\x2e\x36\xbd\x99\x3e\x4c\x27\xd7\xd3\xff\x5b\x69\xf1\xd3\x64\xfa\x30\xbd\xf9\xe3\xfc\xfd\xed\xdd\xfc\xee\xea\xfe\xf6\xf1\xee\xe2\xaa\x9b\x2e\xa0\xde\x7b\xef\x82\x9f\xb1\xf0\x39\x3f\xb0\x87\x20\x63\x86\xa8\x4f\xf2\xbf\x49\x68\x09\x56\x95\xd9\xcc\x52\xad\x46\xb0\x51\x7f\x60\x57\x69\x3a\xdd\xf0\x95\xf8\x58\x24\x09\xe4\xb5\x11\x62\x7d\x91\x0a\xb8\x78\x8e\xd8\x47\x1d\x4f\x83\xdf\x41\x5d\x48\xe3\x6b\xc0\xf3\x79\x1c\xa7\x22\xcb\xf0\xf1\x23\x7a\x7e\x90\xc5\x75\x35\x27\x84\x62\xe0\xcf\x5c\x26\xe6\xfe\xf6\x03\x48\xbf\xea\xe5\x12\x71\xcc\x23\x87\x60\x67\x9f\x0b\x9d\x73\x26\xbe\x44\x40\x91\xd1\xbc\x4e\xae\xf5\xea\x1b\x60\xc6\x7a\xc4\x09\x5b\x2e\x29\x20\xa8\x31\x6f\x3e\xce\x9b\x0d\x01\xbd\xe5\x07\xfc\xe9\x7b\xfc\x65\x63\xeb\x79\x9e\x9c\xa0\x64\xef\x5a\xaf\x9a\xe9\xcd\xc1\xbb\x26\x4e\x76\xaf\x71\x0e\x05\xc0\x7a\xc5\x32\xa9\x9e\x66\xea\xd3\x5a\x28\xa6\x8b\x14\xff\x04\xd7\x7c\xe3\x66\x26\x45\xb6\x16\x31\xd3\x45\x3e\x62\x2f\x82\x6d\xf8\x0e\xdd\x66\xb8\x13\x38\x4e\x66\x58\x32\x70\x8a\x98\x5f\x27\x52\x19\x6b\xb1\x95\x16\x20\x5a\x9d\xfa\x53\xdc\xb8\x2c\x41\x0c\x3f\x9e\xbf\xad\xeb\x3c\x2d\x01\x25\xa0\x00\xc8\x03\x58\x6c\xa6\x96\x2c\x37\x48\x3e\x69\xfd\x54\x6c\x3d\x95\xd4\x1b\x1b\x25\x86\xe1\x7e\xd6\x32\x66\x71\xb1\x4d\x64\xe4\xec\xee\x8b\x4e\x5b\xf9\xf2\x10\xc9\xdc\xff\xd4\xa9\xe2\xf3\xbb\x5e\xac\x01\x26\x1d\x40\x1a\x3a\x98\xf3\x5e\x99\x3b\x90\x49\x15\x25\x05\x88\x59\x14\x99\x48\xcf\xf2\x54\xae\x56\xe0\x80\xdb\xa2\x8b\xef\x9f\x5c\xd0\x93\x17\x1d\x5f\x5f\x10\x56\xff\x25\x7a\x25\x23\x9e\x84\x28\x33\x9f\x9e\x72\xec\x65\x76\xdb\x93\xd4\x17\x00\x52\x6d\x87\x5a\x59\x19\xb6\xa9\x00\x02\xbd\x39\x98\xf2\x39\x99\xbb\x63\xfa\xbd\x64\xe6\x82\x6e\x55\xc0\x7d\x79\x2c\xb8\xe7\xb6\xaf\x20\x12\x61\x9f\x6d\xf5\x1e\x50\xef\x55\x41\x2e\x46\xbf\x28\x91\x82\x07\x0b\xf9\x37\xf3\xa6\x4a\x83\x6f\xe2\x34\x20\x1c\x50\xcc\x6a\xa0\x2c\x1d\x22\x0e\x4b\x98\x56\xf2\x59\xa8\xaf\x4f\x06\x19\x3c\x20\xe2\xd1\x5a\xcc\xad\x5f\x7e\x6a\x93\xe5\x0e\x80\x81\xc6\xca\x92\x31\x87\xa6\x94\x49\x20\xe0\x89\xf0\xea\x84\x3d\xae\xdb\x2e\x14\x18\xe8\x80\xc6\x9b\x4e\xcc\x63\x51\xd2\xd7\x3e\xfa\x3d\x7b\x99\x66\x9f\xed\xb6\x1d\x61\x9c\x5d\x8a\xe8\x89\x3d\xde\x4d\xb1\x2c\x4b\xe6\xcc\x98\x82\x6c\xed\xc9\xe5\x5b\xef\x6e\x39\x5f\x7d\x43\xd9\x5c\x4f\xf1\xea\x34\x41\x4c\x87\x28\x33\x0d\x85\x2b\xc6\x48\x66\x4e\x30\x7d\x9b\xf0\xdc\x72\xa6\x43\x20\x9e\x65\x1b\xa0\x48\x2f\xf2\x40\x57\x84\x44\x8e\xfb\xf8\x14\xc0\x32\x5e\x0e\xaf\x56\x4f\xf3\x63\xc5\x32\x1c\x24\xf9\xd0\xcb\x5b\x77\x1c\x67\x95\xe8\x05\x54\x1a\xb7\xe7\xc5\x3b\x4c\x83\xd9\x17\xa9\x8c\x87\x1c\x2c\x76\x4c\x6e\xdd\x4f\xbb\x3a\xe8\xa4\x90\xdd\x93\xc0\xa6\x4b\x0c\xb5\x56\x2e\x5e\xd5\x4a\xb6\x7d\xb7\x3c\x48\x4d\x65\x2e\x37\xe5\xfc\x40\xcb\x33\x0b\x71\x25\xdd\xa1\xad\x5d\x7f\x97\xa3\x26\xba\x5e\x1b\xbd\x67\x2c\x7d\x39\x75\xf7\x24\x1f\x51\xe0\x8a\xd5\xb8\xae\xca\x75\x08\x59\xa0\x9d\x3a\x84\xf9\x80\x6e\xb9\x9b\xc4\x12\xfe\xb2\xd7\x8c\x56\xc7\xfd\x81\xb2\x95\x47\xb1\xb7\xbc\xc2\x8e\x2a\x72\xed\x83\xcd\xf0\x3e\x53\xa0\xd0\x0a\x91\xdd\x60\x36\xa6\x71\x2d\xc3\xe4\xc4\x6a\x60\x18\xec\xd6\x1c\x80\x43\x19\x84\x84\xd9\xa6\xc2\xa6\x2d\x76\x22\x77\xf5\x7d\x89\x15\x4f\x80\xa8\xbc\x7b\xeb\x72\x81\xb3\xad\x61\x74\xa4\x14\x10\x43\x27\x4f\x23\xd2\x9b\xad\x56\x42\x11\x16\x4b\xe9\x99\xa2\xc6\xad\x04\x9e\x0b\xec\x97\x20\xef\x23\x8a\xa7\x20\x80\x52\x64\x3a\x79\xa6\x0c\x4e\xc0\x3d\x0b\xe2\x19\xa6\x83\x17\xc6\x35\x35\x17\x31\x48\x2d\x12\xfe\x19\x10\x61\x15\x1d\xb8\x54\xac\x64\x96\x8b\xb0\x4a\x20\xfc\xfd\xc9\x24\x7b\x4a\x77\xb7\xae\xa1\x6f\x95\xec\xd9\xe7\x84\x99\x5d\x3b\xa0\x3f\xbb\xad\x88\xa7\xee\x77\xdd\x8b\xa1\x52\xc8\xe5\x8d\x44\xe9\x14\xc0\x35\x80\xce\x67\x86\x94\x0f\x99\x63\x8d\x75\x93\x44\xc5\xf8\xdc\xe9\x2c\xc1\x14\xad\x0a\x9e\x72\x95\x0b\x91\xcd\x14\xe5\xbd\x90\xba\x24\xac\xce\xc5\x05\xf4\x12\x68\x62\xa0\x6b\x15\xe9\x2c\x47\x26\x00\xf8\xc9\x92\xcb\xa4\x48\x5b\x6f\x3b\xb8\x2a\x0f\x2a\x3f\xec\x1a\xa5\x0b\x68\x96\x35\x4d\x9a\x2b\x64\x09\x76\x91\xab\x9e\xad\x66\xad\xca\x75\x1e\x2d\xaf\x60\x4d\x6e\xff\xf9\x76\xa1\xae\x96\xda\x96\x3f\x64\xf3\xad\x1e\x60\xf1\x48\xd5\xbf\xb1\xb1\xec\x73\x2d\x24\xd3\x91\xbd\xfd\xdc\xc6\xa3\xcb\xb3\x27\x48\x7c\xec\xbb\x09\xee\x0f\xef\xfe\xfe\x77\xfb\xd3\x23\xad\xb6\x0b\x56\xed\x9a\xab\x38\x31\x37\x24\x9e\x57\x4e\x20\x8f\xf7\xe1\x1b\xeb\x27\xb4\x6b\xe2\x59\xac\xe4\x3c\xaa\x01\xed\xf7\x8d\x53\x05\xa1\xdf\xf5\x42\xd5\xa7\x94\x71\xf3\x4d\x78\x4d\x7f\xb2\x93\xd6\x93\xdb\xb0\xed\x4b\x70\x29\x57\xdf\x81\x7b\xff\xa1\x6e\x29\x23\xda\x8a\x74\x7e\x39\xf0\xd7\x91\x9b\x11\x70\xb6\xc6\x98\x85\x54\x7d\x33\x45\x52\x70\x98\xf3\x83\x64\x0f\xd2\x51\x64\xec\xb7\xae\xf8\xe2\xb7\xff\x6a\xc9\x08\x76\x6c\x09\x63\x0d\x8c\x1f\x3a\x8a\x8a\x14\x12\x72\x14\x34\x60\x02\xcf\xa6\x21\x8c\xaa\x13\x3c\x91\x1d\x8c\x02\xdd\xa7\x26\xef\xc1\x45\x89\x4a\x2f\xf5\x00\xc1\x01\x14\xb5\x73\x67\x21\xb1\xaf\xa7\x59\xce\xb2\x5c\x6c\x1b\xad\x52\xc9\xe9\x2a\xeb\x36\x1e\xe1\x76\x79\xd5\xc8\x9e\xbe\xee\x00\x1b\x3d\x09\x2e\x72\x7f\xba\xbf\xbd\x61\x5b\xbe\x03\x44\x52\xae\x49\x70\x13\xf8\x98\xaa\xfb\x77\xdf\x0c\x94\x5f\xbe\xbc\xd9\x70\x4c\x09\x86\xd8\x12\x35\xe4\x4e\x50\xb7\x62\x87\x60\xcd\xd0\x92\x34\x5b\x39\xd5\xc9\xd9\x36\xe1\x4a\x20\x77\x2e\xbc\xff\x98\x55\x1e\x1f\x66\x19\x5d\xbe\x81\x70\x1c\xd0\x01\xb8\xc8\xd3\x5a\x48\x0b\xd5\x84\xe8\x2c\x4b\x51\x1e\x95\x58\x6c\xb5\x11\x9d\x70\xab\x0f\xc8\xa8\xcb\x23\xb3\x4d\xb0\xb8\xd0\x26\x4b\x5d\xbe\x9d\x67\x00\x85\x1b\x30\x51\xdd\xba\x99\x33\x65\x65\xd1\xf4\x4b\xc6\x62\x2c\xbf\x2c\x64\x86\x72\xd3\x18\x8a\x06\x58\x0a\xd9\x17\xcc\x99\xa7\x5c\x65\x66\x42\x21\x9a\x26\x9e\x85\x62\xf5\x62\xbe\xe9\xe5\xb5\xcb\x2c\xe3\x24\x91\x16\x47\xcb\xd0\x07\x8e\xd9\x31\x17\x98\x46\x21\xc7\xfd\x34\xb7\x1f\xf8\xb6\x0b\x38\x7e\x74\x8b\xfb\x66\xc9\x15\x9f\x57\xbd\x4e\x90\x98\x03\x7a\xfe\x12\x7a\x3c\x1c\xbd\x47\x75\xa4\xf9\x69\xe4\xbd\x1c\x20\x54\x7f\x9a\x62\x80\x01\xb6\x27\xe0\x81\x71\xa8\x0e\xe7\x2f\x9b\x5d\x0e\xe4\xe7\x28\x88\x0c\x2f\x37\x66\xf7\x42\xb0\x5f\x9c\xa6\xf2\x2f\x24\xae\x01\x40\x35\x10\xc5\x6e\x1b\xd7\xa9\x5a\xea\xe3\x8c\x41\xba\xaa\x01\xa1\x8e\x1a\x95\xe6\x7e\x1e\x0b\xb5\x82\x6a\x06\xf5\xba\x25\x78\x8d\xef\xb5\x07\x58\xf5\xd1\xdf\xc9\x09\x98\x6f\x7b\x6a\xce\x67\x98\xe2\xc3\xb4\x7f\x4b\x8b\x24\x07\x99\x69\x20\x2e\x7c\x52\xfa\x45\xa1\x2f\x40\x4f\x62\x6f\xcd\xfe\x83\x03\x0c\x18\x08\x09\x5b\x55\xa0\x35\x7c\x07\x4c\x8a\x13\xf7\xdf\xec\x1e\xb3\x14\xd8\x67\xa0\x0a\xcf\xc0\xf9\x21\x92\x6f\xb0\xe6\x6f\x27\x23\xf6\xe3\x88\x5d\x8c\xd8\x78\x3c\x7e\x37\x62\x82\x47\x6b\xdb\x23\xfc\x09\x62\x96\x72\xbe\x32\x6d\x3b\x29\x7a\xff\x00\x60\xbe\x37\x87\x95\x25\x0c\xe1\x81\x60\xbd\x8f\x3c\xd8\x57\xc0\x32\x06\x54\x57\xb2\x19\xdd\x68\xad\xa5\xef\x14\x80\x03\x45\xa4\x53\x0b\x2f\xcc\x72\x9d\x5a\xa8\xd4\x33\x4f\xb9\x54\x50\xdd\xc5\xeb\x40\x51\x7a\x72\xc0\xef\x28\xbe\xf0\x0d\xbc\xbf\x54\x8e\xe2\xca\x0c\xd3\x83\xeb\x7f\xbe\xdb\xca\x08\xc6\xf3\x25\x95\x79\x6e\x4e\xe7\x6c\xa6\xee\xd9\x0f\xff\xc6\x26\xdb\x6d\x22\xd8\x84\xfd\x9d\xfd\xc8\x15\x57\x9c\xfd\xc8\xfe\xce\x2e\xb8\xca\x79\xa2\x8b\xad\x60\x17\xec\xef\x66\xd8\x4c\x7b\x37\xda\x1c\x87\xbb\x11\xe3\x4c\x15\x09\x9e\xfa\x6f\x2d\x0c\xe9\x9d\x7b\x2f\xee\x67\xc7\xea\x39\x67\x7a\x43\x47\xe1\x5f\x5d\x34\x3c\x93\x6a\x95\x88\xdc\xaa\xa8\x97\x00\x63\xf8\x80\x33\x78\xd3\x1f\x66\xca\xc5\xf2\xfe\x6a\x7a\xfc\x57\xf6\x77\x76\x53\x24\x89\xe9\x92\x31\x34\x66\x21\xfd\xc0\x2c\x80\x5f\xa8\xf1\x8b\x7c\x92\x5b\x11\x4b\x0e\x10\x7e\xf3\x5f\xe7\x0f\x30\xdb\xf3\xc2\xd3\xe6\x84\x7b\xda\xd1\xaf\x1f\x63\x7a\x5e\xa5\x2e\xcb\xb1\xf0\xdb\xc9\xef\xb8\xf9\x95\x7f\x3a\xdc\x23\xf2\x64\x61\xb4\x1f\xc8\x61\x45\xea\xfc\x90\xed\xff\x20\x13\x50\x39\x6c\x6d\x5b\x0d\x47\x41\x78\xa8\x1f\x6b\x64\x41\x3c\xe2\xe4\x77\xc8\x1e\x4c\xfe\x7d\x4d\x6e\x8d\x87\xbc\x54\xe9\x06\xbe\xa4\xaf\xf6\xef\x95\x15\x72\xfc\xe3\x3f\x97\xd5\x33\x4a\x43\xac\x65\x2f\x99\x91\x4a\x67\x1f\x29\x76\x01\x75\x82\xe6\x22\xa3\x64\x72\x6e\xb6\xea\xf9\x8d\x56\xe6\xda\x9a\xc9\x15\x32\x14\x00\x80\x25\x03\x4e\x36\xeb\x14\x3c\x94\x5d\xd6\x60\x0b\x80\x7f\x60\xba\x84\xa0\xaa\xdc\x58\x01\x33\x05\xc9\x6e\xa6\xcc\x2f\xe8\x44\x02\x80\xb5\x74\x44\x76\xf8\x34\x2b\x68\x4a\xcf\x22\x83\x1c\x34\xde\xb0\xc0\xba\x34\x40\x8f\x58\x70\x54\x2c\x74\x44\x54\xfc\x26\x20\x71\xa1\xd6\x6c\x85\x2f\x62\xb7\x16\x22\xd1\x6a\x65\x56\x45\x9b\x11\xd0\x1b\x2e\x8f\x81\x34\x84\x5d\xc0\xc6\x5a\x7b\x60\x0e\x4b\xfa\x0a\x4d\x89\x39\x27\x65\xec\xef\xf7\xa4\x39\xed\x22\xb2\xee\x34\xa4\x97\x6b\x79\x89\x23\xeb\x45\x1f\x33\x91\x02\xd3\x22\xe6\xd6\x5d\xb4\x1f\x0f\x4e\x5f\x6f\x8b\x6f\xd4\x6f\x53\x75\x42\x32\x9b\x43\x21\x94\x4d\xb0\xc1\x64\x17\xd4\xeb\xb1\x1e\xbf\x25\x3a\xf3\x35\x15\x61\x1b\xe5\x5f\xe1\x7b\xa6\x35\xfa\xd3\x50\x89\x57\x3b\x7a\xa7\x00\xae\x7d\x46\xc6\xf7\xb9\x5e\xda\x1a\xbe\xfe\x67\x7a\x8d\x73\xbf\x1f\x3e\x22\xe4\xd9\x0c\xb9\xe9\xeb\x0b\xa7\x2d\xdf\xa0\xd5\x9c\x32\x12\xfd\x3a\x5b\x1d\xb0\x5b\xf5\x1e\x7f\xfe\x51\x27\x32\xea\x86\x5b\xd9\xe3\x6a\xad\x5f\x1a\xf0\x2b\x0b\x01\xf8\x43\x8a\xff\x50\xa7\xd0\x43\xcf\x45\x94\xfb\x8c\x5b\xfd\xe5\x7e\x85\x78\x74\xde\xc1\x31\xa2\xec\x86\x0d\x74\x9f\x5c\x0e\x0f\xce\x56\xe0\xd8\x02\x6a\x59\x8c\xb5\x42\x15\x17\xe4\xb6\x23\x4e\x21\xe8\xd2\xc8\x83\x81\x7e\x59\xeb\xc4\xdc\xc5\x54\x4c\x7c\x65\x33\xb5\x15\x69\xa4\x13\x9e\x1b\xf3\xff\x42\x9c\x34\x32\x89\x3d\x7f\xfb\x5b\xc0\x92\x02\xe2\xeb\x1d\x89\xd4\x08\x97\x63\xb6\xcd\x77\x9c\xba\x76\xd9\x59\xa1\xca\xe3\x22\x50\xa7\x03\x87\x75\x2d\xfb\x4f\x04\x62\xc2\xa1\x20\x86\x81\x4a\xb6\xd0\x0c\x7a\xa9\x3f\x83\x22\xbc\x20\x25\xb9\xb4\x52\x58\xf6\xe2\x94\x57\xe6\x95\x96\x59\x75\x28\x81\x77\x0e\xeb\x90\x10\x40\x92\x09\xe8\xce\x46\x70\xf4\xc5\x3c\x0b\x14\x4d\xea\x4c\xf9\xfc\xe8\x9b\x2c\xf4\xcb\x1a\xe7\x19\x69\xd5\x2c\xfc\x6c\xc4\xde\x94\x5e\xf4\x0d\xf0\x92\x29\x0d\xcf\xa3\x1c\x56\x69\x68\x60\xb9\x8e\x98\xcc\x67\x4a\x66\xb8\x32\x53\x91\x88\x67\xd3\xbb\x30\x58\x4c\x58\x17\x7b\x77\xb6\xaf\x0d\x08\x66\x6e\x0b\x5f\x9d\xbe\x29\x6c\xc2\x34\xe4\xb7\xe2\x10\x98\x8e\x45\x66\xfc\x46\x60\xe6\x16\x5f\xcc\x06\x90\x90\x0b\x41\xf8\x47\x2c\x94\xed\x1f\xa0\x42\x50\x42\x6d\xa6\xa6\x4b\xa8\x3e\x84\x9a\xc7\x38\xc6\x5b\xa8\xe5\x6a\x76\x64\x23\x92\x82\xc3\x9a\xee\xe4\x4e\x3e\x1f\x35\x96\x70\x27\x89\x67\x91\xee\x72\x08\xea\xc2\xb8\x2a\xc1\xf3\x35\x93\xf9\x08\x58\x62\xac\xa5\x9c\x29\x1e\x93\x44\x25\x35\x67\x86\x06\xd6\x7d\xc7\x3c\xd3\xe7\x0b\xfd\xdc\xe5\xd8\x1e\x8b\xfa\xc2\x5d\xbd\x4d\xb8\x9a\xe3\x09\xf2\x0d\x70\x5f\x81\xfc\x55\x5b\xaa\xb3\x58\xcc\xed\x12\x3b\x4d\x3f\x9d\xbd\xbf\x2b\x89\xd2\x19\x3f\xd6\x3e\x68\x84\x8b\xc1\x33\x5b\xda\xeb\x89\x8b\xd3\x10\xba\x20\x65\x36\x03\xdb\xdf\x0a\x78\x48\x18\xaf\x20\x11\xec\x6a\xdd\x87\x09\xb3\x2b\xe0\x7b\xc5\x27\xf5\x99\xf9\xca\x19\x52\x9d\xf6\xe1\xd0\x98\x9a\x87\x78\x10\x3c\x66\x4f\xb7\x5e\x17\x22\xd3\x1a\x47\xa9\x43\x65\xec\xdb\x06\xe9\x3e\x84\xed\x0b\x8c\xc3\xb9\x30\x4f\xb3\xbc\x59\x78\x0f\xd3\x0d\xd8\xca\x53\xc6\xa8\xc1\x4e\xf5\x8d\x94\xf8\xaa\x5f\xe8\xd7\x98\x4d\x15\xb3\xee\xde\x88\xbd\xc1\x85\x95\xbd\xa1\x10\x24\x69\xe4\x51\xee\x3c\xa6\xdd\x43\x75\x92\x55\x28\x06\xa2\xd5\xfd\x76\xc3\x4c\x50\x27\xbb\xd1\xab\x8e\xcb\x8f\x12\xd0\xf2\x87\x14\x44\x63\x16\x71\x81\x0d\xd0\x21\x89\xd7\xee\x1d\x3a\xed\xda\x47\xb3\xfd\x0b\xdb\x7c\x17\xfb\xd1\xfe\xd0\x0c\xd1\xb6\xa0\xf3\xd4\x7e\xce\x74\x3a\x53\xb6\x35\x0a\x49\x66\x28\xa7\x50\x6d\x2a\x60\xa7\x21\x9f\x3f\x58\xa9\x00\x62\xb0\x0a\x1a\x20\xcc\xe2\x29\xd8\xaa\x56\x00\x40\x11\x0b\xe1\xd5\x3d\xc7\x6c\xe2\x9f\x66\x1c\x0f\xb3\xc0\x37\x78\xcc\x57\x69\x9a\x92\xc4\x0c\x8a\xcc\x2d\x2b\x54\x00\xac\xcf\x0a\xe0\x36\x5b\x16\xc6\x18\x05\x04\x70\x33\x65\x06\x8f\x2d\x25\xe0\x7e\x69\x5c\x66\xea\x83\xce\x6c\x1d\x77\xe6\xc7\xc3\x62\x48\x69\xd8\xde\x38\x21\x11\xfa\xc3\x25\x1c\xda\x14\xf3\xaf\x28\xcb\x42\x45\x05\x91\x31\xec\x74\x91\xfa\x97\x8a\xb8\x9a\xa9\xff\x32\xc3\x83\xba\x8e\x4e\x14\x55\x2f\x71\x0b\x5b\x25\x5e\xf6\xf6\x17\x6c\xf4\xed\xbf\xbe\xfb\xe5\x1d\xf2\x29\x14\x19\x68\x37\x8d\xca\x07\x88\xe3\x02\x2d\x92\x04\x32\xd1\xf6\x0d\x1c\x0d\x82\x7f\x04\xef\x82\xe5\xd0\xa5\x6e\xae\xca\x2e\x46\x9f\x8d\xde\xb5\x82\x7d\xf0\x79\xc2\x22\x9e\x47\xeb\x33\xeb\xcb\x91\x19\xb3\xa7\x1f\x4d\x1f\x8a\xb8\x18\x4f\xab\x99\x0e\xd3\x5c\x38\xd3\x8d\x63\x80\x2f\xad\x17\xf3\x0a\x00\xac\x79\xa8\x72\xc3\x3b\xfe\x30\x5c\x9c\x5e\x96\xd4\xfb\x79\xee\xeb\x56\x99\xc5\xdf\x38\x29\x4a\xae\xf8\x46\xc4\xec\x0d\xd4\xea\xbc\xb1\x93\x3f\x53\xdb\xc5\x38\xd9\x2d\x73\x22\x17\x32\x83\x32\x06\x0d\x83\x3d\xa7\xdc\x3c\xae\x5f\x93\xf6\x0c\x76\xeb\x45\xab\xd9\xd7\x71\x63\xe3\x9e\xd4\xdf\x61\xc1\x18\x97\x1b\x9d\xfb\x32\x44\xa8\x4c\xa6\xca\xb3\xa7\x11\x5b\xa4\x5c\x01\xfd\x74\x1c\x3a\x55\x7e\x77\xc2\xe5\x19\x99\x7b\x28\x63\xc5\x15\x4f\x76\x80\x1d\x1f\xcd\x14\xd2\x1c\x01\x31\xe1\x2e\x4a\x64\x84\x32\xc8\x15\x3f\x48\x3c\x0b\x95\x5f\x51\x5d\xbf\x05\xa9\x1f\x9b\x5a\x76\x3c\x01\x47\x11\x00\x4e\xcb\xde\x0e\xf7\x04\x08\x3e\xc2\x1a\xa5\x02\xc0\xdb\x8b\x5d\x00\x6a\x75\x0b\x7c\x44\x6a\x28\xc0\x04\xc5\xfe\x52\x2c\x74\x62\xa9\xb4\xa6\x97\x4c\xa7\x40\x27\x9c\x6b\xfa\x93\x8c\xdb\x4e\x31\xa9\x62\xf1\xe5\xa8\x7a\xf6\xee\x03\xc9\xba\x77\xe6\x31\x01\x6b\x6d\xf5\x65\x61\x17\xa5\xc2\x1c\x16\xb9\xbd\xc1\xd5\xbe\x95\x55\x11\x76\x93\x24\x5f\x03\xec\x0d\x01\xd7\x7e\x50\x37\x7c\xc7\xa2\x35\x57\xab\xe0\x0a\x0d\x28\x24\xb1\xd5\x29\xca\xee\x3c\x03\x71\x94\x4e\x6d\xbd\x20\x55\xc1\x11\xea\xdb\x05\xbc\x11\x6c\xa9\x6d\xa9\x1b\x5f\xad\x52\xb1\x82\x12\xee\x99\x2a\xd5\xf1\x02\x69\x96\x65\xfc\xc5\xe7\x74\x95\x41\x9e\x86\x4b\xa0\xed\xd6\x92\xa7\x3b\x57\x44\x46\x9a\x55\x6e\xe8\x6a\xc3\x3a\x62\x52\x8c\x47\xec\x77\x1e\x60\x2a\x22\xad\x5c\x15\x5a\xf3\x3b\x6c\x2b\xa1\xe9\x3d\xb6\xa8\x81\x74\xa0\xb9\xef\xf0\x59\x4d\xf9\xaa\x71\xd1\x74\x96\xf1\xe5\x3c\x2f\x06\xd8\x4a\x52\x37\xbc\x30\x3f\xbe\xc7\xdf\x76\x62\xb0\xf9\xd6\x98\x37\x4b\xf8\x62\xbe\x6f\x2c\xbc\x79\xb6\x67\xe6\x6b\x1a\xeb\xbd\x81\xce\x44\xb7\x07\x3a\x4f\xe1\x52\xda\xaa\xfe\xfd\xb1\xce\xa4\xa5\x52\xbd\xe3\x9d\x86\x86\x32\x2d\x18\x95\x60\xe6\x59\xf5\xba\xd5\x60\x01\x9c\x1e\xbc\x4e\xd1\x6f\x47\xe4\x86\x2b\x98\x2f\x19\xc9\xa6\x03\xa1\xc4\xfa\x01\x1a\x97\x5f\xeb\x6e\xdc\xc6\x37\xd2\x3c\xfc\x8f\x2d\xf7\x62\xeb\x99\x34\x0d\x7a\xb8\x3f\x71\x9c\xd2\x81\xe7\x94\x7b\x3c\x72\x9e\xdb\xe0\xa6\x4e\xe5\x4a\x2a\x9e\xeb\x94\xbd\xfd\x68\x89\x82\xdf\x39\x72\x7b\x18\xc5\x53\x98\x89\xd2\x10\xa1\x99\x68\xbe\x7b\x01\x9e\x59\xc4\xf3\x61\xac\x4d\x4d\x1a\xcd\x7b\xf1\xfa\xe6\x5b\x59\xce\x37\xdb\x90\x70\xd0\x49\x07\xd2\xc8\x24\x38\x08\xcc\x76\x0c\x62\x7c\x32\xf3\x35\x58\x33\x45\x91\x71\x9c\x37\x9d\xda\xc1\x03\xdf\xb6\xed\x6c\xde\x16\xf9\xfc\x40\x12\x0d\x22\xdf\x1d\x48\x43\x58\x4d\xa1\xde\x5d\xdb\x84\x81\xbf\x17\x94\x1c\x6d\x78\x51\xe4\x3f\xcb\xe0\xd4\xc6\x2b\x9e\x33\x1b\xe6\x94\xb4\x5c\x01\x17\x89\x2e\x62\x46\x46\x83\xd2\xb1\xe9\x18\x4f\x1f\x20\x24\x1c\x8f\xdb\xd8\x99\x06\x8a\x82\xb9\xfd\x0d\xbf\x6b\x5e\xe1\xf0\x59\x8b\x85\xeb\xdc\x5a\x34\xb2\xc3\x62\x4f\x84\x44\xf8\xc0\xb7\xdd\x8c\x0f\xdc\xde\x9c\xb1\xc0\xc7\x99\x3b\xeb\x05\x96\xf7\x7e\xcb\x70\xb9\x68\x28\xb0\x23\x0d\x0b\x94\xc1\xbd\x44\xc6\x09\xac\xe7\x30\x90\xdc\xc0\xdf\x58\x4a\xd0\x65\x4f\x47\x3f\xce\x56\xb2\x76\x3f\x6a\xcb\x53\xa1\xf2\x39\x3c\x71\xd8\xc3\xe0\x21\x1f\xe1\xe7\x25\x87\xa4\x57\x40\xf0\x3f\x1e\x34\xc6\x79\x2d\x15\xc2\x7f\xb2\x7b\x8a\x6d\x64\x56\x38\xd6\x9c\x3e\x6f\x25\x60\x4f\x82\x9c\x98\x9b\xb8\x96\xe9\xa2\x17\x3a\x60\xf4\x82\x17\x2a\x99\xce\x5e\x2f\xe4\x7b\x8f\xc2\x1f\xa6\x15\x0a\xf3\x50\x05\xa5\x31\x65\xf6\x6f\x7e\xcd\x61\x55\xb2\x4f\x47\x33\x9e\x33\x33\x7f\x09\xfb\x9b\x48\xb5\x2f\x0b\xc0\xa0\x45\xd8\x70\xa7\x3f\x7c\xb8\xc4\x16\xfa\xbb\x28\xee\x14\xaa\x9b\xc0\x5f\x88\x6d\x02\x6f\x96\x8b\x9d\x75\xf7\x5b\x52\x09\x5b\x11\xe1\x3c\x1c\x78\x6c\x06\x17\xbb\xc0\xbe\xdb\xd0\x97\x3b\x2c\xec\x06\x3d\x87\x7b\x2b\xf1\xb9\x6d\xf8\x96\x70\x5e\x04\x29\xad\x06\xf1\xc7\xf0\x12\xff\xf1\xd7\xff\x1c\xb7\x89\x27\x42\xd7\x87\xc2\x66\x5c\xe7\xdf\xa7\x52\xa8\x18\x92\x72\x3c\xae\xb3\xac\xab\x52\x94\xb6\x64\x9e\xcd\x32\x3c\x49\xf5\x5c\xf3\x39\x98\xcd\x71\x11\x7d\x85\xcc\xae\x37\xb2\x6e\xfb\x96\xf2\x3e\x6d\x47\x75\x36\x8f\x77\x8a\x6f\xea\x72\x93\xaf\xda\xc7\x9d\x14\x49\x0c\x5d\xa4\xa7\xef\xcb\x4e\xc4\x22\x7a\x1a\xea\x13\x1c\x4c\x4d\x2c\xa2\x27\xf6\xd3\xc3\x87\x6b\x94\x04\x92\xd9\x4c\xdd\xf0\x5c\x3e\x8b\xc7\x34\x71\x61\x61\x34\x3e\x45\x9a\xd8\x3d\x52\xa6\xca\xc4\xea\xbf\x02\x54\xcc\x89\x57\xd3\x3a\x0e\x21\x93\xf1\x66\x77\xb6\x28\xa2\x27\x91\x9f\xa7\x5c\xc5\x7a\x83\xaf\x71\x9e\x15\xcb\xa5\xfc\x32\xce\x79\xfa\x6e\x1f\xa6\x7f\xaf\x25\x3d\xe2\x92\x70\x8c\x41\xa9\x5f\x03\x9c\x50\x93\xb7\xcd\x32\x0e\xa5\xda\x9d\x65\xf6\x3c\x91\xce\xa4\x40\xbc\xb1\xe5\x22\x32\xa6\x7e\x36\x3c\x61\xc0\xe8\x35\x1f\xac\x5f\xe9\x8a\xd5\xc6\x58\xd9\xa7\xfb\x36\x42\xf8\x51\xeb\xe4\xd8\x28\x21\x4f\xec\x26\x99\x83\xe2\xcc\x31\x2e\x38\x2e\x00\x77\xd9\x9e\x5e\xba\x7c\x95\xa3\x80\xa4\x58\x83\xd3\x7b\x03\x28\x05\x75\x01\x00\x0c\xd0\x89\x0e\x94\x65\xb6\x6d\x48\x58\x0e\x44\x8b\x42\x1b\x88\x74\x70\x3a\xfa\xb5\xb0\x65\x50\xff\xcb\x7d\x1f\x81\x26\xab\xd2\xc3\x41\x01\x04\xd4\x87\xa9\x3c\xca\x05\x13\x42\x3a\x3d\x37\x8e\xc1\xb3\xed\x78\xa2\x2a\x9d\xb1\x39\xe4\xf9\xcc\x54\xe0\xe5\x20\x13\x89\x85\xe3\xba\x51\x6b\x8a\x31\x94\x96\xe1\xd1\x31\x86\x63\x38\x53\x3b\x83\xd0\x97\xa1\xfa\x10\xe4\x51\x23\xbd\x59\x98\x7b\x3e\x96\x77\x52\xe0\x0d\xdc\xb3\x89\xa5\xa4\x72\x41\x52\xeb\x66\x21\x27\x76\x65\xec\xdd\xd1\x10\xb2\x7b\x85\x26\x6b\xdf\x15\x26\xf4\x89\x4f\x4b\xef\xda\x82\xec\xab\xbe\x81\x34\xd7\xd9\x17\xbe\xcb\x40\xaa\x49\x18\xab\xb8\xc4\x60\x53\xb9\xff\x23\x1f\x02\x71\x74\x67\xa4\x7b\x58\x90\x82\x1b\xbd\x8b\xc4\x9a\x77\x91\x58\x51\x2a\xcf\x25\xf2\x26\x6b\x1e\x9c\x6f\x13\x3f\x4e\x3b\xe3\xc7\x98\xc0\xf9\x9f\x11\x32\xee\x08\x4c\x1d\x19\x1f\x0b\x8e\xc9\x54\x47\x22\xb3\x29\x76\x28\x7a\x00\x73\x6c\x9e\x3d\x62\x1b\x2e\x15\x6d\x83\x3c\x35\x06\x32\x16\x8b\x62\xb5\x6a\x0d\xdb\x7c\xff\xf1\xdf\xf2\x3e\xf9\xa7\x8f\xcf\x75\xb2\xe1\x9c\x22\xc2\x36\xb5\x4f\xc2\xb4\xb1\xf1\x95\xbf\x4e\x50\xed\x44\x11\xc2\x69\x9f\x08\xa1\xc5\x1d\x40\xf9\x07\xb9\xf8\x36\x37\xfc\x6b\xe8\xf0\xeb\x84\x0e\x1b\x73\x23\xd5\x1e\x22\xe5\xc0\x5c\x96\x1d\xe0\x8e\x1e\x1e\xc8\x5c\xe4\x28\xee\xa0\x57\x24\x52\x98\x09\x15\x67\x6c\xc1\xa3\x57\xa0\x32\x82\xd3\xe7\xf8\x18\xc5\x9e\x84\xf7\xbd\xde\x08\x06\x8f\xca\x90\x09\x9c\x51\x85\xcd\x08\x90\x54\xe6\x05\x7d\x96\x98\x72\xd0\x70\x5c\x61\xb6\x3a\xf6\x4e\xeb\x5b\x25\x5e\x98\x39\x0d\x46\x21\xb4\x24\x98\x1e\x90\x88\x78\x47\x2a\xe3\x1e\x87\xea\xca\x89\x53\xb1\xe2\x69\x0c\xe8\x67\xda\x92\x09\x8f\x9e\xcc\xbf\x43\xff\xe8\x89\x04\x7f\xb1\x6c\xb5\x08\xc9\xf2\xad\x49\x15\xa1\xe2\x33\x21\x6d\x7c\xff\xf0\xe7\x19\xe3\x51\xaa\x33\xbc\xc5\x3b\x15\x34\xa8\xbe\x03\x07\xf1\x59\xc6\x05\x4f\xf0\x89\xad\xd1\x3f\x9e\x1d\xc5\xbe\x3b\x09\x44\x10\xc4\x97\x6d\xc2\x55\x79\x4f\xe2\xeb\x02\x7f\x86\xec\x2c\x31\x21\x1a\xa8\xaf\x4a\x67\x17\x2a\x07\xfb\x6d\x85\xde\x67\x2a\x78\xbc\x0b\xc9\x72\xa4\x22\x39\x50\x1e\x6f\xa4\x32\x53\x6f\x35\x6e\x9c\x7d\x85\xa6\x23\x9e\x20\x08\x0c\xa8\xe0\x93\xa4\xb2\xf5\x33\xa6\x84\x71\x59\x78\x2a\x93\x1d\x78\xa9\xdb\x54\x9c\x05\xcf\x09\xf6\x37\x61\xd0\x65\x36\x53\xb6\xb0\xbb\xc8\xc4\xb2\x48\xd0\x97\x85\xdb\x9e\x7b\x01\xda\x87\x8f\xd3\x91\x39\xc6\x72\x22\x60\x0e\x1e\x8c\xb2\x26\xa7\xc0\xf3\xd6\xef\x59\xbd\x62\xde\x9e\xc4\x29\x05\xb8\xe1\x5a\xbf\xd8\xa2\x83\x17\xee\x51\x65\x6d\x67\xc9\xc9\xe2\x9c\xdd\x5e\x8d\xbd\x4f\xd8\x5d\x89\x83\x5e\x96\xee\xa6\xcf\x44\xec\x76\xa2\x54\xf0\x3a\xa4\x08\x46\x18\x14\x11\xb3\x22\xc3\xda\x05\x33\x87\x60\xad\xed\xb5\x19\xab\x39\xac\x9a\x1c\x73\x6f\x27\x33\xad\xd8\xac\xf8\xcd\x6f\x7e\x2f\xd8\x6f\x48\x1e\x16\xac\x0c\x46\xa8\x81\xc6\x09\x5b\x07\x03\xe5\x1e\x20\x90\xe3\xa9\x36\x23\xac\x09\x84\x65\x2b\x27\x01\xc6\xc4\xa3\x35\xcb\x8a\x05\x62\x74\x38\x05\x39\xb9\x72\x2c\x89\xd7\x1a\xe0\x36\x78\x8e\xd9\xde\x0f\x08\x16\x7c\xa4\xf3\xc5\x06\x02\x02\x9c\x20\x0c\x74\x28\x2a\x05\x83\x82\x2f\x09\x06\xfc\x23\x28\x4b\x8d\xd8\x4f\xf2\x59\x8c\xd8\xfd\x96\xa7\x4f\x23\x76\x89\xe1\xd6\x3f\xe9\xc5\xde\xfb\xff\x29\x62\x60\xce\x4d\x3d\x56\x43\x15\xa3\x49\xa3\x80\x1b\x34\x08\xf1\xd7\xa3\x35\x16\x61\x01\x5a\x3d\x28\x52\xbe\x4f\x3f\xa7\x95\x40\xf6\x54\xb7\x98\x76\x58\x5f\xeb\x9d\xa6\x6a\xa5\xfd\x79\x4a\x55\x53\x4d\x48\x13\x73\x8e\xc1\x4a\x34\x2f\x7e\x06\x9e\x89\x4e\x5d\x65\x5f\x46\xe1\x67\x5c\x15\x88\xbf\xc3\x13\xb9\x52\x0b\xd7\xd7\xf1\xb2\x0f\x9e\x6f\xb5\x4e\x1a\xfd\xaf\x93\x0e\x60\x2d\xda\xd9\x77\xf0\xa6\x58\x43\x90\x85\x5e\x89\x1d\x45\x1f\x39\xf3\x71\x36\x0c\xaa\x01\x19\x00\xac\xa6\xb8\x80\x24\x82\x1f\x8e\x50\xce\xc8\x98\x15\x44\x3d\xa2\x23\x62\xd5\xef\xb8\xf5\x10\x8d\x13\x45\x21\xc4\x10\x6d\x57\x8b\xe9\x65\xf5\xe7\xb4\xb8\x85\xd0\xee\x5c\x36\x55\xfe\x0f\xdd\x5c\x80\x23\xae\x07\xea\xb1\xe7\xd6\x80\x5b\xdc\xf9\x3e\xde\x43\x5b\x64\x37\x8f\x12\x9e\xf5\x44\xb2\x35\xda\x9d\x29\x35\x74\x01\xed\xf4\xb7\x99\x3f\x41\x4c\x75\xd3\xf3\xc0\x9c\xa9\x89\xe3\xfd\xf3\xae\x96\x73\x0f\xd1\xcc\xa2\x63\x5c\x9b\x1a\x04\xb3\x7b\x92\xc8\x11\xcb\x8a\x68\x0d\x70\xfd\xb2\x9d\x0a\xed\x56\x7d\xc7\x8e\x66\xca\x38\x2b\xa8\x7a\xc2\x21\x21\xfc\x02\x04\xf9\xf2\x6f\xc2\x79\x43\x84\x0a\x0d\x1d\xa0\x05\x37\x53\xa3\x55\xa3\xb3\x68\x2b\x27\x78\xfa\x24\xe2\x20\xd4\x57\x6c\x63\x9e\x1b\xef\xd9\x1d\x72\xb0\x7e\x1d\x61\xaa\xf5\x3e\xb3\xf0\xc5\x42\x67\xb9\x62\x69\x13\xb9\x14\xd1\x2e\xaa\x11\xa1\x94\x60\x18\xa7\x8b\x29\x1f\x16\x52\xed\x22\xcc\x68\xbe\x29\x7f\xaa\x15\x78\xb3\xb6\xdc\xf5\xff\x4c\xc4\x5a\x0b\x67\xc3\x3f\x7b\x54\x6c\x4f\x9a\xf9\x57\xf0\xd9\x3f\x65\x04\xa9\x9b\xae\xe1\x5f\xc2\x7f\x5a\xfb\x65\xf1\x5d\x70\x63\x25\xaf\xb9\x11\x55\xf6\x7d\x15\xa8\xca\x38\xdc\x37\xc8\xb2\xd9\x92\x88\xdf\xb3\x15\xa8\x0c\x38\x76\x25\xca\x03\x40\xe9\xf4\x53\x3b\x5e\x17\x89\xce\x8a\xb4\x7b\xf3\xdf\x95\x7b\x6d\x9f\xde\x40\xd9\x08\x8b\x6d\xb3\x10\x50\x7d\xde\x05\x1f\xd9\xe7\x28\x98\xfb\x52\xf5\xf7\x84\xb7\x7a\x11\x2c\x42\xa8\x7c\x8b\x86\x55\xed\x77\x41\x0c\x04\x4e\xde\x95\x08\xbd\x80\xca\xe1\x58\x5a\x5c\xa5\x7c\xdf\x77\x85\xe9\x6e\xbc\x83\x55\x68\x82\x4a\xe1\xb2\x5e\x19\xd2\x53\x64\x1f\x3e\xf2\x7c\x8d\x81\x9c\x8d\xce\x49\x4c\x1c\xf9\x4a\x10\xc6\x83\x29\x89\x45\xa2\x17\x20\x4b\x07\xaa\xf1\x6d\xeb\x9c\x16\x67\xaf\xa1\xab\x4f\x58\x9f\xb5\x6d\xf6\x03\xd4\xfc\xa5\x22\x03\xea\x87\x7a\xce\xaf\x2f\x42\x76\x58\xb0\xa9\xde\x5d\x63\xb6\x2e\x6b\xc1\xa6\x3a\x57\xb8\xb1\xea\x00\x97\xbc\x3a\xa0\x46\xe2\x2a\xac\x9b\x33\xc7\x1b\xd1\xa6\x52\x52\x1d\x99\x13\x2b\xef\x6b\x75\x3f\x67\x6a\x82\x9f\x94\x54\xf2\x9d\x26\x86\x43\x24\x92\xc4\x9b\xdb\x7f\x58\x48\xc7\x26\x21\x06\x8e\xfc\xfa\x91\xbf\x71\x41\x78\x64\x04\x75\x6b\x2a\x97\xa9\xf1\xa7\x33\x70\x17\xb2\x62\x71\xe6\x29\x12\x74\x0a\x0e\x06\x30\x68\x6c\x39\xe8\x3c\x01\x73\xca\x59\xc3\x41\x82\x71\x68\xcf\x6d\x6f\xa9\xc4\x78\x42\xe6\x0b\xee\x85\x58\xa3\xeb\xde\xdd\xb5\x63\xdc\x7b\x88\x22\xd9\xfa\x50\x34\xd7\x5d\xf6\xa2\x74\x59\xfa\xd6\x00\xa5\x1e\x08\xa0\x16\x4d\xa4\x7f\x7e\x3b\x51\x1a\xb3\x3e\x76\xe2\xa1\x7c\xb5\xb2\xbb\xc6\x5c\x0e\xc9\x72\xb4\xa3\x38\xbf\x2e\xd0\x14\x26\x30\xdb\xf2\x17\x45\xd4\x04\xdd\xdc\x8e\x07\xd9\x87\x66\x5d\x60\x63\x1f\x6a\xd0\x2c\x6f\x29\x14\x91\xfc\xe4\xd2\x09\x08\x8d\x02\xd5\x47\x9e\x24\x21\x4d\xb6\x0f\x05\xcd\x94\x0f\x18\x98\xe3\x3f\x49\xcc\x3f\xa3\xaa\xe1\x26\x22\x8a\x18\x6a\xe7\xc4\xc8\xd6\xd1\x13\x03\x15\xa5\x91\xce\xf0\x62\xee\xaf\xcf\xfb\x76\xf3\xa9\xfc\xc9\xef\xac\x84\x70\x4f\xc2\x16\x1f\x3b\x7f\x12\xbb\xc1\x7d\x6d\x4e\x99\x78\x5d\x39\x50\xd1\x77\xb5\xdc\x11\x4f\x53\x0b\xd8\xa5\xa7\x32\x9e\xe6\x72\xc9\xa3\x52\x04\xbd\xa5\x9f\x6b\x11\x3d\x6d\xb5\x54\x83\x6d\x51\xd0\x1f\x73\x22\xe5\x22\xcb\x99\x6f\xcd\xc1\x91\x7b\xf1\x37\x96\x0e\x66\x7c\x91\x0c\x50\x09\x16\xb1\xe8\xf9\x75\x38\x73\xc2\x79\xed\xcb\xee\xd4\x57\x19\xe1\xcf\x86\x57\x08\xcb\x74\xc7\x2b\xd1\x6a\xd4\x8f\xe6\x52\x40\x9b\xd7\x0a\x39\x7a\x0e\x36\x67\x25\x56\xaa\xc6\x21\x85\x68\xc4\xaf\x97\xc4\xff\xff\x2e\x89\x80\x8b\x78\xcd\x1b\x62\x73\x79\xd9\xaf\x67\xc4\xf7\x75\x46\x20\x4b\x13\xe2\xe6\x87\x0c\x2d\x75\xf5\xce\xff\xfc\xb8\xc1\x15\x2c\xe8\x49\x36\x60\x9c\xbf\xe2\x19\x17\x3c\x96\xb6\xc8\x40\xe3\xd1\xdb\xe8\x76\x67\x03\xfd\x29\xea\x3d\xda\xa0\x74\xaa\xb6\x7d\xc3\x90\x50\x1e\x2e\x1d\x73\x91\xe8\x1d\x4e\x6c\xaf\x4e\xfd\xae\x92\x22\x7d\x4e\x49\x63\x19\x5d\x9a\xe4\xc6\x5a\x44\x25\x30\x5d\xd8\x61\x19\x03\x56\x40\x9e\xbf\xc9\xdc\xa8\x97\x2d\xa0\xc5\xe7\x5d\xcb\x2c\xff\xb9\xa2\x39\x73\x98\x68\xcd\xab\x65\xf6\x6d\x57\xb1\x9b\xc1\x2f\x3a\x13\xd2\x77\xe5\x94\xb1\x5e\xda\x35\x07\xb4\x41\x56\x65\xc0\xf4\x7b\xc8\x79\xf5\x8b\x1b\xaf\x5f\xd0\x19\x7c\x49\xf9\x76\x2b\x52\x9b\x07\xad\xa5\xaa\x81\xb2\x1f\x9e\x02\x9a\x1b\x6b\x81\xc2\x5f\x95\x23\xd5\x98\x92\x4a\xd3\xf0\x35\x18\xba\x71\xf3\xcc\xdd\x14\x49\xd2\x3a\x73\xfb\x99\xc0\x6f\x1e\xaf\xaf\xe7\x3f\x4f\xae\x1f\xaf\x3a\x99\xb5\x83\xaf\xb5\x8e\x89\xeb\x09\x8d\x89\xd7\xee\x30\x8f\x15\x56\x7c\x4c\xfb\xb7\x46\x8f\xba\x48\x92\x32\xeb\xfa\x4c\xfd\x42\xed\x00\xa8\x0c\x15\x65\xcc\xb8\xb1\xce\x81\x2b\x3f\x1f\xbe\xf6\x8b\x69\xfc\x17\xfc\xed\x19\xf3\x2f\xf1\x03\x68\x83\x90\xe6\x40\xf3\xb8\x12\x62\xf5\x88\xed\x80\x10\xa6\xb6\xed\x70\x6a\x5d\x89\xc3\xb6\xc7\xa3\x02\x46\x3b\x11\x5b\x39\x88\x93\xec\x0e\x1c\xbb\x5f\xca\xd1\x45\x67\xcb\x63\x8c\x10\x41\xbb\x23\x54\x03\x00\x8d\x33\x4f\x98\x3f\x53\x78\xe1\x32\x7d\xca\x75\x7b\x9f\xd8\x94\xd0\x01\x09\x57\xab\x82\xaf\x44\x36\x62\xf6\xe1\x33\xb5\x91\xab\x35\x70\x07\x66\xc5\x96\xc0\x6e\x78\x45\x81\x32\xd3\xca\x12\xaa\xa0\xdd\xa4\x9a\x29\x7a\x27\xb5\xf2\xcd\x23\xe6\xeb\x4f\xf7\xee\x75\x08\x4a\x87\x0d\x91\xa0\x81\x9a\x29\x9c\x5c\x24\x28\xb6\x61\x17\xf0\x97\x79\x5e\x5d\xba\x1c\x04\xaf\x50\xf4\xcf\xd8\xf4\x15\x04\x80\x66\xca\x95\xa9\x20\x28\x8f\xde\x21\x20\xbe\xc5\x2e\xed\xb7\x27\x76\x32\xec\x9e\xa0\xbe\x35\xaf\xfa\xa3\xcf\x00\xb3\xe1\xe6\x03\xd4\xcb\xea\x66\xac\xe7\xd5\x84\x07\x86\xa3\xad\x76\x11\x6a\x93\x9a\x7b\x63\xdf\x0b\xbf\xd3\x9a\x52\xd7\xc5\x22\x19\xd0\x25\xfc\x7e\x67\xa7\xd0\x24\x77\x77\xaa\x47\xcc\xf5\xae\xb2\xb5\xcc\x32\xed\x7a\xec\x42\xeb\x96\x79\x39\x61\xf4\xb2\xd4\x29\xfa\xc1\xbe\xc1\x28\xa2\xfc\x90\xf5\xd2\xa3\xa0\xa0\x3a\x44\xd6\xfa\x74\x75\x28\x91\xd9\x41\xdd\xf1\xfe\x53\xef\x1e\x39\x0f\x81\x0e\xbb\x41\x16\x96\xce\xb9\x92\x81\x6d\x31\x93\x14\xbc\xb2\x32\x60\x12\xcd\x8b\xd9\x3c\xa8\xd1\x65\xd6\xff\xc8\x2d\xa2\x91\x9f\xb9\x11\x74\x32\x2a\xd2\xcc\x98\x4b\xb2\x77\x64\xb5\x75\xca\xf8\x4c\x59\x3e\x59\x6b\x8e\x27\x16\x14\x90\xba\xbf\x62\x91\xc6\x16\xf9\x18\xc1\x63\xcd\x99\x56\xc2\x5a\xc3\x99\xb2\xda\x71\x23\xc6\x17\x99\x95\x64\xe3\x6a\xe7\x74\xd2\xa4\x13\xc1\xe0\x8a\x01\xda\x62\xbf\xcd\xab\xb8\x01\xa5\x73\xfe\x5f\xcc\xff\xfe\xf1\x2f\xff\x2f\x00\x00\xff\xff\xcf\x3b\xcd\x57\x48\x83\x04\x00") func adminSwaggerJsonBytes() ([]byte, error) { return bindataRead( @@ -93,7 +93,7 @@ func adminSwaggerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "admin.swagger.json", size: 292762, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} + info := bindataFileInfo{name: "admin.swagger.json", size: 295752, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java index 6037e79688..23292f1bde 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java @@ -24045,6 +24045,16 @@ public interface ExecutionUpdateRequestOrBuilder extends * .flyteidl.admin.ExecutionState state = 2; */ flyteidl.admin.ExecutionOuterClass.ExecutionState getState(); + + /** + * 
+     * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
+     * execution DAG and remove all stored results from datacatalog.
+     *
+ * + * bool evict_cache = 3; + */ + boolean getEvictCache(); } /** * Protobuf type {@code flyteidl.admin.ExecutionUpdateRequest} @@ -24105,6 +24115,11 @@ private ExecutionUpdateRequest( state_ = rawValue; break; } + case 24: { + + evictCache_ = input.readBool(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -24195,6 +24210,20 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionState getState() { return result == null ? flyteidl.admin.ExecutionOuterClass.ExecutionState.UNRECOGNIZED : result; } + public static final int EVICT_CACHE_FIELD_NUMBER = 3; + private boolean evictCache_; + /** + * 
+     * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
+     * execution DAG and remove all stored results from datacatalog.
+     *
+ * + * bool evict_cache = 3; + */ + public boolean getEvictCache() { + return evictCache_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -24215,6 +24244,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (state_ != flyteidl.admin.ExecutionOuterClass.ExecutionState.EXECUTION_ACTIVE.getNumber()) { output.writeEnum(2, state_); } + if (evictCache_ != false) { + output.writeBool(3, evictCache_); + } unknownFields.writeTo(output); } @@ -24232,6 +24264,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeEnumSize(2, state_); } + if (evictCache_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, evictCache_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -24253,6 +24289,8 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getId())) return false; } if (state_ != other.state_) return false; + if (getEvictCache() + != other.getEvictCache()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -24270,6 +24308,9 @@ public int hashCode() { } hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + state_; + hash = (37 * hash) + EVICT_CACHE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getEvictCache()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -24411,6 +24452,8 @@ public Builder clear() { } state_ = 0; + evictCache_ = false; + return this; } @@ -24443,6 +24486,7 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateRequest buildPartial() result.id_ = idBuilder_.build(); } result.state_ = state_; + result.evictCache_ = evictCache_; onBuilt(); return result; } @@ -24497,6 +24541,9 @@ public Builder mergeFrom(flyteidl.admin.ExecutionOuterClass.ExecutionUpdateReque if (other.state_ != 0) { setStateValue(other.getStateValue()); } + if (other.getEvictCache() != false) { + setEvictCache(other.getEvictCache()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -24743,6 +24790,47 @@ public Builder clearState() { onChanged(); return this; } + + private boolean evictCache_ ; + /** + * 
+       * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
+       * execution DAG and remove all stored results from datacatalog.
+       *
+ * + * bool evict_cache = 3; + */ + public boolean getEvictCache() { + return evictCache_; + } + /** + * 
+       * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
+       * execution DAG and remove all stored results from datacatalog.
+       *
+ * + * bool evict_cache = 3; + */ + public Builder setEvictCache(boolean value) { + + evictCache_ = value; + onChanged(); + return this; + } + /** + * 
+       * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
+       * execution DAG and remove all stored results from datacatalog.
+       *
+ * + * bool evict_cache = 3; + */ + public Builder clearEvictCache() { + + evictCache_ = false; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -25768,6 +25856,34 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionStateChangeDetails getDefault public interface ExecutionUpdateResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:flyteidl.admin.ExecutionUpdateResponse) com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + boolean hasCacheEvictionErrors(); + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors(); + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder(); } /** * Protobuf type {@code flyteidl.admin.ExecutionUpdateResponse} @@ -25797,6 +25913,7 @@ private ExecutionUpdateResponse( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -25807,6 +25924,19 @@ private ExecutionUpdateResponse( case 0: done = true; break; + case 10: { + flyteidl.core.Errors.CacheEvictionErrorList.Builder subBuilder = null; + if (cacheEvictionErrors_ != null) { + subBuilder = cacheEvictionErrors_.toBuilder(); + } + cacheEvictionErrors_ = input.readMessage(flyteidl.core.Errors.CacheEvictionErrorList.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(cacheEvictionErrors_); + cacheEvictionErrors_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -25839,6 +25969,42 @@ private ExecutionUpdateResponse( flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse.class, flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse.Builder.class); } + public static final int CACHE_EVICTION_ERRORS_FIELD_NUMBER = 1; + private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public boolean hasCacheEvictionErrors() { + return cacheEvictionErrors_ != null; + } + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { + return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; + } + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { + return getCacheEvictionErrors(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -25853,6 +26019,9 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (cacheEvictionErrors_ != null) { + output.writeMessage(1, getCacheEvictionErrors()); + } unknownFields.writeTo(output); } @@ -25862,6 +26031,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (cacheEvictionErrors_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getCacheEvictionErrors()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -25877,6 +26050,11 @@ public boolean equals(final java.lang.Object obj) { } flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse other = (flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse) obj; + if (hasCacheEvictionErrors() != other.hasCacheEvictionErrors()) return false; + if (hasCacheEvictionErrors()) { + if (!getCacheEvictionErrors() + .equals(other.getCacheEvictionErrors())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -25888,6 +26066,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasCacheEvictionErrors()) { + hash = (37 * hash) + CACHE_EVICTION_ERRORS_FIELD_NUMBER; + hash = (53 * hash) + getCacheEvictionErrors().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -26021,6 +26203,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrors_ = null; + } else { + cacheEvictionErrors_ = null; + cacheEvictionErrorsBuilder_ = null; + } return this; } @@ -26047,6 +26235,11 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse build() { @java.lang.Override public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse buildPartial() { flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse result = new flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse(this); + if (cacheEvictionErrorsBuilder_ == null) { + result.cacheEvictionErrors_ = cacheEvictionErrors_; + } else { + result.cacheEvictionErrors_ = cacheEvictionErrorsBuilder_.build(); + } onBuilt(); return result; } @@ -26095,6 +26288,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse other) { if (other == flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse.getDefaultInstance()) return this; + if (other.hasCacheEvictionErrors()) { + mergeCacheEvictionErrors(other.getCacheEvictionErrors()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -26123,6 +26319,168 @@ public Builder mergeFrom( } return this; } + + private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> cacheEvictionErrorsBuilder_; + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public boolean hasCacheEvictionErrors() { + return cacheEvictionErrorsBuilder_ != null || cacheEvictionErrors_ != null; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { + if (cacheEvictionErrorsBuilder_ == null) { + return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; + } else { + return cacheEvictionErrorsBuilder_.getMessage(); + } + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder setCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { + if (cacheEvictionErrorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + cacheEvictionErrors_ = value; + onChanged(); + } else { + cacheEvictionErrorsBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder setCacheEvictionErrors( + flyteidl.core.Errors.CacheEvictionErrorList.Builder builderForValue) { + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrors_ = builderForValue.build(); + onChanged(); + } else { + cacheEvictionErrorsBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder mergeCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { + if (cacheEvictionErrorsBuilder_ == null) { + if (cacheEvictionErrors_ != null) { + cacheEvictionErrors_ = + flyteidl.core.Errors.CacheEvictionErrorList.newBuilder(cacheEvictionErrors_).mergeFrom(value).buildPartial(); + } else { + cacheEvictionErrors_ = value; + } + onChanged(); + } else { + cacheEvictionErrorsBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder clearCacheEvictionErrors() { + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrors_ = null; + onChanged(); + } else { + cacheEvictionErrors_ = null; + cacheEvictionErrorsBuilder_ = null; + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList.Builder getCacheEvictionErrorsBuilder() { + + onChanged(); + return getCacheEvictionErrorsFieldBuilder().getBuilder(); + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { + if (cacheEvictionErrorsBuilder_ != null) { + return cacheEvictionErrorsBuilder_.getMessageOrBuilder(); + } else { + return cacheEvictionErrors_ == null ? + flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; + } + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> + getCacheEvictionErrorsFieldBuilder() { + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrorsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder>( + getCacheEvictionErrors(), + getParentForChildren(), + isClean()); + cacheEvictionErrors_ = null; + } + return cacheEvictionErrorsBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -26293,109 +26651,112 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse getDefaultInst "\n\036flyteidl/admin/execution.proto\022\016flytei" + "dl.admin\032\'flyteidl/admin/cluster_assignm" + "ent.proto\032\033flyteidl/admin/common.proto\032\034" + - "flyteidl/core/literals.proto\032\035flyteidl/c" + - "ore/execution.proto\032\036flyteidl/core/ident" + - "ifier.proto\032\034flyteidl/core/security.prot" + - "o\032\036google/protobuf/duration.proto\032\037googl" + - "e/protobuf/timestamp.proto\032\036google/proto" + - "buf/wrappers.proto\"\237\001\n\026ExecutionCreateRe" + - "quest\022\017\n\007project\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014" + - "\n\004name\030\003 \001(\t\022+\n\004spec\030\004 \001(\0132\035.flyteidl.ad" + - "min.ExecutionSpec\022)\n\006inputs\030\005 \001(\0132\031.flyt" + - "eidl.core.LiteralMap\"\177\n\030ExecutionRelaunc" + - "hRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" + - "kflowExecutionIdentifier\022\014\n\004name\030\003 \001(\t\022\027" + - "\n\017overwrite_cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027Execut" + - "ionRecoverRequest\0226\n\002id\030\001 \001(\0132*.flyteidl" + - ".core.WorkflowExecutionIdentifier\022\014\n\004nam" + - "e\030\002 \001(\t\0223\n\010metadata\030\003 \001(\0132!.flyteidl.adm" + - "in.ExecutionMetadata\"Q\n\027ExecutionCreateR" + - "esponse\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Work" + - "flowExecutionIdentifier\"U\n\033WorkflowExecu" + - "tionGetRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.co" + - "re.WorkflowExecutionIdentifier\"\243\001\n\tExecu" + - "tion\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workflo" + - "wExecutionIdentifier\022+\n\004spec\030\002 \001(\0132\035.fly" + - "teidl.admin.ExecutionSpec\0221\n\007closure\030\003 \001" + - "(\0132 .flyteidl.admin.ExecutionClosure\"M\n\r" + - "ExecutionList\022-\n\nexecutions\030\001 \003(\0132\031.flyt" + - "eidl.admin.Execution\022\r\n\005token\030\002 \001(\t\"X\n\016L" + - "iteralMapBlob\022/\n\006values\030\001 \001(\0132\031.flyteidl" + - ".core.LiteralMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n" + - "\004data\"1\n\rAbortMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n" + - "\tprincipal\030\002 \001(\t\"\360\005\n\020ExecutionClosure\0225\n" + - "\007outputs\030\001 \001(\0132\036.flyteidl.admin.LiteralM" + - "apBlobB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl.c" + - "ore.ExecutionErrorH\000\022\031\n\013abort_cause\030\n \001(" + - "\tB\002\030\001H\000\0227\n\016abort_metadata\030\014 \001(\0132\035.flytei" + - "dl.admin.AbortMetadataH\000\0224\n\013output_data\030" + - "\r \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0226" + - "\n\017computed_inputs\030\003 \001(\0132\031.flyteidl.core." + - "LiteralMapB\002\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl" + - ".core.WorkflowExecution.Phase\022.\n\nstarted" + - "_at\030\005 \001(\0132\032.google.protobuf.Timestamp\022+\n" + - "\010duration\030\006 \001(\0132\031.google.protobuf.Durati" + - "on\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf" + - ".Timestamp\022.\n\nupdated_at\030\010 \001(\0132\032.google." + - "protobuf.Timestamp\0223\n\rnotifications\030\t \003(" + - "\0132\034.flyteidl.admin.Notification\022.\n\013workf" + - "low_id\030\013 \001(\0132\031.flyteidl.core.Identifier\022" + - "I\n\024state_change_details\030\016 \001(\0132+.flyteidl" + - ".admin.ExecutionStateChangeDetailsB\017\n\rou" + - "tput_result\"+\n\016SystemMetadata\022\031\n\021executi" + - "on_cluster\030\001 \001(\t\"\332\003\n\021ExecutionMetadata\022=" + - "\n\004mode\030\001 \001(\0162/.flyteidl.admin.ExecutionM" + - "etadata.ExecutionMode\022\021\n\tprincipal\030\002 \001(\t" + - "\022\017\n\007nesting\030\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132" + - "\032.google.protobuf.Timestamp\022E\n\025parent_no" + - "de_execution\030\005 \001(\0132&.flyteidl.core.NodeE" + - "xecutionIdentifier\022G\n\023reference_executio" + - "n\030\020 \001(\0132*.flyteidl.core.WorkflowExecutio" + - "nIdentifier\0227\n\017system_metadata\030\021 \001(\0132\036.f" + - "lyteidl.admin.SystemMetadata\"g\n\rExecutio" + - "nMode\022\n\n\006MANUAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYST" + - "EM\020\002\022\014\n\010RELAUNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r" + - "\n\tRECOVERED\020\005\"G\n\020NotificationList\0223\n\rnot" + - "ifications\030\001 \003(\0132\034.flyteidl.admin.Notifi" + - "cation\"\200\006\n\rExecutionSpec\022.\n\013launch_plan\030" + - "\001 \001(\0132\031.flyteidl.core.Identifier\022-\n\006inpu" + - "ts\030\002 \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001\022" + - "3\n\010metadata\030\003 \001(\0132!.flyteidl.admin.Execu" + - "tionMetadata\0229\n\rnotifications\030\005 \001(\0132 .fl" + - "yteidl.admin.NotificationListH\000\022\025\n\013disab" + - "le_all\030\006 \001(\010H\000\022&\n\006labels\030\007 \001(\0132\026.flyteid" + - "l.admin.Labels\0220\n\013annotations\030\010 \001(\0132\033.fl" + - "yteidl.admin.Annotations\0228\n\020security_con" + - "text\030\n \001(\0132\036.flyteidl.core.SecurityConte" + - "xt\022/\n\tauth_role\030\020 \001(\0132\030.flyteidl.admin.A" + - "uthRoleB\002\030\001\022;\n\022quality_of_service\030\021 \001(\0132" + - "\037.flyteidl.core.QualityOfService\022\027\n\017max_" + - "parallelism\030\022 \001(\005\022C\n\026raw_output_data_con" + - "fig\030\023 \001(\0132#.flyteidl.admin.RawOutputData" + - "Config\022=\n\022cluster_assignment\030\024 \001(\0132!.fly" + - "teidl.admin.ClusterAssignment\0221\n\rinterru" + - "ptible\030\025 \001(\0132\032.google.protobuf.BoolValue" + - "\022\027\n\017overwrite_cache\030\026 \001(\010B\030\n\026notificatio" + - "n_overridesJ\004\010\004\020\005\"b\n\031ExecutionTerminateR" + - "equest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workf" + - "lowExecutionIdentifier\022\r\n\005cause\030\002 \001(\t\"\034\n" + - "\032ExecutionTerminateResponse\"Y\n\037WorkflowE" + - "xecutionGetDataRequest\0226\n\002id\030\001 \001(\0132*.fly" + - "teidl.core.WorkflowExecutionIdentifier\"\336" + - "\001\n WorkflowExecutionGetDataResponse\022,\n\007o" + - "utputs\030\001 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030" + - "\001\022+\n\006inputs\030\002 \001(\0132\027.flyteidl.admin.UrlBl" + - "obB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132\031.flyteidl.c" + - "ore.LiteralMap\022/\n\014full_outputs\030\004 \001(\0132\031.f" + - "lyteidl.core.LiteralMap\"\177\n\026ExecutionUpda" + - "teRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wo" + - "rkflowExecutionIdentifier\022-\n\005state\030\002 \001(\016" + - "2\036.flyteidl.admin.ExecutionState\"\220\001\n\033Exe" + - "cutionStateChangeDetails\022-\n\005state\030\001 \001(\0162" + - "\036.flyteidl.admin.ExecutionState\022/\n\013occur" + - "red_at\030\002 \001(\0132\032.google.protobuf.Timestamp" + - "\022\021\n\tprincipal\030\003 \001(\t\"\031\n\027ExecutionUpdateRe" + - "sponse*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" + + "flyteidl/core/literals.proto\032\032flyteidl/c" + + "ore/errors.proto\032\035flyteidl/core/executio" + + "n.proto\032\036flyteidl/core/identifier.proto\032" + + "\034flyteidl/core/security.proto\032\036google/pr" + + "otobuf/duration.proto\032\037google/protobuf/t" + + "imestamp.proto\032\036google/protobuf/wrappers" + + ".proto\"\237\001\n\026ExecutionCreateRequest\022\017\n\007pro" + + "ject\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014\n\004name\030\003 \001(\t" + + "\022+\n\004spec\030\004 \001(\0132\035.flyteidl.admin.Executio" + + "nSpec\022)\n\006inputs\030\005 \001(\0132\031.flyteidl.core.Li" + + "teralMap\"\177\n\030ExecutionRelaunchRequest\0226\n\002" + + "id\030\001 \001(\0132*.flyteidl.core.WorkflowExecuti" + + "onIdentifier\022\014\n\004name\030\003 \001(\t\022\027\n\017overwrite_" + + "cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027ExecutionRecoverRe" + + "quest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workfl" + + "owExecutionIdentifier\022\014\n\004name\030\002 \001(\t\0223\n\010m" + + "etadata\030\003 \001(\0132!.flyteidl.admin.Execution" + + "Metadata\"Q\n\027ExecutionCreateResponse\0226\n\002i" + + "d\030\001 \001(\0132*.flyteidl.core.WorkflowExecutio" + + "nIdentifier\"U\n\033WorkflowExecutionGetReque" + + "st\0226\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowE" + + "xecutionIdentifier\"\243\001\n\tExecution\0226\n\002id\030\001" + + " \001(\0132*.flyteidl.core.WorkflowExecutionId" + + "entifier\022+\n\004spec\030\002 \001(\0132\035.flyteidl.admin." + + "ExecutionSpec\0221\n\007closure\030\003 \001(\0132 .flyteid" + + "l.admin.ExecutionClosure\"M\n\rExecutionLis" + + "t\022-\n\nexecutions\030\001 \003(\0132\031.flyteidl.admin.E" + + "xecution\022\r\n\005token\030\002 \001(\t\"X\n\016LiteralMapBlo" + + "b\022/\n\006values\030\001 \001(\0132\031.flyteidl.core.Litera" + + "lMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n\004data\"1\n\rAbo" + + "rtMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n\tprincipal\030\002" + + " \001(\t\"\360\005\n\020ExecutionClosure\0225\n\007outputs\030\001 \001" + + "(\0132\036.flyteidl.admin.LiteralMapBlobB\002\030\001H\000" + + "\022.\n\005error\030\002 \001(\0132\035.flyteidl.core.Executio" + + "nErrorH\000\022\031\n\013abort_cause\030\n \001(\tB\002\030\001H\000\0227\n\016a" + + "bort_metadata\030\014 \001(\0132\035.flyteidl.admin.Abo" + + "rtMetadataH\000\0224\n\013output_data\030\r \001(\0132\031.flyt" + + "eidl.core.LiteralMapB\002\030\001H\000\0226\n\017computed_i" + + "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMapB\002" + + "\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl.core.Workfl" + + "owExecution.Phase\022.\n\nstarted_at\030\005 \001(\0132\032." + + "google.protobuf.Timestamp\022+\n\010duration\030\006 " + + "\001(\0132\031.google.protobuf.Duration\022.\n\ncreate" + + "d_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022." + + "\n\nupdated_at\030\010 \001(\0132\032.google.protobuf.Tim" + + "estamp\0223\n\rnotifications\030\t \003(\0132\034.flyteidl" + + ".admin.Notification\022.\n\013workflow_id\030\013 \001(\013" + + "2\031.flyteidl.core.Identifier\022I\n\024state_cha" + + "nge_details\030\016 \001(\0132+.flyteidl.admin.Execu" + + "tionStateChangeDetailsB\017\n\routput_result\"" + + "+\n\016SystemMetadata\022\031\n\021execution_cluster\030\001" + + " \001(\t\"\332\003\n\021ExecutionMetadata\022=\n\004mode\030\001 \001(\016" + + "2/.flyteidl.admin.ExecutionMetadata.Exec" + + "utionMode\022\021\n\tprincipal\030\002 \001(\t\022\017\n\007nesting\030" + + "\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132\032.google.pro" + + "tobuf.Timestamp\022E\n\025parent_node_execution" + + "\030\005 \001(\0132&.flyteidl.core.NodeExecutionIden" + + "tifier\022G\n\023reference_execution\030\020 \001(\0132*.fl" + + "yteidl.core.WorkflowExecutionIdentifier\022" + + "7\n\017system_metadata\030\021 \001(\0132\036.flyteidl.admi" + + "n.SystemMetadata\"g\n\rExecutionMode\022\n\n\006MAN" + + "UAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYSTEM\020\002\022\014\n\010RELA" + + "UNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r\n\tRECOVERED\020" + + "\005\"G\n\020NotificationList\0223\n\rnotifications\030\001" + + " \003(\0132\034.flyteidl.admin.Notification\"\200\006\n\rE" + + "xecutionSpec\022.\n\013launch_plan\030\001 \001(\0132\031.flyt" + + "eidl.core.Identifier\022-\n\006inputs\030\002 \001(\0132\031.f" + + "lyteidl.core.LiteralMapB\002\030\001\0223\n\010metadata\030" + + "\003 \001(\0132!.flyteidl.admin.ExecutionMetadata" + + "\0229\n\rnotifications\030\005 \001(\0132 .flyteidl.admin" + + ".NotificationListH\000\022\025\n\013disable_all\030\006 \001(\010" + + "H\000\022&\n\006labels\030\007 \001(\0132\026.flyteidl.admin.Labe" + + "ls\0220\n\013annotations\030\010 \001(\0132\033.flyteidl.admin" + + ".Annotations\0228\n\020security_context\030\n \001(\0132\036" + + ".flyteidl.core.SecurityContext\022/\n\tauth_r" + + "ole\030\020 \001(\0132\030.flyteidl.admin.AuthRoleB\002\030\001\022" + + ";\n\022quality_of_service\030\021 \001(\0132\037.flyteidl.c" + + "ore.QualityOfService\022\027\n\017max_parallelism\030" + + "\022 \001(\005\022C\n\026raw_output_data_config\030\023 \001(\0132#." + + "flyteidl.admin.RawOutputDataConfig\022=\n\022cl" + + "uster_assignment\030\024 \001(\0132!.flyteidl.admin." + + "ClusterAssignment\0221\n\rinterruptible\030\025 \001(\013" + + "2\032.google.protobuf.BoolValue\022\027\n\017overwrit" + + "e_cache\030\026 \001(\010B\030\n\026notification_overridesJ" + + "\004\010\004\020\005\"b\n\031ExecutionTerminateRequest\0226\n\002id" + + "\030\001 \001(\0132*.flyteidl.core.WorkflowExecution" + + "Identifier\022\r\n\005cause\030\002 \001(\t\"\034\n\032ExecutionTe" + + "rminateResponse\"Y\n\037WorkflowExecutionGetD" + + "ataRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.W" + + "orkflowExecutionIdentifier\"\336\001\n WorkflowE" + + "xecutionGetDataResponse\022,\n\007outputs\030\001 \001(\013" + + "2\027.flyteidl.admin.UrlBlobB\002\030\001\022+\n\006inputs\030" + + "\002 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013fu" + + "ll_inputs\030\003 \001(\0132\031.flyteidl.core.LiteralM" + + "ap\022/\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core" + + ".LiteralMap\"\224\001\n\026ExecutionUpdateRequest\0226" + + "\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowExecu" + + "tionIdentifier\022-\n\005state\030\002 \001(\0162\036.flyteidl" + + ".admin.ExecutionState\022\023\n\013evict_cache\030\003 \001" + + "(\010\"\220\001\n\033ExecutionStateChangeDetails\022-\n\005st" + + "ate\030\001 \001(\0162\036.flyteidl.admin.ExecutionStat" + + "e\022/\n\013occurred_at\030\002 \001(\0132\032.google.protobuf" + + ".Timestamp\022\021\n\tprincipal\030\003 \001(\t\"_\n\027Executi" + + "onUpdateResponse\022D\n\025cache_eviction_error" + + "s\030\001 \001(\0132%.flyteidl.core.CacheEvictionErr" + + "orList*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" + "TIVE\020\000\022\026\n\022EXECUTION_ARCHIVED\020\001B7Z5github" + ".com/flyteorg/flyteidl/gen/pb-go/flyteid" + "l/adminb\006proto3" @@ -26414,6 +26775,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( flyteidl.admin.ClusterAssignmentOuterClass.getDescriptor(), flyteidl.admin.Common.getDescriptor(), flyteidl.core.Literals.getDescriptor(), + flyteidl.core.Errors.getDescriptor(), flyteidl.core.Execution.getDescriptor(), flyteidl.core.IdentifierOuterClass.getDescriptor(), flyteidl.core.Security.getDescriptor(), @@ -26534,7 +26896,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_ExecutionUpdateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_ExecutionUpdateRequest_descriptor, - new java.lang.String[] { "Id", "State", }); + new java.lang.String[] { "Id", "State", "EvictCache", }); internal_static_flyteidl_admin_ExecutionStateChangeDetails_descriptor = getDescriptor().getMessageTypes().get(19); internal_static_flyteidl_admin_ExecutionStateChangeDetails_fieldAccessorTable = new @@ -26546,10 +26908,11 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_ExecutionUpdateResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_ExecutionUpdateResponse_descriptor, - new java.lang.String[] { }); + new java.lang.String[] { "CacheEvictionErrors", }); flyteidl.admin.ClusterAssignmentOuterClass.getDescriptor(); flyteidl.admin.Common.getDescriptor(); flyteidl.core.Literals.getDescriptor(); + flyteidl.core.Errors.getDescriptor(); flyteidl.core.Execution.getDescriptor(); flyteidl.core.IdentifierOuterClass.getDescriptor(); flyteidl.core.Security.getDescriptor(); diff --git a/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java index a5aeb376d3..0243a44e8a 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java @@ -10302,6 +10302,1366 @@ public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionGetDataResponse getDe } + public interface TaskExecutionUpdateRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.admin.TaskExecutionUpdateRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * Identifier of the task execution to update
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + boolean hasId(); + /** + * 
+     * Identifier of the task execution to update
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId(); + /** + * 
+     * Identifier of the task execution to update
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder(); + + /** + * 
+     * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
+     * execution DAG and remove all stored results from datacatalog.
+     *
+ * + * bool evict_cache = 2; + */ + boolean getEvictCache(); + } + /** + * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateRequest} + */ + public static final class TaskExecutionUpdateRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.admin.TaskExecutionUpdateRequest) + TaskExecutionUpdateRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use TaskExecutionUpdateRequest.newBuilder() to construct. + private TaskExecutionUpdateRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private TaskExecutionUpdateRequest() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private TaskExecutionUpdateRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder subBuilder = null; + if (id_ != null) { + subBuilder = id_.toBuilder(); + } + id_ = input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(id_); + id_ = subBuilder.buildPartial(); + } + + break; + } + case 16: { + + evictCache_ = input.readBool(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.Builder.class); + } + + public static final int ID_FIELD_NUMBER = 1; + private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; + /** + * 
+     * Identifier of the task execution to update
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public boolean hasId() { + return id_ != null; + } + /** + * 
+     * Identifier of the task execution to update
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { + return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + } + /** + * 
+     * Identifier of the task execution to update
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { + return getId(); + } + + public static final int EVICT_CACHE_FIELD_NUMBER = 2; + private boolean evictCache_; + /** + * 
+     * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
+     * execution DAG and remove all stored results from datacatalog.
+     *
+ * + * bool evict_cache = 2; + */ + public boolean getEvictCache() { + return evictCache_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (id_ != null) { + output.writeMessage(1, getId()); + } + if (evictCache_ != false) { + output.writeBool(2, evictCache_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (id_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getId()); + } + if (evictCache_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(2, evictCache_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest)) { + return super.equals(obj); + } + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest other = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest) obj; + + if (hasId() != other.hasId()) return false; + if (hasId()) { + if (!getId() + .equals(other.getId())) return false; + } + if (getEvictCache() + != other.getEvictCache()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasId()) { + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId().hashCode(); + } + hash = (37 * hash) + EVICT_CACHE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getEvictCache()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.admin.TaskExecutionUpdateRequest) + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.Builder.class); + } + + // Construct using flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (idBuilder_ == null) { + id_ = null; + } else { + id_ = null; + idBuilder_ = null; + } + evictCache_ = false; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest getDefaultInstanceForType() { + return flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest build() { + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest buildPartial() { + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest result = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest(this); + if (idBuilder_ == null) { + result.id_ = id_; + } else { + result.id_ = idBuilder_.build(); + } + result.evictCache_ = evictCache_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest) { + return mergeFrom((flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest other) { + if (other == flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.getDefaultInstance()) return this; + if (other.hasId()) { + mergeId(other.getId()); + } + if (other.getEvictCache() != false) { + setEvictCache(other.getEvictCache()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> idBuilder_; + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public boolean hasId() { + return idBuilder_ != null || id_ != null; + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { + if (idBuilder_ == null) { + return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + } else { + return idBuilder_.getMessage(); + } + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder setId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (idBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + id_ = value; + onChanged(); + } else { + idBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder setId( + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder builderForValue) { + if (idBuilder_ == null) { + id_ = builderForValue.build(); + onChanged(); + } else { + idBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder mergeId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (idBuilder_ == null) { + if (id_ != null) { + id_ = + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder(id_).mergeFrom(value).buildPartial(); + } else { + id_ = value; + } + onChanged(); + } else { + idBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder clearId() { + if (idBuilder_ == null) { + id_ = null; + onChanged(); + } else { + id_ = null; + idBuilder_ = null; + } + + return this; + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getIdBuilder() { + + onChanged(); + return getIdFieldBuilder().getBuilder(); + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { + if (idBuilder_ != null) { + return idBuilder_.getMessageOrBuilder(); + } else { + return id_ == null ? + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + } + } + /** + * 
+       * Identifier of the task execution to update
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> + getIdFieldBuilder() { + if (idBuilder_ == null) { + idBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder>( + getId(), + getParentForChildren(), + isClean()); + id_ = null; + } + return idBuilder_; + } + + private boolean evictCache_ ; + /** + * 
+       * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
+       * execution DAG and remove all stored results from datacatalog.
+       *
+ * + * bool evict_cache = 2; + */ + public boolean getEvictCache() { + return evictCache_; + } + /** + * 
+       * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
+       * execution DAG and remove all stored results from datacatalog.
+       *
+ * + * bool evict_cache = 2; + */ + public Builder setEvictCache(boolean value) { + + evictCache_ = value; + onChanged(); + return this; + } + /** + * 
+       * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
+       * execution DAG and remove all stored results from datacatalog.
+       *
+ * + * bool evict_cache = 2; + */ + public Builder clearEvictCache() { + + evictCache_ = false; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.admin.TaskExecutionUpdateRequest) + } + + // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateRequest) + private static final flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest(); + } + + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public TaskExecutionUpdateRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TaskExecutionUpdateRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface TaskExecutionUpdateResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.admin.TaskExecutionUpdateResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + boolean hasCacheEvictionErrors(); + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors(); + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder(); + } + /** + * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateResponse} + */ + public static final class TaskExecutionUpdateResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.admin.TaskExecutionUpdateResponse) + TaskExecutionUpdateResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use TaskExecutionUpdateResponse.newBuilder() to construct. + private TaskExecutionUpdateResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private TaskExecutionUpdateResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private TaskExecutionUpdateResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + flyteidl.core.Errors.CacheEvictionErrorList.Builder subBuilder = null; + if (cacheEvictionErrors_ != null) { + subBuilder = cacheEvictionErrors_.toBuilder(); + } + cacheEvictionErrors_ = input.readMessage(flyteidl.core.Errors.CacheEvictionErrorList.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(cacheEvictionErrors_); + cacheEvictionErrors_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.Builder.class); + } + + public static final int CACHE_EVICTION_ERRORS_FIELD_NUMBER = 1; + private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public boolean hasCacheEvictionErrors() { + return cacheEvictionErrors_ != null; + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { + return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { + return getCacheEvictionErrors(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (cacheEvictionErrors_ != null) { + output.writeMessage(1, getCacheEvictionErrors()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (cacheEvictionErrors_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getCacheEvictionErrors()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse)) { + return super.equals(obj); + } + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse other = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse) obj; + + if (hasCacheEvictionErrors() != other.hasCacheEvictionErrors()) return false; + if (hasCacheEvictionErrors()) { + if (!getCacheEvictionErrors() + .equals(other.getCacheEvictionErrors())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasCacheEvictionErrors()) { + hash = (37 * hash) + CACHE_EVICTION_ERRORS_FIELD_NUMBER; + hash = (53 * hash) + getCacheEvictionErrors().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.admin.TaskExecutionUpdateResponse) + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.Builder.class); + } + + // Construct using flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrors_ = null; + } else { + cacheEvictionErrors_ = null; + cacheEvictionErrorsBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDefaultInstanceForType() { + return flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse build() { + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse buildPartial() { + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse result = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse(this); + if (cacheEvictionErrorsBuilder_ == null) { + result.cacheEvictionErrors_ = cacheEvictionErrors_; + } else { + result.cacheEvictionErrors_ = cacheEvictionErrorsBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse) { + return mergeFrom((flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse other) { + if (other == flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.getDefaultInstance()) return this; + if (other.hasCacheEvictionErrors()) { + mergeCacheEvictionErrors(other.getCacheEvictionErrors()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> cacheEvictionErrorsBuilder_; + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public boolean hasCacheEvictionErrors() { + return cacheEvictionErrorsBuilder_ != null || cacheEvictionErrors_ != null; + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { + if (cacheEvictionErrorsBuilder_ == null) { + return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; + } else { + return cacheEvictionErrorsBuilder_.getMessage(); + } + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder setCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { + if (cacheEvictionErrorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + cacheEvictionErrors_ = value; + onChanged(); + } else { + cacheEvictionErrorsBuilder_.setMessage(value); + } + + return this; + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder setCacheEvictionErrors( + flyteidl.core.Errors.CacheEvictionErrorList.Builder builderForValue) { + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrors_ = builderForValue.build(); + onChanged(); + } else { + cacheEvictionErrorsBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder mergeCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { + if (cacheEvictionErrorsBuilder_ == null) { + if (cacheEvictionErrors_ != null) { + cacheEvictionErrors_ = + flyteidl.core.Errors.CacheEvictionErrorList.newBuilder(cacheEvictionErrors_).mergeFrom(value).buildPartial(); + } else { + cacheEvictionErrors_ = value; + } + onChanged(); + } else { + cacheEvictionErrorsBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public Builder clearCacheEvictionErrors() { + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrors_ = null; + onChanged(); + } else { + cacheEvictionErrors_ = null; + cacheEvictionErrorsBuilder_ = null; + } + + return this; + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList.Builder getCacheEvictionErrorsBuilder() { + + onChanged(); + return getCacheEvictionErrorsFieldBuilder().getBuilder(); + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { + if (cacheEvictionErrorsBuilder_ != null) { + return cacheEvictionErrorsBuilder_.getMessageOrBuilder(); + } else { + return cacheEvictionErrors_ == null ? + flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; + } + } + /** + * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> + getCacheEvictionErrorsFieldBuilder() { + if (cacheEvictionErrorsBuilder_ == null) { + cacheEvictionErrorsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder>( + getCacheEvictionErrors(), + getParentForChildren(), + isClean()); + cacheEvictionErrors_ = null; + } + return cacheEvictionErrorsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.admin.TaskExecutionUpdateResponse) + } + + // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateResponse) + private static final flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse(); + } + + public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public TaskExecutionUpdateResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TaskExecutionUpdateResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_admin_TaskExecutionGetRequest_descriptor; private static final @@ -10337,6 +11697,16 @@ public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionGetDataResponse getDe private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_admin_TaskExecutionGetDataResponse_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -10348,49 +11718,55 @@ public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionGetDataResponse getDe java.lang.String[] descriptorData = { "\n#flyteidl/admin/task_execution.proto\022\016f" + "lyteidl.admin\032\033flyteidl/admin/common.pro" + - "to\032\035flyteidl/core/execution.proto\032\036flyte" + - "idl/core/identifier.proto\032\034flyteidl/core" + - "/literals.proto\032\032flyteidl/event/event.pr" + - "oto\032\037google/protobuf/timestamp.proto\032\036go" + - "ogle/protobuf/duration.proto\032\034google/pro" + - "tobuf/struct.proto\"M\n\027TaskExecutionGetRe" + - "quest\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" + - "ecutionIdentifier\"\263\001\n\030TaskExecutionListR" + - "equest\022A\n\021node_execution_id\030\001 \001(\0132&.flyt" + - "eidl.core.NodeExecutionIdentifier\022\r\n\005lim" + - "it\030\002 \001(\r\022\r\n\005token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t" + - "\022%\n\007sort_by\030\005 \001(\0132\024.flyteidl.admin.Sort\"" + - "\240\001\n\rTaskExecution\0222\n\002id\030\001 \001(\0132&.flyteidl" + - ".core.TaskExecutionIdentifier\022\021\n\tinput_u" + - "ri\030\002 \001(\t\0225\n\007closure\030\003 \001(\0132$.flyteidl.adm" + - "in.TaskExecutionClosure\022\021\n\tis_parent\030\004 \001" + - "(\010\"Z\n\021TaskExecutionList\0226\n\017task_executio" + - "ns\030\001 \003(\0132\035.flyteidl.admin.TaskExecution\022" + - "\r\n\005token\030\002 \001(\t\"\336\004\n\024TaskExecutionClosure\022" + - "\030\n\noutput_uri\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\013" + - "2\035.flyteidl.core.ExecutionErrorH\000\0224\n\013out" + - "put_data\030\014 \001(\0132\031.flyteidl.core.LiteralMa" + - "pB\002\030\001H\000\0221\n\005phase\030\003 \001(\0162\".flyteidl.core.T" + - "askExecution.Phase\022$\n\004logs\030\004 \003(\0132\026.flyte" + - "idl.core.TaskLog\022.\n\nstarted_at\030\005 \001(\0132\032.g" + - "oogle.protobuf.Timestamp\022+\n\010duration\030\006 \001" + - "(\0132\031.google.protobuf.Duration\022.\n\ncreated" + - "_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022.\n" + - "\nupdated_at\030\010 \001(\0132\032.google.protobuf.Time" + - "stamp\022,\n\013custom_info\030\t \001(\0132\027.google.prot" + - "obuf.Struct\022\016\n\006reason\030\n \001(\t\022\021\n\ttask_type" + - "\030\013 \001(\t\0227\n\010metadata\030\020 \001(\0132%.flyteidl.even" + - "t.TaskExecutionMetadata\022\025\n\revent_version" + - "\030\021 \001(\005B\017\n\routput_result\"Q\n\033TaskExecution" + - "GetDataRequest\0222\n\002id\030\001 \001(\0132&.flyteidl.co" + - "re.TaskExecutionIdentifier\"\332\001\n\034TaskExecu" + - "tionGetDataResponse\022+\n\006inputs\030\001 \001(\0132\027.fl" + - "yteidl.admin.UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(" + - "\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013full_i" + - "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMap\022/" + - "\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core.Lit" + - "eralMapB7Z5github.com/flyteorg/flyteidl/" + - "gen/pb-go/flyteidl/adminb\006proto3" + "to\032\032flyteidl/core/errors.proto\032\035flyteidl" + + "/core/execution.proto\032\036flyteidl/core/ide" + + "ntifier.proto\032\034flyteidl/core/literals.pr" + + "oto\032\032flyteidl/event/event.proto\032\037google/" + + "protobuf/timestamp.proto\032\036google/protobu" + + "f/duration.proto\032\034google/protobuf/struct" + + ".proto\"M\n\027TaskExecutionGetRequest\0222\n\002id\030" + + "\001 \001(\0132&.flyteidl.core.TaskExecutionIdent" + + "ifier\"\263\001\n\030TaskExecutionListRequest\022A\n\021no" + + "de_execution_id\030\001 \001(\0132&.flyteidl.core.No" + + "deExecutionIdentifier\022\r\n\005limit\030\002 \001(\r\022\r\n\005" + + "token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t\022%\n\007sort_by\030" + + "\005 \001(\0132\024.flyteidl.admin.Sort\"\240\001\n\rTaskExec" + + "ution\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" + + "ecutionIdentifier\022\021\n\tinput_uri\030\002 \001(\t\0225\n\007" + + "closure\030\003 \001(\0132$.flyteidl.admin.TaskExecu" + + "tionClosure\022\021\n\tis_parent\030\004 \001(\010\"Z\n\021TaskEx" + + "ecutionList\0226\n\017task_executions\030\001 \003(\0132\035.f" + + "lyteidl.admin.TaskExecution\022\r\n\005token\030\002 \001" + + "(\t\"\336\004\n\024TaskExecutionClosure\022\030\n\noutput_ur" + + "i\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl." + + "core.ExecutionErrorH\000\0224\n\013output_data\030\014 \001" + + "(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0221\n\005p" + + "hase\030\003 \001(\0162\".flyteidl.core.TaskExecution" + + ".Phase\022$\n\004logs\030\004 \003(\0132\026.flyteidl.core.Tas" + + "kLog\022.\n\nstarted_at\030\005 \001(\0132\032.google.protob" + + "uf.Timestamp\022+\n\010duration\030\006 \001(\0132\031.google." + + "protobuf.Duration\022.\n\ncreated_at\030\007 \001(\0132\032." + + "google.protobuf.Timestamp\022.\n\nupdated_at\030" + + "\010 \001(\0132\032.google.protobuf.Timestamp\022,\n\013cus" + + "tom_info\030\t \001(\0132\027.google.protobuf.Struct\022" + + "\016\n\006reason\030\n \001(\t\022\021\n\ttask_type\030\013 \001(\t\0227\n\010me" + + "tadata\030\020 \001(\0132%.flyteidl.event.TaskExecut" + + "ionMetadata\022\025\n\revent_version\030\021 \001(\005B\017\n\rou" + + "tput_result\"Q\n\033TaskExecutionGetDataReque" + + "st\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskExecu" + + "tionIdentifier\"\332\001\n\034TaskExecutionGetDataR" + + "esponse\022+\n\006inputs\030\001 \001(\0132\027.flyteidl.admin" + + ".UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(\0132\027.flyteidl" + + ".admin.UrlBlobB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132" + + "\031.flyteidl.core.LiteralMap\022/\n\014full_outpu" + + "ts\030\004 \001(\0132\031.flyteidl.core.LiteralMap\"e\n\032T" + + "askExecutionUpdateRequest\0222\n\002id\030\001 \001(\0132&." + + "flyteidl.core.TaskExecutionIdentifier\022\023\n" + + "\013evict_cache\030\002 \001(\010\"c\n\033TaskExecutionUpdat" + + "eResponse\022D\n\025cache_eviction_errors\030\001 \001(\013" + + "2%.flyteidl.core.CacheEvictionErrorListB" + + "7Z5github.com/flyteorg/flyteidl/gen/pb-g" + + "o/flyteidl/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -10404,6 +11780,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { flyteidl.admin.Common.getDescriptor(), + flyteidl.core.Errors.getDescriptor(), flyteidl.core.Execution.getDescriptor(), flyteidl.core.IdentifierOuterClass.getDescriptor(), flyteidl.core.Literals.getDescriptor(), @@ -10454,7 +11831,20 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_TaskExecutionGetDataResponse_descriptor, new java.lang.String[] { "Inputs", "Outputs", "FullInputs", "FullOutputs", }); + internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor = + getDescriptor().getMessageTypes().get(7); + internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor, + new java.lang.String[] { "Id", "EvictCache", }); + internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor = + getDescriptor().getMessageTypes().get(8); + internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor, + new java.lang.String[] { "CacheEvictionErrors", }); flyteidl.admin.Common.getDescriptor(); + flyteidl.core.Errors.getDescriptor(); flyteidl.core.Execution.getDescriptor(); flyteidl.core.IdentifierOuterClass.getDescriptor(); flyteidl.core.Literals.getDescriptor(); diff --git a/flyteidl/gen/pb-java/flyteidl/core/Errors.java b/flyteidl/gen/pb-java/flyteidl/core/Errors.java index a6ea3a8d5b..54d6aa45dd 100644 --- a/flyteidl/gen/pb-java/flyteidl/core/Errors.java +++ b/flyteidl/gen/pb-java/flyteidl/core/Errors.java @@ -1820,6 +1820,2483 @@ public flyteidl.core.Errors.ErrorDocument getDefaultInstanceForType() { } + public interface CacheEvictionErrorOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.core.CacheEvictionError) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * Error code to match type of cache eviction error encountered.
+     *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + int getCodeValue(); + /** + * 
+     * Error code to match type of cache eviction error encountered.
+     *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + flyteidl.core.Errors.CacheEvictionError.Code getCode(); + + /** + * 
+     * More detailed error message explaining the reason for the cache eviction failure.
+     *
+ * + * string message = 2; + */ + java.lang.String getMessage(); + /** + * 
+     * More detailed error message explaining the reason for the cache eviction failure.
+     *
+ * + * string message = 2; + */ + com.google.protobuf.ByteString + getMessageBytes(); + + /** + * 
+     * ID of the node execution the cache eviction failed for.
+     *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + boolean hasNodeExecutionId(); + /** + * 
+     * ID of the node execution the cache eviction failed for.
+     *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier getNodeExecutionId(); + /** + * 
+     * ID of the node execution the cache eviction failed for.
+     *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifierOrBuilder getNodeExecutionIdOrBuilder(); + + /** + * 
+     * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + boolean hasTaskExecutionId(); + /** + * 
+     * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId(); + /** + * 
+     * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder(); + + /** + * 
+     * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + boolean hasWorkflowExecutionId(); + /** + * 
+     * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId(); + /** + * 
+     * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder(); + + public flyteidl.core.Errors.CacheEvictionError.SourceCase getSourceCase(); + } + /** + * 
+   * Error returned if eviction of cached output fails and should be re-tried by the user.
+   *
+ * + * Protobuf type {@code flyteidl.core.CacheEvictionError} + */ + public static final class CacheEvictionError extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.core.CacheEvictionError) + CacheEvictionErrorOrBuilder { + private static final long serialVersionUID = 0L; + // Use CacheEvictionError.newBuilder() to construct. + private CacheEvictionError(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CacheEvictionError() { + code_ = 0; + message_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CacheEvictionError( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + int rawValue = input.readEnum(); + + code_ = rawValue; + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + message_ = s; + break; + } + case 26: { + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.Builder subBuilder = null; + if (nodeExecutionId_ != null) { + subBuilder = nodeExecutionId_.toBuilder(); + } + nodeExecutionId_ = input.readMessage(flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(nodeExecutionId_); + nodeExecutionId_ = subBuilder.buildPartial(); + } + + break; + } + case 34: { + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder subBuilder = null; + if (sourceCase_ == 4) { + subBuilder = ((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_).toBuilder(); + } + source_ = + input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_); + source_ = subBuilder.buildPartial(); + } + sourceCase_ = 4; + break; + } + case 42: { + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null; + if (sourceCase_ == 5) { + subBuilder = ((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_).toBuilder(); + } + source_ = + input.readMessage(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_); + source_ = subBuilder.buildPartial(); + } + sourceCase_ = 5; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionError_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionError_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.core.Errors.CacheEvictionError.class, flyteidl.core.Errors.CacheEvictionError.Builder.class); + } + + /** + * Protobuf enum {@code flyteidl.core.CacheEvictionError.Code} + */ + public enum Code + implements com.google.protobuf.ProtocolMessageEnum { + /** + * UNKNOWN = 0; + */ + UNKNOWN(0), + UNRECOGNIZED(-1), + ; + + /** + * UNKNOWN = 0; + */ + public static final int UNKNOWN_VALUE = 0; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static Code valueOf(int value) { + return forNumber(value); + } + + public static Code forNumber(int value) { + switch (value) { + case 0: return UNKNOWN; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + Code> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Code findValueByNumber(int number) { + return Code.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return flyteidl.core.Errors.CacheEvictionError.getDescriptor().getEnumTypes().get(0); + } + + private static final Code[] VALUES = values(); + + public static Code valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private Code(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:flyteidl.core.CacheEvictionError.Code) + } + + private int sourceCase_ = 0; + private java.lang.Object source_; + public enum SourceCase + implements com.google.protobuf.Internal.EnumLite { + TASK_EXECUTION_ID(4), + WORKFLOW_EXECUTION_ID(5), + SOURCE_NOT_SET(0); + private final int value; + private SourceCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static SourceCase valueOf(int value) { + return forNumber(value); + } + + public static SourceCase forNumber(int value) { + switch (value) { + case 4: return TASK_EXECUTION_ID; + case 5: return WORKFLOW_EXECUTION_ID; + case 0: return SOURCE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public SourceCase + getSourceCase() { + return SourceCase.forNumber( + sourceCase_); + } + + public static final int CODE_FIELD_NUMBER = 1; + private int code_; + /** + * 
+     * Error code to match type of cache eviction error encountered.
+     *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + public int getCodeValue() { + return code_; + } + /** + * 
+     * Error code to match type of cache eviction error encountered.
+     *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + public flyteidl.core.Errors.CacheEvictionError.Code getCode() { + @SuppressWarnings("deprecation") + flyteidl.core.Errors.CacheEvictionError.Code result = flyteidl.core.Errors.CacheEvictionError.Code.valueOf(code_); + return result == null ? flyteidl.core.Errors.CacheEvictionError.Code.UNRECOGNIZED : result; + } + + public static final int MESSAGE_FIELD_NUMBER = 2; + private volatile java.lang.Object message_; + /** + * 
+     * More detailed error message explaining the reason for the cache eviction failure.
+     *
+ * + * string message = 2; + */ + public java.lang.String getMessage() { + java.lang.Object ref = message_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + message_ = s; + return s; + } + } + /** + * 
+     * More detailed error message explaining the reason for the cache eviction failure.
+     *
+ * + * string message = 2; + */ + public com.google.protobuf.ByteString + getMessageBytes() { + java.lang.Object ref = message_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + message_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int NODE_EXECUTION_ID_FIELD_NUMBER = 3; + private flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier nodeExecutionId_; + /** + * 
+     * ID of the node execution the cache eviction failed for.
+     *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public boolean hasNodeExecutionId() { + return nodeExecutionId_ != null; + } + /** + * 
+     * ID of the node execution the cache eviction failed for.
+     *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier getNodeExecutionId() { + return nodeExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.getDefaultInstance() : nodeExecutionId_; + } + /** + * 
+     * ID of the node execution the cache eviction failed for.
+     *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifierOrBuilder getNodeExecutionIdOrBuilder() { + return getNodeExecutionId(); + } + + public static final int TASK_EXECUTION_ID_FIELD_NUMBER = 4; + /** + * 
+     * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public boolean hasTaskExecutionId() { + return sourceCase_ == 4; + } + /** + * 
+     * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId() { + if (sourceCase_ == 4) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } + /** + * 
+     * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder() { + if (sourceCase_ == 4) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } + + public static final int WORKFLOW_EXECUTION_ID_FIELD_NUMBER = 5; + /** + * 
+     * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public boolean hasWorkflowExecutionId() { + return sourceCase_ == 5; + } + /** + * 
+     * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { + if (sourceCase_ == 5) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + /** + * 
+     * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { + if (sourceCase_ == 5) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (code_ != flyteidl.core.Errors.CacheEvictionError.Code.UNKNOWN.getNumber()) { + output.writeEnum(1, code_); + } + if (!getMessageBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, message_); + } + if (nodeExecutionId_ != null) { + output.writeMessage(3, getNodeExecutionId()); + } + if (sourceCase_ == 4) { + output.writeMessage(4, (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_); + } + if (sourceCase_ == 5) { + output.writeMessage(5, (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (code_ != flyteidl.core.Errors.CacheEvictionError.Code.UNKNOWN.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, code_); + } + if (!getMessageBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, message_); + } + if (nodeExecutionId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getNodeExecutionId()); + } + if (sourceCase_ == 4) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_); + } + if (sourceCase_ == 5) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.core.Errors.CacheEvictionError)) { + return super.equals(obj); + } + flyteidl.core.Errors.CacheEvictionError other = (flyteidl.core.Errors.CacheEvictionError) obj; + + if (code_ != other.code_) return false; + if (!getMessage() + .equals(other.getMessage())) return false; + if (hasNodeExecutionId() != other.hasNodeExecutionId()) return false; + if (hasNodeExecutionId()) { + if (!getNodeExecutionId() + .equals(other.getNodeExecutionId())) return false; + } + if (!getSourceCase().equals(other.getSourceCase())) return false; + switch (sourceCase_) { + case 4: + if (!getTaskExecutionId() + .equals(other.getTaskExecutionId())) return false; + break; + case 5: + if (!getWorkflowExecutionId() + .equals(other.getWorkflowExecutionId())) return false; + break; + case 0: + default: + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CODE_FIELD_NUMBER; + hash = (53 * hash) + code_; + hash = (37 * hash) + MESSAGE_FIELD_NUMBER; + hash = (53 * hash) + getMessage().hashCode(); + if (hasNodeExecutionId()) { + hash = (37 * hash) + NODE_EXECUTION_ID_FIELD_NUMBER; + hash = (53 * hash) + getNodeExecutionId().hashCode(); + } + switch (sourceCase_) { + case 4: + hash = (37 * hash) + TASK_EXECUTION_ID_FIELD_NUMBER; + hash = (53 * hash) + getTaskExecutionId().hashCode(); + break; + case 5: + hash = (37 * hash) + WORKFLOW_EXECUTION_ID_FIELD_NUMBER; + hash = (53 * hash) + getWorkflowExecutionId().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionError parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.core.Errors.CacheEvictionError parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.core.Errors.CacheEvictionError parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.core.Errors.CacheEvictionError prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * Error returned if eviction of cached output fails and should be re-tried by the user.
+     *
+ * + * Protobuf type {@code flyteidl.core.CacheEvictionError} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.core.CacheEvictionError) + flyteidl.core.Errors.CacheEvictionErrorOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionError_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionError_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.core.Errors.CacheEvictionError.class, flyteidl.core.Errors.CacheEvictionError.Builder.class); + } + + // Construct using flyteidl.core.Errors.CacheEvictionError.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + code_ = 0; + + message_ = ""; + + if (nodeExecutionIdBuilder_ == null) { + nodeExecutionId_ = null; + } else { + nodeExecutionId_ = null; + nodeExecutionIdBuilder_ = null; + } + sourceCase_ = 0; + source_ = null; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionError_descriptor; + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionError getDefaultInstanceForType() { + return flyteidl.core.Errors.CacheEvictionError.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionError build() { + flyteidl.core.Errors.CacheEvictionError result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionError buildPartial() { + flyteidl.core.Errors.CacheEvictionError result = new flyteidl.core.Errors.CacheEvictionError(this); + result.code_ = code_; + result.message_ = message_; + if (nodeExecutionIdBuilder_ == null) { + result.nodeExecutionId_ = nodeExecutionId_; + } else { + result.nodeExecutionId_ = nodeExecutionIdBuilder_.build(); + } + if (sourceCase_ == 4) { + if (taskExecutionIdBuilder_ == null) { + result.source_ = source_; + } else { + result.source_ = taskExecutionIdBuilder_.build(); + } + } + if (sourceCase_ == 5) { + if (workflowExecutionIdBuilder_ == null) { + result.source_ = source_; + } else { + result.source_ = workflowExecutionIdBuilder_.build(); + } + } + result.sourceCase_ = sourceCase_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.core.Errors.CacheEvictionError) { + return mergeFrom((flyteidl.core.Errors.CacheEvictionError)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.core.Errors.CacheEvictionError other) { + if (other == flyteidl.core.Errors.CacheEvictionError.getDefaultInstance()) return this; + if (other.code_ != 0) { + setCodeValue(other.getCodeValue()); + } + if (!other.getMessage().isEmpty()) { + message_ = other.message_; + onChanged(); + } + if (other.hasNodeExecutionId()) { + mergeNodeExecutionId(other.getNodeExecutionId()); + } + switch (other.getSourceCase()) { + case TASK_EXECUTION_ID: { + mergeTaskExecutionId(other.getTaskExecutionId()); + break; + } + case WORKFLOW_EXECUTION_ID: { + mergeWorkflowExecutionId(other.getWorkflowExecutionId()); + break; + } + case SOURCE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.core.Errors.CacheEvictionError parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.core.Errors.CacheEvictionError) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int sourceCase_ = 0; + private java.lang.Object source_; + public SourceCase + getSourceCase() { + return SourceCase.forNumber( + sourceCase_); + } + + public Builder clearSource() { + sourceCase_ = 0; + source_ = null; + onChanged(); + return this; + } + + + private int code_ = 0; + /** + * 
+       * Error code to match type of cache eviction error encountered.
+       *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + public int getCodeValue() { + return code_; + } + /** + * 
+       * Error code to match type of cache eviction error encountered.
+       *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + public Builder setCodeValue(int value) { + code_ = value; + onChanged(); + return this; + } + /** + * 
+       * Error code to match type of cache eviction error encountered.
+       *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + public flyteidl.core.Errors.CacheEvictionError.Code getCode() { + @SuppressWarnings("deprecation") + flyteidl.core.Errors.CacheEvictionError.Code result = flyteidl.core.Errors.CacheEvictionError.Code.valueOf(code_); + return result == null ? flyteidl.core.Errors.CacheEvictionError.Code.UNRECOGNIZED : result; + } + /** + * 
+       * Error code to match type of cache eviction error encountered.
+       *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + public Builder setCode(flyteidl.core.Errors.CacheEvictionError.Code value) { + if (value == null) { + throw new NullPointerException(); + } + + code_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+       * Error code to match type of cache eviction error encountered.
+       *
+ * + * .flyteidl.core.CacheEvictionError.Code code = 1; + */ + public Builder clearCode() { + + code_ = 0; + onChanged(); + return this; + } + + private java.lang.Object message_ = ""; + /** + * 
+       * More detailed error message explaining the reason for the cache eviction failure.
+       *
+ * + * string message = 2; + */ + public java.lang.String getMessage() { + java.lang.Object ref = message_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + message_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * More detailed error message explaining the reason for the cache eviction failure.
+       *
+ * + * string message = 2; + */ + public com.google.protobuf.ByteString + getMessageBytes() { + java.lang.Object ref = message_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + message_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * More detailed error message explaining the reason for the cache eviction failure.
+       *
+ * + * string message = 2; + */ + public Builder setMessage( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + message_ = value; + onChanged(); + return this; + } + /** + * 
+       * More detailed error message explaining the reason for the cache eviction failure.
+       *
+ * + * string message = 2; + */ + public Builder clearMessage() { + + message_ = getDefaultInstance().getMessage(); + onChanged(); + return this; + } + /** + * 
+       * More detailed error message explaining the reason for the cache eviction failure.
+       *
+ * + * string message = 2; + */ + public Builder setMessageBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + message_ = value; + onChanged(); + return this; + } + + private flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier nodeExecutionId_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier, flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifierOrBuilder> nodeExecutionIdBuilder_; + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public boolean hasNodeExecutionId() { + return nodeExecutionIdBuilder_ != null || nodeExecutionId_ != null; + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier getNodeExecutionId() { + if (nodeExecutionIdBuilder_ == null) { + return nodeExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.getDefaultInstance() : nodeExecutionId_; + } else { + return nodeExecutionIdBuilder_.getMessage(); + } + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public Builder setNodeExecutionId(flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier value) { + if (nodeExecutionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + nodeExecutionId_ = value; + onChanged(); + } else { + nodeExecutionIdBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public Builder setNodeExecutionId( + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.Builder builderForValue) { + if (nodeExecutionIdBuilder_ == null) { + nodeExecutionId_ = builderForValue.build(); + onChanged(); + } else { + nodeExecutionIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public Builder mergeNodeExecutionId(flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier value) { + if (nodeExecutionIdBuilder_ == null) { + if (nodeExecutionId_ != null) { + nodeExecutionId_ = + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.newBuilder(nodeExecutionId_).mergeFrom(value).buildPartial(); + } else { + nodeExecutionId_ = value; + } + onChanged(); + } else { + nodeExecutionIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public Builder clearNodeExecutionId() { + if (nodeExecutionIdBuilder_ == null) { + nodeExecutionId_ = null; + onChanged(); + } else { + nodeExecutionId_ = null; + nodeExecutionIdBuilder_ = null; + } + + return this; + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.Builder getNodeExecutionIdBuilder() { + + onChanged(); + return getNodeExecutionIdFieldBuilder().getBuilder(); + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + public flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifierOrBuilder getNodeExecutionIdOrBuilder() { + if (nodeExecutionIdBuilder_ != null) { + return nodeExecutionIdBuilder_.getMessageOrBuilder(); + } else { + return nodeExecutionId_ == null ? + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.getDefaultInstance() : nodeExecutionId_; + } + } + /** + * 
+       * ID of the node execution the cache eviction failed for.
+       *
+ * + * .flyteidl.core.NodeExecutionIdentifier node_execution_id = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier, flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifierOrBuilder> + getNodeExecutionIdFieldBuilder() { + if (nodeExecutionIdBuilder_ == null) { + nodeExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier, flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.NodeExecutionIdentifierOrBuilder>( + getNodeExecutionId(), + getParentForChildren(), + isClean()); + nodeExecutionId_ = null; + } + return nodeExecutionIdBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> taskExecutionIdBuilder_; + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public boolean hasTaskExecutionId() { + return sourceCase_ == 4; + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId() { + if (taskExecutionIdBuilder_ == null) { + if (sourceCase_ == 4) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } else { + if (sourceCase_ == 4) { + return taskExecutionIdBuilder_.getMessage(); + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public Builder setTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (taskExecutionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + source_ = value; + onChanged(); + } else { + taskExecutionIdBuilder_.setMessage(value); + } + sourceCase_ = 4; + return this; + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public Builder setTaskExecutionId( + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder builderForValue) { + if (taskExecutionIdBuilder_ == null) { + source_ = builderForValue.build(); + onChanged(); + } else { + taskExecutionIdBuilder_.setMessage(builderForValue.build()); + } + sourceCase_ = 4; + return this; + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public Builder mergeTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (taskExecutionIdBuilder_ == null) { + if (sourceCase_ == 4 && + source_ != flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance()) { + source_ = flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_) + .mergeFrom(value).buildPartial(); + } else { + source_ = value; + } + onChanged(); + } else { + if (sourceCase_ == 4) { + taskExecutionIdBuilder_.mergeFrom(value); + } + taskExecutionIdBuilder_.setMessage(value); + } + sourceCase_ = 4; + return this; + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public Builder clearTaskExecutionId() { + if (taskExecutionIdBuilder_ == null) { + if (sourceCase_ == 4) { + sourceCase_ = 0; + source_ = null; + onChanged(); + } + } else { + if (sourceCase_ == 4) { + sourceCase_ = 0; + source_ = null; + } + taskExecutionIdBuilder_.clear(); + } + return this; + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getTaskExecutionIdBuilder() { + return getTaskExecutionIdFieldBuilder().getBuilder(); + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder() { + if ((sourceCase_ == 4) && (taskExecutionIdBuilder_ != null)) { + return taskExecutionIdBuilder_.getMessageOrBuilder(); + } else { + if (sourceCase_ == 4) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } + } + /** + * 
+       * ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> + getTaskExecutionIdFieldBuilder() { + if (taskExecutionIdBuilder_ == null) { + if (!(sourceCase_ == 4)) { + source_ = flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } + taskExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder>( + (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) source_, + getParentForChildren(), + isClean()); + source_ = null; + } + sourceCase_ = 4; + onChanged();; + return taskExecutionIdBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> workflowExecutionIdBuilder_; + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public boolean hasWorkflowExecutionId() { + return sourceCase_ == 5; + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { + if (workflowExecutionIdBuilder_ == null) { + if (sourceCase_ == 5) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } else { + if (sourceCase_ == 5) { + return workflowExecutionIdBuilder_.getMessage(); + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public Builder setWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (workflowExecutionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + source_ = value; + onChanged(); + } else { + workflowExecutionIdBuilder_.setMessage(value); + } + sourceCase_ = 5; + return this; + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public Builder setWorkflowExecutionId( + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) { + if (workflowExecutionIdBuilder_ == null) { + source_ = builderForValue.build(); + onChanged(); + } else { + workflowExecutionIdBuilder_.setMessage(builderForValue.build()); + } + sourceCase_ = 5; + return this; + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public Builder mergeWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (workflowExecutionIdBuilder_ == null) { + if (sourceCase_ == 5 && + source_ != flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance()) { + source_ = flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.newBuilder((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_) + .mergeFrom(value).buildPartial(); + } else { + source_ = value; + } + onChanged(); + } else { + if (sourceCase_ == 5) { + workflowExecutionIdBuilder_.mergeFrom(value); + } + workflowExecutionIdBuilder_.setMessage(value); + } + sourceCase_ = 5; + return this; + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public Builder clearWorkflowExecutionId() { + if (workflowExecutionIdBuilder_ == null) { + if (sourceCase_ == 5) { + sourceCase_ = 0; + source_ = null; + onChanged(); + } + } else { + if (sourceCase_ == 5) { + sourceCase_ = 0; + source_ = null; + } + workflowExecutionIdBuilder_.clear(); + } + return this; + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getWorkflowExecutionIdBuilder() { + return getWorkflowExecutionIdFieldBuilder().getBuilder(); + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { + if ((sourceCase_ == 5) && (workflowExecutionIdBuilder_ != null)) { + return workflowExecutionIdBuilder_.getMessageOrBuilder(); + } else { + if (sourceCase_ == 5) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + } + /** + * 
+       * ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> + getWorkflowExecutionIdFieldBuilder() { + if (workflowExecutionIdBuilder_ == null) { + if (!(sourceCase_ == 5)) { + source_ = flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + workflowExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder>( + (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) source_, + getParentForChildren(), + isClean()); + source_ = null; + } + sourceCase_ = 5; + onChanged();; + return workflowExecutionIdBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.core.CacheEvictionError) + } + + // @@protoc_insertion_point(class_scope:flyteidl.core.CacheEvictionError) + private static final flyteidl.core.Errors.CacheEvictionError DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.core.Errors.CacheEvictionError(); + } + + public static flyteidl.core.Errors.CacheEvictionError getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CacheEvictionError parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CacheEvictionError(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionError getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface CacheEvictionErrorListOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.core.CacheEvictionErrorList) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + java.util.List + getErrorsList(); + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + flyteidl.core.Errors.CacheEvictionError getErrors(int index); + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + int getErrorsCount(); + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + java.util.List + getErrorsOrBuilderList(); + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + flyteidl.core.Errors.CacheEvictionErrorOrBuilder getErrorsOrBuilder( + int index); + } + /** + * 
+   * List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request.
+   *
+ * + * Protobuf type {@code flyteidl.core.CacheEvictionErrorList} + */ + public static final class CacheEvictionErrorList extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.core.CacheEvictionErrorList) + CacheEvictionErrorListOrBuilder { + private static final long serialVersionUID = 0L; + // Use CacheEvictionErrorList.newBuilder() to construct. + private CacheEvictionErrorList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CacheEvictionErrorList() { + errors_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CacheEvictionErrorList( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + errors_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + errors_.add( + input.readMessage(flyteidl.core.Errors.CacheEvictionError.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + errors_ = java.util.Collections.unmodifiableList(errors_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionErrorList_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionErrorList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.core.Errors.CacheEvictionErrorList.class, flyteidl.core.Errors.CacheEvictionErrorList.Builder.class); + } + + public static final int ERRORS_FIELD_NUMBER = 1; + private java.util.List errors_; + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public java.util.List getErrorsList() { + return errors_; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public java.util.List + getErrorsOrBuilderList() { + return errors_; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public int getErrorsCount() { + return errors_.size(); + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionError getErrors(int index) { + return errors_.get(index); + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorOrBuilder getErrorsOrBuilder( + int index) { + return errors_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < errors_.size(); i++) { + output.writeMessage(1, errors_.get(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < errors_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, errors_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.core.Errors.CacheEvictionErrorList)) { + return super.equals(obj); + } + flyteidl.core.Errors.CacheEvictionErrorList other = (flyteidl.core.Errors.CacheEvictionErrorList) obj; + + if (!getErrorsList() + .equals(other.getErrorsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getErrorsCount() > 0) { + hash = (37 * hash) + ERRORS_FIELD_NUMBER; + hash = (53 * hash) + getErrorsList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.core.Errors.CacheEvictionErrorList parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.core.Errors.CacheEvictionErrorList prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request.
+     *
+ * + * Protobuf type {@code flyteidl.core.CacheEvictionErrorList} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.core.CacheEvictionErrorList) + flyteidl.core.Errors.CacheEvictionErrorListOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionErrorList_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionErrorList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.core.Errors.CacheEvictionErrorList.class, flyteidl.core.Errors.CacheEvictionErrorList.Builder.class); + } + + // Construct using flyteidl.core.Errors.CacheEvictionErrorList.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getErrorsFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (errorsBuilder_ == null) { + errors_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + errorsBuilder_.clear(); + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.core.Errors.internal_static_flyteidl_core_CacheEvictionErrorList_descriptor; + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionErrorList getDefaultInstanceForType() { + return flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionErrorList build() { + flyteidl.core.Errors.CacheEvictionErrorList result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionErrorList buildPartial() { + flyteidl.core.Errors.CacheEvictionErrorList result = new flyteidl.core.Errors.CacheEvictionErrorList(this); + int from_bitField0_ = bitField0_; + if (errorsBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + errors_ = java.util.Collections.unmodifiableList(errors_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.errors_ = errors_; + } else { + result.errors_ = errorsBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.core.Errors.CacheEvictionErrorList) { + return mergeFrom((flyteidl.core.Errors.CacheEvictionErrorList)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.core.Errors.CacheEvictionErrorList other) { + if (other == flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance()) return this; + if (errorsBuilder_ == null) { + if (!other.errors_.isEmpty()) { + if (errors_.isEmpty()) { + errors_ = other.errors_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureErrorsIsMutable(); + errors_.addAll(other.errors_); + } + onChanged(); + } + } else { + if (!other.errors_.isEmpty()) { + if (errorsBuilder_.isEmpty()) { + errorsBuilder_.dispose(); + errorsBuilder_ = null; + errors_ = other.errors_; + bitField0_ = (bitField0_ & ~0x00000001); + errorsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getErrorsFieldBuilder() : null; + } else { + errorsBuilder_.addAllMessages(other.errors_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.core.Errors.CacheEvictionErrorList parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.core.Errors.CacheEvictionErrorList) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List errors_ = + java.util.Collections.emptyList(); + private void ensureErrorsIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + errors_ = new java.util.ArrayList(errors_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionError, flyteidl.core.Errors.CacheEvictionError.Builder, flyteidl.core.Errors.CacheEvictionErrorOrBuilder> errorsBuilder_; + + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public java.util.List getErrorsList() { + if (errorsBuilder_ == null) { + return java.util.Collections.unmodifiableList(errors_); + } else { + return errorsBuilder_.getMessageList(); + } + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public int getErrorsCount() { + if (errorsBuilder_ == null) { + return errors_.size(); + } else { + return errorsBuilder_.getCount(); + } + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionError getErrors(int index) { + if (errorsBuilder_ == null) { + return errors_.get(index); + } else { + return errorsBuilder_.getMessage(index); + } + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder setErrors( + int index, flyteidl.core.Errors.CacheEvictionError value) { + if (errorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureErrorsIsMutable(); + errors_.set(index, value); + onChanged(); + } else { + errorsBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder setErrors( + int index, flyteidl.core.Errors.CacheEvictionError.Builder builderForValue) { + if (errorsBuilder_ == null) { + ensureErrorsIsMutable(); + errors_.set(index, builderForValue.build()); + onChanged(); + } else { + errorsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder addErrors(flyteidl.core.Errors.CacheEvictionError value) { + if (errorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureErrorsIsMutable(); + errors_.add(value); + onChanged(); + } else { + errorsBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder addErrors( + int index, flyteidl.core.Errors.CacheEvictionError value) { + if (errorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureErrorsIsMutable(); + errors_.add(index, value); + onChanged(); + } else { + errorsBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder addErrors( + flyteidl.core.Errors.CacheEvictionError.Builder builderForValue) { + if (errorsBuilder_ == null) { + ensureErrorsIsMutable(); + errors_.add(builderForValue.build()); + onChanged(); + } else { + errorsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder addErrors( + int index, flyteidl.core.Errors.CacheEvictionError.Builder builderForValue) { + if (errorsBuilder_ == null) { + ensureErrorsIsMutable(); + errors_.add(index, builderForValue.build()); + onChanged(); + } else { + errorsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder addAllErrors( + java.lang.Iterable values) { + if (errorsBuilder_ == null) { + ensureErrorsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, errors_); + onChanged(); + } else { + errorsBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder clearErrors() { + if (errorsBuilder_ == null) { + errors_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + errorsBuilder_.clear(); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public Builder removeErrors(int index) { + if (errorsBuilder_ == null) { + ensureErrorsIsMutable(); + errors_.remove(index); + onChanged(); + } else { + errorsBuilder_.remove(index); + } + return this; + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionError.Builder getErrorsBuilder( + int index) { + return getErrorsFieldBuilder().getBuilder(index); + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorOrBuilder getErrorsOrBuilder( + int index) { + if (errorsBuilder_ == null) { + return errors_.get(index); } else { + return errorsBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public java.util.List + getErrorsOrBuilderList() { + if (errorsBuilder_ != null) { + return errorsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(errors_); + } + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionError.Builder addErrorsBuilder() { + return getErrorsFieldBuilder().addBuilder( + flyteidl.core.Errors.CacheEvictionError.getDefaultInstance()); + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionError.Builder addErrorsBuilder( + int index) { + return getErrorsFieldBuilder().addBuilder( + index, flyteidl.core.Errors.CacheEvictionError.getDefaultInstance()); + } + /** + * repeated .flyteidl.core.CacheEvictionError errors = 1; + */ + public java.util.List + getErrorsBuilderList() { + return getErrorsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionError, flyteidl.core.Errors.CacheEvictionError.Builder, flyteidl.core.Errors.CacheEvictionErrorOrBuilder> + getErrorsFieldBuilder() { + if (errorsBuilder_ == null) { + errorsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionError, flyteidl.core.Errors.CacheEvictionError.Builder, flyteidl.core.Errors.CacheEvictionErrorOrBuilder>( + errors_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + errors_ = null; + } + return errorsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.core.CacheEvictionErrorList) + } + + // @@protoc_insertion_point(class_scope:flyteidl.core.CacheEvictionErrorList) + private static final flyteidl.core.Errors.CacheEvictionErrorList DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.core.Errors.CacheEvictionErrorList(); + } + + public static flyteidl.core.Errors.CacheEvictionErrorList getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CacheEvictionErrorList parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CacheEvictionErrorList(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.core.Errors.CacheEvictionErrorList getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_core_ContainerError_descriptor; private static final @@ -1830,6 +4307,16 @@ public flyteidl.core.Errors.ErrorDocument getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_core_ErrorDocument_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_core_CacheEvictionError_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_core_CacheEvictionError_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_core_CacheEvictionErrorList_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_core_CacheEvictionErrorList_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1840,16 +4327,27 @@ public flyteidl.core.Errors.ErrorDocument getDefaultInstanceForType() { static { java.lang.String[] descriptorData = { "\n\032flyteidl/core/errors.proto\022\rflyteidl.c" + - "ore\032\035flyteidl/core/execution.proto\"\310\001\n\016C" + - "ontainerError\022\014\n\004code\030\001 \001(\t\022\017\n\007message\030\002" + - " \001(\t\0220\n\004kind\030\003 \001(\0162\".flyteidl.core.Conta" + - "inerError.Kind\0227\n\006origin\030\004 \001(\0162\'.flyteid" + - "l.core.ExecutionError.ErrorKind\",\n\004Kind\022" + - "\023\n\017NON_RECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n" + - "\rErrorDocument\022,\n\005error\030\001 \001(\0132\035.flyteidl" + - ".core.ContainerErrorB6Z4github.com/flyte" + - "org/flyteidl/gen/pb-go/flyteidl/coreb\006pr" + - "oto3" + "ore\032\035flyteidl/core/execution.proto\032\036flyt" + + "eidl/core/identifier.proto\"\310\001\n\016Container" + + "Error\022\014\n\004code\030\001 \001(\t\022\017\n\007message\030\002 \001(\t\0220\n\004" + + "kind\030\003 \001(\0162\".flyteidl.core.ContainerErro" + + "r.Kind\0227\n\006origin\030\004 \001(\0162\'.flyteidl.core.E" + + "xecutionError.ErrorKind\",\n\004Kind\022\023\n\017NON_R" + + "ECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n\rErrorDo" + + "cument\022,\n\005error\030\001 \001(\0132\035.flyteidl.core.Co" + + "ntainerError\"\317\002\n\022CacheEvictionError\0224\n\004c" + + "ode\030\001 \001(\0162&.flyteidl.core.CacheEvictionE" + + "rror.Code\022\017\n\007message\030\002 \001(\t\022A\n\021node_execu" + + "tion_id\030\003 \001(\0132&.flyteidl.core.NodeExecut" + + "ionIdentifier\022C\n\021task_execution_id\030\004 \001(\013" + + "2&.flyteidl.core.TaskExecutionIdentifier" + + "H\000\022K\n\025workflow_execution_id\030\005 \001(\0132*.flyt" + + "eidl.core.WorkflowExecutionIdentifierH\000\"" + + "\023\n\004Code\022\013\n\007UNKNOWN\020\000B\010\n\006source\"K\n\026CacheE" + + "victionErrorList\0221\n\006errors\030\001 \003(\0132!.flyte" + + "idl.core.CacheEvictionErrorB6Z4github.co" + + "m/flyteorg/flyteidl/gen/pb-go/flyteidl/c" + + "oreb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -1863,6 +4361,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { flyteidl.core.Execution.getDescriptor(), + flyteidl.core.IdentifierOuterClass.getDescriptor(), }, assigner); internal_static_flyteidl_core_ContainerError_descriptor = getDescriptor().getMessageTypes().get(0); @@ -1876,7 +4375,20 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_core_ErrorDocument_descriptor, new java.lang.String[] { "Error", }); + internal_static_flyteidl_core_CacheEvictionError_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_flyteidl_core_CacheEvictionError_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_core_CacheEvictionError_descriptor, + new java.lang.String[] { "Code", "Message", "NodeExecutionId", "TaskExecutionId", "WorkflowExecutionId", "Source", }); + internal_static_flyteidl_core_CacheEvictionErrorList_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_flyteidl_core_CacheEvictionErrorList_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_core_CacheEvictionErrorList_descriptor, + new java.lang.String[] { "Errors", }); flyteidl.core.Execution.getDescriptor(); + flyteidl.core.IdentifierOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/flyteidl/gen/pb-java/flyteidl/service/Admin.java b/flyteidl/gen/pb-java/flyteidl/service/Admin.java index 29c343de42..b8c4772d7e 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Admin.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Admin.java @@ -38,8 +38,8 @@ public static void registerAllExtensions( "admin/task_execution.proto\032\034flyteidl/adm" + "in/version.proto\032\033flyteidl/admin/common." + "proto\032\'flyteidl/admin/description_entity" + - ".proto\032\036flyteidl/core/identifier.proto2\274" + - "L\n\014AdminService\022m\n\nCreateTask\022!.flyteidl" + + ".proto\032\036flyteidl/core/identifier.proto2\323" + + "O\n\014AdminService\022m\n\nCreateTask\022!.flyteidl" + ".admin.TaskCreateRequest\032\".flyteidl.admi" + "n.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/api/v1/ta" + "sks:\001*\022\210\001\n\007GetTask\022 .flyteidl.admin.Obje" + @@ -207,85 +207,95 @@ public static void registerAllExtensions( "cution_id.name}/{id.node_execution_id.no" + "de_id}/{id.task_id.project}/{id.task_id." + "domain}/{id.task_id.name}/{id.task_id.ve" + - "rsion}/{id.retry_attempt}\022\343\001\n\035UpdateProj" + - "ectDomainAttributes\0224.flyteidl.admin.Pro" + - "jectDomainAttributesUpdateRequest\0325.flyt" + - "eidl.admin.ProjectDomainAttributesUpdate" + - "Response\"U\202\323\344\223\002O\032J/api/v1/project_domain" + - "_attributes/{attributes.project}/{attrib" + - "utes.domain}:\001*\022\301\001\n\032GetProjectDomainAttr" + - "ibutes\0221.flyteidl.admin.ProjectDomainAtt" + - "ributesGetRequest\0322.flyteidl.admin.Proje" + - "ctDomainAttributesGetResponse\"<\202\323\344\223\0026\0224/" + - "api/v1/project_domain_attributes/{projec" + - "t}/{domain}\022\315\001\n\035DeleteProjectDomainAttri" + - "butes\0224.flyteidl.admin.ProjectDomainAttr" + - "ibutesDeleteRequest\0325.flyteidl.admin.Pro" + - "jectDomainAttributesDeleteResponse\"?\202\323\344\223" + - "\0029*4/api/v1/project_domain_attributes/{p" + - "roject}/{domain}:\001*\022\266\001\n\027UpdateProjectAtt" + - "ributes\022..flyteidl.admin.ProjectAttribut" + - "esUpdateRequest\032/.flyteidl.admin.Project" + - "AttributesUpdateResponse\":\202\323\344\223\0024\032//api/v" + - "1/project_attributes/{attributes.project" + - "}:\001*\022\237\001\n\024GetProjectAttributes\022+.flyteidl" + - ".admin.ProjectAttributesGetRequest\032,.fly" + - "teidl.admin.ProjectAttributesGetResponse" + - "\",\202\323\344\223\002&\022$/api/v1/project_attributes/{pr" + - "oject}\022\253\001\n\027DeleteProjectAttributes\022..fly" + - "teidl.admin.ProjectAttributesDeleteReque" + - "st\032/.flyteidl.admin.ProjectAttributesDel" + - "eteResponse\"/\202\323\344\223\002)*$/api/v1/project_att" + - "ributes/{project}:\001*\022\344\001\n\030UpdateWorkflowA" + - "ttributes\022/.flyteidl.admin.WorkflowAttri" + - "butesUpdateRequest\0320.flyteidl.admin.Work" + - "flowAttributesUpdateResponse\"e\202\323\344\223\002_\032Z/a" + - "pi/v1/workflow_attributes/{attributes.pr" + - "oject}/{attributes.domain}/{attributes.w" + - "orkflow}:\001*\022\267\001\n\025GetWorkflowAttributes\022,." + - "flyteidl.admin.WorkflowAttributesGetRequ" + - "est\032-.flyteidl.admin.WorkflowAttributesG" + - "etResponse\"A\202\323\344\223\002;\0229/api/v1/workflow_att" + - "ributes/{project}/{domain}/{workflow}\022\303\001" + - "\n\030DeleteWorkflowAttributes\022/.flyteidl.ad" + - "min.WorkflowAttributesDeleteRequest\0320.fl" + - "yteidl.admin.WorkflowAttributesDeleteRes" + - "ponse\"D\202\323\344\223\002>*9/api/v1/workflow_attribut" + - "es/{project}/{domain}/{workflow}:\001*\022\240\001\n\027" + - "ListMatchableAttributes\022..flyteidl.admin" + - ".ListMatchableAttributesRequest\032/.flytei" + - "dl.admin.ListMatchableAttributesResponse" + - "\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attributes\022\237" + - "\001\n\021ListNamedEntities\022&.flyteidl.admin.Na" + - "medEntityListRequest\032\037.flyteidl.admin.Na" + - "medEntityList\"A\202\323\344\223\002;\0229/api/v1/named_ent" + - "ities/{resource_type}/{project}/{domain}" + - "\022\247\001\n\016GetNamedEntity\022%.flyteidl.admin.Nam" + - "edEntityGetRequest\032\033.flyteidl.admin.Name" + - "dEntity\"Q\202\323\344\223\002K\022I/api/v1/named_entities/" + - "{resource_type}/{id.project}/{id.domain}" + - "/{id.name}\022\276\001\n\021UpdateNamedEntity\022(.flyte" + - "idl.admin.NamedEntityUpdateRequest\032).fly" + - "teidl.admin.NamedEntityUpdateResponse\"T\202" + - "\323\344\223\002N\032I/api/v1/named_entities/{resource_" + - "type}/{id.project}/{id.domain}/{id.name}" + - ":\001*\022l\n\nGetVersion\022!.flyteidl.admin.GetVe" + - "rsionRequest\032\".flyteidl.admin.GetVersion" + - "Response\"\027\202\323\344\223\002\021\022\017/api/v1/version\022\304\001\n\024Ge" + - "tDescriptionEntity\022 .flyteidl.admin.Obje" + - "ctGetRequest\032!.flyteidl.admin.Descriptio" + - "nEntity\"g\202\323\344\223\002a\022_/api/v1/description_ent" + - "ities/{id.resource_type}/{id.project}/{i" + - "d.domain}/{id.name}/{id.version}\022\222\002\n\027Lis" + - "tDescriptionEntities\022,.flyteidl.admin.De" + - "scriptionEntityListRequest\032%.flyteidl.ad" + - "min.DescriptionEntityList\"\241\001\202\323\344\223\002\232\001\022O/ap" + - "i/v1/description_entities/{resource_type" + - "}/{id.project}/{id.domain}/{id.name}ZG\022E" + - "/api/v1/description_entities/{resource_t" + - "ype}/{id.project}/{id.domain}B9Z7github." + - "com/flyteorg/flyteidl/gen/pb-go/flyteidl" + - "/serviceb\006proto3" + "rsion}/{id.retry_attempt}\022\224\003\n\023UpdateTask" + + "Execution\022*.flyteidl.admin.TaskExecution" + + "UpdateRequest\032+.flyteidl.admin.TaskExecu" + + "tionUpdateResponse\"\243\002\202\323\344\223\002\234\002\022\231\002/api/v1/t" + + "ask_executions/{id.node_execution_id.exe" + + "cution_id.project}/{id.node_execution_id" + + ".execution_id.domain}/{id.node_execution" + + "_id.execution_id.name}/{id.node_executio" + + "n_id.node_id}/{id.task_id.project}/{id.t" + + "ask_id.domain}/{id.task_id.name}/{id.tas" + + "k_id.version}/{id.retry_attempt}\022\343\001\n\035Upd" + + "ateProjectDomainAttributes\0224.flyteidl.ad" + + "min.ProjectDomainAttributesUpdateRequest" + + "\0325.flyteidl.admin.ProjectDomainAttribute" + + "sUpdateResponse\"U\202\323\344\223\002O\032J/api/v1/project" + + "_domain_attributes/{attributes.project}/" + + "{attributes.domain}:\001*\022\301\001\n\032GetProjectDom" + + "ainAttributes\0221.flyteidl.admin.ProjectDo" + + "mainAttributesGetRequest\0322.flyteidl.admi" + + "n.ProjectDomainAttributesGetResponse\"<\202\323" + + "\344\223\0026\0224/api/v1/project_domain_attributes/" + + "{project}/{domain}\022\315\001\n\035DeleteProjectDoma" + + "inAttributes\0224.flyteidl.admin.ProjectDom" + + "ainAttributesDeleteRequest\0325.flyteidl.ad" + + "min.ProjectDomainAttributesDeleteRespons" + + "e\"?\202\323\344\223\0029*4/api/v1/project_domain_attrib" + + "utes/{project}/{domain}:\001*\022\266\001\n\027UpdatePro" + + "jectAttributes\022..flyteidl.admin.ProjectA" + + "ttributesUpdateRequest\032/.flyteidl.admin." + + "ProjectAttributesUpdateResponse\":\202\323\344\223\0024\032" + + "//api/v1/project_attributes/{attributes." + + "project}:\001*\022\237\001\n\024GetProjectAttributes\022+.f" + + "lyteidl.admin.ProjectAttributesGetReques" + + "t\032,.flyteidl.admin.ProjectAttributesGetR" + + "esponse\",\202\323\344\223\002&\022$/api/v1/project_attribu" + + "tes/{project}\022\253\001\n\027DeleteProjectAttribute" + + "s\022..flyteidl.admin.ProjectAttributesDele" + + "teRequest\032/.flyteidl.admin.ProjectAttrib" + + "utesDeleteResponse\"/\202\323\344\223\002)*$/api/v1/proj" + + "ect_attributes/{project}:\001*\022\344\001\n\030UpdateWo" + + "rkflowAttributes\022/.flyteidl.admin.Workfl" + + "owAttributesUpdateRequest\0320.flyteidl.adm" + + "in.WorkflowAttributesUpdateResponse\"e\202\323\344" + + "\223\002_\032Z/api/v1/workflow_attributes/{attrib" + + "utes.project}/{attributes.domain}/{attri" + + "butes.workflow}:\001*\022\267\001\n\025GetWorkflowAttrib" + + "utes\022,.flyteidl.admin.WorkflowAttributes" + + "GetRequest\032-.flyteidl.admin.WorkflowAttr" + + "ibutesGetResponse\"A\202\323\344\223\002;\0229/api/v1/workf" + + "low_attributes/{project}/{domain}/{workf" + + "low}\022\303\001\n\030DeleteWorkflowAttributes\022/.flyt" + + "eidl.admin.WorkflowAttributesDeleteReque" + + "st\0320.flyteidl.admin.WorkflowAttributesDe" + + "leteResponse\"D\202\323\344\223\002>*9/api/v1/workflow_a" + + "ttributes/{project}/{domain}/{workflow}:" + + "\001*\022\240\001\n\027ListMatchableAttributes\022..flyteid" + + "l.admin.ListMatchableAttributesRequest\032/" + + ".flyteidl.admin.ListMatchableAttributesR" + + "esponse\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attri" + + "butes\022\237\001\n\021ListNamedEntities\022&.flyteidl.a" + + "dmin.NamedEntityListRequest\032\037.flyteidl.a" + + "dmin.NamedEntityList\"A\202\323\344\223\002;\0229/api/v1/na" + + "med_entities/{resource_type}/{project}/{" + + "domain}\022\247\001\n\016GetNamedEntity\022%.flyteidl.ad" + + "min.NamedEntityGetRequest\032\033.flyteidl.adm" + + "in.NamedEntity\"Q\202\323\344\223\002K\022I/api/v1/named_en" + + "tities/{resource_type}/{id.project}/{id." + + "domain}/{id.name}\022\276\001\n\021UpdateNamedEntity\022" + + "(.flyteidl.admin.NamedEntityUpdateReques" + + "t\032).flyteidl.admin.NamedEntityUpdateResp" + + "onse\"T\202\323\344\223\002N\032I/api/v1/named_entities/{re" + + "source_type}/{id.project}/{id.domain}/{i" + + "d.name}:\001*\022l\n\nGetVersion\022!.flyteidl.admi" + + "n.GetVersionRequest\032\".flyteidl.admin.Get" + + "VersionResponse\"\027\202\323\344\223\002\021\022\017/api/v1/version" + + "\022\304\001\n\024GetDescriptionEntity\022 .flyteidl.adm" + + "in.ObjectGetRequest\032!.flyteidl.admin.Des" + + "criptionEntity\"g\202\323\344\223\002a\022_/api/v1/descript" + + "ion_entities/{id.resource_type}/{id.proj" + + "ect}/{id.domain}/{id.name}/{id.version}\022" + + "\222\002\n\027ListDescriptionEntities\022,.flyteidl.a" + + "dmin.DescriptionEntityListRequest\032%.flyt" + + "eidl.admin.DescriptionEntityList\"\241\001\202\323\344\223\002" + + "\232\001\022O/api/v1/description_entities/{resour" + + "ce_type}/{id.project}/{id.domain}/{id.na" + + "me}ZG\022E/api/v1/description_entities/{res" + + "ource_type}/{id.project}/{id.domain}B9Z7" + + "github.com/flyteorg/flyteidl/gen/pb-go/f" + + "lyteidl/serviceb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index cb649c124a..db08e80787 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -6363,6 +6363,145 @@ export namespace flyteidl { public static verify(message: { [k: string]: any }): (string|null); } + /** Properties of a CacheEvictionError. */ + interface ICacheEvictionError { + + /** CacheEvictionError code */ + code?: (flyteidl.core.CacheEvictionError.Code|null); + + /** CacheEvictionError message */ + message?: (string|null); + + /** CacheEvictionError nodeExecutionId */ + nodeExecutionId?: (flyteidl.core.INodeExecutionIdentifier|null); + + /** CacheEvictionError taskExecutionId */ + taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); + + /** CacheEvictionError workflowExecutionId */ + workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null); + } + + /** Represents a CacheEvictionError. */ + class CacheEvictionError implements ICacheEvictionError { + + /** + * Constructs a new CacheEvictionError. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.core.ICacheEvictionError); + + /** CacheEvictionError code. */ + public code: flyteidl.core.CacheEvictionError.Code; + + /** CacheEvictionError message. */ + public message: string; + + /** CacheEvictionError nodeExecutionId. */ + public nodeExecutionId?: (flyteidl.core.INodeExecutionIdentifier|null); + + /** CacheEvictionError taskExecutionId. */ + public taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); + + /** CacheEvictionError workflowExecutionId. */ + public workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null); + + /** CacheEvictionError source. */ + public source?: ("taskExecutionId"|"workflowExecutionId"); + + /** + * Creates a new CacheEvictionError instance using the specified properties. + * @param [properties] Properties to set + * @returns CacheEvictionError instance + */ + public static create(properties?: flyteidl.core.ICacheEvictionError): flyteidl.core.CacheEvictionError; + + /** + * Encodes the specified CacheEvictionError message. Does not implicitly {@link flyteidl.core.CacheEvictionError.verify|verify} messages. + * @param message CacheEvictionError message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.core.ICacheEvictionError, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CacheEvictionError message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CacheEvictionError + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.core.CacheEvictionError; + + /** + * Verifies a CacheEvictionError message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + namespace CacheEvictionError { + + /** Code enum. */ + enum Code { + UNKNOWN = 0 + } + } + + /** Properties of a CacheEvictionErrorList. */ + interface ICacheEvictionErrorList { + + /** CacheEvictionErrorList errors */ + errors?: (flyteidl.core.ICacheEvictionError[]|null); + } + + /** Represents a CacheEvictionErrorList. */ + class CacheEvictionErrorList implements ICacheEvictionErrorList { + + /** + * Constructs a new CacheEvictionErrorList. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.core.ICacheEvictionErrorList); + + /** CacheEvictionErrorList errors. */ + public errors: flyteidl.core.ICacheEvictionError[]; + + /** + * Creates a new CacheEvictionErrorList instance using the specified properties. + * @param [properties] Properties to set + * @returns CacheEvictionErrorList instance + */ + public static create(properties?: flyteidl.core.ICacheEvictionErrorList): flyteidl.core.CacheEvictionErrorList; + + /** + * Encodes the specified CacheEvictionErrorList message. Does not implicitly {@link flyteidl.core.CacheEvictionErrorList.verify|verify} messages. + * @param message CacheEvictionErrorList message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.core.ICacheEvictionErrorList, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CacheEvictionErrorList message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CacheEvictionErrorList + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.core.CacheEvictionErrorList; + + /** + * Verifies a CacheEvictionErrorList message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + /** Properties of a WorkflowClosure. */ interface IWorkflowClosure { @@ -10839,6 +10978,9 @@ export namespace flyteidl { /** ExecutionUpdateRequest state */ state?: (flyteidl.admin.ExecutionState|null); + + /** ExecutionUpdateRequest evictCache */ + evictCache?: (boolean|null); } /** Represents an ExecutionUpdateRequest. */ @@ -10856,6 +10998,9 @@ export namespace flyteidl { /** ExecutionUpdateRequest state. */ public state: flyteidl.admin.ExecutionState; + /** ExecutionUpdateRequest evictCache. */ + public evictCache: boolean; + /** * Creates a new ExecutionUpdateRequest instance using the specified properties. * @param [properties] Properties to set @@ -10955,6 +11100,9 @@ export namespace flyteidl { /** Properties of an ExecutionUpdateResponse. */ interface IExecutionUpdateResponse { + + /** ExecutionUpdateResponse cacheEvictionErrors */ + cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); } /** Represents an ExecutionUpdateResponse. */ @@ -10966,6 +11114,9 @@ export namespace flyteidl { */ constructor(properties?: flyteidl.admin.IExecutionUpdateResponse); + /** ExecutionUpdateResponse cacheEvictionErrors. */ + public cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); + /** * Creates a new ExecutionUpdateResponse instance using the specified properties. * @param [properties] Properties to set @@ -16070,6 +16221,116 @@ export namespace flyteidl { public static verify(message: { [k: string]: any }): (string|null); } + /** Properties of a TaskExecutionUpdateRequest. */ + interface ITaskExecutionUpdateRequest { + + /** TaskExecutionUpdateRequest id */ + id?: (flyteidl.core.ITaskExecutionIdentifier|null); + + /** TaskExecutionUpdateRequest evictCache */ + evictCache?: (boolean|null); + } + + /** Represents a TaskExecutionUpdateRequest. */ + class TaskExecutionUpdateRequest implements ITaskExecutionUpdateRequest { + + /** + * Constructs a new TaskExecutionUpdateRequest. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.admin.ITaskExecutionUpdateRequest); + + /** TaskExecutionUpdateRequest id. */ + public id?: (flyteidl.core.ITaskExecutionIdentifier|null); + + /** TaskExecutionUpdateRequest evictCache. */ + public evictCache: boolean; + + /** + * Creates a new TaskExecutionUpdateRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns TaskExecutionUpdateRequest instance + */ + public static create(properties?: flyteidl.admin.ITaskExecutionUpdateRequest): flyteidl.admin.TaskExecutionUpdateRequest; + + /** + * Encodes the specified TaskExecutionUpdateRequest message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateRequest.verify|verify} messages. + * @param message TaskExecutionUpdateRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.admin.ITaskExecutionUpdateRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TaskExecutionUpdateRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TaskExecutionUpdateRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.TaskExecutionUpdateRequest; + + /** + * Verifies a TaskExecutionUpdateRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of a TaskExecutionUpdateResponse. */ + interface ITaskExecutionUpdateResponse { + + /** TaskExecutionUpdateResponse cacheEvictionErrors */ + cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); + } + + /** Represents a TaskExecutionUpdateResponse. */ + class TaskExecutionUpdateResponse implements ITaskExecutionUpdateResponse { + + /** + * Constructs a new TaskExecutionUpdateResponse. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.admin.ITaskExecutionUpdateResponse); + + /** TaskExecutionUpdateResponse cacheEvictionErrors. */ + public cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); + + /** + * Creates a new TaskExecutionUpdateResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns TaskExecutionUpdateResponse instance + */ + public static create(properties?: flyteidl.admin.ITaskExecutionUpdateResponse): flyteidl.admin.TaskExecutionUpdateResponse; + + /** + * Encodes the specified TaskExecutionUpdateResponse message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateResponse.verify|verify} messages. + * @param message TaskExecutionUpdateResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.admin.ITaskExecutionUpdateResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TaskExecutionUpdateResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TaskExecutionUpdateResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.TaskExecutionUpdateResponse; + + /** + * Verifies a TaskExecutionUpdateResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + /** Properties of a GetVersionResponse. */ interface IGetVersionResponse { @@ -17679,6 +17940,20 @@ export namespace flyteidl { */ public getTaskExecutionData(request: flyteidl.admin.ITaskExecutionGetDataRequest): Promise; + /** + * Calls UpdateTaskExecution. + * @param request TaskExecutionUpdateRequest message or plain object + * @param callback Node-style callback called with the error, if any, and TaskExecutionUpdateResponse + */ + public updateTaskExecution(request: flyteidl.admin.ITaskExecutionUpdateRequest, callback: flyteidl.service.AdminService.UpdateTaskExecutionCallback): void; + + /** + * Calls UpdateTaskExecution. + * @param request TaskExecutionUpdateRequest message or plain object + * @returns Promise + */ + public updateTaskExecution(request: flyteidl.admin.ITaskExecutionUpdateRequest): Promise; + /** * Calls UpdateProjectDomainAttributes. * @param request ProjectDomainAttributesUpdateRequest message or plain object @@ -18158,6 +18433,13 @@ export namespace flyteidl { */ type GetTaskExecutionDataCallback = (error: (Error|null), response?: flyteidl.admin.TaskExecutionGetDataResponse) => void; + /** + * Callback as used by {@link flyteidl.service.AdminService#updateTaskExecution}. + * @param error Error, if any + * @param [response] TaskExecutionUpdateResponse + */ + type UpdateTaskExecutionCallback = (error: (Error|null), response?: flyteidl.admin.TaskExecutionUpdateResponse) => void; + /** * Callback as used by {@link flyteidl.service.AdminService#updateProjectDomainAttributes}. * @param error Error, if any diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 67d96f215d..b2554aa4ee 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -15243,6 +15243,349 @@ return ErrorDocument; })(); + core.CacheEvictionError = (function() { + + /** + * Properties of a CacheEvictionError. + * @memberof flyteidl.core + * @interface ICacheEvictionError + * @property {flyteidl.core.CacheEvictionError.Code|null} [code] CacheEvictionError code + * @property {string|null} [message] CacheEvictionError message + * @property {flyteidl.core.INodeExecutionIdentifier|null} [nodeExecutionId] CacheEvictionError nodeExecutionId + * @property {flyteidl.core.ITaskExecutionIdentifier|null} [taskExecutionId] CacheEvictionError taskExecutionId + * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [workflowExecutionId] CacheEvictionError workflowExecutionId + */ + + /** + * Constructs a new CacheEvictionError. + * @memberof flyteidl.core + * @classdesc Represents a CacheEvictionError. + * @implements ICacheEvictionError + * @constructor + * @param {flyteidl.core.ICacheEvictionError=} [properties] Properties to set + */ + function CacheEvictionError(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CacheEvictionError code. + * @member {flyteidl.core.CacheEvictionError.Code} code + * @memberof flyteidl.core.CacheEvictionError + * @instance + */ + CacheEvictionError.prototype.code = 0; + + /** + * CacheEvictionError message. + * @member {string} message + * @memberof flyteidl.core.CacheEvictionError + * @instance + */ + CacheEvictionError.prototype.message = ""; + + /** + * CacheEvictionError nodeExecutionId. + * @member {flyteidl.core.INodeExecutionIdentifier|null|undefined} nodeExecutionId + * @memberof flyteidl.core.CacheEvictionError + * @instance + */ + CacheEvictionError.prototype.nodeExecutionId = null; + + /** + * CacheEvictionError taskExecutionId. + * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} taskExecutionId + * @memberof flyteidl.core.CacheEvictionError + * @instance + */ + CacheEvictionError.prototype.taskExecutionId = null; + + /** + * CacheEvictionError workflowExecutionId. + * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} workflowExecutionId + * @memberof flyteidl.core.CacheEvictionError + * @instance + */ + CacheEvictionError.prototype.workflowExecutionId = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * CacheEvictionError source. + * @member {"taskExecutionId"|"workflowExecutionId"|undefined} source + * @memberof flyteidl.core.CacheEvictionError + * @instance + */ + Object.defineProperty(CacheEvictionError.prototype, "source", { + get: $util.oneOfGetter($oneOfFields = ["taskExecutionId", "workflowExecutionId"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new CacheEvictionError instance using the specified properties. + * @function create + * @memberof flyteidl.core.CacheEvictionError + * @static + * @param {flyteidl.core.ICacheEvictionError=} [properties] Properties to set + * @returns {flyteidl.core.CacheEvictionError} CacheEvictionError instance + */ + CacheEvictionError.create = function create(properties) { + return new CacheEvictionError(properties); + }; + + /** + * Encodes the specified CacheEvictionError message. Does not implicitly {@link flyteidl.core.CacheEvictionError.verify|verify} messages. + * @function encode + * @memberof flyteidl.core.CacheEvictionError + * @static + * @param {flyteidl.core.ICacheEvictionError} message CacheEvictionError message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CacheEvictionError.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.code != null && message.hasOwnProperty("code")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.code); + if (message.message != null && message.hasOwnProperty("message")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.message); + if (message.nodeExecutionId != null && message.hasOwnProperty("nodeExecutionId")) + $root.flyteidl.core.NodeExecutionIdentifier.encode(message.nodeExecutionId, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.taskExecutionId != null && message.hasOwnProperty("taskExecutionId")) + $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskExecutionId, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) + $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowExecutionId, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + return writer; + }; + + /** + * Decodes a CacheEvictionError message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.core.CacheEvictionError + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.core.CacheEvictionError} CacheEvictionError + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CacheEvictionError.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.core.CacheEvictionError(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.code = reader.int32(); + break; + case 2: + message.message = reader.string(); + break; + case 3: + message.nodeExecutionId = $root.flyteidl.core.NodeExecutionIdentifier.decode(reader, reader.uint32()); + break; + case 4: + message.taskExecutionId = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); + break; + case 5: + message.workflowExecutionId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a CacheEvictionError message. + * @function verify + * @memberof flyteidl.core.CacheEvictionError + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CacheEvictionError.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.code != null && message.hasOwnProperty("code")) + switch (message.code) { + default: + return "code: enum value expected"; + case 0: + break; + } + if (message.message != null && message.hasOwnProperty("message")) + if (!$util.isString(message.message)) + return "message: string expected"; + if (message.nodeExecutionId != null && message.hasOwnProperty("nodeExecutionId")) { + var error = $root.flyteidl.core.NodeExecutionIdentifier.verify(message.nodeExecutionId); + if (error) + return "nodeExecutionId." + error; + } + if (message.taskExecutionId != null && message.hasOwnProperty("taskExecutionId")) { + properties.source = 1; + { + var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.taskExecutionId); + if (error) + return "taskExecutionId." + error; + } + } + if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) { + if (properties.source === 1) + return "source: multiple values"; + properties.source = 1; + { + var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowExecutionId); + if (error) + return "workflowExecutionId." + error; + } + } + return null; + }; + + /** + * Code enum. + * @name flyteidl.core.CacheEvictionError.Code + * @enum {string} + * @property {number} UNKNOWN=0 UNKNOWN value + */ + CacheEvictionError.Code = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "UNKNOWN"] = 0; + return values; + })(); + + return CacheEvictionError; + })(); + + core.CacheEvictionErrorList = (function() { + + /** + * Properties of a CacheEvictionErrorList. + * @memberof flyteidl.core + * @interface ICacheEvictionErrorList + * @property {Array.|null} [errors] CacheEvictionErrorList errors + */ + + /** + * Constructs a new CacheEvictionErrorList. + * @memberof flyteidl.core + * @classdesc Represents a CacheEvictionErrorList. + * @implements ICacheEvictionErrorList + * @constructor + * @param {flyteidl.core.ICacheEvictionErrorList=} [properties] Properties to set + */ + function CacheEvictionErrorList(properties) { + this.errors = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CacheEvictionErrorList errors. + * @member {Array.} errors + * @memberof flyteidl.core.CacheEvictionErrorList + * @instance + */ + CacheEvictionErrorList.prototype.errors = $util.emptyArray; + + /** + * Creates a new CacheEvictionErrorList instance using the specified properties. + * @function create + * @memberof flyteidl.core.CacheEvictionErrorList + * @static + * @param {flyteidl.core.ICacheEvictionErrorList=} [properties] Properties to set + * @returns {flyteidl.core.CacheEvictionErrorList} CacheEvictionErrorList instance + */ + CacheEvictionErrorList.create = function create(properties) { + return new CacheEvictionErrorList(properties); + }; + + /** + * Encodes the specified CacheEvictionErrorList message. Does not implicitly {@link flyteidl.core.CacheEvictionErrorList.verify|verify} messages. + * @function encode + * @memberof flyteidl.core.CacheEvictionErrorList + * @static + * @param {flyteidl.core.ICacheEvictionErrorList} message CacheEvictionErrorList message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CacheEvictionErrorList.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.errors != null && message.errors.length) + for (var i = 0; i < message.errors.length; ++i) + $root.flyteidl.core.CacheEvictionError.encode(message.errors[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes a CacheEvictionErrorList message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.core.CacheEvictionErrorList + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.core.CacheEvictionErrorList} CacheEvictionErrorList + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CacheEvictionErrorList.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.core.CacheEvictionErrorList(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.errors && message.errors.length)) + message.errors = []; + message.errors.push($root.flyteidl.core.CacheEvictionError.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a CacheEvictionErrorList message. + * @function verify + * @memberof flyteidl.core.CacheEvictionErrorList + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CacheEvictionErrorList.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.errors != null && message.hasOwnProperty("errors")) { + if (!Array.isArray(message.errors)) + return "errors: array expected"; + for (var i = 0; i < message.errors.length; ++i) { + var error = $root.flyteidl.core.CacheEvictionError.verify(message.errors[i]); + if (error) + return "errors." + error; + } + } + return null; + }; + + return CacheEvictionErrorList; + })(); + core.WorkflowClosure = (function() { /** @@ -26072,6 +26415,7 @@ * @interface IExecutionUpdateRequest * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [id] ExecutionUpdateRequest id * @property {flyteidl.admin.ExecutionState|null} [state] ExecutionUpdateRequest state + * @property {boolean|null} [evictCache] ExecutionUpdateRequest evictCache */ /** @@ -26105,6 +26449,14 @@ */ ExecutionUpdateRequest.prototype.state = 0; + /** + * ExecutionUpdateRequest evictCache. + * @member {boolean} evictCache + * @memberof flyteidl.admin.ExecutionUpdateRequest + * @instance + */ + ExecutionUpdateRequest.prototype.evictCache = false; + /** * Creates a new ExecutionUpdateRequest instance using the specified properties. * @function create @@ -26133,6 +26485,8 @@ $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.state != null && message.hasOwnProperty("state")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.state); + if (message.evictCache != null && message.hasOwnProperty("evictCache")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.evictCache); return writer; }; @@ -26160,6 +26514,9 @@ case 2: message.state = reader.int32(); break; + case 3: + message.evictCache = reader.bool(); + break; default: reader.skipType(tag & 7); break; @@ -26192,6 +26549,9 @@ case 1: break; } + if (message.evictCache != null && message.hasOwnProperty("evictCache")) + if (typeof message.evictCache !== "boolean") + return "evictCache: boolean expected"; return null; }; @@ -26355,6 +26715,7 @@ * Properties of an ExecutionUpdateResponse. * @memberof flyteidl.admin * @interface IExecutionUpdateResponse + * @property {flyteidl.core.ICacheEvictionErrorList|null} [cacheEvictionErrors] ExecutionUpdateResponse cacheEvictionErrors */ /** @@ -26372,6 +26733,14 @@ this[keys[i]] = properties[keys[i]]; } + /** + * ExecutionUpdateResponse cacheEvictionErrors. + * @member {flyteidl.core.ICacheEvictionErrorList|null|undefined} cacheEvictionErrors + * @memberof flyteidl.admin.ExecutionUpdateResponse + * @instance + */ + ExecutionUpdateResponse.prototype.cacheEvictionErrors = null; + /** * Creates a new ExecutionUpdateResponse instance using the specified properties. * @function create @@ -26396,6 +26765,8 @@ ExecutionUpdateResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); + if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) + $root.flyteidl.core.CacheEvictionErrorList.encode(message.cacheEvictionErrors, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; @@ -26417,6 +26788,9 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { + case 1: + message.cacheEvictionErrors = $root.flyteidl.core.CacheEvictionErrorList.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -26436,6 +26810,11 @@ ExecutionUpdateResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; + if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) { + var error = $root.flyteidl.core.CacheEvictionErrorList.verify(message.cacheEvictionErrors); + if (error) + return "cacheEvictionErrors." + error; + } return null; }; @@ -38384,6 +38763,247 @@ return TaskExecutionGetDataResponse; })(); + admin.TaskExecutionUpdateRequest = (function() { + + /** + * Properties of a TaskExecutionUpdateRequest. + * @memberof flyteidl.admin + * @interface ITaskExecutionUpdateRequest + * @property {flyteidl.core.ITaskExecutionIdentifier|null} [id] TaskExecutionUpdateRequest id + * @property {boolean|null} [evictCache] TaskExecutionUpdateRequest evictCache + */ + + /** + * Constructs a new TaskExecutionUpdateRequest. + * @memberof flyteidl.admin + * @classdesc Represents a TaskExecutionUpdateRequest. + * @implements ITaskExecutionUpdateRequest + * @constructor + * @param {flyteidl.admin.ITaskExecutionUpdateRequest=} [properties] Properties to set + */ + function TaskExecutionUpdateRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * TaskExecutionUpdateRequest id. + * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} id + * @memberof flyteidl.admin.TaskExecutionUpdateRequest + * @instance + */ + TaskExecutionUpdateRequest.prototype.id = null; + + /** + * TaskExecutionUpdateRequest evictCache. + * @member {boolean} evictCache + * @memberof flyteidl.admin.TaskExecutionUpdateRequest + * @instance + */ + TaskExecutionUpdateRequest.prototype.evictCache = false; + + /** + * Creates a new TaskExecutionUpdateRequest instance using the specified properties. + * @function create + * @memberof flyteidl.admin.TaskExecutionUpdateRequest + * @static + * @param {flyteidl.admin.ITaskExecutionUpdateRequest=} [properties] Properties to set + * @returns {flyteidl.admin.TaskExecutionUpdateRequest} TaskExecutionUpdateRequest instance + */ + TaskExecutionUpdateRequest.create = function create(properties) { + return new TaskExecutionUpdateRequest(properties); + }; + + /** + * Encodes the specified TaskExecutionUpdateRequest message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateRequest.verify|verify} messages. + * @function encode + * @memberof flyteidl.admin.TaskExecutionUpdateRequest + * @static + * @param {flyteidl.admin.ITaskExecutionUpdateRequest} message TaskExecutionUpdateRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TaskExecutionUpdateRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.id != null && message.hasOwnProperty("id")) + $root.flyteidl.core.TaskExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.evictCache != null && message.hasOwnProperty("evictCache")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.evictCache); + return writer; + }; + + /** + * Decodes a TaskExecutionUpdateRequest message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.admin.TaskExecutionUpdateRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.admin.TaskExecutionUpdateRequest} TaskExecutionUpdateRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TaskExecutionUpdateRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.TaskExecutionUpdateRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.id = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); + break; + case 2: + message.evictCache = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a TaskExecutionUpdateRequest message. + * @function verify + * @memberof flyteidl.admin.TaskExecutionUpdateRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + TaskExecutionUpdateRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.id != null && message.hasOwnProperty("id")) { + var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.id); + if (error) + return "id." + error; + } + if (message.evictCache != null && message.hasOwnProperty("evictCache")) + if (typeof message.evictCache !== "boolean") + return "evictCache: boolean expected"; + return null; + }; + + return TaskExecutionUpdateRequest; + })(); + + admin.TaskExecutionUpdateResponse = (function() { + + /** + * Properties of a TaskExecutionUpdateResponse. + * @memberof flyteidl.admin + * @interface ITaskExecutionUpdateResponse + * @property {flyteidl.core.ICacheEvictionErrorList|null} [cacheEvictionErrors] TaskExecutionUpdateResponse cacheEvictionErrors + */ + + /** + * Constructs a new TaskExecutionUpdateResponse. + * @memberof flyteidl.admin + * @classdesc Represents a TaskExecutionUpdateResponse. + * @implements ITaskExecutionUpdateResponse + * @constructor + * @param {flyteidl.admin.ITaskExecutionUpdateResponse=} [properties] Properties to set + */ + function TaskExecutionUpdateResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * TaskExecutionUpdateResponse cacheEvictionErrors. + * @member {flyteidl.core.ICacheEvictionErrorList|null|undefined} cacheEvictionErrors + * @memberof flyteidl.admin.TaskExecutionUpdateResponse + * @instance + */ + TaskExecutionUpdateResponse.prototype.cacheEvictionErrors = null; + + /** + * Creates a new TaskExecutionUpdateResponse instance using the specified properties. + * @function create + * @memberof flyteidl.admin.TaskExecutionUpdateResponse + * @static + * @param {flyteidl.admin.ITaskExecutionUpdateResponse=} [properties] Properties to set + * @returns {flyteidl.admin.TaskExecutionUpdateResponse} TaskExecutionUpdateResponse instance + */ + TaskExecutionUpdateResponse.create = function create(properties) { + return new TaskExecutionUpdateResponse(properties); + }; + + /** + * Encodes the specified TaskExecutionUpdateResponse message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateResponse.verify|verify} messages. + * @function encode + * @memberof flyteidl.admin.TaskExecutionUpdateResponse + * @static + * @param {flyteidl.admin.ITaskExecutionUpdateResponse} message TaskExecutionUpdateResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TaskExecutionUpdateResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) + $root.flyteidl.core.CacheEvictionErrorList.encode(message.cacheEvictionErrors, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes a TaskExecutionUpdateResponse message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.admin.TaskExecutionUpdateResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.admin.TaskExecutionUpdateResponse} TaskExecutionUpdateResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TaskExecutionUpdateResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.TaskExecutionUpdateResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.cacheEvictionErrors = $root.flyteidl.core.CacheEvictionErrorList.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a TaskExecutionUpdateResponse message. + * @function verify + * @memberof flyteidl.admin.TaskExecutionUpdateResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + TaskExecutionUpdateResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) { + var error = $root.flyteidl.core.CacheEvictionErrorList.verify(message.cacheEvictionErrors); + if (error) + return "cacheEvictionErrors." + error; + } + return null; + }; + + return TaskExecutionUpdateResponse; + })(); + admin.GetVersionResponse = (function() { /** @@ -42058,6 +42678,39 @@ * @variation 2 */ + /** + * Callback as used by {@link flyteidl.service.AdminService#updateTaskExecution}. + * @memberof flyteidl.service.AdminService + * @typedef UpdateTaskExecutionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {flyteidl.admin.TaskExecutionUpdateResponse} [response] TaskExecutionUpdateResponse + */ + + /** + * Calls UpdateTaskExecution. + * @function updateTaskExecution + * @memberof flyteidl.service.AdminService + * @instance + * @param {flyteidl.admin.ITaskExecutionUpdateRequest} request TaskExecutionUpdateRequest message or plain object + * @param {flyteidl.service.AdminService.UpdateTaskExecutionCallback} callback Node-style callback called with the error, if any, and TaskExecutionUpdateResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(AdminService.prototype.updateTaskExecution = function updateTaskExecution(request, callback) { + return this.rpcCall(updateTaskExecution, $root.flyteidl.admin.TaskExecutionUpdateRequest, $root.flyteidl.admin.TaskExecutionUpdateResponse, request, callback); + }, "name", { value: "UpdateTaskExecution" }); + + /** + * Calls UpdateTaskExecution. + * @function updateTaskExecution + * @memberof flyteidl.service.AdminService + * @instance + * @param {flyteidl.admin.ITaskExecutionUpdateRequest} request TaskExecutionUpdateRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + /** * Callback as used by {@link flyteidl.service.AdminService#updateProjectDomainAttributes}. * @memberof flyteidl.service.AdminService diff --git a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py index 628d13ded7..51566608f9 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py @@ -14,6 +14,7 @@ from flyteidl.admin import cluster_assignment_pb2 as flyteidl_dot_admin_dot_cluster__assignment__pb2 from flyteidl.admin import common_pb2 as flyteidl_dot_admin_dot_common__pb2 from flyteidl.core import literals_pb2 as flyteidl_dot_core_dot_literals__pb2 +from flyteidl.core import errors_pb2 as flyteidl_dot_core_dot_errors__pb2 from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 from flyteidl.core import security_pb2 as flyteidl_dot_core_dot_security__pb2 @@ -22,7 +23,7 @@ from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x66lyteidl/admin/execution.proto\x12\x0e\x66lyteidl.admin\x1a\'flyteidl/admin/cluster_assignment.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc4\x01\n\x16\x45xecutionCreateRequest\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x16\n\x06\x64omain\x18\x02 \x01(\tR\x06\x64omain\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x31\n\x04spec\x18\x04 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12\x31\n\x06inputs\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\"\x99\x01\n\x18\x45xecutionRelaunchRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\'\n\x0foverwrite_cache\x18\x04 \x01(\x08R\x0eoverwriteCacheJ\x04\x08\x02\x10\x03\"\xa8\x01\n\x17\x45xecutionRecoverRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\"U\n\x17\x45xecutionCreateResponse\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"Y\n\x1bWorkflowExecutionGetRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\xb6\x01\n\tExecution\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x31\n\x04spec\x18\x02 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12:\n\x07\x63losure\x18\x03 \x01(\x0b\x32 .flyteidl.admin.ExecutionClosureR\x07\x63losure\"`\n\rExecutionList\x12\x39\n\nexecutions\x18\x01 \x03(\x0b\x32\x19.flyteidl.admin.ExecutionR\nexecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"e\n\x0eLiteralMapBlob\x12\x37\n\x06values\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\x06values\x12\x12\n\x03uri\x18\x02 \x01(\tH\x00R\x03uriB\x06\n\x04\x64\x61ta\"C\n\rAbortMetadata\x12\x14\n\x05\x63\x61use\x18\x01 \x01(\tR\x05\x63\x61use\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\"\x98\x07\n\x10\x45xecutionClosure\x12>\n\x07outputs\x18\x01 \x01(\x0b\x32\x1e.flyteidl.admin.LiteralMapBlobB\x02\x18\x01H\x00R\x07outputs\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12%\n\x0b\x61\x62ort_cause\x18\n \x01(\tB\x02\x18\x01H\x00R\nabortCause\x12\x46\n\x0e\x61\x62ort_metadata\x18\x0c \x01(\x0b\x32\x1d.flyteidl.admin.AbortMetadataH\x00R\rabortMetadata\x12@\n\x0boutput_data\x18\r \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x46\n\x0f\x63omputed_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x0e\x63omputedInputs\x12<\n\x05phase\x18\x04 \x01(\x0e\x32&.flyteidl.core.WorkflowExecution.PhaseR\x05phase\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x42\n\rnotifications\x18\t \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\x12:\n\x0bworkflow_id\x18\x0b \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12]\n\x14state_change_details\x18\x0e \x01(\x0b\x32+.flyteidl.admin.ExecutionStateChangeDetailsR\x12stateChangeDetailsB\x0f\n\routput_result\"=\n\x0eSystemMetadata\x12+\n\x11\x65xecution_cluster\x18\x01 \x01(\tR\x10\x65xecutionCluster\"\xba\x04\n\x11\x45xecutionMetadata\x12\x43\n\x04mode\x18\x01 \x01(\x0e\x32/.flyteidl.admin.ExecutionMetadata.ExecutionModeR\x04mode\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\x12\x18\n\x07nesting\x18\x03 \x01(\rR\x07nesting\x12=\n\x0cscheduled_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bscheduledAt\x12Z\n\x15parent_node_execution\x18\x05 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x13parentNodeExecution\x12[\n\x13reference_execution\x18\x10 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12G\n\x0fsystem_metadata\x18\x11 \x01(\x0b\x32\x1e.flyteidl.admin.SystemMetadataR\x0esystemMetadata\"g\n\rExecutionMode\x12\n\n\x06MANUAL\x10\x00\x12\r\n\tSCHEDULED\x10\x01\x12\n\n\x06SYSTEM\x10\x02\x12\x0c\n\x08RELAUNCH\x10\x03\x12\x12\n\x0e\x43HILD_WORKFLOW\x10\x04\x12\r\n\tRECOVERED\x10\x05\"V\n\x10NotificationList\x12\x42\n\rnotifications\x18\x01 \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\"\xd2\x07\n\rExecutionSpec\x12:\n\x0blaunch_plan\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nlaunchPlan\x12\x35\n\x06inputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x06inputs\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\x12H\n\rnotifications\x18\x05 \x01(\x0b\x32 .flyteidl.admin.NotificationListH\x00R\rnotifications\x12!\n\x0b\x64isable_all\x18\x06 \x01(\x08H\x00R\ndisableAll\x12.\n\x06labels\x18\x07 \x01(\x0b\x32\x16.flyteidl.admin.LabelsR\x06labels\x12=\n\x0b\x61nnotations\x18\x08 \x01(\x0b\x32\x1b.flyteidl.admin.AnnotationsR\x0b\x61nnotations\x12I\n\x10security_context\x18\n \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12\x39\n\tauth_role\x18\x10 \x01(\x0b\x32\x18.flyteidl.admin.AuthRoleB\x02\x18\x01R\x08\x61uthRole\x12M\n\x12quality_of_service\x18\x11 \x01(\x0b\x32\x1f.flyteidl.core.QualityOfServiceR\x10qualityOfService\x12\'\n\x0fmax_parallelism\x18\x12 \x01(\x05R\x0emaxParallelism\x12X\n\x16raw_output_data_config\x18\x13 \x01(\x0b\x32#.flyteidl.admin.RawOutputDataConfigR\x13rawOutputDataConfig\x12P\n\x12\x63luster_assignment\x18\x14 \x01(\x0b\x32!.flyteidl.admin.ClusterAssignmentR\x11\x63lusterAssignment\x12@\n\rinterruptible\x18\x15 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\rinterruptible\x12\'\n\x0foverwrite_cache\x18\x16 \x01(\x08R\x0eoverwriteCacheB\x18\n\x16notification_overridesJ\x04\x08\x04\x10\x05\"m\n\x19\x45xecutionTerminateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x14\n\x05\x63\x61use\x18\x02 \x01(\tR\x05\x63\x61use\"\x1c\n\x1a\x45xecutionTerminateResponse\"]\n\x1fWorkflowExecutionGetDataRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\x88\x02\n WorkflowExecutionGetDataResponse\x12\x35\n\x07outputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12\x33\n\x06inputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputs\"\x8a\x01\n\x16\x45xecutionUpdateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x34\n\x05state\x18\x02 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\"\xae\x01\n\x1b\x45xecutionStateChangeDetails\x12\x34\n\x05state\x18\x01 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\x12;\n\x0boccurred_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\noccurredAt\x12\x1c\n\tprincipal\x18\x03 \x01(\tR\tprincipal\"\x19\n\x17\x45xecutionUpdateResponse*>\n\x0e\x45xecutionState\x12\x14\n\x10\x45XECUTION_ACTIVE\x10\x00\x12\x16\n\x12\x45XECUTION_ARCHIVED\x10\x01\x42\xb4\x01\n\x12\x63om.flyteidl.adminB\x0e\x45xecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x66lyteidl/admin/execution.proto\x12\x0e\x66lyteidl.admin\x1a\'flyteidl/admin/cluster_assignment.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc4\x01\n\x16\x45xecutionCreateRequest\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x16\n\x06\x64omain\x18\x02 \x01(\tR\x06\x64omain\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x31\n\x04spec\x18\x04 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12\x31\n\x06inputs\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\"\x99\x01\n\x18\x45xecutionRelaunchRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\'\n\x0foverwrite_cache\x18\x04 \x01(\x08R\x0eoverwriteCacheJ\x04\x08\x02\x10\x03\"\xa8\x01\n\x17\x45xecutionRecoverRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\"U\n\x17\x45xecutionCreateResponse\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"Y\n\x1bWorkflowExecutionGetRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\xb6\x01\n\tExecution\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x31\n\x04spec\x18\x02 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12:\n\x07\x63losure\x18\x03 \x01(\x0b\x32 .flyteidl.admin.ExecutionClosureR\x07\x63losure\"`\n\rExecutionList\x12\x39\n\nexecutions\x18\x01 \x03(\x0b\x32\x19.flyteidl.admin.ExecutionR\nexecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"e\n\x0eLiteralMapBlob\x12\x37\n\x06values\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\x06values\x12\x12\n\x03uri\x18\x02 \x01(\tH\x00R\x03uriB\x06\n\x04\x64\x61ta\"C\n\rAbortMetadata\x12\x14\n\x05\x63\x61use\x18\x01 \x01(\tR\x05\x63\x61use\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\"\x98\x07\n\x10\x45xecutionClosure\x12>\n\x07outputs\x18\x01 \x01(\x0b\x32\x1e.flyteidl.admin.LiteralMapBlobB\x02\x18\x01H\x00R\x07outputs\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12%\n\x0b\x61\x62ort_cause\x18\n \x01(\tB\x02\x18\x01H\x00R\nabortCause\x12\x46\n\x0e\x61\x62ort_metadata\x18\x0c \x01(\x0b\x32\x1d.flyteidl.admin.AbortMetadataH\x00R\rabortMetadata\x12@\n\x0boutput_data\x18\r \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x46\n\x0f\x63omputed_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x0e\x63omputedInputs\x12<\n\x05phase\x18\x04 \x01(\x0e\x32&.flyteidl.core.WorkflowExecution.PhaseR\x05phase\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x42\n\rnotifications\x18\t \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\x12:\n\x0bworkflow_id\x18\x0b \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12]\n\x14state_change_details\x18\x0e \x01(\x0b\x32+.flyteidl.admin.ExecutionStateChangeDetailsR\x12stateChangeDetailsB\x0f\n\routput_result\"=\n\x0eSystemMetadata\x12+\n\x11\x65xecution_cluster\x18\x01 \x01(\tR\x10\x65xecutionCluster\"\xba\x04\n\x11\x45xecutionMetadata\x12\x43\n\x04mode\x18\x01 \x01(\x0e\x32/.flyteidl.admin.ExecutionMetadata.ExecutionModeR\x04mode\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\x12\x18\n\x07nesting\x18\x03 \x01(\rR\x07nesting\x12=\n\x0cscheduled_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bscheduledAt\x12Z\n\x15parent_node_execution\x18\x05 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x13parentNodeExecution\x12[\n\x13reference_execution\x18\x10 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12G\n\x0fsystem_metadata\x18\x11 \x01(\x0b\x32\x1e.flyteidl.admin.SystemMetadataR\x0esystemMetadata\"g\n\rExecutionMode\x12\n\n\x06MANUAL\x10\x00\x12\r\n\tSCHEDULED\x10\x01\x12\n\n\x06SYSTEM\x10\x02\x12\x0c\n\x08RELAUNCH\x10\x03\x12\x12\n\x0e\x43HILD_WORKFLOW\x10\x04\x12\r\n\tRECOVERED\x10\x05\"V\n\x10NotificationList\x12\x42\n\rnotifications\x18\x01 \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\"\xd2\x07\n\rExecutionSpec\x12:\n\x0blaunch_plan\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nlaunchPlan\x12\x35\n\x06inputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x06inputs\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\x12H\n\rnotifications\x18\x05 \x01(\x0b\x32 .flyteidl.admin.NotificationListH\x00R\rnotifications\x12!\n\x0b\x64isable_all\x18\x06 \x01(\x08H\x00R\ndisableAll\x12.\n\x06labels\x18\x07 \x01(\x0b\x32\x16.flyteidl.admin.LabelsR\x06labels\x12=\n\x0b\x61nnotations\x18\x08 \x01(\x0b\x32\x1b.flyteidl.admin.AnnotationsR\x0b\x61nnotations\x12I\n\x10security_context\x18\n \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12\x39\n\tauth_role\x18\x10 \x01(\x0b\x32\x18.flyteidl.admin.AuthRoleB\x02\x18\x01R\x08\x61uthRole\x12M\n\x12quality_of_service\x18\x11 \x01(\x0b\x32\x1f.flyteidl.core.QualityOfServiceR\x10qualityOfService\x12\'\n\x0fmax_parallelism\x18\x12 \x01(\x05R\x0emaxParallelism\x12X\n\x16raw_output_data_config\x18\x13 \x01(\x0b\x32#.flyteidl.admin.RawOutputDataConfigR\x13rawOutputDataConfig\x12P\n\x12\x63luster_assignment\x18\x14 \x01(\x0b\x32!.flyteidl.admin.ClusterAssignmentR\x11\x63lusterAssignment\x12@\n\rinterruptible\x18\x15 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\rinterruptible\x12\'\n\x0foverwrite_cache\x18\x16 \x01(\x08R\x0eoverwriteCacheB\x18\n\x16notification_overridesJ\x04\x08\x04\x10\x05\"m\n\x19\x45xecutionTerminateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x14\n\x05\x63\x61use\x18\x02 \x01(\tR\x05\x63\x61use\"\x1c\n\x1a\x45xecutionTerminateResponse\"]\n\x1fWorkflowExecutionGetDataRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\x88\x02\n WorkflowExecutionGetDataResponse\x12\x35\n\x07outputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12\x33\n\x06inputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputs\"\xab\x01\n\x16\x45xecutionUpdateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x34\n\x05state\x18\x02 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\x12\x1f\n\x0b\x65vict_cache\x18\x03 \x01(\x08R\nevictCache\"\xae\x01\n\x1b\x45xecutionStateChangeDetails\x12\x34\n\x05state\x18\x01 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\x12;\n\x0boccurred_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\noccurredAt\x12\x1c\n\tprincipal\x18\x03 \x01(\tR\tprincipal\"t\n\x17\x45xecutionUpdateResponse\x12Y\n\x15\x63\x61\x63he_eviction_errors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x13\x63\x61\x63heEvictionErrors*>\n\x0e\x45xecutionState\x12\x14\n\x10\x45XECUTION_ACTIVE\x10\x00\x12\x16\n\x12\x45XECUTION_ARCHIVED\x10\x01\x42\xb4\x01\n\x12\x63om.flyteidl.adminB\x0e\x45xecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.admin.execution_pb2', globals()) @@ -48,50 +49,50 @@ _WORKFLOWEXECUTIONGETDATARESPONSE.fields_by_name['outputs']._serialized_options = b'\030\001' _WORKFLOWEXECUTIONGETDATARESPONSE.fields_by_name['inputs']._options = None _WORKFLOWEXECUTIONGETDATARESPONSE.fields_by_name['inputs']._serialized_options = b'\030\001' - _EXECUTIONSTATE._serialized_start=4975 - _EXECUTIONSTATE._serialized_end=5037 - _EXECUTIONCREATEREQUEST._serialized_start=341 - _EXECUTIONCREATEREQUEST._serialized_end=537 - _EXECUTIONRELAUNCHREQUEST._serialized_start=540 - _EXECUTIONRELAUNCHREQUEST._serialized_end=693 - _EXECUTIONRECOVERREQUEST._serialized_start=696 - _EXECUTIONRECOVERREQUEST._serialized_end=864 - _EXECUTIONCREATERESPONSE._serialized_start=866 - _EXECUTIONCREATERESPONSE._serialized_end=951 - _WORKFLOWEXECUTIONGETREQUEST._serialized_start=953 - _WORKFLOWEXECUTIONGETREQUEST._serialized_end=1042 - _EXECUTION._serialized_start=1045 - _EXECUTION._serialized_end=1227 - _EXECUTIONLIST._serialized_start=1229 - _EXECUTIONLIST._serialized_end=1325 - _LITERALMAPBLOB._serialized_start=1327 - _LITERALMAPBLOB._serialized_end=1428 - _ABORTMETADATA._serialized_start=1430 - _ABORTMETADATA._serialized_end=1497 - _EXECUTIONCLOSURE._serialized_start=1500 - _EXECUTIONCLOSURE._serialized_end=2420 - _SYSTEMMETADATA._serialized_start=2422 - _SYSTEMMETADATA._serialized_end=2483 - _EXECUTIONMETADATA._serialized_start=2486 - _EXECUTIONMETADATA._serialized_end=3056 - _EXECUTIONMETADATA_EXECUTIONMODE._serialized_start=2953 - _EXECUTIONMETADATA_EXECUTIONMODE._serialized_end=3056 - _NOTIFICATIONLIST._serialized_start=3058 - _NOTIFICATIONLIST._serialized_end=3144 - _EXECUTIONSPEC._serialized_start=3147 - _EXECUTIONSPEC._serialized_end=4125 - _EXECUTIONTERMINATEREQUEST._serialized_start=4127 - _EXECUTIONTERMINATEREQUEST._serialized_end=4236 - _EXECUTIONTERMINATERESPONSE._serialized_start=4238 - _EXECUTIONTERMINATERESPONSE._serialized_end=4266 - _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_start=4268 - _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_end=4361 - _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_start=4364 - _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_end=4628 - _EXECUTIONUPDATEREQUEST._serialized_start=4631 - _EXECUTIONUPDATEREQUEST._serialized_end=4769 - _EXECUTIONSTATECHANGEDETAILS._serialized_start=4772 - _EXECUTIONSTATECHANGEDETAILS._serialized_end=4946 - _EXECUTIONUPDATERESPONSE._serialized_start=4948 - _EXECUTIONUPDATERESPONSE._serialized_end=4973 + _EXECUTIONSTATE._serialized_start=5127 + _EXECUTIONSTATE._serialized_end=5189 + _EXECUTIONCREATEREQUEST._serialized_start=369 + _EXECUTIONCREATEREQUEST._serialized_end=565 + _EXECUTIONRELAUNCHREQUEST._serialized_start=568 + _EXECUTIONRELAUNCHREQUEST._serialized_end=721 + _EXECUTIONRECOVERREQUEST._serialized_start=724 + _EXECUTIONRECOVERREQUEST._serialized_end=892 + _EXECUTIONCREATERESPONSE._serialized_start=894 + _EXECUTIONCREATERESPONSE._serialized_end=979 + _WORKFLOWEXECUTIONGETREQUEST._serialized_start=981 + _WORKFLOWEXECUTIONGETREQUEST._serialized_end=1070 + _EXECUTION._serialized_start=1073 + _EXECUTION._serialized_end=1255 + _EXECUTIONLIST._serialized_start=1257 + _EXECUTIONLIST._serialized_end=1353 + _LITERALMAPBLOB._serialized_start=1355 + _LITERALMAPBLOB._serialized_end=1456 + _ABORTMETADATA._serialized_start=1458 + _ABORTMETADATA._serialized_end=1525 + _EXECUTIONCLOSURE._serialized_start=1528 + _EXECUTIONCLOSURE._serialized_end=2448 + _SYSTEMMETADATA._serialized_start=2450 + _SYSTEMMETADATA._serialized_end=2511 + _EXECUTIONMETADATA._serialized_start=2514 + _EXECUTIONMETADATA._serialized_end=3084 + _EXECUTIONMETADATA_EXECUTIONMODE._serialized_start=2981 + _EXECUTIONMETADATA_EXECUTIONMODE._serialized_end=3084 + _NOTIFICATIONLIST._serialized_start=3086 + _NOTIFICATIONLIST._serialized_end=3172 + _EXECUTIONSPEC._serialized_start=3175 + _EXECUTIONSPEC._serialized_end=4153 + _EXECUTIONTERMINATEREQUEST._serialized_start=4155 + _EXECUTIONTERMINATEREQUEST._serialized_end=4264 + _EXECUTIONTERMINATERESPONSE._serialized_start=4266 + _EXECUTIONTERMINATERESPONSE._serialized_end=4294 + _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_start=4296 + _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_end=4389 + _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_start=4392 + _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_end=4656 + _EXECUTIONUPDATEREQUEST._serialized_start=4659 + _EXECUTIONUPDATEREQUEST._serialized_end=4830 + _EXECUTIONSTATECHANGEDETAILS._serialized_start=4833 + _EXECUTIONSTATECHANGEDETAILS._serialized_end=5007 + _EXECUTIONUPDATERESPONSE._serialized_start=5009 + _EXECUTIONUPDATERESPONSE._serialized_end=5125 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi index 20c0988866..7c214bd80a 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi @@ -1,6 +1,7 @@ from flyteidl.admin import cluster_assignment_pb2 as _cluster_assignment_pb2 from flyteidl.admin import common_pb2 as _common_pb2 from flyteidl.core import literals_pb2 as _literals_pb2 +from flyteidl.core import errors_pb2 as _errors_pb2 from flyteidl.core import execution_pb2 as _execution_pb2 from flyteidl.core import identifier_pb2 as _identifier_pb2 from flyteidl.core import security_pb2 as _security_pb2 @@ -198,16 +199,20 @@ class ExecutionTerminateResponse(_message.Message): def __init__(self) -> None: ... class ExecutionUpdateRequest(_message.Message): - __slots__ = ["id", "state"] + __slots__ = ["evict_cache", "id", "state"] + EVICT_CACHE_FIELD_NUMBER: _ClassVar[int] ID_FIELD_NUMBER: _ClassVar[int] STATE_FIELD_NUMBER: _ClassVar[int] + evict_cache: bool id: _identifier_pb2.WorkflowExecutionIdentifier state: ExecutionState - def __init__(self, id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., state: _Optional[_Union[ExecutionState, str]] = ...) -> None: ... + def __init__(self, id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., state: _Optional[_Union[ExecutionState, str]] = ..., evict_cache: bool = ...) -> None: ... class ExecutionUpdateResponse(_message.Message): - __slots__ = [] - def __init__(self) -> None: ... + __slots__ = ["cache_eviction_errors"] + CACHE_EVICTION_ERRORS_FIELD_NUMBER: _ClassVar[int] + cache_eviction_errors: _errors_pb2.CacheEvictionErrorList + def __init__(self, cache_eviction_errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ... class LiteralMapBlob(_message.Message): __slots__ = ["uri", "values"] diff --git a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py index 38521dc88a..7cf2297d4b 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py @@ -12,6 +12,7 @@ from flyteidl.admin import common_pb2 as flyteidl_dot_admin_dot_common__pb2 +from flyteidl.core import errors_pb2 as flyteidl_dot_core_dot_errors__pb2 from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 from flyteidl.core import literals_pb2 as flyteidl_dot_core_dot_literals__pb2 @@ -21,7 +22,7 @@ from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#flyteidl/admin/task_execution.proto\x12\x0e\x66lyteidl.admin\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"Q\n\x17TaskExecutionGetRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\xe3\x01\n\x18TaskExecutionListRequest\x12R\n\x11node_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12\x14\n\x05limit\x18\x02 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x03 \x01(\tR\x05token\x12\x18\n\x07\x66ilters\x18\x04 \x01(\tR\x07\x66ilters\x12-\n\x07sort_by\x18\x05 \x01(\x0b\x32\x14.flyteidl.admin.SortR\x06sortBy\"\xc1\x01\n\rTaskExecution\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\x12\x1b\n\tinput_uri\x18\x02 \x01(\tR\x08inputUri\x12>\n\x07\x63losure\x18\x03 \x01(\x0b\x32$.flyteidl.admin.TaskExecutionClosureR\x07\x63losure\x12\x1b\n\tis_parent\x18\x04 \x01(\x08R\x08isParent\"q\n\x11TaskExecutionList\x12\x46\n\x0ftask_executions\x18\x01 \x03(\x0b\x32\x1d.flyteidl.admin.TaskExecutionR\x0etaskExecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"\xea\x05\n\x14TaskExecutionClosure\x12#\n\noutput_uri\x18\x01 \x01(\tB\x02\x18\x01H\x00R\toutputUri\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12@\n\x0boutput_data\x18\x0c \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x38\n\x05phase\x18\x03 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\x12*\n\x04logs\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x04logs\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x38\n\x0b\x63ustom_info\x18\t \x01(\x0b\x32\x17.google.protobuf.StructR\ncustomInfo\x12\x16\n\x06reason\x18\n \x01(\tR\x06reason\x12\x1b\n\ttask_type\x18\x0b \x01(\tR\x08taskType\x12\x41\n\x08metadata\x18\x10 \x01(\x0b\x32%.flyteidl.event.TaskExecutionMetadataR\x08metadata\x12#\n\revent_version\x18\x11 \x01(\x05R\x0c\x65ventVersionB\x0f\n\routput_result\"U\n\x1bTaskExecutionGetDataRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\x84\x02\n\x1cTaskExecutionGetDataResponse\x12\x33\n\x06inputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12\x35\n\x07outputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputsB\xb8\x01\n\x12\x63om.flyteidl.adminB\x12TaskExecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#flyteidl/admin/task_execution.proto\x12\x0e\x66lyteidl.admin\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"Q\n\x17TaskExecutionGetRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\xe3\x01\n\x18TaskExecutionListRequest\x12R\n\x11node_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12\x14\n\x05limit\x18\x02 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x03 \x01(\tR\x05token\x12\x18\n\x07\x66ilters\x18\x04 \x01(\tR\x07\x66ilters\x12-\n\x07sort_by\x18\x05 \x01(\x0b\x32\x14.flyteidl.admin.SortR\x06sortBy\"\xc1\x01\n\rTaskExecution\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\x12\x1b\n\tinput_uri\x18\x02 \x01(\tR\x08inputUri\x12>\n\x07\x63losure\x18\x03 \x01(\x0b\x32$.flyteidl.admin.TaskExecutionClosureR\x07\x63losure\x12\x1b\n\tis_parent\x18\x04 \x01(\x08R\x08isParent\"q\n\x11TaskExecutionList\x12\x46\n\x0ftask_executions\x18\x01 \x03(\x0b\x32\x1d.flyteidl.admin.TaskExecutionR\x0etaskExecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"\xea\x05\n\x14TaskExecutionClosure\x12#\n\noutput_uri\x18\x01 \x01(\tB\x02\x18\x01H\x00R\toutputUri\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12@\n\x0boutput_data\x18\x0c \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x38\n\x05phase\x18\x03 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\x12*\n\x04logs\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x04logs\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x38\n\x0b\x63ustom_info\x18\t \x01(\x0b\x32\x17.google.protobuf.StructR\ncustomInfo\x12\x16\n\x06reason\x18\n \x01(\tR\x06reason\x12\x1b\n\ttask_type\x18\x0b \x01(\tR\x08taskType\x12\x41\n\x08metadata\x18\x10 \x01(\x0b\x32%.flyteidl.event.TaskExecutionMetadataR\x08metadata\x12#\n\revent_version\x18\x11 \x01(\x05R\x0c\x65ventVersionB\x0f\n\routput_result\"U\n\x1bTaskExecutionGetDataRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\x84\x02\n\x1cTaskExecutionGetDataResponse\x12\x33\n\x06inputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12\x35\n\x07outputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputs\"u\n\x1aTaskExecutionUpdateRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\x12\x1f\n\x0b\x65vict_cache\x18\x02 \x01(\x08R\nevictCache\"x\n\x1bTaskExecutionUpdateResponse\x12Y\n\x15\x63\x61\x63he_eviction_errors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x13\x63\x61\x63heEvictionErrorsB\xb8\x01\n\x12\x63om.flyteidl.adminB\x12TaskExecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.admin.task_execution_pb2', globals()) @@ -37,18 +38,22 @@ _TASKEXECUTIONGETDATARESPONSE.fields_by_name['inputs']._serialized_options = b'\030\001' _TASKEXECUTIONGETDATARESPONSE.fields_by_name['outputs']._options = None _TASKEXECUTIONGETDATARESPONSE.fields_by_name['outputs']._serialized_options = b'\030\001' - _TASKEXECUTIONGETREQUEST._serialized_start=300 - _TASKEXECUTIONGETREQUEST._serialized_end=381 - _TASKEXECUTIONLISTREQUEST._serialized_start=384 - _TASKEXECUTIONLISTREQUEST._serialized_end=611 - _TASKEXECUTION._serialized_start=614 - _TASKEXECUTION._serialized_end=807 - _TASKEXECUTIONLIST._serialized_start=809 - _TASKEXECUTIONLIST._serialized_end=922 - _TASKEXECUTIONCLOSURE._serialized_start=925 - _TASKEXECUTIONCLOSURE._serialized_end=1671 - _TASKEXECUTIONGETDATAREQUEST._serialized_start=1673 - _TASKEXECUTIONGETDATAREQUEST._serialized_end=1758 - _TASKEXECUTIONGETDATARESPONSE._serialized_start=1761 - _TASKEXECUTIONGETDATARESPONSE._serialized_end=2021 + _TASKEXECUTIONGETREQUEST._serialized_start=328 + _TASKEXECUTIONGETREQUEST._serialized_end=409 + _TASKEXECUTIONLISTREQUEST._serialized_start=412 + _TASKEXECUTIONLISTREQUEST._serialized_end=639 + _TASKEXECUTION._serialized_start=642 + _TASKEXECUTION._serialized_end=835 + _TASKEXECUTIONLIST._serialized_start=837 + _TASKEXECUTIONLIST._serialized_end=950 + _TASKEXECUTIONCLOSURE._serialized_start=953 + _TASKEXECUTIONCLOSURE._serialized_end=1699 + _TASKEXECUTIONGETDATAREQUEST._serialized_start=1701 + _TASKEXECUTIONGETDATAREQUEST._serialized_end=1786 + _TASKEXECUTIONGETDATARESPONSE._serialized_start=1789 + _TASKEXECUTIONGETDATARESPONSE._serialized_end=2049 + _TASKEXECUTIONUPDATEREQUEST._serialized_start=2051 + _TASKEXECUTIONUPDATEREQUEST._serialized_end=2168 + _TASKEXECUTIONUPDATERESPONSE._serialized_start=2170 + _TASKEXECUTIONUPDATERESPONSE._serialized_end=2290 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi index 6b0035fe1d..892fbf4522 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi @@ -1,4 +1,5 @@ from flyteidl.admin import common_pb2 as _common_pb2 +from flyteidl.core import errors_pb2 as _errors_pb2 from flyteidl.core import execution_pb2 as _execution_pb2 from flyteidl.core import identifier_pb2 as _identifier_pb2 from flyteidl.core import literals_pb2 as _literals_pb2 @@ -102,3 +103,17 @@ class TaskExecutionListRequest(_message.Message): sort_by: _common_pb2.Sort token: str def __init__(self, node_execution_id: _Optional[_Union[_identifier_pb2.NodeExecutionIdentifier, _Mapping]] = ..., limit: _Optional[int] = ..., token: _Optional[str] = ..., filters: _Optional[str] = ..., sort_by: _Optional[_Union[_common_pb2.Sort, _Mapping]] = ...) -> None: ... + +class TaskExecutionUpdateRequest(_message.Message): + __slots__ = ["evict_cache", "id"] + EVICT_CACHE_FIELD_NUMBER: _ClassVar[int] + ID_FIELD_NUMBER: _ClassVar[int] + evict_cache: bool + id: _identifier_pb2.TaskExecutionIdentifier + def __init__(self, id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., evict_cache: bool = ...) -> None: ... + +class TaskExecutionUpdateResponse(_message.Message): + __slots__ = ["cache_eviction_errors"] + CACHE_EVICTION_ERRORS_FIELD_NUMBER: _ClassVar[int] + cache_eviction_errors: _errors_pb2.CacheEvictionErrorList + def __init__(self, cache_eviction_errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ... diff --git a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py index 6453c77532..80b627e1c4 100644 --- a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py @@ -12,9 +12,10 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 +from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/core/errors.proto\x12\rflyteidl.core\x1a\x1d\x66lyteidl/core/execution.proto\"\xe5\x01\n\x0e\x43ontainerError\x12\x12\n\x04\x63ode\x18\x01 \x01(\tR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12\x36\n\x04kind\x18\x03 \x01(\x0e\x32\".flyteidl.core.ContainerError.KindR\x04kind\x12?\n\x06origin\x18\x04 \x01(\x0e\x32\'.flyteidl.core.ExecutionError.ErrorKindR\x06origin\",\n\x04Kind\x12\x13\n\x0fNON_RECOVERABLE\x10\x00\x12\x0f\n\x0bRECOVERABLE\x10\x01\"D\n\rErrorDocument\x12\x33\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.ContainerErrorR\x05\x65rrorB\xab\x01\n\x11\x63om.flyteidl.coreB\x0b\x45rrorsProtoP\x01Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/core/errors.proto\x12\rflyteidl.core\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xe5\x01\n\x0e\x43ontainerError\x12\x12\n\x04\x63ode\x18\x01 \x01(\tR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12\x36\n\x04kind\x18\x03 \x01(\x0e\x32\".flyteidl.core.ContainerError.KindR\x04kind\x12?\n\x06origin\x18\x04 \x01(\x0e\x32\'.flyteidl.core.ExecutionError.ErrorKindR\x06origin\",\n\x04Kind\x12\x13\n\x0fNON_RECOVERABLE\x10\x00\x12\x0f\n\x0bRECOVERABLE\x10\x01\"D\n\rErrorDocument\x12\x33\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.ContainerErrorR\x05\x65rror\"\x95\x03\n\x12\x43\x61\x63heEvictionError\x12:\n\x04\x63ode\x18\x01 \x01(\x0e\x32&.flyteidl.core.CacheEvictionError.CodeR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12R\n\x11node_execution_id\x18\x03 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12T\n\x11task_execution_id\x18\x04 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionId\x12`\n\x15workflow_execution_id\x18\x05 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\"\x13\n\x04\x43ode\x12\x0b\n\x07UNKNOWN\x10\x00\x42\x08\n\x06source\"S\n\x16\x43\x61\x63heEvictionErrorList\x12\x39\n\x06\x65rrors\x18\x01 \x03(\x0b\x32!.flyteidl.core.CacheEvictionErrorR\x06\x65rrorsB\xab\x01\n\x11\x63om.flyteidl.coreB\x0b\x45rrorsProtoP\x01Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.core.errors_pb2', globals()) @@ -22,10 +23,16 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\021com.flyteidl.coreB\013ErrorsProtoP\001Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\242\002\003FCX\252\002\rFlyteidl.Core\312\002\rFlyteidl\\Core\342\002\031Flyteidl\\Core\\GPBMetadata\352\002\016Flyteidl::Core' - _CONTAINERERROR._serialized_start=77 - _CONTAINERERROR._serialized_end=306 - _CONTAINERERROR_KIND._serialized_start=262 - _CONTAINERERROR_KIND._serialized_end=306 - _ERRORDOCUMENT._serialized_start=308 - _ERRORDOCUMENT._serialized_end=376 + _CONTAINERERROR._serialized_start=109 + _CONTAINERERROR._serialized_end=338 + _CONTAINERERROR_KIND._serialized_start=294 + _CONTAINERERROR_KIND._serialized_end=338 + _ERRORDOCUMENT._serialized_start=340 + _ERRORDOCUMENT._serialized_end=408 + _CACHEEVICTIONERROR._serialized_start=411 + _CACHEEVICTIONERROR._serialized_end=816 + _CACHEEVICTIONERROR_CODE._serialized_start=787 + _CACHEEVICTIONERROR_CODE._serialized_end=806 + _CACHEEVICTIONERRORLIST._serialized_start=818 + _CACHEEVICTIONERRORLIST._serialized_end=901 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi index 0c0c20e60e..8d7becbd3d 100644 --- a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi @@ -1,11 +1,36 @@ from flyteidl.core import execution_pb2 as _execution_pb2 +from flyteidl.core import identifier_pb2 as _identifier_pb2 +from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union +from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor +class CacheEvictionError(_message.Message): + __slots__ = ["code", "message", "node_execution_id", "task_execution_id", "workflow_execution_id"] + class Code(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): + __slots__ = [] + CODE_FIELD_NUMBER: _ClassVar[int] + MESSAGE_FIELD_NUMBER: _ClassVar[int] + NODE_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + UNKNOWN: CacheEvictionError.Code + WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + code: CacheEvictionError.Code + message: str + node_execution_id: _identifier_pb2.NodeExecutionIdentifier + task_execution_id: _identifier_pb2.TaskExecutionIdentifier + workflow_execution_id: _identifier_pb2.WorkflowExecutionIdentifier + def __init__(self, code: _Optional[_Union[CacheEvictionError.Code, str]] = ..., message: _Optional[str] = ..., node_execution_id: _Optional[_Union[_identifier_pb2.NodeExecutionIdentifier, _Mapping]] = ..., task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., workflow_execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ...) -> None: ... + +class CacheEvictionErrorList(_message.Message): + __slots__ = ["errors"] + ERRORS_FIELD_NUMBER: _ClassVar[int] + errors: _containers.RepeatedCompositeFieldContainer[CacheEvictionError] + def __init__(self, errors: _Optional[_Iterable[_Union[CacheEvictionError, _Mapping]]] = ...) -> None: ... + class ContainerError(_message.Message): __slots__ = ["code", "kind", "message", "origin"] class Kind(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): diff --git a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py index 64cab73d08..822e0e4105 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py @@ -30,7 +30,7 @@ from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/admin.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1c\x66lyteidl/admin/project.proto\x1a.flyteidl/admin/project_domain_attributes.proto\x1a\'flyteidl/admin/project_attributes.proto\x1a\x19\x66lyteidl/admin/task.proto\x1a\x1d\x66lyteidl/admin/workflow.proto\x1a(flyteidl/admin/workflow_attributes.proto\x1a flyteidl/admin/launch_plan.proto\x1a\x1a\x66lyteidl/admin/event.proto\x1a\x1e\x66lyteidl/admin/execution.proto\x1a\'flyteidl/admin/matchable_resource.proto\x1a#flyteidl/admin/node_execution.proto\x1a#flyteidl/admin/task_execution.proto\x1a\x1c\x66lyteidl/admin/version.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\'flyteidl/admin/description_entity.proto\x1a\x1e\x66lyteidl/core/identifier.proto2\xbcL\n\x0c\x41\x64minService\x12m\n\nCreateTask\x12!.flyteidl.admin.TaskCreateRequest\x1a\".flyteidl.admin.TaskCreateResponse\"\x18\x82\xd3\xe4\x93\x02\x12:\x01*\"\r/api/v1/tasks\x12\x88\x01\n\x07GetTask\x12 .flyteidl.admin.ObjectGetRequest\x1a\x14.flyteidl.admin.Task\"E\x82\xd3\xe4\x93\x02?\x12=/api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x97\x01\n\x0bListTaskIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"+\x82\xd3\xe4\x93\x02%\x12#/api/v1/task_ids/{project}/{domain}\x12\xae\x01\n\tListTasks\x12#.flyteidl.admin.ResourceListRequest\x1a\x18.flyteidl.admin.TaskList\"b\x82\xd3\xe4\x93\x02\\Z(\x12&/api/v1/tasks/{id.project}/{id.domain}\x12\x30/api/v1/tasks/{id.project}/{id.domain}/{id.name}\x12}\n\x0e\x43reateWorkflow\x12%.flyteidl.admin.WorkflowCreateRequest\x1a&.flyteidl.admin.WorkflowCreateResponse\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v1/workflows\x12\x94\x01\n\x0bGetWorkflow\x12 .flyteidl.admin.ObjectGetRequest\x1a\x18.flyteidl.admin.Workflow\"I\x82\xd3\xe4\x93\x02\x43\x12\x41/api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x9f\x01\n\x0fListWorkflowIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"/\x82\xd3\xe4\x93\x02)\x12\'/api/v1/workflow_ids/{project}/{domain}\x12\xbe\x01\n\rListWorkflows\x12#.flyteidl.admin.ResourceListRequest\x1a\x1c.flyteidl.admin.WorkflowList\"j\x82\xd3\xe4\x93\x02\x64Z,\x12*/api/v1/workflows/{id.project}/{id.domain}\x12\x34/api/v1/workflows/{id.project}/{id.domain}/{id.name}\x12\x86\x01\n\x10\x43reateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanCreateRequest\x1a(.flyteidl.admin.LaunchPlanCreateResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/launch_plans\x12\x9b\x01\n\rGetLaunchPlan\x12 .flyteidl.admin.ObjectGetRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"L\x82\xd3\xe4\x93\x02\x46\x12\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\xa2\x01\n\x13GetActiveLaunchPlan\x12\'.flyteidl.admin.ActiveLaunchPlanRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"F\x82\xd3\xe4\x93\x02@\x12>/api/v1/active_launch_plans/{id.project}/{id.domain}/{id.name}\x12\x9c\x01\n\x15ListActiveLaunchPlans\x12+.flyteidl.admin.ActiveLaunchPlanListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"6\x82\xd3\xe4\x93\x02\x30\x12./api/v1/active_launch_plans/{project}/{domain}\x12\xa4\x01\n\x11ListLaunchPlanIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"2\x82\xd3\xe4\x93\x02,\x12*/api/v1/launch_plan_ids/{project}/{domain}\x12\xc8\x01\n\x0fListLaunchPlans\x12#.flyteidl.admin.ResourceListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"p\x82\xd3\xe4\x93\x02jZ/\x12-/api/v1/launch_plans/{id.project}/{id.domain}\x12\x37/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}\x12\xb6\x01\n\x10UpdateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanUpdateRequest\x1a(.flyteidl.admin.LaunchPlanUpdateResponse\"O\x82\xd3\xe4\x93\x02I:\x01*\x1a\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x81\x01\n\x0f\x43reateExecution\x12&.flyteidl.admin.ExecutionCreateRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v1/executions\x12\x8e\x01\n\x11RelaunchExecution\x12(.flyteidl.admin.ExecutionRelaunchRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"&\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/api/v1/executions/relaunch\x12\x8b\x01\n\x10RecoverExecution\x12\'.flyteidl.admin.ExecutionRecoverRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\"\x1a/api/v1/executions/recover\x12\x95\x01\n\x0cGetExecution\x12+.flyteidl.admin.WorkflowExecutionGetRequest\x1a\x19.flyteidl.admin.Execution\"=\x82\xd3\xe4\x93\x02\x37\x12\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xa4\x01\n\x0fUpdateExecution\x12&.flyteidl.admin.ExecutionUpdateRequest\x1a\'.flyteidl.admin.ExecutionUpdateResponse\"@\x82\xd3\xe4\x93\x02::\x01*\x1a\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xb9\x01\n\x10GetExecutionData\x12/.flyteidl.admin.WorkflowExecutionGetDataRequest\x1a\x30.flyteidl.admin.WorkflowExecutionGetDataResponse\"B\x82\xd3\xe4\x93\x02<\x12:/api/v1/data/executions/{id.project}/{id.domain}/{id.name}\x12\x89\x01\n\x0eListExecutions\x12#.flyteidl.admin.ResourceListRequest\x1a\x1d.flyteidl.admin.ExecutionList\"3\x82\xd3\xe4\x93\x02-\x12+/api/v1/executions/{id.project}/{id.domain}\x12\xad\x01\n\x12TerminateExecution\x12).flyteidl.admin.ExecutionTerminateRequest\x1a*.flyteidl.admin.ExecutionTerminateResponse\"@\x82\xd3\xe4\x93\x02::\x01**5/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xd2\x01\n\x10GetNodeExecution\x12\'.flyteidl.admin.NodeExecutionGetRequest\x1a\x1d.flyteidl.admin.NodeExecution\"v\x82\xd3\xe4\x93\x02p\x12n/api/v1/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\xde\x01\n\x12ListNodeExecutions\x12(.flyteidl.admin.NodeExecutionListRequest\x1a!.flyteidl.admin.NodeExecutionList\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/node_executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa5\x04\n\x19ListNodeExecutionsForTask\x12/.flyteidl.admin.NodeExecutionForTaskListRequest\x1a!.flyteidl.admin.NodeExecutionList\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03\x12\xa9\x03/api/v1/children/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}\x12\xee\x01\n\x14GetNodeExecutionData\x12+.flyteidl.admin.NodeExecutionGetDataRequest\x1a,.flyteidl.admin.NodeExecutionGetDataResponse\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/data/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\x7f\n\x0fRegisterProject\x12&.flyteidl.admin.ProjectRegisterRequest\x1a\'.flyteidl.admin.ProjectRegisterResponse\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/v1/projects\x12q\n\rUpdateProject\x12\x17.flyteidl.admin.Project\x1a%.flyteidl.admin.ProjectUpdateResponse\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x1a\x15/api/v1/projects/{id}\x12\x66\n\x0cListProjects\x12\".flyteidl.admin.ProjectListRequest\x1a\x18.flyteidl.admin.Projects\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/api/v1/projects\x12\x99\x01\n\x13\x43reateWorkflowEvent\x12-.flyteidl.admin.WorkflowExecutionEventRequest\x1a..flyteidl.admin.WorkflowExecutionEventResponse\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v1/events/workflows\x12\x89\x01\n\x0f\x43reateNodeEvent\x12).flyteidl.admin.NodeExecutionEventRequest\x1a*.flyteidl.admin.NodeExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/nodes\x12\x89\x01\n\x0f\x43reateTaskEvent\x12).flyteidl.admin.TaskExecutionEventRequest\x1a*.flyteidl.admin.TaskExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/tasks\x12\x80\x03\n\x10GetTaskExecution\x12\'.flyteidl.admin.TaskExecutionGetRequest\x1a\x1d.flyteidl.admin.TaskExecution\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x98\x02\n\x12ListTaskExecutions\x12(.flyteidl.admin.TaskExecutionListRequest\x1a!.flyteidl.admin.TaskExecutionList\"\xb4\x01\x82\xd3\xe4\x93\x02\xad\x01\x12\xaa\x01/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}\x12\x9c\x03\n\x14GetTaskExecutionData\x12+.flyteidl.admin.TaskExecutionGetDataRequest\x1a,.flyteidl.admin.TaskExecutionGetDataResponse\"\xa8\x02\x82\xd3\xe4\x93\x02\xa1\x02\x12\x9e\x02/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\xe3\x01\n\x1dUpdateProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesUpdateRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesUpdateResponse\"U\x82\xd3\xe4\x93\x02O:\x01*\x1aJ/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}\x12\xc1\x01\n\x1aGetProjectDomainAttributes\x12\x31.flyteidl.admin.ProjectDomainAttributesGetRequest\x1a\x32.flyteidl.admin.ProjectDomainAttributesGetResponse\"<\x82\xd3\xe4\x93\x02\x36\x12\x34/api/v1/project_domain_attributes/{project}/{domain}\x12\xcd\x01\n\x1d\x44\x65leteProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesDeleteRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesDeleteResponse\"?\x82\xd3\xe4\x93\x02\x39:\x01**4/api/v1/project_domain_attributes/{project}/{domain}\x12\xb6\x01\n\x17UpdateProjectAttributes\x12..flyteidl.admin.ProjectAttributesUpdateRequest\x1a/.flyteidl.admin.ProjectAttributesUpdateResponse\":\x82\xd3\xe4\x93\x02\x34:\x01*\x1a//api/v1/project_attributes/{attributes.project}\x12\x9f\x01\n\x14GetProjectAttributes\x12+.flyteidl.admin.ProjectAttributesGetRequest\x1a,.flyteidl.admin.ProjectAttributesGetResponse\",\x82\xd3\xe4\x93\x02&\x12$/api/v1/project_attributes/{project}\x12\xab\x01\n\x17\x44\x65leteProjectAttributes\x12..flyteidl.admin.ProjectAttributesDeleteRequest\x1a/.flyteidl.admin.ProjectAttributesDeleteResponse\"/\x82\xd3\xe4\x93\x02):\x01**$/api/v1/project_attributes/{project}\x12\xe4\x01\n\x18UpdateWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesUpdateRequest\x1a\x30.flyteidl.admin.WorkflowAttributesUpdateResponse\"e\x82\xd3\xe4\x93\x02_:\x01*\x1aZ/api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow}\x12\xb7\x01\n\x15GetWorkflowAttributes\x12,.flyteidl.admin.WorkflowAttributesGetRequest\x1a-.flyteidl.admin.WorkflowAttributesGetResponse\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xc3\x01\n\x18\x44\x65leteWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesDeleteRequest\x1a\x30.flyteidl.admin.WorkflowAttributesDeleteResponse\"D\x82\xd3\xe4\x93\x02>:\x01**9/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xa0\x01\n\x17ListMatchableAttributes\x12..flyteidl.admin.ListMatchableAttributesRequest\x1a/.flyteidl.admin.ListMatchableAttributesResponse\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/api/v1/matchable_attributes\x12\x9f\x01\n\x11ListNamedEntities\x12&.flyteidl.admin.NamedEntityListRequest\x1a\x1f.flyteidl.admin.NamedEntityList\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/named_entities/{resource_type}/{project}/{domain}\x12\xa7\x01\n\x0eGetNamedEntity\x12%.flyteidl.admin.NamedEntityGetRequest\x1a\x1b.flyteidl.admin.NamedEntity\"Q\x82\xd3\xe4\x93\x02K\x12I/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12\xbe\x01\n\x11UpdateNamedEntity\x12(.flyteidl.admin.NamedEntityUpdateRequest\x1a).flyteidl.admin.NamedEntityUpdateResponse\"T\x82\xd3\xe4\x93\x02N:\x01*\x1aI/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12l\n\nGetVersion\x12!.flyteidl.admin.GetVersionRequest\x1a\".flyteidl.admin.GetVersionResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/v1/version\x12\xc4\x01\n\x14GetDescriptionEntity\x12 .flyteidl.admin.ObjectGetRequest\x1a!.flyteidl.admin.DescriptionEntity\"g\x82\xd3\xe4\x93\x02\x61\x12_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x92\x02\n\x17ListDescriptionEntities\x12,.flyteidl.admin.DescriptionEntityListRequest\x1a%.flyteidl.admin.DescriptionEntityList\"\xa1\x01\x82\xd3\xe4\x93\x02\x9a\x01ZG\x12\x45/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\x12O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nAdminProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/admin.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1c\x66lyteidl/admin/project.proto\x1a.flyteidl/admin/project_domain_attributes.proto\x1a\'flyteidl/admin/project_attributes.proto\x1a\x19\x66lyteidl/admin/task.proto\x1a\x1d\x66lyteidl/admin/workflow.proto\x1a(flyteidl/admin/workflow_attributes.proto\x1a flyteidl/admin/launch_plan.proto\x1a\x1a\x66lyteidl/admin/event.proto\x1a\x1e\x66lyteidl/admin/execution.proto\x1a\'flyteidl/admin/matchable_resource.proto\x1a#flyteidl/admin/node_execution.proto\x1a#flyteidl/admin/task_execution.proto\x1a\x1c\x66lyteidl/admin/version.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\'flyteidl/admin/description_entity.proto\x1a\x1e\x66lyteidl/core/identifier.proto2\xd3O\n\x0c\x41\x64minService\x12m\n\nCreateTask\x12!.flyteidl.admin.TaskCreateRequest\x1a\".flyteidl.admin.TaskCreateResponse\"\x18\x82\xd3\xe4\x93\x02\x12:\x01*\"\r/api/v1/tasks\x12\x88\x01\n\x07GetTask\x12 .flyteidl.admin.ObjectGetRequest\x1a\x14.flyteidl.admin.Task\"E\x82\xd3\xe4\x93\x02?\x12=/api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x97\x01\n\x0bListTaskIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"+\x82\xd3\xe4\x93\x02%\x12#/api/v1/task_ids/{project}/{domain}\x12\xae\x01\n\tListTasks\x12#.flyteidl.admin.ResourceListRequest\x1a\x18.flyteidl.admin.TaskList\"b\x82\xd3\xe4\x93\x02\\Z(\x12&/api/v1/tasks/{id.project}/{id.domain}\x12\x30/api/v1/tasks/{id.project}/{id.domain}/{id.name}\x12}\n\x0e\x43reateWorkflow\x12%.flyteidl.admin.WorkflowCreateRequest\x1a&.flyteidl.admin.WorkflowCreateResponse\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v1/workflows\x12\x94\x01\n\x0bGetWorkflow\x12 .flyteidl.admin.ObjectGetRequest\x1a\x18.flyteidl.admin.Workflow\"I\x82\xd3\xe4\x93\x02\x43\x12\x41/api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x9f\x01\n\x0fListWorkflowIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"/\x82\xd3\xe4\x93\x02)\x12\'/api/v1/workflow_ids/{project}/{domain}\x12\xbe\x01\n\rListWorkflows\x12#.flyteidl.admin.ResourceListRequest\x1a\x1c.flyteidl.admin.WorkflowList\"j\x82\xd3\xe4\x93\x02\x64Z,\x12*/api/v1/workflows/{id.project}/{id.domain}\x12\x34/api/v1/workflows/{id.project}/{id.domain}/{id.name}\x12\x86\x01\n\x10\x43reateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanCreateRequest\x1a(.flyteidl.admin.LaunchPlanCreateResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/launch_plans\x12\x9b\x01\n\rGetLaunchPlan\x12 .flyteidl.admin.ObjectGetRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"L\x82\xd3\xe4\x93\x02\x46\x12\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\xa2\x01\n\x13GetActiveLaunchPlan\x12\'.flyteidl.admin.ActiveLaunchPlanRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"F\x82\xd3\xe4\x93\x02@\x12>/api/v1/active_launch_plans/{id.project}/{id.domain}/{id.name}\x12\x9c\x01\n\x15ListActiveLaunchPlans\x12+.flyteidl.admin.ActiveLaunchPlanListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"6\x82\xd3\xe4\x93\x02\x30\x12./api/v1/active_launch_plans/{project}/{domain}\x12\xa4\x01\n\x11ListLaunchPlanIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"2\x82\xd3\xe4\x93\x02,\x12*/api/v1/launch_plan_ids/{project}/{domain}\x12\xc8\x01\n\x0fListLaunchPlans\x12#.flyteidl.admin.ResourceListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"p\x82\xd3\xe4\x93\x02jZ/\x12-/api/v1/launch_plans/{id.project}/{id.domain}\x12\x37/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}\x12\xb6\x01\n\x10UpdateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanUpdateRequest\x1a(.flyteidl.admin.LaunchPlanUpdateResponse\"O\x82\xd3\xe4\x93\x02I:\x01*\x1a\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x81\x01\n\x0f\x43reateExecution\x12&.flyteidl.admin.ExecutionCreateRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v1/executions\x12\x8e\x01\n\x11RelaunchExecution\x12(.flyteidl.admin.ExecutionRelaunchRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"&\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/api/v1/executions/relaunch\x12\x8b\x01\n\x10RecoverExecution\x12\'.flyteidl.admin.ExecutionRecoverRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\"\x1a/api/v1/executions/recover\x12\x95\x01\n\x0cGetExecution\x12+.flyteidl.admin.WorkflowExecutionGetRequest\x1a\x19.flyteidl.admin.Execution\"=\x82\xd3\xe4\x93\x02\x37\x12\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xa4\x01\n\x0fUpdateExecution\x12&.flyteidl.admin.ExecutionUpdateRequest\x1a\'.flyteidl.admin.ExecutionUpdateResponse\"@\x82\xd3\xe4\x93\x02::\x01*\x1a\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xb9\x01\n\x10GetExecutionData\x12/.flyteidl.admin.WorkflowExecutionGetDataRequest\x1a\x30.flyteidl.admin.WorkflowExecutionGetDataResponse\"B\x82\xd3\xe4\x93\x02<\x12:/api/v1/data/executions/{id.project}/{id.domain}/{id.name}\x12\x89\x01\n\x0eListExecutions\x12#.flyteidl.admin.ResourceListRequest\x1a\x1d.flyteidl.admin.ExecutionList\"3\x82\xd3\xe4\x93\x02-\x12+/api/v1/executions/{id.project}/{id.domain}\x12\xad\x01\n\x12TerminateExecution\x12).flyteidl.admin.ExecutionTerminateRequest\x1a*.flyteidl.admin.ExecutionTerminateResponse\"@\x82\xd3\xe4\x93\x02::\x01**5/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xd2\x01\n\x10GetNodeExecution\x12\'.flyteidl.admin.NodeExecutionGetRequest\x1a\x1d.flyteidl.admin.NodeExecution\"v\x82\xd3\xe4\x93\x02p\x12n/api/v1/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\xde\x01\n\x12ListNodeExecutions\x12(.flyteidl.admin.NodeExecutionListRequest\x1a!.flyteidl.admin.NodeExecutionList\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/node_executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa5\x04\n\x19ListNodeExecutionsForTask\x12/.flyteidl.admin.NodeExecutionForTaskListRequest\x1a!.flyteidl.admin.NodeExecutionList\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03\x12\xa9\x03/api/v1/children/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}\x12\xee\x01\n\x14GetNodeExecutionData\x12+.flyteidl.admin.NodeExecutionGetDataRequest\x1a,.flyteidl.admin.NodeExecutionGetDataResponse\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/data/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\x7f\n\x0fRegisterProject\x12&.flyteidl.admin.ProjectRegisterRequest\x1a\'.flyteidl.admin.ProjectRegisterResponse\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/v1/projects\x12q\n\rUpdateProject\x12\x17.flyteidl.admin.Project\x1a%.flyteidl.admin.ProjectUpdateResponse\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x1a\x15/api/v1/projects/{id}\x12\x66\n\x0cListProjects\x12\".flyteidl.admin.ProjectListRequest\x1a\x18.flyteidl.admin.Projects\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/api/v1/projects\x12\x99\x01\n\x13\x43reateWorkflowEvent\x12-.flyteidl.admin.WorkflowExecutionEventRequest\x1a..flyteidl.admin.WorkflowExecutionEventResponse\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v1/events/workflows\x12\x89\x01\n\x0f\x43reateNodeEvent\x12).flyteidl.admin.NodeExecutionEventRequest\x1a*.flyteidl.admin.NodeExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/nodes\x12\x89\x01\n\x0f\x43reateTaskEvent\x12).flyteidl.admin.TaskExecutionEventRequest\x1a*.flyteidl.admin.TaskExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/tasks\x12\x80\x03\n\x10GetTaskExecution\x12\'.flyteidl.admin.TaskExecutionGetRequest\x1a\x1d.flyteidl.admin.TaskExecution\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x98\x02\n\x12ListTaskExecutions\x12(.flyteidl.admin.TaskExecutionListRequest\x1a!.flyteidl.admin.TaskExecutionList\"\xb4\x01\x82\xd3\xe4\x93\x02\xad\x01\x12\xaa\x01/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}\x12\x9c\x03\n\x14GetTaskExecutionData\x12+.flyteidl.admin.TaskExecutionGetDataRequest\x1a,.flyteidl.admin.TaskExecutionGetDataResponse\"\xa8\x02\x82\xd3\xe4\x93\x02\xa1\x02\x12\x9e\x02/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x94\x03\n\x13UpdateTaskExecution\x12*.flyteidl.admin.TaskExecutionUpdateRequest\x1a+.flyteidl.admin.TaskExecutionUpdateResponse\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\xe3\x01\n\x1dUpdateProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesUpdateRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesUpdateResponse\"U\x82\xd3\xe4\x93\x02O:\x01*\x1aJ/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}\x12\xc1\x01\n\x1aGetProjectDomainAttributes\x12\x31.flyteidl.admin.ProjectDomainAttributesGetRequest\x1a\x32.flyteidl.admin.ProjectDomainAttributesGetResponse\"<\x82\xd3\xe4\x93\x02\x36\x12\x34/api/v1/project_domain_attributes/{project}/{domain}\x12\xcd\x01\n\x1d\x44\x65leteProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesDeleteRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesDeleteResponse\"?\x82\xd3\xe4\x93\x02\x39:\x01**4/api/v1/project_domain_attributes/{project}/{domain}\x12\xb6\x01\n\x17UpdateProjectAttributes\x12..flyteidl.admin.ProjectAttributesUpdateRequest\x1a/.flyteidl.admin.ProjectAttributesUpdateResponse\":\x82\xd3\xe4\x93\x02\x34:\x01*\x1a//api/v1/project_attributes/{attributes.project}\x12\x9f\x01\n\x14GetProjectAttributes\x12+.flyteidl.admin.ProjectAttributesGetRequest\x1a,.flyteidl.admin.ProjectAttributesGetResponse\",\x82\xd3\xe4\x93\x02&\x12$/api/v1/project_attributes/{project}\x12\xab\x01\n\x17\x44\x65leteProjectAttributes\x12..flyteidl.admin.ProjectAttributesDeleteRequest\x1a/.flyteidl.admin.ProjectAttributesDeleteResponse\"/\x82\xd3\xe4\x93\x02):\x01**$/api/v1/project_attributes/{project}\x12\xe4\x01\n\x18UpdateWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesUpdateRequest\x1a\x30.flyteidl.admin.WorkflowAttributesUpdateResponse\"e\x82\xd3\xe4\x93\x02_:\x01*\x1aZ/api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow}\x12\xb7\x01\n\x15GetWorkflowAttributes\x12,.flyteidl.admin.WorkflowAttributesGetRequest\x1a-.flyteidl.admin.WorkflowAttributesGetResponse\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xc3\x01\n\x18\x44\x65leteWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesDeleteRequest\x1a\x30.flyteidl.admin.WorkflowAttributesDeleteResponse\"D\x82\xd3\xe4\x93\x02>:\x01**9/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xa0\x01\n\x17ListMatchableAttributes\x12..flyteidl.admin.ListMatchableAttributesRequest\x1a/.flyteidl.admin.ListMatchableAttributesResponse\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/api/v1/matchable_attributes\x12\x9f\x01\n\x11ListNamedEntities\x12&.flyteidl.admin.NamedEntityListRequest\x1a\x1f.flyteidl.admin.NamedEntityList\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/named_entities/{resource_type}/{project}/{domain}\x12\xa7\x01\n\x0eGetNamedEntity\x12%.flyteidl.admin.NamedEntityGetRequest\x1a\x1b.flyteidl.admin.NamedEntity\"Q\x82\xd3\xe4\x93\x02K\x12I/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12\xbe\x01\n\x11UpdateNamedEntity\x12(.flyteidl.admin.NamedEntityUpdateRequest\x1a).flyteidl.admin.NamedEntityUpdateResponse\"T\x82\xd3\xe4\x93\x02N:\x01*\x1aI/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12l\n\nGetVersion\x12!.flyteidl.admin.GetVersionRequest\x1a\".flyteidl.admin.GetVersionResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/v1/version\x12\xc4\x01\n\x14GetDescriptionEntity\x12 .flyteidl.admin.ObjectGetRequest\x1a!.flyteidl.admin.DescriptionEntity\"g\x82\xd3\xe4\x93\x02\x61\x12_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x92\x02\n\x17ListDescriptionEntities\x12,.flyteidl.admin.DescriptionEntityListRequest\x1a%.flyteidl.admin.DescriptionEntityList\"\xa1\x01\x82\xd3\xe4\x93\x02\x9a\x01ZG\x12\x45/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\x12O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nAdminProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.admin_pb2', globals()) @@ -110,6 +110,8 @@ _ADMINSERVICE.methods_by_name['ListTaskExecutions']._serialized_options = b'\202\323\344\223\002\255\001\022\252\001/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}' _ADMINSERVICE.methods_by_name['GetTaskExecutionData']._options = None _ADMINSERVICE.methods_by_name['GetTaskExecutionData']._serialized_options = b'\202\323\344\223\002\241\002\022\236\002/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}' + _ADMINSERVICE.methods_by_name['UpdateTaskExecution']._options = None + _ADMINSERVICE.methods_by_name['UpdateTaskExecution']._serialized_options = b'\202\323\344\223\002\234\002\022\231\002/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}' _ADMINSERVICE.methods_by_name['UpdateProjectDomainAttributes']._options = None _ADMINSERVICE.methods_by_name['UpdateProjectDomainAttributes']._serialized_options = b'\202\323\344\223\002O:\001*\032J/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}' _ADMINSERVICE.methods_by_name['GetProjectDomainAttributes']._options = None @@ -143,5 +145,5 @@ _ADMINSERVICE.methods_by_name['ListDescriptionEntities']._options = None _ADMINSERVICE.methods_by_name['ListDescriptionEntities']._serialized_options = b'\202\323\344\223\002\232\001ZG\022E/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\022O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}' _ADMINSERVICE._serialized_start=641 - _ADMINSERVICE._serialized_end=10429 + _ADMINSERVICE._serialized_end=10836 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py index bdbf086526..2cf58a61d4 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py @@ -210,6 +210,11 @@ def __init__(self, channel): request_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataRequest.SerializeToString, response_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataResponse.FromString, ) + self.UpdateTaskExecution = channel.unary_unary( + '/flyteidl.service.AdminService/UpdateTaskExecution', + request_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateRequest.SerializeToString, + response_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateResponse.FromString, + ) self.UpdateProjectDomainAttributes = channel.unary_unary( '/flyteidl.service.AdminService/UpdateProjectDomainAttributes', request_serializer=flyteidl_dot_admin_dot_project__domain__attributes__pb2.ProjectDomainAttributesUpdateRequest.SerializeToString, @@ -555,6 +560,13 @@ def GetTaskExecutionData(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def UpdateTaskExecution(self, request, context): + """Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def UpdateProjectDomainAttributes(self, request, context): """Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. """ @@ -849,6 +861,11 @@ def add_AdminServiceServicer_to_server(servicer, server): request_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataRequest.FromString, response_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataResponse.SerializeToString, ), + 'UpdateTaskExecution': grpc.unary_unary_rpc_method_handler( + servicer.UpdateTaskExecution, + request_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateRequest.FromString, + response_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateResponse.SerializeToString, + ), 'UpdateProjectDomainAttributes': grpc.unary_unary_rpc_method_handler( servicer.UpdateProjectDomainAttributes, request_deserializer=flyteidl_dot_admin_dot_project__domain__attributes__pb2.ProjectDomainAttributesUpdateRequest.FromString, @@ -1553,6 +1570,23 @@ def GetTaskExecutionData(request, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + @staticmethod + def UpdateTaskExecution(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.AdminService/UpdateTaskExecution', + flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateRequest.SerializeToString, + flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + @staticmethod def UpdateProjectDomainAttributes(request, target, diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md index 48565101a9..77d8ba3f7f 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md @@ -91,7 +91,6 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**get_project_attributes**](docs/AdminServiceApi.md#get_project_attributes) | **GET** /api/v1/project_attributes/{project} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**get_project_domain_attributes**](docs/AdminServiceApi.md#get_project_domain_attributes) | **GET** /api/v1/project_domain_attributes/{project}/{domain} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**get_task**](docs/AdminServiceApi.md#get_task) | **GET** /api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Task` definition. -*AdminServiceApi* | [**get_task_execution**](docs/AdminServiceApi.md#get_task_execution) | **GET** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**get_task_execution_data**](docs/AdminServiceApi.md#get_task_execution_data) | **GET** /api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**get_version**](docs/AdminServiceApi.md#get_version) | **GET** /api/v1/version | *AdminServiceApi* | [**get_workflow**](docs/AdminServiceApi.md#get_workflow) | **GET** /api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Workflow` definition. @@ -125,6 +124,7 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**update_project**](docs/AdminServiceApi.md#update_project) | **PUT** /api/v1/projects/{id} | Updates an existing :ref:`ref_flyteidl.admin.Project` flyteidl.admin.Project should be passed but the domains property should be empty; it will be ignored in the handler as domains cannot be updated via this API. *AdminServiceApi* | [**update_project_attributes**](docs/AdminServiceApi.md#update_project_attributes) | **PUT** /api/v1/project_attributes/{attributes.project} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` at the project level *AdminServiceApi* | [**update_project_domain_attributes**](docs/AdminServiceApi.md#update_project_domain_attributes) | **PUT** /api/v1/project_domain_attributes/{attributes.project}/{attributes.domain} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. +*AdminServiceApi* | [**update_task_execution**](docs/AdminServiceApi.md#update_task_execution) | **GET** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**update_workflow_attributes**](docs/AdminServiceApi.md#update_workflow_attributes) | **PUT** /api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. @@ -230,6 +230,7 @@ Class | Method | HTTP request | Description - [AdminTaskExecutionEventResponse](docs/AdminTaskExecutionEventResponse.md) - [AdminTaskExecutionGetDataResponse](docs/AdminTaskExecutionGetDataResponse.md) - [AdminTaskExecutionList](docs/AdminTaskExecutionList.md) + - [AdminTaskExecutionUpdateResponse](docs/AdminTaskExecutionUpdateResponse.md) - [AdminTaskList](docs/AdminTaskList.md) - [AdminTaskResourceAttributes](docs/AdminTaskResourceAttributes.md) - [AdminTaskResourceSpec](docs/AdminTaskResourceSpec.md) @@ -253,6 +254,7 @@ Class | Method | HTTP request | Description - [AdminWorkflowList](docs/AdminWorkflowList.md) - [AdminWorkflowSpec](docs/AdminWorkflowSpec.md) - [BlobTypeBlobDimensionality](docs/BlobTypeBlobDimensionality.md) + - [CacheEvictionErrorCode](docs/CacheEvictionErrorCode.md) - [CatalogReservationStatus](docs/CatalogReservationStatus.md) - [ComparisonExpressionOperator](docs/ComparisonExpressionOperator.md) - [ConjunctionExpressionLogicalOperator](docs/ConjunctionExpressionLogicalOperator.md) @@ -270,6 +272,8 @@ Class | Method | HTTP request | Description - [CoreBlobType](docs/CoreBlobType.md) - [CoreBooleanExpression](docs/CoreBooleanExpression.md) - [CoreBranchNode](docs/CoreBranchNode.md) + - [CoreCacheEvictionError](docs/CoreCacheEvictionError.md) + - [CoreCacheEvictionErrorList](docs/CoreCacheEvictionErrorList.md) - [CoreCatalogArtifactTag](docs/CoreCatalogArtifactTag.md) - [CoreCatalogCacheStatus](docs/CoreCatalogCacheStatus.md) - [CoreCatalogMetadata](docs/CoreCatalogMetadata.md) diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py index 6e2a90c3da..0d0c8c18d7 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py @@ -122,6 +122,7 @@ from flyteadmin.models.admin_task_execution_event_response import AdminTaskExecutionEventResponse from flyteadmin.models.admin_task_execution_get_data_response import AdminTaskExecutionGetDataResponse from flyteadmin.models.admin_task_execution_list import AdminTaskExecutionList +from flyteadmin.models.admin_task_execution_update_response import AdminTaskExecutionUpdateResponse from flyteadmin.models.admin_task_list import AdminTaskList from flyteadmin.models.admin_task_resource_attributes import AdminTaskResourceAttributes from flyteadmin.models.admin_task_resource_spec import AdminTaskResourceSpec @@ -145,6 +146,7 @@ from flyteadmin.models.admin_workflow_list import AdminWorkflowList from flyteadmin.models.admin_workflow_spec import AdminWorkflowSpec from flyteadmin.models.blob_type_blob_dimensionality import BlobTypeBlobDimensionality +from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode from flyteadmin.models.catalog_reservation_status import CatalogReservationStatus from flyteadmin.models.comparison_expression_operator import ComparisonExpressionOperator from flyteadmin.models.conjunction_expression_logical_operator import ConjunctionExpressionLogicalOperator @@ -162,6 +164,8 @@ from flyteadmin.models.core_blob_type import CoreBlobType from flyteadmin.models.core_boolean_expression import CoreBooleanExpression from flyteadmin.models.core_branch_node import CoreBranchNode +from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError +from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList from flyteadmin.models.core_catalog_artifact_tag import CoreCatalogArtifactTag from flyteadmin.models.core_catalog_cache_status import CoreCatalogCacheStatus from flyteadmin.models.core_catalog_metadata import CoreCatalogMetadata diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py index 580832f37b..988e40befa 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py @@ -2342,171 +2342,6 @@ def get_task_with_http_info(self, id_project, id_domain, id_name, id_version, ** _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) - def get_task_execution(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 - """Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async_req=True - >>> thread = api.get_task_execution(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) - >>> result = thread.get() - - :param async_req bool - :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) - :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) - :param str id_node_execution_id_node_id: (required) - :param str id_task_id_project: Name of the project the resource belongs to. (required) - :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_task_id_name: User provided value for the resource. (required) - :param str id_task_id_version: Specific version of the resource. (required) - :param int id_retry_attempt: (required) - :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects - :return: FlyteidladminTaskExecution - If the method is called asynchronously, - returns the request thread. - """ - kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 - else: - (data) = self.get_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 - return data - - def get_task_execution_with_http_info(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 - """Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async_req=True - >>> thread = api.get_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) - >>> result = thread.get() - - :param async_req bool - :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) - :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) - :param str id_node_execution_id_node_id: (required) - :param str id_task_id_project: Name of the project the resource belongs to. (required) - :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_task_id_name: User provided value for the resource. (required) - :param str id_task_id_version: Specific version of the resource. (required) - :param int id_retry_attempt: (required) - :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects - :return: FlyteidladminTaskExecution - If the method is called asynchronously, - returns the request thread. - """ - - all_params = ['id_node_execution_id_execution_id_project', 'id_node_execution_id_execution_id_domain', 'id_node_execution_id_execution_id_name', 'id_node_execution_id_node_id', 'id_task_id_project', 'id_task_id_domain', 'id_task_id_name', 'id_task_id_version', 'id_retry_attempt', 'id_task_id_resource_type'] # noqa: E501 - all_params.append('async_req') - all_params.append('_return_http_data_only') - all_params.append('_preload_content') - all_params.append('_request_timeout') - - params = locals() - for key, val in six.iteritems(params['kwargs']): - if key not in all_params: - raise TypeError( - "Got an unexpected keyword argument '%s'" - " to method get_task_execution" % key - ) - params[key] = val - del params['kwargs'] - # verify the required parameter 'id_node_execution_id_execution_id_project' is set - if ('id_node_execution_id_execution_id_project' not in params or - params['id_node_execution_id_execution_id_project'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_project` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_node_execution_id_execution_id_domain' is set - if ('id_node_execution_id_execution_id_domain' not in params or - params['id_node_execution_id_execution_id_domain'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_domain` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_node_execution_id_execution_id_name' is set - if ('id_node_execution_id_execution_id_name' not in params or - params['id_node_execution_id_execution_id_name'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_name` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_node_execution_id_node_id' is set - if ('id_node_execution_id_node_id' not in params or - params['id_node_execution_id_node_id'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_node_id` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_project' is set - if ('id_task_id_project' not in params or - params['id_task_id_project'] is None): - raise ValueError("Missing the required parameter `id_task_id_project` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_domain' is set - if ('id_task_id_domain' not in params or - params['id_task_id_domain'] is None): - raise ValueError("Missing the required parameter `id_task_id_domain` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_name' is set - if ('id_task_id_name' not in params or - params['id_task_id_name'] is None): - raise ValueError("Missing the required parameter `id_task_id_name` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_version' is set - if ('id_task_id_version' not in params or - params['id_task_id_version'] is None): - raise ValueError("Missing the required parameter `id_task_id_version` when calling `get_task_execution`") # noqa: E501 - # verify the required parameter 'id_retry_attempt' is set - if ('id_retry_attempt' not in params or - params['id_retry_attempt'] is None): - raise ValueError("Missing the required parameter `id_retry_attempt` when calling `get_task_execution`") # noqa: E501 - - collection_formats = {} - - path_params = {} - if 'id_node_execution_id_execution_id_project' in params: - path_params['id.node_execution_id.execution_id.project'] = params['id_node_execution_id_execution_id_project'] # noqa: E501 - if 'id_node_execution_id_execution_id_domain' in params: - path_params['id.node_execution_id.execution_id.domain'] = params['id_node_execution_id_execution_id_domain'] # noqa: E501 - if 'id_node_execution_id_execution_id_name' in params: - path_params['id.node_execution_id.execution_id.name'] = params['id_node_execution_id_execution_id_name'] # noqa: E501 - if 'id_node_execution_id_node_id' in params: - path_params['id.node_execution_id.node_id'] = params['id_node_execution_id_node_id'] # noqa: E501 - if 'id_task_id_project' in params: - path_params['id.task_id.project'] = params['id_task_id_project'] # noqa: E501 - if 'id_task_id_domain' in params: - path_params['id.task_id.domain'] = params['id_task_id_domain'] # noqa: E501 - if 'id_task_id_name' in params: - path_params['id.task_id.name'] = params['id_task_id_name'] # noqa: E501 - if 'id_task_id_version' in params: - path_params['id.task_id.version'] = params['id_task_id_version'] # noqa: E501 - if 'id_retry_attempt' in params: - path_params['id.retry_attempt'] = params['id_retry_attempt'] # noqa: E501 - - query_params = [] - if 'id_task_id_resource_type' in params: - query_params.append(('id.task_id.resource_type', params['id_task_id_resource_type'])) # noqa: E501 - - header_params = {} - - form_params = [] - local_var_files = {} - - body_params = None - # HTTP header `Accept` - header_params['Accept'] = self.api_client.select_header_accept( - ['application/json']) # noqa: E501 - - # HTTP header `Content-Type` - header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 - ['application/json']) # noqa: E501 - - # Authentication setting - auth_settings = [] # noqa: E501 - - return self.api_client.call_api( - '/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}', 'GET', - path_params, - query_params, - header_params, - body=body_params, - post_params=form_params, - files=local_var_files, - response_type='FlyteidladminTaskExecution', # noqa: E501 - auth_settings=auth_settings, - async_req=params.get('async_req'), - _return_http_data_only=params.get('_return_http_data_only'), - _preload_content=params.get('_preload_content', True), - _request_timeout=params.get('_request_timeout'), - collection_formats=collection_formats) - def get_task_execution_data(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 """Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 @@ -6604,6 +6439,175 @@ def update_project_domain_attributes_with_http_info(self, attributes_project, at _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) + def update_task_execution(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 + """Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.update_task_execution(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) + :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) + :param str id_node_execution_id_node_id: (required) + :param str id_task_id_project: Name of the project the resource belongs to. (required) + :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_task_id_name: User provided value for the resource. (required) + :param str id_task_id_version: Specific version of the resource. (required) + :param int id_retry_attempt: (required) + :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects + :param bool evict_cache: Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. + :return: AdminTaskExecutionUpdateResponse + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.update_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 + else: + (data) = self.update_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 + return data + + def update_task_execution_with_http_info(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 + """Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.update_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) + :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) + :param str id_node_execution_id_node_id: (required) + :param str id_task_id_project: Name of the project the resource belongs to. (required) + :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_task_id_name: User provided value for the resource. (required) + :param str id_task_id_version: Specific version of the resource. (required) + :param int id_retry_attempt: (required) + :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects + :param bool evict_cache: Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. + :return: AdminTaskExecutionUpdateResponse + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['id_node_execution_id_execution_id_project', 'id_node_execution_id_execution_id_domain', 'id_node_execution_id_execution_id_name', 'id_node_execution_id_node_id', 'id_task_id_project', 'id_task_id_domain', 'id_task_id_name', 'id_task_id_version', 'id_retry_attempt', 'id_task_id_resource_type', 'evict_cache'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method update_task_execution" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'id_node_execution_id_execution_id_project' is set + if ('id_node_execution_id_execution_id_project' not in params or + params['id_node_execution_id_execution_id_project'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_project` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_node_execution_id_execution_id_domain' is set + if ('id_node_execution_id_execution_id_domain' not in params or + params['id_node_execution_id_execution_id_domain'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_domain` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_node_execution_id_execution_id_name' is set + if ('id_node_execution_id_execution_id_name' not in params or + params['id_node_execution_id_execution_id_name'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_name` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_node_execution_id_node_id' is set + if ('id_node_execution_id_node_id' not in params or + params['id_node_execution_id_node_id'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_node_id` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_project' is set + if ('id_task_id_project' not in params or + params['id_task_id_project'] is None): + raise ValueError("Missing the required parameter `id_task_id_project` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_domain' is set + if ('id_task_id_domain' not in params or + params['id_task_id_domain'] is None): + raise ValueError("Missing the required parameter `id_task_id_domain` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_name' is set + if ('id_task_id_name' not in params or + params['id_task_id_name'] is None): + raise ValueError("Missing the required parameter `id_task_id_name` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_version' is set + if ('id_task_id_version' not in params or + params['id_task_id_version'] is None): + raise ValueError("Missing the required parameter `id_task_id_version` when calling `update_task_execution`") # noqa: E501 + # verify the required parameter 'id_retry_attempt' is set + if ('id_retry_attempt' not in params or + params['id_retry_attempt'] is None): + raise ValueError("Missing the required parameter `id_retry_attempt` when calling `update_task_execution`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id_node_execution_id_execution_id_project' in params: + path_params['id.node_execution_id.execution_id.project'] = params['id_node_execution_id_execution_id_project'] # noqa: E501 + if 'id_node_execution_id_execution_id_domain' in params: + path_params['id.node_execution_id.execution_id.domain'] = params['id_node_execution_id_execution_id_domain'] # noqa: E501 + if 'id_node_execution_id_execution_id_name' in params: + path_params['id.node_execution_id.execution_id.name'] = params['id_node_execution_id_execution_id_name'] # noqa: E501 + if 'id_node_execution_id_node_id' in params: + path_params['id.node_execution_id.node_id'] = params['id_node_execution_id_node_id'] # noqa: E501 + if 'id_task_id_project' in params: + path_params['id.task_id.project'] = params['id_task_id_project'] # noqa: E501 + if 'id_task_id_domain' in params: + path_params['id.task_id.domain'] = params['id_task_id_domain'] # noqa: E501 + if 'id_task_id_name' in params: + path_params['id.task_id.name'] = params['id_task_id_name'] # noqa: E501 + if 'id_task_id_version' in params: + path_params['id.task_id.version'] = params['id_task_id_version'] # noqa: E501 + if 'id_retry_attempt' in params: + path_params['id.retry_attempt'] = params['id_retry_attempt'] # noqa: E501 + + query_params = [] + if 'id_task_id_resource_type' in params: + query_params.append(('id.task_id.resource_type', params['id_task_id_resource_type'])) # noqa: E501 + if 'evict_cache' in params: + query_params.append(('evict_cache', params['evict_cache'])) # noqa: E501 + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['application/json']) # noqa: E501 + + # HTTP header `Content-Type` + header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 + ['application/json']) # noqa: E501 + + # Authentication setting + auth_settings = [] # noqa: E501 + + return self.api_client.call_api( + '/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}', 'GET', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='AdminTaskExecutionUpdateResponse', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) + def update_workflow_attributes(self, attributes_project, attributes_domain, attributes_workflow, body, **kwargs): # noqa: E501 """Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. # noqa: E501 diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py index 26f0f636dc..65fcc13ce8 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py @@ -115,6 +115,7 @@ from flyteadmin.models.admin_task_execution_event_response import AdminTaskExecutionEventResponse from flyteadmin.models.admin_task_execution_get_data_response import AdminTaskExecutionGetDataResponse from flyteadmin.models.admin_task_execution_list import AdminTaskExecutionList +from flyteadmin.models.admin_task_execution_update_response import AdminTaskExecutionUpdateResponse from flyteadmin.models.admin_task_list import AdminTaskList from flyteadmin.models.admin_task_resource_attributes import AdminTaskResourceAttributes from flyteadmin.models.admin_task_resource_spec import AdminTaskResourceSpec @@ -138,6 +139,7 @@ from flyteadmin.models.admin_workflow_list import AdminWorkflowList from flyteadmin.models.admin_workflow_spec import AdminWorkflowSpec from flyteadmin.models.blob_type_blob_dimensionality import BlobTypeBlobDimensionality +from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode from flyteadmin.models.catalog_reservation_status import CatalogReservationStatus from flyteadmin.models.comparison_expression_operator import ComparisonExpressionOperator from flyteadmin.models.conjunction_expression_logical_operator import ConjunctionExpressionLogicalOperator @@ -155,6 +157,8 @@ from flyteadmin.models.core_blob_type import CoreBlobType from flyteadmin.models.core_boolean_expression import CoreBooleanExpression from flyteadmin.models.core_branch_node import CoreBranchNode +from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError +from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList from flyteadmin.models.core_catalog_artifact_tag import CoreCatalogArtifactTag from flyteadmin.models.core_catalog_cache_status import CoreCatalogCacheStatus from flyteadmin.models.core_catalog_metadata import CoreCatalogMetadata diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py index 5bbddc57b0..014b9af1b9 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py @@ -35,25 +35,30 @@ class AdminExecutionUpdateRequest(object): """ swagger_types = { 'id': 'CoreWorkflowExecutionIdentifier', - 'state': 'AdminExecutionState' + 'state': 'AdminExecutionState', + 'evict_cache': 'bool' } attribute_map = { 'id': 'id', - 'state': 'state' + 'state': 'state', + 'evict_cache': 'evict_cache' } - def __init__(self, id=None, state=None): # noqa: E501 + def __init__(self, id=None, state=None, evict_cache=None): # noqa: E501 """AdminExecutionUpdateRequest - a model defined in Swagger""" # noqa: E501 self._id = None self._state = None + self._evict_cache = None self.discriminator = None if id is not None: self.id = id if state is not None: self.state = state + if evict_cache is not None: + self.evict_cache = evict_cache @property def id(self): @@ -97,6 +102,29 @@ def state(self, state): self._state = state + @property + def evict_cache(self): + """Gets the evict_cache of this AdminExecutionUpdateRequest. # noqa: E501 + + Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. # noqa: E501 + + :return: The evict_cache of this AdminExecutionUpdateRequest. # noqa: E501 + :rtype: bool + """ + return self._evict_cache + + @evict_cache.setter + def evict_cache(self, evict_cache): + """Sets the evict_cache of this AdminExecutionUpdateRequest. + + Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. # noqa: E501 + + :param evict_cache: The evict_cache of this AdminExecutionUpdateRequest. # noqa: E501 + :type: bool + """ + + self._evict_cache = evict_cache + def to_dict(self): """Returns the model properties as a dict""" result = {} diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py index 9e9f90ee7e..2993e7d509 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py @@ -16,6 +16,8 @@ import six +from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList # noqa: F401,E501 + class AdminExecutionUpdateResponse(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -31,15 +33,45 @@ class AdminExecutionUpdateResponse(object): and the value is json key in definition. """ swagger_types = { + 'cache_eviction_errors': 'CoreCacheEvictionErrorList' } attribute_map = { + 'cache_eviction_errors': 'cache_eviction_errors' } - def __init__(self): # noqa: E501 + def __init__(self, cache_eviction_errors=None): # noqa: E501 """AdminExecutionUpdateResponse - a model defined in Swagger""" # noqa: E501 + + self._cache_eviction_errors = None self.discriminator = None + if cache_eviction_errors is not None: + self.cache_eviction_errors = cache_eviction_errors + + @property + def cache_eviction_errors(self): + """Gets the cache_eviction_errors of this AdminExecutionUpdateResponse. # noqa: E501 + + List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. # noqa: E501 + + :return: The cache_eviction_errors of this AdminExecutionUpdateResponse. # noqa: E501 + :rtype: CoreCacheEvictionErrorList + """ + return self._cache_eviction_errors + + @cache_eviction_errors.setter + def cache_eviction_errors(self, cache_eviction_errors): + """Sets the cache_eviction_errors of this AdminExecutionUpdateResponse. + + List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. # noqa: E501 + + :param cache_eviction_errors: The cache_eviction_errors of this AdminExecutionUpdateResponse. # noqa: E501 + :type: CoreCacheEvictionErrorList + """ + + self._cache_eviction_errors = cache_eviction_errors + def to_dict(self): """Returns the model properties as a dict""" result = {} diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py new file mode 100644 index 0000000000..7fb9ae6ed7 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py @@ -0,0 +1,117 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +import pprint +import re # noqa: F401 + +import six + +from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList # noqa: F401,E501 + + +class AdminTaskExecutionUpdateResponse(object): + """NOTE: This class is auto generated by the swagger code generator program. + + Do not edit the class manually. + """ + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + 'cache_eviction_errors': 'CoreCacheEvictionErrorList' + } + + attribute_map = { + 'cache_eviction_errors': 'cache_eviction_errors' + } + + def __init__(self, cache_eviction_errors=None): # noqa: E501 + """AdminTaskExecutionUpdateResponse - a model defined in Swagger""" # noqa: E501 + + self._cache_eviction_errors = None + self.discriminator = None + + if cache_eviction_errors is not None: + self.cache_eviction_errors = cache_eviction_errors + + @property + def cache_eviction_errors(self): + """Gets the cache_eviction_errors of this AdminTaskExecutionUpdateResponse. # noqa: E501 + + + :return: The cache_eviction_errors of this AdminTaskExecutionUpdateResponse. # noqa: E501 + :rtype: CoreCacheEvictionErrorList + """ + return self._cache_eviction_errors + + @cache_eviction_errors.setter + def cache_eviction_errors(self, cache_eviction_errors): + """Sets the cache_eviction_errors of this AdminTaskExecutionUpdateResponse. + + + :param cache_eviction_errors: The cache_eviction_errors of this AdminTaskExecutionUpdateResponse. # noqa: E501 + :type: CoreCacheEvictionErrorList + """ + + self._cache_eviction_errors = cache_eviction_errors + + def to_dict(self): + """Returns the model properties as a dict""" + result = {} + + for attr, _ in six.iteritems(self.swagger_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else x, + value + )) + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else item, + value.items() + )) + else: + result[attr] = value + if issubclass(AdminTaskExecutionUpdateResponse, dict): + for key, value in self.items(): + result[key] = value + + return result + + def to_str(self): + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + """Returns true if both objects are equal""" + if not isinstance(other, AdminTaskExecutionUpdateResponse): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + """Returns true if both objects are not equal""" + return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py new file mode 100644 index 0000000000..1a329f8ee4 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py @@ -0,0 +1,92 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +import pprint +import re # noqa: F401 + +import six + + +class CacheEvictionErrorCode(object): + """NOTE: This class is auto generated by the swagger code generator program. + + Do not edit the class manually. + """ + + """ + allowed enum values + """ + UNKNOWN = "UNKNOWN" + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + } + + attribute_map = { + } + + def __init__(self): # noqa: E501 + """CacheEvictionErrorCode - a model defined in Swagger""" # noqa: E501 + self.discriminator = None + + def to_dict(self): + """Returns the model properties as a dict""" + result = {} + + for attr, _ in six.iteritems(self.swagger_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else x, + value + )) + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else item, + value.items() + )) + else: + result[attr] = value + if issubclass(CacheEvictionErrorCode, dict): + for key, value in self.items(): + result[key] = value + + return result + + def to_str(self): + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + """Returns true if both objects are equal""" + if not isinstance(other, CacheEvictionErrorCode): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + """Returns true if both objects are not equal""" + return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py new file mode 100644 index 0000000000..3a79208320 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py @@ -0,0 +1,234 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +import pprint +import re # noqa: F401 + +import six + +from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode # noqa: F401,E501 +from flyteadmin.models.core_node_execution_identifier import CoreNodeExecutionIdentifier # noqa: F401,E501 +from flyteadmin.models.core_task_execution_identifier import CoreTaskExecutionIdentifier # noqa: F401,E501 +from flyteadmin.models.core_workflow_execution_identifier import CoreWorkflowExecutionIdentifier # noqa: F401,E501 + + +class CoreCacheEvictionError(object): + """NOTE: This class is auto generated by the swagger code generator program. + + Do not edit the class manually. + """ + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + 'code': 'CacheEvictionErrorCode', + 'message': 'str', + 'node_execution_id': 'CoreNodeExecutionIdentifier', + 'task_execution_id': 'CoreTaskExecutionIdentifier', + 'workflow_execution_id': 'CoreWorkflowExecutionIdentifier' + } + + attribute_map = { + 'code': 'code', + 'message': 'message', + 'node_execution_id': 'node_execution_id', + 'task_execution_id': 'task_execution_id', + 'workflow_execution_id': 'workflow_execution_id' + } + + def __init__(self, code=None, message=None, node_execution_id=None, task_execution_id=None, workflow_execution_id=None): # noqa: E501 + """CoreCacheEvictionError - a model defined in Swagger""" # noqa: E501 + + self._code = None + self._message = None + self._node_execution_id = None + self._task_execution_id = None + self._workflow_execution_id = None + self.discriminator = None + + if code is not None: + self.code = code + if message is not None: + self.message = message + if node_execution_id is not None: + self.node_execution_id = node_execution_id + if task_execution_id is not None: + self.task_execution_id = task_execution_id + if workflow_execution_id is not None: + self.workflow_execution_id = workflow_execution_id + + @property + def code(self): + """Gets the code of this CoreCacheEvictionError. # noqa: E501 + + Error code to match type of cache eviction error encountered. # noqa: E501 + + :return: The code of this CoreCacheEvictionError. # noqa: E501 + :rtype: CacheEvictionErrorCode + """ + return self._code + + @code.setter + def code(self, code): + """Sets the code of this CoreCacheEvictionError. + + Error code to match type of cache eviction error encountered. # noqa: E501 + + :param code: The code of this CoreCacheEvictionError. # noqa: E501 + :type: CacheEvictionErrorCode + """ + + self._code = code + + @property + def message(self): + """Gets the message of this CoreCacheEvictionError. # noqa: E501 + + More detailed error message explaining the reason for the cache eviction failure. # noqa: E501 + + :return: The message of this CoreCacheEvictionError. # noqa: E501 + :rtype: str + """ + return self._message + + @message.setter + def message(self, message): + """Sets the message of this CoreCacheEvictionError. + + More detailed error message explaining the reason for the cache eviction failure. # noqa: E501 + + :param message: The message of this CoreCacheEvictionError. # noqa: E501 + :type: str + """ + + self._message = message + + @property + def node_execution_id(self): + """Gets the node_execution_id of this CoreCacheEvictionError. # noqa: E501 + + ID of the node execution the cache eviction failed for. # noqa: E501 + + :return: The node_execution_id of this CoreCacheEvictionError. # noqa: E501 + :rtype: CoreNodeExecutionIdentifier + """ + return self._node_execution_id + + @node_execution_id.setter + def node_execution_id(self, node_execution_id): + """Sets the node_execution_id of this CoreCacheEvictionError. + + ID of the node execution the cache eviction failed for. # noqa: E501 + + :param node_execution_id: The node_execution_id of this CoreCacheEvictionError. # noqa: E501 + :type: CoreNodeExecutionIdentifier + """ + + self._node_execution_id = node_execution_id + + @property + def task_execution_id(self): + """Gets the task_execution_id of this CoreCacheEvictionError. # noqa: E501 + + ID of the task execution the cache eviction failed for (if the node execution was part of a task execution). # noqa: E501 + + :return: The task_execution_id of this CoreCacheEvictionError. # noqa: E501 + :rtype: CoreTaskExecutionIdentifier + """ + return self._task_execution_id + + @task_execution_id.setter + def task_execution_id(self, task_execution_id): + """Sets the task_execution_id of this CoreCacheEvictionError. + + ID of the task execution the cache eviction failed for (if the node execution was part of a task execution). # noqa: E501 + + :param task_execution_id: The task_execution_id of this CoreCacheEvictionError. # noqa: E501 + :type: CoreTaskExecutionIdentifier + """ + + self._task_execution_id = task_execution_id + + @property + def workflow_execution_id(self): + """Gets the workflow_execution_id of this CoreCacheEvictionError. # noqa: E501 + + ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution). # noqa: E501 + + :return: The workflow_execution_id of this CoreCacheEvictionError. # noqa: E501 + :rtype: CoreWorkflowExecutionIdentifier + """ + return self._workflow_execution_id + + @workflow_execution_id.setter + def workflow_execution_id(self, workflow_execution_id): + """Sets the workflow_execution_id of this CoreCacheEvictionError. + + ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution). # noqa: E501 + + :param workflow_execution_id: The workflow_execution_id of this CoreCacheEvictionError. # noqa: E501 + :type: CoreWorkflowExecutionIdentifier + """ + + self._workflow_execution_id = workflow_execution_id + + def to_dict(self): + """Returns the model properties as a dict""" + result = {} + + for attr, _ in six.iteritems(self.swagger_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else x, + value + )) + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else item, + value.items() + )) + else: + result[attr] = value + if issubclass(CoreCacheEvictionError, dict): + for key, value in self.items(): + result[key] = value + + return result + + def to_str(self): + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + """Returns true if both objects are equal""" + if not isinstance(other, CoreCacheEvictionError): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + """Returns true if both objects are not equal""" + return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py new file mode 100644 index 0000000000..1d6f926d2f --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py @@ -0,0 +1,117 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +import pprint +import re # noqa: F401 + +import six + +from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError # noqa: F401,E501 + + +class CoreCacheEvictionErrorList(object): + """NOTE: This class is auto generated by the swagger code generator program. + + Do not edit the class manually. + """ + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + 'errors': 'list[CoreCacheEvictionError]' + } + + attribute_map = { + 'errors': 'errors' + } + + def __init__(self, errors=None): # noqa: E501 + """CoreCacheEvictionErrorList - a model defined in Swagger""" # noqa: E501 + + self._errors = None + self.discriminator = None + + if errors is not None: + self.errors = errors + + @property + def errors(self): + """Gets the errors of this CoreCacheEvictionErrorList. # noqa: E501 + + + :return: The errors of this CoreCacheEvictionErrorList. # noqa: E501 + :rtype: list[CoreCacheEvictionError] + """ + return self._errors + + @errors.setter + def errors(self, errors): + """Sets the errors of this CoreCacheEvictionErrorList. + + + :param errors: The errors of this CoreCacheEvictionErrorList. # noqa: E501 + :type: list[CoreCacheEvictionError] + """ + + self._errors = errors + + def to_dict(self): + """Returns the model properties as a dict""" + result = {} + + for attr, _ in six.iteritems(self.swagger_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else x, + value + )) + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else item, + value.items() + )) + else: + result[attr] = value + if issubclass(CoreCacheEvictionErrorList, dict): + for key, value in self.items(): + result[key] = value + + return result + + def to_str(self): + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + """Returns true if both objects are equal""" + if not isinstance(other, CoreCacheEvictionErrorList): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + """Returns true if both objects are not equal""" + return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py index 4e4bee3a26..fa88b7e9da 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py @@ -176,13 +176,6 @@ def test_get_task(self): """ pass - def test_get_task_execution(self): - """Test case for get_task_execution - - Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 - """ - pass - def test_get_task_execution_data(self): """Test case for get_task_execution_data @@ -413,6 +406,13 @@ def test_update_project_domain_attributes(self): """ pass + def test_update_task_execution(self): + """Test case for update_task_execution + + Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 + """ + pass + def test_update_workflow_attributes(self): """Test case for update_workflow_attributes diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py new file mode 100644 index 0000000000..22bc72e8a3 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py @@ -0,0 +1,40 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +from __future__ import absolute_import + +import unittest + +import flyteadmin +from flyteadmin.models.admin_task_execution_update_response import AdminTaskExecutionUpdateResponse # noqa: E501 +from flyteadmin.rest import ApiException + + +class TestAdminTaskExecutionUpdateResponse(unittest.TestCase): + """AdminTaskExecutionUpdateResponse unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testAdminTaskExecutionUpdateResponse(self): + """Test AdminTaskExecutionUpdateResponse""" + # FIXME: construct object with mandatory attributes with example values + # model = flyteadmin.models.admin_task_execution_update_response.AdminTaskExecutionUpdateResponse() # noqa: E501 + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py new file mode 100644 index 0000000000..1224645b89 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py @@ -0,0 +1,40 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +from __future__ import absolute_import + +import unittest + +import flyteadmin +from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode # noqa: E501 +from flyteadmin.rest import ApiException + + +class TestCacheEvictionErrorCode(unittest.TestCase): + """CacheEvictionErrorCode unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testCacheEvictionErrorCode(self): + """Test CacheEvictionErrorCode""" + # FIXME: construct object with mandatory attributes with example values + # model = flyteadmin.models.cache_eviction_error_code.CacheEvictionErrorCode() # noqa: E501 + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py new file mode 100644 index 0000000000..e7447bad81 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py @@ -0,0 +1,40 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +from __future__ import absolute_import + +import unittest + +import flyteadmin +from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError # noqa: E501 +from flyteadmin.rest import ApiException + + +class TestCoreCacheEvictionError(unittest.TestCase): + """CoreCacheEvictionError unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testCoreCacheEvictionError(self): + """Test CoreCacheEvictionError""" + # FIXME: construct object with mandatory attributes with example values + # model = flyteadmin.models.core_cache_eviction_error.CoreCacheEvictionError() # noqa: E501 + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py new file mode 100644 index 0000000000..dfe1a21054 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py @@ -0,0 +1,40 @@ +# coding: utf-8 + +""" + flyteidl/service/admin.proto + + No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 + + OpenAPI spec version: version not set + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + + +from __future__ import absolute_import + +import unittest + +import flyteadmin +from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList # noqa: E501 +from flyteadmin.rest import ApiException + + +class TestCoreCacheEvictionErrorList(unittest.TestCase): + """CoreCacheEvictionErrorList unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testCoreCacheEvictionErrorList(self): + """Test CoreCacheEvictionErrorList""" + # FIXME: construct object with mandatory attributes with example values + # model = flyteadmin.models.core_cache_eviction_error_list.CoreCacheEvictionErrorList() # noqa: E501 + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/flyteidl/protos/docs/admin/admin.rst b/flyteidl/protos/docs/admin/admin.rst index 99b5b4096d..36d4f73294 100644 --- a/flyteidl/protos/docs/admin/admin.rst +++ b/flyteidl/protos/docs/admin/admin.rst @@ -1373,6 +1373,7 @@ ExecutionUpdateRequest "id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of the execution to update" "state", ":ref:`ref_flyteidl.admin.ExecutionState`", "", "State to set as the new value active/archive" + "evict_cache", ":ref:`ref_bool`", "", "Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog." @@ -1389,6 +1390,13 @@ ExecutionUpdateResponse +.. csv-table:: ExecutionUpdateResponse type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "cache_eviction_errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set." + + @@ -3791,6 +3799,49 @@ See :ref:`ref_flyteidl.admin.TaskExecution` for more details + +.. _ref_flyteidl.admin.TaskExecutionUpdateRequest: + +TaskExecutionUpdateRequest +------------------------------------------------------------------ + + + + + +.. csv-table:: TaskExecutionUpdateRequest type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "Identifier of the task execution to update" + "evict_cache", ":ref:`ref_bool`", "", "Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog." + + + + + + + +.. _ref_flyteidl.admin.TaskExecutionUpdateResponse: + +TaskExecutionUpdateResponse +------------------------------------------------------------------ + + + + + +.. csv-table:: TaskExecutionUpdateResponse type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "cache_eviction_errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "" + + + + + + .. end messages diff --git a/flyteidl/protos/docs/core/core.rst b/flyteidl/protos/docs/core/core.rst index 43bf4c9c6e..fc31243df0 100644 --- a/flyteidl/protos/docs/core/core.rst +++ b/flyteidl/protos/docs/core/core.rst @@ -528,6 +528,52 @@ flyteidl/core/errors.proto +.. _ref_flyteidl.core.CacheEvictionError: + +CacheEvictionError +------------------------------------------------------------------ + +Error returned if eviction of cached output fails and should be re-tried by the user. + + + +.. csv-table:: CacheEvictionError type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "code", ":ref:`ref_flyteidl.core.CacheEvictionError.Code`", "", "Error code to match type of cache eviction error encountered." + "message", ":ref:`ref_string`", "", "More detailed error message explaining the reason for the cache eviction failure." + "node_execution_id", ":ref:`ref_flyteidl.core.NodeExecutionIdentifier`", "", "ID of the node execution the cache eviction failed for." + "task_execution_id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "ID of the task execution the cache eviction failed for (if the node execution was part of a task execution)." + "workflow_execution_id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution)." + + + + + + + +.. _ref_flyteidl.core.CacheEvictionErrorList: + +CacheEvictionErrorList +------------------------------------------------------------------ + +List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request. + + + +.. csv-table:: CacheEvictionErrorList type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "errors", ":ref:`ref_flyteidl.core.CacheEvictionError`", "repeated", "" + + + + + + + .. _ref_flyteidl.core.ContainerError: ContainerError @@ -579,6 +625,21 @@ failure reasons to the execution engine. +.. _ref_flyteidl.core.CacheEvictionError.Code: + +CacheEvictionError.Code +------------------------------------------------------------------ + + + +.. csv-table:: Enum CacheEvictionError.Code values + :header: "Name", "Number", "Description" + :widths: auto + + "UNKNOWN", "0", "" + + + .. _ref_flyteidl.core.ContainerError.Kind: ContainerError.Kind diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst index 3ca8ff500c..82466acf37 100644 --- a/flyteidl/protos/docs/service/service.rst +++ b/flyteidl/protos/docs/service/service.rst @@ -74,6 +74,7 @@ Standard response codes for both are defined here: https://github.com/grpc-ecosy "GetTaskExecution", ":ref:`ref_flyteidl.admin.TaskExecutionGetRequest`", ":ref:`ref_flyteidl.admin.TaskExecution`", "Fetches a :ref:`ref_flyteidl.admin.TaskExecution`." "ListTaskExecutions", ":ref:`ref_flyteidl.admin.TaskExecutionListRequest`", ":ref:`ref_flyteidl.admin.TaskExecutionList`", "Fetches a list of :ref:`ref_flyteidl.admin.TaskExecution`." "GetTaskExecutionData", ":ref:`ref_flyteidl.admin.TaskExecutionGetDataRequest`", ":ref:`ref_flyteidl.admin.TaskExecutionGetDataResponse`", "Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`." + "UpdateTaskExecution", ":ref:`ref_flyteidl.admin.TaskExecutionUpdateRequest`", ":ref:`ref_flyteidl.admin.TaskExecutionUpdateResponse`", "Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`." "UpdateProjectDomainAttributes", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesUpdateRequest`", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesUpdateResponse`", "Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain." "GetProjectDomainAttributes", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesGetRequest`", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesGetResponse`", "Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain." "DeleteProjectDomainAttributes", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesDeleteRequest`", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesDeleteResponse`", "Deletes custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain." diff --git a/flyteidl/protos/flyteidl/admin/execution.proto b/flyteidl/protos/flyteidl/admin/execution.proto index 6a7c164227..7ac671c94d 100644 --- a/flyteidl/protos/flyteidl/admin/execution.proto +++ b/flyteidl/protos/flyteidl/admin/execution.proto @@ -6,6 +6,7 @@ option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"; import "flyteidl/admin/cluster_assignment.proto"; import "flyteidl/admin/common.proto"; import "flyteidl/core/literals.proto"; +import "flyteidl/core/errors.proto"; import "flyteidl/core/execution.proto"; import "flyteidl/core/identifier.proto"; import "flyteidl/core/security.proto"; @@ -367,6 +368,10 @@ message ExecutionUpdateRequest { // State to set as the new value active/archive ExecutionState state = 2; + + // Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the + // execution DAG and remove all stored results from datacatalog. + bool evict_cache = 3; } message ExecutionStateChangeDetails { @@ -380,4 +385,8 @@ message ExecutionStateChangeDetails { string principal = 3; } -message ExecutionUpdateResponse {} +message ExecutionUpdateResponse { + // List of errors encountered during cache eviction (if any). + // Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. + core.CacheEvictionErrorList cache_eviction_errors = 1; +} diff --git a/flyteidl/protos/flyteidl/admin/task_execution.proto b/flyteidl/protos/flyteidl/admin/task_execution.proto index 36d9b77e1d..87e3657b13 100644 --- a/flyteidl/protos/flyteidl/admin/task_execution.proto +++ b/flyteidl/protos/flyteidl/admin/task_execution.proto @@ -4,6 +4,7 @@ package flyteidl.admin; option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"; import "flyteidl/admin/common.proto"; +import "flyteidl/core/errors.proto"; import "flyteidl/core/execution.proto"; import "flyteidl/core/identifier.proto"; import "flyteidl/core/literals.proto"; @@ -149,3 +150,16 @@ message TaskExecutionGetDataResponse { // Full_outputs will only be populated if they are under a configured size threshold. core.LiteralMap full_outputs = 4; } + +message TaskExecutionUpdateRequest { + // Identifier of the task execution to update + core.TaskExecutionIdentifier id = 1; + + // Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the + // execution DAG and remove all stored results from datacatalog. + bool evict_cache = 2; +} + +message TaskExecutionUpdateResponse { + core.CacheEvictionErrorList cache_eviction_errors = 1; +} diff --git a/flyteidl/protos/flyteidl/core/errors.proto b/flyteidl/protos/flyteidl/core/errors.proto index d9a76d97dc..6e2f333f27 100644 --- a/flyteidl/protos/flyteidl/core/errors.proto +++ b/flyteidl/protos/flyteidl/core/errors.proto @@ -5,6 +5,7 @@ package flyteidl.core; option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"; import "flyteidl/core/execution.proto"; +import "flyteidl/core/identifier.proto"; // Error message to propagate detailed errors from container executions to the execution // engine. @@ -33,3 +34,29 @@ message ErrorDocument { // The error raised during execution. ContainerError error = 1; } + +// Error returned if eviction of cached output fails and should be re-tried by the user. +message CacheEvictionError { + enum Code { + UNKNOWN = 0; + } + + // Error code to match type of cache eviction error encountered. + Code code = 1; + // More detailed error message explaining the reason for the cache eviction failure. + string message = 2; + // ID of the node execution the cache eviction failed for. + core.NodeExecutionIdentifier node_execution_id = 3; + // Source of the node execution. + oneof source { + // ID of the task execution the cache eviction failed for (if the node execution was part of a task execution). + core.TaskExecutionIdentifier task_execution_id = 4; + // ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution). + core.WorkflowExecutionIdentifier workflow_execution_id = 5; + } +} + +// List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request. +message CacheEvictionErrorList { + repeated CacheEvictionError errors = 1; +} \ No newline at end of file diff --git a/flyteidl/protos/flyteidl/service/admin.proto b/flyteidl/protos/flyteidl/service/admin.proto index 6905006bba..2124617217 100644 --- a/flyteidl/protos/flyteidl/service/admin.proto +++ b/flyteidl/protos/flyteidl/service/admin.proto @@ -460,6 +460,16 @@ service AdminService { // }; } + // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. + rpc UpdateTaskExecution (flyteidl.admin.TaskExecutionUpdateRequest) returns (flyteidl.admin.TaskExecutionUpdateResponse) { + option (google.api.http) = { + get: "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" + }; + // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { + // description: "Updates an existing task execution belonging to a project domain." + // }; + } + // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. rpc UpdateProjectDomainAttributes (flyteidl.admin.ProjectDomainAttributesUpdateRequest) returns (flyteidl.admin.ProjectDomainAttributesUpdateResponse) { option (google.api.http) = { From 6480f02e9281943f6068c7e16fb697616ddd8600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Tue, 8 Nov 2022 14:31:28 +0100 Subject: [PATCH 12/57] Updated to latest released version of flytestdlib Ran go mod tidy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- flyteidl/go.mod | 21 +- flyteidl/go.sum | 688 +++++++++++++++++++++++++++--------------------- 2 files changed, 392 insertions(+), 317 deletions(-) diff --git a/flyteidl/go.mod b/flyteidl/go.mod index 84df3143f6..912ec1fc4b 100644 --- a/flyteidl/go.mod +++ b/flyteidl/go.mod @@ -4,24 +4,23 @@ go 1.16 require ( github.com/antihax/optional v1.0.0 - github.com/flyteorg/flytestdlib v1.0.0 + github.com/flyteorg/flytestdlib v1.0.12 github.com/go-test/deep v1.0.7 - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b - github.com/golang/protobuf v1.4.3 + github.com/golang/glog v1.0.0 + github.com/golang/protobuf v1.5.2 github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/jinzhu/copier v0.3.5 - github.com/mitchellh/mapstructure v1.4.1 + github.com/mitchellh/mapstructure v1.4.3 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.0 - github.com/vektra/mockery v1.1.2 // indirect - golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f - golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013 - google.golang.org/api v0.38.0 - google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 - google.golang.org/grpc v1.35.0 + github.com/stretchr/testify v1.7.1 + golang.org/x/net v0.0.0-20220722155237-a158d28d115b + golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 + google.golang.org/api v0.76.0 + google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 + google.golang.org/grpc v1.46.0 k8s.io/apimachinery v0.20.2 ) diff --git a/flyteidl/go.sum b/flyteidl/go.sum index d3b79ca523..8d029645af 100644 --- a/flyteidl/go.sum +++ b/flyteidl/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -13,20 +14,40 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.66.0/go.mod h1:dgqGAjKCDxyhGTtC9dAREQGUJpkceNm1yt590Qno0Ko= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0 h1:XgtDnVJRCPEUG21gjFiRPz4zI1Mjg16R+NYQjfmU4XY= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go v0.101.0 h1:g+LL+JvpvdyGtcaD2xw2mSByE/6F9s471eJSoaysM84= +cloud.google.com/go v0.101.0/go.mod h1:hEiddgDb77jDQ+I80tURYNJEnuwPzFU8awCFFRLKjW0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= +cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= +cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -36,54 +57,52 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.12.0 h1:4y3gHptW1EHVtcPAVE0eBBlFuGqEejTTG3KdIE0lUX4= -cloud.google.com/go/storage v1.12.0/go.mod h1:fFLk2dp2oAhDz8QFKwqrjdJvxSp/W2g7nillojlL5Ho= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8= +cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-sdk-for-go v62.3.0+incompatible h1:Ctfsn9UoA/BB4HMYQlbPPgNXdX0tZ4tmb85+KFb2+RE= -github.com/Azure/azure-sdk-for-go v62.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 h1:qoVeMsc9/fh/yhxVaA0obYjVH/oI/ihrOoMwsLS9KSA= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= +github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo= +github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.0/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 h1:3CVsSo4mp8NDWO11tHzN/mdo2zP0CtaSK5IcwBjfqRA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0 h1:NVS/4LOQfkBpk+B1VopIzv1ptmYeEskA8w/3K/w7vjo= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0/go.mod h1:RG0cZndeZM17StwohYclmcXSr4oOJ8b1I5hB8llIc6Y= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 h1:Px2KVERcYEg2Lv25AqC2hVr0xUWaq94wuEObLIkYzmA= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2/go.mod h1:CdSJQNNzZhCkwDaV27XV1w48ZBPtxe7mlrZAsPNxD5g= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 h1:0nJeKDmB7a1a8RDMjTltahlPsaNlWjq/LpkZleSwINk= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0/go.mod h1:mbwxKc/fW+IkF0GG591MuXw0KuEQBDkeRoZ9vmVJPxg= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest v0.11.17 h1:2zCdHwNgRH+St1J+ZMf66xI8aLr/5KMy+wWLH97zwYM= -github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= +github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.10 h1:r6fZHMaHD8B6LDCn0o5vyBFHIHrM6Ywwx7mb49lPItI= -github.com/Azure/go-autorest/autorest/adal v0.9.10/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ= +github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= +github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c= +github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -91,98 +110,83 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.23.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.37.1 h1:BTHmuN+gzhxkvU9sac2tZvaY0gV9ihbHw+KxZOecYvY= -github.com/aws/aws-sdk-go v1.37.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aws/aws-sdk-go v1.44.2 h1:5VBk5r06bgxgRKVaUtm1/4NT/rtrnH2E4cnAYv5zgQc= +github.com/aws/aws-sdk-go v1.44.2/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1/go.mod h1:jvdWlw8vowVGnZqSDC7yhPd7AifQeQbRDkZcQXV2nRg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc= github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= -github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= -github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/flyteorg/flytestdlib v1.0.0 h1:gb99ignMsVcNTUmWzArtcIDdkRjyzQQVBkWNOQakiFg= -github.com/flyteorg/flytestdlib v1.0.0/go.mod h1:QSVN5wIM1lM9d60eAEbX7NwweQXW96t5x4jbyftn89c= -github.com/flyteorg/stow v0.3.3 h1:tzeNl8mSZFL3oJDi0ACZj6FAineQAF4qyEp6bXtIdQY= -github.com/flyteorg/stow v0.3.3/go.mod h1:HBld7ud0i4khMHwJjkO8v+NSP7ddKa/ruhf4I8fliaA= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= +github.com/flyteorg/flytestdlib v1.0.12 h1:A+yN5TX/SezjCjzv/JV29SzlBAyKGeLDOfAiYqzrKcw= +github.com/flyteorg/flytestdlib v1.0.12/go.mod h1:nIBmBHtjTJvhZEn3e/EwVC/iMkR2tUX8hEiXjRBpH/s= +github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk= +github.com/flyteorg/stow v0.3.6/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -191,7 +195,7 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= @@ -206,26 +210,30 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ= +github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -233,6 +241,8 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -246,9 +256,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -260,15 +273,21 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -276,87 +295,90 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/readahead v0.0.0-20161222183148-eaceba169032/go.mod h1:qYysrqQXuV4tzsizt4oOQ6mrBZQ0xnQXP3ylXX8Jk5Y= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= +github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.3/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -368,176 +390,128 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= +github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/ncw/swift v1.0.49/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks= github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.10.0/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU= -github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM= -github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.3.0 h1:Uehi/mxLK0eiUc0H0++5tpMGTexB8wZ598MIgU8VpDM= -github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpOAnclKvg+mdA= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -548,55 +522,52 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= -github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= +go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.2/go.mod h1:2D7ZejHVMIfog1221iLSYlQRzrtECw3kz4I4VAQm3qI= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.22.6 h1:BdkrbWrzDlV9dnbzoP7sfN+dHheJ4J9JOaYxcUDL+ok= -go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -619,8 +590,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -630,17 +601,14 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -651,8 +619,8 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -667,18 +635,29 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -687,8 +666,19 @@ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013 h1:55H5j7lotzuFCEOKDsMch+fRNUQ9DgtyHOUP31FNqKc= -golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -700,15 +690,14 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -718,17 +707,19 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -742,29 +733,63 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -772,7 +797,6 @@ golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -780,7 +804,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -789,11 +812,9 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -801,7 +822,6 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -812,7 +832,6 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -822,24 +841,26 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -856,14 +877,30 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo= -google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.38.0 h1:vDyWk6eup8eQAidaZ31sNWIn8tZEL8qpbtGkBD4ytQo= -google.golang.org/api v0.38.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= +google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.76.0 h1:UkZl25bR1FHNqtK/EKs3vCdpZtUO6gea3YElTwc8pQg= +google.golang.org/api v0.76.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= @@ -876,7 +913,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -902,26 +938,59 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 h1:uLBY0yHDCj2PMQ98KWDSIDFwn9zK2zh+tgWtbvPPBjI= -google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 h1:G1IeWbjrqEq9ChWxEuRPJu6laA67+XgTFHVSAvepr38= +google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -931,12 +1000,24 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -946,26 +1027,23 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/kothar/go-backblaze.v0 v0.0.0-20190520213052-702d4e7eb465/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/kothar/go-backblaze.v0 v0.0.0-20210124194846-35409b867216/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -979,7 +1057,6 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1008,4 +1085,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= From 1dc2115ca11c13f1ee39cc5ebfd088690245630b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 10 Nov 2022 17:07:03 +0100 Subject: [PATCH 13/57] Refactored cache eviction to own service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../go/admin/mocks/AdminServiceClient.go | 48 - .../go/admin/mocks/AdminServiceServer.go | 41 - .../mocks/CacheManagementServiceClient.go | 114 + .../mocks/CacheManagementServiceServer.go | 97 + .../go/admin/mocks/CacheServiceClient.go | 114 + .../go/admin/mocks/CacheServiceServer.go | 97 + .../gen/pb-cpp/flyteidl/admin/execution.pb.cc | 374 +-- .../gen/pb-cpp/flyteidl/admin/execution.pb.h | 77 - .../flyteidl/admin/task_execution.pb.cc | 797 +------ .../pb-cpp/flyteidl/admin/task_execution.pb.h | 364 +-- .../pb-cpp/flyteidl/service/admin.grpc.pb.cc | 104 +- .../pb-cpp/flyteidl/service/admin.grpc.pb.h | 460 ++-- .../gen/pb-cpp/flyteidl/service/admin.pb.cc | 510 ++-- .../gen/pb-cpp/flyteidl/service/admin.pb.h | 1 - .../pb-cpp/flyteidl/service/cache.grpc.pb.cc | 127 + .../pb-cpp/flyteidl/service/cache.grpc.pb.h | 423 ++++ .../gen/pb-cpp/flyteidl/service/cache.pb.cc | 1078 +++++++++ .../gen/pb-cpp/flyteidl/service/cache.pb.h | 592 +++++ .../gen/pb-go/flyteidl/admin/execution.pb.go | 255 +- .../flyteidl/admin/execution.pb.validate.go | 12 - .../pb-go/flyteidl/admin/task_execution.pb.go | 206 +- .../admin/task_execution.pb.validate.go | 157 -- .../gen/pb-go/flyteidl/service/admin.pb.go | 308 ++- .../gen/pb-go/flyteidl/service/admin.pb.gw.go | 150 -- .../pb-go/flyteidl/service/admin.swagger.json | 80 +- .../gen/pb-go/flyteidl/service/cache.pb.go | 308 +++ .../gen/pb-go/flyteidl/service/cache.pb.gw.go | 302 +++ .../pb-go/flyteidl/service/cache.swagger.json | 314 +++ .../flyteidl/service/flyteadmin/README.md | 6 +- .../service/flyteadmin/api/swagger.yaml | 261 +- .../service/flyteadmin/api_admin_service.go | 233 +- .../model_admin_execution_update_request.go | 2 - .../model_admin_execution_update_response.go | 2 - ...el_admin_task_execution_update_response.go | 14 - .../model_cache_eviction_error_code.go | 17 - .../model_core_cache_eviction_error.go | 24 - .../model_core_cache_eviction_error_list.go | 15 - .../gen/pb-go/flyteidl/service/openapi.go | 4 +- .../flyteidl/admin/ExecutionOuterClass.java | 573 +---- .../admin/TaskExecutionOuterClass.java | 1476 +----------- .../gen/pb-java/flyteidl/service/Admin.java | 505 ++-- .../gen/pb-java/flyteidl/service/Cache.java | 2111 +++++++++++++++++ flyteidl/gen/pb-js/flyteidl.d.ts | 365 +-- flyteidl/gen/pb-js/flyteidl.js | 747 +++--- .../pb_python/flyteidl/admin/execution_pb2.py | 95 +- .../flyteidl/admin/execution_pb2.pyi | 13 +- .../flyteidl/admin/task_execution_pb2.py | 35 +- .../flyteidl/admin/task_execution_pb2.pyi | 15 - .../pb_python/flyteidl/service/admin_pb2.py | 9 +- .../pb_python/flyteidl/service/admin_pb2.pyi | 1 - .../flyteidl/service/admin_pb2_grpc.py | 34 - .../pb_python/flyteidl/service/cache_pb2.py | 39 + .../pb_python/flyteidl/service/cache_pb2.pyi | 26 + .../flyteidl/service/cache_pb2_grpc.py | 104 + .../flyteidl/service/flyteadmin/README.md | 6 +- .../service/flyteadmin/flyteadmin/__init__.py | 4 - .../flyteadmin/api/admin_service_api.py | 334 ++- .../flyteadmin/flyteadmin/models/__init__.py | 4 - .../models/admin_execution_update_request.py | 34 +- .../models/admin_execution_update_response.py | 34 +- .../admin_task_execution_update_response.py | 117 - .../models/cache_eviction_error_code.py | 92 - .../models/core_cache_eviction_error.py | 234 -- .../models/core_cache_eviction_error_list.py | 117 - .../flyteadmin/test/test_admin_service_api.py | 14 +- ...st_admin_task_execution_update_response.py | 40 - .../test/test_cache_eviction_error_code.py | 40 - .../test/test_core_cache_eviction_error.py | 40 - .../test_core_cache_eviction_error_list.py | 40 - flyteidl/protos/docs/admin/admin.rst | 51 - flyteidl/protos/docs/service/service.rst | 105 +- .../protos/flyteidl/admin/execution.proto | 11 +- .../flyteidl/admin/task_execution.proto | 14 - flyteidl/protos/flyteidl/service/admin.proto | 11 - flyteidl/protos/flyteidl/service/cache.proto | 50 + 75 files changed, 8324 insertions(+), 7304 deletions(-) create mode 100644 flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go create mode 100644 flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go create mode 100644 flyteidl/clients/go/admin/mocks/CacheServiceClient.go create mode 100644 flyteidl/clients/go/admin/mocks/CacheServiceServer.go create mode 100644 flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc create mode 100644 flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h create mode 100644 flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc create mode 100644 flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h create mode 100644 flyteidl/gen/pb-go/flyteidl/service/cache.pb.go create mode 100644 flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go create mode 100644 flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json delete mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go delete mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go delete mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go delete mode 100644 flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go create mode 100644 flyteidl/gen/pb-java/flyteidl/service/Cache.java create mode 100644 flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py create mode 100644 flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi create mode 100644 flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py delete mode 100644 flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py create mode 100644 flyteidl/protos/flyteidl/service/cache.proto diff --git a/flyteidl/clients/go/admin/mocks/AdminServiceClient.go b/flyteidl/clients/go/admin/mocks/AdminServiceClient.go index 8d27ec5579..3858c5a696 100644 --- a/flyteidl/clients/go/admin/mocks/AdminServiceClient.go +++ b/flyteidl/clients/go/admin/mocks/AdminServiceClient.go @@ -2465,54 +2465,6 @@ func (_m *AdminServiceClient) UpdateProjectDomainAttributes(ctx context.Context, return r0, r1 } -type AdminServiceClient_UpdateTaskExecution struct { - *mock.Call -} - -func (_m AdminServiceClient_UpdateTaskExecution) Return(_a0 *admin.TaskExecutionUpdateResponse, _a1 error) *AdminServiceClient_UpdateTaskExecution { - return &AdminServiceClient_UpdateTaskExecution{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *AdminServiceClient) OnUpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) *AdminServiceClient_UpdateTaskExecution { - c_call := _m.On("UpdateTaskExecution", ctx, in, opts) - return &AdminServiceClient_UpdateTaskExecution{Call: c_call} -} - -func (_m *AdminServiceClient) OnUpdateTaskExecutionMatch(matchers ...interface{}) *AdminServiceClient_UpdateTaskExecution { - c_call := _m.On("UpdateTaskExecution", matchers...) - return &AdminServiceClient_UpdateTaskExecution{Call: c_call} -} - -// UpdateTaskExecution provides a mock function with given fields: ctx, in, opts -func (_m *AdminServiceClient) UpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) (*admin.TaskExecutionUpdateResponse, error) { - _va := make([]interface{}, len(opts)) - for _i := range opts { - _va[_i] = opts[_i] - } - var _ca []interface{} - _ca = append(_ca, ctx, in) - _ca = append(_ca, _va...) - ret := _m.Called(_ca...) - - var r0 *admin.TaskExecutionUpdateResponse - if rf, ok := ret.Get(0).(func(context.Context, *admin.TaskExecutionUpdateRequest, ...grpc.CallOption) *admin.TaskExecutionUpdateResponse); ok { - r0 = rf(ctx, in, opts...) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*admin.TaskExecutionUpdateResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *admin.TaskExecutionUpdateRequest, ...grpc.CallOption) error); ok { - r1 = rf(ctx, in, opts...) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - type AdminServiceClient_UpdateWorkflowAttributes struct { *mock.Call } diff --git a/flyteidl/clients/go/admin/mocks/AdminServiceServer.go b/flyteidl/clients/go/admin/mocks/AdminServiceServer.go index 62841debaa..67bc383780 100644 --- a/flyteidl/clients/go/admin/mocks/AdminServiceServer.go +++ b/flyteidl/clients/go/admin/mocks/AdminServiceServer.go @@ -2106,47 +2106,6 @@ func (_m *AdminServiceServer) UpdateProjectDomainAttributes(_a0 context.Context, return r0, r1 } -type AdminServiceServer_UpdateTaskExecution struct { - *mock.Call -} - -func (_m AdminServiceServer_UpdateTaskExecution) Return(_a0 *admin.TaskExecutionUpdateResponse, _a1 error) *AdminServiceServer_UpdateTaskExecution { - return &AdminServiceServer_UpdateTaskExecution{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *AdminServiceServer) OnUpdateTaskExecution(_a0 context.Context, _a1 *admin.TaskExecutionUpdateRequest) *AdminServiceServer_UpdateTaskExecution { - c_call := _m.On("UpdateTaskExecution", _a0, _a1) - return &AdminServiceServer_UpdateTaskExecution{Call: c_call} -} - -func (_m *AdminServiceServer) OnUpdateTaskExecutionMatch(matchers ...interface{}) *AdminServiceServer_UpdateTaskExecution { - c_call := _m.On("UpdateTaskExecution", matchers...) - return &AdminServiceServer_UpdateTaskExecution{Call: c_call} -} - -// UpdateTaskExecution provides a mock function with given fields: _a0, _a1 -func (_m *AdminServiceServer) UpdateTaskExecution(_a0 context.Context, _a1 *admin.TaskExecutionUpdateRequest) (*admin.TaskExecutionUpdateResponse, error) { - ret := _m.Called(_a0, _a1) - - var r0 *admin.TaskExecutionUpdateResponse - if rf, ok := ret.Get(0).(func(context.Context, *admin.TaskExecutionUpdateRequest) *admin.TaskExecutionUpdateResponse); ok { - r0 = rf(_a0, _a1) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*admin.TaskExecutionUpdateResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *admin.TaskExecutionUpdateRequest) error); ok { - r1 = rf(_a0, _a1) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - type AdminServiceServer_UpdateWorkflowAttributes struct { *mock.Call } diff --git a/flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go new file mode 100644 index 0000000000..4925e4eb56 --- /dev/null +++ b/flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go @@ -0,0 +1,114 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import ( + context "context" + + grpc "google.golang.org/grpc" + + mock "github.com/stretchr/testify/mock" + + service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" +) + +// CacheManagementServiceClient is an autogenerated mock type for the CacheManagementServiceClient type +type CacheManagementServiceClient struct { + mock.Mock +} + +type CacheManagementServiceClient_EvictExecutionCache struct { + *mock.Call +} + +func (_m CacheManagementServiceClient_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceClient_EvictExecutionCache { + return &CacheManagementServiceClient_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheManagementServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) *CacheManagementServiceClient_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", ctx, in, opts) + return &CacheManagementServiceClient_EvictExecutionCache{Call: c_call} +} + +func (_m *CacheManagementServiceClient) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceClient_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", matchers...) + return &CacheManagementServiceClient_EvictExecutionCache{Call: c_call} +} + +// EvictExecutionCache provides a mock function with given fields: ctx, in, opts +func (_m *CacheManagementServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type CacheManagementServiceClient_EvictTaskExecutionCache struct { + *mock.Call +} + +func (_m CacheManagementServiceClient_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceClient_EvictTaskExecutionCache { + return &CacheManagementServiceClient_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheManagementServiceClient) OnEvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) *CacheManagementServiceClient_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", ctx, in, opts) + return &CacheManagementServiceClient_EvictTaskExecutionCache{Call: c_call} +} + +func (_m *CacheManagementServiceClient) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceClient_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", matchers...) + return &CacheManagementServiceClient_EvictTaskExecutionCache{Call: c_call} +} + +// EvictTaskExecutionCache provides a mock function with given fields: ctx, in, opts +func (_m *CacheManagementServiceClient) EvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go new file mode 100644 index 0000000000..de739a2ee2 --- /dev/null +++ b/flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go @@ -0,0 +1,97 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import ( + context "context" + + service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" + mock "github.com/stretchr/testify/mock" +) + +// CacheManagementServiceServer is an autogenerated mock type for the CacheManagementServiceServer type +type CacheManagementServiceServer struct { + mock.Mock +} + +type CacheManagementServiceServer_EvictExecutionCache struct { + *mock.Call +} + +func (_m CacheManagementServiceServer_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceServer_EvictExecutionCache { + return &CacheManagementServiceServer_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheManagementServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) *CacheManagementServiceServer_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", _a0, _a1) + return &CacheManagementServiceServer_EvictExecutionCache{Call: c_call} +} + +func (_m *CacheManagementServiceServer) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceServer_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", matchers...) + return &CacheManagementServiceServer_EvictExecutionCache{Call: c_call} +} + +// EvictExecutionCache provides a mock function with given fields: _a0, _a1 +func (_m *CacheManagementServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest) *service.EvictCacheResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type CacheManagementServiceServer_EvictTaskExecutionCache struct { + *mock.Call +} + +func (_m CacheManagementServiceServer_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceServer_EvictTaskExecutionCache { + return &CacheManagementServiceServer_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheManagementServiceServer) OnEvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) *CacheManagementServiceServer_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", _a0, _a1) + return &CacheManagementServiceServer_EvictTaskExecutionCache{Call: c_call} +} + +func (_m *CacheManagementServiceServer) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceServer_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", matchers...) + return &CacheManagementServiceServer_EvictTaskExecutionCache{Call: c_call} +} + +// EvictTaskExecutionCache provides a mock function with given fields: _a0, _a1 +func (_m *CacheManagementServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest) *service.EvictCacheResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go new file mode 100644 index 0000000000..0d8e354d98 --- /dev/null +++ b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go @@ -0,0 +1,114 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import ( + context "context" + + grpc "google.golang.org/grpc" + + mock "github.com/stretchr/testify/mock" + + service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" +) + +// CacheServiceClient is an autogenerated mock type for the CacheServiceClient type +type CacheServiceClient struct { + mock.Mock +} + +type CacheServiceClient_EvictExecutionCache struct { + *mock.Call +} + +func (_m CacheServiceClient_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictExecutionCache { + return &CacheServiceClient_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", ctx, in, opts) + return &CacheServiceClient_EvictExecutionCache{Call: c_call} +} + +func (_m *CacheServiceClient) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", matchers...) + return &CacheServiceClient_EvictExecutionCache{Call: c_call} +} + +// EvictExecutionCache provides a mock function with given fields: ctx, in, opts +func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type CacheServiceClient_EvictTaskExecutionCache struct { + *mock.Call +} + +func (_m CacheServiceClient_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictTaskExecutionCache { + return &CacheServiceClient_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheServiceClient) OnEvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", ctx, in, opts) + return &CacheServiceClient_EvictTaskExecutionCache{Call: c_call} +} + +func (_m *CacheServiceClient) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", matchers...) + return &CacheServiceClient_EvictTaskExecutionCache{Call: c_call} +} + +// EvictTaskExecutionCache provides a mock function with given fields: ctx, in, opts +func (_m *CacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go new file mode 100644 index 0000000000..d30d216737 --- /dev/null +++ b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go @@ -0,0 +1,97 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import ( + context "context" + + service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" + mock "github.com/stretchr/testify/mock" +) + +// CacheServiceServer is an autogenerated mock type for the CacheServiceServer type +type CacheServiceServer struct { + mock.Mock +} + +type CacheServiceServer_EvictExecutionCache struct { + *mock.Call +} + +func (_m CacheServiceServer_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictExecutionCache { + return &CacheServiceServer_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) *CacheServiceServer_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", _a0, _a1) + return &CacheServiceServer_EvictExecutionCache{Call: c_call} +} + +func (_m *CacheServiceServer) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", matchers...) + return &CacheServiceServer_EvictExecutionCache{Call: c_call} +} + +// EvictExecutionCache provides a mock function with given fields: _a0, _a1 +func (_m *CacheServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest) *service.EvictCacheResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type CacheServiceServer_EvictTaskExecutionCache struct { + *mock.Call +} + +func (_m CacheServiceServer_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictTaskExecutionCache { + return &CacheServiceServer_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheServiceServer) OnEvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) *CacheServiceServer_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", _a0, _a1) + return &CacheServiceServer_EvictTaskExecutionCache{Call: c_call} +} + +func (_m *CacheServiceServer) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", matchers...) + return &CacheServiceServer_EvictTaskExecutionCache{Call: c_call} +} + +// EvictTaskExecutionCache provides a mock function with given fields: _a0, _a1 +func (_m *CacheServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest) *service.EvictCacheResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc index 20dc2e93b8..caba0518a5 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.cc @@ -32,7 +32,6 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::p extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_Execution_flyteidl_2fadmin_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_ExecutionMetadata_flyteidl_2fadmin_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<9> scc_info_ExecutionClosure_flyteidl_2fadmin_2fexecution_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_ExecutionError_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_QualityOfService_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Identifier_flyteidl_2fcore_2fidentifier_2eproto; @@ -475,9 +474,8 @@ static void InitDefaultsExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2ep ::flyteidl::admin::ExecutionUpdateResponse::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<1> scc_info_ExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto}, { - &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}}; +::google::protobuf::internal::SCCInfo<0> scc_info_ExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto}, {}}; void InitDefaults_flyteidl_2fadmin_2fexecution_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_ExecutionCreateRequest_flyteidl_2fadmin_2fexecution_2eproto.base); @@ -675,7 +673,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fexecution_2eprot ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateRequest, id_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateRequest, state_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateRequest, evict_cache_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionStateChangeDetails, _internal_metadata_), ~0u, // no _extensions_ @@ -689,7 +686,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fexecution_2eprot ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ExecutionUpdateResponse, cache_eviction_errors_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::admin::ExecutionCreateRequest)}, @@ -711,8 +707,8 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 145, -1, sizeof(::flyteidl::admin::WorkflowExecutionGetDataRequest)}, { 151, -1, sizeof(::flyteidl::admin::WorkflowExecutionGetDataResponse)}, { 160, -1, sizeof(::flyteidl::admin::ExecutionUpdateRequest)}, - { 168, -1, sizeof(::flyteidl::admin::ExecutionStateChangeDetails)}, - { 176, -1, sizeof(::flyteidl::admin::ExecutionUpdateResponse)}, + { 167, -1, sizeof(::flyteidl::admin::ExecutionStateChangeDetails)}, + { 175, -1, sizeof(::flyteidl::admin::ExecutionUpdateResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -749,112 +745,109 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fexecution_2eproto[] = "\n\036flyteidl/admin/execution.proto\022\016flytei" "dl.admin\032\'flyteidl/admin/cluster_assignm" "ent.proto\032\033flyteidl/admin/common.proto\032\034" - "flyteidl/core/literals.proto\032\032flyteidl/c" - "ore/errors.proto\032\035flyteidl/core/executio" - "n.proto\032\036flyteidl/core/identifier.proto\032" - "\034flyteidl/core/security.proto\032\036google/pr" - "otobuf/duration.proto\032\037google/protobuf/t" - "imestamp.proto\032\036google/protobuf/wrappers" - ".proto\"\237\001\n\026ExecutionCreateRequest\022\017\n\007pro" - "ject\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014\n\004name\030\003 \001(\t" - "\022+\n\004spec\030\004 \001(\0132\035.flyteidl.admin.Executio" - "nSpec\022)\n\006inputs\030\005 \001(\0132\031.flyteidl.core.Li" - "teralMap\"\177\n\030ExecutionRelaunchRequest\0226\n\002" - "id\030\001 \001(\0132*.flyteidl.core.WorkflowExecuti" - "onIdentifier\022\014\n\004name\030\003 \001(\t\022\027\n\017overwrite_" - "cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027ExecutionRecoverRe" - "quest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workfl" - "owExecutionIdentifier\022\014\n\004name\030\002 \001(\t\0223\n\010m" - "etadata\030\003 \001(\0132!.flyteidl.admin.Execution" - "Metadata\"Q\n\027ExecutionCreateResponse\0226\n\002i" - "d\030\001 \001(\0132*.flyteidl.core.WorkflowExecutio" - "nIdentifier\"U\n\033WorkflowExecutionGetReque" - "st\0226\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowE" - "xecutionIdentifier\"\243\001\n\tExecution\0226\n\002id\030\001" - " \001(\0132*.flyteidl.core.WorkflowExecutionId" - "entifier\022+\n\004spec\030\002 \001(\0132\035.flyteidl.admin." - "ExecutionSpec\0221\n\007closure\030\003 \001(\0132 .flyteid" - "l.admin.ExecutionClosure\"M\n\rExecutionLis" - "t\022-\n\nexecutions\030\001 \003(\0132\031.flyteidl.admin.E" - "xecution\022\r\n\005token\030\002 \001(\t\"X\n\016LiteralMapBlo" - "b\022/\n\006values\030\001 \001(\0132\031.flyteidl.core.Litera" - "lMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n\004data\"1\n\rAbo" - "rtMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n\tprincipal\030\002" - " \001(\t\"\360\005\n\020ExecutionClosure\0225\n\007outputs\030\001 \001" - "(\0132\036.flyteidl.admin.LiteralMapBlobB\002\030\001H\000" - "\022.\n\005error\030\002 \001(\0132\035.flyteidl.core.Executio" - "nErrorH\000\022\031\n\013abort_cause\030\n \001(\tB\002\030\001H\000\0227\n\016a" - "bort_metadata\030\014 \001(\0132\035.flyteidl.admin.Abo" - "rtMetadataH\000\0224\n\013output_data\030\r \001(\0132\031.flyt" - "eidl.core.LiteralMapB\002\030\001H\000\0226\n\017computed_i" - "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMapB\002" - "\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl.core.Workfl" - "owExecution.Phase\022.\n\nstarted_at\030\005 \001(\0132\032." - "google.protobuf.Timestamp\022+\n\010duration\030\006 " - "\001(\0132\031.google.protobuf.Duration\022.\n\ncreate" - "d_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022." - "\n\nupdated_at\030\010 \001(\0132\032.google.protobuf.Tim" - "estamp\0223\n\rnotifications\030\t \003(\0132\034.flyteidl" - ".admin.Notification\022.\n\013workflow_id\030\013 \001(\013" - "2\031.flyteidl.core.Identifier\022I\n\024state_cha" - "nge_details\030\016 \001(\0132+.flyteidl.admin.Execu" - "tionStateChangeDetailsB\017\n\routput_result\"" - "+\n\016SystemMetadata\022\031\n\021execution_cluster\030\001" - " \001(\t\"\332\003\n\021ExecutionMetadata\022=\n\004mode\030\001 \001(\016" - "2/.flyteidl.admin.ExecutionMetadata.Exec" - "utionMode\022\021\n\tprincipal\030\002 \001(\t\022\017\n\007nesting\030" - "\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132\032.google.pro" - "tobuf.Timestamp\022E\n\025parent_node_execution" - "\030\005 \001(\0132&.flyteidl.core.NodeExecutionIden" - "tifier\022G\n\023reference_execution\030\020 \001(\0132*.fl" - "yteidl.core.WorkflowExecutionIdentifier\022" - "7\n\017system_metadata\030\021 \001(\0132\036.flyteidl.admi" - "n.SystemMetadata\"g\n\rExecutionMode\022\n\n\006MAN" - "UAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYSTEM\020\002\022\014\n\010RELA" - "UNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r\n\tRECOVERED\020" - "\005\"G\n\020NotificationList\0223\n\rnotifications\030\001" - " \003(\0132\034.flyteidl.admin.Notification\"\200\006\n\rE" - "xecutionSpec\022.\n\013launch_plan\030\001 \001(\0132\031.flyt" - "eidl.core.Identifier\022-\n\006inputs\030\002 \001(\0132\031.f" - "lyteidl.core.LiteralMapB\002\030\001\0223\n\010metadata\030" - "\003 \001(\0132!.flyteidl.admin.ExecutionMetadata" - "\0229\n\rnotifications\030\005 \001(\0132 .flyteidl.admin" - ".NotificationListH\000\022\025\n\013disable_all\030\006 \001(\010" - "H\000\022&\n\006labels\030\007 \001(\0132\026.flyteidl.admin.Labe" - "ls\0220\n\013annotations\030\010 \001(\0132\033.flyteidl.admin" - ".Annotations\0228\n\020security_context\030\n \001(\0132\036" - ".flyteidl.core.SecurityContext\022/\n\tauth_r" - "ole\030\020 \001(\0132\030.flyteidl.admin.AuthRoleB\002\030\001\022" - ";\n\022quality_of_service\030\021 \001(\0132\037.flyteidl.c" - "ore.QualityOfService\022\027\n\017max_parallelism\030" - "\022 \001(\005\022C\n\026raw_output_data_config\030\023 \001(\0132#." - "flyteidl.admin.RawOutputDataConfig\022=\n\022cl" - "uster_assignment\030\024 \001(\0132!.flyteidl.admin." - "ClusterAssignment\0221\n\rinterruptible\030\025 \001(\013" - "2\032.google.protobuf.BoolValue\022\027\n\017overwrit" - "e_cache\030\026 \001(\010B\030\n\026notification_overridesJ" - "\004\010\004\020\005\"b\n\031ExecutionTerminateRequest\0226\n\002id" - "\030\001 \001(\0132*.flyteidl.core.WorkflowExecution" - "Identifier\022\r\n\005cause\030\002 \001(\t\"\034\n\032ExecutionTe" - "rminateResponse\"Y\n\037WorkflowExecutionGetD" - "ataRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.W" - "orkflowExecutionIdentifier\"\336\001\n WorkflowE" - "xecutionGetDataResponse\022,\n\007outputs\030\001 \001(\013" - "2\027.flyteidl.admin.UrlBlobB\002\030\001\022+\n\006inputs\030" - "\002 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013fu" - "ll_inputs\030\003 \001(\0132\031.flyteidl.core.LiteralM" - "ap\022/\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core" - ".LiteralMap\"\224\001\n\026ExecutionUpdateRequest\0226" - "\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowExecu" - "tionIdentifier\022-\n\005state\030\002 \001(\0162\036.flyteidl" - ".admin.ExecutionState\022\023\n\013evict_cache\030\003 \001" - "(\010\"\220\001\n\033ExecutionStateChangeDetails\022-\n\005st" - "ate\030\001 \001(\0162\036.flyteidl.admin.ExecutionStat" - "e\022/\n\013occurred_at\030\002 \001(\0132\032.google.protobuf" - ".Timestamp\022\021\n\tprincipal\030\003 \001(\t\"_\n\027Executi" - "onUpdateResponse\022D\n\025cache_eviction_error" - "s\030\001 \001(\0132%.flyteidl.core.CacheEvictionErr" - "orList*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" + "flyteidl/core/literals.proto\032\035flyteidl/c" + "ore/execution.proto\032\036flyteidl/core/ident" + "ifier.proto\032\034flyteidl/core/security.prot" + "o\032\036google/protobuf/duration.proto\032\037googl" + "e/protobuf/timestamp.proto\032\036google/proto" + "buf/wrappers.proto\"\237\001\n\026ExecutionCreateRe" + "quest\022\017\n\007project\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014" + "\n\004name\030\003 \001(\t\022+\n\004spec\030\004 \001(\0132\035.flyteidl.ad" + "min.ExecutionSpec\022)\n\006inputs\030\005 \001(\0132\031.flyt" + "eidl.core.LiteralMap\"\177\n\030ExecutionRelaunc" + "hRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" + "kflowExecutionIdentifier\022\014\n\004name\030\003 \001(\t\022\027" + "\n\017overwrite_cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027Execut" + "ionRecoverRequest\0226\n\002id\030\001 \001(\0132*.flyteidl" + ".core.WorkflowExecutionIdentifier\022\014\n\004nam" + "e\030\002 \001(\t\0223\n\010metadata\030\003 \001(\0132!.flyteidl.adm" + "in.ExecutionMetadata\"Q\n\027ExecutionCreateR" + "esponse\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Work" + "flowExecutionIdentifier\"U\n\033WorkflowExecu" + "tionGetRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.co" + "re.WorkflowExecutionIdentifier\"\243\001\n\tExecu" + "tion\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workflo" + "wExecutionIdentifier\022+\n\004spec\030\002 \001(\0132\035.fly" + "teidl.admin.ExecutionSpec\0221\n\007closure\030\003 \001" + "(\0132 .flyteidl.admin.ExecutionClosure\"M\n\r" + "ExecutionList\022-\n\nexecutions\030\001 \003(\0132\031.flyt" + "eidl.admin.Execution\022\r\n\005token\030\002 \001(\t\"X\n\016L" + "iteralMapBlob\022/\n\006values\030\001 \001(\0132\031.flyteidl" + ".core.LiteralMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n" + "\004data\"1\n\rAbortMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n" + "\tprincipal\030\002 \001(\t\"\360\005\n\020ExecutionClosure\0225\n" + "\007outputs\030\001 \001(\0132\036.flyteidl.admin.LiteralM" + "apBlobB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl.c" + "ore.ExecutionErrorH\000\022\031\n\013abort_cause\030\n \001(" + "\tB\002\030\001H\000\0227\n\016abort_metadata\030\014 \001(\0132\035.flytei" + "dl.admin.AbortMetadataH\000\0224\n\013output_data\030" + "\r \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0226" + "\n\017computed_inputs\030\003 \001(\0132\031.flyteidl.core." + "LiteralMapB\002\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl" + ".core.WorkflowExecution.Phase\022.\n\nstarted" + "_at\030\005 \001(\0132\032.google.protobuf.Timestamp\022+\n" + "\010duration\030\006 \001(\0132\031.google.protobuf.Durati" + "on\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf" + ".Timestamp\022.\n\nupdated_at\030\010 \001(\0132\032.google." + "protobuf.Timestamp\0223\n\rnotifications\030\t \003(" + "\0132\034.flyteidl.admin.Notification\022.\n\013workf" + "low_id\030\013 \001(\0132\031.flyteidl.core.Identifier\022" + "I\n\024state_change_details\030\016 \001(\0132+.flyteidl" + ".admin.ExecutionStateChangeDetailsB\017\n\rou" + "tput_result\"+\n\016SystemMetadata\022\031\n\021executi" + "on_cluster\030\001 \001(\t\"\332\003\n\021ExecutionMetadata\022=" + "\n\004mode\030\001 \001(\0162/.flyteidl.admin.ExecutionM" + "etadata.ExecutionMode\022\021\n\tprincipal\030\002 \001(\t" + "\022\017\n\007nesting\030\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132" + "\032.google.protobuf.Timestamp\022E\n\025parent_no" + "de_execution\030\005 \001(\0132&.flyteidl.core.NodeE" + "xecutionIdentifier\022G\n\023reference_executio" + "n\030\020 \001(\0132*.flyteidl.core.WorkflowExecutio" + "nIdentifier\0227\n\017system_metadata\030\021 \001(\0132\036.f" + "lyteidl.admin.SystemMetadata\"g\n\rExecutio" + "nMode\022\n\n\006MANUAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYST" + "EM\020\002\022\014\n\010RELAUNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r" + "\n\tRECOVERED\020\005\"G\n\020NotificationList\0223\n\rnot" + "ifications\030\001 \003(\0132\034.flyteidl.admin.Notifi" + "cation\"\200\006\n\rExecutionSpec\022.\n\013launch_plan\030" + "\001 \001(\0132\031.flyteidl.core.Identifier\022-\n\006inpu" + "ts\030\002 \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001\022" + "3\n\010metadata\030\003 \001(\0132!.flyteidl.admin.Execu" + "tionMetadata\0229\n\rnotifications\030\005 \001(\0132 .fl" + "yteidl.admin.NotificationListH\000\022\025\n\013disab" + "le_all\030\006 \001(\010H\000\022&\n\006labels\030\007 \001(\0132\026.flyteid" + "l.admin.Labels\0220\n\013annotations\030\010 \001(\0132\033.fl" + "yteidl.admin.Annotations\0228\n\020security_con" + "text\030\n \001(\0132\036.flyteidl.core.SecurityConte" + "xt\022/\n\tauth_role\030\020 \001(\0132\030.flyteidl.admin.A" + "uthRoleB\002\030\001\022;\n\022quality_of_service\030\021 \001(\0132" + "\037.flyteidl.core.QualityOfService\022\027\n\017max_" + "parallelism\030\022 \001(\005\022C\n\026raw_output_data_con" + "fig\030\023 \001(\0132#.flyteidl.admin.RawOutputData" + "Config\022=\n\022cluster_assignment\030\024 \001(\0132!.fly" + "teidl.admin.ClusterAssignment\0221\n\rinterru" + "ptible\030\025 \001(\0132\032.google.protobuf.BoolValue" + "\022\027\n\017overwrite_cache\030\026 \001(\010B\030\n\026notificatio" + "n_overridesJ\004\010\004\020\005\"b\n\031ExecutionTerminateR" + "equest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workf" + "lowExecutionIdentifier\022\r\n\005cause\030\002 \001(\t\"\034\n" + "\032ExecutionTerminateResponse\"Y\n\037WorkflowE" + "xecutionGetDataRequest\0226\n\002id\030\001 \001(\0132*.fly" + "teidl.core.WorkflowExecutionIdentifier\"\336" + "\001\n WorkflowExecutionGetDataResponse\022,\n\007o" + "utputs\030\001 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030" + "\001\022+\n\006inputs\030\002 \001(\0132\027.flyteidl.admin.UrlBl" + "obB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132\031.flyteidl.c" + "ore.LiteralMap\022/\n\014full_outputs\030\004 \001(\0132\031.f" + "lyteidl.core.LiteralMap\"\177\n\026ExecutionUpda" + "teRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wo" + "rkflowExecutionIdentifier\022-\n\005state\030\002 \001(\016" + "2\036.flyteidl.admin.ExecutionState\"\220\001\n\033Exe" + "cutionStateChangeDetails\022-\n\005state\030\001 \001(\0162" + "\036.flyteidl.admin.ExecutionState\022/\n\013occur" + "red_at\030\002 \001(\0132\032.google.protobuf.Timestamp" + "\022\021\n\tprincipal\030\003 \001(\t\"\031\n\027ExecutionUpdateRe" + "sponse*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" "TIVE\020\000\022\026\n\022EXECUTION_ARCHIVED\020\001B7Z5github" ".com/flyteorg/flyteidl/gen/pb-go/flyteid" "l/adminb\006proto3" @@ -862,16 +855,15 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fexecution_2eproto[] = ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fexecution_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fexecution_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fexecution_2eproto, - "flyteidl/admin/execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2fexecution_2eproto, 4455, + "flyteidl/admin/execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2fexecution_2eproto, 4335, }; void AddDescriptors_flyteidl_2fadmin_2fexecution_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[10] = + static constexpr ::google::protobuf::internal::InitFunc deps[9] = { ::AddDescriptors_flyteidl_2fadmin_2fcluster_5fassignment_2eproto, ::AddDescriptors_flyteidl_2fadmin_2fcommon_2eproto, ::AddDescriptors_flyteidl_2fcore_2fliterals_2eproto, - ::AddDescriptors_flyteidl_2fcore_2ferrors_2eproto, ::AddDescriptors_flyteidl_2fcore_2fexecution_2eproto, ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, ::AddDescriptors_flyteidl_2fcore_2fsecurity_2eproto, @@ -879,7 +871,7 @@ void AddDescriptors_flyteidl_2fadmin_2fexecution_2eproto() { ::AddDescriptors_google_2fprotobuf_2ftimestamp_2eproto, ::AddDescriptors_google_2fprotobuf_2fwrappers_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2fexecution_2eproto, deps, 10); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2fexecution_2eproto, deps, 9); } // Force running AddDescriptors() at dynamic initialization time. @@ -9710,7 +9702,6 @@ void ExecutionUpdateRequest::clear_id() { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int ExecutionUpdateRequest::kIdFieldNumber; const int ExecutionUpdateRequest::kStateFieldNumber; -const int ExecutionUpdateRequest::kEvictCacheFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 ExecutionUpdateRequest::ExecutionUpdateRequest() @@ -9727,9 +9718,7 @@ ExecutionUpdateRequest::ExecutionUpdateRequest(const ExecutionUpdateRequest& fro } else { id_ = nullptr; } - ::memcpy(&state_, &from.state_, - static_cast(reinterpret_cast(&evict_cache_) - - reinterpret_cast(&state_)) + sizeof(evict_cache_)); + state_ = from.state_; // @@protoc_insertion_point(copy_constructor:flyteidl.admin.ExecutionUpdateRequest) } @@ -9737,8 +9726,8 @@ void ExecutionUpdateRequest::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_ExecutionUpdateRequest_flyteidl_2fadmin_2fexecution_2eproto.base); ::memset(&id_, 0, static_cast( - reinterpret_cast(&evict_cache_) - - reinterpret_cast(&id_)) + sizeof(evict_cache_)); + reinterpret_cast(&state_) - + reinterpret_cast(&id_)) + sizeof(state_)); } ExecutionUpdateRequest::~ExecutionUpdateRequest() { @@ -9769,9 +9758,7 @@ void ExecutionUpdateRequest::Clear() { delete id_; } id_ = nullptr; - ::memset(&state_, 0, static_cast( - reinterpret_cast(&evict_cache_) - - reinterpret_cast(&state_)) + sizeof(evict_cache_)); + state_ = 0; _internal_metadata_.Clear(); } @@ -9809,13 +9796,6 @@ const char* ExecutionUpdateRequest::_InternalParse(const char* begin, const char GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); break; } - // bool evict_cache = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual; - msg->set_evict_cache(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -9871,19 +9851,6 @@ bool ExecutionUpdateRequest::MergePartialFromCodedStream( break; } - // bool evict_cache = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &evict_cache_))); - } else { - goto handle_unusual; - } - break; - } - default: { handle_unusual: if (tag == 0) { @@ -9923,11 +9890,6 @@ void ExecutionUpdateRequest::SerializeWithCachedSizes( 2, this->state(), output); } - // bool evict_cache = 3; - if (this->evict_cache() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->evict_cache(), output); - } - if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -9954,11 +9916,6 @@ ::google::protobuf::uint8* ExecutionUpdateRequest::InternalSerializeWithCachedSi 2, this->state(), target); } - // bool evict_cache = 3; - if (this->evict_cache() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->evict_cache(), target); - } - if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -9993,11 +9950,6 @@ size_t ExecutionUpdateRequest::ByteSizeLong() const { ::google::protobuf::internal::WireFormatLite::EnumSize(this->state()); } - // bool evict_cache = 3; - if (this->evict_cache() != 0) { - total_size += 1 + 1; - } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -10031,9 +9983,6 @@ void ExecutionUpdateRequest::MergeFrom(const ExecutionUpdateRequest& from) { if (from.state() != 0) { set_state(from.state()); } - if (from.evict_cache() != 0) { - set_evict_cache(from.evict_cache()); - } } void ExecutionUpdateRequest::CopyFrom(const ::google::protobuf::Message& from) { @@ -10063,7 +10012,6 @@ void ExecutionUpdateRequest::InternalSwap(ExecutionUpdateRequest* other) { _internal_metadata_.Swap(&other->_internal_metadata_); swap(id_, other->id_); swap(state_, other->state_); - swap(evict_cache_, other->evict_cache_); } ::google::protobuf::Metadata ExecutionUpdateRequest::GetMetadata() const { @@ -10494,26 +10442,12 @@ ::google::protobuf::Metadata ExecutionStateChangeDetails::GetMetadata() const { // =================================================================== void ExecutionUpdateResponse::InitAsDefaultInstance() { - ::flyteidl::admin::_ExecutionUpdateResponse_default_instance_._instance.get_mutable()->cache_eviction_errors_ = const_cast< ::flyteidl::core::CacheEvictionErrorList*>( - ::flyteidl::core::CacheEvictionErrorList::internal_default_instance()); } class ExecutionUpdateResponse::HasBitSetters { public: - static const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors(const ExecutionUpdateResponse* msg); }; -const ::flyteidl::core::CacheEvictionErrorList& -ExecutionUpdateResponse::HasBitSetters::cache_eviction_errors(const ExecutionUpdateResponse* msg) { - return *msg->cache_eviction_errors_; -} -void ExecutionUpdateResponse::clear_cache_eviction_errors() { - if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { - delete cache_eviction_errors_; - } - cache_eviction_errors_ = nullptr; -} #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ExecutionUpdateResponse::kCacheEvictionErrorsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 ExecutionUpdateResponse::ExecutionUpdateResponse() @@ -10525,18 +10459,10 @@ ExecutionUpdateResponse::ExecutionUpdateResponse(const ExecutionUpdateResponse& : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_cache_eviction_errors()) { - cache_eviction_errors_ = new ::flyteidl::core::CacheEvictionErrorList(*from.cache_eviction_errors_); - } else { - cache_eviction_errors_ = nullptr; - } // @@protoc_insertion_point(copy_constructor:flyteidl.admin.ExecutionUpdateResponse) } void ExecutionUpdateResponse::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_ExecutionUpdateResponse_flyteidl_2fadmin_2fexecution_2eproto.base); - cache_eviction_errors_ = nullptr; } ExecutionUpdateResponse::~ExecutionUpdateResponse() { @@ -10545,7 +10471,6 @@ ExecutionUpdateResponse::~ExecutionUpdateResponse() { } void ExecutionUpdateResponse::SharedDtor() { - if (this != internal_default_instance()) delete cache_eviction_errors_; } void ExecutionUpdateResponse::SetCachedSize(int size) const { @@ -10563,10 +10488,6 @@ void ExecutionUpdateResponse::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { - delete cache_eviction_errors_; - } - cache_eviction_errors_ = nullptr; _internal_metadata_.Clear(); } @@ -10583,21 +10504,7 @@ const char* ExecutionUpdateResponse::_InternalParse(const char* begin, const cha ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::flyteidl::core::CacheEvictionErrorList::_InternalParse; - object = msg->mutable_cache_eviction_errors(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } default: { - handle_unusual: if ((tag & 7) == 4 || tag == 0) { ctx->EndGroup(tag); return ptr; @@ -10611,9 +10518,6 @@ const char* ExecutionUpdateResponse::_InternalParse(const char* begin, const cha } // switch } // while return ptr; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); } #else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool ExecutionUpdateResponse::MergePartialFromCodedStream( @@ -10625,28 +10529,12 @@ bool ExecutionUpdateResponse::MergePartialFromCodedStream( ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_cache_eviction_errors())); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } + handle_unusual: + if (tag == 0) { + goto success; } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); } success: // @@protoc_insertion_point(parse_success:flyteidl.admin.ExecutionUpdateResponse) @@ -10664,12 +10552,6 @@ void ExecutionUpdateResponse::SerializeWithCachedSizes( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - if (this->has_cache_eviction_errors()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::cache_eviction_errors(this), output); - } - if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -10683,13 +10565,6 @@ ::google::protobuf::uint8* ExecutionUpdateResponse::InternalSerializeWithCachedS ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - if (this->has_cache_eviction_errors()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 1, HasBitSetters::cache_eviction_errors(this), target); - } - if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -10711,13 +10586,6 @@ size_t ExecutionUpdateResponse::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - if (this->has_cache_eviction_errors()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *cache_eviction_errors_); - } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -10745,9 +10613,6 @@ void ExecutionUpdateResponse::MergeFrom(const ExecutionUpdateResponse& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - if (from.has_cache_eviction_errors()) { - mutable_cache_eviction_errors()->::flyteidl::core::CacheEvictionErrorList::MergeFrom(from.cache_eviction_errors()); - } } void ExecutionUpdateResponse::CopyFrom(const ::google::protobuf::Message& from) { @@ -10775,7 +10640,6 @@ void ExecutionUpdateResponse::Swap(ExecutionUpdateResponse* other) { void ExecutionUpdateResponse::InternalSwap(ExecutionUpdateResponse* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - swap(cache_eviction_errors_, other->cache_eviction_errors_); } ::google::protobuf::Metadata ExecutionUpdateResponse::GetMetadata() const { diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h index 8c9886c5e1..b333e1c4b1 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/execution.pb.h @@ -35,7 +35,6 @@ #include "flyteidl/admin/cluster_assignment.pb.h" #include "flyteidl/admin/common.pb.h" #include "flyteidl/core/literals.pb.h" -#include "flyteidl/core/errors.pb.h" #include "flyteidl/core/execution.pb.h" #include "flyteidl/core/identifier.pb.h" #include "flyteidl/core/security.pb.h" @@ -3028,12 +3027,6 @@ class ExecutionUpdateRequest final : ::flyteidl::admin::ExecutionState state() const; void set_state(::flyteidl::admin::ExecutionState value); - // bool evict_cache = 3; - void clear_evict_cache(); - static const int kEvictCacheFieldNumber = 3; - bool evict_cache() const; - void set_evict_cache(bool value); - // @@protoc_insertion_point(class_scope:flyteidl.admin.ExecutionUpdateRequest) private: class HasBitSetters; @@ -3041,7 +3034,6 @@ class ExecutionUpdateRequest final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::flyteidl::core::WorkflowExecutionIdentifier* id_; int state_; - bool evict_cache_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fexecution_2eproto; }; @@ -3279,21 +3271,11 @@ class ExecutionUpdateResponse final : // accessors ------------------------------------------------------- - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - bool has_cache_eviction_errors() const; - void clear_cache_eviction_errors(); - static const int kCacheEvictionErrorsFieldNumber = 1; - const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors() const; - ::flyteidl::core::CacheEvictionErrorList* release_cache_eviction_errors(); - ::flyteidl::core::CacheEvictionErrorList* mutable_cache_eviction_errors(); - void set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors); - // @@protoc_insertion_point(class_scope:flyteidl.admin.ExecutionUpdateResponse) private: class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fexecution_2eproto; }; @@ -6416,20 +6398,6 @@ inline void ExecutionUpdateRequest::set_state(::flyteidl::admin::ExecutionState // @@protoc_insertion_point(field_set:flyteidl.admin.ExecutionUpdateRequest.state) } -// bool evict_cache = 3; -inline void ExecutionUpdateRequest::clear_evict_cache() { - evict_cache_ = false; -} -inline bool ExecutionUpdateRequest::evict_cache() const { - // @@protoc_insertion_point(field_get:flyteidl.admin.ExecutionUpdateRequest.evict_cache) - return evict_cache_; -} -inline void ExecutionUpdateRequest::set_evict_cache(bool value) { - - evict_cache_ = value; - // @@protoc_insertion_point(field_set:flyteidl.admin.ExecutionUpdateRequest.evict_cache) -} - // ------------------------------------------------------------------- // ExecutionStateChangeDetails @@ -6551,51 +6519,6 @@ inline void ExecutionStateChangeDetails::set_allocated_principal(::std::string* // ExecutionUpdateResponse -// .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; -inline bool ExecutionUpdateResponse::has_cache_eviction_errors() const { - return this != internal_default_instance() && cache_eviction_errors_ != nullptr; -} -inline const ::flyteidl::core::CacheEvictionErrorList& ExecutionUpdateResponse::cache_eviction_errors() const { - const ::flyteidl::core::CacheEvictionErrorList* p = cache_eviction_errors_; - // @@protoc_insertion_point(field_get:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_CacheEvictionErrorList_default_instance_); -} -inline ::flyteidl::core::CacheEvictionErrorList* ExecutionUpdateResponse::release_cache_eviction_errors() { - // @@protoc_insertion_point(field_release:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) - - ::flyteidl::core::CacheEvictionErrorList* temp = cache_eviction_errors_; - cache_eviction_errors_ = nullptr; - return temp; -} -inline ::flyteidl::core::CacheEvictionErrorList* ExecutionUpdateResponse::mutable_cache_eviction_errors() { - - if (cache_eviction_errors_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::CacheEvictionErrorList>(GetArenaNoVirtual()); - cache_eviction_errors_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) - return cache_eviction_errors_; -} -inline void ExecutionUpdateResponse::set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(cache_eviction_errors_); - } - if (cache_eviction_errors) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - cache_eviction_errors = ::google::protobuf::internal::GetOwnedMessage( - message_arena, cache_eviction_errors, submessage_arena); - } - - } else { - - } - cache_eviction_errors_ = cache_eviction_errors; - // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.ExecutionUpdateResponse.cache_eviction_errors) -} - #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc index a9c93c94c4..f80d895efb 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.cc @@ -20,7 +20,6 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fcommon_2eproto ::google::prot extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fcommon_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_UrlBlob_flyteidl_2fadmin_2fcommon_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2ftask_5fexecution_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecution_flyteidl_2fadmin_2ftask_5fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2ftask_5fexecution_2eproto ::google::protobuf::internal::SCCInfo<7> scc_info_TaskExecutionClosure_flyteidl_2fadmin_2ftask_5fexecution_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_ExecutionError_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_TaskLog_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_NodeExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; @@ -63,14 +62,6 @@ class TaskExecutionGetDataResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _TaskExecutionGetDataResponse_default_instance_; -class TaskExecutionUpdateRequestDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _TaskExecutionUpdateRequest_default_instance_; -class TaskExecutionUpdateResponseDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _TaskExecutionUpdateResponse_default_instance_; } // namespace admin } // namespace flyteidl static void InitDefaultsTaskExecutionGetRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { @@ -187,36 +178,6 @@ ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionGetDataResponse_f &scc_info_UrlBlob_flyteidl_2fadmin_2fcommon_2eproto.base, &scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto.base,}}; -static void InitDefaultsTaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::flyteidl::admin::_TaskExecutionUpdateRequest_default_instance_; - new (ptr) ::flyteidl::admin::TaskExecutionUpdateRequest(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); - } - ::flyteidl::admin::TaskExecutionUpdateRequest::InitAsDefaultInstance(); -} - -::google::protobuf::internal::SCCInfo<1> scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsTaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto}, { - &scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; - -static void InitDefaultsTaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::flyteidl::admin::_TaskExecutionUpdateResponse_default_instance_; - new (ptr) ::flyteidl::admin::TaskExecutionUpdateResponse(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); - } - ::flyteidl::admin::TaskExecutionUpdateResponse::InitAsDefaultInstance(); -} - -::google::protobuf::internal::SCCInfo<1> scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsTaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto}, { - &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}}; - void InitDefaults_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionGetRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionListRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); @@ -225,11 +186,9 @@ void InitDefaults_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionClosure_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionGetDataRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionGetDataResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[9]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[7]; constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto = nullptr; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto = nullptr; @@ -301,19 +260,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2ftask_5fexecution PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionGetDataResponse, outputs_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionGetDataResponse, full_inputs_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionGetDataResponse, full_outputs_), - ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateRequest, _internal_metadata_), - ~0u, // no _extensions_ - ~0u, // no _oneof_case_ - ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateRequest, id_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateRequest, evict_cache_), - ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateResponse, _internal_metadata_), - ~0u, // no _extensions_ - ~0u, // no _oneof_case_ - ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionUpdateResponse, cache_eviction_errors_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::admin::TaskExecutionGetRequest)}, @@ -323,8 +269,6 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 32, -1, sizeof(::flyteidl::admin::TaskExecutionClosure)}, { 52, -1, sizeof(::flyteidl::admin::TaskExecutionGetDataRequest)}, { 58, -1, sizeof(::flyteidl::admin::TaskExecutionGetDataResponse)}, - { 67, -1, sizeof(::flyteidl::admin::TaskExecutionUpdateRequest)}, - { 74, -1, sizeof(::flyteidl::admin::TaskExecutionUpdateResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -335,80 +279,71 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::admin::_TaskExecutionClosure_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionGetDataRequest_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionGetDataResponse_default_instance_), - reinterpret_cast(&::flyteidl::admin::_TaskExecutionUpdateRequest_default_instance_), - reinterpret_cast(&::flyteidl::admin::_TaskExecutionUpdateResponse_default_instance_), }; ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto = { {}, AddDescriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, "flyteidl/admin/task_execution.proto", schemas, file_default_instances, TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto::offsets, - file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 9, file_level_enum_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, + file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 7, file_level_enum_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto, }; const char descriptor_table_protodef_flyteidl_2fadmin_2ftask_5fexecution_2eproto[] = "\n#flyteidl/admin/task_execution.proto\022\016f" "lyteidl.admin\032\033flyteidl/admin/common.pro" - "to\032\032flyteidl/core/errors.proto\032\035flyteidl" - "/core/execution.proto\032\036flyteidl/core/ide" - "ntifier.proto\032\034flyteidl/core/literals.pr" - "oto\032\032flyteidl/event/event.proto\032\037google/" - "protobuf/timestamp.proto\032\036google/protobu" - "f/duration.proto\032\034google/protobuf/struct" - ".proto\"M\n\027TaskExecutionGetRequest\0222\n\002id\030" - "\001 \001(\0132&.flyteidl.core.TaskExecutionIdent" - "ifier\"\263\001\n\030TaskExecutionListRequest\022A\n\021no" - "de_execution_id\030\001 \001(\0132&.flyteidl.core.No" - "deExecutionIdentifier\022\r\n\005limit\030\002 \001(\r\022\r\n\005" - "token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t\022%\n\007sort_by\030" - "\005 \001(\0132\024.flyteidl.admin.Sort\"\240\001\n\rTaskExec" - "ution\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" - "ecutionIdentifier\022\021\n\tinput_uri\030\002 \001(\t\0225\n\007" - "closure\030\003 \001(\0132$.flyteidl.admin.TaskExecu" - "tionClosure\022\021\n\tis_parent\030\004 \001(\010\"Z\n\021TaskEx" - "ecutionList\0226\n\017task_executions\030\001 \003(\0132\035.f" - "lyteidl.admin.TaskExecution\022\r\n\005token\030\002 \001" - "(\t\"\336\004\n\024TaskExecutionClosure\022\030\n\noutput_ur" - "i\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl." - "core.ExecutionErrorH\000\0224\n\013output_data\030\014 \001" - "(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0221\n\005p" - "hase\030\003 \001(\0162\".flyteidl.core.TaskExecution" - ".Phase\022$\n\004logs\030\004 \003(\0132\026.flyteidl.core.Tas" - "kLog\022.\n\nstarted_at\030\005 \001(\0132\032.google.protob" - "uf.Timestamp\022+\n\010duration\030\006 \001(\0132\031.google." - "protobuf.Duration\022.\n\ncreated_at\030\007 \001(\0132\032." - "google.protobuf.Timestamp\022.\n\nupdated_at\030" - "\010 \001(\0132\032.google.protobuf.Timestamp\022,\n\013cus" - "tom_info\030\t \001(\0132\027.google.protobuf.Struct\022" - "\016\n\006reason\030\n \001(\t\022\021\n\ttask_type\030\013 \001(\t\0227\n\010me" - "tadata\030\020 \001(\0132%.flyteidl.event.TaskExecut" - "ionMetadata\022\025\n\revent_version\030\021 \001(\005B\017\n\rou" - "tput_result\"Q\n\033TaskExecutionGetDataReque" - "st\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskExecu" - "tionIdentifier\"\332\001\n\034TaskExecutionGetDataR" - "esponse\022+\n\006inputs\030\001 \001(\0132\027.flyteidl.admin" - ".UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(\0132\027.flyteidl" - ".admin.UrlBlobB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132" - "\031.flyteidl.core.LiteralMap\022/\n\014full_outpu" - "ts\030\004 \001(\0132\031.flyteidl.core.LiteralMap\"e\n\032T" - "askExecutionUpdateRequest\0222\n\002id\030\001 \001(\0132&." - "flyteidl.core.TaskExecutionIdentifier\022\023\n" - "\013evict_cache\030\002 \001(\010\"c\n\033TaskExecutionUpdat" - "eResponse\022D\n\025cache_eviction_errors\030\001 \001(\013" - "2%.flyteidl.core.CacheEvictionErrorListB" - "7Z5github.com/flyteorg/flyteidl/gen/pb-g" - "o/flyteidl/adminb\006proto3" + "to\032\035flyteidl/core/execution.proto\032\036flyte" + "idl/core/identifier.proto\032\034flyteidl/core" + "/literals.proto\032\032flyteidl/event/event.pr" + "oto\032\037google/protobuf/timestamp.proto\032\036go" + "ogle/protobuf/duration.proto\032\034google/pro" + "tobuf/struct.proto\"M\n\027TaskExecutionGetRe" + "quest\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" + "ecutionIdentifier\"\263\001\n\030TaskExecutionListR" + "equest\022A\n\021node_execution_id\030\001 \001(\0132&.flyt" + "eidl.core.NodeExecutionIdentifier\022\r\n\005lim" + "it\030\002 \001(\r\022\r\n\005token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t" + "\022%\n\007sort_by\030\005 \001(\0132\024.flyteidl.admin.Sort\"" + "\240\001\n\rTaskExecution\0222\n\002id\030\001 \001(\0132&.flyteidl" + ".core.TaskExecutionIdentifier\022\021\n\tinput_u" + "ri\030\002 \001(\t\0225\n\007closure\030\003 \001(\0132$.flyteidl.adm" + "in.TaskExecutionClosure\022\021\n\tis_parent\030\004 \001" + "(\010\"Z\n\021TaskExecutionList\0226\n\017task_executio" + "ns\030\001 \003(\0132\035.flyteidl.admin.TaskExecution\022" + "\r\n\005token\030\002 \001(\t\"\336\004\n\024TaskExecutionClosure\022" + "\030\n\noutput_uri\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\013" + "2\035.flyteidl.core.ExecutionErrorH\000\0224\n\013out" + "put_data\030\014 \001(\0132\031.flyteidl.core.LiteralMa" + "pB\002\030\001H\000\0221\n\005phase\030\003 \001(\0162\".flyteidl.core.T" + "askExecution.Phase\022$\n\004logs\030\004 \003(\0132\026.flyte" + "idl.core.TaskLog\022.\n\nstarted_at\030\005 \001(\0132\032.g" + "oogle.protobuf.Timestamp\022+\n\010duration\030\006 \001" + "(\0132\031.google.protobuf.Duration\022.\n\ncreated" + "_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022.\n" + "\nupdated_at\030\010 \001(\0132\032.google.protobuf.Time" + "stamp\022,\n\013custom_info\030\t \001(\0132\027.google.prot" + "obuf.Struct\022\016\n\006reason\030\n \001(\t\022\021\n\ttask_type" + "\030\013 \001(\t\0227\n\010metadata\030\020 \001(\0132%.flyteidl.even" + "t.TaskExecutionMetadata\022\025\n\revent_version" + "\030\021 \001(\005B\017\n\routput_result\"Q\n\033TaskExecution" + "GetDataRequest\0222\n\002id\030\001 \001(\0132&.flyteidl.co" + "re.TaskExecutionIdentifier\"\332\001\n\034TaskExecu" + "tionGetDataResponse\022+\n\006inputs\030\001 \001(\0132\027.fl" + "yteidl.admin.UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(" + "\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013full_i" + "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMap\022/" + "\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core.Lit" + "eralMapB7Z5github.com/flyteorg/flyteidl/" + "gen/pb-go/flyteidl/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto = { false, InitDefaults_flyteidl_2fadmin_2ftask_5fexecution_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2ftask_5fexecution_2eproto, - "flyteidl/admin/task_execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 2024, + "flyteidl/admin/task_execution.proto", &assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, 1792, }; void AddDescriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[9] = + static constexpr ::google::protobuf::internal::InitFunc deps[8] = { ::AddDescriptors_flyteidl_2fadmin_2fcommon_2eproto, - ::AddDescriptors_flyteidl_2fcore_2ferrors_2eproto, ::AddDescriptors_flyteidl_2fcore_2fexecution_2eproto, ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, ::AddDescriptors_flyteidl_2fcore_2fliterals_2eproto, @@ -417,7 +352,7 @@ void AddDescriptors_flyteidl_2fadmin_2ftask_5fexecution_2eproto() { ::AddDescriptors_google_2fprotobuf_2fduration_2eproto, ::AddDescriptors_google_2fprotobuf_2fstruct_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, deps, 9); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto, deps, 8); } // Force running AddDescriptors() at dynamic initialization time. @@ -4157,636 +4092,6 @@ ::google::protobuf::Metadata TaskExecutionGetDataResponse::GetMetadata() const { } -// =================================================================== - -void TaskExecutionUpdateRequest::InitAsDefaultInstance() { - ::flyteidl::admin::_TaskExecutionUpdateRequest_default_instance_._instance.get_mutable()->id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( - ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); -} -class TaskExecutionUpdateRequest::HasBitSetters { - public: - static const ::flyteidl::core::TaskExecutionIdentifier& id(const TaskExecutionUpdateRequest* msg); -}; - -const ::flyteidl::core::TaskExecutionIdentifier& -TaskExecutionUpdateRequest::HasBitSetters::id(const TaskExecutionUpdateRequest* msg) { - return *msg->id_; -} -void TaskExecutionUpdateRequest::clear_id() { - if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { - delete id_; - } - id_ = nullptr; -} -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int TaskExecutionUpdateRequest::kIdFieldNumber; -const int TaskExecutionUpdateRequest::kEvictCacheFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - -TaskExecutionUpdateRequest::TaskExecutionUpdateRequest() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { - SharedCtor(); - // @@protoc_insertion_point(constructor:flyteidl.admin.TaskExecutionUpdateRequest) -} -TaskExecutionUpdateRequest::TaskExecutionUpdateRequest(const TaskExecutionUpdateRequest& from) - : ::google::protobuf::Message(), - _internal_metadata_(nullptr) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_id()) { - id_ = new ::flyteidl::core::TaskExecutionIdentifier(*from.id_); - } else { - id_ = nullptr; - } - evict_cache_ = from.evict_cache_; - // @@protoc_insertion_point(copy_constructor:flyteidl.admin.TaskExecutionUpdateRequest) -} - -void TaskExecutionUpdateRequest::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); - ::memset(&id_, 0, static_cast( - reinterpret_cast(&evict_cache_) - - reinterpret_cast(&id_)) + sizeof(evict_cache_)); -} - -TaskExecutionUpdateRequest::~TaskExecutionUpdateRequest() { - // @@protoc_insertion_point(destructor:flyteidl.admin.TaskExecutionUpdateRequest) - SharedDtor(); -} - -void TaskExecutionUpdateRequest::SharedDtor() { - if (this != internal_default_instance()) delete id_; -} - -void TaskExecutionUpdateRequest::SetCachedSize(int size) const { - _cached_size_.Set(size); -} -const TaskExecutionUpdateRequest& TaskExecutionUpdateRequest::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_TaskExecutionUpdateRequest_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); - return *internal_default_instance(); -} - - -void TaskExecutionUpdateRequest::Clear() { -// @@protoc_insertion_point(message_clear_start:flyteidl.admin.TaskExecutionUpdateRequest) - ::google::protobuf::uint32 cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { - delete id_; - } - id_ = nullptr; - evict_cache_ = false; - _internal_metadata_.Clear(); -} - -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* TaskExecutionUpdateRequest::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - switch (tag >> 3) { - // .flyteidl.core.TaskExecutionIdentifier id = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::flyteidl::core::TaskExecutionIdentifier::_InternalParse; - object = msg->mutable_id(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } - // bool evict_cache = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; - msg->set_evict_cache(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } - default: { - handle_unusual: - if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; - } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; - } - } // switch - } // while - return ptr; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool TaskExecutionUpdateRequest::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:flyteidl.admin.TaskExecutionUpdateRequest) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.core.TaskExecutionIdentifier id = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_id())); - } else { - goto handle_unusual; - } - break; - } - - // bool evict_cache = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &evict_cache_))); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:flyteidl.admin.TaskExecutionUpdateRequest) - return true; -failure: - // @@protoc_insertion_point(parse_failure:flyteidl.admin.TaskExecutionUpdateRequest) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void TaskExecutionUpdateRequest::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:flyteidl.admin.TaskExecutionUpdateRequest) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .flyteidl.core.TaskExecutionIdentifier id = 1; - if (this->has_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::id(this), output); - } - - // bool evict_cache = 2; - if (this->evict_cache() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->evict_cache(), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:flyteidl.admin.TaskExecutionUpdateRequest) -} - -::google::protobuf::uint8* TaskExecutionUpdateRequest::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.TaskExecutionUpdateRequest) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .flyteidl.core.TaskExecutionIdentifier id = 1; - if (this->has_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 1, HasBitSetters::id(this), target); - } - - // bool evict_cache = 2; - if (this->evict_cache() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->evict_cache(), target); - } - - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); - } - // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.TaskExecutionUpdateRequest) - return target; -} - -size_t TaskExecutionUpdateRequest::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.TaskExecutionUpdateRequest) - size_t total_size = 0; - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - // .flyteidl.core.TaskExecutionIdentifier id = 1; - if (this->has_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *id_); - } - - // bool evict_cache = 2; - if (this->evict_cache() != 0) { - total_size += 1 + 1; - } - - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; -} - -void TaskExecutionUpdateRequest::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.TaskExecutionUpdateRequest) - GOOGLE_DCHECK_NE(&from, this); - const TaskExecutionUpdateRequest* source = - ::google::protobuf::DynamicCastToGenerated( - &from); - if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.TaskExecutionUpdateRequest) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.TaskExecutionUpdateRequest) - MergeFrom(*source); - } -} - -void TaskExecutionUpdateRequest::MergeFrom(const TaskExecutionUpdateRequest& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.TaskExecutionUpdateRequest) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - if (from.has_id()) { - mutable_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.id()); - } - if (from.evict_cache() != 0) { - set_evict_cache(from.evict_cache()); - } -} - -void TaskExecutionUpdateRequest::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.TaskExecutionUpdateRequest) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -void TaskExecutionUpdateRequest::CopyFrom(const TaskExecutionUpdateRequest& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.TaskExecutionUpdateRequest) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool TaskExecutionUpdateRequest::IsInitialized() const { - return true; -} - -void TaskExecutionUpdateRequest::Swap(TaskExecutionUpdateRequest* other) { - if (other == this) return; - InternalSwap(other); -} -void TaskExecutionUpdateRequest::InternalSwap(TaskExecutionUpdateRequest* other) { - using std::swap; - _internal_metadata_.Swap(&other->_internal_metadata_); - swap(id_, other->id_); - swap(evict_cache_, other->evict_cache_); -} - -::google::protobuf::Metadata TaskExecutionUpdateRequest::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto); - return ::file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[kIndexInFileMessages]; -} - - -// =================================================================== - -void TaskExecutionUpdateResponse::InitAsDefaultInstance() { - ::flyteidl::admin::_TaskExecutionUpdateResponse_default_instance_._instance.get_mutable()->cache_eviction_errors_ = const_cast< ::flyteidl::core::CacheEvictionErrorList*>( - ::flyteidl::core::CacheEvictionErrorList::internal_default_instance()); -} -class TaskExecutionUpdateResponse::HasBitSetters { - public: - static const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors(const TaskExecutionUpdateResponse* msg); -}; - -const ::flyteidl::core::CacheEvictionErrorList& -TaskExecutionUpdateResponse::HasBitSetters::cache_eviction_errors(const TaskExecutionUpdateResponse* msg) { - return *msg->cache_eviction_errors_; -} -void TaskExecutionUpdateResponse::clear_cache_eviction_errors() { - if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { - delete cache_eviction_errors_; - } - cache_eviction_errors_ = nullptr; -} -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int TaskExecutionUpdateResponse::kCacheEvictionErrorsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - -TaskExecutionUpdateResponse::TaskExecutionUpdateResponse() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { - SharedCtor(); - // @@protoc_insertion_point(constructor:flyteidl.admin.TaskExecutionUpdateResponse) -} -TaskExecutionUpdateResponse::TaskExecutionUpdateResponse(const TaskExecutionUpdateResponse& from) - : ::google::protobuf::Message(), - _internal_metadata_(nullptr) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_cache_eviction_errors()) { - cache_eviction_errors_ = new ::flyteidl::core::CacheEvictionErrorList(*from.cache_eviction_errors_); - } else { - cache_eviction_errors_ = nullptr; - } - // @@protoc_insertion_point(copy_constructor:flyteidl.admin.TaskExecutionUpdateResponse) -} - -void TaskExecutionUpdateResponse::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); - cache_eviction_errors_ = nullptr; -} - -TaskExecutionUpdateResponse::~TaskExecutionUpdateResponse() { - // @@protoc_insertion_point(destructor:flyteidl.admin.TaskExecutionUpdateResponse) - SharedDtor(); -} - -void TaskExecutionUpdateResponse::SharedDtor() { - if (this != internal_default_instance()) delete cache_eviction_errors_; -} - -void TaskExecutionUpdateResponse::SetCachedSize(int size) const { - _cached_size_.Set(size); -} -const TaskExecutionUpdateResponse& TaskExecutionUpdateResponse::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_TaskExecutionUpdateResponse_flyteidl_2fadmin_2ftask_5fexecution_2eproto.base); - return *internal_default_instance(); -} - - -void TaskExecutionUpdateResponse::Clear() { -// @@protoc_insertion_point(message_clear_start:flyteidl.admin.TaskExecutionUpdateResponse) - ::google::protobuf::uint32 cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - if (GetArenaNoVirtual() == nullptr && cache_eviction_errors_ != nullptr) { - delete cache_eviction_errors_; - } - cache_eviction_errors_ = nullptr; - _internal_metadata_.Clear(); -} - -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* TaskExecutionUpdateResponse::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - switch (tag >> 3) { - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::flyteidl::core::CacheEvictionErrorList::_InternalParse; - object = msg->mutable_cache_eviction_errors(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } - default: { - handle_unusual: - if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; - } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; - } - } // switch - } // while - return ptr; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool TaskExecutionUpdateResponse::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:flyteidl.admin.TaskExecutionUpdateResponse) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_cache_eviction_errors())); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:flyteidl.admin.TaskExecutionUpdateResponse) - return true; -failure: - // @@protoc_insertion_point(parse_failure:flyteidl.admin.TaskExecutionUpdateResponse) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void TaskExecutionUpdateResponse::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:flyteidl.admin.TaskExecutionUpdateResponse) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - if (this->has_cache_eviction_errors()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::cache_eviction_errors(this), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:flyteidl.admin.TaskExecutionUpdateResponse) -} - -::google::protobuf::uint8* TaskExecutionUpdateResponse::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.TaskExecutionUpdateResponse) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - if (this->has_cache_eviction_errors()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 1, HasBitSetters::cache_eviction_errors(this), target); - } - - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); - } - // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.TaskExecutionUpdateResponse) - return target; -} - -size_t TaskExecutionUpdateResponse::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.TaskExecutionUpdateResponse) - size_t total_size = 0; - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - if (this->has_cache_eviction_errors()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *cache_eviction_errors_); - } - - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; -} - -void TaskExecutionUpdateResponse::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.TaskExecutionUpdateResponse) - GOOGLE_DCHECK_NE(&from, this); - const TaskExecutionUpdateResponse* source = - ::google::protobuf::DynamicCastToGenerated( - &from); - if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.TaskExecutionUpdateResponse) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.TaskExecutionUpdateResponse) - MergeFrom(*source); - } -} - -void TaskExecutionUpdateResponse::MergeFrom(const TaskExecutionUpdateResponse& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.TaskExecutionUpdateResponse) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - if (from.has_cache_eviction_errors()) { - mutable_cache_eviction_errors()->::flyteidl::core::CacheEvictionErrorList::MergeFrom(from.cache_eviction_errors()); - } -} - -void TaskExecutionUpdateResponse::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.TaskExecutionUpdateResponse) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -void TaskExecutionUpdateResponse::CopyFrom(const TaskExecutionUpdateResponse& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.TaskExecutionUpdateResponse) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool TaskExecutionUpdateResponse::IsInitialized() const { - return true; -} - -void TaskExecutionUpdateResponse::Swap(TaskExecutionUpdateResponse* other) { - if (other == this) return; - InternalSwap(other); -} -void TaskExecutionUpdateResponse::InternalSwap(TaskExecutionUpdateResponse* other) { - using std::swap; - _internal_metadata_.Swap(&other->_internal_metadata_); - swap(cache_eviction_errors_, other->cache_eviction_errors_); -} - -::google::protobuf::Metadata TaskExecutionUpdateResponse::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2ftask_5fexecution_2eproto); - return ::file_level_metadata_flyteidl_2fadmin_2ftask_5fexecution_2eproto[kIndexInFileMessages]; -} - - // @@protoc_insertion_point(namespace_scope) } // namespace admin } // namespace flyteidl @@ -4813,12 +4118,6 @@ template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionGetDataRequest* Are template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionGetDataResponse* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionGetDataResponse >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionGetDataResponse >(arena); } -template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionUpdateRequest* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionUpdateRequest >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionUpdateRequest >(arena); -} -template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionUpdateResponse* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionUpdateResponse >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionUpdateResponse >(arena); -} } // namespace protobuf } // namespace google diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h index 99d9dc6b46..32c81855f9 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/task_execution.pb.h @@ -32,7 +32,6 @@ #include // IWYU pragma: export #include #include "flyteidl/admin/common.pb.h" -#include "flyteidl/core/errors.pb.h" #include "flyteidl/core/execution.pb.h" #include "flyteidl/core/identifier.pb.h" #include "flyteidl/core/literals.pb.h" @@ -50,7 +49,7 @@ struct TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[9] + static const ::google::protobuf::internal::ParseTable schema[7] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -80,12 +79,6 @@ extern TaskExecutionListDefaultTypeInternal _TaskExecutionList_default_instance_ class TaskExecutionListRequest; class TaskExecutionListRequestDefaultTypeInternal; extern TaskExecutionListRequestDefaultTypeInternal _TaskExecutionListRequest_default_instance_; -class TaskExecutionUpdateRequest; -class TaskExecutionUpdateRequestDefaultTypeInternal; -extern TaskExecutionUpdateRequestDefaultTypeInternal _TaskExecutionUpdateRequest_default_instance_; -class TaskExecutionUpdateResponse; -class TaskExecutionUpdateResponseDefaultTypeInternal; -extern TaskExecutionUpdateResponseDefaultTypeInternal _TaskExecutionUpdateResponse_default_instance_; } // namespace admin } // namespace flyteidl namespace google { @@ -97,8 +90,6 @@ template<> ::flyteidl::admin::TaskExecutionGetDataResponse* Arena::CreateMaybeMe template<> ::flyteidl::admin::TaskExecutionGetRequest* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionGetRequest>(Arena*); template<> ::flyteidl::admin::TaskExecutionList* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionList>(Arena*); template<> ::flyteidl::admin::TaskExecutionListRequest* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionListRequest>(Arena*); -template<> ::flyteidl::admin::TaskExecutionUpdateRequest* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionUpdateRequest>(Arena*); -template<> ::flyteidl::admin::TaskExecutionUpdateResponse* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionUpdateResponse>(Arena*); } // namespace protobuf } // namespace google namespace flyteidl { @@ -1201,243 +1192,6 @@ class TaskExecutionGetDataResponse final : mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto; }; -// ------------------------------------------------------------------- - -class TaskExecutionUpdateRequest final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.TaskExecutionUpdateRequest) */ { - public: - TaskExecutionUpdateRequest(); - virtual ~TaskExecutionUpdateRequest(); - - TaskExecutionUpdateRequest(const TaskExecutionUpdateRequest& from); - - inline TaskExecutionUpdateRequest& operator=(const TaskExecutionUpdateRequest& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 - TaskExecutionUpdateRequest(TaskExecutionUpdateRequest&& from) noexcept - : TaskExecutionUpdateRequest() { - *this = ::std::move(from); - } - - inline TaskExecutionUpdateRequest& operator=(TaskExecutionUpdateRequest&& from) noexcept { - if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { - if (this != &from) InternalSwap(&from); - } else { - CopyFrom(from); - } - return *this; - } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); - } - static const TaskExecutionUpdateRequest& default_instance(); - - static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY - static inline const TaskExecutionUpdateRequest* internal_default_instance() { - return reinterpret_cast( - &_TaskExecutionUpdateRequest_default_instance_); - } - static constexpr int kIndexInFileMessages = - 7; - - void Swap(TaskExecutionUpdateRequest* other); - friend void swap(TaskExecutionUpdateRequest& a, TaskExecutionUpdateRequest& b) { - a.Swap(&b); - } - - // implements Message ---------------------------------------------- - - inline TaskExecutionUpdateRequest* New() const final { - return CreateMaybeMessage(nullptr); - } - - TaskExecutionUpdateRequest* New(::google::protobuf::Arena* arena) const final { - return CreateMaybeMessage(arena); - } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; - void CopyFrom(const TaskExecutionUpdateRequest& from); - void MergeFrom(const TaskExecutionUpdateRequest& from); - PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; - bool IsInitialized() const final; - - size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; - int GetCachedSize() const final { return _cached_size_.Get(); } - - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const final; - void InternalSwap(TaskExecutionUpdateRequest* other); - private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return nullptr; - } - inline void* MaybeArenaPtr() const { - return nullptr; - } - public: - - ::google::protobuf::Metadata GetMetadata() const final; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // .flyteidl.core.TaskExecutionIdentifier id = 1; - bool has_id() const; - void clear_id(); - static const int kIdFieldNumber = 1; - const ::flyteidl::core::TaskExecutionIdentifier& id() const; - ::flyteidl::core::TaskExecutionIdentifier* release_id(); - ::flyteidl::core::TaskExecutionIdentifier* mutable_id(); - void set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id); - - // bool evict_cache = 2; - void clear_evict_cache(); - static const int kEvictCacheFieldNumber = 2; - bool evict_cache() const; - void set_evict_cache(bool value); - - // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateRequest) - private: - class HasBitSetters; - - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::flyteidl::core::TaskExecutionIdentifier* id_; - bool evict_cache_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto; -}; -// ------------------------------------------------------------------- - -class TaskExecutionUpdateResponse final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.TaskExecutionUpdateResponse) */ { - public: - TaskExecutionUpdateResponse(); - virtual ~TaskExecutionUpdateResponse(); - - TaskExecutionUpdateResponse(const TaskExecutionUpdateResponse& from); - - inline TaskExecutionUpdateResponse& operator=(const TaskExecutionUpdateResponse& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 - TaskExecutionUpdateResponse(TaskExecutionUpdateResponse&& from) noexcept - : TaskExecutionUpdateResponse() { - *this = ::std::move(from); - } - - inline TaskExecutionUpdateResponse& operator=(TaskExecutionUpdateResponse&& from) noexcept { - if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { - if (this != &from) InternalSwap(&from); - } else { - CopyFrom(from); - } - return *this; - } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); - } - static const TaskExecutionUpdateResponse& default_instance(); - - static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY - static inline const TaskExecutionUpdateResponse* internal_default_instance() { - return reinterpret_cast( - &_TaskExecutionUpdateResponse_default_instance_); - } - static constexpr int kIndexInFileMessages = - 8; - - void Swap(TaskExecutionUpdateResponse* other); - friend void swap(TaskExecutionUpdateResponse& a, TaskExecutionUpdateResponse& b) { - a.Swap(&b); - } - - // implements Message ---------------------------------------------- - - inline TaskExecutionUpdateResponse* New() const final { - return CreateMaybeMessage(nullptr); - } - - TaskExecutionUpdateResponse* New(::google::protobuf::Arena* arena) const final { - return CreateMaybeMessage(arena); - } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; - void CopyFrom(const TaskExecutionUpdateResponse& from); - void MergeFrom(const TaskExecutionUpdateResponse& from); - PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; - bool IsInitialized() const final; - - size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; - int GetCachedSize() const final { return _cached_size_.Get(); } - - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const final; - void InternalSwap(TaskExecutionUpdateResponse* other); - private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return nullptr; - } - inline void* MaybeArenaPtr() const { - return nullptr; - } - public: - - ::google::protobuf::Metadata GetMetadata() const final; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - bool has_cache_eviction_errors() const; - void clear_cache_eviction_errors(); - static const int kCacheEvictionErrorsFieldNumber = 1; - const ::flyteidl::core::CacheEvictionErrorList& cache_eviction_errors() const; - ::flyteidl::core::CacheEvictionErrorList* release_cache_eviction_errors(); - ::flyteidl::core::CacheEvictionErrorList* mutable_cache_eviction_errors(); - void set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors); - - // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateResponse) - private: - class HasBitSetters; - - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::TableStruct_flyteidl_2fadmin_2ftask_5fexecution_2eproto; -}; // =================================================================== @@ -2806,118 +2560,6 @@ inline void TaskExecutionGetDataResponse::set_allocated_full_outputs(::flyteidl: // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.TaskExecutionGetDataResponse.full_outputs) } -// ------------------------------------------------------------------- - -// TaskExecutionUpdateRequest - -// .flyteidl.core.TaskExecutionIdentifier id = 1; -inline bool TaskExecutionUpdateRequest::has_id() const { - return this != internal_default_instance() && id_ != nullptr; -} -inline const ::flyteidl::core::TaskExecutionIdentifier& TaskExecutionUpdateRequest::id() const { - const ::flyteidl::core::TaskExecutionIdentifier* p = id_; - // @@protoc_insertion_point(field_get:flyteidl.admin.TaskExecutionUpdateRequest.id) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_TaskExecutionIdentifier_default_instance_); -} -inline ::flyteidl::core::TaskExecutionIdentifier* TaskExecutionUpdateRequest::release_id() { - // @@protoc_insertion_point(field_release:flyteidl.admin.TaskExecutionUpdateRequest.id) - - ::flyteidl::core::TaskExecutionIdentifier* temp = id_; - id_ = nullptr; - return temp; -} -inline ::flyteidl::core::TaskExecutionIdentifier* TaskExecutionUpdateRequest::mutable_id() { - - if (id_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::TaskExecutionIdentifier>(GetArenaNoVirtual()); - id_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.admin.TaskExecutionUpdateRequest.id) - return id_; -} -inline void TaskExecutionUpdateRequest::set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(id_); - } - if (id) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - id = ::google::protobuf::internal::GetOwnedMessage( - message_arena, id, submessage_arena); - } - - } else { - - } - id_ = id; - // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.TaskExecutionUpdateRequest.id) -} - -// bool evict_cache = 2; -inline void TaskExecutionUpdateRequest::clear_evict_cache() { - evict_cache_ = false; -} -inline bool TaskExecutionUpdateRequest::evict_cache() const { - // @@protoc_insertion_point(field_get:flyteidl.admin.TaskExecutionUpdateRequest.evict_cache) - return evict_cache_; -} -inline void TaskExecutionUpdateRequest::set_evict_cache(bool value) { - - evict_cache_ = value; - // @@protoc_insertion_point(field_set:flyteidl.admin.TaskExecutionUpdateRequest.evict_cache) -} - -// ------------------------------------------------------------------- - -// TaskExecutionUpdateResponse - -// .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; -inline bool TaskExecutionUpdateResponse::has_cache_eviction_errors() const { - return this != internal_default_instance() && cache_eviction_errors_ != nullptr; -} -inline const ::flyteidl::core::CacheEvictionErrorList& TaskExecutionUpdateResponse::cache_eviction_errors() const { - const ::flyteidl::core::CacheEvictionErrorList* p = cache_eviction_errors_; - // @@protoc_insertion_point(field_get:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_CacheEvictionErrorList_default_instance_); -} -inline ::flyteidl::core::CacheEvictionErrorList* TaskExecutionUpdateResponse::release_cache_eviction_errors() { - // @@protoc_insertion_point(field_release:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) - - ::flyteidl::core::CacheEvictionErrorList* temp = cache_eviction_errors_; - cache_eviction_errors_ = nullptr; - return temp; -} -inline ::flyteidl::core::CacheEvictionErrorList* TaskExecutionUpdateResponse::mutable_cache_eviction_errors() { - - if (cache_eviction_errors_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::CacheEvictionErrorList>(GetArenaNoVirtual()); - cache_eviction_errors_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) - return cache_eviction_errors_; -} -inline void TaskExecutionUpdateResponse::set_allocated_cache_eviction_errors(::flyteidl::core::CacheEvictionErrorList* cache_eviction_errors) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(cache_eviction_errors_); - } - if (cache_eviction_errors) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - cache_eviction_errors = ::google::protobuf::internal::GetOwnedMessage( - message_arena, cache_eviction_errors, submessage_arena); - } - - } else { - - } - cache_eviction_errors_ = cache_eviction_errors; - // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.TaskExecutionUpdateResponse.cache_eviction_errors) -} - #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ @@ -2933,10 +2575,6 @@ inline void TaskExecutionUpdateResponse::set_allocated_cache_eviction_errors(::f // ------------------------------------------------------------------- -// ------------------------------------------------------------------- - -// ------------------------------------------------------------------- - // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc index 295f6c569a..e3d019e881 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.cc @@ -56,7 +56,6 @@ static const char* AdminService_method_names[] = { "/flyteidl.service.AdminService/GetTaskExecution", "/flyteidl.service.AdminService/ListTaskExecutions", "/flyteidl.service.AdminService/GetTaskExecutionData", - "/flyteidl.service.AdminService/UpdateTaskExecution", "/flyteidl.service.AdminService/UpdateProjectDomainAttributes", "/flyteidl.service.AdminService/GetProjectDomainAttributes", "/flyteidl.service.AdminService/DeleteProjectDomainAttributes", @@ -118,23 +117,22 @@ AdminService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& chann , rpcmethod_GetTaskExecution_(AdminService_method_names[33], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_ListTaskExecutions_(AdminService_method_names[34], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_GetTaskExecutionData_(AdminService_method_names[35], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateTaskExecution_(AdminService_method_names[36], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateProjectDomainAttributes_(AdminService_method_names[37], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetProjectDomainAttributes_(AdminService_method_names[38], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_DeleteProjectDomainAttributes_(AdminService_method_names[39], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateProjectAttributes_(AdminService_method_names[40], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetProjectAttributes_(AdminService_method_names[41], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_DeleteProjectAttributes_(AdminService_method_names[42], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateWorkflowAttributes_(AdminService_method_names[43], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetWorkflowAttributes_(AdminService_method_names[44], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_DeleteWorkflowAttributes_(AdminService_method_names[45], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ListMatchableAttributes_(AdminService_method_names[46], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ListNamedEntities_(AdminService_method_names[47], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetNamedEntity_(AdminService_method_names[48], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_UpdateNamedEntity_(AdminService_method_names[49], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetVersion_(AdminService_method_names[50], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetDescriptionEntity_(AdminService_method_names[51], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ListDescriptionEntities_(AdminService_method_names[52], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateProjectDomainAttributes_(AdminService_method_names[36], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetProjectDomainAttributes_(AdminService_method_names[37], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteProjectDomainAttributes_(AdminService_method_names[38], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateProjectAttributes_(AdminService_method_names[39], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetProjectAttributes_(AdminService_method_names[40], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteProjectAttributes_(AdminService_method_names[41], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateWorkflowAttributes_(AdminService_method_names[42], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetWorkflowAttributes_(AdminService_method_names[43], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteWorkflowAttributes_(AdminService_method_names[44], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListMatchableAttributes_(AdminService_method_names[45], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListNamedEntities_(AdminService_method_names[46], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetNamedEntity_(AdminService_method_names[47], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_UpdateNamedEntity_(AdminService_method_names[48], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetVersion_(AdminService_method_names[49], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetDescriptionEntity_(AdminService_method_names[50], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListDescriptionEntities_(AdminService_method_names[51], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} ::grpc::Status AdminService::Stub::CreateTask(::grpc::ClientContext* context, const ::flyteidl::admin::TaskCreateRequest& request, ::flyteidl::admin::TaskCreateResponse* response) { @@ -1145,34 +1143,6 @@ ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataRespon return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::TaskExecutionGetDataResponse>::Create(channel_.get(), cq, rpcmethod_GetTaskExecutionData_, context, request, false); } -::grpc::Status AdminService::Stub::UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) { - return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_UpdateTaskExecution_, context, request, response); -} - -void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, std::move(f)); -} - -void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, std::move(f)); -} - -void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, reactor); -} - -void AdminService::Stub::experimental_async::UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_UpdateTaskExecution_, context, request, response, reactor); -} - -::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* AdminService::Stub::AsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::TaskExecutionUpdateResponse>::Create(channel_.get(), cq, rpcmethod_UpdateTaskExecution_, context, request, true); -} - -::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* AdminService::Stub::PrepareAsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::TaskExecutionUpdateResponse>::Create(channel_.get(), cq, rpcmethod_UpdateTaskExecution_, context, request, false); -} - ::grpc::Status AdminService::Stub::UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) { return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_UpdateProjectDomainAttributes_, context, request, response); } @@ -1805,85 +1775,80 @@ AdminService::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( AdminService_method_names[36], ::grpc::internal::RpcMethod::NORMAL_RPC, - new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>( - std::mem_fn(&AdminService::Service::UpdateTaskExecution), this))); - AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[37], - ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateProjectDomainAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[38], + AdminService_method_names[37], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>( std::mem_fn(&AdminService::Service::GetProjectDomainAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[39], + AdminService_method_names[38], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>( std::mem_fn(&AdminService::Service::DeleteProjectDomainAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[40], + AdminService_method_names[39], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateProjectAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[41], + AdminService_method_names[40], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>( std::mem_fn(&AdminService::Service::GetProjectAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[42], + AdminService_method_names[41], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>( std::mem_fn(&AdminService::Service::DeleteProjectAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[43], + AdminService_method_names[42], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateWorkflowAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[44], + AdminService_method_names[43], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>( std::mem_fn(&AdminService::Service::GetWorkflowAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[45], + AdminService_method_names[44], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>( std::mem_fn(&AdminService::Service::DeleteWorkflowAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[46], + AdminService_method_names[45], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>( std::mem_fn(&AdminService::Service::ListMatchableAttributes), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[47], + AdminService_method_names[46], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>( std::mem_fn(&AdminService::Service::ListNamedEntities), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[48], + AdminService_method_names[47], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>( std::mem_fn(&AdminService::Service::GetNamedEntity), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[49], + AdminService_method_names[48], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>( std::mem_fn(&AdminService::Service::UpdateNamedEntity), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[50], + AdminService_method_names[49], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>( std::mem_fn(&AdminService::Service::GetVersion), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[51], + AdminService_method_names[50], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>( std::mem_fn(&AdminService::Service::GetDescriptionEntity), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - AdminService_method_names[52], + AdminService_method_names[51], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AdminService::Service, ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>( std::mem_fn(&AdminService::Service::ListDescriptionEntities), this))); @@ -2144,13 +2109,6 @@ ::grpc::Status AdminService::Service::GetTaskExecutionData(::grpc::ServerContext return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } -::grpc::Status AdminService::Service::UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) { - (void) context; - (void) request; - (void) response; - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); -} - ::grpc::Status AdminService::Service::UpdateProjectDomainAttributes(::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) { (void) context; (void) request; diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h index 6eb63a088b..57ff8aa599 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.grpc.pb.h @@ -344,14 +344,6 @@ class AdminService final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>> PrepareAsyncGetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>>(PrepareAsyncGetTaskExecutionDataRaw(context, request, cq)); } - // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>> AsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>>(AsyncUpdateTaskExecutionRaw(context, request, cq)); - } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>> PrepareAsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>>(PrepareAsyncUpdateTaskExecutionRaw(context, request, cq)); - } // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. virtual ::grpc::Status UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) = 0; std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>> AsyncUpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) { @@ -668,11 +660,6 @@ class AdminService final { virtual void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, std::function) = 0; virtual void GetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; - // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) = 0; - virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) = 0; - virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; - virtual void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. virtual void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) = 0; virtual void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) = 0; @@ -827,8 +814,6 @@ class AdminService final { virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionList>* PrepareAsyncListTaskExecutionsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionListRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>* AsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionGetDataResponse>* PrepareAsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>* AsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::TaskExecutionUpdateResponse>* PrepareAsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* AsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* PrepareAsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ProjectDomainAttributesGetResponse>* AsyncGetProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesGetRequest& request, ::grpc::CompletionQueue* cq) = 0; @@ -1117,13 +1102,6 @@ class AdminService final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>> PrepareAsyncGetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>>(PrepareAsyncGetTaskExecutionDataRaw(context, request, cq)); } - ::grpc::Status UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>> AsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>>(AsyncUpdateTaskExecutionRaw(context, request, cq)); - } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>> PrepareAsyncUpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>>(PrepareAsyncUpdateTaskExecutionRaw(context, request, cq)); - } ::grpc::Status UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response) override; std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>> AsyncUpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>>(AsyncUpdateProjectDomainAttributesRaw(context, request, cq)); @@ -1383,10 +1361,6 @@ class AdminService final { void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, std::function) override; void GetTaskExecutionData(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void GetTaskExecutionData(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) override; - void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, std::function) override; - void UpdateTaskExecution(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void UpdateTaskExecution(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) override; void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, std::function) override; void UpdateProjectDomainAttributes(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; @@ -1534,8 +1508,6 @@ class AdminService final { ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionList>* PrepareAsyncListTaskExecutionsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionListRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>* AsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionGetDataResponse>* PrepareAsyncGetTaskExecutionDataRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* AsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::TaskExecutionUpdateResponse>* PrepareAsyncUpdateTaskExecutionRaw(::grpc::ClientContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* AsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* PrepareAsyncUpdateProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ProjectDomainAttributesGetResponse>* AsyncGetProjectDomainAttributesRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ProjectDomainAttributesGetRequest& request, ::grpc::CompletionQueue* cq) override; @@ -1604,7 +1576,6 @@ class AdminService final { const ::grpc::internal::RpcMethod rpcmethod_GetTaskExecution_; const ::grpc::internal::RpcMethod rpcmethod_ListTaskExecutions_; const ::grpc::internal::RpcMethod rpcmethod_GetTaskExecutionData_; - const ::grpc::internal::RpcMethod rpcmethod_UpdateTaskExecution_; const ::grpc::internal::RpcMethod rpcmethod_UpdateProjectDomainAttributes_; const ::grpc::internal::RpcMethod rpcmethod_GetProjectDomainAttributes_; const ::grpc::internal::RpcMethod rpcmethod_DeleteProjectDomainAttributes_; @@ -1706,8 +1677,6 @@ class AdminService final { virtual ::grpc::Status ListTaskExecutions(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionListRequest* request, ::flyteidl::admin::TaskExecutionList* response); // Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. virtual ::grpc::Status GetTaskExecutionData(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response); - // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response); // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. virtual ::grpc::Status UpdateProjectDomainAttributes(::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse* response); // Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. @@ -2461,32 +2430,12 @@ class AdminService final { } }; template - class WithAsyncMethod_UpdateTaskExecution : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithAsyncMethod_UpdateTaskExecution() { - ::grpc::Service::MarkMethodAsync(36); - } - ~WithAsyncMethod_UpdateTaskExecution() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - void RequestUpdateTaskExecution(::grpc::ServerContext* context, ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::TaskExecutionUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); - } - }; - template class WithAsyncMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodAsync(37); + ::grpc::Service::MarkMethodAsync(36); } ~WithAsyncMethod_UpdateProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2497,7 +2446,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectDomainAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2506,7 +2455,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodAsync(38); + ::grpc::Service::MarkMethodAsync(37); } ~WithAsyncMethod_GetProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2517,7 +2466,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectDomainAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectDomainAttributesGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectDomainAttributesGetResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2526,7 +2475,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodAsync(39); + ::grpc::Service::MarkMethodAsync(38); } ~WithAsyncMethod_DeleteProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2537,7 +2486,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectDomainAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectDomainAttributesDeleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2546,7 +2495,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodAsync(40); + ::grpc::Service::MarkMethodAsync(39); } ~WithAsyncMethod_UpdateProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2557,7 +2506,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectAttributesUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectAttributesUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2566,7 +2515,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodAsync(41); + ::grpc::Service::MarkMethodAsync(40); } ~WithAsyncMethod_GetProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2577,7 +2526,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectAttributesGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectAttributesGetResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2586,7 +2535,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodAsync(42); + ::grpc::Service::MarkMethodAsync(41); } ~WithAsyncMethod_DeleteProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2597,7 +2546,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ProjectAttributesDeleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ProjectAttributesDeleteResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2606,7 +2555,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodAsync(43); + ::grpc::Service::MarkMethodAsync(42); } ~WithAsyncMethod_UpdateWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2617,7 +2566,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateWorkflowAttributes(::grpc::ServerContext* context, ::flyteidl::admin::WorkflowAttributesUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::WorkflowAttributesUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2626,7 +2575,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodAsync(44); + ::grpc::Service::MarkMethodAsync(43); } ~WithAsyncMethod_GetWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2637,7 +2586,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetWorkflowAttributes(::grpc::ServerContext* context, ::flyteidl::admin::WorkflowAttributesGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::WorkflowAttributesGetResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2646,7 +2595,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodAsync(45); + ::grpc::Service::MarkMethodAsync(44); } ~WithAsyncMethod_DeleteWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2657,7 +2606,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteWorkflowAttributes(::grpc::ServerContext* context, ::flyteidl::admin::WorkflowAttributesDeleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::WorkflowAttributesDeleteResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2666,7 +2615,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodAsync(46); + ::grpc::Service::MarkMethodAsync(45); } ~WithAsyncMethod_ListMatchableAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -2677,7 +2626,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListMatchableAttributes(::grpc::ServerContext* context, ::flyteidl::admin::ListMatchableAttributesRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ListMatchableAttributesResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2686,7 +2635,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodAsync(47); + ::grpc::Service::MarkMethodAsync(46); } ~WithAsyncMethod_ListNamedEntities() override { BaseClassMustBeDerivedFromService(this); @@ -2697,7 +2646,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListNamedEntities(::grpc::ServerContext* context, ::flyteidl::admin::NamedEntityListRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::NamedEntityList>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2706,7 +2655,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodAsync(48); + ::grpc::Service::MarkMethodAsync(47); } ~WithAsyncMethod_GetNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -2717,7 +2666,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetNamedEntity(::grpc::ServerContext* context, ::flyteidl::admin::NamedEntityGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::NamedEntity>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2726,7 +2675,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodAsync(49); + ::grpc::Service::MarkMethodAsync(48); } ~WithAsyncMethod_UpdateNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -2737,7 +2686,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateNamedEntity(::grpc::ServerContext* context, ::flyteidl::admin::NamedEntityUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::NamedEntityUpdateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2746,7 +2695,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetVersion() { - ::grpc::Service::MarkMethodAsync(50); + ::grpc::Service::MarkMethodAsync(49); } ~WithAsyncMethod_GetVersion() override { BaseClassMustBeDerivedFromService(this); @@ -2757,7 +2706,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetVersion(::grpc::ServerContext* context, ::flyteidl::admin::GetVersionRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::GetVersionResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2766,7 +2715,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodAsync(51); + ::grpc::Service::MarkMethodAsync(50); } ~WithAsyncMethod_GetDescriptionEntity() override { BaseClassMustBeDerivedFromService(this); @@ -2777,7 +2726,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetDescriptionEntity(::grpc::ServerContext* context, ::flyteidl::admin::ObjectGetRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::DescriptionEntity>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2786,7 +2735,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodAsync(52); + ::grpc::Service::MarkMethodAsync(51); } ~WithAsyncMethod_ListDescriptionEntities() override { BaseClassMustBeDerivedFromService(this); @@ -2797,10 +2746,10 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListDescriptionEntities(::grpc::ServerContext* context, ::flyteidl::admin::DescriptionEntityListRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::DescriptionEntityList>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(52, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService; + typedef WithAsyncMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService; template class ExperimentalWithCallbackMethod_CreateTask : public BaseClass { private: @@ -3918,43 +3867,12 @@ class AdminService final { virtual void GetTaskExecutionData(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionGetDataRequest* request, ::flyteidl::admin::TaskExecutionGetDataResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template - class ExperimentalWithCallbackMethod_UpdateTaskExecution : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - ExperimentalWithCallbackMethod_UpdateTaskExecution() { - ::grpc::Service::experimental().MarkMethodCallback(36, - new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>( - [this](::grpc::ServerContext* context, - const ::flyteidl::admin::TaskExecutionUpdateRequest* request, - ::flyteidl::admin::TaskExecutionUpdateResponse* response, - ::grpc::experimental::ServerCallbackRpcController* controller) { - return this->UpdateTaskExecution(context, request, response, controller); - })); - } - void SetMessageAllocatorFor_UpdateTaskExecution( - ::grpc::experimental::MessageAllocator< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>* allocator) { - static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(36)) - ->SetMessageAllocator(allocator); - } - ~ExperimentalWithCallbackMethod_UpdateTaskExecution() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - virtual void UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } - }; - template class ExperimentalWithCallbackMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(37, + ::grpc::Service::experimental().MarkMethodCallback(36, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesUpdateRequest* request, @@ -3966,7 +3884,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateProjectDomainAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(37)) + ::grpc::Service::experimental().GetHandler(36)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateProjectDomainAttributes() override { @@ -3985,7 +3903,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(38, + ::grpc::Service::experimental().MarkMethodCallback(37, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesGetRequest* request, @@ -3997,7 +3915,7 @@ class AdminService final { void SetMessageAllocatorFor_GetProjectDomainAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>*>( - ::grpc::Service::experimental().GetHandler(38)) + ::grpc::Service::experimental().GetHandler(37)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetProjectDomainAttributes() override { @@ -4016,7 +3934,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(39, + ::grpc::Service::experimental().MarkMethodCallback(38, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectDomainAttributesDeleteRequest* request, @@ -4028,7 +3946,7 @@ class AdminService final { void SetMessageAllocatorFor_DeleteProjectDomainAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>*>( - ::grpc::Service::experimental().GetHandler(39)) + ::grpc::Service::experimental().GetHandler(38)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_DeleteProjectDomainAttributes() override { @@ -4047,7 +3965,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateProjectAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(40, + ::grpc::Service::experimental().MarkMethodCallback(39, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectAttributesUpdateRequest* request, @@ -4059,7 +3977,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateProjectAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(40)) + ::grpc::Service::experimental().GetHandler(39)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateProjectAttributes() override { @@ -4078,7 +3996,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetProjectAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(41, + ::grpc::Service::experimental().MarkMethodCallback(40, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectAttributesGetRequest* request, @@ -4090,7 +4008,7 @@ class AdminService final { void SetMessageAllocatorFor_GetProjectAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>*>( - ::grpc::Service::experimental().GetHandler(41)) + ::grpc::Service::experimental().GetHandler(40)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetProjectAttributes() override { @@ -4109,7 +4027,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_DeleteProjectAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(42, + ::grpc::Service::experimental().MarkMethodCallback(41, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ProjectAttributesDeleteRequest* request, @@ -4121,7 +4039,7 @@ class AdminService final { void SetMessageAllocatorFor_DeleteProjectAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>*>( - ::grpc::Service::experimental().GetHandler(42)) + ::grpc::Service::experimental().GetHandler(41)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_DeleteProjectAttributes() override { @@ -4140,7 +4058,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(43, + ::grpc::Service::experimental().MarkMethodCallback(42, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::WorkflowAttributesUpdateRequest* request, @@ -4152,7 +4070,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateWorkflowAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(43)) + ::grpc::Service::experimental().GetHandler(42)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateWorkflowAttributes() override { @@ -4171,7 +4089,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(44, + ::grpc::Service::experimental().MarkMethodCallback(43, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::WorkflowAttributesGetRequest* request, @@ -4183,7 +4101,7 @@ class AdminService final { void SetMessageAllocatorFor_GetWorkflowAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>*>( - ::grpc::Service::experimental().GetHandler(44)) + ::grpc::Service::experimental().GetHandler(43)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetWorkflowAttributes() override { @@ -4202,7 +4120,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_DeleteWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(45, + ::grpc::Service::experimental().MarkMethodCallback(44, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::WorkflowAttributesDeleteRequest* request, @@ -4214,7 +4132,7 @@ class AdminService final { void SetMessageAllocatorFor_DeleteWorkflowAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>*>( - ::grpc::Service::experimental().GetHandler(45)) + ::grpc::Service::experimental().GetHandler(44)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_DeleteWorkflowAttributes() override { @@ -4233,7 +4151,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ListMatchableAttributes() { - ::grpc::Service::experimental().MarkMethodCallback(46, + ::grpc::Service::experimental().MarkMethodCallback(45, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ListMatchableAttributesRequest* request, @@ -4245,7 +4163,7 @@ class AdminService final { void SetMessageAllocatorFor_ListMatchableAttributes( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>*>( - ::grpc::Service::experimental().GetHandler(46)) + ::grpc::Service::experimental().GetHandler(45)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ListMatchableAttributes() override { @@ -4264,7 +4182,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ListNamedEntities() { - ::grpc::Service::experimental().MarkMethodCallback(47, + ::grpc::Service::experimental().MarkMethodCallback(46, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::NamedEntityListRequest* request, @@ -4276,7 +4194,7 @@ class AdminService final { void SetMessageAllocatorFor_ListNamedEntities( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>*>( - ::grpc::Service::experimental().GetHandler(47)) + ::grpc::Service::experimental().GetHandler(46)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ListNamedEntities() override { @@ -4295,7 +4213,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetNamedEntity() { - ::grpc::Service::experimental().MarkMethodCallback(48, + ::grpc::Service::experimental().MarkMethodCallback(47, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::NamedEntityGetRequest* request, @@ -4307,7 +4225,7 @@ class AdminService final { void SetMessageAllocatorFor_GetNamedEntity( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>*>( - ::grpc::Service::experimental().GetHandler(48)) + ::grpc::Service::experimental().GetHandler(47)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetNamedEntity() override { @@ -4326,7 +4244,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_UpdateNamedEntity() { - ::grpc::Service::experimental().MarkMethodCallback(49, + ::grpc::Service::experimental().MarkMethodCallback(48, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::NamedEntityUpdateRequest* request, @@ -4338,7 +4256,7 @@ class AdminService final { void SetMessageAllocatorFor_UpdateNamedEntity( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>*>( - ::grpc::Service::experimental().GetHandler(49)) + ::grpc::Service::experimental().GetHandler(48)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_UpdateNamedEntity() override { @@ -4357,7 +4275,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetVersion() { - ::grpc::Service::experimental().MarkMethodCallback(50, + ::grpc::Service::experimental().MarkMethodCallback(49, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::GetVersionRequest* request, @@ -4369,7 +4287,7 @@ class AdminService final { void SetMessageAllocatorFor_GetVersion( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>*>( - ::grpc::Service::experimental().GetHandler(50)) + ::grpc::Service::experimental().GetHandler(49)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetVersion() override { @@ -4388,7 +4306,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetDescriptionEntity() { - ::grpc::Service::experimental().MarkMethodCallback(51, + ::grpc::Service::experimental().MarkMethodCallback(50, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ObjectGetRequest* request, @@ -4400,7 +4318,7 @@ class AdminService final { void SetMessageAllocatorFor_GetDescriptionEntity( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>*>( - ::grpc::Service::experimental().GetHandler(51)) + ::grpc::Service::experimental().GetHandler(50)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetDescriptionEntity() override { @@ -4419,7 +4337,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ListDescriptionEntities() { - ::grpc::Service::experimental().MarkMethodCallback(52, + ::grpc::Service::experimental().MarkMethodCallback(51, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::DescriptionEntityListRequest* request, @@ -4431,7 +4349,7 @@ class AdminService final { void SetMessageAllocatorFor_ListDescriptionEntities( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>*>( - ::grpc::Service::experimental().GetHandler(52)) + ::grpc::Service::experimental().GetHandler(51)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ListDescriptionEntities() override { @@ -4444,7 +4362,7 @@ class AdminService final { } virtual void ListDescriptionEntities(::grpc::ServerContext* context, const ::flyteidl::admin::DescriptionEntityListRequest* request, ::flyteidl::admin::DescriptionEntityList* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; - typedef ExperimentalWithCallbackMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ExperimentalCallbackService; + typedef ExperimentalWithCallbackMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ExperimentalCallbackService; template class WithGenericMethod_CreateTask : public BaseClass { private: @@ -5058,29 +4976,12 @@ class AdminService final { } }; template - class WithGenericMethod_UpdateTaskExecution : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithGenericMethod_UpdateTaskExecution() { - ::grpc::Service::MarkMethodGeneric(36); - } - ~WithGenericMethod_UpdateTaskExecution() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - }; - template class WithGenericMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodGeneric(37); + ::grpc::Service::MarkMethodGeneric(36); } ~WithGenericMethod_UpdateProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5097,7 +4998,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodGeneric(38); + ::grpc::Service::MarkMethodGeneric(37); } ~WithGenericMethod_GetProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5114,7 +5015,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodGeneric(39); + ::grpc::Service::MarkMethodGeneric(38); } ~WithGenericMethod_DeleteProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5131,7 +5032,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodGeneric(40); + ::grpc::Service::MarkMethodGeneric(39); } ~WithGenericMethod_UpdateProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5148,7 +5049,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodGeneric(41); + ::grpc::Service::MarkMethodGeneric(40); } ~WithGenericMethod_GetProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5165,7 +5066,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodGeneric(42); + ::grpc::Service::MarkMethodGeneric(41); } ~WithGenericMethod_DeleteProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5182,7 +5083,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodGeneric(43); + ::grpc::Service::MarkMethodGeneric(42); } ~WithGenericMethod_UpdateWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5199,7 +5100,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodGeneric(44); + ::grpc::Service::MarkMethodGeneric(43); } ~WithGenericMethod_GetWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5216,7 +5117,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodGeneric(45); + ::grpc::Service::MarkMethodGeneric(44); } ~WithGenericMethod_DeleteWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5233,7 +5134,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodGeneric(46); + ::grpc::Service::MarkMethodGeneric(45); } ~WithGenericMethod_ListMatchableAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -5250,7 +5151,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodGeneric(47); + ::grpc::Service::MarkMethodGeneric(46); } ~WithGenericMethod_ListNamedEntities() override { BaseClassMustBeDerivedFromService(this); @@ -5267,7 +5168,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodGeneric(48); + ::grpc::Service::MarkMethodGeneric(47); } ~WithGenericMethod_GetNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -5284,7 +5185,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodGeneric(49); + ::grpc::Service::MarkMethodGeneric(48); } ~WithGenericMethod_UpdateNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -5301,7 +5202,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetVersion() { - ::grpc::Service::MarkMethodGeneric(50); + ::grpc::Service::MarkMethodGeneric(49); } ~WithGenericMethod_GetVersion() override { BaseClassMustBeDerivedFromService(this); @@ -5318,7 +5219,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodGeneric(51); + ::grpc::Service::MarkMethodGeneric(50); } ~WithGenericMethod_GetDescriptionEntity() override { BaseClassMustBeDerivedFromService(this); @@ -5335,7 +5236,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodGeneric(52); + ::grpc::Service::MarkMethodGeneric(51); } ~WithGenericMethod_ListDescriptionEntities() override { BaseClassMustBeDerivedFromService(this); @@ -6067,32 +5968,12 @@ class AdminService final { } }; template - class WithRawMethod_UpdateTaskExecution : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithRawMethod_UpdateTaskExecution() { - ::grpc::Service::MarkMethodRaw(36); - } - ~WithRawMethod_UpdateTaskExecution() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - void RequestUpdateTaskExecution(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); - } - }; - template class WithRawMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodRaw(37); + ::grpc::Service::MarkMethodRaw(36); } ~WithRawMethod_UpdateProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6103,7 +5984,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectDomainAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6112,7 +5993,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodRaw(38); + ::grpc::Service::MarkMethodRaw(37); } ~WithRawMethod_GetProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6123,7 +6004,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectDomainAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6132,7 +6013,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodRaw(39); + ::grpc::Service::MarkMethodRaw(38); } ~WithRawMethod_DeleteProjectDomainAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6143,7 +6024,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectDomainAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6152,7 +6033,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodRaw(40); + ::grpc::Service::MarkMethodRaw(39); } ~WithRawMethod_UpdateProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6163,7 +6044,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateProjectAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6172,7 +6053,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodRaw(41); + ::grpc::Service::MarkMethodRaw(40); } ~WithRawMethod_GetProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6183,7 +6064,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetProjectAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(40, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6192,7 +6073,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodRaw(42); + ::grpc::Service::MarkMethodRaw(41); } ~WithRawMethod_DeleteProjectAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6203,7 +6084,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteProjectAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(41, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6212,7 +6093,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodRaw(43); + ::grpc::Service::MarkMethodRaw(42); } ~WithRawMethod_UpdateWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6223,7 +6104,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateWorkflowAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6232,7 +6113,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodRaw(44); + ::grpc::Service::MarkMethodRaw(43); } ~WithRawMethod_GetWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6243,7 +6124,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetWorkflowAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6252,7 +6133,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodRaw(45); + ::grpc::Service::MarkMethodRaw(44); } ~WithRawMethod_DeleteWorkflowAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6263,7 +6144,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestDeleteWorkflowAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6272,7 +6153,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodRaw(46); + ::grpc::Service::MarkMethodRaw(45); } ~WithRawMethod_ListMatchableAttributes() override { BaseClassMustBeDerivedFromService(this); @@ -6283,7 +6164,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListMatchableAttributes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(45, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6292,7 +6173,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodRaw(47); + ::grpc::Service::MarkMethodRaw(46); } ~WithRawMethod_ListNamedEntities() override { BaseClassMustBeDerivedFromService(this); @@ -6303,7 +6184,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListNamedEntities(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(46, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6312,7 +6193,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodRaw(48); + ::grpc::Service::MarkMethodRaw(47); } ~WithRawMethod_GetNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -6323,7 +6204,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetNamedEntity(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(47, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6332,7 +6213,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodRaw(49); + ::grpc::Service::MarkMethodRaw(48); } ~WithRawMethod_UpdateNamedEntity() override { BaseClassMustBeDerivedFromService(this); @@ -6343,7 +6224,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestUpdateNamedEntity(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(48, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6352,7 +6233,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetVersion() { - ::grpc::Service::MarkMethodRaw(50); + ::grpc::Service::MarkMethodRaw(49); } ~WithRawMethod_GetVersion() override { BaseClassMustBeDerivedFromService(this); @@ -6363,7 +6244,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetVersion(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(49, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6372,7 +6253,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodRaw(51); + ::grpc::Service::MarkMethodRaw(50); } ~WithRawMethod_GetDescriptionEntity() override { BaseClassMustBeDerivedFromService(this); @@ -6383,7 +6264,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetDescriptionEntity(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(50, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -6392,7 +6273,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodRaw(52); + ::grpc::Service::MarkMethodRaw(51); } ~WithRawMethod_ListDescriptionEntities() override { BaseClassMustBeDerivedFromService(this); @@ -6403,7 +6284,7 @@ class AdminService final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestListDescriptionEntities(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(52, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(51, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -7307,37 +7188,12 @@ class AdminService final { virtual void GetTaskExecutionData(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template - class ExperimentalWithRawCallbackMethod_UpdateTaskExecution : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - ExperimentalWithRawCallbackMethod_UpdateTaskExecution() { - ::grpc::Service::experimental().MarkMethodRawCallback(36, - new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( - [this](::grpc::ServerContext* context, - const ::grpc::ByteBuffer* request, - ::grpc::ByteBuffer* response, - ::grpc::experimental::ServerCallbackRpcController* controller) { - this->UpdateTaskExecution(context, request, response, controller); - })); - } - ~ExperimentalWithRawCallbackMethod_UpdateTaskExecution() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - virtual void UpdateTaskExecution(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } - }; - template class ExperimentalWithRawCallbackMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(37, + ::grpc::Service::experimental().MarkMethodRawCallback(36, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7362,7 +7218,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(38, + ::grpc::Service::experimental().MarkMethodRawCallback(37, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7387,7 +7243,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(39, + ::grpc::Service::experimental().MarkMethodRawCallback(38, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7412,7 +7268,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateProjectAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(40, + ::grpc::Service::experimental().MarkMethodRawCallback(39, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7437,7 +7293,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetProjectAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(41, + ::grpc::Service::experimental().MarkMethodRawCallback(40, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7462,7 +7318,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_DeleteProjectAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(42, + ::grpc::Service::experimental().MarkMethodRawCallback(41, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7487,7 +7343,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(43, + ::grpc::Service::experimental().MarkMethodRawCallback(42, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7512,7 +7368,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(44, + ::grpc::Service::experimental().MarkMethodRawCallback(43, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7537,7 +7393,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_DeleteWorkflowAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(45, + ::grpc::Service::experimental().MarkMethodRawCallback(44, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7562,7 +7418,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ListMatchableAttributes() { - ::grpc::Service::experimental().MarkMethodRawCallback(46, + ::grpc::Service::experimental().MarkMethodRawCallback(45, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7587,7 +7443,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ListNamedEntities() { - ::grpc::Service::experimental().MarkMethodRawCallback(47, + ::grpc::Service::experimental().MarkMethodRawCallback(46, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7612,7 +7468,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetNamedEntity() { - ::grpc::Service::experimental().MarkMethodRawCallback(48, + ::grpc::Service::experimental().MarkMethodRawCallback(47, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7637,7 +7493,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_UpdateNamedEntity() { - ::grpc::Service::experimental().MarkMethodRawCallback(49, + ::grpc::Service::experimental().MarkMethodRawCallback(48, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7662,7 +7518,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetVersion() { - ::grpc::Service::experimental().MarkMethodRawCallback(50, + ::grpc::Service::experimental().MarkMethodRawCallback(49, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7687,7 +7543,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetDescriptionEntity() { - ::grpc::Service::experimental().MarkMethodRawCallback(51, + ::grpc::Service::experimental().MarkMethodRawCallback(50, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -7712,7 +7568,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ListDescriptionEntities() { - ::grpc::Service::experimental().MarkMethodRawCallback(52, + ::grpc::Service::experimental().MarkMethodRawCallback(51, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -8452,32 +8308,12 @@ class AdminService final { virtual ::grpc::Status StreamedGetTaskExecutionData(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::TaskExecutionGetDataRequest,::flyteidl::admin::TaskExecutionGetDataResponse>* server_unary_streamer) = 0; }; template - class WithStreamedUnaryMethod_UpdateTaskExecution : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithStreamedUnaryMethod_UpdateTaskExecution() { - ::grpc::Service::MarkMethodStreamed(36, - new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::TaskExecutionUpdateRequest, ::flyteidl::admin::TaskExecutionUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateTaskExecution::StreamedUpdateTaskExecution, this, std::placeholders::_1, std::placeholders::_2))); - } - ~WithStreamedUnaryMethod_UpdateTaskExecution() override { - BaseClassMustBeDerivedFromService(this); - } - // disable regular version of this method - ::grpc::Status UpdateTaskExecution(::grpc::ServerContext* context, const ::flyteidl::admin::TaskExecutionUpdateRequest* request, ::flyteidl::admin::TaskExecutionUpdateResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - // replace default version of method with streamed unary - virtual ::grpc::Status StreamedUpdateTaskExecution(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::TaskExecutionUpdateRequest,::flyteidl::admin::TaskExecutionUpdateResponse>* server_unary_streamer) = 0; - }; - template class WithStreamedUnaryMethod_UpdateProjectDomainAttributes : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateProjectDomainAttributes() { - ::grpc::Service::MarkMethodStreamed(37, + ::grpc::Service::MarkMethodStreamed(36, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesUpdateRequest, ::flyteidl::admin::ProjectDomainAttributesUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateProjectDomainAttributes::StreamedUpdateProjectDomainAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateProjectDomainAttributes() override { @@ -8497,7 +8333,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetProjectDomainAttributes() { - ::grpc::Service::MarkMethodStreamed(38, + ::grpc::Service::MarkMethodStreamed(37, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesGetRequest, ::flyteidl::admin::ProjectDomainAttributesGetResponse>(std::bind(&WithStreamedUnaryMethod_GetProjectDomainAttributes::StreamedGetProjectDomainAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetProjectDomainAttributes() override { @@ -8517,7 +8353,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_DeleteProjectDomainAttributes() { - ::grpc::Service::MarkMethodStreamed(39, + ::grpc::Service::MarkMethodStreamed(38, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectDomainAttributesDeleteRequest, ::flyteidl::admin::ProjectDomainAttributesDeleteResponse>(std::bind(&WithStreamedUnaryMethod_DeleteProjectDomainAttributes::StreamedDeleteProjectDomainAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_DeleteProjectDomainAttributes() override { @@ -8537,7 +8373,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateProjectAttributes() { - ::grpc::Service::MarkMethodStreamed(40, + ::grpc::Service::MarkMethodStreamed(39, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectAttributesUpdateRequest, ::flyteidl::admin::ProjectAttributesUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateProjectAttributes::StreamedUpdateProjectAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateProjectAttributes() override { @@ -8557,7 +8393,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetProjectAttributes() { - ::grpc::Service::MarkMethodStreamed(41, + ::grpc::Service::MarkMethodStreamed(40, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectAttributesGetRequest, ::flyteidl::admin::ProjectAttributesGetResponse>(std::bind(&WithStreamedUnaryMethod_GetProjectAttributes::StreamedGetProjectAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetProjectAttributes() override { @@ -8577,7 +8413,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_DeleteProjectAttributes() { - ::grpc::Service::MarkMethodStreamed(42, + ::grpc::Service::MarkMethodStreamed(41, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ProjectAttributesDeleteRequest, ::flyteidl::admin::ProjectAttributesDeleteResponse>(std::bind(&WithStreamedUnaryMethod_DeleteProjectAttributes::StreamedDeleteProjectAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_DeleteProjectAttributes() override { @@ -8597,7 +8433,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateWorkflowAttributes() { - ::grpc::Service::MarkMethodStreamed(43, + ::grpc::Service::MarkMethodStreamed(42, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::WorkflowAttributesUpdateRequest, ::flyteidl::admin::WorkflowAttributesUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateWorkflowAttributes::StreamedUpdateWorkflowAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateWorkflowAttributes() override { @@ -8617,7 +8453,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetWorkflowAttributes() { - ::grpc::Service::MarkMethodStreamed(44, + ::grpc::Service::MarkMethodStreamed(43, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::WorkflowAttributesGetRequest, ::flyteidl::admin::WorkflowAttributesGetResponse>(std::bind(&WithStreamedUnaryMethod_GetWorkflowAttributes::StreamedGetWorkflowAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetWorkflowAttributes() override { @@ -8637,7 +8473,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_DeleteWorkflowAttributes() { - ::grpc::Service::MarkMethodStreamed(45, + ::grpc::Service::MarkMethodStreamed(44, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::WorkflowAttributesDeleteRequest, ::flyteidl::admin::WorkflowAttributesDeleteResponse>(std::bind(&WithStreamedUnaryMethod_DeleteWorkflowAttributes::StreamedDeleteWorkflowAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_DeleteWorkflowAttributes() override { @@ -8657,7 +8493,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ListMatchableAttributes() { - ::grpc::Service::MarkMethodStreamed(46, + ::grpc::Service::MarkMethodStreamed(45, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ListMatchableAttributesRequest, ::flyteidl::admin::ListMatchableAttributesResponse>(std::bind(&WithStreamedUnaryMethod_ListMatchableAttributes::StreamedListMatchableAttributes, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ListMatchableAttributes() override { @@ -8677,7 +8513,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ListNamedEntities() { - ::grpc::Service::MarkMethodStreamed(47, + ::grpc::Service::MarkMethodStreamed(46, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::NamedEntityListRequest, ::flyteidl::admin::NamedEntityList>(std::bind(&WithStreamedUnaryMethod_ListNamedEntities::StreamedListNamedEntities, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ListNamedEntities() override { @@ -8697,7 +8533,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetNamedEntity() { - ::grpc::Service::MarkMethodStreamed(48, + ::grpc::Service::MarkMethodStreamed(47, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::NamedEntityGetRequest, ::flyteidl::admin::NamedEntity>(std::bind(&WithStreamedUnaryMethod_GetNamedEntity::StreamedGetNamedEntity, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetNamedEntity() override { @@ -8717,7 +8553,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_UpdateNamedEntity() { - ::grpc::Service::MarkMethodStreamed(49, + ::grpc::Service::MarkMethodStreamed(48, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::NamedEntityUpdateRequest, ::flyteidl::admin::NamedEntityUpdateResponse>(std::bind(&WithStreamedUnaryMethod_UpdateNamedEntity::StreamedUpdateNamedEntity, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_UpdateNamedEntity() override { @@ -8737,7 +8573,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetVersion() { - ::grpc::Service::MarkMethodStreamed(50, + ::grpc::Service::MarkMethodStreamed(49, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::GetVersionRequest, ::flyteidl::admin::GetVersionResponse>(std::bind(&WithStreamedUnaryMethod_GetVersion::StreamedGetVersion, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetVersion() override { @@ -8757,7 +8593,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetDescriptionEntity() { - ::grpc::Service::MarkMethodStreamed(51, + ::grpc::Service::MarkMethodStreamed(50, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ObjectGetRequest, ::flyteidl::admin::DescriptionEntity>(std::bind(&WithStreamedUnaryMethod_GetDescriptionEntity::StreamedGetDescriptionEntity, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetDescriptionEntity() override { @@ -8777,7 +8613,7 @@ class AdminService final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ListDescriptionEntities() { - ::grpc::Service::MarkMethodStreamed(52, + ::grpc::Service::MarkMethodStreamed(51, new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::DescriptionEntityListRequest, ::flyteidl::admin::DescriptionEntityList>(std::bind(&WithStreamedUnaryMethod_ListDescriptionEntities::StreamedListDescriptionEntities, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ListDescriptionEntities() override { @@ -8791,9 +8627,9 @@ class AdminService final { // replace default version of method with streamed unary virtual ::grpc::Status StreamedListDescriptionEntities(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::DescriptionEntityListRequest,::flyteidl::admin::DescriptionEntityList>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService; + typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService; typedef Service SplitStreamedService; - typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService; + typedef WithStreamedUnaryMethod_CreateTask > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService; }; } // namespace service diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc index 7abacc4c30..781c94f376 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc @@ -52,273 +52,262 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto[] = "admin/task_execution.proto\032\034flyteidl/adm" "in/version.proto\032\033flyteidl/admin/common." "proto\032\'flyteidl/admin/description_entity" - ".proto\032\036flyteidl/core/identifier.proto2\323" - "O\n\014AdminService\022m\n\nCreateTask\022!.flyteidl" - ".admin.TaskCreateRequest\032\".flyteidl.admi" - "n.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/api/v1/ta" - "sks:\001*\022\210\001\n\007GetTask\022 .flyteidl.admin.Obje" - "ctGetRequest\032\024.flyteidl.admin.Task\"E\202\323\344\223" - "\002\?\022=/api/v1/tasks/{id.project}/{id.domai" - "n}/{id.name}/{id.version}\022\227\001\n\013ListTaskId" - "s\0220.flyteidl.admin.NamedEntityIdentifier" - "ListRequest\032).flyteidl.admin.NamedEntity" - "IdentifierList\"+\202\323\344\223\002%\022#/api/v1/task_ids" - "/{project}/{domain}\022\256\001\n\tListTasks\022#.flyt" - "eidl.admin.ResourceListRequest\032\030.flyteid" - "l.admin.TaskList\"b\202\323\344\223\002\\\0220/api/v1/tasks/" - "{id.project}/{id.domain}/{id.name}Z(\022&/a" - "pi/v1/tasks/{id.project}/{id.domain}\022}\n\016" - "CreateWorkflow\022%.flyteidl.admin.Workflow" - "CreateRequest\032&.flyteidl.admin.WorkflowC" - "reateResponse\"\034\202\323\344\223\002\026\"\021/api/v1/workflows" - ":\001*\022\224\001\n\013GetWorkflow\022 .flyteidl.admin.Obj" - "ectGetRequest\032\030.flyteidl.admin.Workflow\"" - "I\202\323\344\223\002C\022A/api/v1/workflows/{id.project}/" - "{id.domain}/{id.name}/{id.version}\022\237\001\n\017L" - "istWorkflowIds\0220.flyteidl.admin.NamedEnt" - "ityIdentifierListRequest\032).flyteidl.admi" - "n.NamedEntityIdentifierList\"/\202\323\344\223\002)\022\'/ap" - "i/v1/workflow_ids/{project}/{domain}\022\276\001\n" - "\rListWorkflows\022#.flyteidl.admin.Resource" - "ListRequest\032\034.flyteidl.admin.WorkflowLis" - "t\"j\202\323\344\223\002d\0224/api/v1/workflows/{id.project" - "}/{id.domain}/{id.name}Z,\022*/api/v1/workf" - "lows/{id.project}/{id.domain}\022\206\001\n\020Create" - "LaunchPlan\022\'.flyteidl.admin.LaunchPlanCr" - "eateRequest\032(.flyteidl.admin.LaunchPlanC" - "reateResponse\"\037\202\323\344\223\002\031\"\024/api/v1/launch_pl" - "ans:\001*\022\233\001\n\rGetLaunchPlan\022 .flyteidl.admi" - "n.ObjectGetRequest\032\032.flyteidl.admin.Laun" - "chPlan\"L\202\323\344\223\002F\022D/api/v1/launch_plans/{id" - ".project}/{id.domain}/{id.name}/{id.vers" - "ion}\022\242\001\n\023GetActiveLaunchPlan\022\'.flyteidl." - "admin.ActiveLaunchPlanRequest\032\032.flyteidl" - ".admin.LaunchPlan\"F\202\323\344\223\002@\022>/api/v1/activ" - "e_launch_plans/{id.project}/{id.domain}/" - "{id.name}\022\234\001\n\025ListActiveLaunchPlans\022+.fl" - "yteidl.admin.ActiveLaunchPlanListRequest" - "\032\036.flyteidl.admin.LaunchPlanList\"6\202\323\344\223\0020" - "\022./api/v1/active_launch_plans/{project}/" - "{domain}\022\244\001\n\021ListLaunchPlanIds\0220.flyteid" - "l.admin.NamedEntityIdentifierListRequest" - "\032).flyteidl.admin.NamedEntityIdentifierL" - "ist\"2\202\323\344\223\002,\022*/api/v1/launch_plan_ids/{pr" - "oject}/{domain}\022\310\001\n\017ListLaunchPlans\022#.fl" - "yteidl.admin.ResourceListRequest\032\036.flyte" - "idl.admin.LaunchPlanList\"p\202\323\344\223\002j\0227/api/v" - "1/launch_plans/{id.project}/{id.domain}/" - "{id.name}Z/\022-/api/v1/launch_plans/{id.pr" - "oject}/{id.domain}\022\266\001\n\020UpdateLaunchPlan\022" - "\'.flyteidl.admin.LaunchPlanUpdateRequest" - "\032(.flyteidl.admin.LaunchPlanUpdateRespon" - "se\"O\202\323\344\223\002I\032D/api/v1/launch_plans/{id.pro" + ".proto2\274L\n\014AdminService\022m\n\nCreateTask\022!." + "flyteidl.admin.TaskCreateRequest\032\".flyte" + "idl.admin.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/a" + "pi/v1/tasks:\001*\022\210\001\n\007GetTask\022 .flyteidl.ad" + "min.ObjectGetRequest\032\024.flyteidl.admin.Ta" + "sk\"E\202\323\344\223\002\?\022=/api/v1/tasks/{id.project}/{" + "id.domain}/{id.name}/{id.version}\022\227\001\n\013Li" + "stTaskIds\0220.flyteidl.admin.NamedEntityId" + "entifierListRequest\032).flyteidl.admin.Nam" + "edEntityIdentifierList\"+\202\323\344\223\002%\022#/api/v1/" + "task_ids/{project}/{domain}\022\256\001\n\tListTask" + "s\022#.flyteidl.admin.ResourceListRequest\032\030" + ".flyteidl.admin.TaskList\"b\202\323\344\223\002\\\0220/api/v" + "1/tasks/{id.project}/{id.domain}/{id.nam" + "e}Z(\022&/api/v1/tasks/{id.project}/{id.dom" + "ain}\022}\n\016CreateWorkflow\022%.flyteidl.admin." + "WorkflowCreateRequest\032&.flyteidl.admin.W" + "orkflowCreateResponse\"\034\202\323\344\223\002\026\"\021/api/v1/w" + "orkflows:\001*\022\224\001\n\013GetWorkflow\022 .flyteidl.a" + "dmin.ObjectGetRequest\032\030.flyteidl.admin.W" + "orkflow\"I\202\323\344\223\002C\022A/api/v1/workflows/{id.p" + "roject}/{id.domain}/{id.name}/{id.versio" + "n}\022\237\001\n\017ListWorkflowIds\0220.flyteidl.admin." + "NamedEntityIdentifierListRequest\032).flyte" + "idl.admin.NamedEntityIdentifierList\"/\202\323\344" + "\223\002)\022\'/api/v1/workflow_ids/{project}/{dom" + "ain}\022\276\001\n\rListWorkflows\022#.flyteidl.admin." + "ResourceListRequest\032\034.flyteidl.admin.Wor" + "kflowList\"j\202\323\344\223\002d\0224/api/v1/workflows/{id" + ".project}/{id.domain}/{id.name}Z,\022*/api/" + "v1/workflows/{id.project}/{id.domain}\022\206\001" + "\n\020CreateLaunchPlan\022\'.flyteidl.admin.Laun" + "chPlanCreateRequest\032(.flyteidl.admin.Lau" + "nchPlanCreateResponse\"\037\202\323\344\223\002\031\"\024/api/v1/l" + "aunch_plans:\001*\022\233\001\n\rGetLaunchPlan\022 .flyte" + "idl.admin.ObjectGetRequest\032\032.flyteidl.ad" + "min.LaunchPlan\"L\202\323\344\223\002F\022D/api/v1/launch_p" + "lans/{id.project}/{id.domain}/{id.name}/" + "{id.version}\022\242\001\n\023GetActiveLaunchPlan\022\'.f" + "lyteidl.admin.ActiveLaunchPlanRequest\032\032." + "flyteidl.admin.LaunchPlan\"F\202\323\344\223\002@\022>/api/" + "v1/active_launch_plans/{id.project}/{id." + "domain}/{id.name}\022\234\001\n\025ListActiveLaunchPl" + "ans\022+.flyteidl.admin.ActiveLaunchPlanLis" + "tRequest\032\036.flyteidl.admin.LaunchPlanList" + "\"6\202\323\344\223\0020\022./api/v1/active_launch_plans/{p" + "roject}/{domain}\022\244\001\n\021ListLaunchPlanIds\0220" + ".flyteidl.admin.NamedEntityIdentifierLis" + "tRequest\032).flyteidl.admin.NamedEntityIde" + "ntifierList\"2\202\323\344\223\002,\022*/api/v1/launch_plan" + "_ids/{project}/{domain}\022\310\001\n\017ListLaunchPl" + "ans\022#.flyteidl.admin.ResourceListRequest" + "\032\036.flyteidl.admin.LaunchPlanList\"p\202\323\344\223\002j" + "\0227/api/v1/launch_plans/{id.project}/{id." + "domain}/{id.name}Z/\022-/api/v1/launch_plan" + "s/{id.project}/{id.domain}\022\266\001\n\020UpdateLau" + "nchPlan\022\'.flyteidl.admin.LaunchPlanUpdat" + "eRequest\032(.flyteidl.admin.LaunchPlanUpda" + "teResponse\"O\202\323\344\223\002I\032D/api/v1/launch_plans" + "/{id.project}/{id.domain}/{id.name}/{id." + "version}:\001*\022\201\001\n\017CreateExecution\022&.flytei" + "dl.admin.ExecutionCreateRequest\032\'.flytei" + "dl.admin.ExecutionCreateResponse\"\035\202\323\344\223\002\027" + "\"\022/api/v1/executions:\001*\022\216\001\n\021RelaunchExec" + "ution\022(.flyteidl.admin.ExecutionRelaunch" + "Request\032\'.flyteidl.admin.ExecutionCreate" + "Response\"&\202\323\344\223\002 \"\033/api/v1/executions/rel" + "aunch:\001*\022\213\001\n\020RecoverExecution\022\'.flyteidl" + ".admin.ExecutionRecoverRequest\032\'.flyteid" + "l.admin.ExecutionCreateResponse\"%\202\323\344\223\002\037\"" + "\032/api/v1/executions/recover:\001*\022\225\001\n\014GetEx" + "ecution\022+.flyteidl.admin.WorkflowExecuti" + "onGetRequest\032\031.flyteidl.admin.Execution\"" + "=\202\323\344\223\0027\0225/api/v1/executions/{id.project}" + "/{id.domain}/{id.name}\022\244\001\n\017UpdateExecuti" + "on\022&.flyteidl.admin.ExecutionUpdateReque" + "st\032\'.flyteidl.admin.ExecutionUpdateRespo" + "nse\"@\202\323\344\223\002:\0325/api/v1/executions/{id.proj" + "ect}/{id.domain}/{id.name}:\001*\022\271\001\n\020GetExe" + "cutionData\022/.flyteidl.admin.WorkflowExec" + "utionGetDataRequest\0320.flyteidl.admin.Wor" + "kflowExecutionGetDataResponse\"B\202\323\344\223\002<\022:/" + "api/v1/data/executions/{id.project}/{id." + "domain}/{id.name}\022\211\001\n\016ListExecutions\022#.f" + "lyteidl.admin.ResourceListRequest\032\035.flyt" + "eidl.admin.ExecutionList\"3\202\323\344\223\002-\022+/api/v" + "1/executions/{id.project}/{id.domain}\022\255\001" + "\n\022TerminateExecution\022).flyteidl.admin.Ex" + "ecutionTerminateRequest\032*.flyteidl.admin" + ".ExecutionTerminateResponse\"@\202\323\344\223\002:*5/ap" + "i/v1/executions/{id.project}/{id.domain}" + "/{id.name}:\001*\022\322\001\n\020GetNodeExecution\022\'.fly" + "teidl.admin.NodeExecutionGetRequest\032\035.fl" + "yteidl.admin.NodeExecution\"v\202\323\344\223\002p\022n/api" + "/v1/node_executions/{id.execution_id.pro" + "ject}/{id.execution_id.domain}/{id.execu" + "tion_id.name}/{id.node_id}\022\336\001\n\022ListNodeE" + "xecutions\022(.flyteidl.admin.NodeExecution" + "ListRequest\032!.flyteidl.admin.NodeExecuti" + "onList\"{\202\323\344\223\002u\022s/api/v1/node_executions/" + "{workflow_execution_id.project}/{workflo" + "w_execution_id.domain}/{workflow_executi" + "on_id.name}\022\245\004\n\031ListNodeExecutionsForTas" + "k\022/.flyteidl.admin.NodeExecutionForTaskL" + "istRequest\032!.flyteidl.admin.NodeExecutio" + "nList\"\263\003\202\323\344\223\002\254\003\022\251\003/api/v1/children/task_" + "executions/{task_execution_id.node_execu" + "tion_id.execution_id.project}/{task_exec" + "ution_id.node_execution_id.execution_id." + "domain}/{task_execution_id.node_executio" + "n_id.execution_id.name}/{task_execution_" + "id.node_execution_id.node_id}/{task_exec" + "ution_id.task_id.project}/{task_executio" + "n_id.task_id.domain}/{task_execution_id." + "task_id.name}/{task_execution_id.task_id" + ".version}/{task_execution_id.retry_attem" + "pt}\022\356\001\n\024GetNodeExecutionData\022+.flyteidl." + "admin.NodeExecutionGetDataRequest\032,.flyt" + "eidl.admin.NodeExecutionGetDataResponse\"" + "{\202\323\344\223\002u\022s/api/v1/data/node_executions/{i" + "d.execution_id.project}/{id.execution_id" + ".domain}/{id.execution_id.name}/{id.node" + "_id}\022\177\n\017RegisterProject\022&.flyteidl.admin" + ".ProjectRegisterRequest\032\'.flyteidl.admin" + ".ProjectRegisterResponse\"\033\202\323\344\223\002\025\"\020/api/v" + "1/projects:\001*\022q\n\rUpdateProject\022\027.flyteid" + "l.admin.Project\032%.flyteidl.admin.Project" + "UpdateResponse\" \202\323\344\223\002\032\032\025/api/v1/projects" + "/{id}:\001*\022f\n\014ListProjects\022\".flyteidl.admi" + "n.ProjectListRequest\032\030.flyteidl.admin.Pr" + "ojects\"\030\202\323\344\223\002\022\022\020/api/v1/projects\022\231\001\n\023Cre" + "ateWorkflowEvent\022-.flyteidl.admin.Workfl" + "owExecutionEventRequest\032..flyteidl.admin" + ".WorkflowExecutionEventResponse\"#\202\323\344\223\002\035\"" + "\030/api/v1/events/workflows:\001*\022\211\001\n\017CreateN" + "odeEvent\022).flyteidl.admin.NodeExecutionE" + "ventRequest\032*.flyteidl.admin.NodeExecuti" + "onEventResponse\"\037\202\323\344\223\002\031\"\024/api/v1/events/" + "nodes:\001*\022\211\001\n\017CreateTaskEvent\022).flyteidl." + "admin.TaskExecutionEventRequest\032*.flytei" + "dl.admin.TaskExecutionEventResponse\"\037\202\323\344" + "\223\002\031\"\024/api/v1/events/tasks:\001*\022\200\003\n\020GetTask" + "Execution\022\'.flyteidl.admin.TaskExecution" + "GetRequest\032\035.flyteidl.admin.TaskExecutio" + "n\"\243\002\202\323\344\223\002\234\002\022\231\002/api/v1/task_executions/{i" + "d.node_execution_id.execution_id.project" + "}/{id.node_execution_id.execution_id.dom" + "ain}/{id.node_execution_id.execution_id." + "name}/{id.node_execution_id.node_id}/{id" + ".task_id.project}/{id.task_id.domain}/{i" + "d.task_id.name}/{id.task_id.version}/{id" + ".retry_attempt}\022\230\002\n\022ListTaskExecutions\022(" + ".flyteidl.admin.TaskExecutionListRequest" + "\032!.flyteidl.admin.TaskExecutionList\"\264\001\202\323" + "\344\223\002\255\001\022\252\001/api/v1/task_executions/{node_ex" + "ecution_id.execution_id.project}/{node_e" + "xecution_id.execution_id.domain}/{node_e" + "xecution_id.execution_id.name}/{node_exe" + "cution_id.node_id}\022\234\003\n\024GetTaskExecutionD" + "ata\022+.flyteidl.admin.TaskExecutionGetDat" + "aRequest\032,.flyteidl.admin.TaskExecutionG" + "etDataResponse\"\250\002\202\323\344\223\002\241\002\022\236\002/api/v1/data/" + "task_executions/{id.node_execution_id.ex" + "ecution_id.project}/{id.node_execution_i" + "d.execution_id.domain}/{id.node_executio" + "n_id.execution_id.name}/{id.node_executi" + "on_id.node_id}/{id.task_id.project}/{id." + "task_id.domain}/{id.task_id.name}/{id.ta" + "sk_id.version}/{id.retry_attempt}\022\343\001\n\035Up" + "dateProjectDomainAttributes\0224.flyteidl.a" + "dmin.ProjectDomainAttributesUpdateReques" + "t\0325.flyteidl.admin.ProjectDomainAttribut" + "esUpdateResponse\"U\202\323\344\223\002O\032J/api/v1/projec" + "t_domain_attributes/{attributes.project}" + "/{attributes.domain}:\001*\022\301\001\n\032GetProjectDo" + "mainAttributes\0221.flyteidl.admin.ProjectD" + "omainAttributesGetRequest\0322.flyteidl.adm" + "in.ProjectDomainAttributesGetResponse\"<\202" + "\323\344\223\0026\0224/api/v1/project_domain_attributes" + "/{project}/{domain}\022\315\001\n\035DeleteProjectDom" + "ainAttributes\0224.flyteidl.admin.ProjectDo" + "mainAttributesDeleteRequest\0325.flyteidl.a" + "dmin.ProjectDomainAttributesDeleteRespon" + "se\"\?\202\323\344\223\0029*4/api/v1/project_domain_attri" + "butes/{project}/{domain}:\001*\022\266\001\n\027UpdatePr" + "ojectAttributes\022..flyteidl.admin.Project" + "AttributesUpdateRequest\032/.flyteidl.admin" + ".ProjectAttributesUpdateResponse\":\202\323\344\223\0024" + "\032//api/v1/project_attributes/{attributes" + ".project}:\001*\022\237\001\n\024GetProjectAttributes\022+." + "flyteidl.admin.ProjectAttributesGetReque" + "st\032,.flyteidl.admin.ProjectAttributesGet" + "Response\",\202\323\344\223\002&\022$/api/v1/project_attrib" + "utes/{project}\022\253\001\n\027DeleteProjectAttribut" + "es\022..flyteidl.admin.ProjectAttributesDel" + "eteRequest\032/.flyteidl.admin.ProjectAttri" + "butesDeleteResponse\"/\202\323\344\223\002)*$/api/v1/pro" + "ject_attributes/{project}:\001*\022\344\001\n\030UpdateW" + "orkflowAttributes\022/.flyteidl.admin.Workf" + "lowAttributesUpdateRequest\0320.flyteidl.ad" + "min.WorkflowAttributesUpdateResponse\"e\202\323" + "\344\223\002_\032Z/api/v1/workflow_attributes/{attri" + "butes.project}/{attributes.domain}/{attr" + "ibutes.workflow}:\001*\022\267\001\n\025GetWorkflowAttri" + "butes\022,.flyteidl.admin.WorkflowAttribute" + "sGetRequest\032-.flyteidl.admin.WorkflowAtt" + "ributesGetResponse\"A\202\323\344\223\002;\0229/api/v1/work" + "flow_attributes/{project}/{domain}/{work" + "flow}\022\303\001\n\030DeleteWorkflowAttributes\022/.fly" + "teidl.admin.WorkflowAttributesDeleteRequ" + "est\0320.flyteidl.admin.WorkflowAttributesD" + "eleteResponse\"D\202\323\344\223\002>*9/api/v1/workflow_" + "attributes/{project}/{domain}/{workflow}" + ":\001*\022\240\001\n\027ListMatchableAttributes\022..flytei" + "dl.admin.ListMatchableAttributesRequest\032" + "/.flyteidl.admin.ListMatchableAttributes" + "Response\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attr" + "ibutes\022\237\001\n\021ListNamedEntities\022&.flyteidl." + "admin.NamedEntityListRequest\032\037.flyteidl." + "admin.NamedEntityList\"A\202\323\344\223\002;\0229/api/v1/n" + "amed_entities/{resource_type}/{project}/" + "{domain}\022\247\001\n\016GetNamedEntity\022%.flyteidl.a" + "dmin.NamedEntityGetRequest\032\033.flyteidl.ad" + "min.NamedEntity\"Q\202\323\344\223\002K\022I/api/v1/named_e" + "ntities/{resource_type}/{id.project}/{id" + ".domain}/{id.name}\022\276\001\n\021UpdateNamedEntity" + "\022(.flyteidl.admin.NamedEntityUpdateReque" + "st\032).flyteidl.admin.NamedEntityUpdateRes" + "ponse\"T\202\323\344\223\002N\032I/api/v1/named_entities/{r" + "esource_type}/{id.project}/{id.domain}/{" + "id.name}:\001*\022l\n\nGetVersion\022!.flyteidl.adm" + "in.GetVersionRequest\032\".flyteidl.admin.Ge" + "tVersionResponse\"\027\202\323\344\223\002\021\022\017/api/v1/versio" + "n\022\304\001\n\024GetDescriptionEntity\022 .flyteidl.ad" + "min.ObjectGetRequest\032!.flyteidl.admin.De" + "scriptionEntity\"g\202\323\344\223\002a\022_/api/v1/descrip" + "tion_entities/{id.resource_type}/{id.pro" "ject}/{id.domain}/{id.name}/{id.version}" - ":\001*\022\201\001\n\017CreateExecution\022&.flyteidl.admin" - ".ExecutionCreateRequest\032\'.flyteidl.admin" - ".ExecutionCreateResponse\"\035\202\323\344\223\002\027\"\022/api/v" - "1/executions:\001*\022\216\001\n\021RelaunchExecution\022(." - "flyteidl.admin.ExecutionRelaunchRequest\032" - "\'.flyteidl.admin.ExecutionCreateResponse" - "\"&\202\323\344\223\002 \"\033/api/v1/executions/relaunch:\001*" - "\022\213\001\n\020RecoverExecution\022\'.flyteidl.admin.E" - "xecutionRecoverRequest\032\'.flyteidl.admin." - "ExecutionCreateResponse\"%\202\323\344\223\002\037\"\032/api/v1" - "/executions/recover:\001*\022\225\001\n\014GetExecution\022" - "+.flyteidl.admin.WorkflowExecutionGetReq" - "uest\032\031.flyteidl.admin.Execution\"=\202\323\344\223\0027\022" - "5/api/v1/executions/{id.project}/{id.dom" - "ain}/{id.name}\022\244\001\n\017UpdateExecution\022&.fly" - "teidl.admin.ExecutionUpdateRequest\032\'.fly" - "teidl.admin.ExecutionUpdateResponse\"@\202\323\344" - "\223\002:\0325/api/v1/executions/{id.project}/{id" - ".domain}/{id.name}:\001*\022\271\001\n\020GetExecutionDa" - "ta\022/.flyteidl.admin.WorkflowExecutionGet" - "DataRequest\0320.flyteidl.admin.WorkflowExe" - "cutionGetDataResponse\"B\202\323\344\223\002<\022:/api/v1/d" - "ata/executions/{id.project}/{id.domain}/" - "{id.name}\022\211\001\n\016ListExecutions\022#.flyteidl." - "admin.ResourceListRequest\032\035.flyteidl.adm" - "in.ExecutionList\"3\202\323\344\223\002-\022+/api/v1/execut" - "ions/{id.project}/{id.domain}\022\255\001\n\022Termin" - "ateExecution\022).flyteidl.admin.ExecutionT" - "erminateRequest\032*.flyteidl.admin.Executi" - "onTerminateResponse\"@\202\323\344\223\002:*5/api/v1/exe" - "cutions/{id.project}/{id.domain}/{id.nam" - "e}:\001*\022\322\001\n\020GetNodeExecution\022\'.flyteidl.ad" - "min.NodeExecutionGetRequest\032\035.flyteidl.a" - "dmin.NodeExecution\"v\202\323\344\223\002p\022n/api/v1/node" - "_executions/{id.execution_id.project}/{i" - "d.execution_id.domain}/{id.execution_id." - "name}/{id.node_id}\022\336\001\n\022ListNodeExecution" - "s\022(.flyteidl.admin.NodeExecutionListRequ" - "est\032!.flyteidl.admin.NodeExecutionList\"{" - "\202\323\344\223\002u\022s/api/v1/node_executions/{workflo" - "w_execution_id.project}/{workflow_execut" - "ion_id.domain}/{workflow_execution_id.na" - "me}\022\245\004\n\031ListNodeExecutionsForTask\022/.flyt" - "eidl.admin.NodeExecutionForTaskListReque" - "st\032!.flyteidl.admin.NodeExecutionList\"\263\003" - "\202\323\344\223\002\254\003\022\251\003/api/v1/children/task_executio" - "ns/{task_execution_id.node_execution_id." - "execution_id.project}/{task_execution_id" - ".node_execution_id.execution_id.domain}/" - "{task_execution_id.node_execution_id.exe" - "cution_id.name}/{task_execution_id.node_" - "execution_id.node_id}/{task_execution_id" - ".task_id.project}/{task_execution_id.tas" - "k_id.domain}/{task_execution_id.task_id." - "name}/{task_execution_id.task_id.version" - "}/{task_execution_id.retry_attempt}\022\356\001\n\024" - "GetNodeExecutionData\022+.flyteidl.admin.No" - "deExecutionGetDataRequest\032,.flyteidl.adm" - "in.NodeExecutionGetDataResponse\"{\202\323\344\223\002u\022" - "s/api/v1/data/node_executions/{id.execut" - "ion_id.project}/{id.execution_id.domain}" - "/{id.execution_id.name}/{id.node_id}\022\177\n\017" - "RegisterProject\022&.flyteidl.admin.Project" - "RegisterRequest\032\'.flyteidl.admin.Project" - "RegisterResponse\"\033\202\323\344\223\002\025\"\020/api/v1/projec" - "ts:\001*\022q\n\rUpdateProject\022\027.flyteidl.admin." - "Project\032%.flyteidl.admin.ProjectUpdateRe" - "sponse\" \202\323\344\223\002\032\032\025/api/v1/projects/{id}:\001*" - "\022f\n\014ListProjects\022\".flyteidl.admin.Projec" - "tListRequest\032\030.flyteidl.admin.Projects\"\030" - "\202\323\344\223\002\022\022\020/api/v1/projects\022\231\001\n\023CreateWorkf" - "lowEvent\022-.flyteidl.admin.WorkflowExecut" - "ionEventRequest\032..flyteidl.admin.Workflo" - "wExecutionEventResponse\"#\202\323\344\223\002\035\"\030/api/v1" - "/events/workflows:\001*\022\211\001\n\017CreateNodeEvent" - "\022).flyteidl.admin.NodeExecutionEventRequ" - "est\032*.flyteidl.admin.NodeExecutionEventR" - "esponse\"\037\202\323\344\223\002\031\"\024/api/v1/events/nodes:\001*" - "\022\211\001\n\017CreateTaskEvent\022).flyteidl.admin.Ta" - "skExecutionEventRequest\032*.flyteidl.admin" - ".TaskExecutionEventResponse\"\037\202\323\344\223\002\031\"\024/ap" - "i/v1/events/tasks:\001*\022\200\003\n\020GetTaskExecutio" - "n\022\'.flyteidl.admin.TaskExecutionGetReque" - "st\032\035.flyteidl.admin.TaskExecution\"\243\002\202\323\344\223" - "\002\234\002\022\231\002/api/v1/task_executions/{id.node_e" - "xecution_id.execution_id.project}/{id.no" - "de_execution_id.execution_id.domain}/{id" - ".node_execution_id.execution_id.name}/{i" - "d.node_execution_id.node_id}/{id.task_id" - ".project}/{id.task_id.domain}/{id.task_i" - "d.name}/{id.task_id.version}/{id.retry_a" - "ttempt}\022\230\002\n\022ListTaskExecutions\022(.flyteid" - "l.admin.TaskExecutionListRequest\032!.flyte" - "idl.admin.TaskExecutionList\"\264\001\202\323\344\223\002\255\001\022\252\001" - "/api/v1/task_executions/{node_execution_" - "id.execution_id.project}/{node_execution" - "_id.execution_id.domain}/{node_execution" - "_id.execution_id.name}/{node_execution_i" - "d.node_id}\022\234\003\n\024GetTaskExecutionData\022+.fl" - "yteidl.admin.TaskExecutionGetDataRequest" - "\032,.flyteidl.admin.TaskExecutionGetDataRe" - "sponse\"\250\002\202\323\344\223\002\241\002\022\236\002/api/v1/data/task_exe" - "cutions/{id.node_execution_id.execution_" - "id.project}/{id.node_execution_id.execut" - "ion_id.domain}/{id.node_execution_id.exe" - "cution_id.name}/{id.node_execution_id.no" - "de_id}/{id.task_id.project}/{id.task_id." - "domain}/{id.task_id.name}/{id.task_id.ve" - "rsion}/{id.retry_attempt}\022\224\003\n\023UpdateTask" - "Execution\022*.flyteidl.admin.TaskExecution" - "UpdateRequest\032+.flyteidl.admin.TaskExecu" - "tionUpdateResponse\"\243\002\202\323\344\223\002\234\002\022\231\002/api/v1/t" - "ask_executions/{id.node_execution_id.exe" - "cution_id.project}/{id.node_execution_id" - ".execution_id.domain}/{id.node_execution" - "_id.execution_id.name}/{id.node_executio" - "n_id.node_id}/{id.task_id.project}/{id.t" - "ask_id.domain}/{id.task_id.name}/{id.tas" - "k_id.version}/{id.retry_attempt}\022\343\001\n\035Upd" - "ateProjectDomainAttributes\0224.flyteidl.ad" - "min.ProjectDomainAttributesUpdateRequest" - "\0325.flyteidl.admin.ProjectDomainAttribute" - "sUpdateResponse\"U\202\323\344\223\002O\032J/api/v1/project" - "_domain_attributes/{attributes.project}/" - "{attributes.domain}:\001*\022\301\001\n\032GetProjectDom" - "ainAttributes\0221.flyteidl.admin.ProjectDo" - "mainAttributesGetRequest\0322.flyteidl.admi" - "n.ProjectDomainAttributesGetResponse\"<\202\323" - "\344\223\0026\0224/api/v1/project_domain_attributes/" - "{project}/{domain}\022\315\001\n\035DeleteProjectDoma" - "inAttributes\0224.flyteidl.admin.ProjectDom" - "ainAttributesDeleteRequest\0325.flyteidl.ad" - "min.ProjectDomainAttributesDeleteRespons" - "e\"\?\202\323\344\223\0029*4/api/v1/project_domain_attrib" - "utes/{project}/{domain}:\001*\022\266\001\n\027UpdatePro" - "jectAttributes\022..flyteidl.admin.ProjectA" - "ttributesUpdateRequest\032/.flyteidl.admin." - "ProjectAttributesUpdateResponse\":\202\323\344\223\0024\032" - "//api/v1/project_attributes/{attributes." - "project}:\001*\022\237\001\n\024GetProjectAttributes\022+.f" - "lyteidl.admin.ProjectAttributesGetReques" - "t\032,.flyteidl.admin.ProjectAttributesGetR" - "esponse\",\202\323\344\223\002&\022$/api/v1/project_attribu" - "tes/{project}\022\253\001\n\027DeleteProjectAttribute" - "s\022..flyteidl.admin.ProjectAttributesDele" - "teRequest\032/.flyteidl.admin.ProjectAttrib" - "utesDeleteResponse\"/\202\323\344\223\002)*$/api/v1/proj" - "ect_attributes/{project}:\001*\022\344\001\n\030UpdateWo" - "rkflowAttributes\022/.flyteidl.admin.Workfl" - "owAttributesUpdateRequest\0320.flyteidl.adm" - "in.WorkflowAttributesUpdateResponse\"e\202\323\344" - "\223\002_\032Z/api/v1/workflow_attributes/{attrib" - "utes.project}/{attributes.domain}/{attri" - "butes.workflow}:\001*\022\267\001\n\025GetWorkflowAttrib" - "utes\022,.flyteidl.admin.WorkflowAttributes" - "GetRequest\032-.flyteidl.admin.WorkflowAttr" - "ibutesGetResponse\"A\202\323\344\223\002;\0229/api/v1/workf" - "low_attributes/{project}/{domain}/{workf" - "low}\022\303\001\n\030DeleteWorkflowAttributes\022/.flyt" - "eidl.admin.WorkflowAttributesDeleteReque" - "st\0320.flyteidl.admin.WorkflowAttributesDe" - "leteResponse\"D\202\323\344\223\002>*9/api/v1/workflow_a" - "ttributes/{project}/{domain}/{workflow}:" - "\001*\022\240\001\n\027ListMatchableAttributes\022..flyteid" - "l.admin.ListMatchableAttributesRequest\032/" - ".flyteidl.admin.ListMatchableAttributesR" - "esponse\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attri" - "butes\022\237\001\n\021ListNamedEntities\022&.flyteidl.a" - "dmin.NamedEntityListRequest\032\037.flyteidl.a" - "dmin.NamedEntityList\"A\202\323\344\223\002;\0229/api/v1/na" - "med_entities/{resource_type}/{project}/{" - "domain}\022\247\001\n\016GetNamedEntity\022%.flyteidl.ad" - "min.NamedEntityGetRequest\032\033.flyteidl.adm" - "in.NamedEntity\"Q\202\323\344\223\002K\022I/api/v1/named_en" - "tities/{resource_type}/{id.project}/{id." - "domain}/{id.name}\022\276\001\n\021UpdateNamedEntity\022" - "(.flyteidl.admin.NamedEntityUpdateReques" - "t\032).flyteidl.admin.NamedEntityUpdateResp" - "onse\"T\202\323\344\223\002N\032I/api/v1/named_entities/{re" - "source_type}/{id.project}/{id.domain}/{i" - "d.name}:\001*\022l\n\nGetVersion\022!.flyteidl.admi" - "n.GetVersionRequest\032\".flyteidl.admin.Get" - "VersionResponse\"\027\202\323\344\223\002\021\022\017/api/v1/version" - "\022\304\001\n\024GetDescriptionEntity\022 .flyteidl.adm" - "in.ObjectGetRequest\032!.flyteidl.admin.Des" - "criptionEntity\"g\202\323\344\223\002a\022_/api/v1/descript" - "ion_entities/{id.resource_type}/{id.proj" - "ect}/{id.domain}/{id.name}/{id.version}\022" - "\222\002\n\027ListDescriptionEntities\022,.flyteidl.a" - "dmin.DescriptionEntityListRequest\032%.flyt" - "eidl.admin.DescriptionEntityList\"\241\001\202\323\344\223\002" - "\232\001\022O/api/v1/description_entities/{resour" - "ce_type}/{id.project}/{id.domain}/{id.na" - "me}ZG\022E/api/v1/description_entities/{res" - "ource_type}/{id.project}/{id.domain}B9Z7" - "github.com/flyteorg/flyteidl/gen/pb-go/f" - "lyteidl/serviceb\006proto3" + "\022\222\002\n\027ListDescriptionEntities\022,.flyteidl." + "admin.DescriptionEntityListRequest\032%.fly" + "teidl.admin.DescriptionEntityList\"\241\001\202\323\344\223" + "\002\232\001\022O/api/v1/description_entities/{resou" + "rce_type}/{id.project}/{id.domain}/{id.n" + "ame}ZG\022E/api/v1/description_entities/{re" + "source_type}/{id.project}/{id.domain}B9Z" + "7github.com/flyteorg/flyteidl/gen/pb-go/" + "flyteidl/serviceb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fadmin_2eproto = { false, InitDefaults_flyteidl_2fservice_2fadmin_2eproto, descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto, - "flyteidl/service/admin.proto", &assign_descriptors_table_flyteidl_2fservice_2fadmin_2eproto, 10903, + "flyteidl/service/admin.proto", &assign_descriptors_table_flyteidl_2fservice_2fadmin_2eproto, 10464, }; void AddDescriptors_flyteidl_2fservice_2fadmin_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[17] = + static constexpr ::google::protobuf::internal::InitFunc deps[16] = { ::AddDescriptors_google_2fapi_2fannotations_2eproto, ::AddDescriptors_flyteidl_2fadmin_2fproject_2eproto, @@ -336,9 +325,8 @@ void AddDescriptors_flyteidl_2fservice_2fadmin_2eproto() { ::AddDescriptors_flyteidl_2fadmin_2fversion_2eproto, ::AddDescriptors_flyteidl_2fadmin_2fcommon_2eproto, ::AddDescriptors_flyteidl_2fadmin_2fdescription_5fentity_2eproto, - ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fservice_2fadmin_2eproto, deps, 17); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fservice_2fadmin_2eproto, deps, 16); } // Force running AddDescriptors() at dynamic initialization time. diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.h index 0a6aec1ea2..ca8c835a94 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.h @@ -45,7 +45,6 @@ #include "flyteidl/admin/version.pb.h" #include "flyteidl/admin/common.pb.h" #include "flyteidl/admin/description_entity.pb.h" -#include "flyteidl/core/identifier.pb.h" // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_flyteidl_2fservice_2fadmin_2eproto diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc new file mode 100644 index 0000000000..90e90e8e59 --- /dev/null +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc @@ -0,0 +1,127 @@ +// Generated by the gRPC C++ plugin. +// If you make any local change, they will be lost. +// source: flyteidl/service/cache.proto + +#include "flyteidl/service/cache.pb.h" +#include "flyteidl/service/cache.grpc.pb.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +namespace flyteidl { +namespace service { + +static const char* CacheService_method_names[] = { + "/flyteidl.service.CacheService/EvictExecutionCache", + "/flyteidl.service.CacheService/EvictTaskExecutionCache", +}; + +std::unique_ptr< CacheService::Stub> CacheService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) { + (void)options; + std::unique_ptr< CacheService::Stub> stub(new CacheService::Stub(channel)); + return stub; +} + +CacheService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel) + : channel_(channel), rpcmethod_EvictExecutionCache_(CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_EvictTaskExecutionCache_(CacheService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + {} + +::grpc::Status CacheService::Stub::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictExecutionCache_, context, request, response); +} + +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); +} + +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); +} + +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); +} + +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, false); +} + +::grpc::Status CacheService::Stub::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictTaskExecutionCache_, context, request, response); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, false); +} + +CacheService::Service::Service() { + AddMethod(new ::grpc::internal::RpcServiceMethod( + CacheService_method_names[0], + ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + std::mem_fn(&CacheService::Service::EvictExecutionCache), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + CacheService_method_names[1], + ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + std::mem_fn(&CacheService::Service::EvictTaskExecutionCache), this))); +} + +CacheService::Service::~Service() { +} + +::grpc::Status CacheService::Service::EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + +::grpc::Status CacheService::Service::EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + + +} // namespace flyteidl +} // namespace service + diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h new file mode 100644 index 0000000000..8632f26b5a --- /dev/null +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h @@ -0,0 +1,423 @@ +// Generated by the gRPC C++ plugin. +// If you make any local change, they will be lost. +// source: flyteidl/service/cache.proto +#ifndef GRPC_flyteidl_2fservice_2fcache_2eproto__INCLUDED +#define GRPC_flyteidl_2fservice_2fcache_2eproto__INCLUDED + +#include "flyteidl/service/cache.pb.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace grpc_impl { +class Channel; +class CompletionQueue; +class ServerCompletionQueue; +} // namespace grpc_impl + +namespace grpc { +namespace experimental { +template +class MessageAllocator; +} // namespace experimental +} // namespace grpc_impl + +namespace grpc { +class ServerContext; +} // namespace grpc + +namespace flyteidl { +namespace service { + +// CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. +class CacheService final { + public: + static constexpr char const* service_full_name() { + return "flyteidl.service.CacheService"; + } + class StubInterface { + public: + virtual ~StubInterface() {} + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + virtual ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); + } + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); + } + class experimental_async_interface { + public: + virtual ~experimental_async_interface() {} + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + }; + virtual class experimental_async_interface* experimental_async() { return nullptr; } + private: + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + }; + class Stub final : public StubInterface { + public: + Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel); + ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); + } + ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); + } + class experimental_async final : + public StubInterface::experimental_async_interface { + public: + void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + private: + friend class Stub; + explicit experimental_async(Stub* stub): stub_(stub) { } + Stub* stub() { return stub_; } + Stub* stub_; + }; + class experimental_async_interface* experimental_async() override { return &async_stub_; } + + private: + std::shared_ptr< ::grpc::ChannelInterface> channel_; + class experimental_async async_stub_{this}; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + const ::grpc::internal::RpcMethod rpcmethod_EvictExecutionCache_; + const ::grpc::internal::RpcMethod rpcmethod_EvictTaskExecutionCache_; + }; + static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions()); + + class Service : public ::grpc::Service { + public: + Service(); + virtual ~Service(); + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + virtual ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); + }; + template + class WithAsyncMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_EvictExecutionCache() { + ::grpc::Service::MarkMethodAsync(0); + } + ~WithAsyncMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestEvictExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithAsyncMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodAsync(1); + } + ~WithAsyncMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); + } + }; + typedef WithAsyncMethod_EvictExecutionCache > AsyncService; + template + class ExperimentalWithCallbackMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_EvictExecutionCache() { + ::grpc::Service::experimental().MarkMethodCallback(0, + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + [this](::grpc::ServerContext* context, + const ::flyteidl::service::EvictExecutionCacheRequest* request, + ::flyteidl::service::EvictCacheResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->EvictExecutionCache(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_EvictExecutionCache( + ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( + ::grpc::Service::experimental().GetHandler(0)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_EvictTaskExecutionCache() { + ::grpc::Service::experimental().MarkMethodCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + [this](::grpc::ServerContext* context, + const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, + ::flyteidl::service::EvictCacheResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->EvictTaskExecutionCache(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_EvictTaskExecutionCache( + ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( + ::grpc::Service::experimental().GetHandler(1)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + typedef ExperimentalWithCallbackMethod_EvictExecutionCache > ExperimentalCallbackService; + template + class WithGenericMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_EvictExecutionCache() { + ::grpc::Service::MarkMethodGeneric(0); + } + ~WithGenericMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template + class WithGenericMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodGeneric(1); + } + ~WithGenericMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template + class WithRawMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_EvictExecutionCache() { + ::grpc::Service::MarkMethodRaw(0); + } + ~WithRawMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithRawMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodRaw(1); + } + ~WithRawMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class ExperimentalWithRawCallbackMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_EvictExecutionCache() { + ::grpc::Service::experimental().MarkMethodRawCallback(0, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->EvictExecutionCache(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache() { + ::grpc::Service::experimental().MarkMethodRawCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->EvictTaskExecutionCache(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class WithStreamedUnaryMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_EvictExecutionCache() { + ::grpc::Service::MarkMethodStreamed(0, + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictExecutionCache::StreamedEvictExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; + }; + template + class WithStreamedUnaryMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodStreamed(1, + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictTaskExecutionCache::StreamedEvictTaskExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictTaskExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; + }; + typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedUnaryService; + typedef Service SplitStreamedService; + typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedService; +}; + +} // namespace service +} // namespace flyteidl + + +#endif // GRPC_flyteidl_2fservice_2fcache_2eproto__INCLUDED diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc new file mode 100644 index 0000000000..467d81aa1c --- /dev/null +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc @@ -0,0 +1,1078 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: flyteidl/service/cache.proto + +#include "flyteidl/service/cache.pb.h" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +// @@protoc_insertion_point(includes) +#include + +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; +namespace flyteidl { +namespace service { +class EvictExecutionCacheRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _EvictExecutionCacheRequest_default_instance_; +class EvictTaskExecutionCacheRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _EvictTaskExecutionCacheRequest_default_instance_; +class EvictCacheResponseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _EvictCacheResponse_default_instance_; +} // namespace service +} // namespace flyteidl +static void InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::service::_EvictExecutionCacheRequest_default_instance_; + new (ptr) ::flyteidl::service::EvictExecutionCacheRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::service::EvictExecutionCacheRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { + &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; + +static void InitDefaultsEvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_; + new (ptr) ::flyteidl::service::EvictTaskExecutionCacheRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::service::EvictTaskExecutionCacheRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { + &scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; + +static void InitDefaultsEvictCacheResponse_flyteidl_2fservice_2fcache_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::service::_EvictCacheResponse_default_instance_; + new (ptr) ::flyteidl::service::EvictCacheResponse(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::service::EvictCacheResponse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_EvictCacheResponse_flyteidl_2fservice_2fcache_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictCacheResponse_flyteidl_2fservice_2fcache_2eproto}, { + &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}}; + +void InitDefaults_flyteidl_2fservice_2fcache_2eproto() { + ::google::protobuf::internal::InitSCC(&scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_EvictCacheResponse_flyteidl_2fservice_2fcache_2eproto.base); +} + +::google::protobuf::Metadata file_level_metadata_flyteidl_2fservice_2fcache_2eproto[3]; +constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr; +constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr; + +const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, id_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictTaskExecutionCacheRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictTaskExecutionCacheRequest, id_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheResponse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheResponse, errors_), +}; +static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + { 0, -1, sizeof(::flyteidl::service::EvictExecutionCacheRequest)}, + { 6, -1, sizeof(::flyteidl::service::EvictTaskExecutionCacheRequest)}, + { 12, -1, sizeof(::flyteidl::service::EvictCacheResponse)}, +}; + +static ::google::protobuf::Message const * const file_default_instances[] = { + reinterpret_cast(&::flyteidl::service::_EvictExecutionCacheRequest_default_instance_), + reinterpret_cast(&::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_), + reinterpret_cast(&::flyteidl::service::_EvictCacheResponse_default_instance_), +}; + +::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto = { + {}, AddDescriptors_flyteidl_2fservice_2fcache_2eproto, "flyteidl/service/cache.proto", schemas, + file_default_instances, TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets, + file_level_metadata_flyteidl_2fservice_2fcache_2eproto, 3, file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto, file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto, +}; + +const char descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto[] = + "\n\034flyteidl/service/cache.proto\022\020flyteidl" + ".service\032\034google/api/annotations.proto\032\032" + "flyteidl/core/errors.proto\032\036flyteidl/cor" + "e/identifier.proto\"T\n\032EvictExecutionCach" + "eRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" + "kflowExecutionIdentifier\"T\n\036EvictTaskExe" + "cutionCacheRequest\0222\n\002id\030\001 \001(\0132&.flyteid" + "l.core.TaskExecutionIdentifier\"K\n\022EvictC" + "acheResponse\0225\n\006errors\030\001 \001(\0132%.flyteidl." + "core.CacheEvictionErrorList2\345\004\n\014CacheSer" + "vice\022\261\001\n\023EvictExecutionCache\022,.flyteidl." + "service.EvictExecutionCacheRequest\032$.fly" + "teidl.service.EvictCacheResponse\"F\202\323\344\223\002@" + "*;/api/v1/cache/executions/{id.project}/" + "{id.domain}/{id.name}:\001*\022\240\003\n\027EvictTaskEx" + "ecutionCache\0220.flyteidl.service.EvictTas" + "kExecutionCacheRequest\032$.flyteidl.servic" + "e.EvictCacheResponse\"\254\002\202\323\344\223\002\245\002*\237\002/api/v1" + "/cache/task_executions/{id.node_executio" + "n_id.execution_id.project}/{id.node_exec" + "ution_id.execution_id.domain}/{id.node_e" + "xecution_id.execution_id.name}/{id.node_" + "execution_id.node_id}/{id.task_id.projec" + "t}/{id.task_id.domain}/{id.task_id.name}" + "/{id.task_id.version}/{id.retry_attempt}" + ":\001*B9Z7github.com/flyteorg/flyteidl/gen/" + "pb-go/flyteidl/serviceb\006proto3" + ; +::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fcache_2eproto = { + false, InitDefaults_flyteidl_2fservice_2fcache_2eproto, + descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto, + "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1070, +}; + +void AddDescriptors_flyteidl_2fservice_2fcache_2eproto() { + static constexpr ::google::protobuf::internal::InitFunc deps[3] = + { + ::AddDescriptors_google_2fapi_2fannotations_2eproto, + ::AddDescriptors_flyteidl_2fcore_2ferrors_2eproto, + ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, + }; + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fservice_2fcache_2eproto, deps, 3); +} + +// Force running AddDescriptors() at dynamic initialization time. +static bool dynamic_init_dummy_flyteidl_2fservice_2fcache_2eproto = []() { AddDescriptors_flyteidl_2fservice_2fcache_2eproto(); return true; }(); +namespace flyteidl { +namespace service { + +// =================================================================== + +void EvictExecutionCacheRequest::InitAsDefaultInstance() { + ::flyteidl::service::_EvictExecutionCacheRequest_default_instance_._instance.get_mutable()->id_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>( + ::flyteidl::core::WorkflowExecutionIdentifier::internal_default_instance()); +} +class EvictExecutionCacheRequest::HasBitSetters { + public: + static const ::flyteidl::core::WorkflowExecutionIdentifier& id(const EvictExecutionCacheRequest* msg); +}; + +const ::flyteidl::core::WorkflowExecutionIdentifier& +EvictExecutionCacheRequest::HasBitSetters::id(const EvictExecutionCacheRequest* msg) { + return *msg->id_; +} +void EvictExecutionCacheRequest::clear_id() { + if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { + delete id_; + } + id_ = nullptr; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int EvictExecutionCacheRequest::kIdFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +EvictExecutionCacheRequest::EvictExecutionCacheRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.service.EvictExecutionCacheRequest) +} +EvictExecutionCacheRequest::EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_id()) { + id_ = new ::flyteidl::core::WorkflowExecutionIdentifier(*from.id_); + } else { + id_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictExecutionCacheRequest) +} + +void EvictExecutionCacheRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + id_ = nullptr; +} + +EvictExecutionCacheRequest::~EvictExecutionCacheRequest() { + // @@protoc_insertion_point(destructor:flyteidl.service.EvictExecutionCacheRequest) + SharedDtor(); +} + +void EvictExecutionCacheRequest::SharedDtor() { + if (this != internal_default_instance()) delete id_; +} + +void EvictExecutionCacheRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const EvictExecutionCacheRequest& EvictExecutionCacheRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + return *internal_default_instance(); +} + + +void EvictExecutionCacheRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { + delete id_; + } + id_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* EvictExecutionCacheRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.core.WorkflowExecutionIdentifier id = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::WorkflowExecutionIdentifier::_InternalParse; + object = msg->mutable_id(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool EvictExecutionCacheRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.service.EvictExecutionCacheRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.WorkflowExecutionIdentifier id = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_id())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.service.EvictExecutionCacheRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictExecutionCacheRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void EvictExecutionCacheRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.WorkflowExecutionIdentifier id = 1; + if (this->has_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::id(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictExecutionCacheRequest) +} + +::google::protobuf::uint8* EvictExecutionCacheRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.WorkflowExecutionIdentifier id = 1; + if (this->has_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::id(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictExecutionCacheRequest) + return target; +} + +size_t EvictExecutionCacheRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictExecutionCacheRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .flyteidl.core.WorkflowExecutionIdentifier id = 1; + if (this->has_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *id_); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void EvictExecutionCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictExecutionCacheRequest) + GOOGLE_DCHECK_NE(&from, this); + const EvictExecutionCacheRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictExecutionCacheRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictExecutionCacheRequest) + MergeFrom(*source); + } +} + +void EvictExecutionCacheRequest::MergeFrom(const EvictExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictExecutionCacheRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_id()) { + mutable_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.id()); + } +} + +void EvictExecutionCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictExecutionCacheRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void EvictExecutionCacheRequest::CopyFrom(const EvictExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictExecutionCacheRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool EvictExecutionCacheRequest::IsInitialized() const { + return true; +} + +void EvictExecutionCacheRequest::Swap(EvictExecutionCacheRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void EvictExecutionCacheRequest::InternalSwap(EvictExecutionCacheRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(id_, other->id_); +} + +::google::protobuf::Metadata EvictExecutionCacheRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto); + return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void EvictTaskExecutionCacheRequest::InitAsDefaultInstance() { + ::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_._instance.get_mutable()->id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( + ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); +} +class EvictTaskExecutionCacheRequest::HasBitSetters { + public: + static const ::flyteidl::core::TaskExecutionIdentifier& id(const EvictTaskExecutionCacheRequest* msg); +}; + +const ::flyteidl::core::TaskExecutionIdentifier& +EvictTaskExecutionCacheRequest::HasBitSetters::id(const EvictTaskExecutionCacheRequest* msg) { + return *msg->id_; +} +void EvictTaskExecutionCacheRequest::clear_id() { + if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { + delete id_; + } + id_ = nullptr; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int EvictTaskExecutionCacheRequest::kIdFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +EvictTaskExecutionCacheRequest::EvictTaskExecutionCacheRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.service.EvictTaskExecutionCacheRequest) +} +EvictTaskExecutionCacheRequest::EvictTaskExecutionCacheRequest(const EvictTaskExecutionCacheRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_id()) { + id_ = new ::flyteidl::core::TaskExecutionIdentifier(*from.id_); + } else { + id_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictTaskExecutionCacheRequest) +} + +void EvictTaskExecutionCacheRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + id_ = nullptr; +} + +EvictTaskExecutionCacheRequest::~EvictTaskExecutionCacheRequest() { + // @@protoc_insertion_point(destructor:flyteidl.service.EvictTaskExecutionCacheRequest) + SharedDtor(); +} + +void EvictTaskExecutionCacheRequest::SharedDtor() { + if (this != internal_default_instance()) delete id_; +} + +void EvictTaskExecutionCacheRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const EvictTaskExecutionCacheRequest& EvictTaskExecutionCacheRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + return *internal_default_instance(); +} + + +void EvictTaskExecutionCacheRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictTaskExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { + delete id_; + } + id_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* EvictTaskExecutionCacheRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.core.TaskExecutionIdentifier id = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::TaskExecutionIdentifier::_InternalParse; + object = msg->mutable_id(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool EvictTaskExecutionCacheRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.service.EvictTaskExecutionCacheRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.TaskExecutionIdentifier id = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_id())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.service.EvictTaskExecutionCacheRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictTaskExecutionCacheRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void EvictTaskExecutionCacheRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictTaskExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + if (this->has_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::id(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictTaskExecutionCacheRequest) +} + +::google::protobuf::uint8* EvictTaskExecutionCacheRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictTaskExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + if (this->has_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::id(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictTaskExecutionCacheRequest) + return target; +} + +size_t EvictTaskExecutionCacheRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictTaskExecutionCacheRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + if (this->has_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *id_); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void EvictTaskExecutionCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) + GOOGLE_DCHECK_NE(&from, this); + const EvictTaskExecutionCacheRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictTaskExecutionCacheRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictTaskExecutionCacheRequest) + MergeFrom(*source); + } +} + +void EvictTaskExecutionCacheRequest::MergeFrom(const EvictTaskExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_id()) { + mutable_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.id()); + } +} + +void EvictTaskExecutionCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void EvictTaskExecutionCacheRequest::CopyFrom(const EvictTaskExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool EvictTaskExecutionCacheRequest::IsInitialized() const { + return true; +} + +void EvictTaskExecutionCacheRequest::Swap(EvictTaskExecutionCacheRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void EvictTaskExecutionCacheRequest::InternalSwap(EvictTaskExecutionCacheRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(id_, other->id_); +} + +::google::protobuf::Metadata EvictTaskExecutionCacheRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto); + return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void EvictCacheResponse::InitAsDefaultInstance() { + ::flyteidl::service::_EvictCacheResponse_default_instance_._instance.get_mutable()->errors_ = const_cast< ::flyteidl::core::CacheEvictionErrorList*>( + ::flyteidl::core::CacheEvictionErrorList::internal_default_instance()); +} +class EvictCacheResponse::HasBitSetters { + public: + static const ::flyteidl::core::CacheEvictionErrorList& errors(const EvictCacheResponse* msg); +}; + +const ::flyteidl::core::CacheEvictionErrorList& +EvictCacheResponse::HasBitSetters::errors(const EvictCacheResponse* msg) { + return *msg->errors_; +} +void EvictCacheResponse::clear_errors() { + if (GetArenaNoVirtual() == nullptr && errors_ != nullptr) { + delete errors_; + } + errors_ = nullptr; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int EvictCacheResponse::kErrorsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +EvictCacheResponse::EvictCacheResponse() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.service.EvictCacheResponse) +} +EvictCacheResponse::EvictCacheResponse(const EvictCacheResponse& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_errors()) { + errors_ = new ::flyteidl::core::CacheEvictionErrorList(*from.errors_); + } else { + errors_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictCacheResponse) +} + +void EvictCacheResponse::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_EvictCacheResponse_flyteidl_2fservice_2fcache_2eproto.base); + errors_ = nullptr; +} + +EvictCacheResponse::~EvictCacheResponse() { + // @@protoc_insertion_point(destructor:flyteidl.service.EvictCacheResponse) + SharedDtor(); +} + +void EvictCacheResponse::SharedDtor() { + if (this != internal_default_instance()) delete errors_; +} + +void EvictCacheResponse::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const EvictCacheResponse& EvictCacheResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_EvictCacheResponse_flyteidl_2fservice_2fcache_2eproto.base); + return *internal_default_instance(); +} + + +void EvictCacheResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictCacheResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaNoVirtual() == nullptr && errors_ != nullptr) { + delete errors_; + } + errors_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* EvictCacheResponse::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.core.CacheEvictionErrorList errors = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::CacheEvictionErrorList::_InternalParse; + object = msg->mutable_errors(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool EvictCacheResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.service.EvictCacheResponse) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.CacheEvictionErrorList errors = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_errors())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.service.EvictCacheResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictCacheResponse) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void EvictCacheResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictCacheResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionErrorList errors = 1; + if (this->has_errors()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::errors(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictCacheResponse) +} + +::google::protobuf::uint8* EvictCacheResponse::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictCacheResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionErrorList errors = 1; + if (this->has_errors()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::errors(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictCacheResponse) + return target; +} + +size_t EvictCacheResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictCacheResponse) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .flyteidl.core.CacheEvictionErrorList errors = 1; + if (this->has_errors()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *errors_); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void EvictCacheResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictCacheResponse) + GOOGLE_DCHECK_NE(&from, this); + const EvictCacheResponse* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictCacheResponse) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictCacheResponse) + MergeFrom(*source); + } +} + +void EvictCacheResponse::MergeFrom(const EvictCacheResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictCacheResponse) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_errors()) { + mutable_errors()->::flyteidl::core::CacheEvictionErrorList::MergeFrom(from.errors()); + } +} + +void EvictCacheResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictCacheResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void EvictCacheResponse::CopyFrom(const EvictCacheResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictCacheResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool EvictCacheResponse::IsInitialized() const { + return true; +} + +void EvictCacheResponse::Swap(EvictCacheResponse* other) { + if (other == this) return; + InternalSwap(other); +} +void EvictCacheResponse::InternalSwap(EvictCacheResponse* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(errors_, other->errors_); +} + +::google::protobuf::Metadata EvictCacheResponse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto); + return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages]; +} + + +// @@protoc_insertion_point(namespace_scope) +} // namespace service +} // namespace flyteidl +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictExecutionCacheRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::service::EvictExecutionCacheRequest >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictTaskExecutionCacheRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::service::EvictTaskExecutionCacheRequest >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictCacheResponse* Arena::CreateMaybeMessage< ::flyteidl::service::EvictCacheResponse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::service::EvictCacheResponse >(arena); +} +} // namespace protobuf +} // namespace google + +// @@protoc_insertion_point(global_scope) +#include diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h new file mode 100644 index 0000000000..49169c4a63 --- /dev/null +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h @@ -0,0 +1,592 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: flyteidl/service/cache.proto + +#ifndef PROTOBUF_INCLUDED_flyteidl_2fservice_2fcache_2eproto +#define PROTOBUF_INCLUDED_flyteidl_2fservice_2fcache_2eproto + +#include +#include + +#include +#if PROTOBUF_VERSION < 3007000 +#error This file was generated by a newer version of protoc which is +#error incompatible with your Protocol Buffer headers. Please update +#error your headers. +#endif +#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION +#error This file was generated by an older version of protoc which is +#error incompatible with your Protocol Buffer headers. Please +#error regenerate this file with a newer version of protoc. +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: export +#include // IWYU pragma: export +#include +#include "google/api/annotations.pb.h" +#include "flyteidl/core/errors.pb.h" +#include "flyteidl/core/identifier.pb.h" +// @@protoc_insertion_point(includes) +#include +#define PROTOBUF_INTERNAL_EXPORT_flyteidl_2fservice_2fcache_2eproto + +// Internal implementation detail -- do not use these members. +struct TableStruct_flyteidl_2fservice_2fcache_2eproto { + static const ::google::protobuf::internal::ParseTableField entries[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::AuxillaryParseTableField aux[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::ParseTable schema[3] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::FieldMetadata field_metadata[]; + static const ::google::protobuf::internal::SerializationTable serialization_table[]; + static const ::google::protobuf::uint32 offsets[]; +}; +void AddDescriptors_flyteidl_2fservice_2fcache_2eproto(); +namespace flyteidl { +namespace service { +class EvictCacheResponse; +class EvictCacheResponseDefaultTypeInternal; +extern EvictCacheResponseDefaultTypeInternal _EvictCacheResponse_default_instance_; +class EvictExecutionCacheRequest; +class EvictExecutionCacheRequestDefaultTypeInternal; +extern EvictExecutionCacheRequestDefaultTypeInternal _EvictExecutionCacheRequest_default_instance_; +class EvictTaskExecutionCacheRequest; +class EvictTaskExecutionCacheRequestDefaultTypeInternal; +extern EvictTaskExecutionCacheRequestDefaultTypeInternal _EvictTaskExecutionCacheRequest_default_instance_; +} // namespace service +} // namespace flyteidl +namespace google { +namespace protobuf { +template<> ::flyteidl::service::EvictCacheResponse* Arena::CreateMaybeMessage<::flyteidl::service::EvictCacheResponse>(Arena*); +template<> ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictExecutionCacheRequest>(Arena*); +template<> ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictTaskExecutionCacheRequest>(Arena*); +} // namespace protobuf +} // namespace google +namespace flyteidl { +namespace service { + +// =================================================================== + +class EvictExecutionCacheRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictExecutionCacheRequest) */ { + public: + EvictExecutionCacheRequest(); + virtual ~EvictExecutionCacheRequest(); + + EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from); + + inline EvictExecutionCacheRequest& operator=(const EvictExecutionCacheRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + EvictExecutionCacheRequest(EvictExecutionCacheRequest&& from) noexcept + : EvictExecutionCacheRequest() { + *this = ::std::move(from); + } + + inline EvictExecutionCacheRequest& operator=(EvictExecutionCacheRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const EvictExecutionCacheRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const EvictExecutionCacheRequest* internal_default_instance() { + return reinterpret_cast( + &_EvictExecutionCacheRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 0; + + void Swap(EvictExecutionCacheRequest* other); + friend void swap(EvictExecutionCacheRequest& a, EvictExecutionCacheRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline EvictExecutionCacheRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + EvictExecutionCacheRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const EvictExecutionCacheRequest& from); + void MergeFrom(const EvictExecutionCacheRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(EvictExecutionCacheRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .flyteidl.core.WorkflowExecutionIdentifier id = 1; + bool has_id() const; + void clear_id(); + static const int kIdFieldNumber = 1; + const ::flyteidl::core::WorkflowExecutionIdentifier& id() const; + ::flyteidl::core::WorkflowExecutionIdentifier* release_id(); + ::flyteidl::core::WorkflowExecutionIdentifier* mutable_id(); + void set_allocated_id(::flyteidl::core::WorkflowExecutionIdentifier* id); + + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::core::WorkflowExecutionIdentifier* id_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto; +}; +// ------------------------------------------------------------------- + +class EvictTaskExecutionCacheRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictTaskExecutionCacheRequest) */ { + public: + EvictTaskExecutionCacheRequest(); + virtual ~EvictTaskExecutionCacheRequest(); + + EvictTaskExecutionCacheRequest(const EvictTaskExecutionCacheRequest& from); + + inline EvictTaskExecutionCacheRequest& operator=(const EvictTaskExecutionCacheRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + EvictTaskExecutionCacheRequest(EvictTaskExecutionCacheRequest&& from) noexcept + : EvictTaskExecutionCacheRequest() { + *this = ::std::move(from); + } + + inline EvictTaskExecutionCacheRequest& operator=(EvictTaskExecutionCacheRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const EvictTaskExecutionCacheRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const EvictTaskExecutionCacheRequest* internal_default_instance() { + return reinterpret_cast( + &_EvictTaskExecutionCacheRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 1; + + void Swap(EvictTaskExecutionCacheRequest* other); + friend void swap(EvictTaskExecutionCacheRequest& a, EvictTaskExecutionCacheRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline EvictTaskExecutionCacheRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + EvictTaskExecutionCacheRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const EvictTaskExecutionCacheRequest& from); + void MergeFrom(const EvictTaskExecutionCacheRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(EvictTaskExecutionCacheRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .flyteidl.core.TaskExecutionIdentifier id = 1; + bool has_id() const; + void clear_id(); + static const int kIdFieldNumber = 1; + const ::flyteidl::core::TaskExecutionIdentifier& id() const; + ::flyteidl::core::TaskExecutionIdentifier* release_id(); + ::flyteidl::core::TaskExecutionIdentifier* mutable_id(); + void set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id); + + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictTaskExecutionCacheRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::core::TaskExecutionIdentifier* id_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto; +}; +// ------------------------------------------------------------------- + +class EvictCacheResponse final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictCacheResponse) */ { + public: + EvictCacheResponse(); + virtual ~EvictCacheResponse(); + + EvictCacheResponse(const EvictCacheResponse& from); + + inline EvictCacheResponse& operator=(const EvictCacheResponse& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + EvictCacheResponse(EvictCacheResponse&& from) noexcept + : EvictCacheResponse() { + *this = ::std::move(from); + } + + inline EvictCacheResponse& operator=(EvictCacheResponse&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const EvictCacheResponse& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const EvictCacheResponse* internal_default_instance() { + return reinterpret_cast( + &_EvictCacheResponse_default_instance_); + } + static constexpr int kIndexInFileMessages = + 2; + + void Swap(EvictCacheResponse* other); + friend void swap(EvictCacheResponse& a, EvictCacheResponse& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline EvictCacheResponse* New() const final { + return CreateMaybeMessage(nullptr); + } + + EvictCacheResponse* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const EvictCacheResponse& from); + void MergeFrom(const EvictCacheResponse& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(EvictCacheResponse* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .flyteidl.core.CacheEvictionErrorList errors = 1; + bool has_errors() const; + void clear_errors(); + static const int kErrorsFieldNumber = 1; + const ::flyteidl::core::CacheEvictionErrorList& errors() const; + ::flyteidl::core::CacheEvictionErrorList* release_errors(); + ::flyteidl::core::CacheEvictionErrorList* mutable_errors(); + void set_allocated_errors(::flyteidl::core::CacheEvictionErrorList* errors); + + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictCacheResponse) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::core::CacheEvictionErrorList* errors_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto; +}; +// =================================================================== + + +// =================================================================== + +#ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif // __GNUC__ +// EvictExecutionCacheRequest + +// .flyteidl.core.WorkflowExecutionIdentifier id = 1; +inline bool EvictExecutionCacheRequest::has_id() const { + return this != internal_default_instance() && id_ != nullptr; +} +inline const ::flyteidl::core::WorkflowExecutionIdentifier& EvictExecutionCacheRequest::id() const { + const ::flyteidl::core::WorkflowExecutionIdentifier* p = id_; + // @@protoc_insertion_point(field_get:flyteidl.service.EvictExecutionCacheRequest.id) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_WorkflowExecutionIdentifier_default_instance_); +} +inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::release_id() { + // @@protoc_insertion_point(field_release:flyteidl.service.EvictExecutionCacheRequest.id) + + ::flyteidl::core::WorkflowExecutionIdentifier* temp = id_; + id_ = nullptr; + return temp; +} +inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::mutable_id() { + + if (id_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::WorkflowExecutionIdentifier>(GetArenaNoVirtual()); + id_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictExecutionCacheRequest.id) + return id_; +} +inline void EvictExecutionCacheRequest::set_allocated_id(::flyteidl::core::WorkflowExecutionIdentifier* id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(id_); + } + if (id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, id, submessage_arena); + } + + } else { + + } + id_ = id; + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictExecutionCacheRequest.id) +} + +// ------------------------------------------------------------------- + +// EvictTaskExecutionCacheRequest + +// .flyteidl.core.TaskExecutionIdentifier id = 1; +inline bool EvictTaskExecutionCacheRequest::has_id() const { + return this != internal_default_instance() && id_ != nullptr; +} +inline const ::flyteidl::core::TaskExecutionIdentifier& EvictTaskExecutionCacheRequest::id() const { + const ::flyteidl::core::TaskExecutionIdentifier* p = id_; + // @@protoc_insertion_point(field_get:flyteidl.service.EvictTaskExecutionCacheRequest.id) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_TaskExecutionIdentifier_default_instance_); +} +inline ::flyteidl::core::TaskExecutionIdentifier* EvictTaskExecutionCacheRequest::release_id() { + // @@protoc_insertion_point(field_release:flyteidl.service.EvictTaskExecutionCacheRequest.id) + + ::flyteidl::core::TaskExecutionIdentifier* temp = id_; + id_ = nullptr; + return temp; +} +inline ::flyteidl::core::TaskExecutionIdentifier* EvictTaskExecutionCacheRequest::mutable_id() { + + if (id_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::TaskExecutionIdentifier>(GetArenaNoVirtual()); + id_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictTaskExecutionCacheRequest.id) + return id_; +} +inline void EvictTaskExecutionCacheRequest::set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(id_); + } + if (id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, id, submessage_arena); + } + + } else { + + } + id_ = id; + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictTaskExecutionCacheRequest.id) +} + +// ------------------------------------------------------------------- + +// EvictCacheResponse + +// .flyteidl.core.CacheEvictionErrorList errors = 1; +inline bool EvictCacheResponse::has_errors() const { + return this != internal_default_instance() && errors_ != nullptr; +} +inline const ::flyteidl::core::CacheEvictionErrorList& EvictCacheResponse::errors() const { + const ::flyteidl::core::CacheEvictionErrorList* p = errors_; + // @@protoc_insertion_point(field_get:flyteidl.service.EvictCacheResponse.errors) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_CacheEvictionErrorList_default_instance_); +} +inline ::flyteidl::core::CacheEvictionErrorList* EvictCacheResponse::release_errors() { + // @@protoc_insertion_point(field_release:flyteidl.service.EvictCacheResponse.errors) + + ::flyteidl::core::CacheEvictionErrorList* temp = errors_; + errors_ = nullptr; + return temp; +} +inline ::flyteidl::core::CacheEvictionErrorList* EvictCacheResponse::mutable_errors() { + + if (errors_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::CacheEvictionErrorList>(GetArenaNoVirtual()); + errors_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictCacheResponse.errors) + return errors_; +} +inline void EvictCacheResponse::set_allocated_errors(::flyteidl::core::CacheEvictionErrorList* errors) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(errors_); + } + if (errors) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + errors = ::google::protobuf::internal::GetOwnedMessage( + message_arena, errors, submessage_arena); + } + + } else { + + } + errors_ = errors; + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictCacheResponse.errors) +} + +#ifdef __GNUC__ + #pragma GCC diagnostic pop +#endif // __GNUC__ +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + + +// @@protoc_insertion_point(namespace_scope) + +} // namespace service +} // namespace flyteidl + +// @@protoc_insertion_point(global_scope) + +#include +#endif // PROTOBUF_INCLUDED_flyteidl_2fservice_2fcache_2eproto diff --git a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go index 0a13f9c22d..97f79a51e8 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.go @@ -1445,13 +1445,10 @@ type ExecutionUpdateRequest struct { // Identifier of the execution to update Id *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // State to set as the new value active/archive - State ExecutionState `protobuf:"varint,2,opt,name=state,proto3,enum=flyteidl.admin.ExecutionState" json:"state,omitempty"` - // Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the - // execution DAG and remove all stored results from datacatalog. - EvictCache bool `protobuf:"varint,3,opt,name=evict_cache,json=evictCache,proto3" json:"evict_cache,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + State ExecutionState `protobuf:"varint,2,opt,name=state,proto3,enum=flyteidl.admin.ExecutionState" json:"state,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ExecutionUpdateRequest) Reset() { *m = ExecutionUpdateRequest{} } @@ -1493,13 +1490,6 @@ func (m *ExecutionUpdateRequest) GetState() ExecutionState { return ExecutionState_EXECUTION_ACTIVE } -func (m *ExecutionUpdateRequest) GetEvictCache() bool { - if m != nil { - return m.EvictCache - } - return false -} - type ExecutionStateChangeDetails struct { // The state of the execution is used to control its visibility in the UI/CLI. State ExecutionState `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.ExecutionState" json:"state,omitempty"` @@ -1559,12 +1549,9 @@ func (m *ExecutionStateChangeDetails) GetPrincipal() string { } type ExecutionUpdateResponse struct { - // List of errors encountered during cache eviction (if any). - // Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. - CacheEvictionErrors *core.CacheEvictionErrorList `protobuf:"bytes,1,opt,name=cache_eviction_errors,json=cacheEvictionErrors,proto3" json:"cache_eviction_errors,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ExecutionUpdateResponse) Reset() { *m = ExecutionUpdateResponse{} } @@ -1592,13 +1579,6 @@ func (m *ExecutionUpdateResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ExecutionUpdateResponse proto.InternalMessageInfo -func (m *ExecutionUpdateResponse) GetCacheEvictionErrors() *core.CacheEvictionErrorList { - if m != nil { - return m.CacheEvictionErrors - } - return nil -} - func init() { proto.RegisterEnum("flyteidl.admin.ExecutionState", ExecutionState_name, ExecutionState_value) proto.RegisterEnum("flyteidl.admin.ExecutionMetadata_ExecutionMode", ExecutionMetadata_ExecutionMode_name, ExecutionMetadata_ExecutionMode_value) @@ -1628,117 +1608,114 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/execution.proto", fileDescriptor_4e2785d91b3809ec) } var fileDescriptor_4e2785d91b3809ec = []byte{ - // 1786 bytes of a gzipped FileDescriptorProto + // 1730 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdd, 0x72, 0xdb, 0xc6, - 0x15, 0x16, 0x29, 0x4a, 0xa2, 0x0e, 0x4d, 0x8a, 0x5e, 0x39, 0x0a, 0x22, 0x3b, 0xb6, 0x82, 0x4e, - 0x1a, 0x4f, 0x32, 0x25, 0x27, 0x4a, 0x35, 0x99, 0xb8, 0x75, 0x26, 0x14, 0x45, 0x87, 0x4a, 0xf5, - 0xe3, 0xae, 0x7e, 0x1c, 0xa7, 0x93, 0x41, 0x97, 0xc0, 0x92, 0x42, 0x03, 0x60, 0xe1, 0xdd, 0x85, - 0x65, 0xbf, 0x41, 0x1f, 0xa1, 0x7d, 0x83, 0xce, 0x74, 0xa6, 0x97, 0xbd, 0xe8, 0x75, 0x9f, 0xa0, - 0x4f, 0xd4, 0xc1, 0x62, 0x01, 0x02, 0x20, 0x65, 0xc9, 0x63, 0xdf, 0x11, 0xe7, 0x7c, 0xe7, 0xec, - 0xd9, 0xf3, 0xbf, 0x84, 0xfb, 0x63, 0xef, 0xb5, 0xa4, 0xae, 0xe3, 0x75, 0x89, 0xe3, 0xbb, 0x41, - 0x97, 0xbe, 0xa2, 0x76, 0x24, 0x5d, 0x16, 0x74, 0x42, 0xce, 0x24, 0x43, 0xad, 0x94, 0xdf, 0x51, - 0xfc, 0xcd, 0xcf, 0x4a, 0x78, 0xdb, 0x8b, 0x84, 0xa4, 0xdc, 0x22, 0x42, 0xb8, 0x93, 0xc0, 0xa7, - 0x81, 0x4c, 0x04, 0x37, 0xef, 0x96, 0x81, 0xcc, 0xf7, 0x53, 0xad, 0x9b, 0xf7, 0x32, 0xa6, 0xcd, - 0x38, 0xed, 0x7a, 0xae, 0xa4, 0x9c, 0x78, 0x42, 0x73, 0x37, 0x8b, 0x5c, 0xca, 0x39, 0xe3, 0x29, - 0xef, 0xe3, 0x12, 0xaf, 0x68, 0xee, 0xe6, 0xfd, 0x22, 0xdb, 0x75, 0x68, 0x20, 0xdd, 0xb1, 0x4b, - 0xf9, 0xfc, 0x83, 0x05, 0xb5, 0x23, 0xee, 0xca, 0xd7, 0xa9, 0xf4, 0x84, 0xb1, 0x89, 0x47, 0xbb, - 0xea, 0x6b, 0x14, 0x8d, 0xbb, 0x4e, 0xc4, 0x49, 0x4e, 0xfb, 0x83, 0x32, 0x5f, 0xba, 0x3e, 0x15, - 0x92, 0xf8, 0xe1, 0x55, 0x0a, 0x2e, 0x39, 0x09, 0x43, 0x9a, 0x5a, 0x6f, 0xfe, 0xb7, 0x02, 0x1b, - 0x83, 0xd4, 0xe4, 0x3e, 0xa7, 0x44, 0x52, 0x4c, 0x5f, 0x44, 0x54, 0x48, 0x64, 0xc0, 0x4a, 0xc8, - 0xd9, 0x5f, 0xa8, 0x2d, 0x8d, 0xca, 0x56, 0xe5, 0xe1, 0x2a, 0x4e, 0x3f, 0xd1, 0x06, 0x2c, 0x3b, - 0xcc, 0x27, 0x6e, 0x60, 0x54, 0x15, 0x43, 0x7f, 0x21, 0x04, 0xb5, 0x80, 0xf8, 0xd4, 0x58, 0x54, - 0x54, 0xf5, 0x1b, 0x7d, 0x09, 0x35, 0x11, 0x52, 0xdb, 0xa8, 0x6d, 0x55, 0x1e, 0x36, 0xb6, 0x3f, - 0xee, 0x14, 0xa3, 0xd7, 0xc9, 0xce, 0x3e, 0x09, 0xa9, 0x8d, 0x15, 0x14, 0x7d, 0x09, 0xcb, 0x6e, - 0x10, 0x46, 0x52, 0x18, 0x4b, 0x4a, 0xe8, 0xa3, 0xa9, 0x50, 0xec, 0xa3, 0xce, 0x41, 0x12, 0x9c, - 0x43, 0x12, 0x62, 0x0d, 0x34, 0xff, 0x5e, 0x01, 0x23, 0x53, 0x85, 0xa9, 0x47, 0xa2, 0xc0, 0xbe, - 0x48, 0x2f, 0xf2, 0x08, 0xaa, 0xae, 0xa3, 0xee, 0xd0, 0xd8, 0xfe, 0xbc, 0xa4, 0xeb, 0x19, 0xe3, - 0xbf, 0x8c, 0x3d, 0x76, 0x99, 0x09, 0xef, 0x67, 0x01, 0xc2, 0x55, 0xd7, 0x99, 0x7b, 0xa5, 0xcf, - 0x60, 0x8d, 0xbd, 0xa4, 0xfc, 0x92, 0xbb, 0x92, 0x5a, 0x36, 0xb1, 0x2f, 0xa8, 0xba, 0x5d, 0x1d, - 0xb7, 0x32, 0x72, 0x3f, 0xa6, 0xfe, 0x50, 0xab, 0x57, 0xdb, 0x8b, 0xe6, 0x3f, 0x2a, 0xf0, 0x61, - 0xce, 0x36, 0x3b, 0x06, 0xbd, 0x4f, 0xd3, 0xaa, 0x39, 0xd3, 0x1e, 0x43, 0xdd, 0xa7, 0x92, 0x38, - 0x44, 0x12, 0x65, 0x72, 0x63, 0xfb, 0x93, 0x2b, 0x3d, 0x7e, 0xa8, 0x81, 0x38, 0x13, 0x31, 0xcf, - 0x72, 0x96, 0xa6, 0xc9, 0x20, 0x42, 0x16, 0x08, 0xfa, 0x2e, 0x96, 0x9a, 0xcf, 0xe1, 0xee, 0x0c, - 0xe4, 0x7b, 0x2a, 0xdf, 0x83, 0x13, 0xcc, 0x7f, 0x57, 0x60, 0x35, 0xe3, 0xbd, 0x93, 0x3b, 0xd3, - 0x44, 0xad, 0xde, 0x3c, 0x51, 0x1f, 0xc1, 0x8a, 0xed, 0x31, 0x11, 0x71, 0xaa, 0x9d, 0xbd, 0x75, - 0xa5, 0x54, 0x3f, 0xc1, 0xe1, 0x54, 0xc0, 0xfc, 0x33, 0x34, 0x33, 0xe6, 0x81, 0x2b, 0x24, 0xfa, - 0x06, 0x20, 0xeb, 0x1d, 0xc2, 0xa8, 0x6c, 0x2d, 0x16, 0x33, 0xbf, 0xa4, 0x0f, 0xe7, 0xc0, 0xe8, - 0x0e, 0x2c, 0x49, 0xf6, 0x0b, 0x4d, 0xcb, 0x31, 0xf9, 0x30, 0x29, 0xb4, 0xa6, 0x95, 0xb2, 0xeb, - 0xb1, 0x11, 0xfa, 0x1a, 0x96, 0x5f, 0x12, 0x2f, 0xa2, 0x42, 0xbb, 0xe8, 0xea, 0xc2, 0xda, 0xad, - 0x1a, 0x95, 0xe1, 0x02, 0xd6, 0x70, 0x84, 0x60, 0x31, 0xe2, 0x6e, 0xa2, 0x7e, 0xb8, 0x80, 0xe3, - 0x8f, 0xdd, 0x65, 0xa8, 0xa9, 0x9c, 0xe9, 0x43, 0xb3, 0x37, 0x62, 0x5c, 0xa6, 0xe9, 0x14, 0x5b, - 0x63, 0x93, 0x48, 0x50, 0xdd, 0x35, 0x92, 0x0f, 0x74, 0x0f, 0x56, 0x43, 0xee, 0x06, 0xb6, 0x1b, - 0x12, 0x4f, 0xdb, 0x39, 0x25, 0x98, 0x7f, 0x5b, 0x81, 0x76, 0xd9, 0x57, 0xe8, 0x5b, 0x58, 0x61, - 0x91, 0x54, 0x8d, 0x20, 0xb1, 0xf7, 0x7e, 0xd9, 0x1d, 0xc5, 0xfb, 0x69, 0xa3, 0x53, 0x21, 0xb4, - 0x03, 0x4b, 0xaa, 0x53, 0xcf, 0x86, 0x54, 0xdd, 0x36, 0x3b, 0x6f, 0x10, 0x83, 0x86, 0x0b, 0x38, - 0x41, 0xa3, 0x4f, 0xa1, 0x41, 0xe2, 0x0b, 0x59, 0xc9, 0x2d, 0x20, 0xb6, 0x55, 0xab, 0x06, 0xc5, - 0xe8, 0xab, 0x0b, 0x3d, 0x81, 0x56, 0x02, 0xcb, 0x0a, 0xee, 0xd6, 0xfc, 0xcc, 0x29, 0x78, 0x67, - 0xb8, 0x80, 0x9b, 0xa4, 0xe0, 0xae, 0xef, 0xa0, 0x91, 0x18, 0x6c, 0x29, 0x25, 0xcd, 0x9b, 0x45, - 0x06, 0x12, 0x99, 0xbd, 0x58, 0xc3, 0x13, 0x58, 0xb3, 0x99, 0x1f, 0x46, 0x92, 0x3a, 0x96, 0x6e, - 0x9c, 0x8b, 0x37, 0xd0, 0x82, 0x5b, 0xa9, 0xd4, 0xbe, 0x12, 0x42, 0xbf, 0x87, 0xa5, 0xf0, 0x82, - 0x88, 0xa4, 0x9b, 0xb5, 0xb6, 0x7f, 0x7d, 0x5d, 0x01, 0x75, 0x9e, 0xc6, 0x68, 0x9c, 0x08, 0xc5, - 0xf9, 0x2b, 0x24, 0xe1, 0xb1, 0x11, 0x44, 0xea, 0xce, 0xbd, 0xd9, 0x49, 0xc6, 0x4f, 0x27, 0x1d, - 0x3f, 0x9d, 0xd3, 0x74, 0x3e, 0xe1, 0x55, 0x8d, 0xee, 0x49, 0xb4, 0x03, 0xf5, 0x74, 0xae, 0x19, - 0xcb, 0xda, 0xf2, 0xb2, 0xe0, 0x9e, 0x06, 0xe0, 0x0c, 0x1a, 0x9f, 0x68, 0xab, 0x26, 0xa5, 0x4e, - 0x5c, 0xb9, 0xfe, 0x44, 0x8d, 0xee, 0xa9, 0x62, 0x8b, 0x42, 0x27, 0x15, 0xad, 0x5f, 0x2f, 0xaa, - 0xd1, 0x3d, 0x89, 0x76, 0xa1, 0x19, 0xb0, 0xb8, 0x6f, 0xd8, 0x24, 0x29, 0xd5, 0x55, 0x55, 0xaa, - 0xf7, 0xca, 0x61, 0x3f, 0xca, 0x81, 0x70, 0x51, 0x04, 0x3d, 0x82, 0xc6, 0xa5, 0xf6, 0xa6, 0xe5, - 0x3a, 0x46, 0x63, 0x6e, 0xb4, 0x72, 0xfd, 0x09, 0x52, 0xf4, 0xbe, 0x83, 0x7e, 0x86, 0x3b, 0x42, - 0x92, 0x78, 0xf2, 0x5c, 0x90, 0x60, 0x42, 0x2d, 0x87, 0x4a, 0xe2, 0x7a, 0xc2, 0x68, 0x29, 0x25, - 0x5f, 0x5c, 0xdd, 0xb7, 0x62, 0xa1, 0xbe, 0x92, 0xd9, 0x4b, 0x44, 0x30, 0x12, 0x33, 0xb4, 0xdd, - 0x35, 0x68, 0xea, 0x74, 0xe4, 0x54, 0x44, 0x9e, 0x34, 0x1f, 0x43, 0xeb, 0xe4, 0xb5, 0x90, 0xd4, - 0xcf, 0x32, 0xf6, 0x0b, 0xb8, 0x9d, 0x35, 0x1f, 0x4b, 0xaf, 0x5b, 0xba, 0xd8, 0xdb, 0x74, 0x5a, - 0xc4, 0x8a, 0x6e, 0xfe, 0xa7, 0x06, 0xb7, 0x67, 0x46, 0x0e, 0xea, 0x43, 0xcd, 0x67, 0x4e, 0xd2, - 0x22, 0x5a, 0xdb, 0xdd, 0x6b, 0x67, 0x54, 0x8e, 0xc2, 0x1c, 0x8a, 0x95, 0xf0, 0x9b, 0x5b, 0x4a, - 0xbc, 0xbe, 0x04, 0x54, 0x48, 0x37, 0x98, 0xa8, 0x6a, 0x68, 0xe2, 0xf4, 0x13, 0x3d, 0x86, 0x5b, - 0xc2, 0xbe, 0xa0, 0x4e, 0xe4, 0x25, 0xe1, 0xaf, 0x5d, 0x1b, 0xfe, 0x46, 0x86, 0xef, 0x49, 0xf4, - 0x13, 0x7c, 0x10, 0x12, 0x4e, 0x03, 0x69, 0x05, 0xcc, 0xa1, 0x56, 0x76, 0x63, 0x9d, 0xf3, 0xe5, - 0xb2, 0x39, 0x62, 0x0e, 0x9d, 0x37, 0x73, 0xd6, 0x13, 0x25, 0x05, 0x36, 0xfa, 0x13, 0xac, 0x73, - 0x3a, 0xa6, 0x9c, 0x06, 0x76, 0x5e, 0x73, 0xfb, 0xad, 0x27, 0x1a, 0xca, 0xd4, 0x4c, 0x95, 0x7f, - 0x0f, 0x6b, 0x42, 0x45, 0x72, 0xda, 0xb2, 0x6e, 0xcf, 0xef, 0xab, 0xc5, 0x80, 0xe3, 0x96, 0x28, - 0x7c, 0x9b, 0x93, 0xdc, 0xec, 0x8a, 0xe3, 0x81, 0x00, 0x96, 0x0f, 0x7b, 0x47, 0x67, 0xbd, 0x83, - 0xf6, 0x02, 0x6a, 0xc2, 0xea, 0x49, 0x7f, 0x38, 0xd8, 0x3b, 0x3b, 0x18, 0xec, 0xb5, 0x2b, 0x31, - 0xeb, 0xe4, 0xf9, 0xc9, 0xe9, 0xe0, 0xb0, 0x5d, 0x45, 0xb7, 0xa0, 0x8e, 0x07, 0x07, 0xbd, 0xb3, - 0xa3, 0xfe, 0xb0, 0xbd, 0x88, 0x10, 0xb4, 0xfa, 0xc3, 0xfd, 0x83, 0x3d, 0xeb, 0xd9, 0x31, 0xfe, - 0xc3, 0x93, 0x83, 0xe3, 0x67, 0xed, 0x5a, 0x2c, 0x8c, 0x07, 0xfd, 0xe3, 0xf3, 0x01, 0x1e, 0xec, - 0xb5, 0x97, 0xcc, 0x73, 0x68, 0xe7, 0xcb, 0x48, 0xcd, 0xc9, 0x99, 0xfa, 0xab, 0xbc, 0x75, 0xfd, - 0x99, 0xff, 0x5b, 0xc9, 0xdd, 0xe0, 0x24, 0x19, 0xe5, 0x8d, 0x64, 0x69, 0xb4, 0x42, 0x8f, 0x04, - 0x57, 0xcc, 0xc7, 0x7c, 0x45, 0x26, 0xe8, 0xa7, 0x1e, 0x09, 0xd0, 0x4e, 0xb6, 0xaf, 0x56, 0x6f, - 0xd2, 0x76, 0x35, 0xf8, 0x1d, 0x77, 0x35, 0x34, 0x2c, 0xfb, 0x61, 0x69, 0xfe, 0x0a, 0x52, 0x76, - 0x60, 0x3c, 0x81, 0x8a, 0xdd, 0xe8, 0x13, 0x68, 0x38, 0xae, 0x20, 0x23, 0x8f, 0x5a, 0xc4, 0xf3, - 0x54, 0x07, 0xae, 0xc7, 0x23, 0x46, 0x13, 0x7b, 0x9e, 0x87, 0x3a, 0xb0, 0xec, 0x91, 0x11, 0xf5, - 0x84, 0x6e, 0xb3, 0x1b, 0x33, 0x93, 0x58, 0x71, 0xb1, 0x46, 0xa1, 0xc7, 0xd0, 0x20, 0x41, 0xc0, - 0xa4, 0x36, 0x2d, 0x69, 0xb0, 0x77, 0x67, 0x26, 0xe3, 0x14, 0x82, 0xf3, 0x78, 0xb4, 0x0f, 0xed, - 0xf4, 0x21, 0x64, 0xd9, 0x2c, 0x90, 0xf4, 0x95, 0x54, 0x73, 0xb8, 0x90, 0xaa, 0xca, 0xb7, 0x27, - 0x1a, 0xd6, 0x4f, 0x50, 0x78, 0x4d, 0x14, 0x09, 0xe8, 0x1b, 0x58, 0x25, 0x91, 0xbc, 0xb0, 0x38, - 0xf3, 0xa8, 0xae, 0x23, 0x63, 0xc6, 0x8e, 0x48, 0x5e, 0x60, 0xe6, 0x51, 0x15, 0x9e, 0x3a, 0xd1, - 0x5f, 0xe8, 0x10, 0xd0, 0x8b, 0x88, 0x78, 0xb1, 0x11, 0x6c, 0x6c, 0x09, 0xca, 0x5f, 0xba, 0x36, - 0xd5, 0x25, 0xf3, 0xa0, 0x64, 0xc7, 0x1f, 0x13, 0xe0, 0xf1, 0xf8, 0x24, 0x81, 0xe1, 0xf6, 0x8b, - 0x12, 0x25, 0x7e, 0x36, 0xf8, 0xe4, 0x95, 0x15, 0x12, 0x4e, 0x3c, 0x8f, 0x7a, 0xae, 0xf0, 0x0d, - 0xb4, 0x55, 0x79, 0xb8, 0x84, 0x5b, 0x3e, 0x79, 0xf5, 0x74, 0x4a, 0x45, 0x3f, 0xc2, 0x06, 0x27, - 0x97, 0x56, 0x6e, 0x2b, 0x88, 0x9d, 0x30, 0x76, 0x27, 0xc6, 0xba, 0x3a, 0xfb, 0x57, 0x65, 0xfb, - 0x31, 0xb9, 0x3c, 0xce, 0xd6, 0x81, 0xbe, 0x82, 0xe2, 0x75, 0x3e, 0x4b, 0x44, 0x4f, 0x01, 0xcd, - 0x3e, 0x8f, 0x8d, 0x3b, 0xf3, 0x93, 0x4f, 0x77, 0xf0, 0x5e, 0x06, 0xc4, 0xb7, 0xed, 0x32, 0x09, - 0x7d, 0x07, 0x4d, 0x37, 0x90, 0x94, 0xf3, 0x28, 0x94, 0xee, 0xc8, 0xa3, 0xc6, 0x07, 0x57, 0x34, - 0xd3, 0x5d, 0xc6, 0xbc, 0xf3, 0x78, 0x9b, 0xc4, 0x45, 0x81, 0x79, 0xaf, 0xa9, 0x8d, 0x79, 0xaf, - 0xa9, 0x5d, 0x03, 0x36, 0xf2, 0x79, 0x6b, 0xc5, 0x6c, 0xee, 0x3a, 0x54, 0xfc, 0x50, 0xab, 0xd7, - 0xda, 0x4b, 0xa6, 0x0f, 0x1f, 0x65, 0xf5, 0x72, 0x4a, 0xb9, 0xef, 0x06, 0xb9, 0xc7, 0xec, 0xbb, - 0xbc, 0x0c, 0xb2, 0x85, 0xb6, 0x9a, 0x5b, 0x68, 0xcd, 0x7b, 0xb0, 0x39, 0xef, 0xb8, 0xe4, 0xb9, - 0x64, 0xfe, 0x0c, 0x0f, 0xe6, 0x3d, 0x79, 0xe2, 0x58, 0xbc, 0x8f, 0x67, 0xcf, 0x5f, 0xab, 0xb0, - 0x75, 0xb5, 0x7e, 0xfd, 0x64, 0xdb, 0x29, 0xef, 0xcf, 0x1f, 0x96, 0x43, 0x7c, 0xc6, 0xbd, 0x74, - 0x71, 0x9e, 0xae, 0xcd, 0x5f, 0x95, 0xda, 0xd9, 0x1b, 0xa5, 0xd2, 0x66, 0xf6, 0x08, 0x1a, 0xe3, - 0xc8, 0xf3, 0x6e, 0xba, 0x7f, 0x62, 0x88, 0xd1, 0xd9, 0xde, 0x79, 0x4b, 0xc9, 0xa6, 0xc6, 0xd6, - 0xae, 0x13, 0x56, 0x47, 0x25, 0xc9, 0x2d, 0xcc, 0x7f, 0xe6, 0xff, 0xc1, 0x38, 0x53, 0x6b, 0xda, - 0xfb, 0x08, 0xfa, 0x6f, 0x61, 0x49, 0x6d, 0x47, 0xca, 0x09, 0xad, 0xd9, 0x11, 0x59, 0xdc, 0xab, - 0x70, 0x02, 0x46, 0x0f, 0xa0, 0x41, 0x5f, 0xba, 0xb6, 0xd4, 0x89, 0xbc, 0xa8, 0x12, 0x19, 0x14, - 0x49, 0x25, 0xb1, 0xf9, 0xaf, 0x0a, 0xdc, 0x7d, 0xc3, 0x4a, 0x36, 0x3d, 0xb6, 0xf2, 0x36, 0xc7, - 0xfe, 0x0e, 0x1a, 0xcc, 0xb6, 0x23, 0xce, 0x93, 0x85, 0xa6, 0x7a, 0xed, 0x42, 0x03, 0x29, 0xbc, - 0x27, 0x8b, 0x6b, 0xd4, 0x62, 0xf9, 0x65, 0x26, 0x73, 0x7f, 0x09, 0xa4, 0xde, 0xd5, 0xf9, 0xf5, - 0x1c, 0x3e, 0x50, 0xd7, 0xb4, 0xd4, 0xfd, 0xe2, 0x92, 0x4c, 0xfe, 0x18, 0xd3, 0x1e, 0xff, 0xb4, - 0xe4, 0x71, 0xe5, 0x80, 0x81, 0x86, 0xaa, 0x37, 0x57, 0x3c, 0x8e, 0xf0, 0xba, 0x3d, 0x43, 0x17, - 0x9f, 0x7f, 0x0b, 0xad, 0xe2, 0x4d, 0xd1, 0x1d, 0x68, 0x0f, 0x7e, 0x1c, 0xf4, 0xcf, 0x4e, 0xf7, - 0x8f, 0x8f, 0xac, 0x5e, 0xff, 0x74, 0xff, 0x7c, 0xd0, 0x5e, 0x40, 0x1b, 0x80, 0x72, 0x54, 0xdc, - 0x1f, 0xee, 0x9f, 0xc7, 0x5b, 0xc7, 0xee, 0xd7, 0x3f, 0xed, 0x4c, 0x5c, 0x79, 0x11, 0x8d, 0x3a, - 0x36, 0xf3, 0xbb, 0xca, 0x0e, 0xc6, 0x27, 0xdd, 0xec, 0xbf, 0xb6, 0x09, 0x0d, 0xba, 0xe1, 0xe8, - 0x37, 0x13, 0xd6, 0x2d, 0xfe, 0x29, 0x38, 0x5a, 0x56, 0xce, 0xfa, 0xea, 0xff, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xae, 0xb6, 0x27, 0x59, 0x86, 0x14, 0x00, 0x00, + 0x15, 0x16, 0x29, 0x52, 0xa2, 0x0e, 0x4d, 0x9a, 0x5e, 0x3b, 0x0a, 0x2c, 0x3b, 0xb6, 0x82, 0x4e, + 0x1b, 0x4f, 0x32, 0x25, 0x27, 0x4a, 0x35, 0x99, 0xb8, 0x75, 0x26, 0x14, 0x45, 0x87, 0x4a, 0xf5, + 0xe3, 0xae, 0x7e, 0x9c, 0xa4, 0x93, 0x41, 0x97, 0xc0, 0x92, 0x42, 0xb3, 0xc0, 0xc2, 0x8b, 0x85, + 0x65, 0xbf, 0x41, 0xa7, 0x4f, 0xd0, 0xbe, 0x41, 0xaf, 0x7a, 0xd9, 0x8b, 0x5e, 0xf7, 0x09, 0xfa, + 0x44, 0x19, 0x2c, 0x16, 0x20, 0x00, 0x52, 0x96, 0x3c, 0xf6, 0x1d, 0xf7, 0x9c, 0xef, 0x1c, 0x9c, + 0x3d, 0xff, 0x4b, 0x78, 0x30, 0x61, 0xaf, 0x25, 0x75, 0x1d, 0xd6, 0x23, 0x8e, 0xe7, 0xfa, 0x3d, + 0xfa, 0x8a, 0xda, 0x91, 0x74, 0xb9, 0xdf, 0x0d, 0x04, 0x97, 0x1c, 0xb5, 0x53, 0x7e, 0x57, 0xf1, + 0x37, 0x3e, 0x29, 0xe1, 0x6d, 0x16, 0x85, 0x92, 0x0a, 0x8b, 0x84, 0xa1, 0x3b, 0xf5, 0x3d, 0xea, + 0xcb, 0x44, 0x70, 0xe3, 0x5e, 0x19, 0xc8, 0x3d, 0x2f, 0xd5, 0xba, 0x71, 0x3f, 0x63, 0xda, 0x5c, + 0xd0, 0x1e, 0x73, 0x25, 0x15, 0x84, 0x85, 0x9a, 0xfb, 0x51, 0x91, 0x5b, 0x32, 0x69, 0xe3, 0x41, + 0x91, 0xed, 0x3a, 0xd4, 0x97, 0xee, 0xc4, 0xa5, 0x62, 0xb1, 0xf2, 0x90, 0xda, 0x91, 0x70, 0xe5, + 0xeb, 0x54, 0x7a, 0xca, 0xf9, 0x94, 0xd1, 0x9e, 0x3a, 0x8d, 0xa3, 0x49, 0xcf, 0x89, 0x04, 0xc9, + 0x69, 0x7f, 0x58, 0xe6, 0x4b, 0xd7, 0xa3, 0xa1, 0x24, 0x5e, 0x70, 0x99, 0x82, 0x0b, 0x41, 0x82, + 0x80, 0x0a, 0x6d, 0xbd, 0xf9, 0xbf, 0x0a, 0xac, 0x0f, 0x53, 0x93, 0x07, 0x82, 0x12, 0x49, 0x31, + 0x7d, 0x11, 0xd1, 0x50, 0x22, 0x03, 0x56, 0x03, 0xc1, 0xff, 0x4a, 0x6d, 0x69, 0x54, 0x36, 0x2b, + 0x8f, 0xd6, 0x70, 0x7a, 0x44, 0xeb, 0xb0, 0xe2, 0x70, 0x8f, 0xb8, 0xbe, 0x51, 0x55, 0x0c, 0x7d, + 0x42, 0x08, 0x6a, 0x3e, 0xf1, 0xa8, 0xb1, 0xac, 0xa8, 0xea, 0x37, 0xfa, 0x1c, 0x6a, 0x61, 0x40, + 0x6d, 0xa3, 0xb6, 0x59, 0x79, 0xd4, 0xdc, 0xfa, 0xa8, 0x5b, 0x8c, 0x50, 0x37, 0xfb, 0xf6, 0x71, + 0x40, 0x6d, 0xac, 0xa0, 0xe8, 0x73, 0x58, 0x71, 0xfd, 0x20, 0x92, 0xa1, 0x51, 0x57, 0x42, 0x77, + 0x67, 0x42, 0xb1, 0x8f, 0xba, 0xfb, 0x49, 0x00, 0x0e, 0x48, 0x80, 0x35, 0xd0, 0xfc, 0x67, 0x05, + 0x8c, 0x4c, 0x15, 0xa6, 0x8c, 0x44, 0xbe, 0x7d, 0x9e, 0x5e, 0xe4, 0x31, 0x54, 0x5d, 0x47, 0xdd, + 0xa1, 0xb9, 0xf5, 0x69, 0x49, 0xd7, 0x73, 0x2e, 0x7e, 0x9e, 0x30, 0x7e, 0x91, 0x09, 0xef, 0x65, + 0x01, 0xc2, 0x55, 0xd7, 0x59, 0x78, 0xa5, 0x4f, 0xe0, 0x26, 0x7f, 0x49, 0xc5, 0x85, 0x70, 0x25, + 0xb5, 0x6c, 0x62, 0x9f, 0x53, 0x75, 0xbb, 0x06, 0x6e, 0x67, 0xe4, 0x41, 0x4c, 0xfd, 0xae, 0xd6, + 0xa8, 0x76, 0x96, 0xcd, 0x7f, 0x55, 0xe0, 0xc3, 0x9c, 0x6d, 0x76, 0x0c, 0x7a, 0x9f, 0xa6, 0x55, + 0x73, 0xa6, 0x3d, 0x81, 0x86, 0x47, 0x25, 0x71, 0x88, 0x24, 0xca, 0xe4, 0xe6, 0xd6, 0xc7, 0x97, + 0x7a, 0xfc, 0x40, 0x03, 0x71, 0x26, 0x62, 0x9e, 0xe6, 0x2c, 0x4d, 0x93, 0x21, 0x0c, 0xb8, 0x1f, + 0xd2, 0x77, 0xb1, 0xd4, 0xfc, 0x01, 0xee, 0xcd, 0x41, 0xbe, 0xa5, 0xf2, 0x3d, 0x38, 0xc1, 0xfc, + 0x4f, 0x05, 0xd6, 0x32, 0xde, 0x3b, 0xb9, 0x33, 0x4d, 0xd4, 0xea, 0xf5, 0x13, 0xf5, 0x31, 0xac, + 0xda, 0x8c, 0x87, 0x91, 0xa0, 0xda, 0xd9, 0x9b, 0x97, 0x4a, 0x0d, 0x12, 0x1c, 0x4e, 0x05, 0xcc, + 0xbf, 0x40, 0x2b, 0x63, 0xee, 0xbb, 0xa1, 0x44, 0x5f, 0x01, 0x64, 0xbd, 0x23, 0x34, 0x2a, 0x9b, + 0xcb, 0xc5, 0xcc, 0x2f, 0xe9, 0xc3, 0x39, 0x30, 0xba, 0x03, 0x75, 0xc9, 0x7f, 0xa6, 0x69, 0x39, + 0x26, 0x07, 0x93, 0x42, 0x7b, 0x56, 0x29, 0x3b, 0x8c, 0x8f, 0xd1, 0x97, 0xb0, 0xf2, 0x92, 0xb0, + 0x88, 0x86, 0xda, 0x45, 0x97, 0x17, 0xd6, 0x4e, 0xd5, 0xa8, 0x8c, 0x96, 0xb0, 0x86, 0x23, 0x04, + 0xcb, 0x91, 0x70, 0x13, 0xf5, 0xa3, 0x25, 0x1c, 0x1f, 0x76, 0x56, 0xa0, 0xa6, 0x72, 0x66, 0x00, + 0xad, 0xfe, 0x98, 0x0b, 0x99, 0xa6, 0x53, 0x6c, 0x8d, 0x4d, 0xa2, 0x90, 0xea, 0xae, 0x91, 0x1c, + 0xd0, 0x7d, 0x58, 0x0b, 0x84, 0xeb, 0xdb, 0x6e, 0x40, 0x98, 0xb6, 0x73, 0x46, 0x30, 0xff, 0xb1, + 0x0a, 0x9d, 0xb2, 0xaf, 0xd0, 0xd7, 0xb0, 0xca, 0x23, 0xa9, 0x1a, 0x41, 0x62, 0xef, 0x83, 0xb2, + 0x3b, 0x8a, 0xf7, 0xd3, 0x46, 0xa7, 0x42, 0x68, 0x1b, 0xea, 0x54, 0x08, 0x2e, 0xe6, 0x43, 0xaa, + 0x6e, 0x9b, 0x7d, 0x6f, 0x18, 0x83, 0x46, 0x4b, 0x38, 0x41, 0xa3, 0x5f, 0x43, 0x93, 0xc4, 0x17, + 0xb2, 0x92, 0x5b, 0x40, 0x6c, 0xab, 0x56, 0x0d, 0x8a, 0x31, 0x50, 0x17, 0x7a, 0x0a, 0xed, 0x04, + 0x96, 0x15, 0xdc, 0x8d, 0xc5, 0x99, 0x53, 0xf0, 0xce, 0x68, 0x09, 0xb7, 0x48, 0xc1, 0x5d, 0xdf, + 0x40, 0x33, 0x31, 0xd8, 0x52, 0x4a, 0x5a, 0xd7, 0x8b, 0x0c, 0x24, 0x32, 0xbb, 0xb1, 0x86, 0xa7, + 0x70, 0xd3, 0xe6, 0x5e, 0x10, 0x49, 0xea, 0x58, 0xba, 0x71, 0x2e, 0x5f, 0x43, 0x0b, 0x6e, 0xa7, + 0x52, 0x7b, 0x4a, 0x08, 0xfd, 0x01, 0xea, 0xc1, 0x39, 0x09, 0x93, 0x6e, 0xd6, 0xde, 0xfa, 0xcd, + 0x55, 0x05, 0xd4, 0x7d, 0x16, 0xa3, 0x71, 0x22, 0x14, 0xe7, 0x6f, 0x28, 0x89, 0x88, 0x8d, 0x20, + 0x52, 0x77, 0xee, 0x8d, 0x6e, 0x32, 0x7e, 0xba, 0xe9, 0xf8, 0xe9, 0x9e, 0xa4, 0xf3, 0x09, 0xaf, + 0x69, 0x74, 0x5f, 0xa2, 0x6d, 0x68, 0xa4, 0x73, 0xcd, 0x58, 0xd1, 0x96, 0x97, 0x05, 0x77, 0x35, + 0x00, 0x67, 0xd0, 0xf8, 0x8b, 0xb6, 0x6a, 0x52, 0xea, 0x8b, 0xab, 0x57, 0x7f, 0x51, 0xa3, 0xfb, + 0xaa, 0xd8, 0xa2, 0xc0, 0x49, 0x45, 0x1b, 0x57, 0x8b, 0x6a, 0x74, 0x5f, 0xa2, 0x1d, 0x68, 0xf9, + 0x3c, 0xee, 0x1b, 0x36, 0x49, 0x4a, 0x75, 0x4d, 0x95, 0xea, 0xfd, 0x72, 0xd8, 0x0f, 0x73, 0x20, + 0x5c, 0x14, 0x41, 0x8f, 0xa1, 0x79, 0xa1, 0xbd, 0x69, 0xb9, 0x8e, 0xd1, 0x5c, 0x18, 0xad, 0x5c, + 0x7f, 0x82, 0x14, 0xbd, 0xe7, 0xa0, 0x9f, 0xe0, 0x4e, 0x28, 0x49, 0x3c, 0x79, 0xce, 0x89, 0x3f, + 0xa5, 0x96, 0x43, 0x25, 0x71, 0x59, 0x68, 0xb4, 0x95, 0x92, 0xcf, 0x2e, 0xef, 0x5b, 0xb1, 0xd0, + 0x40, 0xc9, 0xec, 0x26, 0x22, 0x18, 0x85, 0x73, 0xb4, 0x9d, 0x9b, 0xd0, 0xd2, 0xe9, 0x28, 0x68, + 0x18, 0x31, 0x69, 0x3e, 0x81, 0xf6, 0xf1, 0xeb, 0x50, 0x52, 0x2f, 0xcb, 0xd8, 0xcf, 0xe0, 0x56, + 0xd6, 0x7c, 0x2c, 0xbd, 0x52, 0xe9, 0x62, 0xef, 0xd0, 0x59, 0x11, 0x2b, 0xba, 0xf9, 0xdf, 0x1a, + 0xdc, 0x9a, 0x1b, 0x39, 0x68, 0x00, 0x35, 0x8f, 0x3b, 0x49, 0x8b, 0x68, 0x6f, 0xf5, 0xae, 0x9c, + 0x51, 0x39, 0x0a, 0x77, 0x28, 0x56, 0xc2, 0x6f, 0x6e, 0x29, 0xf1, 0xfa, 0xe2, 0xd3, 0x50, 0xba, + 0xfe, 0x54, 0x55, 0x43, 0x0b, 0xa7, 0x47, 0xf4, 0x04, 0x6e, 0x84, 0xf6, 0x39, 0x75, 0x22, 0x96, + 0x84, 0xbf, 0x76, 0x65, 0xf8, 0x9b, 0x19, 0xbe, 0x2f, 0xd1, 0x8f, 0xf0, 0x41, 0x40, 0x04, 0xf5, + 0xa5, 0xe5, 0x73, 0x87, 0x5a, 0xd9, 0x8d, 0x75, 0xce, 0x97, 0xcb, 0xe6, 0x90, 0x3b, 0x74, 0xd1, + 0xcc, 0xb9, 0x9d, 0x28, 0x29, 0xb0, 0xd1, 0x9f, 0xe1, 0xb6, 0xa0, 0x13, 0x2a, 0xa8, 0x6f, 0xe7, + 0x35, 0x77, 0xde, 0x7a, 0xa2, 0xa1, 0x4c, 0xcd, 0x4c, 0xf9, 0xb7, 0x70, 0x33, 0x54, 0x91, 0x9c, + 0xb5, 0xac, 0x5b, 0x8b, 0xfb, 0x6a, 0x31, 0xe0, 0xb8, 0x1d, 0x16, 0xce, 0xe6, 0x34, 0x37, 0xbb, + 0xe2, 0x78, 0x20, 0x80, 0x95, 0x83, 0xfe, 0xe1, 0x69, 0x7f, 0xbf, 0xb3, 0x84, 0x5a, 0xb0, 0x76, + 0x3c, 0x18, 0x0d, 0x77, 0x4f, 0xf7, 0x87, 0xbb, 0x9d, 0x4a, 0xcc, 0x3a, 0xfe, 0xe1, 0xf8, 0x64, + 0x78, 0xd0, 0xa9, 0xa2, 0x1b, 0xd0, 0xc0, 0xc3, 0xfd, 0xfe, 0xe9, 0xe1, 0x60, 0xd4, 0x59, 0x46, + 0x08, 0xda, 0x83, 0xd1, 0xde, 0xfe, 0xae, 0xf5, 0xfc, 0x08, 0xff, 0xf1, 0xe9, 0xfe, 0xd1, 0xf3, + 0x4e, 0x2d, 0x16, 0xc6, 0xc3, 0xc1, 0xd1, 0xd9, 0x10, 0x0f, 0x77, 0x3b, 0x75, 0xf3, 0x0c, 0x3a, + 0xf9, 0x32, 0x52, 0x73, 0x72, 0xae, 0xfe, 0x2a, 0x6f, 0x5d, 0x7f, 0xe6, 0xff, 0x57, 0x73, 0x37, + 0x38, 0x4e, 0x46, 0x79, 0x33, 0x59, 0x1a, 0xad, 0x80, 0x11, 0xff, 0x92, 0xf9, 0x98, 0xaf, 0xc8, + 0x04, 0xfd, 0x8c, 0x11, 0x1f, 0x6d, 0x67, 0xfb, 0x6a, 0xf5, 0x3a, 0x6d, 0x57, 0x83, 0xdf, 0x71, + 0x57, 0x43, 0xa3, 0xb2, 0x1f, 0xea, 0x8b, 0x57, 0x90, 0xb2, 0x03, 0xe3, 0x09, 0x54, 0xec, 0x46, + 0x1f, 0x43, 0xd3, 0x71, 0x43, 0x32, 0x66, 0xd4, 0x22, 0x8c, 0xa9, 0x0e, 0xdc, 0x88, 0x47, 0x8c, + 0x26, 0xf6, 0x19, 0x43, 0x5d, 0x58, 0x61, 0x64, 0x4c, 0x59, 0xa8, 0xdb, 0xec, 0xfa, 0xdc, 0x24, + 0x56, 0x5c, 0xac, 0x51, 0xe8, 0x09, 0x34, 0x89, 0xef, 0x73, 0xa9, 0x4d, 0x4b, 0x1a, 0xec, 0xbd, + 0xb9, 0xc9, 0x38, 0x83, 0xe0, 0x3c, 0x1e, 0xed, 0x41, 0x27, 0x7d, 0x08, 0x59, 0x36, 0xf7, 0x25, + 0x7d, 0x25, 0xd5, 0x1c, 0x2e, 0xa4, 0xaa, 0xf2, 0xed, 0xb1, 0x86, 0x0d, 0x12, 0x14, 0xbe, 0x19, + 0x16, 0x09, 0xe8, 0x2b, 0x58, 0x23, 0x91, 0x3c, 0xb7, 0x04, 0x67, 0x54, 0xd7, 0x91, 0x31, 0x67, + 0x47, 0x24, 0xcf, 0x31, 0x67, 0x54, 0x85, 0xa7, 0x41, 0xf4, 0x09, 0x1d, 0x00, 0x7a, 0x11, 0x11, + 0x16, 0x1b, 0xc1, 0x27, 0x56, 0x48, 0xc5, 0x4b, 0xd7, 0xa6, 0xba, 0x64, 0x1e, 0x96, 0xec, 0xf8, + 0x53, 0x02, 0x3c, 0x9a, 0x1c, 0x27, 0x30, 0xdc, 0x79, 0x51, 0xa2, 0xc4, 0xcf, 0x06, 0x8f, 0xbc, + 0xb2, 0x02, 0x22, 0x08, 0x63, 0x94, 0xb9, 0xa1, 0x67, 0xa0, 0xcd, 0xca, 0xa3, 0x3a, 0x6e, 0x7b, + 0xe4, 0xd5, 0xb3, 0x19, 0x15, 0x7d, 0x0f, 0xeb, 0x82, 0x5c, 0x58, 0xb9, 0xad, 0x20, 0x76, 0xc2, + 0xc4, 0x9d, 0x1a, 0xb7, 0xd5, 0xb7, 0x7f, 0x55, 0xb6, 0x1f, 0x93, 0x8b, 0xa3, 0x6c, 0x1d, 0x18, + 0x28, 0x28, 0xbe, 0x2d, 0xe6, 0x89, 0xe8, 0x19, 0xa0, 0xf9, 0x27, 0xb0, 0x71, 0x67, 0x71, 0xf2, + 0xe9, 0x0e, 0xde, 0xcf, 0x80, 0xf8, 0x96, 0x5d, 0x26, 0xa1, 0x6f, 0xa0, 0xe5, 0xfa, 0x92, 0x0a, + 0x11, 0x05, 0xd2, 0x1d, 0x33, 0x6a, 0x7c, 0x70, 0x49, 0x33, 0xdd, 0xe1, 0x9c, 0x9d, 0xc5, 0xdb, + 0x24, 0x2e, 0x0a, 0x2c, 0x7a, 0x4d, 0xad, 0x2f, 0x7a, 0x4d, 0xed, 0x18, 0xb0, 0x9e, 0xcf, 0x5b, + 0x2b, 0x66, 0x0b, 0xd7, 0xa1, 0xe1, 0x77, 0xb5, 0x46, 0xad, 0x53, 0x37, 0x3d, 0xb8, 0x9b, 0xd5, + 0xcb, 0x09, 0x15, 0x9e, 0xeb, 0xe7, 0x1e, 0xb3, 0xef, 0xf2, 0x32, 0xc8, 0x16, 0xda, 0x6a, 0x6e, + 0xa1, 0x35, 0xef, 0xc3, 0xc6, 0xa2, 0xcf, 0x25, 0xcf, 0x25, 0xf3, 0x27, 0x78, 0xb8, 0xe8, 0xc9, + 0x13, 0xc7, 0xe2, 0x7d, 0x3c, 0x7b, 0xfe, 0x56, 0x85, 0xcd, 0xcb, 0xf5, 0xeb, 0x27, 0xdb, 0x76, + 0x79, 0x7f, 0xfe, 0xb0, 0x1c, 0xe2, 0x53, 0xc1, 0xd2, 0xc5, 0x79, 0xb6, 0x36, 0x7f, 0x51, 0x6a, + 0x67, 0x6f, 0x94, 0x4a, 0x9b, 0xd9, 0x63, 0x68, 0x4e, 0x22, 0xc6, 0xae, 0xbb, 0x7f, 0x62, 0x88, + 0xd1, 0xd9, 0xde, 0x79, 0x43, 0xc9, 0xa6, 0xc6, 0xd6, 0xae, 0x12, 0x56, 0x9f, 0x4a, 0x92, 0x3b, + 0x34, 0xff, 0x9e, 0xff, 0x07, 0xe3, 0x54, 0xad, 0x69, 0xef, 0x23, 0xe8, 0xbf, 0x83, 0xba, 0xda, + 0x8e, 0x94, 0x13, 0xda, 0xf3, 0x23, 0xb2, 0xb8, 0x57, 0xe1, 0x04, 0x6c, 0xfe, 0xbb, 0x02, 0xf7, + 0xde, 0xb0, 0x71, 0xcd, 0xb4, 0x56, 0xde, 0x42, 0x2b, 0xfa, 0x3d, 0x34, 0xb9, 0x6d, 0x47, 0x42, + 0x24, 0xfb, 0x4a, 0xf5, 0xca, 0x7d, 0x05, 0x52, 0x78, 0x5f, 0x16, 0xb7, 0xa4, 0xe5, 0xf2, 0xc3, + 0xeb, 0x6e, 0xee, 0xc5, 0x9f, 0x3a, 0x2f, 0x49, 0x9f, 0x4f, 0xbf, 0x86, 0x76, 0xd1, 0x1c, 0x74, + 0x07, 0x3a, 0xc3, 0xef, 0x87, 0x83, 0xd3, 0x93, 0xbd, 0xa3, 0x43, 0xab, 0x3f, 0x38, 0xd9, 0x3b, + 0x1b, 0x76, 0x96, 0xd0, 0x3a, 0xa0, 0x1c, 0x15, 0x0f, 0x46, 0x7b, 0x67, 0xf1, 0xe4, 0xdf, 0xf9, + 0xf2, 0xc7, 0xed, 0xa9, 0x2b, 0xcf, 0xa3, 0x71, 0xd7, 0xe6, 0x5e, 0x4f, 0x5d, 0x94, 0x8b, 0x69, + 0x2f, 0xfb, 0xbf, 0x6b, 0x4a, 0xfd, 0x5e, 0x30, 0xfe, 0xed, 0x94, 0xf7, 0x8a, 0x7f, 0xbe, 0x8d, + 0x57, 0xd4, 0x8d, 0xbe, 0xf8, 0x25, 0x00, 0x00, 0xff, 0xff, 0x26, 0xb3, 0xd4, 0x61, 0xee, 0x13, + 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go index d25236d491..4b6bbe524c 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/execution.pb.validate.go @@ -1804,8 +1804,6 @@ func (m *ExecutionUpdateRequest) Validate() error { // no validation rules for State - // no validation rules for EvictCache - return nil } @@ -1955,16 +1953,6 @@ func (m *ExecutionUpdateResponse) Validate() error { return nil } - if v, ok := interface{}(m.GetCacheEvictionErrors()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return ExecutionUpdateResponseValidationError{ - field: "CacheEvictionErrors", - reason: "embedded message failed validation", - cause: err, - } - } - } - return nil } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go index e76782a1f1..1057668a07 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.go @@ -589,95 +589,6 @@ func (m *TaskExecutionGetDataResponse) GetFullOutputs() *core.LiteralMap { return nil } -type TaskExecutionUpdateRequest struct { - // Identifier of the task execution to update - Id *core.TaskExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - // Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the - // execution DAG and remove all stored results from datacatalog. - EvictCache bool `protobuf:"varint,2,opt,name=evict_cache,json=evictCache,proto3" json:"evict_cache,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TaskExecutionUpdateRequest) Reset() { *m = TaskExecutionUpdateRequest{} } -func (m *TaskExecutionUpdateRequest) String() string { return proto.CompactTextString(m) } -func (*TaskExecutionUpdateRequest) ProtoMessage() {} -func (*TaskExecutionUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8cde4c3aa101642e, []int{7} -} - -func (m *TaskExecutionUpdateRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TaskExecutionUpdateRequest.Unmarshal(m, b) -} -func (m *TaskExecutionUpdateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TaskExecutionUpdateRequest.Marshal(b, m, deterministic) -} -func (m *TaskExecutionUpdateRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskExecutionUpdateRequest.Merge(m, src) -} -func (m *TaskExecutionUpdateRequest) XXX_Size() int { - return xxx_messageInfo_TaskExecutionUpdateRequest.Size(m) -} -func (m *TaskExecutionUpdateRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TaskExecutionUpdateRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskExecutionUpdateRequest proto.InternalMessageInfo - -func (m *TaskExecutionUpdateRequest) GetId() *core.TaskExecutionIdentifier { - if m != nil { - return m.Id - } - return nil -} - -func (m *TaskExecutionUpdateRequest) GetEvictCache() bool { - if m != nil { - return m.EvictCache - } - return false -} - -type TaskExecutionUpdateResponse struct { - CacheEvictionErrors *core.CacheEvictionErrorList `protobuf:"bytes,1,opt,name=cache_eviction_errors,json=cacheEvictionErrors,proto3" json:"cache_eviction_errors,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TaskExecutionUpdateResponse) Reset() { *m = TaskExecutionUpdateResponse{} } -func (m *TaskExecutionUpdateResponse) String() string { return proto.CompactTextString(m) } -func (*TaskExecutionUpdateResponse) ProtoMessage() {} -func (*TaskExecutionUpdateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8cde4c3aa101642e, []int{8} -} - -func (m *TaskExecutionUpdateResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TaskExecutionUpdateResponse.Unmarshal(m, b) -} -func (m *TaskExecutionUpdateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TaskExecutionUpdateResponse.Marshal(b, m, deterministic) -} -func (m *TaskExecutionUpdateResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskExecutionUpdateResponse.Merge(m, src) -} -func (m *TaskExecutionUpdateResponse) XXX_Size() int { - return xxx_messageInfo_TaskExecutionUpdateResponse.Size(m) -} -func (m *TaskExecutionUpdateResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TaskExecutionUpdateResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskExecutionUpdateResponse proto.InternalMessageInfo - -func (m *TaskExecutionUpdateResponse) GetCacheEvictionErrors() *core.CacheEvictionErrorList { - if m != nil { - return m.CacheEvictionErrors - } - return nil -} - func init() { proto.RegisterType((*TaskExecutionGetRequest)(nil), "flyteidl.admin.TaskExecutionGetRequest") proto.RegisterType((*TaskExecutionListRequest)(nil), "flyteidl.admin.TaskExecutionListRequest") @@ -686,8 +597,6 @@ func init() { proto.RegisterType((*TaskExecutionClosure)(nil), "flyteidl.admin.TaskExecutionClosure") proto.RegisterType((*TaskExecutionGetDataRequest)(nil), "flyteidl.admin.TaskExecutionGetDataRequest") proto.RegisterType((*TaskExecutionGetDataResponse)(nil), "flyteidl.admin.TaskExecutionGetDataResponse") - proto.RegisterType((*TaskExecutionUpdateRequest)(nil), "flyteidl.admin.TaskExecutionUpdateRequest") - proto.RegisterType((*TaskExecutionUpdateResponse)(nil), "flyteidl.admin.TaskExecutionUpdateResponse") } func init() { @@ -695,64 +604,59 @@ func init() { } var fileDescriptor_8cde4c3aa101642e = []byte{ - // 930 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x6d, 0x6f, 0x1b, 0x45, - 0x10, 0xae, 0x9d, 0x38, 0xb6, 0xc7, 0x79, 0x21, 0x4b, 0x68, 0x0e, 0x27, 0xa5, 0x96, 0x43, 0x91, - 0x85, 0xd4, 0xb3, 0x94, 0x2a, 0x50, 0x10, 0x42, 0xc4, 0x6d, 0xa0, 0x91, 0x52, 0x28, 0xdb, 0x04, - 0x09, 0xbe, 0x9c, 0xd6, 0x77, 0x6b, 0x67, 0x95, 0xf3, 0xed, 0x75, 0x77, 0x2f, 0xaa, 0xbf, 0xf3, - 0xc7, 0xf8, 0x2d, 0x7c, 0xe3, 0x57, 0xa0, 0x9d, 0xdb, 0x73, 0x72, 0x97, 0x90, 0x48, 0xf4, 0x8b, - 0xa5, 0x9d, 0x79, 0x9e, 0x79, 0x66, 0xe7, 0x65, 0x7d, 0xb0, 0x37, 0x89, 0xe7, 0x86, 0x8b, 0x28, - 0x1e, 0xb2, 0x68, 0x26, 0x92, 0xa1, 0x61, 0xfa, 0x22, 0xe0, 0xef, 0x79, 0x98, 0x19, 0x21, 0x13, - 0x3f, 0x55, 0xd2, 0x48, 0xb2, 0x5e, 0x80, 0x7c, 0x04, 0x75, 0x77, 0x2a, 0xa4, 0x50, 0xce, 0x66, - 0x05, 0xb8, 0xdb, 0x5d, 0x38, 0x43, 0xa9, 0xf8, 0x90, 0x2b, 0x25, 0x95, 0x76, 0xbe, 0x47, 0x15, - 0x5f, 0x59, 0xa7, 0xfb, 0x59, 0xd9, 0x2d, 0x22, 0x9e, 0x18, 0x31, 0x11, 0x5c, 0x39, 0xff, 0x6e, - 0xd9, 0x1f, 0x0b, 0xc3, 0x15, 0x8b, 0xf5, 0x0d, 0x61, 0x7e, 0xc9, 0x13, 0x93, 0xff, 0x3a, 0xdf, - 0xe3, 0xa9, 0x94, 0xd3, 0x98, 0x0f, 0xf1, 0x34, 0xce, 0x26, 0x43, 0x23, 0x66, 0x5c, 0x1b, 0x36, - 0x4b, 0x0b, 0xe9, 0x2a, 0x20, 0xca, 0x14, 0xbb, 0x96, 0xda, 0x6e, 0xd5, 0xaf, 0x8d, 0xca, 0x42, - 0x17, 0xbe, 0xff, 0x2b, 0x6c, 0x9f, 0x32, 0x7d, 0x71, 0x54, 0xdc, 0xe7, 0x27, 0x6e, 0x28, 0x7f, - 0x97, 0x71, 0x6d, 0xc8, 0x57, 0x50, 0x17, 0x91, 0x57, 0xeb, 0xd5, 0x06, 0x9d, 0xfd, 0x2f, 0xfc, - 0x45, 0x21, 0xed, 0x05, 0xfc, 0x12, 0xe7, 0x78, 0x71, 0x5b, 0x5a, 0x17, 0x51, 0xff, 0xef, 0x1a, - 0x78, 0x25, 0xff, 0x89, 0xd0, 0x8b, 0xa0, 0x14, 0x36, 0x13, 0x19, 0xf1, 0xab, 0x46, 0x05, 0xff, - 0xa9, 0xf1, 0xb3, 0x8c, 0xf8, 0x6d, 0x1a, 0x1b, 0x49, 0xd9, 0x41, 0xb6, 0xa0, 0x11, 0x8b, 0x99, - 0x30, 0x5e, 0xbd, 0x57, 0x1b, 0xac, 0xd1, 0xfc, 0x60, 0xad, 0x46, 0x5e, 0xf0, 0xc4, 0x5b, 0xea, - 0xd5, 0x06, 0x6d, 0x9a, 0x1f, 0x88, 0x07, 0xcd, 0x89, 0x88, 0x0d, 0x57, 0xda, 0x5b, 0x46, 0x7b, - 0x71, 0x24, 0x4f, 0xa1, 0xa9, 0xa5, 0x32, 0xc1, 0x78, 0xee, 0x35, 0x30, 0x9f, 0x2d, 0xbf, 0x3c, - 0x3c, 0xfe, 0x5b, 0xa9, 0x0c, 0x5d, 0xb1, 0xa0, 0xd1, 0xbc, 0xff, 0x57, 0x0d, 0xd6, 0x4a, 0xb7, - 0xfc, 0xbf, 0xf5, 0x22, 0x3b, 0xd0, 0x16, 0x49, 0x9a, 0x99, 0x20, 0x53, 0x02, 0xaf, 0xd0, 0xa6, - 0x2d, 0x34, 0x9c, 0x29, 0x41, 0xbe, 0x87, 0x66, 0x18, 0x4b, 0x9d, 0x29, 0x8e, 0xf7, 0xe8, 0xec, - 0x7f, 0x5e, 0xcd, 0xaa, 0x14, 0xfa, 0x45, 0x8e, 0xa5, 0x05, 0x09, 0x83, 0xeb, 0x20, 0x65, 0x8a, - 0x27, 0x06, 0x6f, 0xdc, 0xa2, 0x2d, 0xa1, 0xdf, 0xe0, 0xb9, 0xff, 0x0e, 0x36, 0x6f, 0x34, 0x8a, - 0xfc, 0x08, 0x1b, 0xe5, 0x55, 0xd2, 0x5e, 0xad, 0xb7, 0x34, 0xe8, 0xec, 0x3f, 0xba, 0x53, 0x99, - 0xae, 0x9b, 0xeb, 0x47, 0x7d, 0x55, 0xff, 0xfa, 0xb5, 0xfa, 0xf7, 0xff, 0x69, 0xc0, 0xd6, 0x6d, - 0x19, 0x93, 0x3d, 0x00, 0x99, 0x99, 0xa2, 0x0c, 0xb6, 0x8a, 0xed, 0x51, 0xdd, 0xab, 0xbd, 0x7a, - 0x40, 0xdb, 0xb9, 0xdd, 0x56, 0xe3, 0x00, 0x1a, 0xb8, 0x95, 0x18, 0xb3, 0x94, 0x11, 0x56, 0x79, - 0x11, 0xf4, 0xc8, 0x82, 0x5e, 0x3d, 0xa0, 0x39, 0x9a, 0xfc, 0x00, 0x1d, 0x17, 0x3b, 0x62, 0x86, - 0x79, 0xab, 0x48, 0xfe, 0xb4, 0x42, 0x3e, 0xc9, 0x77, 0xf2, 0x35, 0x4b, 0x9d, 0xae, 0xcb, 0xe7, - 0x25, 0x33, 0x8c, 0x3c, 0x87, 0x46, 0x7a, 0xce, 0x74, 0xde, 0x84, 0xf5, 0xfd, 0xfe, 0x5d, 0xed, - 0xf5, 0xdf, 0x58, 0x24, 0xcd, 0x09, 0xe4, 0x4b, 0x58, 0x8e, 0xe5, 0xd4, 0x4e, 0x9b, 0xad, 0xe1, - 0xc3, 0x5b, 0x88, 0x27, 0x72, 0x4a, 0x11, 0x43, 0xbe, 0x01, 0xd0, 0x86, 0x29, 0xc3, 0xa3, 0x80, - 0x19, 0x37, 0x85, 0x5d, 0x3f, 0xdf, 0x5f, 0xbf, 0xd8, 0x5f, 0xff, 0xb4, 0x78, 0x00, 0x68, 0xdb, - 0xa1, 0x0f, 0x0d, 0x39, 0x80, 0x56, 0xb1, 0xf7, 0xde, 0x8a, 0xbb, 0x5f, 0x95, 0xf8, 0xd2, 0x01, - 0xe8, 0x02, 0x6a, 0x15, 0x43, 0xc5, 0x99, 0x53, 0x6c, 0xde, 0xaf, 0xe8, 0xd0, 0x87, 0xc6, 0x52, - 0xb3, 0x34, 0x2a, 0xa8, 0xad, 0xfb, 0xa9, 0x0e, 0x7d, 0x68, 0xc8, 0x73, 0xe8, 0x84, 0x99, 0x36, - 0x72, 0x16, 0x88, 0x64, 0x22, 0xbd, 0x36, 0x72, 0xb7, 0x6f, 0x70, 0xdf, 0xe2, 0x43, 0x45, 0x21, - 0xc7, 0x1e, 0x27, 0x13, 0x49, 0x1e, 0xc2, 0x8a, 0xe2, 0x4c, 0xcb, 0xc4, 0x03, 0x9c, 0x2a, 0x77, - 0xb2, 0x63, 0x8e, 0x43, 0x6b, 0xe6, 0x29, 0xf7, 0x3a, 0xf9, 0x0e, 0x59, 0xc3, 0xe9, 0x3c, 0xe5, - 0xe4, 0x10, 0x5a, 0x33, 0x6e, 0x18, 0xf6, 0xfe, 0x23, 0xd4, 0x7a, 0x72, 0xd5, 0x86, 0xfc, 0xad, - 0x2d, 0x35, 0xf0, 0xb5, 0x03, 0xd3, 0x05, 0x8d, 0xec, 0xc1, 0x1a, 0x02, 0x83, 0x4b, 0xae, 0xb4, - 0xad, 0xf1, 0x66, 0xaf, 0x36, 0x68, 0xd0, 0x55, 0x34, 0xfe, 0x96, 0xdb, 0x46, 0x1b, 0xb0, 0xe6, - 0xc6, 0x4c, 0x71, 0x9d, 0xc5, 0xa6, 0x7f, 0x06, 0x3b, 0xd5, 0xc7, 0xd5, 0x4e, 0xd3, 0x87, 0x3e, - 0xb0, 0x7f, 0xd6, 0x61, 0xf7, 0xf6, 0xb8, 0x3a, 0x95, 0x89, 0xe6, 0xe4, 0x19, 0xac, 0xe0, 0x03, - 0xa2, 0x5d, 0xf0, 0xed, 0xea, 0xe6, 0x9e, 0xa9, 0x78, 0x14, 0xcb, 0xb1, 0x1d, 0x74, 0xea, 0xa0, - 0xe4, 0x00, 0x9a, 0x79, 0xf6, 0xda, 0x6d, 0xd7, 0x9d, 0xac, 0x02, 0x4b, 0xbe, 0x85, 0xce, 0x24, - 0x8b, 0xe3, 0xc0, 0x09, 0x2e, 0xdd, 0xb3, 0x5b, 0x14, 0x2c, 0xfa, 0x38, 0x97, 0xfc, 0x0e, 0x56, - 0x91, 0x5b, 0xe8, 0x2e, 0xdf, 0x47, 0x46, 0xa9, 0x5f, 0x72, 0x74, 0x3f, 0x83, 0x6e, 0xa9, 0x0a, - 0x67, 0x38, 0x5f, 0x1f, 0x58, 0x5c, 0xf2, 0x18, 0x3a, 0xfc, 0x52, 0x84, 0x26, 0x08, 0x59, 0x78, - 0xce, 0xb1, 0x14, 0x2d, 0x0a, 0x68, 0x7a, 0x61, 0x2d, 0xfd, 0xf7, 0x95, 0xa6, 0x16, 0xb2, 0xae, - 0xf6, 0xbf, 0xc3, 0x27, 0xc8, 0x0c, 0x90, 0x62, 0xff, 0xe0, 0xf2, 0xef, 0x08, 0x97, 0xca, 0x93, - 0x4a, 0x2a, 0x18, 0xf3, 0xc8, 0x41, 0xf1, 0xd9, 0xc2, 0x7f, 0xcb, 0x8f, 0xc3, 0x1b, 0x76, 0x3d, - 0xfa, 0xfa, 0x8f, 0x83, 0xa9, 0x30, 0xe7, 0xd9, 0xd8, 0x0f, 0xe5, 0x6c, 0x88, 0x71, 0xa4, 0x9a, - 0x0e, 0x17, 0x1f, 0x0f, 0x53, 0x9e, 0x0c, 0xd3, 0xf1, 0xd3, 0xa9, 0x1c, 0x96, 0xbf, 0x72, 0xc6, - 0x2b, 0xb8, 0x52, 0xcf, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x7f, 0x0e, 0x85, 0x33, 0x09, - 0x00, 0x00, + // 851 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xdd, 0x6e, 0xdc, 0x44, + 0x14, 0xae, 0x37, 0xd9, 0xbf, 0xb3, 0xf9, 0x21, 0xa3, 0xa8, 0x31, 0x9b, 0x14, 0x56, 0x1b, 0x40, + 0x2b, 0xa4, 0xda, 0x52, 0xaa, 0x40, 0x41, 0x08, 0x91, 0xa5, 0x85, 0x46, 0x4a, 0xa1, 0x4c, 0x13, + 0x2e, 0xb8, 0xb1, 0x66, 0xd7, 0xb3, 0xdb, 0x51, 0x6c, 0x8f, 0x3b, 0x73, 0x5c, 0xb1, 0xf7, 0xbc, + 0x18, 0xcf, 0xc2, 0x1d, 0x4f, 0x81, 0x3c, 0x1e, 0x3b, 0xb1, 0x1b, 0xb2, 0x12, 0xdc, 0x58, 0x3a, + 0xe7, 0x7c, 0xdf, 0xf9, 0x3f, 0x63, 0x38, 0x5e, 0x44, 0x2b, 0xe4, 0x22, 0x8c, 0x7c, 0x16, 0xc6, + 0x22, 0xf1, 0x91, 0xe9, 0xeb, 0x80, 0xff, 0xce, 0xe7, 0x19, 0x0a, 0x99, 0x78, 0xa9, 0x92, 0x28, + 0xc9, 0x4e, 0x09, 0xf2, 0x0c, 0x68, 0x78, 0xd8, 0x20, 0xcd, 0x65, 0x1c, 0x97, 0xe0, 0xe1, 0xa3, + 0xca, 0x38, 0x97, 0x8a, 0xfb, 0x0d, 0x5f, 0xc3, 0x8f, 0xea, 0x66, 0x11, 0xf2, 0x04, 0xc5, 0x42, + 0x70, 0x65, 0xed, 0x47, 0x75, 0x7b, 0x24, 0x90, 0x2b, 0x16, 0x69, 0x6b, 0x1d, 0x56, 0x56, 0xfe, + 0x8e, 0x27, 0x58, 0x7c, 0xad, 0xed, 0xe3, 0xa5, 0x94, 0xcb, 0x88, 0xfb, 0x46, 0x9a, 0x65, 0x0b, + 0x1f, 0x45, 0xcc, 0x35, 0xb2, 0x38, 0x2d, 0x43, 0x37, 0x01, 0x61, 0xa6, 0xd8, 0xad, 0xd4, 0x8e, + 0x9a, 0x76, 0x8d, 0x2a, 0x9b, 0x5b, 0xf7, 0xe3, 0x5f, 0xe0, 0xe0, 0x92, 0xe9, 0xeb, 0xe7, 0x65, + 0x3d, 0x3f, 0x72, 0xa4, 0xfc, 0x6d, 0xc6, 0x35, 0x92, 0x2f, 0xa0, 0x25, 0x42, 0xd7, 0x19, 0x39, + 0x93, 0xc1, 0xc9, 0x67, 0x5e, 0xd5, 0xac, 0xbc, 0x00, 0xaf, 0xc6, 0x39, 0xaf, 0xaa, 0xa5, 0x2d, + 0x11, 0x8e, 0xff, 0x72, 0xc0, 0xad, 0xd9, 0x2f, 0x84, 0xae, 0x9c, 0x52, 0xd8, 0x4b, 0x64, 0xc8, + 0x6f, 0x86, 0x11, 0xfc, 0x6b, 0x8c, 0x9f, 0x64, 0xc8, 0xef, 0x8a, 0xb1, 0x9b, 0xd4, 0x0d, 0x64, + 0x1f, 0xda, 0x91, 0x88, 0x05, 0xba, 0xad, 0x91, 0x33, 0xd9, 0xa6, 0x85, 0x90, 0x6b, 0x51, 0x5e, + 0xf3, 0xc4, 0xdd, 0x18, 0x39, 0x93, 0x3e, 0x2d, 0x04, 0xe2, 0x42, 0x77, 0x21, 0x22, 0xe4, 0x4a, + 0xbb, 0x9b, 0x46, 0x5f, 0x8a, 0xe4, 0x31, 0x74, 0xb5, 0x54, 0x18, 0xcc, 0x56, 0x6e, 0xdb, 0xe4, + 0xb3, 0xef, 0xd5, 0x17, 0xc4, 0x7b, 0x2d, 0x15, 0xd2, 0x4e, 0x0e, 0x9a, 0xae, 0xc6, 0x7f, 0x3a, + 0xb0, 0x5d, 0xab, 0xf2, 0xbf, 0xf6, 0x8b, 0x1c, 0x42, 0x5f, 0x24, 0x69, 0x86, 0x41, 0xa6, 0x84, + 0x29, 0xa1, 0x4f, 0x7b, 0x46, 0x71, 0xa5, 0x04, 0xf9, 0x16, 0xba, 0xf3, 0x48, 0xea, 0x4c, 0x71, + 0x53, 0xc7, 0xe0, 0xe4, 0x93, 0x66, 0x56, 0x35, 0xd7, 0xdf, 0x17, 0x58, 0x5a, 0x92, 0x8c, 0x73, + 0x1d, 0xa4, 0x4c, 0xf1, 0x04, 0x4d, 0xc5, 0x3d, 0xda, 0x13, 0xfa, 0x95, 0x91, 0xc7, 0x6f, 0x61, + 0xef, 0xbd, 0x41, 0x91, 0x1f, 0x60, 0xb7, 0x7e, 0x2e, 0xda, 0x75, 0x46, 0x1b, 0x93, 0xc1, 0xc9, + 0xa3, 0x7b, 0x23, 0xd3, 0x1d, 0xbc, 0x2d, 0xea, 0x9b, 0xfe, 0xb7, 0x6e, 0xf5, 0x7f, 0xfc, 0x77, + 0x1b, 0xf6, 0xef, 0xca, 0x98, 0x1c, 0x03, 0xc8, 0x0c, 0xcb, 0x36, 0xe4, 0x5d, 0xec, 0x4f, 0x5b, + 0xae, 0xf3, 0xe2, 0x01, 0xed, 0x17, 0xfa, 0xbc, 0x1b, 0xa7, 0xd0, 0xe6, 0x4a, 0x49, 0x65, 0x7c, + 0xd6, 0x32, 0x32, 0x5d, 0xae, 0x9c, 0x3e, 0xcf, 0x41, 0x2f, 0x1e, 0xd0, 0x02, 0x4d, 0xbe, 0x83, + 0x81, 0xf5, 0x1d, 0x32, 0x64, 0xee, 0x96, 0x21, 0x7f, 0xd8, 0x20, 0x5f, 0x14, 0x37, 0xf9, 0x92, + 0xa5, 0x36, 0xae, 0xcd, 0xe7, 0x19, 0x43, 0x46, 0x9e, 0x42, 0x3b, 0x7d, 0xc3, 0x74, 0x31, 0x84, + 0x9d, 0x93, 0xf1, 0x7d, 0xe3, 0xf5, 0x5e, 0xe5, 0x48, 0x5a, 0x10, 0xc8, 0xe7, 0xb0, 0x19, 0xc9, + 0x65, 0xbe, 0x6d, 0x79, 0x0f, 0x1f, 0xde, 0x41, 0xbc, 0x90, 0x4b, 0x6a, 0x30, 0xe4, 0x2b, 0x00, + 0x8d, 0x4c, 0x21, 0x0f, 0x03, 0x86, 0x76, 0x0b, 0x87, 0x5e, 0x71, 0xbf, 0x5e, 0x79, 0xbf, 0xde, + 0x65, 0xf9, 0x00, 0xd0, 0xbe, 0x45, 0x9f, 0x21, 0x39, 0x85, 0x5e, 0x79, 0xf7, 0x6e, 0xc7, 0xd6, + 0xd7, 0x24, 0x3e, 0xb3, 0x00, 0x5a, 0x41, 0xf3, 0x88, 0x73, 0xc5, 0x99, 0x8d, 0xd8, 0x5d, 0x1f, + 0xd1, 0xa2, 0xcf, 0x30, 0xa7, 0x66, 0x69, 0x58, 0x52, 0x7b, 0xeb, 0xa9, 0x16, 0x7d, 0x86, 0xe4, + 0x29, 0x0c, 0xe6, 0x99, 0x46, 0x19, 0x07, 0x22, 0x59, 0x48, 0xb7, 0x6f, 0xb8, 0x07, 0xef, 0x71, + 0x5f, 0x9b, 0x87, 0x8a, 0x42, 0x81, 0x3d, 0x4f, 0x16, 0x92, 0x3c, 0x84, 0x8e, 0xe2, 0x4c, 0xcb, + 0xc4, 0x05, 0xb3, 0x55, 0x56, 0xca, 0xd7, 0xdc, 0x2c, 0x2d, 0xae, 0x52, 0xee, 0x0e, 0x8a, 0x1b, + 0xca, 0x15, 0x97, 0xab, 0x94, 0x93, 0x33, 0xe8, 0xc5, 0x1c, 0x99, 0x99, 0xfd, 0x07, 0x26, 0xd6, + 0xa7, 0x37, 0x63, 0x28, 0xde, 0xda, 0xda, 0x00, 0x5f, 0x5a, 0x30, 0xad, 0x68, 0xe4, 0x18, 0xb6, + 0x0d, 0x30, 0x78, 0xc7, 0x95, 0xce, 0x7b, 0xbc, 0x37, 0x72, 0x26, 0x6d, 0xba, 0x65, 0x94, 0xbf, + 0x16, 0xba, 0xe9, 0x2e, 0x6c, 0xdb, 0x35, 0x53, 0x5c, 0x67, 0x11, 0x8e, 0xaf, 0xe0, 0xb0, 0xf9, + 0xb8, 0xe6, 0xdb, 0xf4, 0x7f, 0x1f, 0xd8, 0x3f, 0x5a, 0x70, 0x74, 0xb7, 0x5f, 0x9d, 0xca, 0x44, + 0x73, 0xf2, 0x04, 0x3a, 0xe6, 0x01, 0xd1, 0xd6, 0xf9, 0x41, 0xf3, 0x72, 0xaf, 0x54, 0x34, 0x8d, + 0xe4, 0x2c, 0x5f, 0x74, 0x6a, 0xa1, 0xe4, 0x14, 0xba, 0x45, 0xf6, 0xda, 0x5e, 0xd7, 0xbd, 0xac, + 0x12, 0x4b, 0xbe, 0x86, 0xc1, 0x22, 0x8b, 0xa2, 0xc0, 0x06, 0xdc, 0x58, 0x73, 0x5b, 0x14, 0x72, + 0xf4, 0x79, 0x11, 0xf2, 0x1b, 0xd8, 0x32, 0xdc, 0x32, 0xee, 0xe6, 0x3a, 0xb2, 0x09, 0xf5, 0x73, + 0x81, 0x9e, 0x7e, 0xf9, 0xdb, 0xe9, 0x52, 0xe0, 0x9b, 0x6c, 0xe6, 0xcd, 0x65, 0xec, 0x1b, 0x8e, + 0x54, 0x4b, 0xbf, 0xfa, 0x97, 0x2e, 0x79, 0xe2, 0xa7, 0xb3, 0xc7, 0x4b, 0xe9, 0xd7, 0x7f, 0xec, + 0xb3, 0x8e, 0xd9, 0xb0, 0x27, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x34, 0x93, 0x80, 0x05, 0x26, + 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go index b57984bd06..15652bacc2 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/task_execution.pb.validate.go @@ -749,160 +749,3 @@ var _ interface { Cause() error ErrorName() string } = TaskExecutionGetDataResponseValidationError{} - -// Validate checks the field values on TaskExecutionUpdateRequest with the -// rules defined in the proto definition for this message. If any rules are -// violated, an error is returned. -func (m *TaskExecutionUpdateRequest) Validate() error { - if m == nil { - return nil - } - - if v, ok := interface{}(m.GetId()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return TaskExecutionUpdateRequestValidationError{ - field: "Id", - reason: "embedded message failed validation", - cause: err, - } - } - } - - // no validation rules for EvictCache - - return nil -} - -// TaskExecutionUpdateRequestValidationError is the validation error returned -// by TaskExecutionUpdateRequest.Validate if the designated constraints aren't met. -type TaskExecutionUpdateRequestValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e TaskExecutionUpdateRequestValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e TaskExecutionUpdateRequestValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e TaskExecutionUpdateRequestValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e TaskExecutionUpdateRequestValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e TaskExecutionUpdateRequestValidationError) ErrorName() string { - return "TaskExecutionUpdateRequestValidationError" -} - -// Error satisfies the builtin error interface -func (e TaskExecutionUpdateRequestValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sTaskExecutionUpdateRequest.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = TaskExecutionUpdateRequestValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = TaskExecutionUpdateRequestValidationError{} - -// Validate checks the field values on TaskExecutionUpdateResponse with the -// rules defined in the proto definition for this message. If any rules are -// violated, an error is returned. -func (m *TaskExecutionUpdateResponse) Validate() error { - if m == nil { - return nil - } - - if v, ok := interface{}(m.GetCacheEvictionErrors()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return TaskExecutionUpdateResponseValidationError{ - field: "CacheEvictionErrors", - reason: "embedded message failed validation", - cause: err, - } - } - } - - return nil -} - -// TaskExecutionUpdateResponseValidationError is the validation error returned -// by TaskExecutionUpdateResponse.Validate if the designated constraints -// aren't met. -type TaskExecutionUpdateResponseValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e TaskExecutionUpdateResponseValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e TaskExecutionUpdateResponseValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e TaskExecutionUpdateResponseValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e TaskExecutionUpdateResponseValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e TaskExecutionUpdateResponseValidationError) ErrorName() string { - return "TaskExecutionUpdateResponseValidationError" -} - -// Error satisfies the builtin error interface -func (e TaskExecutionUpdateResponseValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sTaskExecutionUpdateResponse.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = TaskExecutionUpdateResponseValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = TaskExecutionUpdateResponseValidationError{} diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go index 480234abeb..6b8de7f4ce 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go @@ -7,7 +7,6 @@ import ( context "context" fmt "fmt" admin "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin" - _ "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -30,143 +29,140 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("flyteidl/service/admin.proto", fileDescriptor_5cfa31da1d67295d) } var fileDescriptor_5cfa31da1d67295d = []byte{ - // 2161 bytes of a gzipped FileDescriptorProto + // 2127 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x9a, 0xdf, 0x6f, 0x1d, 0x47, - 0x15, 0xc7, 0x35, 0x36, 0x02, 0x31, 0xcd, 0x0f, 0x7b, 0x92, 0x60, 0x67, 0x63, 0x27, 0xe9, 0xba, - 0x8e, 0x7f, 0xdf, 0x75, 0xd3, 0xb4, 0x51, 0x42, 0x7f, 0xb9, 0xb5, 0x73, 0x65, 0x08, 0x71, 0x31, - 0x29, 0x48, 0x16, 0xd2, 0xd5, 0xfa, 0xee, 0xc4, 0xd9, 0xe4, 0xde, 0xbb, 0xb7, 0xbb, 0x63, 0x17, - 0xcb, 0xb2, 0xf8, 0xf1, 0x80, 0xa8, 0x90, 0x78, 0x80, 0x22, 0x28, 0x44, 0x94, 0x42, 0x11, 0x3f, - 0xcb, 0x0b, 0xa8, 0x88, 0x97, 0x4a, 0x08, 0x1e, 0x78, 0xe1, 0x85, 0xbe, 0xf3, 0x42, 0x9f, 0xf9, - 0x1b, 0xd0, 0x9c, 0x9d, 0xd9, 0xbb, 0xb3, 0xbb, 0xb3, 0x3b, 0x6b, 0x52, 0x9e, 0xfa, 0x66, 0xdf, - 0xf3, 0x9d, 0x99, 0xcf, 0x39, 0x73, 0xe6, 0xcc, 0xec, 0xee, 0xe0, 0x89, 0x3b, 0x9d, 0x7d, 0x46, - 0x7d, 0xaf, 0xe3, 0x44, 0x34, 0xdc, 0xf3, 0xdb, 0xd4, 0x71, 0xbd, 0xae, 0xdf, 0x6b, 0xf4, 0xc3, - 0x80, 0x05, 0x64, 0x44, 0x5a, 0x1b, 0xc2, 0x6a, 0x4d, 0xec, 0x04, 0xc1, 0x4e, 0x87, 0x3a, 0x6e, - 0xdf, 0x77, 0xdc, 0x5e, 0x2f, 0x60, 0x2e, 0xf3, 0x83, 0x5e, 0x14, 0xeb, 0xad, 0x41, 0x6f, 0xd0, - 0x8b, 0xd3, 0x0f, 0x83, 0x7b, 0xb4, 0xcd, 0x84, 0xb5, 0x51, 0x6c, 0x6d, 0x79, 0x41, 0xd7, 0xf5, - 0x7b, 0x2d, 0x97, 0xb1, 0xd0, 0xdf, 0xde, 0x65, 0x54, 0xf6, 0x36, 0xa3, 0xd1, 0xe7, 0x84, 0x67, - 0x33, 0x42, 0xe6, 0x46, 0xf7, 0x85, 0x69, 0x32, 0x63, 0x7a, 0x35, 0x08, 0xef, 0xdf, 0xe9, 0x04, - 0xaf, 0x0a, 0xf3, 0xac, 0xc6, 0x9c, 0x1f, 0xe3, 0x62, 0x46, 0xd9, 0x71, 0x77, 0x7b, 0xed, 0xbb, - 0xad, 0x7e, 0xc7, 0x15, 0xc1, 0xb2, 0xac, 0x8c, 0x82, 0xee, 0xd1, 0x9e, 0x74, 0xfd, 0x7c, 0xd6, - 0xf6, 0x15, 0xda, 0xde, 0xe5, 0x91, 0xd3, 0xb8, 0xda, 0x75, 0x59, 0xfb, 0xae, 0xbb, 0xdd, 0xa1, - 0xad, 0x90, 0x46, 0xc1, 0x6e, 0xd8, 0xa6, 0x42, 0x38, 0x95, 0x11, 0xf6, 0x02, 0x8f, 0xb6, 0xb2, - 0xbd, 0x4d, 0x15, 0xc4, 0x23, 0x27, 0xca, 0xce, 0xd5, 0x1e, 0x0d, 0xa3, 0x81, 0xf5, 0x5c, 0xc6, - 0xda, 0x0e, 0xba, 0x5d, 0x2d, 0xad, 0x47, 0xa3, 0x76, 0xe8, 0xf7, 0x79, 0xe7, 0x2d, 0xda, 0x63, - 0x3e, 0xdb, 0xcf, 0xb9, 0xdd, 0x0e, 0x42, 0xea, 0xf8, 0x1e, 0xb7, 0xde, 0xf1, 0x69, 0x18, 0xdb, - 0x2f, 0xbf, 0xbf, 0x81, 0x8f, 0xad, 0xf0, 0x2e, 0xbe, 0x10, 0xa7, 0x17, 0xe9, 0x62, 0xfc, 0x62, - 0x48, 0x5d, 0x46, 0x6f, 0xbb, 0xd1, 0x7d, 0xf2, 0x68, 0x92, 0x31, 0x8d, 0x38, 0x2b, 0xf9, 0xaf, - 0xb1, 0x7d, 0x93, 0xbe, 0xb2, 0x4b, 0x23, 0x66, 0xd9, 0x65, 0x92, 0xa8, 0x1f, 0xf4, 0x22, 0x6a, - 0x8f, 0x7f, 0xe3, 0xfd, 0x0f, 0xbe, 0x37, 0x44, 0xec, 0xe3, 0x90, 0xb5, 0x7b, 0x8f, 0x43, 0x3c, - 0xa2, 0xeb, 0x68, 0x9e, 0x7c, 0x0b, 0xe1, 0x4f, 0x34, 0x29, 0x83, 0xc1, 0x2e, 0x66, 0x7b, 0xda, - 0xd8, 0xe6, 0xd9, 0xd6, 0xa4, 0x4c, 0x8e, 0x75, 0xba, 0x68, 0x2c, 0x7b, 0x0d, 0x7a, 0x7f, 0x8e, - 0x3c, 0xa3, 0xf4, 0xee, 0x1c, 0xf8, 0x5e, 0x43, 0x24, 0xec, 0x21, 0xfc, 0x13, 0x67, 0x79, 0xfc, - 0x77, 0xcf, 0xed, 0xd2, 0xf8, 0x2f, 0x11, 0xf5, 0x43, 0xf2, 0x03, 0x84, 0x1f, 0xb9, 0xe9, 0x47, - 0xc0, 0xb2, 0xee, 0x45, 0x64, 0x39, 0x3b, 0xd8, 0x2d, 0xb7, 0x4b, 0xbd, 0x35, 0x88, 0xee, 0x7a, - 0x12, 0x47, 0xde, 0x42, 0xe2, 0xcd, 0x19, 0xb7, 0xb0, 0x17, 0x80, 0x79, 0x9a, 0x4c, 0xa5, 0x99, - 0x5b, 0xbe, 0x17, 0x39, 0x07, 0x03, 0x66, 0x01, 0x4c, 0x7e, 0x8f, 0xf0, 0x27, 0x25, 0x59, 0x44, - 0xa6, 0xb2, 0xa3, 0x6c, 0x8a, 0x04, 0x4d, 0xa3, 0x8c, 0x17, 0x45, 0x0a, 0x46, 0xde, 0x86, 0x91, - 0xbf, 0x4c, 0x96, 0xeb, 0x46, 0x6b, 0x6b, 0x96, 0x5c, 0x32, 0x6b, 0x43, 0x0e, 0xf1, 0x89, 0x38, - 0x03, 0xbe, 0x24, 0x56, 0x33, 0x99, 0xce, 0xf2, 0x48, 0x8b, 0x9a, 0x4c, 0x97, 0xaa, 0x64, 0x22, - 0xa1, 0x26, 0xc0, 0x89, 0x4f, 0xd9, 0xa3, 0x12, 0x48, 0x96, 0x0d, 0x48, 0xaa, 0xd7, 0x11, 0x7e, - 0xa4, 0x49, 0x59, 0x32, 0x78, 0x75, 0x62, 0x8d, 0xeb, 0xc6, 0xb5, 0xd7, 0x61, 0xa4, 0x17, 0xc9, - 0x4a, 0x6e, 0xa4, 0xda, 0x09, 0xf6, 0x26, 0xc2, 0x27, 0xf9, 0x14, 0xc8, 0xbe, 0x3f, 0xf4, 0x24, - 0x73, 0x80, 0x7d, 0x8e, 0xcc, 0x64, 0xd9, 0x75, 0x89, 0xf6, 0x1e, 0xc2, 0xc7, 0xd3, 0x84, 0x86, - 0xc9, 0x36, 0xa1, 0x8b, 0x1e, 0x50, 0xdc, 0x03, 0x0a, 0x8f, 0x5c, 0x39, 0x4a, 0x04, 0xb7, 0x16, - 0xc9, 0xbc, 0x79, 0x3b, 0xf2, 0x4d, 0x84, 0x47, 0xe2, 0x54, 0xb9, 0x09, 0xbb, 0xc3, 0x4b, 0x1d, - 0xb7, 0x47, 0x66, 0xb2, 0x78, 0x03, 0x9b, 0x9a, 0x7d, 0xb3, 0xd5, 0x42, 0x91, 0x7f, 0x17, 0xc0, - 0xa7, 0xb3, 0xf6, 0x69, 0xc9, 0x96, 0xda, 0x8c, 0x20, 0x05, 0x7f, 0x8c, 0xf0, 0xf1, 0x26, 0x65, - 0x29, 0x8a, 0xea, 0x24, 0xb4, 0xf4, 0xc3, 0xdb, 0x37, 0x61, 0xc0, 0x1b, 0x64, 0xb5, 0x68, 0xc0, - 0xda, 0x99, 0xf8, 0x33, 0x84, 0x4f, 0x35, 0x29, 0x5b, 0x69, 0x33, 0x7f, 0xaf, 0x34, 0x52, 0x59, - 0x85, 0x09, 0xea, 0x0d, 0x40, 0x7d, 0x9e, 0x3c, 0x2b, 0x51, 0x5d, 0xe8, 0xa4, 0x55, 0x93, 0x98, - 0x3c, 0x40, 0xf8, 0x0c, 0x4f, 0xa0, 0x2c, 0x43, 0x44, 0x16, 0xaa, 0x30, 0xd3, 0xc9, 0x79, 0x5e, - 0x8f, 0x0a, 0xe9, 0xf9, 0x14, 0xe0, 0x2e, 0x93, 0x46, 0x29, 0x6e, 0x7e, 0xad, 0xbc, 0x8d, 0xf0, - 0x28, 0xef, 0x60, 0xd0, 0xdd, 0x87, 0xbe, 0x9e, 0x2f, 0x03, 0x6a, 0x6a, 0x45, 0xa4, 0x18, 0x75, - 0x4b, 0xfa, 0xef, 0xa2, 0xe8, 0xa4, 0xe3, 0x67, 0xb4, 0xa8, 0xab, 0xe2, 0xd6, 0x07, 0x98, 0x7b, - 0xe4, 0xea, 0x11, 0x33, 0x72, 0xcb, 0x21, 0x4b, 0xb5, 0x9a, 0x92, 0x77, 0x11, 0x1e, 0x79, 0xb9, - 0xef, 0x19, 0x2f, 0xee, 0x58, 0x6b, 0xb0, 0xb8, 0xa5, 0x50, 0x2c, 0xee, 0x0d, 0xf0, 0x6c, 0xdd, - 0x7a, 0x28, 0x6b, 0x8d, 0x17, 0x83, 0xaf, 0x23, 0x7c, 0x32, 0x2e, 0x20, 0x6b, 0xf2, 0x08, 0x48, - 0x72, 0x3b, 0x5d, 0x62, 0x52, 0x6b, 0xd2, 0x4c, 0xa5, 0x4e, 0x50, 0x4f, 0x02, 0xf5, 0x98, 0x4d, - 0x24, 0x75, 0x72, 0xdc, 0x84, 0x82, 0xf4, 0x1d, 0x84, 0x47, 0x37, 0x69, 0xec, 0xc9, 0x80, 0x62, - 0x56, 0xdb, 0xbb, 0xd4, 0xd6, 0xe6, 0xb8, 0x04, 0x1c, 0x17, 0xed, 0x73, 0x79, 0x0e, 0x27, 0x14, - 0x9d, 0x72, 0xa0, 0x6f, 0x23, 0x3c, 0xb2, 0x49, 0xdb, 0xc1, 0x1e, 0x0d, 0x07, 0x3c, 0x33, 0x25, - 0x3c, 0x20, 0xad, 0x8d, 0x33, 0x0d, 0x38, 0x17, 0x6c, 0xab, 0x10, 0x07, 0xfa, 0xe4, 0x34, 0xdf, - 0x47, 0xf8, 0x58, 0x93, 0xb2, 0x01, 0xc9, 0x82, 0x6e, 0x4f, 0x4b, 0x24, 0xa9, 0xca, 0x7d, 0x56, - 0x4b, 0x63, 0x3f, 0x03, 0xe3, 0x5f, 0x25, 0x4f, 0x16, 0x8c, 0x6f, 0x50, 0x04, 0xdf, 0x46, 0xf8, - 0x64, 0x9c, 0x9e, 0x26, 0xa9, 0xa3, 0x66, 0xfc, 0x4c, 0xa5, 0x4e, 0xc4, 0xe8, 0x79, 0x60, 0xbc, - 0x6e, 0x1d, 0x8d, 0x91, 0x87, 0xef, 0xcf, 0x08, 0x8f, 0xa4, 0xc3, 0xb7, 0xea, 0x32, 0x97, 0x38, - 0x26, 0x21, 0xe4, 0x4a, 0x09, 0xbc, 0x6c, 0xde, 0x40, 0x90, 0xbf, 0x00, 0xe4, 0x4f, 0x93, 0xeb, - 0x92, 0xdc, 0x73, 0x99, 0x5b, 0x33, 0xc4, 0xaf, 0x21, 0x7c, 0x82, 0x57, 0xb4, 0x64, 0x10, 0xc3, - 0x02, 0x39, 0xa9, 0x0d, 0x2f, 0xd4, 0xc7, 0x27, 0x00, 0x6d, 0x89, 0x2c, 0xd4, 0x08, 0x2a, 0x79, - 0x07, 0x61, 0x72, 0x9b, 0x86, 0x5d, 0xbf, 0xa7, 0xcc, 0xf8, 0x9c, 0x76, 0xa8, 0x44, 0x2c, 0xa9, - 0xe6, 0x4d, 0xa4, 0xea, 0xbc, 0xcf, 0x1f, 0x7d, 0xde, 0xff, 0x19, 0xcf, 0xfb, 0xad, 0xc0, 0xa3, - 0x25, 0x8b, 0x58, 0x31, 0xa7, 0x96, 0xcd, 0x64, 0xa9, 0xd0, 0xde, 0x03, 0xbc, 0x3e, 0xe9, 0x49, - 0x3c, 0xf5, 0x51, 0x3b, 0x66, 0x4c, 0xfe, 0x6d, 0x65, 0x81, 0x15, 0x4b, 0x9a, 0x5e, 0x31, 0x0c, - 0x2a, 0x36, 0xf4, 0xee, 0x7b, 0x87, 0xe4, 0x5f, 0x08, 0x13, 0x3e, 0x85, 0x0a, 0x4d, 0x94, 0xaf, - 0x95, 0x8a, 0x3d, 0x9d, 0x19, 0x8f, 0x56, 0x2a, 0xed, 0x03, 0xf0, 0x6d, 0x97, 0x44, 0x5a, 0xdf, - 0x92, 0xb3, 0xba, 0xc6, 0xc3, 0x62, 0x7b, 0xe2, 0x67, 0xb1, 0x39, 0xce, 0xf8, 0x5f, 0x7c, 0x0c, - 0x9f, 0xcd, 0x3b, 0x78, 0x23, 0x08, 0xe1, 0x31, 0xdc, 0x29, 0xa5, 0x17, 0xaa, 0x9a, 0xee, 0xfe, - 0x61, 0x18, 0xfc, 0xfd, 0xdd, 0x30, 0xf9, 0xf5, 0xb0, 0xf4, 0xb8, 0x7d, 0xd7, 0xef, 0x78, 0x21, - 0xcd, 0xbe, 0x1c, 0x89, 0x9c, 0x03, 0xf5, 0x87, 0x96, 0x9c, 0x1b, 0xe5, 0x17, 0x4d, 0x54, 0x6a, - 0x37, 0x4d, 0x02, 0x56, 0xbb, 0xa5, 0xc8, 0x1c, 0x93, 0x76, 0x32, 0xb5, 0x8a, 0xd4, 0xe2, 0xc1, - 0xbf, 0xd4, 0x07, 0xa9, 0x29, 0x81, 0x95, 0x12, 0x2d, 0x95, 0x14, 0xc8, 0x83, 0x49, 0x91, 0x26, - 0xa4, 0x2c, 0xdc, 0x6f, 0xb9, 0x8c, 0xd1, 0x6e, 0x9f, 0x1d, 0x92, 0xff, 0x20, 0x7c, 0x3a, 0xbb, - 0xba, 0xa1, 0xb2, 0x2f, 0x54, 0xad, 0xf0, 0x74, 0x55, 0x5f, 0x34, 0x13, 0x8b, 0x9a, 0x94, 0x5b, - 0x18, 0x50, 0xd1, 0xff, 0x4f, 0x2b, 0xff, 0xab, 0xf8, 0xe4, 0x26, 0xdd, 0xf1, 0x23, 0x46, 0xc3, - 0x97, 0xe2, 0x0e, 0xf3, 0x9b, 0xad, 0x30, 0x48, 0x9d, 0x76, 0xb3, 0xcd, 0xe9, 0x84, 0x83, 0xe7, - 0xc0, 0xc1, 0x33, 0xf6, 0x88, 0x74, 0x50, 0xa0, 0xc3, 0x29, 0xed, 0x15, 0x7c, 0x3c, 0xde, 0x9b, - 0xe5, 0xf0, 0x63, 0x9a, 0x6e, 0xad, 0x69, 0x8d, 0x21, 0xb3, 0xb5, 0x5f, 0x84, 0xd1, 0x2c, 0xeb, - 0x4c, 0x76, 0x34, 0xee, 0x38, 0x94, 0xf0, 0x3b, 0xf8, 0x18, 0x5f, 0xa2, 0xa2, 0x79, 0x44, 0x6c, - 0x4d, 0xc7, 0xa5, 0x6f, 0x97, 0x64, 0x6b, 0xf9, 0xa6, 0x8f, 0xe4, 0xbc, 0x23, 0x6f, 0x20, 0x7c, - 0x4a, 0x7d, 0x29, 0xb4, 0xb6, 0x47, 0x7b, 0x8c, 0x2c, 0x55, 0x6e, 0xfa, 0xa0, 0x93, 0x43, 0x37, - 0x4c, 0xe5, 0x22, 0x00, 0x53, 0x00, 0x34, 0x69, 0x8f, 0x27, 0x7b, 0x1c, 0x37, 0x47, 0xea, 0x0b, - 0xa3, 0xd7, 0x92, 0x03, 0x3a, 0xe4, 0x26, 0x70, 0xcd, 0x95, 0xa6, 0xad, 0xc2, 0x34, 0x6f, 0x22, - 0xd5, 0xbd, 0x39, 0x10, 0x3c, 0x3c, 0x07, 0x33, 0x2c, 0xbc, 0xce, 0x6a, 0x58, 0xc0, 0x64, 0xc6, - 0x52, 0x24, 0xad, 0x60, 0x49, 0xde, 0xce, 0x7e, 0x6d, 0x18, 0xb6, 0x77, 0xa5, 0x8b, 0xfc, 0xf6, - 0xae, 0x98, 0xcb, 0xb6, 0x77, 0x45, 0x68, 0xff, 0x7c, 0x08, 0x86, 0x7f, 0x30, 0x44, 0xde, 0x18, - 0x52, 0xde, 0x82, 0x66, 0xd6, 0xb9, 0x71, 0xed, 0xaf, 0x51, 0xec, 0x8d, 0xab, 0x7b, 0x45, 0x39, - 0x2f, 0xac, 0xdf, 0x45, 0x05, 0x3b, 0x5f, 0xa1, 0x0b, 0x4b, 0x72, 0xbe, 0x06, 0xff, 0x70, 0x28, - 0x3e, 0x8c, 0x28, 0xb1, 0x2b, 0x38, 0x8c, 0x28, 0xf6, 0xd2, 0xdd, 0x39, 0xa7, 0xb4, 0xff, 0x88, - 0x60, 0x26, 0xde, 0x41, 0xe4, 0x37, 0x48, 0x3b, 0x13, 0xc6, 0xd3, 0x60, 0x3a, 0x07, 0x66, 0x13, - 0xa0, 0x8f, 0x3e, 0x79, 0x30, 0x0c, 0xdb, 0x93, 0xe2, 0x4f, 0xf1, 0xf6, 0x94, 0xcd, 0xd0, 0xd2, - 0xed, 0xa9, 0x58, 0x2c, 0x96, 0xcc, 0xaf, 0xe2, 0xa4, 0x7d, 0x6b, 0x88, 0xfc, 0x64, 0x48, 0xd9, - 0xa1, 0x3e, 0xca, 0xdc, 0x6c, 0xe6, 0xbe, 0x3e, 0x8c, 0x4f, 0xc5, 0xbb, 0x91, 0x5a, 0x3f, 0xca, - 0x2b, 0x94, 0xfa, 0x08, 0xbb, 0x60, 0xa4, 0x15, 0x73, 0xf3, 0x51, 0x41, 0x31, 0x99, 0x96, 0x7f, - 0x23, 0x3c, 0xa9, 0x9c, 0x31, 0x56, 0xa1, 0xcb, 0x95, 0xe4, 0x73, 0x2b, 0xb9, 0xa2, 0xd9, 0xdd, - 0xb3, 0x42, 0x75, 0xaa, 0x9e, 0xac, 0xd9, 0x4a, 0x4c, 0xda, 0xcb, 0x30, 0x67, 0x1b, 0xd6, 0x67, - 0x32, 0x07, 0x86, 0xfc, 0x37, 0x69, 0xe7, 0x40, 0xfd, 0x24, 0x2c, 0x82, 0x93, 0xfa, 0x51, 0x04, - 0x87, 0xef, 0x5c, 0x7f, 0x41, 0xd8, 0x6a, 0x52, 0xa6, 0x73, 0xf1, 0x71, 0x43, 0xd8, 0xd4, 0x6e, - 0x76, 0xb9, 0x4e, 0x13, 0xe1, 0xdc, 0xd3, 0xe0, 0xdc, 0x53, 0x83, 0x4f, 0x1f, 0x25, 0xce, 0xe5, - 0x5f, 0xdd, 0xfe, 0x03, 0xe1, 0xc9, 0x55, 0xda, 0xa1, 0xff, 0xfb, 0x4c, 0xc5, 0xbd, 0xd4, 0x9d, - 0x29, 0xd9, 0x4a, 0x38, 0xf3, 0x1c, 0x38, 0x73, 0x6d, 0xfe, 0x48, 0xce, 0xf0, 0x39, 0x79, 0x17, - 0xe1, 0x31, 0x25, 0xf3, 0x52, 0x9e, 0x34, 0x34, 0x4c, 0xba, 0x6c, 0x73, 0x8c, 0xf5, 0x82, 0xfe, - 0x3a, 0xd0, 0x5f, 0xb1, 0x9c, 0x2c, 0x7d, 0x45, 0x82, 0x71, 0xf0, 0x37, 0xe3, 0xe7, 0xa0, 0x3c, - 0xf5, 0x42, 0x25, 0x45, 0x2a, 0x81, 0x16, 0xcd, 0xc4, 0x82, 0x77, 0x11, 0x78, 0x2f, 0x91, 0xc7, - 0xca, 0x78, 0x25, 0x24, 0xf9, 0x2d, 0xc2, 0x63, 0x4a, 0xaa, 0xd4, 0x0a, 0xad, 0x9a, 0x1e, 0x8e, - 0xb1, 0x5e, 0xa0, 0x8a, 0xcf, 0x8c, 0xf3, 0x46, 0xa8, 0x3c, 0x9e, 0x1f, 0x20, 0x3c, 0x1e, 0x4f, - 0x8f, 0x3c, 0xbc, 0xa7, 0x70, 0xb5, 0x6f, 0x0d, 0x75, 0xa9, 0xb0, 0x6c, 0xde, 0x40, 0x00, 0x53, - 0x00, 0x6e, 0x59, 0x5b, 0xb9, 0xef, 0xa2, 0x47, 0xa8, 0x36, 0xca, 0x6f, 0xb2, 0x23, 0x70, 0xf3, - 0x4f, 0x08, 0x9f, 0x49, 0x7d, 0x86, 0x4e, 0xf9, 0xb8, 0x58, 0x8d, 0x9c, 0x4a, 0x9c, 0x25, 0x43, - 0xb5, 0xf0, 0x6e, 0x05, 0xbc, 0xfb, 0x34, 0xb9, 0x56, 0xea, 0x5d, 0x6e, 0x85, 0x0e, 0x5e, 0x19, - 0x1d, 0x92, 0xbf, 0x22, 0x3c, 0x1e, 0x4f, 0xf2, 0xd1, 0x26, 0x48, 0x4d, 0xa8, 0x65, 0xf3, 0x06, - 0xc2, 0x85, 0x55, 0x70, 0xe1, 0xd9, 0xf9, 0xa3, 0xbb, 0xc0, 0xe3, 0xff, 0x53, 0x84, 0xc7, 0xf8, - 0xf9, 0xf6, 0x73, 0xf2, 0x2a, 0x4f, 0xd9, 0xa2, 0xd0, 0x08, 0xb5, 0x8b, 0x42, 0xab, 0x17, 0x2e, - 0x3c, 0x06, 0x2e, 0x9c, 0x27, 0x13, 0xd2, 0x85, 0xc1, 0x85, 0xa2, 0x81, 0x0f, 0xbc, 0xb2, 0xc0, - 0x47, 0xc4, 0xc1, 0x37, 0x3f, 0x9f, 0x46, 0xf9, 0x77, 0x0e, 0xa9, 0x4f, 0x82, 0xe9, 0xa3, 0xfd, - 0x85, 0x0a, 0x5d, 0x3e, 0x15, 0xf8, 0x51, 0xc1, 0x8b, 0x6f, 0x08, 0xf9, 0x3c, 0x84, 0xf2, 0x6e, - 0x53, 0x8b, 0xed, 0xf7, 0xf9, 0x19, 0x22, 0xbf, 0x09, 0xfd, 0x12, 0xe1, 0x13, 0x4d, 0x9a, 0x02, - 0xdc, 0xcf, 0xdf, 0xe5, 0x48, 0x19, 0x53, 0x69, 0x7b, 0xae, 0x44, 0x66, 0x7f, 0x1e, 0xc8, 0x3e, - 0x4b, 0xd6, 0x4d, 0xc9, 0xaa, 0xdf, 0xe3, 0xbf, 0x87, 0xf0, 0x68, 0xbc, 0xd0, 0xd3, 0xb0, 0xb3, - 0x25, 0x14, 0x6a, 0x1d, 0x99, 0x33, 0x50, 0x8a, 0xc9, 0xbd, 0x0d, 0xf4, 0xb7, 0xac, 0x87, 0x47, - 0xcf, 0xf3, 0xb5, 0x83, 0x71, 0x93, 0xb2, 0x2f, 0xc6, 0x67, 0xb7, 0xfc, 0xd5, 0xab, 0x81, 0x4d, - 0x7b, 0xf5, 0x2a, 0x2d, 0x11, 0xa8, 0x63, 0x80, 0x3a, 0x4a, 0x4e, 0x4a, 0x54, 0x71, 0x36, 0x24, - 0x7f, 0x8b, 0x37, 0xb5, 0xd5, 0xc1, 0xcd, 0x31, 0x11, 0xb1, 0xea, 0x8b, 0x0a, 0x39, 0xb4, 0x5c, - 0x27, 0xf6, 0x0e, 0x0c, 0xeb, 0x92, 0x56, 0xf2, 0x90, 0x94, 0xbd, 0xa1, 0x06, 0x71, 0x82, 0xe3, - 0x69, 0xcd, 0x50, 0xa9, 0x57, 0x19, 0xbe, 0x3b, 0x14, 0x2f, 0xf2, 0x2c, 0x82, 0x5f, 0x54, 0x66, - 0x73, 0x9c, 0xe9, 0xd5, 0x34, 0x6d, 0xa4, 0xb6, 0xdf, 0x8a, 0x1f, 0x96, 0x7f, 0x84, 0xc8, 0x46, - 0xb9, 0x6f, 0xb5, 0x1d, 0xdb, 0x6a, 0x92, 0xb5, 0x87, 0xd2, 0xe5, 0x0b, 0xd7, 0xb6, 0xae, 0xee, - 0xf8, 0xec, 0xee, 0xee, 0x76, 0xa3, 0x1d, 0x74, 0x1d, 0x70, 0x2b, 0x08, 0x77, 0x9c, 0xe4, 0x2e, - 0xe0, 0x0e, 0xed, 0x39, 0xfd, 0xed, 0xa5, 0x9d, 0xc0, 0xc9, 0x5e, 0x3e, 0xdd, 0xfe, 0x38, 0xdc, - 0x0b, 0x7c, 0xe2, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x78, 0x10, 0xee, 0x69, 0x97, 0x2a, 0x00, - 0x00, + 0x15, 0xc7, 0x35, 0x36, 0x02, 0x31, 0x4d, 0x62, 0x7b, 0x9a, 0x60, 0x67, 0x63, 0x27, 0xe9, 0xba, + 0x8e, 0x7f, 0xdf, 0x75, 0xd3, 0xb4, 0x51, 0x42, 0x7f, 0xb9, 0xb5, 0x73, 0x65, 0x08, 0x49, 0x31, + 0x29, 0x48, 0x16, 0xd2, 0xd5, 0xfa, 0xee, 0xc4, 0xde, 0xe4, 0xde, 0xbb, 0xb7, 0xbb, 0x63, 0x17, + 0xcb, 0xb2, 0xf8, 0xf1, 0x80, 0xa8, 0x90, 0x78, 0xe0, 0x87, 0xa0, 0x10, 0x51, 0x0a, 0x45, 0xfc, + 0x2c, 0x2f, 0xa0, 0x22, 0x24, 0x54, 0x09, 0xc1, 0x03, 0x2f, 0xbc, 0xc0, 0x3b, 0x2f, 0xf4, 0x99, + 0xbf, 0x01, 0xcd, 0xd9, 0x99, 0xbd, 0x3b, 0xbb, 0x3b, 0xbb, 0xb3, 0x26, 0xe5, 0x89, 0x37, 0xfb, + 0x9e, 0xef, 0xcc, 0x7c, 0xce, 0x99, 0x33, 0x67, 0x66, 0x67, 0x17, 0x4f, 0xde, 0xed, 0x1c, 0x30, + 0xea, 0x7b, 0x1d, 0x27, 0xa2, 0xe1, 0xbe, 0xdf, 0xa6, 0x8e, 0xeb, 0x75, 0xfd, 0x5e, 0xa3, 0x1f, + 0x06, 0x2c, 0x20, 0xa3, 0xd2, 0xda, 0x10, 0x56, 0x6b, 0x72, 0x27, 0x08, 0x76, 0x3a, 0xd4, 0x71, + 0xfb, 0xbe, 0xe3, 0xf6, 0x7a, 0x01, 0x73, 0x99, 0x1f, 0xf4, 0xa2, 0x58, 0x6f, 0x0d, 0x7a, 0x83, + 0x5e, 0x9c, 0x7e, 0x18, 0xdc, 0xa3, 0x6d, 0x26, 0xac, 0x8d, 0x62, 0x6b, 0xcb, 0x0b, 0xba, 0xae, + 0xdf, 0x6b, 0xb9, 0x8c, 0x85, 0xfe, 0xf6, 0x1e, 0xa3, 0xb2, 0xb7, 0x59, 0x8d, 0x3e, 0x27, 0x3c, + 0x9b, 0x11, 0x32, 0x37, 0xba, 0x2f, 0x4c, 0x53, 0x19, 0xd3, 0x6b, 0x41, 0x78, 0xff, 0x6e, 0x27, + 0x78, 0x4d, 0x98, 0xe7, 0x34, 0xe6, 0xfc, 0x18, 0x17, 0x33, 0xca, 0x8e, 0xbb, 0xd7, 0x6b, 0xef, + 0xb6, 0xfa, 0x1d, 0x57, 0x04, 0xcb, 0xb2, 0x32, 0x0a, 0xba, 0x4f, 0x7b, 0xd2, 0xf5, 0xf3, 0x59, + 0xdb, 0x17, 0x68, 0x7b, 0x8f, 0x47, 0x4e, 0xe3, 0x6a, 0xd7, 0x65, 0xed, 0x5d, 0x77, 0xbb, 0x43, + 0x5b, 0x21, 0x8d, 0x82, 0xbd, 0xb0, 0x4d, 0x85, 0x70, 0x3a, 0x23, 0xec, 0x05, 0x1e, 0x6d, 0x65, + 0x7b, 0x9b, 0x2e, 0x88, 0x47, 0x4e, 0x94, 0x9d, 0xab, 0x7d, 0x1a, 0x46, 0x03, 0xeb, 0xb9, 0x8c, + 0xb5, 0x1d, 0x74, 0xbb, 0x5a, 0x5a, 0x8f, 0x46, 0xed, 0xd0, 0xef, 0xf3, 0xce, 0x5b, 0xb4, 0xc7, + 0x7c, 0x76, 0x10, 0x0b, 0x2f, 0xff, 0xf1, 0x26, 0x3e, 0xb1, 0xca, 0x25, 0x9f, 0x89, 0xd3, 0x87, + 0x74, 0x31, 0x7e, 0x29, 0xa4, 0x2e, 0xa3, 0x77, 0xdc, 0xe8, 0x3e, 0x79, 0x2c, 0xc9, 0x88, 0x46, + 0x9c, 0x75, 0xfc, 0xd7, 0xd8, 0xbe, 0x49, 0x5f, 0xdd, 0xa3, 0x11, 0xb3, 0xec, 0x32, 0x49, 0xd4, + 0x0f, 0x7a, 0x11, 0xb5, 0x27, 0xbe, 0xf2, 0x8f, 0xf7, 0xbf, 0x35, 0x44, 0xec, 0x93, 0x90, 0x95, + 0xfb, 0x4f, 0x80, 0xbf, 0xd1, 0x75, 0xb4, 0x40, 0xbe, 0x86, 0xf0, 0x47, 0x9a, 0x94, 0xc1, 0x60, + 0x17, 0xb3, 0x3d, 0xdd, 0xde, 0xe6, 0xd9, 0xd4, 0xa4, 0x4c, 0x8e, 0x75, 0xba, 0x68, 0x2c, 0x7b, + 0x1d, 0x7a, 0x7f, 0x9e, 0x3c, 0xab, 0xf4, 0xee, 0x1c, 0xfa, 0x5e, 0x43, 0x24, 0xe4, 0x11, 0xfc, + 0x13, 0x67, 0x71, 0xfc, 0x77, 0xcf, 0xed, 0xd2, 0xf8, 0x2f, 0x11, 0xd5, 0x23, 0xf2, 0x5d, 0x84, + 0x1f, 0xb9, 0xe9, 0x47, 0xc0, 0xb2, 0xe1, 0x45, 0x64, 0x25, 0x3b, 0xd8, 0x2d, 0xb7, 0x4b, 0xbd, + 0x75, 0x88, 0xde, 0x86, 0xc7, 0xa3, 0x78, 0xd7, 0xa7, 0x21, 0x6f, 0x21, 0xf1, 0xe6, 0x8d, 0x5b, + 0xd8, 0x8b, 0xc0, 0x3c, 0x43, 0xa6, 0xd3, 0xcc, 0x2d, 0xdf, 0x8b, 0x9c, 0xc3, 0x01, 0xb3, 0x00, + 0x26, 0xbf, 0x41, 0xf8, 0xa3, 0x92, 0x2c, 0x22, 0xd3, 0xd9, 0x51, 0x36, 0x45, 0x02, 0xa6, 0x51, + 0x26, 0x8a, 0x22, 0x05, 0x23, 0x6f, 0xc3, 0xc8, 0x9f, 0x27, 0x2b, 0x75, 0xa3, 0xb5, 0x35, 0x47, + 0x2e, 0x99, 0xb5, 0x21, 0x47, 0xf8, 0x54, 0x9c, 0x01, 0x9f, 0x13, 0xab, 0x95, 0xcc, 0x64, 0x79, + 0xa4, 0x45, 0x4d, 0xa6, 0x4b, 0x55, 0x32, 0x91, 0x50, 0x93, 0xe0, 0xc4, 0xc7, 0xec, 0x31, 0x09, + 0x24, 0xcb, 0x02, 0x24, 0xd5, 0xb7, 0x11, 0x7e, 0xa4, 0x49, 0x59, 0x32, 0x78, 0x75, 0x62, 0x4d, + 0xe8, 0xc6, 0xb5, 0x37, 0x60, 0xa4, 0x97, 0xc8, 0x6a, 0x6e, 0xa4, 0xda, 0x09, 0xf6, 0x26, 0xc2, + 0x23, 0x7c, 0x0a, 0x64, 0xdf, 0x1f, 0x78, 0x92, 0x39, 0xc0, 0x3e, 0x4f, 0x66, 0xb3, 0xec, 0xba, + 0x44, 0x7b, 0x0f, 0xe1, 0x93, 0x69, 0x42, 0xc3, 0x64, 0x9b, 0xd4, 0x45, 0x0f, 0x28, 0xee, 0x01, + 0x85, 0x47, 0xae, 0x1c, 0x27, 0x82, 0x5b, 0x4b, 0x64, 0xc1, 0xbc, 0x1d, 0xf9, 0x2a, 0xc2, 0xa3, + 0x71, 0xaa, 0xdc, 0x84, 0xea, 0xff, 0x72, 0xc7, 0xed, 0x91, 0xd9, 0x2c, 0xde, 0xc0, 0xa6, 0x66, + 0xdf, 0x5c, 0xb5, 0x50, 0xe4, 0xdf, 0x05, 0xf0, 0xe9, 0xac, 0x7d, 0x5a, 0xb2, 0xa5, 0x36, 0x1b, + 0x48, 0xc1, 0x1f, 0x20, 0x7c, 0xb2, 0x49, 0x59, 0x8a, 0xa2, 0x3a, 0x09, 0x2d, 0xfd, 0xf0, 0xf6, + 0x4d, 0x18, 0xf0, 0x06, 0x59, 0x2b, 0x1a, 0xb0, 0x76, 0x26, 0xfe, 0x18, 0xe1, 0x47, 0x9b, 0x94, + 0xad, 0xb6, 0x99, 0xbf, 0x5f, 0x1a, 0xa9, 0xac, 0xc2, 0x04, 0xf5, 0x06, 0xa0, 0xbe, 0x40, 0x9e, + 0x93, 0xa8, 0x2e, 0x74, 0xd2, 0xaa, 0x49, 0x4c, 0x1e, 0x20, 0x7c, 0x86, 0x27, 0x50, 0x96, 0x21, + 0x22, 0x8b, 0x55, 0x98, 0xe9, 0xe4, 0x3c, 0xaf, 0x47, 0x85, 0xf4, 0x7c, 0x1a, 0x70, 0x57, 0x48, + 0xa3, 0x14, 0x37, 0xbf, 0x56, 0xde, 0x46, 0x78, 0x8c, 0x77, 0x30, 0xe8, 0xee, 0x03, 0x5f, 0xcf, + 0x97, 0x01, 0x35, 0xb5, 0x22, 0x52, 0x8c, 0xba, 0x25, 0xfd, 0x57, 0x51, 0x74, 0xd2, 0xf1, 0x33, + 0x5a, 0xd4, 0x55, 0x71, 0xeb, 0x03, 0xcc, 0x3d, 0x72, 0xf5, 0x98, 0x19, 0xb9, 0xe5, 0x90, 0xe5, + 0x5a, 0x4d, 0xc9, 0xbb, 0x08, 0x8f, 0xbe, 0xd2, 0xf7, 0x8c, 0x17, 0x77, 0xac, 0x35, 0x58, 0xdc, + 0x52, 0x28, 0x16, 0xf7, 0x6d, 0xf0, 0x6c, 0xc3, 0x7a, 0x28, 0x6b, 0x8d, 0x17, 0x83, 0x2f, 0x23, + 0x3c, 0x12, 0x17, 0x90, 0x75, 0x79, 0xc4, 0x23, 0xb9, 0x9d, 0x2e, 0x31, 0xa9, 0x35, 0x69, 0xb6, + 0x52, 0x27, 0xa8, 0xa7, 0x80, 0x7a, 0xdc, 0x26, 0x92, 0x3a, 0x39, 0x4e, 0x42, 0x41, 0xfa, 0x06, + 0xc2, 0x63, 0x9b, 0x34, 0xf6, 0x64, 0x40, 0x31, 0xa7, 0xed, 0x5d, 0x6a, 0x6b, 0x73, 0x5c, 0x02, + 0x8e, 0x8b, 0xf6, 0xb9, 0x3c, 0x87, 0x13, 0x8a, 0x4e, 0x39, 0xd0, 0xd7, 0x11, 0x1e, 0xdd, 0xa4, + 0xed, 0x60, 0x9f, 0x86, 0x03, 0x9e, 0xd9, 0x12, 0x1e, 0x90, 0xd6, 0xc6, 0x99, 0x01, 0x9c, 0x0b, + 0xb6, 0x55, 0x88, 0x03, 0x7d, 0x72, 0x9a, 0xef, 0x20, 0x7c, 0xa2, 0x49, 0xd9, 0x80, 0x64, 0x51, + 0xb7, 0xa7, 0x25, 0x92, 0x54, 0xe5, 0x3e, 0xab, 0xa5, 0xb1, 0x9f, 0x85, 0xf1, 0xaf, 0x92, 0xa7, + 0x0a, 0xc6, 0x37, 0x28, 0x82, 0x6f, 0x23, 0x3c, 0x12, 0xa7, 0xa7, 0x49, 0xea, 0xa8, 0x19, 0x3f, + 0x5b, 0xa9, 0x13, 0x31, 0x7a, 0x01, 0x18, 0xaf, 0x5b, 0xc7, 0x63, 0xe4, 0xe1, 0xfb, 0x03, 0xc2, + 0xa3, 0xe9, 0xf0, 0xad, 0xb9, 0xcc, 0x25, 0x8e, 0x49, 0x08, 0xb9, 0x52, 0x02, 0xaf, 0x98, 0x37, + 0x10, 0xe4, 0x2f, 0x02, 0xf9, 0x33, 0xe4, 0xba, 0x24, 0xf7, 0x5c, 0xe6, 0xd6, 0x0c, 0xf1, 0xeb, + 0x08, 0x9f, 0xe2, 0x15, 0x2d, 0x19, 0xc4, 0xb0, 0x40, 0x4e, 0x69, 0xc3, 0x0b, 0xf5, 0xf1, 0x49, + 0x40, 0x5b, 0x26, 0x8b, 0x35, 0x82, 0x4a, 0xde, 0x41, 0x98, 0xdc, 0xa1, 0x61, 0xd7, 0xef, 0x29, + 0x33, 0x3e, 0xaf, 0x1d, 0x2a, 0x11, 0x4b, 0xaa, 0x05, 0x13, 0xa9, 0x3a, 0xef, 0x0b, 0xc7, 0x9f, + 0xf7, 0xbf, 0xc7, 0xf3, 0x7e, 0x2b, 0xf0, 0x68, 0xc9, 0x22, 0x56, 0xcc, 0xa9, 0x65, 0x33, 0x55, + 0x2a, 0xb4, 0xf7, 0x01, 0xaf, 0x4f, 0x7a, 0x12, 0x4f, 0x7d, 0x94, 0x8e, 0x19, 0x93, 0x7f, 0x5b, + 0x59, 0x60, 0xc5, 0x92, 0xa6, 0x57, 0x0c, 0x83, 0x8a, 0x0d, 0xbd, 0xfb, 0xde, 0x11, 0xf9, 0x27, + 0xc2, 0x84, 0x4f, 0xa1, 0x42, 0x13, 0xe5, 0x6b, 0xa5, 0x62, 0x4f, 0x67, 0xc6, 0x63, 0x95, 0x4a, + 0xfb, 0x10, 0x7c, 0xdb, 0x23, 0x91, 0xd6, 0xb7, 0xe4, 0xac, 0xae, 0xf1, 0xb0, 0xd8, 0x9e, 0xf8, + 0x59, 0x6c, 0x8e, 0x33, 0xfe, 0xa7, 0x1f, 0xc2, 0x67, 0xf3, 0x0e, 0xde, 0x08, 0x42, 0x78, 0x0c, + 0x77, 0x4a, 0xe9, 0x85, 0xaa, 0xa6, 0xbb, 0xbf, 0x1d, 0x06, 0x7f, 0x7f, 0x3d, 0x4c, 0x7e, 0x31, + 0x2c, 0x3d, 0x6e, 0xef, 0xfa, 0x1d, 0x2f, 0xa4, 0xd9, 0xcb, 0x8f, 0xc8, 0x39, 0x54, 0x7f, 0x68, + 0xc9, 0xb9, 0x51, 0x7e, 0xd1, 0x44, 0xa5, 0x76, 0xd3, 0x24, 0x60, 0xb5, 0x5b, 0x8a, 0xcc, 0x31, + 0x69, 0x27, 0x53, 0xab, 0x48, 0x2d, 0x1e, 0xfc, 0x4b, 0x7d, 0x90, 0x9a, 0x12, 0x58, 0x29, 0xd1, + 0x52, 0x49, 0x81, 0x3c, 0x98, 0x14, 0x69, 0x42, 0xca, 0xc2, 0x83, 0x96, 0xcb, 0x18, 0xed, 0xf6, + 0xd9, 0x11, 0xf9, 0x37, 0xc2, 0xa7, 0xb3, 0xab, 0x1b, 0x2a, 0xfb, 0x62, 0xd5, 0x0a, 0x4f, 0x57, + 0xf5, 0x25, 0x33, 0xb1, 0xa8, 0x49, 0xb9, 0x85, 0x01, 0x15, 0xfd, 0x7f, 0xb4, 0xf2, 0xbf, 0x88, + 0x47, 0x36, 0xe9, 0x8e, 0x1f, 0x31, 0x1a, 0xbe, 0x1c, 0x77, 0x98, 0xdf, 0x6c, 0x85, 0x41, 0xea, + 0xb4, 0x9b, 0x6d, 0x4e, 0x27, 0x1c, 0x3c, 0x07, 0x0e, 0x9e, 0xb1, 0x47, 0xa5, 0x83, 0x02, 0x1d, + 0x4e, 0x69, 0xaf, 0xe2, 0x93, 0xf1, 0xde, 0x2c, 0x87, 0x1f, 0xd7, 0x74, 0x6b, 0xcd, 0x68, 0x0c, + 0x99, 0xad, 0xfd, 0x22, 0x8c, 0x66, 0x59, 0x67, 0xb2, 0xa3, 0x71, 0xc7, 0xa1, 0x84, 0xdf, 0xc5, + 0x27, 0xf8, 0x12, 0x15, 0xcd, 0x23, 0x62, 0x6b, 0x3a, 0x2e, 0xbd, 0x5d, 0x92, 0xad, 0xe5, 0x4d, + 0x1f, 0xc9, 0x79, 0x47, 0xde, 0x40, 0xf8, 0x51, 0xf5, 0x52, 0x68, 0x7d, 0x9f, 0xf6, 0x18, 0x59, + 0xae, 0xdc, 0xf4, 0x41, 0x27, 0x87, 0x6e, 0x98, 0xca, 0x45, 0x00, 0xa6, 0x01, 0x68, 0xca, 0x9e, + 0x48, 0xf6, 0x38, 0x6e, 0x8e, 0xd4, 0x0b, 0xa3, 0xd7, 0x93, 0x03, 0x3a, 0xe4, 0x26, 0x70, 0xcd, + 0x97, 0xa6, 0xad, 0xc2, 0xb4, 0x60, 0x22, 0xd5, 0xdd, 0x1c, 0x08, 0x1e, 0x9e, 0x83, 0x19, 0x16, + 0x5e, 0x67, 0x35, 0x2c, 0x60, 0x32, 0x63, 0x29, 0x92, 0x56, 0xb0, 0x24, 0xb7, 0xb3, 0x5f, 0x1a, + 0x86, 0xed, 0x5d, 0xe9, 0x22, 0xbf, 0xbd, 0x2b, 0xe6, 0xb2, 0xed, 0x5d, 0x11, 0xda, 0x3f, 0x19, + 0x82, 0xe1, 0x1f, 0x0c, 0x91, 0x37, 0x86, 0x94, 0x5b, 0xd0, 0xcc, 0x3a, 0x37, 0xae, 0xfd, 0x35, + 0x8a, 0xbd, 0x71, 0x75, 0xaf, 0x28, 0xe7, 0x85, 0xf5, 0xbb, 0xa8, 0x60, 0xe7, 0x2b, 0x74, 0x61, + 0x49, 0xce, 0xd7, 0xe0, 0xef, 0x0d, 0xc5, 0x87, 0x11, 0x25, 0x76, 0x05, 0x87, 0x11, 0xc5, 0x5e, + 0xba, 0x3b, 0xe7, 0x94, 0xf6, 0xef, 0x10, 0xcc, 0xc4, 0x3b, 0x88, 0xfc, 0x12, 0x69, 0x67, 0xc2, + 0x78, 0x1a, 0x4c, 0xe7, 0xc0, 0x6c, 0x02, 0xf4, 0xd1, 0x27, 0x0f, 0x86, 0x61, 0x7b, 0x52, 0xfc, + 0x29, 0xde, 0x9e, 0xb2, 0x19, 0x5a, 0xba, 0x3d, 0x15, 0x8b, 0xc5, 0x92, 0xf9, 0x79, 0x9c, 0xb4, + 0x6f, 0x0d, 0x91, 0x1f, 0x0e, 0x29, 0x3b, 0xd4, 0xff, 0x33, 0x37, 0x9b, 0xb9, 0xff, 0x42, 0x78, + 0x4a, 0xd9, 0xcc, 0xd6, 0xa0, 0xcb, 0xd5, 0xe4, 0xbd, 0x1d, 0xb9, 0xa2, 0xd9, 0x46, 0xb2, 0x42, + 0xf5, 0xb1, 0xf6, 0xa9, 0x9a, 0xad, 0xc4, 0xcc, 0xbd, 0x02, 0x13, 0x77, 0xdb, 0xfa, 0x44, 0x66, + 0x67, 0xca, 0xbf, 0xdc, 0x74, 0x0e, 0xd5, 0x77, 0x8b, 0x22, 0x38, 0xa9, 0x1f, 0x45, 0x70, 0x78, + 0x89, 0xfc, 0x13, 0xc2, 0x56, 0x93, 0x32, 0x9d, 0x8b, 0x4f, 0x18, 0xc2, 0xa6, 0xca, 0xe6, 0xe5, + 0x3a, 0x4d, 0x84, 0x73, 0xcf, 0x80, 0x73, 0x4f, 0x0f, 0xee, 0xd8, 0x4b, 0x9c, 0xcb, 0xdf, 0x11, + 0xfe, 0x0d, 0xe1, 0xa9, 0x35, 0xda, 0xa1, 0xff, 0xfd, 0x4c, 0xc5, 0xbd, 0xd4, 0x9d, 0x29, 0xd9, + 0x4a, 0x38, 0xf3, 0x3c, 0x38, 0x73, 0x6d, 0xe1, 0x58, 0xce, 0xf0, 0x39, 0x79, 0x17, 0xe1, 0x71, + 0x25, 0xf3, 0x52, 0x9e, 0x34, 0x34, 0x4c, 0xba, 0x6c, 0x73, 0x8c, 0xf5, 0x82, 0xfe, 0x3a, 0xd0, + 0x5f, 0xb1, 0x9c, 0x2c, 0x7d, 0x45, 0x82, 0x71, 0xf0, 0x37, 0xe3, 0x03, 0x77, 0x9e, 0x7a, 0xb1, + 0x92, 0x22, 0x95, 0x40, 0x4b, 0x66, 0x62, 0xc1, 0xbb, 0x04, 0xbc, 0x97, 0xc8, 0xe3, 0x65, 0xbc, + 0x12, 0x92, 0xfc, 0x0a, 0xe1, 0x71, 0x25, 0x55, 0x6a, 0x85, 0x56, 0x4d, 0x0f, 0xc7, 0x58, 0x2f, + 0x50, 0xc5, 0xfb, 0xac, 0x05, 0x23, 0x54, 0x1e, 0xcf, 0xf7, 0x11, 0x9e, 0x88, 0xa7, 0x47, 0x9e, + 0x12, 0x53, 0xb8, 0xda, 0xeb, 0x29, 0x5d, 0x2a, 0xac, 0x98, 0x37, 0x10, 0xc0, 0x14, 0x80, 0x5b, + 0xd6, 0x56, 0xee, 0x05, 0xdc, 0x31, 0xaa, 0x8d, 0xf2, 0x9b, 0xec, 0x08, 0xdc, 0xfc, 0x3d, 0xc2, + 0x67, 0x52, 0xef, 0x3b, 0x53, 0x3e, 0x2e, 0x55, 0x23, 0xa7, 0x12, 0x67, 0xd9, 0x50, 0x2d, 0xbc, + 0x5b, 0x05, 0xef, 0x3e, 0x4e, 0xae, 0x95, 0x7a, 0x97, 0x5b, 0xa1, 0x83, 0xbb, 0x89, 0x23, 0xf2, + 0x67, 0x84, 0x27, 0xe2, 0x49, 0x3e, 0xde, 0x04, 0xa9, 0x09, 0xb5, 0x62, 0xde, 0x40, 0xb8, 0xb0, + 0x06, 0x2e, 0x3c, 0xb7, 0x70, 0x7c, 0x17, 0x78, 0xfc, 0x7f, 0x84, 0xf0, 0x38, 0x3f, 0x48, 0x7d, + 0x4a, 0x7e, 0x13, 0x52, 0xb6, 0x28, 0x34, 0x42, 0xed, 0xa2, 0xd0, 0xea, 0x85, 0x0b, 0x8f, 0x83, + 0x0b, 0xe7, 0xc9, 0xa4, 0x74, 0x61, 0xf0, 0x65, 0xca, 0xc0, 0x07, 0x5e, 0x59, 0xe0, 0x6d, 0xd5, + 0xe0, 0xe5, 0x92, 0x4f, 0xa3, 0xfc, 0xc3, 0x6d, 0xea, 0xdd, 0x53, 0xfa, 0x0c, 0x79, 0xa1, 0x42, + 0x97, 0x4f, 0x05, 0x7e, 0x54, 0xf0, 0xe2, 0x4f, 0x4d, 0x7c, 0x1e, 0x42, 0xf9, 0x91, 0x4c, 0x8b, + 0x1d, 0xf4, 0xf9, 0x19, 0x22, 0xbf, 0x09, 0xfd, 0x0c, 0xe1, 0x53, 0x4d, 0x9a, 0x02, 0x3c, 0xc8, + 0x7f, 0x34, 0x90, 0x32, 0xa6, 0xd2, 0xf6, 0x5c, 0x89, 0xcc, 0xfe, 0x34, 0x90, 0x7d, 0x92, 0x6c, + 0x98, 0x92, 0x55, 0x5f, 0x18, 0xbf, 0x87, 0xf0, 0x58, 0xbc, 0xd0, 0xd3, 0xb0, 0x73, 0x25, 0x14, + 0x6a, 0x1d, 0x99, 0x37, 0x50, 0x8a, 0xc9, 0xbd, 0x03, 0xf4, 0xb7, 0xac, 0x87, 0x47, 0xcf, 0xf3, + 0xb5, 0x83, 0x71, 0x93, 0xb2, 0xcf, 0xc6, 0x67, 0xb7, 0xfc, 0x37, 0x3e, 0x03, 0x9b, 0xf6, 0x1b, + 0x9f, 0xb4, 0x44, 0xa0, 0x8e, 0x03, 0xea, 0x18, 0x19, 0x91, 0xa8, 0xe2, 0x6c, 0x48, 0xfe, 0x12, + 0x6f, 0x6a, 0x6b, 0x83, 0x4f, 0x90, 0x44, 0xc4, 0xaa, 0xdf, 0x88, 0xe7, 0xd0, 0x72, 0x9d, 0xd8, + 0x3b, 0x30, 0xac, 0x4b, 0x5a, 0xc9, 0x69, 0x3c, 0xfb, 0xa9, 0x13, 0xc4, 0x09, 0x8e, 0xa7, 0x35, + 0x43, 0xa5, 0xbe, 0x33, 0xff, 0xe6, 0x50, 0xbc, 0xc8, 0xb3, 0x08, 0x7e, 0x51, 0x99, 0xcd, 0x71, + 0xa6, 0x57, 0xd3, 0x8c, 0x91, 0xda, 0x7e, 0x2b, 0x7e, 0x2a, 0xfb, 0x3e, 0x22, 0xb7, 0xcb, 0x7d, + 0xab, 0xed, 0xd8, 0x56, 0x93, 0xac, 0x3f, 0x94, 0x2e, 0x5f, 0xbc, 0xb6, 0x75, 0x75, 0xc7, 0x67, + 0xbb, 0x7b, 0xdb, 0x8d, 0x76, 0xd0, 0x75, 0xc0, 0xad, 0x20, 0xdc, 0x71, 0x92, 0xaf, 0xcf, 0x76, + 0x68, 0xcf, 0xe9, 0x6f, 0x2f, 0xef, 0x04, 0x4e, 0xf6, 0x2b, 0xc6, 0xed, 0x0f, 0xc3, 0x07, 0x68, + 0x4f, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x36, 0x38, 0x50, 0x1c, 0xe0, 0x28, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -259,8 +255,6 @@ type AdminServiceClient interface { ListTaskExecutions(ctx context.Context, in *admin.TaskExecutionListRequest, opts ...grpc.CallOption) (*admin.TaskExecutionList, error) // Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. GetTaskExecutionData(ctx context.Context, in *admin.TaskExecutionGetDataRequest, opts ...grpc.CallOption) (*admin.TaskExecutionGetDataResponse, error) - // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - UpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) (*admin.TaskExecutionUpdateResponse, error) // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. UpdateProjectDomainAttributes(ctx context.Context, in *admin.ProjectDomainAttributesUpdateRequest, opts ...grpc.CallOption) (*admin.ProjectDomainAttributesUpdateResponse, error) // Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. @@ -626,15 +620,6 @@ func (c *adminServiceClient) GetTaskExecutionData(ctx context.Context, in *admin return out, nil } -func (c *adminServiceClient) UpdateTaskExecution(ctx context.Context, in *admin.TaskExecutionUpdateRequest, opts ...grpc.CallOption) (*admin.TaskExecutionUpdateResponse, error) { - out := new(admin.TaskExecutionUpdateResponse) - err := c.cc.Invoke(ctx, "/flyteidl.service.AdminService/UpdateTaskExecution", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *adminServiceClient) UpdateProjectDomainAttributes(ctx context.Context, in *admin.ProjectDomainAttributesUpdateRequest, opts ...grpc.CallOption) (*admin.ProjectDomainAttributesUpdateResponse, error) { out := new(admin.ProjectDomainAttributesUpdateResponse) err := c.cc.Invoke(ctx, "/flyteidl.service.AdminService/UpdateProjectDomainAttributes", in, out, opts...) @@ -859,8 +844,6 @@ type AdminServiceServer interface { ListTaskExecutions(context.Context, *admin.TaskExecutionListRequest) (*admin.TaskExecutionList, error) // Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. GetTaskExecutionData(context.Context, *admin.TaskExecutionGetDataRequest) (*admin.TaskExecutionGetDataResponse, error) - // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - UpdateTaskExecution(context.Context, *admin.TaskExecutionUpdateRequest) (*admin.TaskExecutionUpdateResponse, error) // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. UpdateProjectDomainAttributes(context.Context, *admin.ProjectDomainAttributesUpdateRequest) (*admin.ProjectDomainAttributesUpdateResponse, error) // Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. @@ -1006,9 +989,6 @@ func (*UnimplementedAdminServiceServer) ListTaskExecutions(ctx context.Context, func (*UnimplementedAdminServiceServer) GetTaskExecutionData(ctx context.Context, req *admin.TaskExecutionGetDataRequest) (*admin.TaskExecutionGetDataResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTaskExecutionData not implemented") } -func (*UnimplementedAdminServiceServer) UpdateTaskExecution(ctx context.Context, req *admin.TaskExecutionUpdateRequest) (*admin.TaskExecutionUpdateResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateTaskExecution not implemented") -} func (*UnimplementedAdminServiceServer) UpdateProjectDomainAttributes(ctx context.Context, req *admin.ProjectDomainAttributesUpdateRequest) (*admin.ProjectDomainAttributesUpdateResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateProjectDomainAttributes not implemented") } @@ -1710,24 +1690,6 @@ func _AdminService_GetTaskExecutionData_Handler(srv interface{}, ctx context.Con return interceptor(ctx, in, info, handler) } -func _AdminService_UpdateTaskExecution_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(admin.TaskExecutionUpdateRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AdminServiceServer).UpdateTaskExecution(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/flyteidl.service.AdminService/UpdateTaskExecution", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminServiceServer).UpdateTaskExecution(ctx, req.(*admin.TaskExecutionUpdateRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _AdminService_UpdateProjectDomainAttributes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(admin.ProjectDomainAttributesUpdateRequest) if err := dec(in); err != nil { @@ -2164,10 +2126,6 @@ var _AdminService_serviceDesc = grpc.ServiceDesc{ MethodName: "GetTaskExecutionData", Handler: _AdminService_GetTaskExecutionData_Handler, }, - { - MethodName: "UpdateTaskExecution", - Handler: _AdminService_UpdateTaskExecution_Handler, - }, { MethodName: "UpdateProjectDomainAttributes", Handler: _AdminService_UpdateProjectDomainAttributes_Handler, diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go index 1c62a12b7e..796ed9f938 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go +++ b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.gw.go @@ -2053,132 +2053,6 @@ func request_AdminService_GetTaskExecutionData_0(ctx context.Context, marshaler } -var ( - filter_AdminService_UpdateTaskExecution_0 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0, "node_execution_id": 1, "execution_id": 2, "project": 3, "domain": 4, "name": 5, "node_id": 6, "task_id": 7, "version": 8, "retry_attempt": 9}, Base: []int{1, 20, 1, 1, 1, 4, 3, 2, 7, 5, 3, 0, 0, 0, 9, 6, 0, 15, 9, 0, 17, 12, 0, 19, 15, 0, 19, 18, 0, 20, 0}, Check: []int{0, 1, 2, 3, 4, 2, 6, 7, 2, 9, 10, 5, 8, 11, 2, 15, 16, 2, 18, 19, 2, 21, 22, 2, 24, 25, 2, 27, 28, 2, 30}} -) - -func request_AdminService_UpdateTaskExecution_0(ctx context.Context, marshaler runtime.Marshaler, client AdminServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq admin.TaskExecutionUpdateRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["id.node_execution_id.execution_id.project"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.project") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.project", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.project", err) - } - - val, ok = pathParams["id.node_execution_id.execution_id.domain"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.domain") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.domain", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.domain", err) - } - - val, ok = pathParams["id.node_execution_id.execution_id.name"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.name") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.name", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.name", err) - } - - val, ok = pathParams["id.node_execution_id.node_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.node_id") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.node_id", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.node_id", err) - } - - val, ok = pathParams["id.task_id.project"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.project") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.project", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.project", err) - } - - val, ok = pathParams["id.task_id.domain"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.domain") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.domain", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.domain", err) - } - - val, ok = pathParams["id.task_id.name"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.name") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.name", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.name", err) - } - - val, ok = pathParams["id.task_id.version"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.version") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.version", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.version", err) - } - - val, ok = pathParams["id.retry_attempt"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.retry_attempt") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "id.retry_attempt", val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.retry_attempt", err) - } - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_AdminService_UpdateTaskExecution_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.UpdateTaskExecution(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - func request_AdminService_UpdateProjectDomainAttributes_0(ctx context.Context, marshaler runtime.Marshaler, client AdminServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq admin.ProjectDomainAttributesUpdateRequest var metadata runtime.ServerMetadata @@ -3879,26 +3753,6 @@ func RegisterAdminServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu }) - mux.Handle("GET", pattern_AdminService_UpdateTaskExecution_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_AdminService_UpdateTaskExecution_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_AdminService_UpdateTaskExecution_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("PUT", pattern_AdminService_UpdateProjectDomainAttributes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -4321,8 +4175,6 @@ var ( pattern_AdminService_GetTaskExecutionData_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "data", "task_executions", "id.node_execution_id.execution_id.project", "id.node_execution_id.execution_id.domain", "id.node_execution_id.execution_id.name", "id.node_execution_id.node_id", "id.task_id.project", "id.task_id.domain", "id.task_id.name", "id.task_id.version", "id.retry_attempt"}, "")) - pattern_AdminService_UpdateTaskExecution_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11}, []string{"api", "v1", "task_executions", "id.node_execution_id.execution_id.project", "id.node_execution_id.execution_id.domain", "id.node_execution_id.execution_id.name", "id.node_execution_id.node_id", "id.task_id.project", "id.task_id.domain", "id.task_id.name", "id.task_id.version", "id.retry_attempt"}, "")) - pattern_AdminService_UpdateProjectDomainAttributes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"api", "v1", "project_domain_attributes", "attributes.project", "attributes.domain"}, "")) pattern_AdminService_GetProjectDomainAttributes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"api", "v1", "project_domain_attributes", "project", "domain"}, "")) @@ -4437,8 +4289,6 @@ var ( forward_AdminService_GetTaskExecutionData_0 = runtime.ForwardResponseMessage - forward_AdminService_UpdateTaskExecution_0 = runtime.ForwardResponseMessage - forward_AdminService_UpdateProjectDomainAttributes_0 = runtime.ForwardResponseMessage forward_AdminService_GetProjectDomainAttributes_0 = runtime.ForwardResponseMessage diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json index 80986f6777..0c99664435 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/admin.swagger.json @@ -2179,13 +2179,13 @@ }, "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}": { "get": { - "summary": "Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`.", - "operationId": "UpdateTaskExecution", + "summary": "Fetches a :ref:`ref_flyteidl.admin.TaskExecution`.", + "operationId": "GetTaskExecution", "responses": { "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/adminTaskExecutionUpdateResponse" + "$ref": "#/definitions/flyteidladminTaskExecution" } } }, @@ -2266,14 +2266,6 @@ "DATASET" ], "default": "UNSPECIFIED" - }, - { - "name": "evict_cache", - "description": "Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the\nexecution DAG and remove all stored results from datacatalog.", - "in": "query", - "required": false, - "type": "boolean", - "format": "boolean" } ], "tags": [ @@ -3196,13 +3188,6 @@ ], "default": "SINGLE" }, - "CacheEvictionErrorCode": { - "type": "string", - "enum": [ - "UNKNOWN" - ], - "default": "UNKNOWN" - }, "CatalogReservationStatus": { "type": "string", "enum": [ @@ -4030,22 +4015,11 @@ "state": { "$ref": "#/definitions/adminExecutionState", "title": "State to set as the new value active/archive" - }, - "evict_cache": { - "type": "boolean", - "format": "boolean", - "description": "Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the\nexecution DAG and remove all stored results from datacatalog." } } }, "adminExecutionUpdateResponse": { - "type": "object", - "properties": { - "cache_eviction_errors": { - "$ref": "#/definitions/coreCacheEvictionErrorList", - "description": "List of errors encountered during cache eviction (if any).\nWill only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set." - } - } + "type": "object" }, "adminFixedRate": { "type": "object", @@ -5134,14 +5108,6 @@ }, "title": "Response structure for a query to list of task execution entities.\nSee :ref:`ref_flyteidl.admin.TaskExecution` for more details" }, - "adminTaskExecutionUpdateResponse": { - "type": "object", - "properties": { - "cache_eviction_errors": { - "$ref": "#/definitions/coreCacheEvictionErrorList" - } - } - }, "adminTaskList": { "type": "object", "properties": { @@ -5627,44 +5593,6 @@ }, "description": "BranchNode is a special node that alter the flow of the workflow graph. It allows the control flow to branch at\nruntime based on a series of conditions that get evaluated on various parameters (e.g. inputs, primitives)." }, - "coreCacheEvictionError": { - "type": "object", - "properties": { - "code": { - "$ref": "#/definitions/CacheEvictionErrorCode", - "description": "Error code to match type of cache eviction error encountered." - }, - "message": { - "type": "string", - "description": "More detailed error message explaining the reason for the cache eviction failure." - }, - "node_execution_id": { - "$ref": "#/definitions/coreNodeExecutionIdentifier", - "description": "ID of the node execution the cache eviction failed for." - }, - "task_execution_id": { - "$ref": "#/definitions/coreTaskExecutionIdentifier", - "description": "ID of the task execution the cache eviction failed for (if the node execution was part of a task execution)." - }, - "workflow_execution_id": { - "$ref": "#/definitions/coreWorkflowExecutionIdentifier", - "description": "ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution)." - } - }, - "description": "Error returned if eviction of cached output fails and should be re-tried by the user." - }, - "coreCacheEvictionErrorList": { - "type": "object", - "properties": { - "errors": { - "type": "array", - "items": { - "$ref": "#/definitions/coreCacheEvictionError" - } - } - }, - "description": "List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request." - }, "coreCatalogArtifactTag": { "type": "object", "properties": { diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go new file mode 100644 index 0000000000..d458db4407 --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go @@ -0,0 +1,308 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: flyteidl/service/cache.proto + +package service + +import ( + context "context" + fmt "fmt" + core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + proto "github.com/golang/protobuf/proto" + _ "google.golang.org/genproto/googleapis/api/annotations" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +type EvictExecutionCacheRequest struct { + // Identifier of execution to evict cache for. + Id *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *EvictExecutionCacheRequest) Reset() { *m = EvictExecutionCacheRequest{} } +func (m *EvictExecutionCacheRequest) String() string { return proto.CompactTextString(m) } +func (*EvictExecutionCacheRequest) ProtoMessage() {} +func (*EvictExecutionCacheRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_c5ff5da69b96fa44, []int{0} +} + +func (m *EvictExecutionCacheRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EvictExecutionCacheRequest.Unmarshal(m, b) +} +func (m *EvictExecutionCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EvictExecutionCacheRequest.Marshal(b, m, deterministic) +} +func (m *EvictExecutionCacheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvictExecutionCacheRequest.Merge(m, src) +} +func (m *EvictExecutionCacheRequest) XXX_Size() int { + return xxx_messageInfo_EvictExecutionCacheRequest.Size(m) +} +func (m *EvictExecutionCacheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_EvictExecutionCacheRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_EvictExecutionCacheRequest proto.InternalMessageInfo + +func (m *EvictExecutionCacheRequest) GetId() *core.WorkflowExecutionIdentifier { + if m != nil { + return m.Id + } + return nil +} + +type EvictTaskExecutionCacheRequest struct { + // Identifier of task execution to evict cache for. + Id *core.TaskExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *EvictTaskExecutionCacheRequest) Reset() { *m = EvictTaskExecutionCacheRequest{} } +func (m *EvictTaskExecutionCacheRequest) String() string { return proto.CompactTextString(m) } +func (*EvictTaskExecutionCacheRequest) ProtoMessage() {} +func (*EvictTaskExecutionCacheRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_c5ff5da69b96fa44, []int{1} +} + +func (m *EvictTaskExecutionCacheRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EvictTaskExecutionCacheRequest.Unmarshal(m, b) +} +func (m *EvictTaskExecutionCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EvictTaskExecutionCacheRequest.Marshal(b, m, deterministic) +} +func (m *EvictTaskExecutionCacheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvictTaskExecutionCacheRequest.Merge(m, src) +} +func (m *EvictTaskExecutionCacheRequest) XXX_Size() int { + return xxx_messageInfo_EvictTaskExecutionCacheRequest.Size(m) +} +func (m *EvictTaskExecutionCacheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_EvictTaskExecutionCacheRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_EvictTaskExecutionCacheRequest proto.InternalMessageInfo + +func (m *EvictTaskExecutionCacheRequest) GetId() *core.TaskExecutionIdentifier { + if m != nil { + return m.Id + } + return nil +} + +type EvictCacheResponse struct { + // List of errors encountered during cache eviction (if any). + Errors *core.CacheEvictionErrorList `protobuf:"bytes,1,opt,name=errors,proto3" json:"errors,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *EvictCacheResponse) Reset() { *m = EvictCacheResponse{} } +func (m *EvictCacheResponse) String() string { return proto.CompactTextString(m) } +func (*EvictCacheResponse) ProtoMessage() {} +func (*EvictCacheResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_c5ff5da69b96fa44, []int{2} +} + +func (m *EvictCacheResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EvictCacheResponse.Unmarshal(m, b) +} +func (m *EvictCacheResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EvictCacheResponse.Marshal(b, m, deterministic) +} +func (m *EvictCacheResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvictCacheResponse.Merge(m, src) +} +func (m *EvictCacheResponse) XXX_Size() int { + return xxx_messageInfo_EvictCacheResponse.Size(m) +} +func (m *EvictCacheResponse) XXX_DiscardUnknown() { + xxx_messageInfo_EvictCacheResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_EvictCacheResponse proto.InternalMessageInfo + +func (m *EvictCacheResponse) GetErrors() *core.CacheEvictionErrorList { + if m != nil { + return m.Errors + } + return nil +} + +func init() { + proto.RegisterType((*EvictExecutionCacheRequest)(nil), "flyteidl.service.EvictExecutionCacheRequest") + proto.RegisterType((*EvictTaskExecutionCacheRequest)(nil), "flyteidl.service.EvictTaskExecutionCacheRequest") + proto.RegisterType((*EvictCacheResponse)(nil), "flyteidl.service.EvictCacheResponse") +} + +func init() { proto.RegisterFile("flyteidl/service/cache.proto", fileDescriptor_c5ff5da69b96fa44) } + +var fileDescriptor_c5ff5da69b96fa44 = []byte{ + // 462 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcf, 0x8a, 0x13, 0x41, + 0x10, 0xc6, 0xc9, 0x28, 0x7b, 0x68, 0x3d, 0xc8, 0x78, 0x50, 0x86, 0x65, 0x91, 0xa0, 0x22, 0x41, + 0xbb, 0x75, 0x05, 0xc5, 0x15, 0x41, 0x94, 0x08, 0x82, 0xa7, 0xac, 0xe0, 0xe2, 0x25, 0x74, 0xba, + 0x2b, 0xb3, 0x65, 0x92, 0xae, 0xb1, 0xbb, 0x33, 0xba, 0xc8, 0x5e, 0x7c, 0x05, 0x1f, 0x40, 0x2f, + 0xde, 0xbc, 0xf8, 0x2c, 0xbe, 0x82, 0xbe, 0x87, 0x4c, 0xcf, 0x9f, 0xdd, 0x19, 0x32, 0xba, 0xb7, + 0x74, 0xd5, 0x57, 0xbf, 0x7c, 0xfd, 0x55, 0x3a, 0x6c, 0x7b, 0xbe, 0x3c, 0xf2, 0x80, 0x7a, 0x29, + 0x1c, 0xd8, 0x1c, 0x15, 0x08, 0x25, 0xd5, 0x21, 0xf0, 0xcc, 0x92, 0xa7, 0xf8, 0x52, 0xdd, 0xe5, + 0x55, 0x37, 0xd9, 0x4e, 0x89, 0xd2, 0x25, 0x08, 0x99, 0xa1, 0x90, 0xc6, 0x90, 0x97, 0x1e, 0xc9, + 0xb8, 0x52, 0x9f, 0x24, 0x0d, 0x4d, 0x91, 0x05, 0x01, 0xd6, 0x92, 0xad, 0x7b, 0x3b, 0xed, 0x1e, + 0x6a, 0x30, 0x1e, 0xe7, 0x08, 0xb6, 0xec, 0x0f, 0x0f, 0x58, 0x32, 0xce, 0x51, 0xf9, 0xf1, 0x47, + 0x50, 0xeb, 0x02, 0xfa, 0xbc, 0x30, 0x32, 0x81, 0xf7, 0x6b, 0x70, 0x3e, 0xde, 0x63, 0x11, 0xea, + 0xab, 0x83, 0x6b, 0x83, 0x5b, 0x17, 0x76, 0x47, 0xbc, 0xb1, 0x55, 0xa0, 0xf8, 0x1b, 0xb2, 0x8b, + 0xf9, 0x92, 0x3e, 0x34, 0x93, 0x2f, 0x1b, 0xf6, 0x24, 0x42, 0x3d, 0x3c, 0x60, 0x3b, 0x81, 0xfc, + 0x5a, 0xba, 0xc5, 0x66, 0xfa, 0x83, 0x53, 0xf4, 0x9b, 0x1d, 0x7a, 0x6b, 0xaa, 0x43, 0xde, 0x67, + 0x71, 0x20, 0x57, 0x30, 0x97, 0x91, 0x71, 0x10, 0x3f, 0x61, 0x5b, 0xe5, 0xcd, 0x2b, 0xe2, 0x8d, + 0x0e, 0x31, 0xa8, 0xc3, 0x1c, 0x92, 0x19, 0x17, 0xca, 0x57, 0xe8, 0xfc, 0xa4, 0x1a, 0xda, 0xfd, + 0x73, 0x9e, 0x5d, 0x0c, 0x92, 0xfd, 0x32, 0xf3, 0xf8, 0xe7, 0x80, 0x5d, 0xde, 0x10, 0x4d, 0x7c, + 0x9b, 0x77, 0xd7, 0xc3, 0xfb, 0x13, 0x4c, 0xae, 0xf7, 0xa8, 0x5b, 0xde, 0x87, 0x2f, 0x3e, 0xff, + 0xfa, 0xfd, 0x25, 0x7a, 0x3a, 0x7a, 0x1c, 0x36, 0x9c, 0xdf, 0x2b, 0x7f, 0x0e, 0x02, 0x6a, 0xa4, + 0x13, 0x9f, 0x50, 0x17, 0x1b, 0x7b, 0x07, 0xca, 0x1f, 0x87, 0x83, 0xa6, 0x95, 0x44, 0x53, 0x7e, + 0x36, 0x72, 0x05, 0xc7, 0x7b, 0x83, 0x51, 0xfc, 0xed, 0x1c, 0xbb, 0xd2, 0x13, 0x7a, 0x7c, 0xb7, + 0xc7, 0x49, 0xef, 0x7e, 0xce, 0xe8, 0xfd, 0x47, 0x14, 0xcc, 0x7f, 0x8f, 0x46, 0x5f, 0xa3, 0xb6, + 0x7d, 0x2f, 0xdd, 0x62, 0xda, 0xb9, 0x83, 0x21, 0x0d, 0x27, 0xb5, 0x29, 0x6a, 0xde, 0x3a, 0xb4, + 0xae, 0xf8, 0x1f, 0x6d, 0x2b, 0x81, 0x7f, 0x4b, 0x43, 0x40, 0x3d, 0xc2, 0x50, 0x41, 0x5d, 0xb6, + 0x83, 0xe5, 0xae, 0x8f, 0xba, 0x78, 0xfa, 0x0b, 0xeb, 0xda, 0x09, 0xb9, 0xae, 0xe4, 0x60, 0x1d, + 0x52, 0x25, 0xb3, 0xe0, 0xed, 0xd1, 0x54, 0x7a, 0x0f, 0xab, 0xcc, 0x17, 0x2b, 0x7a, 0xf6, 0xe8, + 0xed, 0xc3, 0x14, 0xfd, 0xe1, 0x7a, 0xc6, 0x15, 0xad, 0x44, 0x08, 0x98, 0x6c, 0x2a, 0x9a, 0x67, + 0x9a, 0x82, 0x11, 0xd9, 0xec, 0x4e, 0x4a, 0xa2, 0xfb, 0x1f, 0x31, 0xdb, 0x0a, 0x4f, 0xf6, 0xfe, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0x10, 0x51, 0x12, 0x3e, 0x04, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// CacheServiceClient is the client API for CacheService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type CacheServiceClient interface { + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) +} + +type cacheServiceClient struct { + cc *grpc.ClientConn +} + +func NewCacheServiceClient(cc *grpc.ClientConn) CacheServiceClient { + return &cacheServiceClient{cc} +} + +func (c *cacheServiceClient) EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { + out := new(EvictCacheResponse) + err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictExecutionCache", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { + out := new(EvictCacheResponse) + err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictTaskExecutionCache", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// CacheServiceServer is the server API for CacheService service. +type CacheServiceServer interface { + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + EvictExecutionCache(context.Context, *EvictExecutionCacheRequest) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + EvictTaskExecutionCache(context.Context, *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error) +} + +// UnimplementedCacheServiceServer can be embedded to have forward compatible implementations. +type UnimplementedCacheServiceServer struct { +} + +func (*UnimplementedCacheServiceServer) EvictExecutionCache(ctx context.Context, req *EvictExecutionCacheRequest) (*EvictCacheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EvictExecutionCache not implemented") +} +func (*UnimplementedCacheServiceServer) EvictTaskExecutionCache(ctx context.Context, req *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EvictTaskExecutionCache not implemented") +} + +func RegisterCacheServiceServer(s *grpc.Server, srv CacheServiceServer) { + s.RegisterService(&_CacheService_serviceDesc, srv) +} + +func _CacheService_EvictExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EvictExecutionCacheRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CacheServiceServer).EvictExecutionCache(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/flyteidl.service.CacheService/EvictExecutionCache", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CacheServiceServer).EvictExecutionCache(ctx, req.(*EvictExecutionCacheRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _CacheService_EvictTaskExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EvictTaskExecutionCacheRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/flyteidl.service.CacheService/EvictTaskExecutionCache", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, req.(*EvictTaskExecutionCacheRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _CacheService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "flyteidl.service.CacheService", + HandlerType: (*CacheServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "EvictExecutionCache", + Handler: _CacheService_EvictExecutionCache_Handler, + }, + { + MethodName: "EvictTaskExecutionCache", + Handler: _CacheService_EvictTaskExecutionCache_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "flyteidl/service/cache.proto", +} diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go new file mode 100644 index 0000000000..4ec5ff90b9 --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go @@ -0,0 +1,302 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: flyteidl/service/cache.proto + +/* +Package service is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package service + +import ( + "context" + "io" + "net/http" + + "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/status" +) + +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray + +func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq EvictExecutionCacheRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id.project"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.project") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.project", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.project", err) + } + + val, ok = pathParams["id.domain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.domain") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.domain", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.domain", err) + } + + val, ok = pathParams["id.name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.name") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.name", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.name", err) + } + + msg, err := client.EvictExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func request_CacheService_EvictTaskExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq EvictTaskExecutionCacheRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id.node_execution_id.execution_id.project"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.project") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.project", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.project", err) + } + + val, ok = pathParams["id.node_execution_id.execution_id.domain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.domain") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.domain", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.domain", err) + } + + val, ok = pathParams["id.node_execution_id.execution_id.name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.name") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.name", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.name", err) + } + + val, ok = pathParams["id.node_execution_id.node_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.node_id") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.node_id", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.node_id", err) + } + + val, ok = pathParams["id.task_id.project"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.project") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.project", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.project", err) + } + + val, ok = pathParams["id.task_id.domain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.domain") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.domain", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.domain", err) + } + + val, ok = pathParams["id.task_id.name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.name") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.name", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.name", err) + } + + val, ok = pathParams["id.task_id.version"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.version") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.version", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.version", err) + } + + val, ok = pathParams["id.retry_attempt"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.retry_attempt") + } + + err = runtime.PopulateFieldFromPath(&protoReq, "id.retry_attempt", val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.retry_attempt", err) + } + + msg, err := client.EvictTaskExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +// RegisterCacheServiceHandlerFromEndpoint is same as RegisterCacheServiceHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterCacheServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterCacheServiceHandler(ctx, mux, conn) +} + +// RegisterCacheServiceHandler registers the http handlers for service CacheService to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterCacheServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterCacheServiceHandlerClient(ctx, mux, NewCacheServiceClient(conn)) +} + +// RegisterCacheServiceHandlerClient registers the http handlers for service CacheService +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "CacheServiceClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "CacheServiceClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "CacheServiceClient" to call the correct interceptors. +func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client CacheServiceClient) error { + + mux.Handle("DELETE", pattern_CacheService_EvictExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_CacheService_EvictExecutionCache_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_CacheService_EvictExecutionCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("DELETE", pattern_CacheService_EvictTaskExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_CacheService_EvictTaskExecutionCache_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_CacheService_EvictTaskExecutionCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_CacheService_EvictExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "id.project", "id.domain", "id.name"}, "")) + + pattern_CacheService_EvictTaskExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "id.node_execution_id.execution_id.project", "id.node_execution_id.execution_id.domain", "id.node_execution_id.execution_id.name", "id.node_execution_id.node_id", "id.task_id.project", "id.task_id.domain", "id.task_id.name", "id.task_id.version", "id.retry_attempt"}, "")) +) + +var ( + forward_CacheService_EvictExecutionCache_0 = runtime.ForwardResponseMessage + + forward_CacheService_EvictTaskExecutionCache_0 = runtime.ForwardResponseMessage +) diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json new file mode 100644 index 0000000000..acd2849a20 --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json @@ -0,0 +1,314 @@ +{ + "swagger": "2.0", + "info": { + "title": "flyteidl/service/cache.proto", + "version": "version not set" + }, + "schemes": [ + "http", + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}": { + "delete": { + "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.", + "operationId": "EvictExecutionCache", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serviceEvictCacheResponse" + } + } + }, + "parameters": [ + { + "name": "id.project", + "description": "Name of the project the resource belongs to.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.domain", + "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.name", + "description": "User or system provided value for the resource.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/serviceEvictExecutionCacheRequest" + } + } + ], + "tags": [ + "CacheService" + ] + } + }, + "/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}": { + "delete": { + "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.", + "operationId": "EvictTaskExecutionCache", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serviceEvictCacheResponse" + } + } + }, + "parameters": [ + { + "name": "id.node_execution_id.execution_id.project", + "description": "Name of the project the resource belongs to.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.node_execution_id.execution_id.domain", + "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.node_execution_id.execution_id.name", + "description": "User or system provided value for the resource.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.node_execution_id.node_id", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.task_id.project", + "description": "Name of the project the resource belongs to.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.task_id.domain", + "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.task_id.name", + "description": "User provided value for the resource.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.task_id.version", + "description": "Specific version of the resource.", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "id.retry_attempt", + "in": "path", + "required": true, + "type": "integer", + "format": "int64" + }, + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/serviceEvictTaskExecutionCacheRequest" + } + } + ], + "tags": [ + "CacheService" + ] + } + } + }, + "definitions": { + "CacheEvictionErrorCode": { + "type": "string", + "enum": [ + "UNKNOWN" + ], + "default": "UNKNOWN" + }, + "coreCacheEvictionError": { + "type": "object", + "properties": { + "code": { + "$ref": "#/definitions/CacheEvictionErrorCode", + "description": "Error code to match type of cache eviction error encountered." + }, + "message": { + "type": "string", + "description": "More detailed error message explaining the reason for the cache eviction failure." + }, + "node_execution_id": { + "$ref": "#/definitions/coreNodeExecutionIdentifier", + "description": "ID of the node execution the cache eviction failed for." + }, + "task_execution_id": { + "$ref": "#/definitions/coreTaskExecutionIdentifier", + "description": "ID of the task execution the cache eviction failed for (if the node execution was part of a task execution)." + }, + "workflow_execution_id": { + "$ref": "#/definitions/coreWorkflowExecutionIdentifier", + "description": "ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution)." + } + }, + "description": "Error returned if eviction of cached output fails and should be re-tried by the user." + }, + "coreCacheEvictionErrorList": { + "type": "object", + "properties": { + "errors": { + "type": "array", + "items": { + "$ref": "#/definitions/coreCacheEvictionError" + } + } + }, + "description": "List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request." + }, + "coreIdentifier": { + "type": "object", + "properties": { + "resource_type": { + "$ref": "#/definitions/coreResourceType", + "description": "Identifies the specific type of resource that this identifier corresponds to." + }, + "project": { + "type": "string", + "description": "Name of the project the resource belongs to." + }, + "domain": { + "type": "string", + "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." + }, + "name": { + "type": "string", + "description": "User provided value for the resource." + }, + "version": { + "type": "string", + "description": "Specific version of the resource." + } + }, + "description": "Encapsulation of fields that uniquely identifies a Flyte resource." + }, + "coreNodeExecutionIdentifier": { + "type": "object", + "properties": { + "node_id": { + "type": "string" + }, + "execution_id": { + "$ref": "#/definitions/coreWorkflowExecutionIdentifier" + } + }, + "description": "Encapsulation of fields that identify a Flyte node execution entity." + }, + "coreResourceType": { + "type": "string", + "enum": [ + "UNSPECIFIED", + "TASK", + "WORKFLOW", + "LAUNCH_PLAN", + "DATASET" + ], + "default": "UNSPECIFIED", + "description": "Indicates a resource type within Flyte.\n\n - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects.\nEventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects \nin a similar manner to other Flyte objects" + }, + "coreTaskExecutionIdentifier": { + "type": "object", + "properties": { + "task_id": { + "$ref": "#/definitions/coreIdentifier" + }, + "node_execution_id": { + "$ref": "#/definitions/coreNodeExecutionIdentifier" + }, + "retry_attempt": { + "type": "integer", + "format": "int64" + } + }, + "description": "Encapsulation of fields that identify a Flyte task execution entity." + }, + "coreWorkflowExecutionIdentifier": { + "type": "object", + "properties": { + "project": { + "type": "string", + "description": "Name of the project the resource belongs to." + }, + "domain": { + "type": "string", + "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." + }, + "name": { + "type": "string", + "description": "User or system provided value for the resource." + } + }, + "title": "Encapsulation of fields that uniquely identifies a Flyte workflow execution" + }, + "serviceEvictCacheResponse": { + "type": "object", + "properties": { + "errors": { + "$ref": "#/definitions/coreCacheEvictionErrorList", + "description": "List of errors encountered during cache eviction (if any)." + } + } + }, + "serviceEvictExecutionCacheRequest": { + "type": "object", + "properties": { + "id": { + "$ref": "#/definitions/coreWorkflowExecutionIdentifier", + "description": "Identifier of execution to evict cache for." + } + } + }, + "serviceEvictTaskExecutionCacheRequest": { + "type": "object", + "properties": { + "id": { + "$ref": "#/definitions/coreTaskExecutionIdentifier", + "description": "Identifier of task execution to evict cache for." + } + } + } + } +} diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md index 79b06ece86..9f51012635 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/README.md @@ -42,6 +42,7 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**GetProjectAttributes**](docs/AdminServiceApi.md#getprojectattributes) | **Get** /api/v1/project_attributes/{project} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**GetProjectDomainAttributes**](docs/AdminServiceApi.md#getprojectdomainattributes) | **Get** /api/v1/project_domain_attributes/{project}/{domain} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**GetTask**](docs/AdminServiceApi.md#gettask) | **Get** /api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Task` definition. +*AdminServiceApi* | [**GetTaskExecution**](docs/AdminServiceApi.md#gettaskexecution) | **Get** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**GetTaskExecutionData**](docs/AdminServiceApi.md#gettaskexecutiondata) | **Get** /api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**GetVersion**](docs/AdminServiceApi.md#getversion) | **Get** /api/v1/version | *AdminServiceApi* | [**GetWorkflow**](docs/AdminServiceApi.md#getworkflow) | **Get** /api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Workflow` definition. @@ -75,7 +76,6 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**UpdateProject**](docs/AdminServiceApi.md#updateproject) | **Put** /api/v1/projects/{id} | Updates an existing :ref:`ref_flyteidl.admin.Project` flyteidl.admin.Project should be passed but the domains property should be empty; it will be ignored in the handler as domains cannot be updated via this API. *AdminServiceApi* | [**UpdateProjectAttributes**](docs/AdminServiceApi.md#updateprojectattributes) | **Put** /api/v1/project_attributes/{attributes.project} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` at the project level *AdminServiceApi* | [**UpdateProjectDomainAttributes**](docs/AdminServiceApi.md#updateprojectdomainattributes) | **Put** /api/v1/project_domain_attributes/{attributes.project}/{attributes.domain} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. -*AdminServiceApi* | [**UpdateTaskExecution**](docs/AdminServiceApi.md#updatetaskexecution) | **Get** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**UpdateWorkflowAttributes**](docs/AdminServiceApi.md#updateworkflowattributes) | **Put** /api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. @@ -181,7 +181,6 @@ Class | Method | HTTP request | Description - [AdminTaskExecutionEventResponse](docs/AdminTaskExecutionEventResponse.md) - [AdminTaskExecutionGetDataResponse](docs/AdminTaskExecutionGetDataResponse.md) - [AdminTaskExecutionList](docs/AdminTaskExecutionList.md) - - [AdminTaskExecutionUpdateResponse](docs/AdminTaskExecutionUpdateResponse.md) - [AdminTaskList](docs/AdminTaskList.md) - [AdminTaskResourceAttributes](docs/AdminTaskResourceAttributes.md) - [AdminTaskResourceSpec](docs/AdminTaskResourceSpec.md) @@ -205,7 +204,6 @@ Class | Method | HTTP request | Description - [AdminWorkflowList](docs/AdminWorkflowList.md) - [AdminWorkflowSpec](docs/AdminWorkflowSpec.md) - [BlobTypeBlobDimensionality](docs/BlobTypeBlobDimensionality.md) - - [CacheEvictionErrorCode](docs/CacheEvictionErrorCode.md) - [CatalogReservationStatus](docs/CatalogReservationStatus.md) - [ComparisonExpressionOperator](docs/ComparisonExpressionOperator.md) - [ConjunctionExpressionLogicalOperator](docs/ConjunctionExpressionLogicalOperator.md) @@ -223,8 +221,6 @@ Class | Method | HTTP request | Description - [CoreBlobType](docs/CoreBlobType.md) - [CoreBooleanExpression](docs/CoreBooleanExpression.md) - [CoreBranchNode](docs/CoreBranchNode.md) - - [CoreCacheEvictionError](docs/CoreCacheEvictionError.md) - - [CoreCacheEvictionErrorList](docs/CoreCacheEvictionErrorList.md) - [CoreCatalogArtifactTag](docs/CoreCatalogArtifactTag.md) - [CoreCatalogCacheStatus](docs/CoreCatalogCacheStatus.md) - [CoreCatalogMetadata](docs/CoreCatalogMetadata.md) diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml index 72a461ec3d..7667076bef 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml @@ -1910,8 +1910,8 @@ paths: : get: tags: - "AdminService" - summary: "Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`." - operationId: "UpdateTaskExecution" + summary: "Fetches a :ref:`ref_flyteidl.admin.TaskExecution`." + operationId: "GetTaskExecution" parameters: - name: "id.node_execution_id.execution_id.project" in: "path" @@ -1988,21 +1988,11 @@ paths: - "DATASET" x-exportParamName: "IdTaskIdResourceType" x-optionalDataType: "String" - - name: "evict_cache" - in: "query" - description: "Indicates the cache of this (finished) task execution should\ - \ be evicted, instructing flyteadmin to traverse the\nexecution DAG and\ - \ remove all stored results from datacatalog." - required: false - type: "boolean" - format: "boolean" - x-exportParamName: "EvictCache" - x-optionalDataType: "Bool" responses: 200: description: "A successful response." schema: - $ref: "#/definitions/adminTaskExecutionUpdateResponse" + $ref: "#/definitions/flyteidladminTaskExecution" ? /api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id} : get: tags: @@ -2835,11 +2825,6 @@ definitions: - "SINGLE" - "MULTIPART" default: "SINGLE" - CacheEvictionErrorCode: - type: "string" - enum: - - "UNKNOWN" - default: "UNKNOWN" CatalogReservationStatus: type: "string" description: "Indicates the status of a catalog reservation operation.\n\n - RESERVATION_DISABLED:\ @@ -4501,75 +4486,8 @@ definitions: state: title: "State to set as the new value active/archive" $ref: "#/definitions/adminExecutionState" - evict_cache: - type: "boolean" - format: "boolean" - description: "Indicates the cache of this (finished) execution should be evicted,\ - \ instructing flyteadmin to traverse the\nexecution DAG and remove all stored\ - \ results from datacatalog." adminExecutionUpdateResponse: type: "object" - properties: - cache_eviction_errors: - description: "List of errors encountered during cache eviction (if any).\n\ - Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest`\ - \ is set." - $ref: "#/definitions/coreCacheEvictionErrorList" - example: - cache_eviction_errors: - errors: - - code: {} - workflow_execution_id: - domain: "domain" - name: "name" - project: "project" - task_execution_id: - task_id: - domain: "domain" - resource_type: {} - name: "name" - project: "project" - version: "version" - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - retry_attempt: 0 - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - message: "message" - - code: {} - workflow_execution_id: - domain: "domain" - name: "name" - project: "project" - task_execution_id: - task_id: - domain: "domain" - resource_type: {} - name: "name" - project: "project" - version: "version" - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - retry_attempt: 0 - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - message: "message" adminFixedRate: type: "object" properties: @@ -16101,66 +16019,6 @@ definitions: uri: "uri" ttl: "ttl" token: "token" - adminTaskExecutionUpdateResponse: - type: "object" - properties: - cache_eviction_errors: - $ref: "#/definitions/coreCacheEvictionErrorList" - example: - cache_eviction_errors: - errors: - - code: {} - workflow_execution_id: - domain: "domain" - name: "name" - project: "project" - task_execution_id: - task_id: - domain: "domain" - resource_type: {} - name: "name" - project: "project" - version: "version" - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - retry_attempt: 0 - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - message: "message" - - code: {} - workflow_execution_id: - domain: "domain" - name: "name" - project: "project" - task_execution_id: - task_id: - domain: "domain" - resource_type: {} - name: "name" - project: "project" - version: "version" - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - retry_attempt: 0 - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - message: "message" adminTaskList: type: "object" properties: @@ -44048,119 +43906,6 @@ definitions: integer: "integer" var: "var" operator: {} - coreCacheEvictionError: - type: "object" - properties: - code: - description: "Error code to match type of cache eviction error encountered." - $ref: "#/definitions/CacheEvictionErrorCode" - message: - type: "string" - description: "More detailed error message explaining the reason for the cache\ - \ eviction failure." - node_execution_id: - description: "ID of the node execution the cache eviction failed for." - $ref: "#/definitions/coreNodeExecutionIdentifier" - task_execution_id: - description: "ID of the task execution the cache eviction failed for (if the\ - \ node execution was part of a task execution)." - $ref: "#/definitions/coreTaskExecutionIdentifier" - workflow_execution_id: - description: "ID of the workflow execution the cache eviction failed for (if\ - \ the node execution was part of a workflow execution)." - $ref: "#/definitions/coreWorkflowExecutionIdentifier" - description: "Error returned if eviction of cached output fails and should be\ - \ re-tried by the user." - example: - code: {} - workflow_execution_id: - domain: "domain" - name: "name" - project: "project" - task_execution_id: - task_id: - domain: "domain" - resource_type: {} - name: "name" - project: "project" - version: "version" - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - retry_attempt: 0 - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - message: "message" - coreCacheEvictionErrorList: - type: "object" - properties: - errors: - type: "array" - items: - $ref: "#/definitions/coreCacheEvictionError" - description: "List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered\ - \ during a cache eviction request." - example: - errors: - - code: {} - workflow_execution_id: - domain: "domain" - name: "name" - project: "project" - task_execution_id: - task_id: - domain: "domain" - resource_type: {} - name: "name" - project: "project" - version: "version" - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - retry_attempt: 0 - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - message: "message" - - code: {} - workflow_execution_id: - domain: "domain" - name: "name" - project: "project" - task_execution_id: - task_id: - domain: "domain" - resource_type: {} - name: "name" - project: "project" - version: "version" - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - retry_attempt: 0 - node_execution_id: - execution_id: - domain: "domain" - name: "name" - project: "project" - node_id: "node_id" - message: "message" coreCatalogArtifactTag: type: "object" properties: diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go index d1031b1e8a..dab31c18d1 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/api_admin_service.go @@ -1988,6 +1988,120 @@ func (a *AdminServiceApiService) GetTask(ctx context.Context, idProject string, return localVarReturnValue, localVarHttpResponse, nil } +/* +AdminServiceApiService Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. + * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param idNodeExecutionIdExecutionIdProject Name of the project the resource belongs to. + * @param idNodeExecutionIdExecutionIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. + * @param idNodeExecutionIdExecutionIdName User or system provided value for the resource. + * @param idNodeExecutionIdNodeId + * @param idTaskIdProject Name of the project the resource belongs to. + * @param idTaskIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. + * @param idTaskIdName User provided value for the resource. + * @param idTaskIdVersion Specific version of the resource. + * @param idRetryAttempt + * @param optional nil or *GetTaskExecutionOpts - Optional Parameters: + * @param "IdTaskIdResourceType" (optional.String) - Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects + +@return FlyteidladminTaskExecution +*/ + +type GetTaskExecutionOpts struct { + IdTaskIdResourceType optional.String +} + +func (a *AdminServiceApiService) GetTaskExecution(ctx context.Context, idNodeExecutionIdExecutionIdProject string, idNodeExecutionIdExecutionIdDomain string, idNodeExecutionIdExecutionIdName string, idNodeExecutionIdNodeId string, idTaskIdProject string, idTaskIdDomain string, idTaskIdName string, idTaskIdVersion string, idRetryAttempt int64, localVarOptionals *GetTaskExecutionOpts) (FlyteidladminTaskExecution, *http.Response, error) { + var ( + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + localVarReturnValue FlyteidladminTaskExecution + ) + + // create path and map variables + localVarPath := a.client.cfg.BasePath + "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.project"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdProject), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.domain"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdDomain), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.name"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdName), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.node_id"+"}", fmt.Sprintf("%v", idNodeExecutionIdNodeId), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.project"+"}", fmt.Sprintf("%v", idTaskIdProject), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.domain"+"}", fmt.Sprintf("%v", idTaskIdDomain), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.name"+"}", fmt.Sprintf("%v", idTaskIdName), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.version"+"}", fmt.Sprintf("%v", idTaskIdVersion), -1) + localVarPath = strings.Replace(localVarPath, "{"+"id.retry_attempt"+"}", fmt.Sprintf("%v", idRetryAttempt), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + if localVarOptionals != nil && localVarOptionals.IdTaskIdResourceType.IsSet() { + localVarQueryParams.Add("id.task_id.resource_type", parameterToString(localVarOptionals.IdTaskIdResourceType.Value(), "")) + } + // to determine the Content-Type header + localVarHttpContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) + if localVarHttpContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHttpContentType + } + + // to determine the Accept header + localVarHttpHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) + if localVarHttpHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHttpHeaderAccept + } + r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHttpResponse, err := a.client.callAPI(r) + if err != nil || localVarHttpResponse == nil { + return localVarReturnValue, localVarHttpResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body) + localVarHttpResponse.Body.Close() + if err != nil { + return localVarReturnValue, localVarHttpResponse, err + } + + if localVarHttpResponse.StatusCode < 300 { + // If we succeed, return the data, otherwise pass on to decode error. + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); + if err == nil { + return localVarReturnValue, localVarHttpResponse, err + } + } + + if localVarHttpResponse.StatusCode >= 300 { + newErr := GenericSwaggerError{ + body: localVarBody, + error: localVarHttpResponse.Status, + } + + if localVarHttpResponse.StatusCode == 200 { + var v FlyteidladminTaskExecution + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, nil +} + /* AdminServiceApiService Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @@ -5636,125 +5750,6 @@ func (a *AdminServiceApiService) UpdateProjectDomainAttributes(ctx context.Conte return localVarReturnValue, localVarHttpResponse, nil } -/* -AdminServiceApiService Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param idNodeExecutionIdExecutionIdProject Name of the project the resource belongs to. - * @param idNodeExecutionIdExecutionIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. - * @param idNodeExecutionIdExecutionIdName User or system provided value for the resource. - * @param idNodeExecutionIdNodeId - * @param idTaskIdProject Name of the project the resource belongs to. - * @param idTaskIdDomain Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. - * @param idTaskIdName User provided value for the resource. - * @param idTaskIdVersion Specific version of the resource. - * @param idRetryAttempt - * @param optional nil or *UpdateTaskExecutionOpts - Optional Parameters: - * @param "IdTaskIdResourceType" (optional.String) - Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects - * @param "EvictCache" (optional.Bool) - Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. - -@return AdminTaskExecutionUpdateResponse -*/ - -type UpdateTaskExecutionOpts struct { - IdTaskIdResourceType optional.String - EvictCache optional.Bool -} - -func (a *AdminServiceApiService) UpdateTaskExecution(ctx context.Context, idNodeExecutionIdExecutionIdProject string, idNodeExecutionIdExecutionIdDomain string, idNodeExecutionIdExecutionIdName string, idNodeExecutionIdNodeId string, idTaskIdProject string, idTaskIdDomain string, idTaskIdName string, idTaskIdVersion string, idRetryAttempt int64, localVarOptionals *UpdateTaskExecutionOpts) (AdminTaskExecutionUpdateResponse, *http.Response, error) { - var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue AdminTaskExecutionUpdateResponse - ) - - // create path and map variables - localVarPath := a.client.cfg.BasePath + "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.project"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdProject), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.domain"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdDomain), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.execution_id.name"+"}", fmt.Sprintf("%v", idNodeExecutionIdExecutionIdName), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.node_execution_id.node_id"+"}", fmt.Sprintf("%v", idNodeExecutionIdNodeId), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.project"+"}", fmt.Sprintf("%v", idTaskIdProject), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.domain"+"}", fmt.Sprintf("%v", idTaskIdDomain), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.name"+"}", fmt.Sprintf("%v", idTaskIdName), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.task_id.version"+"}", fmt.Sprintf("%v", idTaskIdVersion), -1) - localVarPath = strings.Replace(localVarPath, "{"+"id.retry_attempt"+"}", fmt.Sprintf("%v", idRetryAttempt), -1) - - localVarHeaderParams := make(map[string]string) - localVarQueryParams := url.Values{} - localVarFormParams := url.Values{} - - if localVarOptionals != nil && localVarOptionals.IdTaskIdResourceType.IsSet() { - localVarQueryParams.Add("id.task_id.resource_type", parameterToString(localVarOptionals.IdTaskIdResourceType.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EvictCache.IsSet() { - localVarQueryParams.Add("evict_cache", parameterToString(localVarOptionals.EvictCache.Value(), "")) - } - // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/json"} - - // set Content-Type header - localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) - if localVarHttpContentType != "" { - localVarHeaderParams["Content-Type"] = localVarHttpContentType - } - - // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} - - // set Accept header - localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) - if localVarHttpHeaderAccept != "" { - localVarHeaderParams["Accept"] = localVarHttpHeaderAccept - } - r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) - if err != nil { - return localVarReturnValue, nil, err - } - - localVarHttpResponse, err := a.client.callAPI(r) - if err != nil || localVarHttpResponse == nil { - return localVarReturnValue, localVarHttpResponse, err - } - - localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body) - localVarHttpResponse.Body.Close() - if err != nil { - return localVarReturnValue, localVarHttpResponse, err - } - - if localVarHttpResponse.StatusCode < 300 { - // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { - return localVarReturnValue, localVarHttpResponse, err - } - } - - if localVarHttpResponse.StatusCode >= 300 { - newErr := GenericSwaggerError{ - body: localVarBody, - error: localVarHttpResponse.Status, - } - - if localVarHttpResponse.StatusCode == 200 { - var v AdminTaskExecutionUpdateResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v - return localVarReturnValue, localVarHttpResponse, newErr - } - - return localVarReturnValue, localVarHttpResponse, newErr - } - - return localVarReturnValue, localVarHttpResponse, nil -} - /* AdminServiceApiService Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go index 4ab0289ace..681eb05ed9 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_request.go @@ -12,6 +12,4 @@ package flyteadmin type AdminExecutionUpdateRequest struct { Id *CoreWorkflowExecutionIdentifier `json:"id,omitempty"` State *AdminExecutionState `json:"state,omitempty"` - // Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. - EvictCache bool `json:"evict_cache,omitempty"` } diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go index e7d34dcac4..34de2f4ce0 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go +++ b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_execution_update_response.go @@ -10,6 +10,4 @@ package flyteadmin type AdminExecutionUpdateResponse struct { - // List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. - CacheEvictionErrors *CoreCacheEvictionErrorList `json:"cache_eviction_errors,omitempty"` } diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go deleted file mode 100644 index becf9ea0cb..0000000000 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_admin_task_execution_update_response.go +++ /dev/null @@ -1,14 +0,0 @@ -/* - * flyteidl/service/admin.proto - * - * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) - * - * API version: version not set - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ - -package flyteadmin - -type AdminTaskExecutionUpdateResponse struct { - CacheEvictionErrors *CoreCacheEvictionErrorList `json:"cache_eviction_errors,omitempty"` -} diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go deleted file mode 100644 index f27b405536..0000000000 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_cache_eviction_error_code.go +++ /dev/null @@ -1,17 +0,0 @@ -/* - * flyteidl/service/admin.proto - * - * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) - * - * API version: version not set - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ - -package flyteadmin - -type CacheEvictionErrorCode string - -// List of CacheEvictionErrorCode -const ( - CacheEvictionErrorCodeUNKNOWN CacheEvictionErrorCode = "UNKNOWN" -) diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go deleted file mode 100644 index 246c0011ad..0000000000 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error.go +++ /dev/null @@ -1,24 +0,0 @@ -/* - * flyteidl/service/admin.proto - * - * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) - * - * API version: version not set - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ - -package flyteadmin - -// Error returned if eviction of cached output fails and should be re-tried by the user. -type CoreCacheEvictionError struct { - // Error code to match type of cache eviction error encountered. - Code *CacheEvictionErrorCode `json:"code,omitempty"` - // More detailed error message explaining the reason for the cache eviction failure. - Message string `json:"message,omitempty"` - // ID of the node execution the cache eviction failed for. - NodeExecutionId *CoreNodeExecutionIdentifier `json:"node_execution_id,omitempty"` - // ID of the task execution the cache eviction failed for (if the node execution was part of a task execution). - TaskExecutionId *CoreTaskExecutionIdentifier `json:"task_execution_id,omitempty"` - // ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution). - WorkflowExecutionId *CoreWorkflowExecutionIdentifier `json:"workflow_execution_id,omitempty"` -} diff --git a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go b/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go deleted file mode 100644 index 75ff771bf5..0000000000 --- a/flyteidl/gen/pb-go/flyteidl/service/flyteadmin/model_core_cache_eviction_error_list.go +++ /dev/null @@ -1,15 +0,0 @@ -/* - * flyteidl/service/admin.proto - * - * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) - * - * API version: version not set - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ - -package flyteadmin - -// List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request. -type CoreCacheEvictionErrorList struct { - Errors []CoreCacheEvictionError `json:"errors,omitempty"` -} diff --git a/flyteidl/gen/pb-go/flyteidl/service/openapi.go b/flyteidl/gen/pb-go/flyteidl/service/openapi.go index 1ebf4a0f21..0d16c30ef7 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/openapi.go +++ b/flyteidl/gen/pb-go/flyteidl/service/openapi.go @@ -78,7 +78,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _adminSwaggerJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x23\x37\x96\x2f\x0c\xff\x3f\x9f\x02\xb7\xfa\x46\xd8\xd5\xa3\xc5\x76\xcf\xf4\xdb\x57\x13\x37\xde\x87\x96\x58\x65\x5d\xab\x24\xb5\x16\x7b\xfc\x5c\x76\xd0\x60\x26\x48\xa2\x95\x09\x64\x03\x48\xa9\xe8\x8e\xfe\xee\x4f\xe0\x60\x49\xe4\x46\x26\x17\x49\x54\x39\x67\x22\xda\x2a\x66\x26\xd6\x83\x83\xb3\xfe\xce\x3f\xff\x0d\xa1\x77\xf2\x09\xcf\x66\x44\xbc\x3b\x41\xef\xbe\x3b\xfa\xe6\xdd\x81\xfe\x8d\xb2\x29\x7f\x77\x82\xf4\x73\x84\xde\x29\xaa\x12\xa2\x9f\x4f\x93\x85\x22\x34\x4e\x8e\x25\x11\x8f\x34\x22\xc7\x38\x4e\x29\x3b\xca\x04\x57\x1c\x3e\x44\xe8\xdd\x23\x11\x92\x72\xa6\x5f\xb7\x7f\x22\xc6\x15\x92\x44\xbd\xfb\x37\x84\xfe\x05\xcd\xcb\x68\x4e\x52\x22\xdf\x9d\xa0\xff\x6b\x3e\x9a\x2b\x95\xb9\x06\xf4\xdf\x52\xbf\xfb\x37\x78\x37\xe2\x4c\xe6\xa5\x97\x71\x96\x25\x34\xc2\x8a\x72\x76\xfc\x77\xc9\x59\xf1\x6e\x26\x78\x9c\x47\x1d\xdf\xc5\x6a\x2e\x8b\x39\x1e\xe3\x8c\x1e\x3f\x7e\x7b\x8c\x23\x45\x1f\xc9\x38\xc1\x39\x8b\xe6\xe3\x2c\xc1\x4c\x1e\xff\x93\xc6\x7a\x8e\x7f\x27\x91\xfa\x17\xfc\x23\xe6\x29\xa6\xcc\xfc\xcd\x70\x4a\xfe\xe5\xdb\x41\xe8\xdd\x8c\xa8\xe0\x9f\x7a\xb6\x79\x9a\x62\xb1\xd0\x2b\xf2\x81\xa8\x68\x8e\xd4\x9c\x20\xd3\x0f\x72\x4b\xc4\xa7\x08\xa3\x13\x41\xa6\x27\xbf\x0a\x32\x1d\xbb\x85\x3e\x32\x0b\x7c\x01\xa3\xb9\x4e\x30\xfb\xf5\xc8\x2e\x13\xb4\xcc\x33\x22\x60\x6e\xe7\xb1\x6e\xfd\x23\x51\x03\x68\xb6\x78\x3f\x7c\x5b\x10\x99\x71\x26\x89\x2c\x0d\x0f\xa1\x77\xdf\x7d\xf3\x4d\xe5\x27\x84\xde\xc5\x44\x46\x82\x66\xca\xee\xe5\x00\xc9\x3c\x8a\x88\x94\xd3\x3c\x41\xae\xa5\x70\x30\x66\xaa\x7a\x63\x71\xad\x31\x84\xde\xfd\x4f\x41\xa6\xba\x9d\x3f\x1c\xc7\x64\x4a\x19\xd5\xed\x4a\x43\x3f\xc1\x68\x4b\x5f\xfd\xeb\xdf\x9a\xfe\xfe\x57\x30\xa3\x0c\x0b\x9c\x12\x45\x44\xb1\xe3\xe6\xff\x2a\x73\xd1\x7b\xa4\x3b\x2f\xf6\xb1\x3a\xf0\xca\x6c\x2f\x71\x4a\xf4\x9e\xe8\x9d\xb2\x5f\xc0\xdf\x82\x48\x9e\x8b\x88\xa0\x09\x49\x38\x9b\x49\xa4\x78\x6d\x0d\x28\xb4\xa0\xc9\xab\xfa\x44\x90\x7f\xe4\x54\x10\xbd\x57\x4a\xe4\xa4\xf2\x54\x2d\x32\x18\xa4\x54\x82\xb2\x59\xb8\x14\xff\x3a\xe8\x34\x35\x43\x95\x6b\xcc\xcc\x7c\xd0\x3a\xb1\x11\x1b\xb8\x57\x22\xcc\xd0\x84\x20\x7d\x16\x69\x4c\x04\x89\x11\x96\x08\x23\x99\x4f\x24\x51\xe8\x89\xaa\x39\x65\xfa\xdf\x19\x89\xe8\x94\x46\x6e\xcd\xf6\x67\x6d\xe0\xcf\xe5\x2b\x73\x2f\x89\xd0\x03\x7f\xa4\x31\x89\xd1\x23\x4e\x72\x82\xa6\x5c\x94\x96\xe7\x68\xc4\xee\xe6\x7a\x1d\xd2\x09\x65\x70\xf2\xf4\x5a\x3a\x0a\xf9\x77\xb7\x5c\xff\x8e\x74\x7f\x28\x67\xf4\x1f\x39\x49\x16\x88\xc6\x84\x29\x3a\xa5\x44\x56\x5b\xfb\x77\x0e\xfd\xe3\x04\x1d\x22\xbd\xce\x44\x28\x58\x6f\xce\x14\xf9\xac\x24\x3a\x44\x09\x7d\x20\xe8\xab\x0b\x2a\x15\x1a\x5c\x9f\x7f\x75\x80\xbe\x32\xe7\x05\x01\x6f\xfa\xea\x05\x56\xd8\xff\xfd\xb7\xe0\xe8\x29\x3c\xab\x1e\xba\x77\x03\x7d\x9a\x6f\xcd\xd5\x50\xb4\xf0\xb7\x7f\x0b\xdb\xb1\xfb\xb5\x9c\xdf\x16\xcc\xd6\x72\xda\xae\xfc\x15\x96\xa9\xcc\x5a\xa5\xde\xa1\x6d\x39\xab\x6e\xb7\xca\x5a\xe5\xdb\xe2\xad\x7a\x0a\xcf\xcd\x5f\xb7\x61\xae\x58\x01\xd5\x63\xca\xcc\x21\xf1\x67\x46\x48\x7d\x4e\x1c\xf5\xee\x09\x4b\xd9\x86\xd7\x06\x33\x0b\xd8\xad\xe3\xa2\xc1\xaa\xec\xe1\xbc\x13\x9a\xd2\x55\xfb\x7b\xce\x62\x2d\x72\x59\x66\xc7\xf2\x74\x42\x84\x5e\x06\xc7\xf6\x60\xb6\x13\xcd\x06\x55\x2e\x18\x89\x3b\x4c\xf3\x1f\x39\x11\x8b\x25\xf3\x9c\xe2\x44\xb6\x4d\x94\x32\x45\xb4\x7c\x5b\x79\x3c\xe5\x22\xc5\xca\xbe\xf0\xe7\xff\x58\x77\x21\x14\x7f\x20\xab\xf6\xff\xdc\xec\x66\x84\x25\x90\x41\x9a\x27\x8a\x66\x09\x41\x19\x9e\x11\x69\x57\x24\x4f\x94\x3c\x80\xd7\xb4\x4c\x4d\xc4\xa1\xbf\x81\xa0\x07\x77\xf3\xe6\x12\x7e\x41\x53\x2f\x40\x32\xf2\x59\x41\x4b\x23\x06\x77\x2f\x2c\x51\x78\xa3\x3c\xc3\x52\x6e\x46\x33\x92\x0b\x35\x9e\x2c\x8e\x1e\x48\xad\xdf\x56\xca\xc1\x0c\x61\xa5\x04\x9d\xe4\x8a\xe8\x79\xeb\x36\xdc\xdd\x09\xec\xd1\x5c\xd0\x5d\x58\xc3\xeb\x4d\x38\xa6\x82\x44\x30\xb7\x75\x0e\x8c\xff\x4a\xcf\x5b\xeb\x2f\x0b\x33\xfb\x07\xb2\x00\x79\xa4\x61\x05\xfc\x96\x8f\xd8\x88\xa1\x43\x74\x36\xbc\x3d\x1d\x5e\x9e\x9d\x5f\x7e\x3c\x41\xdf\x2f\x50\x4c\xa6\x38\x4f\xd4\x01\x9a\x52\x92\xc4\x12\x61\x41\xa0\x49\x12\x6b\x99\x43\x0f\x86\xb0\x98\xb2\x19\xe2\x22\x26\xe2\xf9\x96\xb1\xf2\x94\xb0\x3c\xad\xdc\x2b\xf0\x7b\x31\xfa\xca\x17\x5a\xc4\xf0\x8f\x4a\x4f\xfe\x56\x5b\x60\x98\xb1\xee\x3b\x68\xed\xc5\x84\x9a\x68\x4e\x93\x58\x10\x76\xac\xb0\x7c\x18\x93\xcf\x24\xca\xcd\x9d\xfc\xcf\xf2\x0f\x63\x2d\x99\xf2\x98\x94\x7f\x29\xfd\xa3\x10\x85\xd6\xfe\xd4\x6b\xa9\x6b\x7f\x09\x3a\x6d\xb7\xef\xe0\x17\x1a\x37\xbe\x0d\xbf\xac\x98\x83\x7b\x67\xc9\x60\xdd\x2b\xad\xa3\x72\x2f\x58\x89\xaf\xf1\x1d\x41\x94\x58\x8c\xb1\x52\x24\xcd\xd4\x9a\xfa\x3a\x46\x89\x96\x2b\x97\xc9\x91\x97\x3c\x26\x43\xd7\xdf\xaf\xc8\x88\xb3\x24\x46\x93\x85\xe5\x5a\x53\x22\x08\x8b\x48\x7b\x0b\x77\x58\x3e\x14\x2d\xac\x12\x46\x4b\xfd\xc9\x0f\x5c\xe8\xcf\xdf\x82\x40\x5a\x1a\xf8\x4b\xc8\xa4\x9b\x9e\xb8\x2f\xce\x42\xb0\x21\xff\xe8\xed\x09\xdb\xaf\x64\x57\xeb\x03\x17\x48\x2e\xa4\x22\xe9\x4a\x3b\xc4\xdb\x59\x08\x7b\x41\xec\xeb\x80\x2b\x77\xd4\xef\xe0\xd4\x97\x6f\xdc\xfe\x78\xaf\xb1\x64\xbb\xb2\x22\xee\xfb\x3c\x9d\x0f\x67\xf9\x54\x6f\xdd\xf6\x05\x4e\x8c\x37\x31\xcd\x92\x2c\xb8\xeb\x41\x3e\x93\xb9\xa1\x75\xaf\xdc\x6a\x8f\x61\x00\x2b\x14\xcd\xb2\x1d\xda\x9f\x3f\xfd\x69\x68\xa1\x31\xe6\x38\x35\xa7\x32\x30\x56\xa1\x88\x0b\x23\x0b\xc6\xf6\xbc\x1b\x5d\x73\x70\x37\xb8\x1d\xde\x9d\xa0\x01\x8a\xb1\xc2\xfa\x80\x0b\x92\x09\x22\x09\x53\xa0\xc7\xeb\xef\xd5\x02\xa5\x3c\x26\x89\xd1\x38\x3f\x68\xc9\x17\x9d\x61\x85\x4f\xb1\xc2\x09\x9f\x1d\xa1\x01\xfc\x53\x7f\x4c\x25\xc2\x89\xe4\x08\x3b\xb2\x22\xb1\x6b\x02\xb3\xd8\xb1\x16\x8c\x22\x9e\x66\x34\xf1\x36\x78\x6f\x5c\xa1\x2c\xa6\x8f\x34\xce\x71\x82\xf8\x44\x73\x15\xad\x21\x0f\x1f\x09\x53\x39\x4e\x92\x05\xc2\x49\x82\x6c\xb7\xee\x05\x24\xe7\x3c\x4f\x62\xdd\xae\x1b\xa5\xa4\x29\x4d\xb0\xd0\x2a\xb8\x19\xed\x95\x6d\x0b\xdd\xcd\x89\x1f\x2b\x8c\x4b\xaf\x66\x8a\x1f\x88\x44\x54\xa1\x8c\x4b\x49\x27\x49\x71\xe6\xef\xcf\x11\x8c\xfb\xf4\xe2\x1c\xf4\xf9\x48\x21\x6e\x78\xa8\xeb\xdc\xda\x6f\x5c\x8f\x29\x66\x8c\x40\xc7\x5c\xcd\x89\xb0\xdd\xdb\x97\x5f\x5b\x35\xbf\xbf\xbc\xbd\x1e\x9e\x9e\x7f\x38\x1f\x9e\xd5\x75\xf3\xbb\xc1\xed\x8f\xf5\x5f\x7f\xbe\xba\xf9\xf1\xc3\xc5\xd5\xcf\xf5\x27\x17\x83\xfb\xcb\xd3\x1f\xc6\xd7\x17\x83\xcb\xfa\x43\x4b\x56\x9d\xd5\xfc\x70\x64\x6b\x9e\xad\xde\xa6\xf9\x5c\x36\xcd\x83\x2f\xd7\xa8\x39\xa5\x09\xe8\xa0\x9d\x0d\x9a\xde\x86\x60\xbf\x44\x19\x96\xd2\x48\x46\x66\x04\x47\x23\xf6\x89\x0b\xcd\xc0\xa6\x5c\xf3\x08\x2d\x3d\x29\x91\x47\x8a\xb2\x99\xff\xe8\x04\x8d\xf2\x6f\xbe\xf9\x53\x74\x41\xd9\x03\xfc\x45\xf6\x71\x71\x7a\x8b\x6f\x6f\xf1\xfd\x7d\x59\x7c\xb5\xe8\x73\x1c\x1a\x7a\x77\x1b\x32\xa4\x85\x0b\x96\xe5\x0a\x44\x09\x9e\x2b\xfd\xa7\xee\x12\xc8\x63\x49\xe0\x50\x37\x83\xe2\x47\xa2\xfc\x8b\x5a\xb4\x79\x0b\x76\xc4\x9f\xb9\x78\x98\x26\xfc\xc9\x0f\xfc\x23\x51\x7a\xec\x37\xb6\x97\x3e\x94\xa8\x0f\x25\x7a\xdd\x50\xa2\xbd\x32\xe6\x3d\x3f\xf3\x2b\x5b\xfe\x0c\x07\x6c\xf1\x64\xb5\x3a\xaa\x5a\xfc\x50\x81\x9b\xe9\x45\xb8\x66\xd9\x99\xb3\x82\x73\x96\x5e\x7e\x2b\xdc\xb3\x34\xe8\x97\xe7\x9c\xbf\x0b\x7f\x4b\xef\x4e\xd9\x70\xa1\xde\x24\x83\xed\x78\x77\xbc\x98\x33\xe4\xf9\x19\x7e\x2d\xb6\x61\x9d\x60\x86\x35\xa2\x17\x3a\x87\x2b\xac\x88\x4f\x68\x0c\x48\x68\x8a\x40\xa8\x87\x1c\x34\xc6\x18\x6c\x17\x54\xb0\xe9\xdd\xd4\x3d\x4c\xe0\x23\x51\xa5\x97\xdf\xca\xdd\x54\x1a\xf4\xcb\xdf\x4d\xbf\xd3\xe8\x80\x3e\x1c\xe0\x19\x97\xee\x4b\xbf\xd1\xf6\xd7\xe1\xff\x3b\xf0\xf0\xf7\x2e\xfd\xb5\xd6\xe8\xcb\xf2\xe1\x7f\xa9\x4e\xfb\xb7\xe9\xa5\xef\xdd\xf2\xbd\x5b\xfe\x35\xfc\x27\x6f\xcf\x2d\xff\xbc\xea\x69\x71\xbc\xc6\x8e\x16\xac\xbe\x16\x1c\xca\x7f\x75\x70\xd2\xc0\x5f\x4e\xe5\x5b\x37\x68\xbc\x55\x87\x3b\x2b\xc6\x37\x84\x23\xf4\xab\x25\xa4\x15\xea\x5c\xed\xbb\xb7\xa0\xce\xd5\x07\xfd\xfc\x3a\xdc\xab\x31\xdf\x67\xba\x3c\xdf\x08\x1b\x58\xff\xb6\xfc\x82\x65\xf2\x5e\x16\x7f\xfe\x6c\xfc\xbd\x99\xd0\xdb\x91\xbd\x5f\xe1\xe2\xed\x78\xeb\xee\x3c\x27\xab\xe1\x9a\x0d\x6e\xa7\x55\x19\x56\xd5\xaf\x29\x91\xdf\xbd\xc9\xfb\xf6\x25\x92\xac\xfa\x0b\xb7\xbf\x70\x6d\x53\xfd\x85\xfb\x05\x5f\xb8\x7b\x07\x7f\xb3\x37\x11\xa0\x7d\x10\x79\x0f\x8c\xd1\xc7\x90\xef\x70\x71\xfa\x18\xf2\x3e\x86\xfc\x77\x16\x43\xbe\x8d\xf6\xb4\x29\x16\xe5\x6b\xe8\x51\xbd\x1a\xd5\xab\x51\xe1\xef\xbd\x1a\xd5\xab\x51\xbd\x1a\xf5\x85\xa3\x88\xf6\x3a\x54\xf7\x85\xe8\x75\xa8\xce\x4b\xd5\xeb\x50\x4b\x16\xa7\xd7\xa1\x7a\x1d\xea\xf7\xa5\x43\x91\x47\xc2\x94\x84\x64\xb4\x50\xa3\x78\x97\x71\xd9\xae\x09\x85\xdc\xa1\x41\x0b\x82\x36\xcb\x49\x61\x10\xb8\xf4\x2b\x9a\x63\x89\x78\x14\xe5\xa2\x72\x06\xaa\x7a\xd0\xa9\x20\x58\x11\x68\x41\x7f\xf8\x16\xf4\x9f\xfa\x74\x5f\x2a\x06\x7f\xc2\xe3\x1a\xb5\x9b\x83\xd0\xf4\x64\xb9\x3c\xb2\xb3\xa9\xff\x23\x27\xdd\xd4\xbf\x67\x24\x6a\x85\xe5\xc3\x8e\x89\xba\x94\x6b\xb1\x11\x51\x43\x0b\x6f\x85\xa8\xeb\xd3\xfd\xdd\x10\x75\xd3\xd4\xf7\x81\xa8\x9f\x6c\x1e\xff\x8e\x09\xbb\x06\x0f\xb0\x11\x71\xfb\x56\xde\x0a\x81\x37\x4f\xfb\x77\x43\xe4\x6d\xd3\x7f\x5d\x42\xf7\x29\x92\x9d\x49\xfc\x4e\xd0\xd9\x4c\xab\x19\xa0\xe1\x69\x52\x5c\x5d\x23\xa8\x48\x0a\x5c\x49\xd6\xfe\xd5\xb7\x40\xd2\x7e\xb0\x66\xec\xbf\x1b\x5a\xae\xcd\x7b\x4f\x88\xf8\x58\x90\x88\x3f\x42\xbd\xb0\x6e\xc4\x7c\x43\x80\x82\x81\x5f\x67\x82\x3c\x52\x9e\xcb\x64\x71\x28\x72\x86\x1c\xf3\x47\xbe\x79\x63\xad\x7e\xa2\x49\x82\x38\xd3\xfa\x97\xc2\x42\xb9\xc7\x5a\xff\x16\x3c\x85\x53\x91\x60\xa9\xd0\x03\xe3\x4f\x0c\x4d\x31\x4d\x72\x41\x50\xc6\x29\x53\x47\x23\x76\xce\xd0\x8d\x19\x23\xe4\x0d\x1c\xa0\x5c\xea\xb3\x14\x61\xc6\xb8\x42\xd1\x1c\xb3\x19\x41\x98\x2d\x6c\x02\x6e\x41\x19\x88\x0b\x94\x67\x31\xd6\x8a\xef\x9c\x54\xa3\xf4\xfc\x18\xc1\x7c\x47\x25\xa2\x12\x91\xcf\x4a\x90\x94\x24\x0b\xdd\x87\xa6\x7d\xc5\x91\x5d\x1f\x33\x54\x9b\xce\x47\x84\xe0\x42\x42\xc6\xc1\x64\xf1\x1b\x66\x8a\x32\x82\x40\x51\x92\xc6\x34\x77\x88\x2e\xb8\x04\xb3\xcd\x8f\x7f\x91\x28\x4a\x72\xa9\x88\x38\x40\x93\x7c\x26\xb5\xa6\x98\x25\x58\x4d\xb9\x48\xf5\x08\x29\x93\x0a\x4f\x68\x42\xd5\xe2\x00\xa5\x38\x9a\x9b\xb6\x60\x0d\xe4\xc1\x88\xc5\xfc\x89\x49\x25\x08\xf6\xbd\xbb\x87\xe8\xeb\xf0\x99\x21\x00\xf9\xfe\x00\xd2\x0e\x69\xaa\xd5\xdd\x60\xf8\xc5\x8e\x9b\x3d\xd1\x8d\x90\x18\x4d\x48\x84\x73\x69\x3d\x0c\x4a\x2c\x10\xf9\x3c\xc7\xb9\x84\xbd\xd3\xd3\xb3\x39\x1b\x11\x4f\xb3\x84\x28\x82\xe8\x14\x29\x41\x49\x8c\xf0\x0c\x53\xbd\x74\xb7\x64\x09\x08\xba\x27\x7a\xbb\x81\x96\xea\x7f\x05\xf5\x3b\xe5\x82\xa0\x98\x28\x4c\x93\xa5\x5e\x27\xfb\x6d\xcf\xe5\xde\x12\x97\x2b\x6f\xf8\x5e\xb0\x39\x03\xe2\xbf\x83\x4b\x9b\x59\xd3\x7d\x84\x93\x2d\xef\xef\x1b\x3b\xa8\x9e\xb6\xdf\x16\x6d\x9b\x5d\xdb\x1f\xe2\x7e\xb1\x18\xec\xee\x15\x2d\x8a\x6a\x16\x6f\x8a\xa6\x5f\x22\x2c\xa0\x77\x38\xf7\x0e\xe7\xd6\x95\x79\x9b\x0e\xe7\xbd\xf1\x18\xf5\x3e\xe7\x67\xf2\x39\x53\xd9\x3b\x9d\x7b\xa7\x73\xd7\x05\xea\x9d\xce\xbd\xd3\xf9\xed\x3a\x9d\x9f\x13\xf7\x79\xa7\xe8\xce\x6f\x4a\xb4\xee\xc5\xea\x5e\xac\xee\x21\x9c\xfd\xd4\x76\xc5\xc2\xdc\xd7\xef\x62\x92\x10\x45\xda\xed\x59\x44\xa4\x5a\x5b\x30\xd7\x33\x65\x5a\x8e\x9b\x09\x22\xe5\xb6\x0c\xc9\x37\xfc\x36\xd9\x92\x1f\x7e\x0f\x35\xdf\xf3\xa9\x9e\x4f\x6d\x32\xb5\xfd\x31\xcd\x06\x87\xf9\xa5\x6c\xb3\x9e\xff\x66\x79\xbb\xf4\x77\x6f\xdc\x90\x85\x5f\xd4\x50\xb8\x96\xda\x15\xf7\x87\xdb\xd2\xf9\x96\xfc\xd8\xf4\xf5\x36\x99\xb1\x19\x7b\xcf\x89\x7b\x4e\xdc\x73\xe2\xb7\xcd\x89\xdd\x49\x7e\x55\x17\x99\xf1\xd3\x8d\xb3\x04\xb3\x31\x8d\xe5\xf1\x3f\x0b\x5d\xfe\xb9\x3c\x64\xfa\x40\xc5\x26\xc5\xd4\xa7\x74\x8a\x5f\xf5\x27\x49\x61\x30\xf7\x98\x99\x2b\x9c\x68\xc6\xc6\x7e\x9d\x60\x76\x1e\xbf\x09\x3f\x5a\xe3\xec\x5f\xc2\xa7\xb6\x0d\x1f\xc7\x0a\x3c\x1d\x98\x32\x63\xc2\x2b\xf2\x6a\x4b\x06\xca\xfd\x38\xe1\xdb\x70\xf5\x60\x62\x01\x63\x77\xfc\x3a\x58\x94\xfd\x9b\x76\xef\xd7\xe9\x73\x09\x7b\xcf\x45\xc7\x09\xf7\x9e\x8b\xfd\xf5\x5c\xbc\x96\x3b\xf2\x85\x8f\xe7\x4b\x89\x75\xdd\x83\xf0\x4d\xb4\x1a\x04\xb5\xe6\x59\xc2\x71\xbc\xcc\x15\x53\x08\x5e\x21\x38\xca\xca\x48\xfc\xe2\xb3\xb7\x20\xac\x15\xa3\xfd\x9d\x45\xf2\xd5\x27\xbe\x2f\x5a\xca\x0b\x86\xf2\x35\x93\xf8\x1a\x2a\xc9\xdb\xc0\x4f\x2d\xc6\xdb\x87\xf6\xf5\x16\xa5\xd7\xb7\x28\xf5\xa1\x7d\xbd\x0a\xb8\x67\x2a\x60\x1f\xda\xd7\x87\xf6\xf5\x0a\xf2\xf2\x69\xf7\x0a\xf2\x17\x11\xda\xd7\x49\xd4\x7e\x46\xec\xcd\xed\x85\xee\x5e\xe6\x76\xef\xf5\x32\x77\x2f\x73\x7f\xa1\x32\xf7\x7e\xac\x70\x2f\x70\xf7\x02\x77\x2f\x70\xf7\x02\x77\x2f\x70\xef\x7c\x19\x7b\x81\xfb\x25\x0b\x74\x36\x4b\xdd\x2b\x92\x6c\xde\xaa\x2f\xa7\x17\xb7\x7b\x71\x7b\xbf\xc5\xed\xbd\x99\xd0\xdb\x29\xf3\xd8\x6d\x3e\x7d\x91\xf2\xbe\x48\x79\x5f\xa4\xfc\xd9\x8b\x94\xbb\xaf\x3b\x64\x7c\xd8\xc3\xa5\xb0\xca\xa5\x01\x7c\x14\x64\x46\xa5\x02\xf6\xdf\x45\x5e\x59\x9d\xe8\xf1\x56\xe5\x94\x3e\xd5\xc3\x3f\xed\xa5\x96\x5e\x6a\xf9\x9d\x4a\x2d\x7b\x14\x0b\xb6\x17\x19\x2b\x29\x56\xd1\x1c\x4f\x12\x32\xf6\x46\x1f\xd9\x55\x0f\xbe\xa0\x52\x49\x14\xe5\x52\xf1\xb4\xfd\x72\xf9\xe4\x7a\x18\xf8\x0e\x4e\x39\x9b\xd2\x59\x6e\xee\x16\x03\xce\x19\x9c\xe8\x42\x12\x5c\x64\x64\x95\xa7\xaa\xa1\xf5\x37\x71\x2d\x35\x0f\xfd\xa5\x6e\xa7\x75\x04\xf7\xc2\xc8\x67\xa5\x6e\x2d\x6b\x8d\x6f\x86\xb7\x57\xf7\x37\xa7\xc3\x13\x34\xc8\xb2\x84\x1a\xbb\xbb\x21\x05\xfa\x9b\x9e\x14\x52\x58\x3e\x14\x7b\x29\x0c\x99\x1b\x0c\x5b\x30\xf4\x6b\xd9\x18\x1d\xa2\xd3\x8b\xfb\xdb\xbb\xe1\x4d\x4b\x83\x96\x50\x20\x6f\x95\xa4\x59\x82\x15\x89\xd1\x43\x3e\x21\x82\x11\x2d\xed\x58\xa4\xdb\xc2\xfc\x6f\x1a\x1d\xfe\xf7\xf0\xf4\xfe\xee\xfc\xea\x72\xfc\xd7\xfb\xe1\xfd\xf0\x04\x39\x8a\xd3\xcd\xea\x71\xe9\x51\xc4\x0b\x86\x53\xad\x81\xe8\x1f\x8a\x4c\xd9\x7f\xe4\x24\x27\x08\x4b\x49\x67\x2c\x25\x80\x08\x5c\x6a\xd1\x0d\xf8\x62\xf0\xfd\xf0\xa2\xdc\xf2\x9c\x84\xf0\xbb\x28\xc1\x13\x92\x58\x7f\x04\x98\xd8\x35\xa1\x07\x50\xc5\xc6\x51\x91\x9b\x55\xfd\xeb\xfd\xe0\xe2\xfc\xee\x97\xf1\xd5\x87\xf1\xed\xf0\xe6\xa7\xf3\xd3\xe1\xd8\x4a\x95\xa7\x03\xdd\x6f\xa9\x27\x2b\x7c\xa2\x7f\xe4\x38\xd1\xda\x09\x9f\x3a\x3c\x5e\xf4\x34\x27\x0c\xe5\x0c\x28\xce\xa8\x3c\x5a\x0f\xf2\x9d\xea\x53\x66\x66\x74\x7d\x71\xff\xf1\xfc\x72\x7c\xf5\xd3\xf0\xe6\xe6\xfc\x6c\x78\x82\x6e\x49\x02\x4a\x81\x5b\x74\xd8\xc5\x2c\xc9\x67\x94\x21\x9a\x66\x09\xd1\xab\x81\x6d\x36\xf1\x1c\x3f\x52\x2e\xec\xd1\x9d\xd1\x47\xc2\xcc\x3a\xc2\x99\x85\xf6\x9d\xf0\x3d\x0e\x96\xee\xea\xf2\xc3\xf9\xc7\x13\x34\x88\x63\x3f\x07\x09\x6d\x94\x28\xc7\xc1\x3a\x1f\x96\x87\xad\x99\x03\x74\x6f\x88\x88\x3f\x12\x21\x68\x4c\x2a\x74\x34\xb8\xbd\x3d\xff\x78\xf9\x69\x78\x79\x07\x2b\xa6\x04\x4f\x24\x9a\xf3\x27\x30\x65\xc3\x0c\xc1\xc2\xfd\x88\x69\x02\x9d\xb9\xcd\xe2\x0c\x3d\xcd\x29\xb8\x3f\x00\x98\xd9\xf7\x6c\xf4\x33\x91\xb3\x57\xb7\xce\x96\x0e\x5e\x5d\x6d\xa9\x9e\xa4\xfa\x1b\x95\x63\xb1\xec\x85\x12\x95\xd7\x5f\x5c\x45\xad\xf5\x2f\x2a\xe4\xd6\xae\xac\xd5\xe8\xa5\x7d\xa6\xc5\x5e\x77\xd6\xd5\xca\x6b\xf8\x62\xd7\xac\x66\xbc\xf1\x4b\x54\x65\xbd\x01\xbf\xe7\x52\xd8\xa7\x20\x67\xf2\x57\xab\xdc\xaf\x30\x4d\x07\x5f\xbc\x85\xcb\x35\x1c\xee\x1e\x5d\xa4\x37\xa1\x5c\xe3\xc4\xe3\x94\x28\x1c\x63\x85\x35\x7b\x9a\x11\x75\x84\xae\x18\x3c\xbb\xc3\xf2\xe1\x00\xb9\x82\x14\x88\x0b\x54\x08\x8e\x2f\x90\x2d\xf9\x46\x6c\x32\xeb\x2b\x33\xbd\x52\xde\x2b\xe5\xcd\x2b\xd3\x47\xee\xb4\xac\xf0\xae\x2e\xc6\xb5\xcc\x98\xbb\xbb\xbf\x4c\x8b\x6f\xf7\x0a\x7b\x59\xbb\xe5\x4e\x2f\x34\x53\x0c\xa5\xbf\xad\xcc\xff\xf5\xb7\x55\x7f\x5b\xf5\xb7\xd5\x1e\xac\xf0\xab\xdb\x80\x1b\xb8\xfb\xab\x1a\x81\x57\x69\xa7\x1b\xa3\x18\x15\xda\xe8\x3a\x38\x46\xbf\x76\x85\x2b\x2a\xbe\xa1\x6f\xc3\xec\x1b\x4c\xf2\x25\x32\x15\x76\x7a\x99\x9b\x10\xe0\x5e\x3f\x7d\xc6\x1b\xbf\x07\x95\xda\x29\xa8\xd4\x7e\xcc\xf5\x59\xb2\x1a\x76\x6f\x8a\x7e\x1b\x99\x0c\x3d\x7a\x54\x1f\xab\xdf\xc7\xea\xc3\xef\x3d\x7a\xd4\xee\xa8\xf5\x79\xa5\x6b\x1e\x93\x71\xa5\xc6\x87\xff\xe7\xb8\xea\xf9\x29\x3d\x09\xdd\x40\xa5\x07\x45\xf2\x02\xb4\x4e\xe3\x5d\xd6\x05\xb9\xe4\x31\xe9\x5c\x1b\xa4\xf4\xf2\x9e\xcb\xe0\x6e\x9e\x46\x16\x2f\x0d\xfc\x99\x25\xf1\x96\x2d\xff\x12\x0d\x3b\x0d\x04\xdc\x5b\x79\x56\x2e\xd4\x97\x0a\x10\x5d\x70\xa8\x37\xe4\xa9\xe8\xc6\xc6\x5d\x98\xca\xb8\x85\x99\x37\x3f\xf7\x2c\xbd\xf9\xf1\xf3\xc0\x40\x74\xe7\xe8\x60\x56\x09\xdf\x7e\x1b\x76\x95\x70\xc4\x2f\x61\x59\x59\xba\xf7\x5f\x1c\x57\x5f\x46\xc9\x3d\x6f\xef\xb8\x5c\x5f\x2a\x87\xef\x51\x1b\x96\xd9\x3a\x7a\x58\x84\xde\xd4\xb2\x3f\x13\xee\x4d\x2d\x6f\xda\xd4\x62\x5c\xb4\xe3\x0c\x0b\xc2\x54\x83\x48\x5d\xbd\x4e\xe0\xf5\x30\x8d\xd6\x49\x1d\xd0\x00\xd2\x12\x2d\xb2\x17\xb2\xbf\xaa\xbe\x2c\xdb\x8b\x15\x0c\x82\xe4\x96\xe3\x7f\x16\x7f\x7b\x61\xbd\x04\xea\xbd\x24\x3a\xc9\xc0\x37\x4b\x7d\x47\xe7\x36\x50\x69\xfb\xf4\x17\xac\x4a\xa2\x60\x42\x1e\x49\xb2\x32\x9e\xe9\xda\xbc\xfd\xb6\xb2\x5e\x6a\x83\x7e\xd9\xd8\xa6\xfa\xc6\x77\x3b\x40\x6e\x67\xa8\xc9\xe0\x08\xd2\x04\xb4\x34\xca\xa7\xc5\xc5\x20\xd1\x13\x4d\x12\x48\x12\x87\x24\x96\xb6\x1b\xe0\x77\x17\xf1\xd0\xba\xf3\xaf\x1a\xf7\xd0\xc4\x1d\x9a\x58\x42\x17\x7b\xea\xae\xd2\xe0\x1c\xb1\x41\x86\x12\x68\x43\x2b\x0c\xb0\x5f\x06\x27\xf8\x48\xd4\x4b\xb1\x81\x4d\xcf\xfe\xd2\x73\x2f\xc8\x94\x08\xc2\x22\xb2\x87\xde\xf6\x75\xc2\x40\x7e\x36\x93\xb4\x31\x20\x3e\x3b\x34\x9c\xaa\xe2\x56\x4f\x2b\x89\xba\x7d\x72\x60\x9f\x1c\xd8\x27\x07\x56\x8f\x7a\x9f\x1c\xd8\x27\x07\x6e\x52\x3c\xfd\x0c\x1e\xbf\x96\x54\x61\x7a\xff\x32\x04\x0b\x33\x97\x5e\xb6\xf8\xdd\x68\x16\x6e\xc3\xf7\x42\xb3\x30\x67\x6d\x95\xf9\xa1\xf4\x63\x43\x88\xf5\x8b\x9b\x24\x36\x61\x1a\x25\xbb\xc4\x19\xbc\xfe\x26\x59\x47\x75\xe8\xbd\x8d\x02\x05\x5b\xf7\x7c\x9c\xa4\x76\x04\xba\x4d\xdc\x7a\x0c\xdf\xee\xbc\xf7\x85\x83\xb6\xd1\xfd\xbe\xf2\xd1\xed\x4a\x6b\xef\x81\xc5\xe6\x0b\xe2\x91\xbd\xf5\xe6\x95\x73\x25\x6a\xcc\xf0\xcd\x4e\xb7\x37\x56\xf5\xc6\xaa\xde\x58\xd5\x1b\xab\x7a\x63\x15\xea\x8d\x55\x6b\x1b\xab\xbe\x20\x99\xaa\x37\x5c\xf5\x62\xd5\xee\xa6\xbb\xaf\x5a\xe6\x3e\x59\xeb\x3a\x03\xdf\x16\x39\x54\x2b\x23\xef\xed\xb4\x7f\x5d\x11\x72\x7f\xed\x46\xf0\x76\xf8\x95\x7c\x6e\x96\xb4\x4d\x60\xb1\xdb\xd1\x2f\x36\xae\xb8\xaf\x06\xd7\xb8\x56\x7d\xd8\xf3\x92\xc5\xe9\xc3\x9e\xfb\xb0\xe7\xbd\x0b\x7b\xde\xb9\xb2\x92\x71\xb9\x0c\x90\xc8\x54\x43\x59\x9a\xff\xec\xee\x6c\x48\x34\x02\x52\x30\x85\x70\x62\x92\x25\x7c\x01\x96\x94\x25\xd7\xb9\xeb\xe2\xba\x26\x51\xef\xfb\x8d\xee\x46\xfe\x52\x3a\xc7\xbe\xc8\xa4\xc5\xbc\xf7\x42\x0a\x3d\xfe\x67\x25\x9d\xbf\x13\x5e\x26\x43\xe4\x33\x95\x70\x2b\xad\x26\xec\x11\x6b\x7e\x12\x54\xa3\xb2\xf7\xe0\x24\x57\x41\xee\x9e\xd4\x82\x55\x46\x84\x5a\x04\x6f\x92\x34\x53\x8b\xff\x1a\x31\xaa\xbc\x87\x8d\xce\x18\x17\x86\xab\xe9\x8f\xe7\x98\xc5\x09\x11\xfa\x52\x75\xed\x44\x98\x31\xae\x40\xdc\x80\x19\xc4\xe8\x91\x62\x23\x9c\x0c\xae\xcf\x3b\xfb\x99\xdf\xd0\xe9\x7a\xe9\xfa\x43\x2b\xee\xba\x8f\x09\x9f\x40\x51\xb2\xbc\xac\xd3\xeb\x06\x7a\xcf\x68\x69\xe7\x5e\x8b\x21\x28\x2c\x1f\xaa\xc0\x21\xe5\x2c\xf4\xf1\x52\x28\x91\x15\xef\x96\x30\xe6\x97\xbf\x5a\x81\x1b\x29\x3f\xb3\x00\x24\xf0\x18\x86\x5c\x1d\x87\xfb\x31\xec\xd0\xfd\x56\xb4\xec\x7e\x71\xd5\x58\xe1\x47\x41\x94\x58\x8c\xb1\x52\x9a\xc9\x74\xf6\xf0\x9a\xa3\x16\x98\xbe\x4d\x96\x31\xf8\x5e\xb8\xa7\x74\x6b\xd5\x69\xe5\x96\x77\x58\x3e\x74\x4b\x9a\x37\xfd\x95\xde\x7f\x0b\x8c\xa9\x34\xe0\x17\x2f\x8f\xd6\x8d\x92\x57\x70\xb1\xb7\x97\x4b\xdf\xf5\x5c\xae\x31\xf1\xdf\x4b\x5e\x7d\x37\x3e\xb5\xca\xa4\xfb\x16\x73\xec\x97\x31\xde\xbd\x19\x61\x85\xf7\x7f\x89\x27\xb7\x7c\x93\xf5\x47\x74\xd9\x1a\x7d\x71\x75\x10\x2b\x02\xca\x8a\xb9\xbd\x91\x7a\x88\x55\x19\x6b\xd7\xa3\x7a\x1e\x93\x78\xb0\x1b\x7d\x0d\xea\xbe\x06\x75\x5f\x83\xba\xb5\x06\x75\x87\xc3\x44\x1e\x69\xa4\xc6\x11\x8e\xe6\x2b\xcf\x4f\xc9\x3e\x0e\x5f\x18\xb6\x46\x25\xfa\x5a\x2b\x17\x72\x4e\xe2\xf7\xd5\x30\xb4\xc0\x52\xa4\x7b\x22\xf1\x01\xa2\xa1\x0f\x45\x6f\x30\xe8\x23\x7a\xd3\x95\xc0\x9a\xee\xf5\x11\x24\x23\x56\x34\x72\x36\xf8\x08\x74\x24\x48\xca\x1f\x09\x50\xb1\x54\x60\x63\xb2\x9e\x2d\x34\x15\x3c\x85\x23\x18\xd9\x43\xb5\x7b\x62\x99\x70\x9e\x10\x5c\xe3\xfc\x05\x33\x73\x2f\xbc\x9e\x89\xa0\xb3\x7d\xa0\xab\x71\xa0\x9b\x65\xa0\xdd\x2c\xf0\x0c\x3e\xf5\xee\x8a\xf9\x05\x95\xaa\xf4\xf6\x9b\x70\xb0\x97\x46\xfc\x12\x68\x76\xbf\x53\x55\xbc\xd7\xc3\x9f\x65\xdd\xbe\x54\x25\x7c\xcf\x35\xf0\x1e\x87\xaf\xaf\x39\xd0\x87\xcb\xec\x70\x71\xfa\x70\x99\x3e\x5c\xe6\x8b\x0d\x97\x69\xd7\x26\x68\xbc\x75\x72\xe5\x9a\xf5\xbe\xbc\x59\x46\xfc\x0a\xa2\x94\x56\x1f\x3b\x56\x00\xd3\xa2\xf2\x79\xfc\x26\xa4\xfa\xc6\x09\xbf\x84\x74\xdf\x57\x95\xda\x69\x55\xa9\xbd\x9b\x76\x2f\xf8\xf5\x82\x5f\x2f\xdb\x74\x9c\x70\x2f\xdb\xec\xaf\x6c\xf3\x5a\x0a\xcb\x97\x04\x78\xac\x85\xa7\x52\x1e\xd3\xd2\x70\x68\x03\x1e\x04\x86\xf5\x3c\x4b\x38\x8e\x97\x85\x45\x6b\x59\xeb\x57\x54\xc8\x35\x4b\x44\x33\xd3\xae\xfe\xe0\x2d\x48\x66\x7a\x9c\x66\xc4\xbf\x9b\xc8\xe7\x70\xca\xaf\x1a\xf4\x0c\xf4\x0a\xa1\x7e\xa5\x90\xc1\xe7\xd2\x3a\xaa\x34\xdc\x49\xc1\x90\xdf\xbd\x15\x2a\x7e\x09\x75\xe2\x0b\x76\x08\xf4\x46\xff\xdf\x67\x59\xfa\xbd\x91\x52\x7b\x55\xae\xcf\x79\xed\x8d\xf8\xbd\xa2\xdb\x2b\xba\x3b\x5f\xc6\x7d\x52\x74\x5f\x51\xa2\x36\x49\x3c\xcf\x52\x64\x72\x33\xd9\xba\x17\xad\x7b\xd1\xba\x17\xad\xbf\x58\xd1\x7a\x3f\x56\xb8\x97\xab\x7b\xb9\xba\x97\xab\x7b\xb9\xba\x97\xab\x77\xbe\x8c\xbd\x5c\x5d\x91\xab\xe1\x2f\x97\xc4\xbe\xae\x90\xdd\x59\xb8\x5e\x01\x31\xfe\x96\x5c\x2f\xbd\x54\xdd\x4b\xd5\xfb\x2d\x55\xef\xcd\x84\xbe\xbc\xd4\xd3\x3e\x79\xb3\x4f\xde\xec\x93\x37\x5b\x92\x37\x9f\x55\x9e\x71\xbc\x64\x99\x84\x52\x17\x2c\x7e\xaa\x71\xa0\xbd\x95\x2d\x8a\xd1\x6e\x1a\xd6\xb1\xab\xa5\x76\x65\x00\x36\xa9\x03\x56\xfa\xcd\x35\xb4\x47\xd5\xc1\x0e\x9c\xb4\xa0\x19\x85\x1b\xdf\x6a\xb0\xa4\x9f\xed\x9b\x6f\x0b\xaa\xbd\x3e\xea\xbe\x3a\x18\x0a\x76\xad\xaf\x0e\xf6\x8c\xf3\x76\x87\x6b\xc5\xcc\x1d\x8d\x1a\x1b\xef\x1b\x9d\xf6\xab\x07\xc8\xb5\x9f\xf4\x57\x0d\x97\x6b\xbc\x49\x6a\xc9\x3a\xc7\xff\x6c\xbc\x28\x5e\xa1\x28\xda\xda\xb7\xc3\x47\xa2\xbe\x94\xab\xa1\x2f\x8a\xd6\x57\xef\xd8\xd1\x74\x37\x62\xfd\x6f\x76\xb6\x7d\x09\xb8\xbe\x04\x5c\x5f\x02\xae\x2f\x01\xd7\x97\x80\x43\xbf\xf3\x12\x70\x6b\x8b\x8f\x66\x1c\x5f\x8a\x04\xd9\x97\x80\xeb\x85\xc8\xdd\x4d\xf7\xf7\x25\x44\xee\xa1\x05\x61\x2f\x6a\xdd\x79\x0b\xc2\xab\xe3\x7c\xb8\x91\x74\xc5\xfa\x70\x0b\xda\xe3\x7d\xd8\xff\xeb\xf1\x3e\x7a\xbc\x8f\x96\x59\xf7\xc1\xac\x3d\xde\x07\xea\xc3\x35\xfb\x70\xcd\x7d\x0e\xd7\xec\xb0\x8d\x3d\xde\x47\x47\x71\xee\x99\x30\x3f\x9c\xcc\xb5\x16\xee\xc7\xcf\x75\x45\x63\x6f\xa5\x34\x37\xd6\xdf\x19\xfe\x47\x75\xda\x7b\xa1\x92\xbc\x20\x0e\x48\x13\x5d\x77\x56\x40\xde\x06\x1e\x88\x1b\x6d\x9f\xb8\xd8\x87\x58\xef\x7f\x88\xf5\xde\x25\x2e\xee\x8d\x24\xdb\xab\x7b\x7d\xee\x62\x9f\xbb\xd8\x2b\xc3\xbd\x32\xbc\xf3\x65\xdc\x27\x65\xf8\x95\x25\xec\x67\xc4\x05\xd9\x4e\xd6\xee\x45\x6d\xf3\x5e\x2f\x6a\xf7\xa2\xf6\x17\x2a\x6a\xef\xc7\x0a\xf7\x72\x76\x2f\x67\xf7\x72\x76\x2f\x67\xf7\x72\xf6\xce\x97\xb1\x97\xb3\x5f\x0c\x27\xa4\x49\xd8\xee\x98\x6f\xf3\x96\x24\xed\x5e\xca\xee\xa5\xec\xfd\x96\xb2\xf7\x66\x42\x3d\x66\x48\x8f\x19\xd2\x63\x86\xf4\x98\x21\x1b\xc9\x37\xff\x66\x8f\xe5\xbb\xe0\x26\xf6\x57\xf6\xbb\xef\x13\x3e\xb9\x5b\x64\x44\xff\xf7\x8c\xa6\x84\x49\x90\x46\xa9\x5a\x84\xf2\x4c\xcb\xca\xd7\xd7\xfc\xdd\xed\xf9\xe5\xc7\x8b\x30\x9b\xe6\xdd\xa7\xfb\x8b\xbb\xf3\xeb\xc1\x8d\x5f\x17\x3f\xab\x70\x2d\xec\x77\x25\x91\xec\x14\x47\x73\x32\x7c\xa4\x20\x51\x0f\x85\xe0\xe2\x94\xc7\x64\xb3\x71\xdd\x5f\xfe\x78\x79\xf5\xf3\xe5\xd2\x31\x94\xde\x29\x06\x01\xe7\xee\x86\x68\x05\x18\x8e\xee\xad\xc2\x2a\x97\x9b\x0d\xe3\x66\x78\x3b\xbc\xf9\x09\x52\x92\xc6\x67\xe7\xb7\x83\xef\x2f\x4a\x54\x59\x7a\x3e\x38\xfd\xeb\xfd\xf9\x4d\xfb\xf3\xe1\x7f\x9f\xdf\xde\xdd\xb6\x3d\xbd\x19\x5e\x0c\x07\xb7\xed\x5f\x7f\x18\x9c\x5f\xdc\xdf\x0c\x97\x2e\xc8\xd2\xd1\x2e\xd7\x84\x24\x2c\x12\x24\x1b\x20\x5b\xcd\x5f\xb3\x6a\xb7\x86\xc8\xcb\xb0\x8e\x27\x37\xf5\x75\x82\xee\xad\x61\x81\xda\xc6\x0d\x97\x0f\x1a\x32\x1a\x51\x4c\x25\x9e\x24\x24\xae\xb5\xe4\xd6\xb0\xad\x25\x5c\x1a\xd4\x93\x56\xe1\xbd\xdc\xab\x19\x6f\x64\x18\x12\x82\x44\x49\x45\x58\xdc\xd0\x87\xd9\x87\xd6\x1e\x98\x66\xa0\xf4\x91\x94\x7a\x8a\x72\x21\x08\x53\xc9\x02\x91\xcf\x54\x2a\x59\x6b\xd4\x6d\x5f\x5b\xb3\xf6\x62\xf7\x0d\xce\xb1\x44\x13\x42\x58\x79\xfc\x82\x24\x04\xcb\x86\x31\xdb\xdd\xef\xb6\x2c\x7e\xaf\xac\x49\xc8\xdc\x88\x53\x4c\x93\x5c\x90\xca\x69\xe1\x69\x86\x05\x95\x9c\x0d\x3f\xeb\x0b\x55\x73\x93\x2b\xf8\x9c\x8b\xcd\x4e\xcc\xf0\xaf\x21\x05\x5f\x96\xff\xf9\xf1\xae\xfc\xaf\x12\xe3\xb9\xb8\x2b\xff\x6b\x39\xad\x07\x0d\x57\x29\xfb\x10\x7d\xbc\x3b\x41\x1f\x21\xce\x4a\xa0\xbb\x39\x36\x14\x7b\x71\x77\x82\x2e\x88\x94\xf0\x4b\xf1\xb1\xa2\x2a\x81\xb9\x7d\x4f\x19\x16\x0b\xe4\xa6\x6f\xb2\x6d\x71\x34\x47\xc4\x2f\x4d\x75\xf1\xd8\xdf\x73\x66\xb8\x9d\x7f\xe5\x82\xcf\x68\x84\x93\xed\x16\x71\x70\x59\xe2\x03\x57\x37\x4b\x97\x22\x7c\xbb\xbe\x16\x83\xcb\x33\xc8\x64\x75\x43\x6d\x98\xf9\x25\x91\x9a\x48\x22\xce\x62\xeb\x2a\xd2\x22\xc8\x22\xd0\x2c\xfe\xce\x21\x1b\x38\x97\x94\xcd\x74\x8b\xe8\x18\x5d\xdd\x8c\xd8\x95\x88\x8d\x35\x96\x68\x91\xdc\xd0\x1c\x95\x88\x71\x85\x68\x9a\x71\xa1\x30\x53\x5a\x1b\x01\x59\xc4\xae\x88\xe1\x00\xa7\x3c\x4d\x73\x85\xf5\x41\xab\x2d\x2a\x33\x36\x99\x5b\xa2\xce\x63\xf0\xef\x34\xac\xa1\x11\x56\x8a\xb9\x64\x42\xb7\xaf\x05\xa5\xb2\x22\x4f\xe3\x9a\x3e\xed\x9a\xc0\x42\xe0\xb2\x48\xf3\x8e\x2a\x92\x56\xdf\xef\x18\x69\xfa\xaf\x46\x2b\xc5\xa9\xc9\xec\x20\x62\x20\xa2\x39\x55\x24\x52\xfa\x08\x6e\x75\x23\x06\x74\x31\xf8\x74\xf6\xe7\xff\x28\xfd\x70\xf3\xa9\xf6\xc3\xf8\xa7\x3f\xd7\x7e\xf9\xff\x75\xba\x57\xdb\x68\x2a\x9c\xcb\x21\xc8\xf5\x60\x98\x76\x53\x45\x34\xc5\x33\x82\x64\x9e\x69\x0a\x90\x47\xe5\xfd\xd5\x72\xed\x05\xc7\x31\x65\x33\x93\x86\x7a\x41\x15\x11\x38\xf9\x84\xb3\x0f\xce\x88\xbe\xc1\xea\xfc\x9f\xdb\x52\xd2\xf0\xbb\x5f\x06\x9f\xc2\xb4\xe3\x77\xd7\x37\x57\x77\x57\x4b\x67\x5d\x6a\xa1\x7e\x8c\xf4\xe3\x13\xf8\x5f\x74\x8c\x74\xeb\x5e\xfc\x4e\x89\xc2\x5a\x2d\x41\x5f\x9b\xcc\x3d\x9f\xcd\x43\x59\x02\xa7\x26\x13\x34\xa5\x70\xa5\x18\x33\xe2\x7b\x23\xe1\x7b\x15\xc6\x9f\x1b\xf3\x01\xa8\xec\xee\x52\x66\x31\x16\x31\xfa\xbb\xac\xe6\xb0\x83\xf5\xda\xfc\x40\x62\x74\x88\xe6\x4a\x65\xf2\xe4\xf8\xf8\xe9\xe9\xe9\x48\xbf\x7d\xc4\xc5\xec\x58\xff\x71\x48\xd8\xd1\x5c\xa5\x89\xc9\xd9\xd7\xab\x70\x82\xae\x05\xd7\x57\x08\x58\x09\x88\xa0\x38\xa1\xbf\x91\x18\x4d\x0c\xff\xe3\x53\xf4\x6b\xc4\x05\x39\x2a\x36\xc6\x5a\xb6\xec\x3d\x62\xad\x5f\xc7\xfa\xa5\x06\x66\x52\xdd\x4f\x14\x93\x88\xc6\x56\xcc\x20\x2c\xe2\x60\xfe\x34\x0e\x13\xdd\x9e\x4b\x77\xd4\x6a\x55\x96\xab\x62\x39\x03\x8d\x09\xc7\x24\x48\xb9\x57\xbc\x4c\x70\x5a\xfb\x3a\x37\xba\x73\x2e\x89\x80\xbb\x15\xc3\xad\xea\x5e\xcd\xf4\x84\x23\x9e\xa0\x49\x3e\x9d\x12\x11\x7a\xc5\x0f\xb4\x4a\x45\x25\x12\x24\xe2\x69\x0a\x12\x83\xfe\x2a\x97\x86\xaa\x61\xc5\xec\x68\x8f\x46\x0c\xf6\x5f\xeb\x5a\x40\x01\x31\x07\x56\xc7\x08\x89\x11\x66\x0b\xd3\xcd\x24\x9f\x86\xed\x1b\x2c\x0c\x1c\x23\xaa\x46\x6c\x90\x24\x48\x90\x94\x2b\x12\x24\x72\x82\x07\xaf\xbc\xe0\xc0\x22\x05\xc9\x12\x1c\x91\xd8\xd0\x43\xc2\x23\x9c\xa0\x29\x4d\x88\x5c\x48\x45\xd2\xb0\x81\xaf\xc1\x60\xa4\xd7\x8c\x4a\x14\xf3\x27\x96\x70\x6c\xe7\x51\xfd\xec\x7d\xf9\x34\x0e\x1d\x4e\x01\x88\xeb\xf0\x3f\x3f\x52\x16\xef\x8c\x43\xdd\xdf\x0e\x6f\xc2\x7f\xdf\xfe\x72\x7b\x37\xfc\xb4\x1e\xf7\xf1\x94\x05\xc3\x03\x43\xc2\x09\xba\x35\x8b\xc0\x85\x96\x88\x44\xcb\xa4\x3e\x59\x52\x2a\x7e\xd8\x58\x1f\xf9\x34\xb8\xbc\x1f\x94\x38\xca\xed\xe9\x0f\xc3\xb3\xfb\x8a\x3e\x60\xe7\x57\x92\xe1\x8d\x0e\x1a\xfe\x76\xfa\xc3\xf9\xc5\xd9\xb8\x41\x6b\x7d\x77\x33\x3c\xbd\xfa\x69\x78\x53\x28\x98\x8d\x4b\x54\x19\x4c\x95\x59\xdd\x19\xa6\x34\xe7\x31\x9a\x2c\x9a\x51\x29\xb4\xe4\x9c\x80\x43\xb8\xc0\x65\x31\xad\x9e\x00\x6f\x72\x00\x21\xc5\x17\x29\x8f\xc9\x81\x7d\x07\xe0\x3c\x8c\x85\xc7\x48\xcc\xcd\x0d\xeb\xde\x31\x0b\xac\x25\x06\x69\xc3\x2f\xdc\x09\x1a\x20\xa9\x5f\xcc\xf5\xa1\x16\x74\x36\x03\xeb\x65\x65\xa8\xa6\x35\xfb\x29\x2c\x2f\x7c\x67\xf6\x3f\x13\x1c\xce\xb9\xee\xd6\x9a\xbd\xbd\x69\xc4\x7c\x08\xd0\x2f\xe5\x16\x05\x06\xab\x47\xc3\xd0\xdc\x66\xe9\x45\x68\x5d\x2f\x73\x1e\x8d\xd1\x4a\x1f\x2e\x60\x5b\xd2\x18\x5d\x33\x41\x1e\x29\xcf\x83\x4f\x2d\xba\x48\x69\xc7\x1b\x9b\x2f\x16\x00\x96\xcd\x58\x66\x2a\xcd\x78\xf2\x68\x6c\x41\xb3\xb0\x47\x68\x61\x2a\x78\xda\xd0\x46\xf9\x98\x9c\x5f\xdd\x2a\x81\x15\x99\x2d\xce\x2c\xcb\xd8\xfc\x78\x9c\x5d\xfd\x7c\x79\x71\x35\x38\x1b\x0f\x07\x1f\xcb\x27\xde\x3f\xb9\xbd\xbb\x19\x0e\x3e\x95\x1f\x8d\x2f\xaf\xee\xc6\xee\x8d\xa5\x24\xdf\xd2\x41\xfd\x9e\x2e\xbf\x78\x82\x34\xcb\x05\xd6\xe8\x50\xf7\x02\xfe\x38\x21\x53\x2e\x0c\x9f\x4f\x5d\xfc\x84\x15\x61\xdc\xda\x5a\x5d\xac\x32\x8b\x13\x30\xcf\x35\x35\x69\x4c\xef\x4a\x10\x9c\xc2\x3d\x81\x19\x1a\xb2\xf8\xf0\x6a\x7a\x78\x6b\x7e\x4c\xb1\x78\x20\xc2\x7f\xfa\x24\xa8\x52\x84\x95\x54\x3a\xec\x86\xec\x95\xc4\xa2\x83\x23\x74\xa3\xf9\xbe\x7e\xdf\x5f\x6a\x9a\xd8\x63\xa2\x30\x4d\xa4\x1d\x6c\x69\x5d\x4f\xd0\x05\x16\xb3\xc2\x18\xf8\x35\x9f\x4e\x4d\x63\xef\xcd\x30\xf4\x1d\x56\x9a\x45\x03\xef\xd5\xa4\xe1\xee\x45\xe8\xcf\xbe\xec\xe5\xe1\x3a\x55\xdd\x67\xdb\xd1\xd4\xfd\x35\xac\xb8\xd1\xd8\x4b\xba\xa1\x7d\xd2\x40\x6b\x30\x71\xf3\x78\xf9\x25\xd3\xdc\x76\x9d\x9c\xca\x2f\x36\x90\x93\x49\xe8\xd2\x3b\x3f\xd5\xda\x66\x03\x2d\x91\xcf\xd4\x1a\x0c\xc2\x71\x57\x48\xa8\x68\x06\x6c\xbc\x38\xcb\x08\x16\xb2\x69\xb7\xcb\x62\x60\xcb\xde\x9b\x9e\xc2\x3e\xec\x26\xbb\x7e\x0e\x10\x67\x60\x70\xf0\x42\x44\x85\x22\x3b\xd0\x80\x69\xab\x46\x01\xd7\x00\xf9\x74\x65\xe1\x95\x3e\x51\xa9\x95\x46\xf3\xe3\xf7\x16\xf7\x69\x33\x82\xf8\x30\x38\xbf\xa8\x08\x17\xe3\xb3\xe1\x87\xc1\xfd\xc5\x72\x5b\x65\xe9\xbb\xea\x16\xa3\x43\xa4\x9f\x97\x9d\xf7\x74\x6a\xee\x0c\x87\x5e\x65\x54\x5a\xc2\xc0\x68\x65\xf1\x72\x8c\xd1\x3c\x26\x59\xc2\x17\x29\x61\x60\xe2\x29\xdd\x84\x7a\x3d\xa7\x98\xda\xab\x25\x18\x2c\x58\x71\xac\xd9\x0d\xae\xb1\x43\x07\x99\x45\x62\x7f\xf3\x96\x11\xb3\x2a\xac\xfb\xda\xb8\xf0\xec\x7f\x6e\x15\x56\x1b\x9e\xb1\xc1\xe9\xdd\xf9\x4f\xc3\xb2\x7e\x78\xfa\xc3\xf9\x4f\x4d\x52\xcd\xf8\xe3\xf0\x72\x78\x33\xb8\x5b\x21\x9c\x54\x9a\x6c\x12\x4e\xa4\x1e\x70\xd5\x85\x4b\xa5\x0f\x4b\x8a\x0c\xee\x16\xa2\x4a\xa2\x47\x2a\xe9\x84\x02\x4a\x99\x75\x87\xde\x9f\x03\x67\x7d\xc4\x09\x8d\xa9\x5a\x38\xf1\xc5\xf4\x5b\xde\x47\xcd\x49\x6d\xfb\xc6\xec\x10\x3a\x49\xc1\xca\x67\x36\xc7\x4d\xfa\x04\x81\x6e\xfb\x08\x4a\x5b\xf0\x19\xd3\x82\x34\x9b\x11\x61\x86\x03\x2e\xa0\x70\x2c\xc1\x73\x3d\xaa\x50\x58\x29\x56\xcd\x0b\xad\x33\xc2\x88\x00\x24\x3a\xdf\x89\x11\xa4\x04\x61\x5f\x69\x99\x2b\x4b\x68\x44\x55\xb2\x40\x11\xd8\xb0\xc0\x9c\x99\x62\x86\x67\x56\x38\x00\x35\xa7\x42\x12\x7f\x35\x50\x6e\x57\x53\xeb\x5f\xb8\xa3\x64\xc3\x63\x76\x7f\x79\x36\xfc\x70\x7e\x59\x26\x81\x1f\xce\x3f\x96\x44\xd8\x4f\xc3\xb3\xf3\xfb\xd2\x6d\xae\x25\xd9\xe5\x72\x7d\xb5\xd9\x86\xa3\xe8\x5f\x3a\x41\x67\xe6\xd3\x13\xbd\xb8\x0d\x38\x75\x5e\xf9\xad\xac\xc3\x8d\x8b\x0b\x74\x7f\x0c\x99\x12\x8d\xce\x91\xae\x26\x24\xeb\x08\x2d\xd9\x90\x9a\xe3\x25\x6a\x7d\x5f\x56\x3d\xdb\xd5\x29\xbb\x17\x21\xf2\xf3\xa8\xb0\x2c\x85\x81\x14\x60\x34\x68\x33\x62\x35\xf8\xd6\x0a\x86\xfd\x13\xf8\xc9\xd3\x5c\x2a\xe3\xcf\x04\xe2\x44\x0f\x7f\x91\x7a\x41\xc1\xdf\x79\x84\x6e\x09\x19\x31\x67\x3d\x98\x51\x35\xcf\x27\x47\x11\x4f\x8f\x0b\x90\xc4\x63\x9c\xd1\x14\x6b\x49\x9a\x88\xc5\xf1\x24\xe1\x93\xe3\x14\x4b\x45\xc4\x71\xf6\x30\x83\x30\x1c\xe7\xd3\x3d\xf6\xcd\xce\xf8\x1f\x2e\xfe\xf4\xcd\xe1\xc5\x5f\xbe\x79\x57\xb7\x90\xb5\xed\xff\x90\x45\x38\x93\x79\x62\xc3\xf6\x44\xb8\x36\xee\xc8\xe7\x64\xd5\x7e\x5f\x96\xb7\x6b\x3b\xfd\xf5\xf4\xfa\xbe\x64\xb1\x2e\xff\xf3\xd3\xf0\xd3\xd5\xcd\x2f\x25\x4e\x79\x77\x75\x33\xf8\x58\x62\xa8\xc3\xeb\x1f\x86\x9f\x86\x37\x83\x8b\xb1\x7b\xb8\x8d\xed\xed\x47\xc6\x9f\x58\x79\x69\xa4\xe3\x80\xb5\x9e\x4e\xd0\x07\x2e\xd0\x8f\x7e\x27\x0f\x27\x58\xc2\x15\xe3\xee\x2c\x79\x80\x32\x1e\x03\xe3\x45\x24\x9b\x93\x94\x08\x9c\x58\x9b\x81\x54\x5c\xe0\x99\xb9\xe9\x65\x24\xb0\x8a\xe6\x48\x66\x38\x22\x07\x28\x02\x6a\x98\x1d\xc0\xa6\x80\xaa\xc5\x67\x55\x3b\xdf\x4d\xce\x14\x4d\x89\x53\xc1\xed\x3f\xef\xcc\x66\x6c\xb0\x39\x57\x77\x3f\x94\x85\xbd\x0f\x17\xbf\xdc\x0d\xc7\xb7\x67\x3f\x2e\x5d\x4f\xf3\x59\x69\x64\xb7\x10\x05\x75\xca\x93\x3c\x65\xe1\xdf\x9b\x8f\xed\xfc\xf2\x6e\xf8\xb1\x3a\xba\xab\xc1\x5d\x99\x32\x6e\xca\x51\x76\xef\xbe\xbf\xba\xba\x18\x96\xfc\xd2\xef\xce\x06\x77\xc3\xbb\xf3\x4f\x25\xfa\x39\xbb\xbf\x31\x90\x88\xcb\xa6\xe9\x46\xd0\x30\x51\x3d\xad\x70\x9a\xbb\x66\x85\x9d\x38\xd1\xc0\x46\xb5\x9b\xb3\x7c\x18\x60\xfe\x98\x98\x34\xb0\xea\x1c\x7a\x93\x6a\x64\x46\xda\xc8\x0e\x55\x79\x9b\x50\x3b\x3b\x5e\xba\xd1\xcb\xb8\xf2\x9d\x1f\x82\xc1\x23\x35\xca\x36\x4e\x12\xfe\x64\xe2\x89\x53\xaa\x6f\x65\x8b\xce\xa6\x5f\x91\x85\x87\xf0\xa8\x81\xe3\x95\xb7\x85\x44\x82\xa8\x4f\x3c\x67\x6a\x73\x92\x1b\x5c\x96\xf8\xce\xf0\xf2\xa7\xf1\x4f\x83\x32\x05\x9e\x5f\x2c\x67\x35\x61\x13\x0d\x57\xf1\xe0\xf2\x17\x7f\x09\x43\xd4\xf9\x81\xd7\x50\x8d\xec\x1a\x25\x54\x8b\xbd\x11\xd6\xda\x6b\x02\x12\x0d\x22\x14\x4c\x0e\xa9\x9e\x1c\x44\xb9\x66\xc6\x9f\x64\xf8\x93\x19\xe4\x89\xfb\xa3\xd2\x9e\x84\x75\x01\x6b\xaa\x0b\xea\x87\x76\xac\x56\xcd\x10\x61\x8f\x54\x70\x00\xd5\x45\x8f\x58\x50\x2d\x8d\x9b\x96\xf5\x5c\x4f\xe0\x7f\xd7\x6b\x13\x0c\xa3\x15\xc6\x75\xcb\x85\x3a\xf3\xd1\xc4\x9b\x59\x43\x9a\xa2\x6a\xeb\xf1\xb4\xcd\x86\x8e\xfa\xb7\x0d\x9b\xb3\x65\xd4\x71\x79\xc2\xff\x48\xce\x28\x4e\x34\x03\xd8\x9d\xbc\x38\xb8\xbc\x3d\x2f\xcb\x8f\x65\x35\x23\xe0\xcb\x1b\xcb\x8b\x60\xa8\x34\x23\x77\xca\xc4\xed\x5f\x2f\x8c\x76\x01\xc8\xcb\xe6\xdc\x06\x8a\x05\x08\x40\x0e\x8a\x25\xc3\x42\x56\xbe\x90\x08\xd0\xd8\x8a\xa8\x2f\x7d\x67\x41\x4c\xd5\x23\xa7\xf1\x88\x91\xcf\x19\x61\x12\x82\x03\xcc\x7d\x56\xf8\xda\xe5\x11\x3a\x9f\x02\x4b\xd0\xaf\x33\x94\x33\xeb\x00\xd3\x17\xae\x19\xe4\x81\x16\x65\xed\x10\xbc\x86\x08\x86\x17\x46\x5c\xc4\x56\x31\xf8\x11\xfb\xd9\x3b\xd1\xe0\xd1\x94\x6b\x06\xa4\x77\xd1\xb6\x77\x82\x30\x93\xf4\x00\x69\x85\xa5\xba\xa7\x90\xbf\xa0\x15\x4a\x1b\x47\xa6\x39\x8d\xfd\xf3\xe5\xaf\x81\x5a\xb0\x72\x78\x19\x34\xdf\x05\x95\xab\xa0\x45\x34\x4e\x8c\xc7\x64\xdc\xfd\x4e\x88\xb8\x20\xd6\xcf\xb2\xf6\x35\xb0\x8a\xb1\xdf\x61\xf9\x50\xf3\x3d\x9c\x33\xa9\x30\x8b\xc8\x69\x82\xe5\x86\x41\x48\xce\xc6\x71\x50\x96\x38\x6e\x6e\xee\xaf\xef\xce\xbf\x5f\xc1\xe5\xab\x1f\xd7\xc3\x80\xa2\x24\x77\xee\xb9\x89\xe0\x38\x46\x9a\x7d\xce\xb8\x71\x05\x5a\xc1\xbf\xc0\x1f\x37\xc9\x45\x3e\xaa\xb3\x84\x7d\x5e\xe4\x44\x58\x3b\x47\xe8\x4a\xa0\x76\x21\x50\xa4\x57\x02\x05\x26\x0f\xb7\xd5\xe0\x59\x34\x55\x51\xac\x75\x2b\x4b\xb0\x9a\x72\x91\x1a\x2e\x5f\x9a\xb4\x69\x7c\x79\xa3\x94\x29\x22\x44\x9e\x29\xea\x00\xe5\xab\x52\x2a\x94\x99\xe7\xb3\x4f\x44\x4a\x3c\x23\xdb\x38\xa0\x9b\x94\x87\xdb\x9f\xc2\x7f\x82\x83\xb9\x8b\xec\x5f\x1a\xa1\x0b\xbf\x77\xf4\x74\xc5\x3e\x98\x40\x9e\x6b\x9e\xd0\x68\xc3\xa8\xbf\x0f\x83\xf3\x8b\xf1\xf9\x27\xad\xc4\x0f\xee\x86\x17\x25\x51\x02\x9e\x0d\x3e\xdc\x0d\x6f\x2c\x92\xf6\xe0\xfb\x8b\xe1\xf8\xf2\xea\x6c\x78\x3b\x3e\xbd\xfa\x74\x7d\x31\x5c\x11\x99\xd3\xda\x78\xdd\xba\x5a\x7d\xf5\xa4\xf6\x0b\xec\xb0\xe6\x65\xa1\xbd\x0c\x52\xd7\x30\x4d\xc0\x09\xce\x8d\x33\x1c\x23\xc6\x63\x02\x3f\x4b\x67\x9d\xf1\xf0\xd5\xe8\x5c\x7d\x95\x24\x08\xe7\x8a\xa7\x18\xbc\x36\xc9\x62\xc4\xf0\x44\xb3\x56\x9c\x24\x41\x78\x97\xc8\x19\xd3\x2c\x56\x37\x66\x70\xe2\xa3\x84\x68\x76\x9e\x05\x19\x87\xd6\x6f\x30\xa5\x0c\xc2\x7d\x53\x2c\x1e\x8c\x9b\xa9\xe8\xb2\x38\x14\x12\x61\x39\x62\x7a\x5c\xc4\x1a\x86\xba\xac\xf0\x49\xa7\xb7\x5a\x57\x27\xc5\x0f\x44\xaf\x4a\x9a\x47\x73\x94\x09\x3e\x13\x44\x4a\x6b\x5b\x8e\x30\x33\x01\x08\xf6\x75\x7d\x0d\x8d\x18\xe3\x7a\x29\x9c\x09\x3b\x26\x19\x61\x31\x61\x11\x35\xb9\x85\xe0\xbb\xf7\xa6\xcd\x99\xc0\xd9\x1c\x49\x0e\x4e\x6f\x58\x76\xb0\x5f\x99\x8f\xdc\x4d\x66\x66\x6c\x1e\x87\x16\x68\x91\x6b\x3e\x71\x05\x72\xa2\x59\x65\xf8\xd8\x5d\x86\xce\xed\x62\xec\x80\x69\x96\x10\x65\x2a\x06\xc0\x92\xc3\x66\xe8\xb5\x2e\xed\x87\xde\xa6\xa6\x4d\xd0\x17\xb6\x1b\x33\x96\x76\x44\x47\x0d\x96\x6d\x7b\xa4\xd0\x0f\x98\xc5\x89\x6e\xc5\xf9\x30\xca\x67\x11\xf2\x61\x06\x9a\x6a\xdc\x69\xdc\xe6\x16\x8d\x70\x2e\xb7\xb9\x46\x2b\x09\xa1\xc6\x2a\x78\x58\x04\x85\x00\x79\xdb\x6c\x50\x58\xdd\x4c\xb3\x48\x9c\x70\xbb\x4a\xe6\xf5\xdc\x14\xa1\x42\x30\x9a\x96\x6b\x36\x13\x94\x45\x34\xc3\xc9\x46\xba\x5f\x25\x23\xc0\x06\xda\x7f\x4d\xa7\x9a\x7c\xde\xd7\xdc\xb6\x8a\x88\x14\xb2\xa4\xed\x30\xfd\x16\xae\x61\x49\xb2\xa9\x15\x44\x16\xd1\x24\x58\xf0\xdc\xf8\xe3\x60\x5d\x48\xdc\x70\x54\x8f\x9a\xb6\x5b\x9f\x0c\x5c\x8e\xc2\xde\x60\xb3\x4d\xe4\x4f\xdb\xfa\x55\x5a\xb1\xbd\x9b\x60\x3c\x9c\x5c\x37\xb7\xd9\xb4\x03\xc1\xc3\x7f\x2d\xa3\x9d\x4f\x38\xd3\x34\x63\x6b\x07\xe0\x62\x8e\x56\x49\xb2\xa5\xc9\x5c\xfc\x4c\xe0\x3b\xf7\xc9\x29\xdd\x77\xa3\x58\x42\x1b\x00\x55\xef\xa4\x14\x43\x10\x24\xba\x5b\x1a\x9f\xe6\x5a\x96\x45\x18\xa2\x10\xd0\xd7\xe4\x68\x76\x84\x5c\x25\x88\x03\x34\xb8\xbe\x1e\x5e\x9e\x1d\x20\xa2\xa2\xf7\x2e\x66\xd1\x06\x2c\x8d\x98\xe2\x56\x5a\x59\xb8\x2a\x1e\x29\x11\x33\x52\x9a\xb3\x8b\x6e\x82\x50\xe5\x19\x95\xca\x86\xcf\x6a\xbe\x12\xd4\x5b\xa1\x69\x55\xcc\x36\x14\x92\xab\xf9\x36\xa4\x81\xa5\xcc\x53\xad\xcb\x8e\x29\x4e\xc7\x82\x27\xdb\x30\x85\x33\x98\x0a\xa8\xcb\x1e\x23\x80\xe2\x14\xe9\x66\x6d\x28\x88\x77\x39\x7a\x91\x4e\x0b\x46\x9a\x2f\xeb\x7b\x33\xb8\xb7\x9c\xf7\xc1\xc6\xa3\x51\x17\x02\x01\x18\x02\x2d\xac\xa2\x30\x1b\x8f\xad\xa5\x7e\x8c\xa3\x48\xab\xdc\x3b\x9e\x54\x50\xc4\xc7\xb9\x04\x6c\x47\xcf\x36\xcd\x55\x74\xee\x86\x99\x69\x0e\x06\xc1\xc0\xfa\xca\x95\x3c\xa2\x45\xfb\x0d\xfd\x4e\x16\xb5\x5e\x5d\x99\x9d\x7b\xe9\x4d\x2a\xe6\x12\x96\x04\x76\x52\x9a\x32\x3d\x6a\x4e\x16\x68\x8e\x1f\x49\xa9\x4b\x97\x95\xa3\x1b\x5e\xf0\x5c\x34\x31\xba\x11\x3b\x23\x99\x20\x5a\xd2\xaf\x3a\x50\x3c\x4d\xdf\x94\x29\xb1\xa7\xeb\x9e\xae\xdf\x3c\x5d\x9f\x9a\x6a\x4d\x03\x5f\x9d\x6b\x2b\x01\xce\x34\x36\xce\x38\x4f\xc6\x1d\x6c\x22\xdd\x57\xbc\xe4\x09\xab\xd4\xae\x02\x5c\x02\x9e\x83\x7c\x54\xba\x36\xb9\xbe\xeb\x82\x3c\x5f\x3b\xbc\x25\xcb\xe0\x5c\x66\x41\xd1\x9e\x6d\xce\x7b\x53\x2b\xcb\x5a\x42\xcf\x2e\xe6\x9c\x1a\xf9\xc6\xbb\xcb\xc2\x22\xac\xa5\xc3\xe4\x44\x11\xca\x6a\x25\xe1\x0c\x3d\xeb\x05\x36\x72\xc7\x3f\x72\xae\xb0\x7c\x7f\x34\x62\x5a\x88\x7a\x20\x0b\x63\x6e\xd5\x62\xca\x1f\xb5\x2c\x7e\x28\x09\x93\x10\xee\xfd\x47\xe3\x9e\xd3\x24\xee\xcc\xd5\x46\x35\x35\x95\xe8\x20\xe8\xda\xf7\x02\x21\xba\xb6\x51\x2b\x25\x15\x01\xd0\x20\xe7\x9b\xb9\xd8\x67\x66\xf8\x33\xa2\x20\xcf\x5b\x51\x05\x3a\x53\x6c\x4a\xdd\xd5\x86\xbe\xd2\x74\x65\xa8\x42\x70\xf0\x93\xc4\xf9\x76\x8c\x5f\xd6\xdb\x58\xc9\x19\xbd\xb6\x70\x6b\x63\xde\x8f\x9d\xdd\x28\x12\xbc\x56\x3f\x0e\x4b\x64\x76\x7a\x62\xd8\x81\xf3\x5f\x13\x76\xf4\x44\x1f\x68\x46\x62\x8a\x21\x02\x5e\xff\xeb\x58\xcf\xeb\x0f\xa7\x37\x57\x97\xe3\x22\x93\xe7\xbf\x46\x6c\x90\x48\xee\xb3\x14\x10\xe3\xcc\x87\xdb\x67\x82\x38\x91\xd0\xce\x05\xac\xae\x85\x19\x71\xc4\xda\x46\x10\xf3\x48\x1e\xe1\x27\x79\x84\x53\xfc\x1b\x67\xe0\x4a\x1f\xc0\x9f\xa7\x09\xcf\xe3\x9f\xb1\x8a\xe6\xc7\x70\xae\xd5\x31\x79\x24\x4c\x19\x37\x95\x5e\xae\x18\x32\x88\x25\x44\xeb\xff\x41\x8f\xb9\x48\x2a\x92\x5a\x93\x8d\x48\xa6\xd0\xff\x23\xc8\x84\x73\xd5\x7c\x49\xf1\xe9\x54\x92\xb5\x2e\xa4\x42\x49\xbb\xbd\x42\x7f\xf9\xf3\x37\xdf\x6a\x12\xda\x64\x8d\xcf\x6f\xaf\xc6\xfa\xfb\x3f\x9c\xd9\xef\xe5\x1a\xec\xee\x2a\x2b\x58\x9b\x23\x1e\x13\x38\x9f\x33\xb8\xfd\x04\x38\x2f\x80\xbd\x01\x39\x14\xfb\xd8\xc4\xdd\xce\x4a\xad\x6f\xa7\xb2\x6d\xb4\x98\xa0\x62\x07\x73\x44\x87\x88\x71\x94\x9a\x58\x53\xcc\xd0\x7f\xfc\xf8\x7d\xf3\x06\xe6\x82\x6e\xd4\x21\xb5\x98\x11\x41\x97\x92\xfe\x46\x24\xd2\x54\xa3\xa9\x98\xa7\xba\x6b\x41\xe4\x9c\x27\x31\x7a\x22\xa0\x26\xd9\x38\x50\xaf\x95\x0b\x32\x62\x61\x13\x10\x72\x88\x70\xa2\xf8\x8c\xc0\x5d\xed\x14\x35\x45\x84\x16\x55\x4c\x96\x86\xe2\x82\x1c\x18\xbc\xb1\xdb\x3f\xb9\xd8\x6a\x98\x26\x3c\x72\x49\x2d\xd6\x24\x17\x4f\x9a\x67\x3e\xad\x9a\x5e\x51\xbb\x0d\xbf\xba\xc9\xd6\x6c\xdb\xbc\x34\x36\x09\xc5\xda\xb0\xaa\x3b\xd3\x3c\x18\x1a\x71\x36\x4e\x28\x7b\xd8\x68\x33\xae\x9c\x28\xa7\x5b\xb0\x6b\xa6\x5b\xf4\x76\x6e\x63\x01\x59\xe3\x7c\x7c\xc8\x93\xc4\xa4\xb6\x84\xdb\x03\x72\x97\x59\x37\x10\x06\x32\x93\x03\x4a\x62\xeb\xf7\xb2\x9a\xb0\x20\x0c\x02\xde\x46\x6c\xb2\xb0\x3e\x5b\x79\x80\x64\x1e\xcd\x5d\x66\x5e\xc4\x99\xd4\x62\x34\x17\x28\xe2\x69\x6a\x2a\xac\x32\x82\x14\xe7\x89\xb4\xd1\xee\xec\x50\xe1\x48\x8d\x58\xd1\xdf\x8a\x93\x67\xca\x30\x6d\x97\xba\xd7\xdd\xa5\x53\x94\x7b\x5a\x2a\x70\xd3\x38\x04\x8e\x00\x23\x98\xf1\x44\x05\x10\x14\xbc\x7e\x96\xcc\x86\xb5\x68\x06\x72\xce\x85\x1a\xc7\x8d\x3c\x67\x25\xd1\x54\x19\x21\x23\x87\x09\x04\x0d\xf3\x47\x2d\xfc\x93\x27\x6f\x7c\x5d\x36\x04\x4d\xd5\xcb\x46\xd0\xed\x18\x2d\x1d\xd9\xba\x24\xd8\xb2\x56\x06\x46\x24\x2a\xc7\x84\xaf\x1a\xe3\x2d\x7c\x05\x58\x02\x4b\x17\xaf\x7a\xee\x9c\x10\xc4\xe3\x02\xf1\xce\xdc\xeb\x36\x23\x64\xd9\x9a\x5a\xfc\x86\xe7\xcb\x1c\x5d\x36\x95\xfb\xb2\x25\x57\x8f\x05\x4c\xf6\x92\x80\xac\x89\xc5\x84\x2a\x81\x45\x09\xae\xc4\xeb\x83\x92\x60\x01\xf1\x59\x23\x66\xc0\xeb\x8c\xa6\x10\xa3\x98\x4a\x48\x10\x81\xbb\x34\x70\x86\xa1\x6e\x4a\x60\xe5\x68\x17\x79\x8e\x26\xfe\x1c\x02\xcb\x0a\xd2\x70\xcc\x4e\x77\xe4\x41\xba\xb4\x7e\xc6\xa3\xbc\x10\xe4\x22\x90\x70\x2d\xb0\x0f\xa2\x4c\xd2\xd9\x5c\x21\xca\xac\xdd\x11\x27\x33\x2e\xa8\x9a\xa7\xf2\x00\x4d\x72\xa9\xb5\x50\x13\xac\x66\xe2\x51\x88\x8a\x3a\x71\xa1\x6d\x93\x88\xe3\x4a\x83\x75\x15\x65\x03\xd2\xe8\x76\x28\x87\x95\xbb\x62\x05\xe1\x0c\x3c\xd8\x61\xb5\x0d\x0a\xc5\x23\x0d\x46\x26\x32\x71\x80\xdc\xc1\x4b\x41\x29\x92\xb6\x73\x00\xd0\x94\x3b\xf3\x52\xbc\x44\x35\x30\x64\x92\x41\x05\x71\xb1\xdb\x20\x79\x95\xe1\x31\x0d\x84\x94\x77\x3a\xa5\x99\x6a\x0c\xdc\xaa\xbb\x8a\x6e\x02\xe0\xa1\x6e\x8b\x0d\xc9\x58\x40\xcd\x00\x17\x37\x62\xb7\x84\xb4\xa3\xc9\xd5\xf6\xde\xd4\xe7\x85\x29\xd8\x44\x8f\xe5\x24\xbf\x8d\x13\xfb\x6c\x78\x7b\x7a\x73\x7e\x6d\x20\x27\xae\x6e\x3e\x0d\xee\xc6\x0d\x7e\xed\x86\xb7\x3e\x0d\x6e\x7e\x3c\x5b\xfd\xda\x0f\x77\xe5\xac\xec\x86\x57\x6e\x6e\x97\x27\x73\x74\x18\x62\x43\x52\x58\x63\x3f\x27\x28\x5b\xa8\x39\x67\x3e\x44\x21\x2e\xf1\xa6\x43\x64\x32\x82\x15\x84\x10\x09\xa9\x1a\x1c\x87\x77\x10\x97\xb3\x5a\xc2\x2c\x6f\x96\xc1\x82\xdb\xa9\x68\xb4\xc6\x89\xfc\x98\xf0\x09\xf8\xad\xf3\x52\x9d\xdd\x25\x11\xe8\x5b\xc6\xfb\x9c\x51\x99\x25\x78\x51\xeb\x61\xd5\x95\x73\x89\x53\x02\x11\xc7\x05\x88\x9d\x4b\x16\xd1\x3b\x03\x09\x4c\xfe\x5e\xa7\x53\xc8\x64\x52\x14\x2b\x82\x26\x44\x3d\x41\xde\x9c\xfb\xd5\xdb\x52\x5d\xc0\x88\x3c\x1a\x31\x30\xe7\x8c\xf4\x22\xc7\x39\x44\xfb\x8d\xde\x1d\xa0\xd1\xbb\x98\x3c\x92\x84\x67\x7a\xe7\xf5\x0f\x2d\x97\xcc\x30\xc5\x34\xb9\xe4\xca\x5b\xe6\xb6\xd9\x4f\x41\x22\x9a\x81\x64\x3e\x26\xba\xdd\x97\x13\x3c\x4a\x94\xec\xd8\x19\x8c\x01\xe1\x38\xd6\x4a\x36\xb0\x32\x37\xbc\x22\x04\x88\x05\x53\x2f\x15\xec\x5c\x47\xa4\xf0\xe6\x6f\xd3\x63\xd8\x66\xd9\xec\xd9\xb8\x03\xde\x31\xfc\x42\x4a\x86\x0b\xc5\xf1\x1d\x77\xd4\x3a\xee\xdb\x74\x8c\x56\x0f\x74\xf5\x00\xea\xb5\x58\x43\x60\xf6\x03\xbc\xd5\xdf\xad\x14\x34\xfd\x6d\x1b\x85\x75\xe1\x41\x64\xb4\xb9\xcd\xd5\x74\x6a\xb2\x72\xc4\x51\xc2\x65\x19\xea\xa4\xf3\xa0\x4f\xed\xa7\xcb\xc6\x3d\x0c\x9d\xc5\xfa\x5a\x5f\xcb\x1f\xdd\xb0\xf0\x15\x40\x41\xc3\x26\x94\x75\x70\xd8\xb7\x0f\x10\x85\x60\x39\x90\xa7\x93\x22\xf1\x9b\xc5\xa8\xb0\x62\x8f\x58\x11\x72\x20\xd1\x13\x49\x20\x4a\x29\xe2\x69\x06\x16\x5a\x3b\x5c\xdb\x12\x89\x4d\xc0\xe7\x01\xe2\xb9\xd2\x8d\x99\x94\x0a\x67\x83\xb3\xf9\x1a\x85\xd5\xda\xb8\x4e\x6c\xec\xb2\x07\x27\x36\xb4\x6e\x58\x21\x65\xe8\x23\x51\xd0\x0a\x80\xbf\x87\x13\x04\x31\xaf\x1a\x01\xd7\xbc\xf6\x5b\x9c\x28\x3b\x93\x35\x76\xbe\xc0\xbd\xf8\x3e\xe1\x93\xe5\x3a\x1e\x34\x8e\xee\x6f\xce\x9d\x41\xa9\x08\x7f\x09\x10\x70\x4b\x0e\xa1\xe1\xf5\xcd\xf0\x74\x70\x37\x3c\x3b\x42\xf7\x92\xe8\xe5\xf1\xd3\x85\xf4\x58\x2f\x51\x9a\x91\x5b\x20\x0d\x26\x15\xc1\x6d\x7a\x2c\x11\xa2\x94\xc4\xba\x82\x71\x94\x51\x36\x96\x13\x36\x60\x5c\x50\x6b\x67\x01\x5c\x98\xea\x3c\x6d\x60\xd5\xaa\x13\x08\x61\x2e\xe3\xb7\x13\x64\x64\xc6\x9b\xd6\x03\xab\x56\x91\x4f\x39\x20\xeb\xb9\x27\x03\x47\x4b\xcd\x09\x15\xa8\xd3\xb4\x0c\x51\x8d\xbb\xcf\x29\x88\x50\xfe\x84\xb3\xe5\xd9\x83\xf8\xa9\x44\xb4\x46\x92\x09\x5c\xaf\xcf\x7d\x0e\x1c\x5b\x1b\x1b\x56\xb8\xfd\x04\x0b\x7f\x84\xe1\xad\x9e\x6f\x9a\x80\x7d\xe9\x6c\x1c\xe1\xc4\x2a\x83\xb0\x61\x88\x12\xc1\xd9\x81\x5f\x28\x43\xa5\x2b\xf1\x00\x4d\xe9\x67\xdb\x68\x11\x9e\xec\x5e\x0d\xfc\xd5\x2d\xe1\x70\x73\x5c\x3f\x53\x6b\x88\x0d\xd7\xf0\xfd\xd2\xf0\x2c\x2e\x95\x96\xba\xb4\xe4\x2a\x48\xc4\x85\xbe\x29\xa0\xdb\xc2\x88\xbc\x4a\x64\x50\x58\xe8\x45\xa9\x1b\xd5\x97\x9d\xfe\xa2\x8e\x45\x8c\x15\x39\x54\x74\x65\xfe\xaa\x4d\x71\x80\x64\x08\xac\x02\x34\xa7\xe2\xe6\x99\x90\x19\x66\x2e\xb2\xb6\x65\xb8\xee\xca\xdb\x82\x55\x69\x09\x16\x43\x76\x0f\xc8\x57\x90\xb9\x51\x1a\x87\xcc\x60\x3d\x97\x8e\xc3\x06\x2f\xec\xc3\xb2\x3d\x61\x1f\x4b\xd1\x32\xd8\x3c\x8b\xf7\x69\xb0\x09\x96\x0a\xd9\x31\xb5\x69\x92\x81\x84\xff\xbc\x36\xb4\x92\x6a\xd6\xd5\x7c\xa6\x49\xa8\xac\x84\x10\x30\x6c\x4b\x07\x7b\x61\x40\x3e\x52\x22\x66\x4e\x10\x36\xe5\x7c\xfd\xd9\xb6\x75\x7d\xdd\x2d\x11\x32\x13\x88\xb1\xae\x37\x7d\x84\x06\xac\x06\x77\xe4\xc2\x6a\x4a\xeb\x65\xee\x24\x9c\x3c\xe1\x85\x44\x99\x30\xc8\x20\x26\xf0\xda\x4d\x1e\xe2\x1d\xcb\x1f\x79\x4f\xb6\x72\x91\xef\x08\x54\xe9\xd5\x31\x4f\x4e\xee\x1d\x3f\x83\x27\xa6\x12\x14\xec\x05\xf2\xa2\xb9\x42\xd5\xec\xc0\xea\x14\x19\x47\x73\xcc\x66\x64\xec\x6c\x64\x9b\x68\x4b\xba\x9d\x53\x68\xe6\xcc\xb6\xd2\x7c\x39\x5d\x1b\x85\xc9\xd6\x10\x31\xaf\x7a\xfb\x8f\x3e\x04\x52\xe1\x19\x41\x66\x44\x9d\xac\x8a\xa5\x80\x1f\x8b\x15\x0b\x7a\x82\x6d\x75\x58\x0e\x82\x6e\x13\xde\x21\x72\xe5\x02\x4f\x48\xf2\x3a\x8e\x6f\xe8\xda\xda\x56\xc1\xd9\x62\x82\xb9\x09\x7a\x02\x73\x6c\x85\x65\x58\xe3\xab\xc8\x9b\x42\xbb\x97\xcd\xb3\x54\x41\x7b\x8b\x89\xba\x7a\x13\x9b\x4c\xb5\xad\x0a\x45\x78\xed\x05\xd5\x1a\x9a\xec\x23\xe1\xf5\x57\x35\x09\x6e\x36\x90\xa0\x68\x44\xcb\x38\xb6\xae\x1a\xb1\x72\x2a\x1b\xe7\x88\x77\xac\xa4\x76\x3e\x45\x8c\x33\x82\xa8\x2c\x5e\x56\xe5\x6c\x16\x8f\xb0\xa2\x45\x7c\x63\x7c\xf1\x95\x9e\x7c\x01\x9f\xe7\xb6\xb4\x14\xb9\xef\xde\x36\xe0\xd2\x73\x19\xd1\x8a\x2a\x16\x0b\x40\x68\x34\x7c\xb8\x2c\xd3\xad\x1c\xe7\xce\x05\xee\x3b\x07\xc0\x19\x04\x5a\x2a\x8e\x40\x8c\xac\x0c\x0e\x19\x18\x4b\xfb\x92\xfd\xc8\xa2\x8c\x8c\x98\xb7\x6c\x00\x21\x52\x89\x52\x9c\x81\x4b\x86\x71\x55\x7c\x65\x50\x73\x94\xdf\xc2\x03\x27\x88\x4b\x53\x87\xa9\x65\x05\x56\x99\x76\xdc\xf5\x5b\xac\x6b\x19\x9d\xd0\x21\xab\xce\xe8\x23\x61\x8e\xa6\x0f\xdc\x99\xd0\x83\x72\x9d\x26\x8b\x43\x0c\x51\xa2\x24\x0e\x0d\xd7\xcb\x39\x92\x31\xc8\xec\x83\x3d\xb2\xfb\x92\xdd\x35\x46\x41\x18\x8c\xab\x12\x38\xb9\x8b\xeb\x0d\xa9\xd4\xc2\xae\x9a\x44\x5e\x2c\xd1\x1f\x19\x57\x7f\x0c\x80\x69\x9d\xf1\x02\x3e\x75\x26\xa8\x83\x5a\xd9\x0f\x38\xb4\x96\x70\x10\x0e\x00\x92\x56\xae\xfc\xb6\xae\xdd\x22\x6e\xf9\x59\xa5\xd1\x61\x3d\x89\xa9\xad\x6e\x52\xef\x70\x45\xd5\x6b\xa1\x6a\xf0\x34\xa5\xd9\x8a\x93\x5e\x32\x74\xca\x55\x1e\x56\xbf\x17\x9d\x3c\xab\xb5\x84\xee\x6d\xa8\x2d\xed\x1c\xf8\xb2\x02\xc3\xb6\xd9\x2e\xb1\x49\x9a\x5e\x9b\x5c\x2e\xca\x91\x47\xb6\x8a\x41\x0b\x48\xeb\xd1\x88\x7d\xe0\xc2\x5e\xc1\xd2\xc2\xc4\x4f\x70\xf4\x70\x48\x58\x8c\x70\xae\xe6\x06\x2c\xd5\xfa\x15\x16\x96\x1a\xb4\xa4\x01\x64\xe3\x91\x10\xa8\x8c\xb0\x88\x5d\xc1\x82\x47\xee\x46\x31\x62\x41\x23\x00\x44\x0f\xc5\x82\xa0\xdc\x69\x9b\xaa\x49\xa4\xd6\xaf\xda\xd6\xa2\xa9\x90\x67\xad\x8c\xe7\xf2\x73\x56\x2a\x4c\x0a\x10\xfa\x10\x9f\xc2\xa7\xf5\xd5\x39\x77\xd6\x46\xa7\xdf\x69\x7a\xae\x7b\x21\x0e\xac\x46\x61\x4c\x52\x76\x06\x5a\xd2\xf9\xc6\xf1\xda\x12\xe8\xeb\x34\x17\x10\x6d\xd9\xd4\xe6\xd7\xd1\x9c\x26\x85\xef\xe2\xfd\x81\x1f\xa6\x6e\x32\x21\x8f\x24\x31\x90\xe3\x91\x80\xc0\x6a\x63\x35\xfc\x06\xfd\x6f\x53\xdc\x12\x7d\x3b\x62\x1f\x81\x0d\x27\xc9\x02\x00\x11\x7d\xcb\x58\x55\x9a\x79\x68\x1c\x80\xb2\x99\x1c\xa8\x3c\x10\xb3\xd7\x73\xfc\x48\x46\xcc\x35\xf3\xbf\xd1\x03\xfa\x77\xf4\x6d\x9b\x7a\xe7\xe2\xa3\x9f\xd9\xce\xf1\x21\x88\x3e\x0e\x6e\x39\xcb\x28\x2d\xbf\x71\x66\x90\x92\x11\xb2\x01\x18\xc1\xe3\x1a\x53\xf6\xc8\xa3\x5a\x10\x7e\x78\x6a\xb1\x20\x4c\x8d\x19\x8f\xc9\x98\x34\xb8\x34\x97\x30\x09\x2d\x04\x5c\xf2\x98\xac\x74\x48\x7a\x66\xfa\x33\x98\x6e\x64\x3e\xf1\xdb\x01\xf9\xd9\x3e\x19\xd7\x5b\x1f\xca\x94\xd6\x3c\x72\x0f\x1e\xba\xc9\xb8\x37\x75\xa6\xba\x28\xbf\x03\xb8\x10\xec\x00\x9a\x1d\x7a\x09\x56\x2e\x85\xb5\x7a\x1c\xab\x8e\x00\xfd\xb2\x9e\xb9\xbd\xac\x02\x58\x54\x28\x5d\x21\xe8\x8c\x6a\xf9\xbd\xbb\xc3\x16\x38\xe1\x26\xde\x0c\x83\x11\xd9\xc9\x9d\x51\x2c\x85\xc3\xc9\x38\xf4\xf4\x57\x38\x21\x27\x3c\xaf\x0a\xf0\x76\x01\xa8\x0c\x93\x6b\xad\xac\xbe\xd0\x7c\x78\x66\x12\xb8\xc8\x9c\x9a\x94\xe9\xc1\xe9\x05\xd2\xa7\x83\xa7\x06\x57\x08\x16\x2d\x57\x73\x2e\xe8\x6f\xad\x09\x26\xed\x32\x7a\xe1\x69\x2d\xf2\x71\xcc\x38\xcb\xd2\x3a\x10\xab\x11\x29\x54\x49\x2b\x69\xd2\x99\xd0\x24\x07\x08\x4d\xcd\x66\xa7\x79\x62\x70\xf7\x23\x2e\x62\x53\x7d\x5b\x96\xb2\x7f\x20\x8a\xd2\x89\xf7\x58\xf9\x06\xa9\x45\x1a\xb4\xc8\xfe\xc6\x82\xb3\x54\x00\xfd\x6b\x4e\xf2\x1d\x25\x50\xbd\x6a\xc8\xe9\x1d\x9e\xc9\x22\x86\xd4\xac\x8d\xe6\xcd\xc5\xfa\xfe\x43\xcf\x54\x06\x29\x87\xce\xb2\xe8\x11\x7c\x8c\x4a\x6e\x8a\x4b\xae\x65\xd1\xb9\x31\xc8\xe5\x3b\x30\xe9\xbc\x44\x3c\x47\x5d\x46\x6a\x60\x3f\x96\xfc\x1e\x7d\x02\x5e\x95\x45\x3c\x93\x9d\xc4\x41\xc0\x57\xa4\x8f\x67\x34\x99\x6c\xc0\xe4\xea\x42\xf5\xd2\xa0\xd6\xc2\x80\xe2\xd9\x5a\x43\x2e\xac\xe2\x10\x35\xff\x24\x28\x00\x7c\x2d\x8a\x97\x7d\x1d\x55\x77\x5d\x84\x3c\x46\x4b\x29\x46\xac\x85\xb8\x0e\xb7\x84\x8b\x66\x1e\xbf\x86\x01\xc2\x36\x54\xee\xba\xee\xb7\x6f\x3b\x11\x86\x25\xed\xeb\x91\xa8\xa3\x7b\xac\x3c\x0c\xbe\x90\xc3\xeb\x18\x10\xbd\x68\xf3\x72\x27\xc3\x93\xe3\x38\xc2\xd1\xbc\x75\x52\x13\xce\x13\x82\x59\x9b\xf4\xda\xf8\xb8\x7a\x44\x0c\x36\x25\xb0\xee\x24\x01\x80\x56\xb7\x04\xb6\xa8\x5f\x21\xbe\xb3\x18\x80\xb5\x0d\x0f\x37\x48\x1c\x6e\xa0\x8a\x30\x67\xf9\xa1\x6c\x96\x90\xea\x5a\x59\x04\xf4\x03\xdb\x49\x12\xe5\x49\x50\xd5\x2f\x23\x42\x8f\x5a\x2f\xf1\x23\x61\x5a\x67\xb0\xe3\x70\xce\x8c\x27\x97\xcf\xea\x6b\xf9\x1c\xf8\xae\x9d\x3f\x0d\x92\xc6\xe2\x11\x83\x83\xcb\xcb\x87\x55\xd3\xaa\xd4\x6a\x46\x68\x97\xda\xf8\x74\x06\x42\xc4\xda\xc7\xf3\xb6\x6c\x26\x5e\xfb\x4c\x9a\xbe\xc7\x10\x63\xb0\xb5\x6b\x2d\x70\xbf\x14\x99\xf6\x66\x63\x1d\x9a\xd2\x0b\x19\x91\x21\x6a\xa3\x0c\xf2\x12\x04\x6d\xb4\xa1\xf9\x3c\xeb\x5d\x52\x54\x2f\x70\xb7\x41\xc7\xa1\x2c\x75\x55\x77\x74\x3c\x83\x75\x72\xd9\xb9\xbd\xb0\x11\xb7\x65\x97\xad\x4f\xcf\x28\xc2\x1c\x6d\x7d\x4e\x25\x30\x24\x97\x43\x4a\xf0\xcf\x46\xc3\xa6\xd2\x58\xc0\x5c\x95\x82\x34\x53\x0b\x5b\xd4\x0a\xee\xc5\x30\x25\xd3\x00\x76\x35\xb9\x87\xab\x77\x64\x5c\x72\x10\x37\x75\x06\x1d\x59\xb3\x42\x63\x93\x6e\xa1\x43\x00\x88\x4a\xc2\x7d\x5b\x34\x88\xa9\x0f\x3a\xc6\x49\xab\x2d\x6b\x07\x4c\x13\xb2\x24\x8b\x24\x7b\x8b\xdd\xa9\x44\x4e\x34\xef\xc2\x49\x52\x99\x17\x86\x6c\x56\xe5\x6b\x84\x4d\x8a\x42\xa6\xdd\x9d\xd5\x09\x9e\x90\xb5\xdc\xd3\x17\xe6\x83\xa5\x54\x04\xaf\x40\xaa\x69\x96\x25\x8b\x6e\xa8\x4d\x61\xe8\x5d\x23\xc6\xd5\xaa\x81\x85\xc8\x58\x4b\xef\xa6\x32\xba\xd4\x66\x43\x94\x24\xca\x05\x55\x8b\xb1\x35\xfa\x75\x67\x5a\xb7\xf6\xcb\x53\xfb\x61\x17\x8d\xfa\x04\xb9\xfe\x9c\x91\x11\xee\x29\x41\x4d\x01\x14\x3b\x85\x2e\xdb\xad\xb5\xe4\x46\xec\x9b\x65\x0b\xeb\xc0\x77\xba\x0d\x55\x77\xb1\xe9\xf0\x6c\x61\x85\x31\x9f\x3a\x58\x9b\xee\x0b\x5b\xad\x38\xb1\x86\xb5\xd4\xa1\xe7\x66\x82\x72\x61\x0b\x3b\x74\x09\x6a\x4b\xf1\xe7\x71\x86\x05\x4e\x12\x92\x50\x99\x6e\x6e\xdb\xfd\xd3\x77\x4b\x47\x7b\x6a\x0a\x90\x48\x5b\xce\xe7\x33\x4d\xf3\x14\xb1\x3c\x9d\x58\x29\x17\xcb\x87\x10\xbb\xd0\x65\x5a\x1b\x08\x1e\x37\xc0\x52\xbe\xb7\x08\xd0\x28\x47\x2c\xc0\x25\xb6\xa6\x0a\x1c\xcd\x29\x79\x04\xd4\x44\xc1\x88\x94\x47\xe8\x92\x2b\x72\x82\x3e\xe1\xec\x0e\x04\x35\x53\x11\x70\x66\xac\xe3\x58\x22\x2d\xb5\xe6\x8c\xaa\x83\x11\xb3\x60\xc6\x6e\x55\x8e\x23\xce\x0c\xa0\x65\x04\x0b\xeb\x9b\x00\x73\xaf\x43\x76\x54\x2e\x2f\x8d\xca\x96\xc5\x16\xf8\x69\x1c\x44\xaf\x8e\x4d\x76\xc0\x1a\x74\x7c\x83\x9f\x4c\xbc\x36\x94\xe1\x37\x5f\x2f\x91\xdc\x6d\x40\x94\x2d\x00\x63\x70\x5c\x5d\xe0\x08\xb7\x60\x02\xbe\x74\x95\x89\x4e\xfd\x9a\x1e\x91\x23\xf4\x7d\xc2\x27\xf2\x00\x49\x8f\x79\x0c\x0f\x25\x51\xf2\xc0\x38\xa8\xe0\xdf\x26\x93\xe7\xbd\x5b\xfd\x82\xef\x43\xd5\xb6\x29\xfd\x6c\x30\x0c\xe4\x9f\x4e\x8e\x8f\xd3\xc5\xe1\x24\x8f\x1e\x88\xd2\x7f\x81\x4c\xd1\xb8\x42\x0e\x00\x08\x37\xc1\x09\xad\x5a\x9d\x3a\x14\x51\x27\x8a\xb4\x20\x76\x92\x00\xec\xb5\xbe\xd2\x7d\x5d\x4c\x87\x5c\xc3\x59\x73\xd1\x3f\x3b\x65\x91\xb7\x1d\xaf\x12\x5e\xee\xcb\x68\x2b\xa6\xee\x67\x08\xd3\x3b\x4d\xf0\xac\xa2\xb2\xac\xa1\xa4\x5c\xa5\xd4\x52\x91\x9e\x3b\xc4\x5b\xe8\x53\x56\x8e\x32\xfb\xca\xb9\x23\xc1\xad\x68\xdd\x2d\x47\x23\x36\x90\xe8\x89\x98\x72\x9e\x90\x52\x06\xde\x89\x9c\xca\xb9\x4f\x28\x03\x7b\x29\x34\x6a\xd0\x4c\x4d\xd2\xbb\x55\x1c\x9d\x66\xe5\xfc\x37\x56\x03\xc5\x89\x24\x07\xba\x61\x40\xb4\x72\x81\x84\xe8\x49\xe0\x2c\x23\x62\xc4\x2c\x32\x25\xe0\x2f\x73\x6e\x83\x44\xda\xa2\xc9\x7b\x8d\x72\xbf\x34\xca\x41\x25\xb4\x1c\x2a\xdc\xa6\xa0\xf4\xc8\xa2\x90\x9f\xb3\x4f\x79\x95\xb3\x74\x35\x03\x18\x2f\x7c\x1c\x73\x22\x03\xc3\x33\xf2\xf6\xa3\x84\x4e\x89\xbe\x31\x47\x4c\x2f\x7d\x68\x24\x37\x98\xbe\x0e\xe2\x57\x77\x1a\x09\x2e\xa5\x8d\x16\x37\xed\x2c\xcf\xf9\xd9\xa2\x7c\x98\x01\x26\x36\x85\xfb\xab\x85\xc4\x82\x67\xae\xa4\x98\x7d\xd8\x5c\xcf\xbd\xad\xa9\x95\x05\xc4\x8a\xb5\x58\xa3\x84\xd8\xf1\xe9\xc5\xb9\xaf\x9b\x53\xe9\xba\x5e\x43\x2c\x04\x73\x6e\xaf\x22\x56\x9f\x71\x50\x4f\xac\xd2\xc4\x92\x8a\x62\xab\x37\xab\x1c\xa3\xba\x0d\x52\x57\x65\xeb\x57\xdd\x59\x15\x9a\x59\x15\x4a\xbd\xa3\x6d\x6a\x61\x85\x11\x08\x39\xcf\xed\x15\x06\x61\x41\xbf\x25\x15\x4e\xb3\x30\x4d\xd0\x41\x15\xda\x69\x9a\xa3\xd6\xc6\xb8\x5f\x14\x42\x39\xc2\x26\x02\xa3\x3a\xb8\xda\x56\xac\xe7\xa5\xb9\xb3\xc8\xcc\xbb\x08\xbd\x7d\xb9\xbc\xdb\x64\x51\x44\x9a\x49\x2b\x6f\xb8\xaa\xbf\x2d\xb6\xea\x09\xf1\x28\xd4\xad\x1b\xba\x6d\x62\x9d\x47\xab\x11\x04\x4b\x1b\x42\x00\xf9\x67\x95\xdc\x94\x35\x4c\x9a\x7e\xcc\x26\x83\xf5\xd0\xe3\xbe\x07\x57\x8d\x2d\x65\x14\xb9\x83\x48\x85\x20\x8f\x44\x00\xed\xd8\x38\x15\x56\x3e\xaa\x38\x11\x04\xc7\x8b\x60\x45\xbc\x93\xdc\xf4\x0c\x26\x1d\x49\x53\xad\x74\x82\x38\xcd\xf8\x21\xcf\x9c\x9c\x5d\x7a\x0b\x40\xfb\xe9\x54\xdf\x58\x81\x8b\x5d\x7f\xc1\x0e\xc9\x67\x2a\x95\xd6\x4b\x1a\xe2\x0b\x5d\x23\x70\x4b\x43\x29\x9f\x39\xb1\x37\xdc\xe8\xdd\xe0\xfb\xab\x9b\xbb\xe1\xd9\xe8\x5d\x11\x51\xee\x52\xa6\x3c\x08\x8d\xc3\x14\xe7\x6c\xc4\x7c\x10\xa8\xc7\x5c\x85\xbd\x44\x38\x8e\x0b\xc4\x6b\xab\xf8\x18\x39\x63\x29\x47\x0e\x4e\xc5\xca\xf0\xcf\x25\xcd\xdc\x43\xde\xcc\xbe\x9e\xac\x25\xee\x9e\xd2\xc9\x31\xd9\x3f\x4b\xd2\x34\x76\x74\xd9\x84\x70\x91\xca\xe8\x87\x44\x39\x3c\x33\x46\x9e\x9c\x7c\x0f\xb7\xf3\x31\x36\x97\x70\x4b\x2e\xef\x23\x8d\xd4\xb3\x8b\xd3\x65\xfb\x07\xf4\xe6\x03\xc5\xbe\xb6\x52\x68\xfc\xbe\xae\xac\x4d\x08\x82\x01\xea\x53\xe7\x8a\x3d\x68\xd6\x0e\x31\x8d\xb0\x4c\xc6\x66\x89\xf5\x21\x26\x26\x54\xae\x68\xe4\x6c\xf0\x11\xa4\x73\x41\x52\xfe\x68\x0a\x4b\x1b\x69\xd8\x0b\xd0\x60\x04\xd0\x32\x6a\x84\x15\x4e\x78\x23\xeb\xe9\x40\xb5\xdb\x07\x3e\xc3\x92\x8c\x61\xae\x94\xb3\x31\x64\x58\xaf\xe1\x9a\x38\xd5\x9f\x0f\xed\xd7\x90\x44\xdd\xd9\xf6\x6e\xba\x02\xc1\x3d\xd7\x9a\x68\x81\xa3\x6a\xb6\xc9\x8d\xc9\xdf\xb7\x47\x23\xf6\xb3\xe6\x34\x00\x40\x32\x21\x28\xe3\x59\x6e\x62\x8d\xe8\x14\xfd\x1a\xd0\xd3\xaf\xba\xf9\xd5\x71\xa8\xa5\xa3\xff\xab\xe6\xb9\x92\x74\x8c\xa0\xf8\x40\x3f\x93\xf8\xa6\x45\x7e\xdf\x49\xbe\x4f\xa7\x38\xc9\xc6\x83\x95\x33\xba\x8e\x3d\xc4\x4f\xe5\x5e\x7f\xd7\xfd\x02\xbc\x2a\xf0\xc6\x0a\xec\x50\x00\x0e\x55\x08\xa3\x88\x08\x85\x29\x43\x53\xb8\x42\x58\xb4\x40\x80\xfa\x42\xc0\xc3\xff\x1d\x4a\x29\x03\x5c\x85\x06\xce\x5c\x1e\xcf\x46\xea\xd1\xa7\xf3\xcb\xfb\xbb\x92\x52\xf4\xc3\xd5\x7d\xb9\x62\xf9\xe0\x97\xa5\x5a\x51\xa5\x85\x65\xa1\x54\xc1\x14\x8b\x1c\x4d\x0b\xa1\xea\x57\xa6\x69\xa2\x1f\x89\xfa\x49\x4b\x00\x9c\xed\xe4\x1c\x1b\x89\x1e\x5c\x9b\x64\xfc\x68\x1a\x5e\x83\x0c\xec\x50\x96\x64\xa9\x38\x9d\x01\x7a\x40\xb6\x87\x10\x32\xe1\xc8\xd4\xe6\x1e\x00\x77\x34\xec\xcf\x1c\x4f\xad\x99\x73\xa6\x97\xcb\x00\x59\x3a\xf4\xcb\xa0\x39\x3e\x35\x1f\x77\xc4\x02\x0b\x02\xd2\x75\x5b\xc5\x52\xa2\xc1\xf5\x79\xc3\x5a\x5f\x54\xbd\x3f\x5f\x56\x21\x91\xc4\x3b\xa2\x76\x5d\x43\x24\xc8\x2c\xdc\x8b\xf2\x21\x76\xa6\xdb\x55\x0e\x31\xfe\xfa\xeb\x72\x10\xc0\x3e\xe0\xa4\x36\x69\x4e\xa5\x8c\xe1\x15\x90\xa8\xeb\x25\xd1\x15\xcb\xb0\x26\x5e\x51\x38\x20\x9b\xc1\x11\x62\xf4\xd4\xc3\x83\x0f\x42\xcc\x1e\x6e\x4a\x95\xda\xb0\x80\x9d\xe1\x18\x15\xb3\xe9\x02\x64\xf4\x93\xa1\x68\x8f\x73\x01\xc8\x1d\xae\x14\x9e\x0b\xeb\xb5\x69\xe7\xe1\x74\x43\x6a\x5b\x0f\xfb\xa8\x18\x9f\xb3\x5c\x3b\x99\x34\xc3\xd6\xfc\x02\xba\xa4\xc3\xa8\x6f\x2a\x69\x76\x34\x62\x41\xac\x89\x34\xda\x9f\x3e\x23\xae\x2c\x04\xd4\x1a\x65\x00\x29\x0c\xf9\x35\xfe\x66\x2e\xed\x40\x35\xbb\x5d\xcd\xcb\x85\x1d\x6a\xfd\xd8\xd3\x29\xe7\xd8\xe5\x10\x3a\x43\x92\x0d\xe1\x0b\xcd\x6c\xd0\x5e\x00\xe5\x6e\x3b\x06\x4b\x32\xd8\x6e\x70\x50\x28\x2c\xc8\x3b\x8f\x39\x91\xec\x2b\xe5\xb3\x34\x69\x62\x8b\x51\xe0\xaa\x65\x5f\x8b\x1c\x98\xda\x96\x97\x1f\xf0\x1d\x00\x2b\xad\xab\x3f\x05\xc7\x6a\xa5\xb5\xce\xa9\x27\x40\x09\x61\x18\x11\x74\xda\x86\x82\xf4\x39\x23\xd1\x26\xe8\x2f\xd7\x58\xe0\x94\x28\x22\x96\x45\x12\x95\xcb\xf8\x82\xa4\xee\x76\xd0\xf6\x6b\x76\xd1\xd4\x38\xa8\x16\xc3\xf0\x4a\xfe\xc5\x2a\x34\x17\x3f\x8b\xb5\x80\xab\xf4\x34\x7e\xb2\x45\x1d\xd6\x9c\x85\xed\xa7\x98\x86\x0d\x94\x0a\xc0\x7b\xb6\x9d\xd3\xcb\xa0\x98\xdc\xd5\xf0\x40\x4a\x91\x3e\x7b\x02\x5f\xb2\x7a\x94\x6d\xb8\x25\xab\x78\xe9\x4e\x78\xb7\x4b\x4e\x70\xd9\xaf\x95\x43\x55\x4a\x7b\x00\x2a\x01\x79\xdf\x40\x78\x34\x63\x8f\x80\xd0\xd2\x14\xdc\x18\x78\xec\x2c\x32\x5d\x61\xd7\xb6\x92\x55\xb5\xac\x4f\x65\xb9\x56\xf0\xb8\x5d\xe1\x32\xf4\x12\xcd\xae\x25\x9a\x55\xa4\x5c\x0a\x8c\xd5\xd4\x49\x44\x05\x22\xc6\x96\xdb\xb5\xb9\xfd\xe5\x09\x42\xda\x90\xbd\x22\x6d\xcd\x4e\xb8\xfa\x29\xf3\xff\x2a\x73\x70\x47\xd4\x21\xa9\x36\xe5\x43\x1e\x05\x9e\x38\xb0\x5e\x25\xa1\x34\x60\x43\x62\x60\xb4\x26\x82\xd1\x38\x3b\xce\x2f\x8d\x1f\x0f\xf2\x92\x17\x3c\x47\x4f\x54\x6a\x5d\x78\xc4\x20\xc4\xcf\x3b\x45\x14\x47\xe6\xc5\x03\x78\x0b\x10\x0c\x64\x3e\x49\xa9\x42\x38\x98\x61\xc9\x3c\x73\x60\xcf\xb3\xfe\x00\x66\xdc\x98\x22\xdf\x84\xae\xb3\xe2\xd0\x6c\x60\x3b\x2e\x1a\xd9\x36\x0b\x3e\x08\x47\x7e\xde\x3c\xf8\x40\xe3\x09\x35\xcc\xc6\x33\xd7\x27\xc2\xa3\x66\x6b\x83\xc5\xfb\x04\x50\x56\x2a\x55\xe5\x6e\xb1\x28\x9f\x2b\x92\xe0\x8b\x8d\xe8\x94\x05\x5f\xbc\xbe\x8b\x34\xf8\xb6\x02\x51\xcb\xd2\x22\xdd\x27\x2d\x6e\x00\x97\x6e\xab\xb8\x8b\x79\x0f\x25\xa5\xeb\x56\x49\x69\xdf\x00\xc9\x8a\x58\xfe\xcd\x23\xc3\xd7\x51\x07\x8b\xd4\xaa\x90\x8a\x82\x4c\xc9\x32\x9c\x0b\xa9\x72\x7e\xc6\x15\xa4\xc3\x44\x50\x3c\xbb\x96\xa2\x39\x62\xcd\x12\xc8\x72\x9e\xb8\x6d\x76\xc5\x4e\x81\xcb\x82\xf3\xe7\x66\x61\x2d\x5a\x3f\xfb\xf8\x34\xa3\x2c\xdb\x32\xd8\x55\x11\xb3\xf0\x74\xb6\x28\x20\x20\x78\x6c\x92\x2b\xdc\x70\x2a\x3b\xe6\x3e\xac\x3c\x17\xf6\xd2\xdd\xa1\x6a\x57\xe3\xce\x9d\x53\x45\xbc\x8c\x6c\xb9\xb1\x8b\x75\x76\x6a\x7c\xc5\x61\xbd\x49\x79\x4f\xc0\x03\xdd\x19\x8a\x69\x15\x58\x40\x37\x7e\x00\x4e\x6e\x3b\x74\x6c\x02\x7e\x3c\xb6\x76\x65\x4b\x4a\x13\xb6\x65\xd3\x9f\x61\xd2\xeb\x96\x64\x0d\x9c\xae\xc2\x06\xea\xd2\xd0\x6e\x00\xb5\x58\x6d\x7c\x63\x85\x0f\x7b\xd1\x2e\x67\x31\x11\x8c\x60\x35\x7f\xb9\xf4\x88\xd3\x6d\x8d\xd3\x2f\x96\x2a\x71\xba\x93\x7a\xdc\x95\xf4\x83\x35\x33\x0f\xd6\x70\x63\x17\xd5\x59\x6b\x8a\x63\x83\xd1\x30\x40\x8f\x59\x87\x4a\xb7\xca\xa0\x68\x56\xe6\x9e\x27\x97\xa4\xc1\xea\x53\xcb\x22\xd1\x87\x3d\xac\x69\xbb\x62\x49\xbe\x88\xa4\x8d\xe7\xcf\x23\x58\x56\x3d\x37\x0f\x52\x0b\xa0\x84\xb1\xc2\x94\x59\xee\xb5\x2c\x9b\x40\x4b\x94\x29\x6e\x4a\x20\xd8\xfb\xd4\x94\x2f\x3e\x33\xa5\xcf\x53\xe8\xf3\x14\x1a\xf6\xa8\xcf\x53\x68\x57\xf4\x96\x99\x19\xbd\xe7\x0b\xaa\x09\x96\x6a\xc0\x98\x75\x5c\xa1\xad\x6d\x9e\x3f\xe0\x2c\x75\x61\x48\x8c\xfd\xc5\xfe\xd0\x18\x15\x53\xfb\xac\x3a\xdb\xd0\x6a\xc8\x16\x55\xe3\x3b\x16\x71\x62\x81\xda\x6c\x74\x74\xd9\xca\xb3\xcc\x20\x39\x62\x3f\xf0\x27\xf2\x48\xc4\x01\xc2\x0a\xa5\x5c\x2b\xe9\x41\x14\x0a\x10\x5c\x09\xf3\xdb\x44\x1b\x60\x74\x89\x53\x12\x9b\x8a\x6e\x41\x0c\xa5\x35\x8b\x5a\x87\x66\x13\x1e\x29\x40\x6b\x9a\x6d\x70\xd1\x09\x23\x66\xe2\x1a\x4d\x84\x13\xdc\xc9\xd4\x4d\x0c\xe8\xfa\x8f\xde\xdd\xfa\xc7\x23\x74\xa7\xef\x01\x2a\xcb\xe3\x0d\xe0\xc9\xda\xc6\x36\x62\x33\xc1\xf3\xcc\x5b\xaa\xf8\xc4\x94\xf6\x34\xd0\xe6\x75\x77\x2b\x0c\xc6\xf9\x5a\x23\x1c\x6b\x8d\x77\x39\xe1\xbc\x4a\xc8\xeb\x46\x18\x3f\x21\x01\x69\x2e\xe1\xa3\xab\x6c\x5c\xbd\xf1\x92\x06\xc8\x26\xcb\x90\xca\x9f\xc9\x85\x7b\x46\x24\xd8\x5e\xbc\x6d\xbb\x94\x68\x5d\x4e\xe6\x6f\x1c\xe7\x32\xcb\xa3\xf7\x0e\x38\x0b\x7a\x33\x4e\x40\xd1\xb9\x8d\xac\x32\x59\x9c\x96\x1f\x3f\x9b\x4d\x72\xfd\x28\xd4\xca\xda\x5d\xe7\x22\xe3\x20\xf1\x24\x0b\x87\x6b\x60\xa1\xd0\x82\xe0\xce\x30\x98\xa8\x91\xb2\xa9\x54\x9f\xb0\x8a\xe6\x9a\xbf\x17\x90\x60\x3b\x8a\xaa\x2b\xb8\xf2\xf3\xda\x29\x1b\x66\x70\x1a\xf6\xde\x62\xb8\xef\x60\xb7\x36\xf7\xab\x8b\xe5\x77\x37\x76\xaa\xfb\x33\xce\x2d\x5b\xb0\x37\xb0\x3e\xba\x4f\xec\x13\x3d\xd1\x55\x54\xb4\x6a\xfc\xdd\x68\xab\x5c\x92\x6a\xe7\xf1\x7a\x5b\x60\xac\x9c\x59\x44\xab\xe2\x45\x5b\x81\xb2\xc5\xc9\xbe\x61\x49\x79\xeb\x3d\xd1\xf2\x8c\x2a\xec\x9a\x29\xce\xb4\xb0\xae\xb8\xbe\x25\xc5\xcc\xc8\x8b\xa6\xd2\x29\xc2\x28\x17\xd4\x9d\xfd\x4a\xd2\x74\x3b\x75\x80\x1d\xf0\x38\x2c\x39\x14\xe1\xa0\x1a\x9b\x71\xab\xe3\x48\xe5\xd8\x87\xff\x01\x4d\xb8\x22\xcf\x26\x41\xdc\xb9\xaf\x85\x13\xa3\x1a\xf6\x74\x25\x61\x6f\xb1\xcb\xb8\x09\x00\xb0\xd3\x49\xa3\x6c\x16\xa0\x07\x36\xdb\x62\xbb\x14\x07\x68\xfc\xb2\x5b\x81\x83\xc6\x4f\x9d\xec\xb3\xc9\xb7\x4b\xd0\x8d\x5a\x3f\x5f\x25\xc0\x96\x42\x9d\x6d\xb8\xa9\x95\x9e\x42\x5c\x47\x6b\x27\x03\x78\x56\x0a\xee\x70\x6c\xa5\xa9\xff\xf2\x7f\x99\x62\x52\x66\x69\xfe\x0b\x71\x31\x62\xe6\xf7\x03\x5f\xc8\x41\xbf\x50\x20\xa4\xe2\x94\x14\x18\x92\xa2\x8c\x36\x07\x98\x1b\x16\x2d\xcc\xa0\xe1\x7a\x1c\x7b\x3d\x86\x87\x7c\x42\x04\x23\x7a\x68\x2e\x3b\xdf\x33\xb3\x14\x33\x3c\x03\xec\xdd\x03\x88\x3f\x03\x71\xb5\x10\xf9\x0d\x49\x9b\x82\x80\xc0\xad\x34\xb3\xb4\xc9\xbd\x45\x5d\x53\xe8\xd3\x88\xb2\x16\xfa\xb3\x08\x62\x68\xa6\xfe\x1b\xdb\xff\x66\x12\xfb\xdd\xe0\xf6\xc7\xf1\xcd\xf0\xf6\xea\xfe\xe6\xb4\x24\xb6\x9f\x5e\xdc\xdf\xde\x0d\x6f\x1a\x9f\x15\x89\xb1\x7f\xbd\x1f\xde\xb7\x3c\x72\x0d\x5c\x0c\xbe\x1f\x96\x8a\x04\xff\xf5\x7e\x70\x71\x7e\xf7\xcb\xf8\xea\xc3\xf8\x76\x78\xf3\xd3\xf9\xe9\x70\x7c\x7b\x3d\x3c\x3d\xff\x70\x7e\x3a\xd0\x5f\x86\xef\x5e\x5f\xdc\x7f\x3c\xbf\x1c\xbb\xe0\xde\xf0\xd1\xcf\x57\x37\x3f\x7e\xb8\xb8\xfa\x79\x1c\x74\x79\x75\xf9\xe1\xfc\x63\xd3\x2c\x06\xb7\xb7\xe7\x1f\x2f\x3f\x0d\x2f\x97\x17\x23\x6e\x5e\x8d\xd6\x3a\xa7\xc1\x45\x16\x18\x67\x02\x31\x69\xb2\xb0\xa4\x4d\x7f\x03\x17\xc1\xb5\xa1\xc7\xc3\x03\xf7\x97\x29\x1d\x7c\xa8\x59\xa0\xf3\x3e\x15\xdc\x63\xc4\xbc\x7b\xd0\x5f\xaa\x50\x3a\xde\xe6\x39\x97\x46\x7b\x82\x06\x70\x56\x40\x61\x28\x75\x0a\xe8\x26\x7e\xa4\xce\xa1\x0c\x74\x98\xd0\x94\x82\x6f\x19\x1d\xa2\xea\x86\x97\x1b\xb4\x73\x82\x21\x58\xef\x58\xbc\xec\x34\xc8\x6a\x0a\x35\x50\xca\x09\x72\x1c\x9a\x18\xb5\xdd\x80\xb3\x2e\x18\x4e\x69\x64\x7e\xa8\xe0\x93\xa2\x02\x8b\xa3\xda\x62\x89\xc0\xca\x2d\xcf\x09\xfa\xf1\x2f\xc5\xa0\xc0\x53\x60\x0d\x04\x79\xad\xe4\x9c\x7d\x20\x72\xb3\xaa\xab\xc8\xb3\xd4\x93\x3b\xe6\xd6\x84\x0b\xe7\xd6\x56\x26\x06\xb7\x4e\xce\x02\x3c\xae\x92\x8f\x47\x1f\x6f\x33\xa3\x0a\x8d\x9f\xa0\x5b\xc0\x02\x91\x85\xea\xae\x77\x31\x4b\xf2\x19\x65\x88\xa6\x59\x42\x8a\x9a\xd6\x13\x32\xc7\x8f\x94\xbb\xfa\x0e\xa6\x0c\x06\xac\xa3\x15\xad\xd0\x21\x6a\x3d\x28\x27\x68\x10\xc7\xb2\xcc\xe0\x4a\x94\xe3\x58\xe6\x61\x79\xd8\x21\x84\x16\x8b\x3d\xdb\xac\xd0\x51\x71\xe4\x60\xc5\x76\x8f\x76\x52\x67\x87\xe5\xbb\x77\x2b\xe4\x5e\xf9\x30\x76\xa4\x3c\xde\x48\x18\xb8\xc3\xf2\xc1\xb1\xe6\x55\x02\x81\xc3\x9d\xd9\xae\x47\x0b\x40\xd3\xb5\x53\xbf\xb2\x63\x38\x68\x9b\xf5\xd9\x0a\x9b\xbc\xa2\x4b\x37\xe3\xa4\x52\xdb\xaa\x73\x7f\xa5\xda\x58\x8d\x9d\xed\xd4\xab\xd2\x2c\x8d\xc1\x91\x1c\x7b\xfa\x5f\x63\x1e\xd7\xf0\xe9\x95\xff\x72\xa9\xc8\x36\x0e\xd6\x6d\x5d\x5f\x4b\x2d\x23\xd8\xfa\x5b\x96\xd2\xe1\x8e\xf0\x8f\xba\x0b\x83\x50\x99\x80\x46\xe0\x56\xc3\x94\xd9\x7a\x35\xc4\xfb\x7d\x5c\x85\x66\x7d\x8e\x7d\x0d\x35\x3c\x81\x1c\xd8\x42\x58\x4c\x89\x94\xb8\x05\x1d\x25\x30\x89\x6d\xc3\x18\xfc\x09\xb5\x1f\x76\xa4\x27\x77\x26\xef\xf4\x57\xcb\x8c\x3e\x37\xa1\x66\xec\x26\xaa\x05\xd6\xd8\xc5\xb3\xa2\x2b\x93\xd5\xa6\xf9\xcb\x41\x11\xb2\xc2\x45\x10\xc9\xd3\xe6\x66\xe9\x68\x56\xab\x2e\x58\x63\x19\xa2\xd0\x55\xb6\x7e\xa4\x4b\xd0\xfa\xc6\x90\xd1\xd6\x7f\x81\xcb\xeb\xb3\x06\xd5\x95\xfc\x8a\x61\x89\xe6\x88\xa7\xa9\x91\x0b\x4a\xb6\xd4\x03\x84\x4d\x32\x61\x21\x4d\xc9\x3c\x9a\x1b\x6f\x8e\xbe\x32\x0e\x46\xec\x29\xd8\x90\x52\xb8\xed\x20\x6c\x09\xe0\x36\x3f\xeb\xe3\x46\x1f\x4b\x41\xcc\x20\x32\x52\x88\xa8\x0d\x08\xc1\x38\xde\x8a\xfa\x4a\x2b\x08\x3c\xd8\xaf\x2d\x48\x7d\x83\x62\x7a\x95\xf5\x6d\x2b\xa9\xe7\xe7\x16\x54\xb2\xdb\x42\x53\xee\x3a\x84\xa0\x98\x5e\xd3\x08\x76\x50\x4b\xef\x45\xf1\xaf\x7d\x52\xa4\xc9\xa1\x4d\x27\x16\x10\x43\x4f\xd7\xad\xf6\xbf\xbb\x19\xfd\xbb\xf1\x3b\xe4\x2d\x08\x2a\x41\x6b\x1e\x02\x1b\x1d\x6a\x99\xd5\xe5\x5b\xdb\x80\x07\x89\x0e\x0d\xac\xde\x57\x10\xcf\x38\xb8\x3e\xff\xea\x00\x7d\x15\xe6\x74\x7d\xb5\xd1\x01\xb4\xe3\xb6\xf5\xf4\x40\x9b\x2a\x05\xf6\x97\x8f\x1d\xec\x55\xe5\x24\xda\x3d\xb3\x07\x11\xb5\x9d\x43\xfd\x65\xe9\x1b\x70\x02\x43\x7d\x38\xe3\x27\xf5\x61\xc5\xd6\x05\x64\x64\x5c\x2a\x1b\xd6\x2e\x1e\xb1\xc9\xa2\xea\xe4\x39\xf0\x5e\x9e\xce\xa7\x74\xeb\x9a\x67\xba\xbd\x7a\x12\xf0\x8e\xc3\x5d\x97\xdf\x07\x2b\xd2\x8a\x07\x26\xb2\x99\x4f\x03\x2e\xd6\x16\x0d\xd0\xc7\x89\x37\xcd\xaa\x64\x2f\x73\x8b\xd9\xb8\x29\xab\xe4\x9f\xb7\x46\x6e\x1d\x82\xab\x07\x4d\x2b\x62\xe3\xea\x5b\x84\xeb\x9e\xca\x9e\x97\xca\x76\x91\x57\x50\x1e\xdc\xfa\x17\xe8\xa9\x91\xe3\x82\x66\x9c\xc1\x55\x2b\x13\x9e\xc1\x97\x0a\xe3\xad\xae\x28\xbb\xa6\xcf\x37\x58\x93\xd5\x4e\xdf\x5b\x13\x38\x60\xdc\xae\xf5\xb1\x56\x87\x3a\x50\xb6\x4a\x0f\xa7\x26\x87\x50\xd1\x94\x1c\x18\x20\x9b\x22\xd8\xc1\x9e\x57\x20\x37\x13\x0b\x34\x27\x54\xb8\x4e\x2c\xa0\xe1\x5a\x49\xe7\x6b\x4a\xe3\x6d\x34\xb2\x45\xa4\xc9\xe5\xe0\xd3\xf0\x6c\x3c\xbc\xbc\x3b\xbf\xfb\xa5\x01\xac\xb2\xfc\xd8\xe1\x55\x06\x2f\xdc\xfe\x72\x7b\x37\xfc\x34\xfe\x38\xbc\x1c\xde\x0c\xee\x56\x60\x59\x2e\xeb\xac\x0d\x27\x31\x97\x4d\xea\xdb\x3a\x58\x89\xce\xcc\xdb\xd0\x7b\x1d\xd1\x32\xe8\x84\x92\x16\x54\x4b\x93\x60\xcf\x62\x22\x50\x4c\x1e\x49\xc2\xb3\xc2\xac\xda\xb8\x60\x01\xdc\x65\x43\xfb\xcb\x20\x2f\xa1\xcd\xea\x1a\x9f\x20\x53\x0c\x2d\xa8\x07\xeb\x1b\x04\x91\x0f\x0b\xc2\xbe\x52\x88\x7c\xce\x12\x1a\x51\x15\x24\xe0\x71\x61\xdd\x2b\xc6\x7d\x08\x51\xa0\x2b\x88\x6b\x67\xd1\x28\x3b\xd7\xf9\x43\x4f\x7a\x5d\xdb\xf7\x27\xca\xc3\xaf\xad\xac\xb0\xb3\x03\xc5\xbe\xc5\x69\x5c\x43\x87\xdb\x60\x74\xcf\x61\x1e\xa8\x67\xc2\xd8\x24\xba\x16\xe4\xb8\xe6\x41\xae\xbe\x0d\x97\xc5\xc9\x94\xce\xf5\xf2\x40\x99\x6e\x94\xfa\xca\xe1\x2e\xa5\xca\x93\x3b\xc0\xb7\xb0\x31\xe2\x6b\x06\x2c\xd4\x40\xdd\x98\x89\xed\xc4\x00\x7a\xa7\xb4\x02\x66\x22\x02\x0e\xb4\x50\x45\x71\x42\x7f\x03\x24\x28\x41\x8e\x82\x08\x0a\x48\xb4\x8b\xc3\x88\x4b\x8b\xd2\x70\x34\x62\x67\xc3\xeb\x9b\xe1\xa9\x66\x48\x47\xe8\x5e\x02\xc8\x53\x69\xea\x67\x96\xbc\x8d\x38\x16\x46\x32\x50\x26\x15\xc1\x6d\xc1\x60\x80\x3b\xd7\x9d\x3f\xf8\xfe\x00\xdd\xae\x85\xbc\xe1\x59\xc9\x36\xe5\x0c\x00\x97\xad\x65\x83\x83\xd8\xfc\x9d\xa7\x3e\xdd\xe0\xa7\xd2\x8a\x84\x20\x17\x20\x89\x94\x57\xfd\x19\x57\x1b\xd0\x42\xbb\xcf\xaf\xd4\xe7\x35\x7c\xbb\x6c\x9e\x77\x10\x62\x27\x55\x01\x3d\x6a\xd0\x49\x7d\x59\x98\xca\x3c\x5b\x45\x45\xf1\x1a\x80\x18\x15\xd2\x9f\x90\x19\x66\x48\xe4\x8c\x55\xb0\x68\x43\x4b\x5b\x3d\x68\x66\xdd\xa3\xaa\xd7\x0c\xa7\x3c\x67\xa0\x34\x40\x18\x6b\xc3\x60\x64\x46\x98\x5a\x31\x98\xd7\x82\x3b\xa9\x0c\x75\x7f\x11\x4f\x1a\x06\xda\x06\x7a\xd2\xe4\x4f\x82\xda\xc4\xeb\x5d\xcb\x2e\x28\xaf\xe4\x54\xd2\x87\xca\xdf\xcf\xcd\x5a\x36\x96\x0f\x5b\x77\x77\x87\xe5\xc3\xea\xae\x62\x12\x3d\xac\x7b\xd9\x54\x33\x20\x13\x5b\xda\xb9\x66\xec\x5b\xe8\xa7\xb6\x76\x09\x54\xf4\x8e\x1e\xd0\x0f\x77\x9f\x2e\xd0\x94\x6a\xb9\x57\x5f\x2b\x97\x58\xcb\xd8\xf7\x22\x71\x76\x61\x6b\x5b\xcd\x45\xe2\xef\x5e\xd8\x78\x27\x4a\x05\x52\x82\xbe\xd1\xf0\x8c\x38\x63\xaf\xb0\x98\x76\x95\xda\x25\x02\xb3\x98\xa7\x66\x1e\xc7\x32\x9f\x4e\xe9\xe7\x23\x85\xc5\xfb\x35\x24\x9a\xd3\x92\x83\xad\x42\x46\x36\x7c\xd2\x42\x2c\x82\x55\x61\xa5\x9c\x30\x7c\x24\x4c\xed\x44\xc8\x86\x26\x1a\x32\xbc\xbb\x99\xca\x4d\x21\xc7\xf3\xb3\x82\x43\xbb\xb8\xd4\x30\x34\x47\x09\x0c\x97\x95\xcd\xaa\xb1\x7e\xe1\x36\x6f\xf5\x63\x67\x07\x28\xbc\x5a\x5f\x97\x15\xf1\xdd\x76\xb5\x8b\x82\xce\x45\x6c\xa6\x03\xc3\xdf\x10\xf3\x45\x12\xa3\x8a\x07\x58\x03\x56\xc3\xaa\xee\xb9\xe9\x73\x8e\x65\xb5\xcb\x95\x5b\xbe\x01\xc0\x49\xa9\x99\x8f\x04\xf2\xff\x76\x11\x4d\xbd\x4e\x9e\x37\x0c\xe4\x5e\x24\x10\x07\xbc\xd4\x14\x63\x8a\x49\xeb\xe3\xeb\xc5\x13\xdc\x41\xd0\x34\x83\xd1\x92\x0f\xc9\x04\x89\x34\x3f\x3e\x41\xd7\x09\xd1\xe2\x43\xae\x45\x88\x3c\x49\x1c\x18\xd4\x72\x11\x67\x2d\x00\xb3\x67\x9f\x57\x20\x40\x2f\x99\x98\x03\x43\x5b\x3e\xb3\x60\x0d\x76\x9f\x9d\x1f\xac\xef\x53\x2b\xac\xb3\x9a\x93\x85\x09\xfe\x04\x7b\x08\x2e\x71\x63\xfa\x9b\x66\xf3\x82\xc8\x39\x6f\xcd\x88\x0b\x67\xfb\x3c\x73\x70\x4b\xf9\x8c\x93\xb0\x91\x77\xe3\xb6\xe0\xe0\x0e\x97\xf3\x99\x69\xa2\x51\x24\x58\x36\x45\x5f\x2f\xc1\x87\x30\x58\x68\x4e\x1b\xca\x66\x87\x06\x8e\xb9\xc2\x5e\x14\xc2\x64\x15\xf6\xf7\x42\x22\x5f\x18\x07\xa2\xff\xbc\xb0\x82\x16\x71\xed\x54\xc9\xa2\xb6\x18\xd2\x77\xfa\x7a\x5c\xd6\x66\x3f\x14\x4d\xe8\x01\x37\xb3\x36\x5b\x2a\x01\xe4\x36\x1b\xdb\x22\x4b\x00\x5f\x76\x8b\xcd\x94\x1b\x75\x8a\x76\x06\xba\xad\x1f\x07\xc4\xb2\x22\xe1\xeb\xb9\xdc\x39\x25\x6a\x29\x4d\xa0\x87\x8c\x5a\x1f\x32\xca\xd6\xcd\xf0\xb4\x07\x00\x6f\x4a\x40\x46\x77\xe1\xb1\xa9\x5e\xf2\xd6\xca\xba\x2a\xd5\xa6\xb4\x3b\x9d\xf2\x6a\x4a\x5f\xe8\x73\x7f\xb6\xa5\xcb\x47\x4f\x66\x31\x86\x4c\xc5\x6d\xc2\x3e\x4a\xf3\x37\xe6\x6a\x68\x93\xc4\xc8\xa4\xa5\x1b\x40\x5b\xbb\x76\xde\x54\x9f\x61\x41\x98\x1a\xb1\x1b\x3d\x0a\xf3\x45\xe1\xfa\x77\x81\x1f\x0e\x64\x1c\xaa\x88\x4e\x11\xb6\x5f\xc1\xa2\xb7\x45\x5e\xc9\xb1\x79\x09\x74\xa1\x67\xcc\x9e\xfe\xde\xbc\x63\x92\xd9\x2d\x98\x8b\x9e\x2a\x9d\x16\x7a\xa3\x16\xf6\xa2\x39\x85\x5c\xf2\x98\x48\x7b\x79\x50\x65\xc1\x02\xbc\xa8\x9c\x13\x07\xab\x0b\x9f\x79\xfe\xd5\xc4\x5c\x9d\x66\xca\x9c\x45\x48\x8e\x58\xd0\xc7\x12\x14\x46\xa3\x1d\x6e\x28\xf6\xc3\x3e\xd3\xd8\x7b\x5a\xe0\x9f\x66\x87\xb8\xa0\x33\xca\x82\x92\x40\x76\x7a\x29\xce\xc0\x9e\x68\xce\x20\x9f\xfa\xfb\xe7\xce\x86\xb5\x1f\xc1\x88\xff\xef\x7f\xff\xed\x88\xb6\x99\xdb\xe5\xd8\xae\xc0\x3e\xec\xe4\x7a\xdb\x12\xee\x7c\x00\x0f\xd1\x02\x3b\x20\xf3\x89\xc7\x6e\x2e\x85\xea\x17\xbf\xda\xcb\x4d\x13\x0d\x57\x73\xe3\x5f\x2c\x93\x3b\x18\xe3\x45\xbe\xfc\x96\x0d\x58\x5c\xe1\x81\x2e\xdc\x8c\x41\x94\xa7\x03\xff\x37\xd1\x79\xba\xfd\xca\x85\x52\x61\x50\x01\x4a\xdb\x36\xd1\x70\x73\x2c\x9f\x2f\xe4\xa1\xb1\x76\x8f\xb1\x52\x86\x77\xe4\xaa\xe0\x07\x33\x48\x93\x45\xa7\x77\x25\x97\x44\x98\x03\xed\xe1\x7c\x50\xbd\xbc\x37\xc4\xbe\xad\xf0\xe1\x90\x14\xd3\xb5\xe2\xb4\xf5\xfb\xcd\x08\x79\x25\x23\x2e\x9e\x11\x31\x8e\xf3\x52\x50\xee\xaa\xb6\xaf\xf5\x47\x67\xb9\x5a\xac\x6e\x5f\x26\x38\x7a\x58\x07\x95\x50\xbf\xdf\xd2\xec\x6a\xc1\x30\x08\x9d\x28\x0b\x87\x2d\x98\x7f\xa4\x82\xf9\x67\x63\xf9\x4a\x5a\x3b\x5c\x34\x0c\xea\xb3\x07\xc2\xbd\xbd\x89\x0c\x32\xb1\xa9\x1a\x34\xc9\x0b\x2b\x87\xc7\x7a\x8f\x8f\x46\xec\x83\x29\x96\x00\x8a\x87\x19\x40\x04\x89\x14\xe4\x73\xc6\x25\x29\x65\xf6\x34\xe0\xb7\xdb\xcc\x3c\x3b\x8c\x66\x99\xb4\x52\x1f\x7f\x2b\x91\xf4\xd5\xd1\x1b\xeb\x1b\x5e\x9f\x72\x33\x05\x6e\x25\xf5\x44\x34\xa3\x9a\x76\xc6\x8d\x27\x6d\xfd\xa9\x77\x2d\xff\x51\xc4\xca\x00\x8e\x8f\x4a\x16\x07\xc8\x4f\xaf\x42\x10\x09\x79\x24\x60\xa6\x84\x31\x86\x28\xfd\x65\x53\x53\x0b\x3b\x59\x75\x80\x8a\xb4\x3a\x60\x0b\x28\xae\x8e\xa0\x9c\x7c\xd4\x44\x8b\xe5\xb4\x8a\xad\x33\x80\x9a\x1c\xfe\x6b\x48\xa1\x83\xb0\x5a\xc1\x82\x28\x44\x3e\x2b\x62\xcb\x3a\xde\xb9\x1c\xad\x7a\x58\x37\x6a\x4e\x33\x69\x17\x91\x76\x4f\x15\xb5\x89\xd8\xcc\x5c\x97\x84\x16\xbb\x7b\xdf\x26\x65\xcd\x31\x8b\x6d\xa6\xa1\xf4\x65\xd0\xcc\xec\x8c\x1d\xc8\xc7\x60\xdb\x7c\xb9\x00\xe6\xd9\xb4\x69\xf0\xa8\xe1\x22\x73\x7a\x91\x96\xcc\xc1\x6d\xcd\x85\x16\x50\x73\xa6\x68\xa2\x89\xc3\x8e\x41\x6b\xcd\x39\xf3\x40\x6b\x10\x31\xdc\x86\xe5\x45\xa5\xa4\x6c\x36\xb6\x2b\xe9\x92\xe6\xba\x5d\x0c\x65\x9a\xfa\x64\x9a\x32\x3f\x7e\xef\x1a\x5a\x6e\xe7\x35\x64\x0d\x38\x4b\x2e\x5d\x0f\x04\x6b\xc6\xdd\x64\x2c\x40\x96\xcb\xf2\x1b\xd3\xd8\x2c\x05\x35\xd5\x83\x61\xa2\xeb\x18\x29\x40\xac\xab\xe7\xc7\x17\x57\x88\xb4\x29\x78\x26\xb1\x06\x22\xa0\x55\x4b\x8e\xa1\x6c\xcd\x2d\x3c\x67\x5e\x44\xb3\x45\x7b\x7c\x06\x75\x25\x4d\x11\xbb\xee\x6c\x98\x37\x4e\x92\x09\x8e\x1e\xbc\xb2\xe1\x55\x6e\x2e\x1c\xe8\xb9\x16\x50\xa1\xaa\x93\x21\x2e\x53\xbe\x4d\x4b\x37\xa1\x17\xc6\x20\xa4\xd8\x61\x17\x9d\x9b\x55\xb3\x10\x4f\x06\x12\xc7\x8c\xde\xc4\x8c\xc7\x24\x4b\xf8\x22\x6d\xb9\xcf\xaa\xa9\x59\xdb\x44\x40\xb4\x65\x86\xed\xf4\x2a\xab\x30\xbd\xb5\x2f\xb3\x5a\x9e\xc7\x0e\xf0\x7a\xd6\xe0\x92\x1f\x13\x3e\x01\x2b\x9f\xd5\xb2\x5d\xee\x42\x10\x42\x5f\x3d\xcf\xeb\x66\x54\x54\x4f\x24\x95\x59\x82\x17\xcb\x7a\x30\xb1\xfc\xcf\xbb\x6f\x26\xf7\x7b\xb5\x11\xac\x7b\x14\x6c\xe3\xe7\xcf\x81\xc0\x7a\xe1\x24\x01\xf3\xae\xe1\x5f\x15\x63\x92\x49\xa2\x3a\xca\x04\xd7\x82\x02\x1f\x31\x85\x67\x6e\x73\xad\x70\xc9\x9f\x18\x11\x72\x4e\xb3\x52\xb5\xb7\xad\xc3\x6e\x2d\x45\xdb\xff\x98\x20\xd3\x35\x78\x27\xcf\x0e\x0d\xf2\x83\xa6\x0f\x99\xe1\xa8\x30\xfe\x45\x09\x96\x92\x4e\x17\x01\x60\x83\x8f\x60\x84\xb4\x98\xb2\xb6\x1c\x14\x58\x6a\x62\x34\x66\x7c\xbb\xc9\x58\xde\x3e\x5b\xeb\xbe\x7c\xfc\x68\x1c\x22\x63\xcd\x4d\x11\xcb\x0a\x3a\x87\xbb\xa9\x2d\x4a\x47\x2b\x92\xa6\x49\xcd\xde\x2c\xc3\x78\x29\xa8\x4a\xbb\x19\xa1\x10\x26\xed\xb0\xad\x22\xe3\x81\x14\x42\x90\x11\x55\x4a\x51\x83\xcd\xd7\x8a\x93\x33\x7f\x6a\xe2\xf4\x20\x0c\x90\xab\x5e\x7c\x7c\x80\xe4\x56\xe0\x45\x5d\xe8\xe2\x8c\x24\x64\x27\x91\xac\x1b\x10\x49\xd5\xc3\x1e\x90\xc7\x52\xd2\x28\x40\xd2\x57\x1b\x17\x36\x08\xb0\x6d\x81\x40\x69\x1e\xfa\xcf\x66\xa0\x36\xc6\xb6\x69\x17\xc1\xfe\x05\xab\xdc\x55\x77\x69\xc2\x52\x33\x2d\x58\x92\x2b\xba\x29\xd1\x55\xd1\xa9\x97\x57\xf6\x91\xd4\x5e\x39\x14\xb5\x36\xae\x8f\xa4\x4b\xc4\xc1\xca\x03\xb0\x11\x07\xaa\xf3\xe9\x6e\x74\x61\xfd\x84\x8a\xa3\x19\x51\xa6\x84\xbb\xaf\x53\xff\x96\x68\x62\x67\x81\xf4\x3b\x5a\xfd\xe6\x43\xbe\xde\xa9\xbd\x25\x4a\xba\x2b\xa1\x06\x4f\x67\x37\x67\x0f\xb7\x60\x3f\x8e\xa5\x11\x5c\xbf\x78\xb9\x65\xeb\xe4\x73\x3b\x32\x9b\x82\xfd\x3b\x12\xa8\xcc\x1c\x63\xfb\x85\x4f\xb7\x2e\x01\x0d\xe1\x12\x38\x9b\x59\xa3\xd7\xe7\x7a\x55\xd2\xfe\xd2\x45\xaf\xf5\x69\xbc\x3a\xaa\x82\xba\x7b\x79\x70\x3d\x79\xd0\x81\x17\xee\xe1\xe5\xdf\x76\x0c\xf6\xf3\xfe\xd9\x03\xe1\xb0\x76\x25\xee\x4e\x44\x7c\x43\x64\xb2\x17\x92\x62\x6d\x2b\x5e\x4a\x5e\x3c\x74\xe8\x31\x05\x16\xcb\xfe\x6e\xd1\x7e\x9c\xe4\x1b\xeb\x06\x7a\xbe\x0b\x76\x35\xbd\xec\x84\x3e\x00\x48\x11\x43\xbe\x69\x6e\x2b\x33\xc0\xe1\x0d\x42\xc6\x6a\xbe\x87\x15\xc1\x78\x76\x78\x9d\xc2\xf0\x6a\xcb\xf9\x1c\xdb\x6b\x93\x8b\x3a\x6f\xee\x73\x92\xda\xba\x63\xd9\x85\x8e\xf2\xcc\x5e\x1c\x4b\x8d\xc1\x07\x7d\x4c\x6c\xb7\x5b\xb4\x01\xb2\xc4\x6d\xd9\x2e\x0f\x59\x53\xd9\xaa\xed\xd3\xa3\x5d\xca\xd9\x38\x13\x64\x4a\x3f\x6f\x24\x8a\x5f\xc3\xa7\x56\xbd\xd4\xcb\x5c\x29\x84\x05\xee\x19\x28\x9c\x15\xc4\xed\xd9\x95\xb6\xc5\x72\x46\xac\xc8\x38\xb3\xe9\x66\x0f\x64\x81\xb8\x28\xfd\xb4\x29\xb8\xde\xee\x8b\x76\x99\x7d\x9d\x2b\x95\xc9\x93\xe3\xe3\x19\x55\xf3\x7c\x72\x14\xf1\xd4\x84\x9b\x73\x31\x33\x7f\x1c\x53\x29\x73\x22\x8f\xbf\xfb\xf6\xdb\x62\x8b\x27\x38\x7a\x98\x19\xb8\x92\xba\xdf\xa9\xb4\xe5\xb7\xf5\xc2\xb6\xeb\x97\x7a\x10\x9c\x8d\xc9\x67\x4d\xa4\x72\x53\x20\x9b\x7b\x49\x24\x1a\xfc\x7c\x8b\xe4\x82\x29\xfc\xf9\x04\x7d\xa2\x0c\x04\x90\x1f\x78\x2e\x24\x3a\xc3\x8b\x43\x3e\x3d\x4c\x39\x53\x73\xf4\x09\xfe\xd7\xfe\xf4\x44\xc8\x03\xfa\x85\x60\x61\xf7\xd7\x96\x44\xf2\xd5\x75\xe7\x18\x72\x71\x25\x22\x8f\x7a\x85\xbf\xfd\x4f\x94\x9a\x96\x4f\xd0\x37\xc7\xdf\xfe\x27\xfa\x23\xfc\xff\xff\x1f\xfd\xb1\x45\x53\x5b\x0f\x0a\x07\x0a\x67\xde\x94\xdd\x71\x07\x95\x95\xda\xa0\x96\xf0\xa9\xe0\xc5\x4e\x35\xb6\xfc\x40\xa3\x07\x3e\x9d\x8e\x15\x4d\x89\xc9\x0d\x1a\x63\x51\x83\x51\xdd\x10\x57\x90\xda\xca\xa7\x82\x1a\xb8\x6d\x57\x5b\xc1\x76\x6a\x32\xa1\xdd\x71\x93\x79\x51\xf9\x11\x82\x40\x4a\xd5\x34\xa9\x84\xaf\x48\xac\x4f\xc5\x3a\x01\x1f\xce\x3a\x53\xaf\xcf\x5e\x20\x07\x84\xd5\x7c\x7d\xe0\x56\x18\x85\x68\x02\x35\xec\x42\x36\x1e\x87\x5a\x78\xe4\x17\x13\xf3\x06\x53\x7b\xad\x78\x37\x59\xeb\x7c\x75\xa8\xdb\x2d\x17\x5b\xc9\xcb\x0f\xa4\x16\x73\xdb\xb1\x8e\x88\xab\x21\x19\xd6\x95\x86\xa4\x53\x2e\x3c\xbe\xa7\xd1\x6b\x6d\xb5\xb1\xd5\x56\x28\x2a\x4c\x70\x50\xb7\x43\xaf\xa7\x7e\xe6\x3f\x59\x35\x4c\x88\x14\x72\x6f\x17\x75\x94\x60\xb4\xfa\x8a\xd3\x2c\xb1\x61\xc4\x0d\x20\x60\xab\x36\xf4\xd6\xe7\x7d\x43\xe3\x10\xb6\x06\x21\xfb\xcc\x49\x26\x36\x27\xb9\x79\x3f\x73\x11\x91\x53\xbe\x5d\xd8\x62\x42\x59\x2d\xde\xb9\x7b\x89\x8e\xa0\x58\xb9\x29\xc6\xe2\x70\x32\x79\x5c\x08\x7b\xc6\xac\x6b\xd1\xd9\x03\x80\xbe\xf2\x6c\x00\xe8\x69\x17\x18\x70\x35\xcc\xf0\x2d\xb8\xb6\x31\xfc\x15\x0c\xcf\x41\xce\x57\x90\xe6\x05\xd6\xbc\x70\x43\xd8\x3c\x53\x3b\xe4\x00\x09\x0c\x71\x6c\x6a\x8e\x99\x51\x09\xa7\x38\xa2\x6c\x76\x10\x20\xa6\x41\xe2\x77\xc8\x81\x9b\xe8\xe2\x0e\xcb\x87\xdd\xc6\x66\x6d\x5d\x4b\x8d\xc6\x45\x3d\x1f\x8b\x71\x60\x6c\xc1\xb4\x06\x17\xa5\xb0\x7c\x68\x03\xf9\xa8\x21\x0c\x2d\x19\x9d\x5f\x0a\x87\x4b\xb4\x6c\x7c\x2e\x91\x94\x84\x22\x28\xc0\x87\xbb\x2a\x9a\x16\x6f\xcc\xe5\x02\x61\xb8\x37\x69\x42\xe2\x2a\xd0\xde\x92\xf1\xcb\x39\x17\x6a\xbc\x21\x44\x61\x35\x19\x96\x91\xc3\x04\x60\x19\xf8\x23\x11\x8f\x94\x3c\x95\x91\xfe\xd6\xa1\x45\x63\x67\x08\x02\x91\x00\x0a\x2e\xd5\x9a\x74\x6c\xec\xdd\x6c\x61\x78\x93\x3e\xcf\x58\x3e\x48\x5f\x53\x10\xc9\x14\x27\xc9\x01\x12\x24\x97\xa6\xa6\xa5\x24\xc9\xf4\xd0\xa1\xb2\xc7\x28\xe1\x33\x1a\xe1\x04\x4d\x12\x1e\x3d\xc8\x11\xd3\x77\x33\x9b\x19\xbe\x90\x09\x1e\x11\x29\x03\x61\xa6\xc8\x73\xb5\xd9\x47\x50\x50\x50\x11\x91\x52\x46\xa5\xa2\x91\x93\x52\x8a\xd4\x72\x53\x3e\x56\xab\x97\x11\x37\x65\x10\x61\xb8\x5a\xb8\x22\x06\x27\x2e\x67\xb6\x7e\x07\xdc\x90\x16\xfe\xc9\xc5\xd5\xb6\x1d\xa0\x1d\xa0\x59\x39\x0a\x19\xab\xf2\x81\x5c\x71\xa4\x4e\xed\x67\x70\x8c\x97\x91\xc0\x4d\xf9\x44\x79\x82\xf4\x27\xcd\x83\x24\x3b\xba\x2c\xa2\x86\x4b\xc2\x82\x0f\xa6\xdd\x33\x70\x1d\x18\x72\x0b\xa4\xce\x2a\x9a\xd6\xab\x08\x52\x06\x94\x8c\xa9\x3a\x1a\x29\x8b\x92\x3c\xf6\x45\xc3\xf4\xad\xfb\xa8\x89\xc4\x2d\x8f\x5e\x7b\x7d\x37\x1f\x20\x2c\xd1\x13\x49\x12\xfd\x5f\x13\x34\x7c\xe8\x31\xbc\x35\x4b\x36\x38\xeb\xd0\x89\xe3\xd2\xad\x14\x05\x93\xd8\x93\x5a\x97\xfe\xde\x5e\x97\x33\xaf\x94\xcc\xf4\xf2\xac\xc9\xa1\xf5\x4a\xb7\xe2\x1d\x96\xc6\x56\x26\x5b\x00\x6e\x69\x1f\x54\x47\x03\x90\x68\xca\x90\x36\x14\x07\x4f\x1f\x69\x51\xd7\xd5\xf6\xb6\xd4\x40\xa4\x67\xd4\xc9\x3a\x14\x12\xc5\xc6\x16\xcf\xca\x54\x6a\x48\x03\xd4\x14\x04\x37\x13\x02\x35\x21\x8f\x22\x42\xe2\xc6\xf8\x52\x3d\xa2\xbd\xc3\xf3\xbb\xc6\x6a\x6e\x92\xd6\x53\xae\x4c\x59\x41\x83\xe7\xe7\x2c\x57\x06\x00\x6e\x92\xf0\x09\x5c\x48\x00\xf5\xe7\x92\x5e\x83\x84\x39\x33\x6f\x12\xa3\xaf\x83\xfb\xc5\x03\x2a\xbc\x6f\x06\x9e\x2b\xad\xc8\x1e\xc0\xfc\x55\x4d\x66\xad\x60\x7f\xe5\xca\x58\x47\xe8\xba\x82\x02\x12\x56\x96\xc6\xfa\xda\x58\x8a\x28\xf3\x4a\xd0\x80\x95\x49\x3c\xdf\x0e\xad\x09\x0d\x58\xea\x73\x07\xd0\x80\x95\x79\xb6\x44\xe5\xf3\xd9\xb3\x66\x13\xeb\x49\x5d\xf0\xee\x29\x5e\x06\x8d\xca\x88\x78\x25\x12\x74\x07\x72\xd1\x44\x88\xfb\x05\x7b\x58\xa9\x1f\xf7\xba\xb0\x87\x95\xc1\xec\x33\xec\x61\x65\xa8\xfb\x0b\x7b\xd8\x30\xd0\x0e\xb0\x87\xc6\x6d\x3f\xd6\x44\xdd\x8d\x29\x40\xca\xca\x24\x9f\xde\xc2\xbd\xbb\x74\x8c\xa7\x26\x24\xc0\x5c\x63\x4e\x94\xb4\x28\xc0\x30\x5a\x9b\xdd\xd8\x16\xe8\x84\xe5\x56\xb4\xe7\xfd\x6a\x54\x1a\x43\x42\x96\x60\x56\xbe\x3a\xa0\x44\xbc\x20\x91\x26\x3f\xc3\xa8\x94\xc0\x4c\xc2\x54\x0f\xac\xb9\x4e\x8f\xc2\x58\xa8\x23\x9c\xd9\x6c\xf1\xb6\xe2\x1c\xfb\x93\x17\xbb\x1e\xa2\x24\x00\xdd\x95\x58\x7d\x27\x98\xaa\x4f\x15\x7c\xfb\x39\x7f\xb2\x92\x23\x90\x9f\x21\xc6\x56\xd2\x83\x4e\xc7\xd6\xa6\xd0\xb6\x62\x94\x29\x32\xab\x8a\xf4\xc5\x61\xa1\x4c\xfd\xe9\xbb\x95\x1c\xc8\xe0\xf8\x39\xeb\x45\x80\x32\x6f\xa1\x43\x7c\x3d\x1b\x12\xdb\x22\xf7\x52\x6b\xd7\x7a\x3a\xe6\x46\x95\x28\xc5\xd4\xe9\xf9\xb9\x04\xe7\xdc\x9c\xca\x11\x33\x09\x5c\xb6\xb6\xda\x11\xfa\x00\xa5\x33\x71\x9a\x25\xe4\x00\xf9\xf9\x51\x4d\x41\xa3\xfc\x9b\x6f\xfe\x44\xd0\x37\x28\x25\x98\x95\x4c\x2c\xa0\xd5\xeb\x2b\x0f\x80\xe2\xd4\x9c\x8c\x58\xe3\x56\xa0\xe1\x67\x53\x8d\xc7\x45\xf0\x9d\xb3\x29\x77\x26\x1b\x28\x09\x87\xa3\x39\x92\xf9\xc4\xd4\x34\x0d\x4c\x6c\x4e\xcf\xbb\xe0\x33\x70\x3d\xc3\x4d\xec\x06\xbd\x31\x40\x66\x85\xe1\x74\x04\xc8\x2c\x4d\xad\x07\xc8\x6c\x3e\x7d\x7b\x0b\x90\x59\xd9\xf3\x6e\x00\x99\x4d\x5b\xbe\x01\x40\x66\xa9\x99\x2f\x06\x20\xb3\xb2\xa2\x5f\x0c\x40\x66\x65\x5e\x3d\x40\xe6\x17\x02\x90\xb9\x9a\x8f\x34\x42\x40\x36\x1f\xde\xf5\x20\x20\x1b\xf5\xab\x76\x16\xb1\x2d\xde\x0e\x48\x73\x2f\x0c\x01\x59\x9a\x40\x1f\xee\xb6\x7e\xb8\x5b\x23\xf1\xd9\xbe\xf5\xf0\x5c\x0c\x5c\xf5\x22\xeb\x08\x02\x59\xda\x9f\xce\xa6\x4f\xff\xc5\xfa\x51\x9f\xad\x1e\x17\x1c\xcd\xc9\x98\x3c\x52\xf0\xdc\x8f\xc1\xee\xb6\x06\x27\x39\xd5\x9f\x0f\xed\xd7\x60\x5a\x83\xd3\x52\x5f\xe3\xe6\x09\xed\xe2\x68\x3d\x6f\xc4\x28\xb8\x94\xba\xda\x77\x06\x25\xb2\x90\x16\x0b\x57\x8b\x7a\x0e\x8d\xcc\xa8\x82\x61\x7c\x42\x7f\x14\x37\x88\x3c\xad\x2c\xaf\x77\x42\x99\xc3\xb5\x4b\x6f\x43\x43\xa1\xf7\x2d\xe8\xd5\x25\xe7\xad\xe9\xed\x71\x83\x00\xaf\x4f\x23\xd5\x24\x34\xa5\xbb\x6a\x76\xd5\xcd\xec\xb1\x96\x40\x3d\xac\xe5\x1d\xea\xfb\xd6\x0c\xc7\x08\xfb\x95\x74\x4b\x00\x82\x30\x5f\xce\xa8\x54\xa2\x35\xf6\xaa\x36\xc2\x6d\xb8\x5c\x96\x77\x0e\xd8\x09\x56\x75\xb6\xd9\x67\x29\x49\xb9\x58\x15\xf8\xd5\xf8\xa5\x2d\x51\xb1\xc9\xa7\x24\x9b\x93\x54\x4b\x75\xe3\x75\x1b\xe9\xba\xdf\x3e\x29\xd5\xe6\x46\x99\x40\xcc\x12\x11\x04\x5e\x63\xfd\x6e\x6c\x10\x0f\x3b\x6f\xf7\xb6\xdb\x6c\x31\x19\xd7\x74\x4b\x38\x4c\xda\xe5\xe6\x1f\xfb\x52\x29\x36\x00\xe8\xbb\x31\x00\xc6\xc7\x1f\xad\x0e\x71\x59\x12\xdc\xb2\x0c\xd7\xa8\xf8\xca\x16\x70\x5d\x23\xee\xa1\xee\x13\x0e\xab\x77\xae\x1f\x0d\xd3\x82\xca\x59\x5f\x1e\x70\x96\x4b\x22\x0e\x43\x15\xa1\x34\x98\xfa\x7a\x95\xa8\xc4\xa9\x96\x5b\x10\x49\x2e\x5a\xa3\x60\xbb\x98\x55\x23\x95\xe3\x04\xf4\xd6\xb0\xea\x5c\x75\x53\x27\x8b\x86\xb4\xba\x6e\x76\x7b\xca\xd4\x9f\xff\x63\xad\xdd\xd4\x3a\x96\x5d\x37\xa8\x94\x83\xa3\x88\x48\x63\xe9\xb5\x51\xd2\x78\xc2\x1f\xa1\x48\xce\x36\xbb\xaa\x8f\xb2\x9e\xb7\x66\xf0\x1e\xea\x36\x2e\x48\xdd\x88\x0b\x73\xc1\xf3\xd9\xdc\x19\x93\xf4\x99\xd1\x53\x6b\xda\xcb\x9f\x6a\x16\xdb\xb5\xf7\xf2\xfb\x9c\x26\x9b\x99\xea\x6e\x4b\xe5\x83\x3e\x9e\xdf\x21\x39\xf7\xa7\x75\x02\xcd\x36\x6e\x6c\x7d\xd0\xdd\xfb\xb4\xdf\x7a\xaf\x01\x74\x73\xe0\xe0\x1d\xa7\x3c\x49\xc0\xee\x2d\x49\xfa\x18\x56\xfd\x0e\xbb\x87\x09\xdf\xd1\x0d\x6b\xdd\xc3\xd7\xe0\x3d\x93\x0a\xa7\x59\x27\xf9\xeb\xda\x88\x86\x12\xb9\xd1\x57\x5d\xe7\x26\xae\x8f\x33\xc2\x9a\x8c\x6d\x3f\xd7\x8b\x5e\xbc\xb1\xe8\x4a\x17\x6a\xb7\xb3\x08\x4b\xb7\x24\x2f\x1c\x65\xb9\x62\x1e\xfb\x1a\x69\x59\x61\x76\x3e\xf0\xb1\xb8\x66\x5c\xf8\x8a\x51\x7c\x06\x7a\x89\x47\x6c\x50\xca\xf7\x70\x15\x6e\x27\x8b\x22\x60\xdc\xe8\x10\x21\x33\x83\x72\x05\xd6\x52\x04\x4e\x1d\xfd\x17\x68\x3a\x06\x1c\xd5\xc4\x5f\xba\x18\x4b\x88\x76\x27\xf1\x21\x8e\x16\x51\x42\xa3\xc0\x08\x30\x13\x38\x9b\x37\x71\x3c\xb7\xf3\x3d\xaa\xcb\x6b\xa1\xba\xb4\xd5\xe0\x59\x27\xbe\xdd\xd1\x15\xc3\x29\xe9\xd1\x66\x9a\xd0\x66\x0e\x3c\x9e\x02\x2b\xaa\x09\xbd\x62\x9a\x7e\xfd\xdc\xf5\x90\x33\xaf\x00\x39\xb3\xc9\xe1\x2b\xf0\x64\x4a\xc7\xae\x87\xc1\x79\xd7\x09\x06\xc7\x5f\x82\x7b\x85\x6c\xd2\x7e\x1e\x5f\x19\x31\xa3\x3e\xb0\xd7\x84\xbd\x69\x10\x17\xd6\x91\x9b\x96\xe1\xde\x2c\xa3\x8b\x4e\xeb\xf2\xba\x28\x34\xeb\xad\xcc\x5a\x00\x33\x8d\x77\xd7\x9e\xc0\xcd\xb4\x6f\xc3\x9e\x9c\x9b\x5d\xa6\x00\xad\x57\x2e\x31\x4c\x03\x5a\x47\xc1\x5a\x2f\x23\xc8\xd3\xc3\xdb\xca\x0a\x2a\x6a\x55\x6d\x96\x19\x34\x70\x4e\x75\x22\xd0\x9c\x27\xb1\x89\x5b\x0b\x56\xcb\x77\xe0\xe3\xd1\xfd\x02\xb9\xcd\xb8\xcd\x48\x64\xb4\xad\xa2\xe0\xd4\xb2\xfc\x1f\xbf\x89\x6f\x3d\x07\x28\x90\x7f\x77\x9b\x07\x14\xae\xec\xa6\xb9\x40\x2b\x06\xb7\x4c\xf4\xd8\x30\x1f\x28\xe8\x71\xa9\x97\xce\xcd\xae\x93\xa7\xae\x4a\x2c\x1b\x44\x85\xd5\x2a\x83\x6d\x0f\x3e\x93\xe2\xcf\xe3\x0c\x0b\x9c\x24\x24\xa1\x32\x7d\xb6\xd0\xd4\xd3\xb2\xbb\x56\x9f\x55\xc1\x8d\x89\x88\xe5\xe9\xc4\x90\xa2\x1b\x88\xad\x47\xa8\x38\x12\x39\x0b\xa1\xb3\xfc\xc6\x20\x57\xaf\x2e\x87\x7b\x01\xac\x4a\xd1\x1c\x8a\x5f\x4e\x31\x15\x8c\xc8\xd6\x52\x83\x24\xca\x05\x55\x8b\xb1\xad\xdc\xd8\xfd\xc0\xdd\xda\x2f\x4f\xed\x87\xcb\x3d\xdc\x0e\x75\xc0\xf5\xe7\x2b\x45\x66\x44\x40\x19\x1a\x57\x50\x25\xa8\x4e\x69\x51\x25\x88\xaf\x65\x03\xc1\xb8\xb5\x6b\xbb\x2d\x88\x1c\x3f\x8d\x83\xbc\x9e\x71\x54\x25\x8e\x55\x87\xb5\x09\xd7\x68\xd9\x24\x9f\x19\xd9\xa7\xc5\x8b\xfc\x0c\x55\x2c\x6c\xf0\xbe\x69\x5a\x0f\x38\x70\x05\x83\xbd\xb2\xd8\x98\x00\x1c\xc0\x2a\x55\x2d\xe3\xc4\x8c\x71\xd5\x5c\xbf\x6c\xc9\x60\x07\xc1\x57\x1d\x46\x1c\x74\xb2\xa3\x61\xeb\x83\x2e\x44\x9e\x29\x3a\xa9\x43\xef\xa8\xdd\x55\xb5\x1c\x24\x90\x93\xee\xdc\x0c\xa5\x6e\x4d\xa9\xcb\x12\x27\xb6\xb3\xd3\xf2\xbf\xc5\xa9\x72\x08\x46\x94\xcd\x12\x52\xca\x26\xbb\x4a\x29\x50\xa1\x39\x3f\x60\x80\xd6\xd4\x59\xb6\xcd\x7e\xe5\xc2\x3d\x30\x14\xcc\x34\x26\xa2\xa3\x11\x1b\x48\xf4\x44\x10\x23\x16\xe2\xa2\xa1\x14\xa6\xb7\x6a\x43\x6d\xa1\x09\xd1\x3d\xf9\xd8\x14\x2d\x3c\x50\x25\x7d\x79\x2b\xd3\xc7\x14\x27\x92\x1c\xe8\x86\xa1\x2a\xa6\xe2\x10\x05\x8a\xd1\x93\xc0\x59\x46\xc4\x88\xd9\x9c\x02\x70\xb8\x70\x9e\x98\xf6\xdb\x62\x5d\xed\x1a\x90\x31\xc4\x45\xbd\xcc\x1e\x61\x48\x09\x89\xe6\x24\x76\xc9\xd5\xe5\xed\x71\xf3\x36\x06\xeb\x35\x36\xeb\x7c\xea\xca\x33\x1d\xd8\x4e\x92\x48\x73\x14\x5f\xad\x37\x23\x42\x8f\x5a\xd3\xf0\x23\x61\x88\x4e\xdd\x38\x6c\xec\x0e\x7a\x02\xcf\x94\x26\xfd\x47\x4c\x13\x83\x56\xe0\xba\x76\x42\xa0\x31\xbf\x8f\x98\x71\x77\xb3\xa8\x94\x27\x49\x19\x95\x73\xcd\xa9\x73\xf0\x49\x82\x9a\xb1\x96\xe4\x19\xc7\xb2\x6c\x64\x34\xea\x1b\xfd\xad\x64\xde\x38\x2c\xe5\x80\x45\x01\xbc\x10\x44\x7f\xba\x0a\x51\xcb\xe4\xcc\x3e\x97\xa0\x9e\x4b\xd0\xbc\x36\xfb\x98\x4f\xe0\x0f\xcb\xba\x39\x05\x6d\xdb\xbf\x0b\x09\x72\x87\xb9\x05\xaf\x1c\x84\xff\x3c\xf1\xf7\xaf\x9b\x30\xf1\x1c\xb9\x12\x7d\x46\xc1\xdb\xcb\x28\x68\x3f\xb6\x6b\x65\x15\xac\x40\x98\x72\xbd\x6c\x1b\xf1\xec\x21\x87\x9e\x35\xea\xd9\x47\x6d\x04\x5f\x74\x8c\x7c\x2e\x30\x91\xfa\xe8\xe7\x67\x8a\x7e\x6e\x58\xe2\xf5\x22\xa0\x37\xb2\xad\xbc\x7c\x70\xa6\xeb\xf9\x25\x02\x34\x57\x45\xc7\xe4\x93\xf1\xb3\x1f\xbd\xc6\x39\x77\x3d\x81\x3f\x7b\xa2\x30\x22\x91\xd0\x74\x36\x21\x71\x0c\xf6\x7b\xc5\x6d\xc9\xd7\x82\x76\x9c\x1e\xa6\x99\x2f\x96\x9a\xd8\x71\xc2\xd9\x4c\xd2\xd8\x60\x2b\x64\x18\x4a\x2f\x86\x5a\x22\xe4\x14\xc3\xfe\x26\x09\x11\xce\xfc\x2b\xd0\xd7\x92\x6a\xb9\x3f\x30\x09\x0b\x14\x73\x22\xd9\x57\xca\x68\x65\x98\x2d\xd0\x03\xe3\x4f\x09\x89\x67\xb0\x43\xd5\xc1\x1c\x22\x4a\x0e\x10\x55\xfe\x33\x01\x49\xc8\x3c\x57\x23\x3d\x76\x08\xea\x31\x22\x20\xb1\xdf\x06\xc5\x8d\x7d\x33\xef\x8f\x10\x3a\x67\x68\x8a\x23\x75\x80\x64\x3e\x29\xda\x8f\xb9\xa9\x56\xab\xd5\x9c\x60\xe2\x45\x23\x7d\x70\x6e\x43\xe7\xcd\x67\xc3\x71\x07\x4d\xae\x83\x84\xe2\xad\x82\x98\x1e\xf1\x36\x58\x93\x9f\x72\x69\xbd\xdd\x88\x33\x7f\xf4\x2d\x9a\x8a\x07\x0b\x86\x12\xa3\x06\x78\x97\xf1\xb8\xd5\xa8\x54\x99\xca\xba\x63\x29\x22\xce\x6c\x65\x53\xeb\x11\x80\x76\xcd\x72\xc7\xfc\x89\x49\x25\x08\x4e\xad\x15\x56\x5f\x35\x10\xad\x60\xe2\xcd\xf4\xe8\xa9\x30\x22\xc6\x3a\x5b\x7c\x41\xd9\x83\xde\xdd\x02\x1e\x19\x0a\x45\x43\xcf\x4d\x9b\x96\xe9\x1b\x8f\x9c\x72\x66\x3c\x31\xdb\xec\x9f\xa4\x33\x86\x93\x35\x95\xdc\xda\xca\xd5\x9d\x27\xce\x78\x65\xc5\x05\x2d\x45\x18\xab\x0a\x32\x3d\xae\x65\x44\xa8\xcc\x37\x74\xdd\x60\x14\x93\x8c\xb0\x98\xb0\x68\x01\x24\xc2\x00\x28\x43\x30\x9c\x20\x0c\xdf\xe1\xe4\x08\x9d\x99\x44\x06\x2f\xe1\xd9\x6b\x1d\x2e\xf4\x14\x33\x3a\xd5\x82\x22\x58\xbb\xec\x28\x47\xcc\x0c\xd3\x19\x9b\x83\xea\xdb\x7e\xc5\x1a\x76\xe6\x7b\xca\x70\x29\x73\x64\x83\xf3\x94\xe4\x6b\x05\x07\x07\x66\xab\x45\x1b\x66\xb8\xc2\xab\x60\xbc\xd7\xd8\x0c\x24\xa1\x6e\x39\xd2\xdd\x21\xb8\x32\xcd\x22\x61\xa4\x30\x58\xb4\xe7\x24\xc9\x82\xda\xbf\x19\x16\x4a\xba\xa3\x6d\x80\x5f\xf5\x2d\x93\xe6\xcc\x40\x6e\x18\x4b\xc3\x93\x05\xd7\xb4\xce\x8c\xa2\xf1\xa3\x11\x3b\x57\x5f\x49\xcd\xf9\x38\x9b\x25\x0b\x84\xe3\x47\x2a\x0b\x10\xf1\x88\x33\x99\xa7\x44\x54\x4a\xea\x5b\x00\x5e\xec\x48\x53\x8f\x4d\xcb\xfc\x8f\x38\xa1\xb1\xee\xd6\xc8\x18\x33\x34\x21\x53\x2d\x3f\x65\x58\x48\x67\x11\x6b\x70\x69\xda\xcd\x8d\xf5\x5a\xbd\x1a\xb7\xfc\x29\x64\x88\x28\x2d\x78\x27\xb6\x3a\xf0\x71\x95\x73\xda\x55\x5f\xc2\x35\x27\xb5\x49\xa1\xe5\x02\x8e\x5d\x85\xb3\x55\x98\x30\x0e\x97\x2c\x37\x21\x2c\xba\x1f\x27\x4b\x9b\xc1\xad\xc5\x01\x2a\x13\xb4\xa3\x36\x86\xd6\x90\x6b\x12\x0a\xc2\x85\x54\x58\xd1\xc8\x8a\xed\x5c\xd8\x8b\xc3\x5e\x2c\xed\x5b\x7b\xb6\x25\x0c\xb3\x8c\x70\x52\xdf\xe1\x25\x5e\x33\xf3\xfe\x72\xde\x6a\x8f\x9b\x69\x7b\x69\xd2\x4a\xc4\x93\x64\x1d\x88\xf0\xca\xcc\x4f\x8b\xcf\x97\x8f\xa8\xe8\x47\x6f\x80\xdb\x0b\x38\x35\xc6\xf7\x88\x13\x2b\xa1\x4a\x65\x77\x29\x7c\xc9\xdc\x6e\x0b\xeb\xdb\x1c\x31\x3e\x35\x15\x5e\xdb\xbc\x92\x99\xe0\x29\x5d\x07\xab\xce\x38\xea\x6e\x5c\x14\xe1\x0a\xe1\xcd\xc5\x1a\xea\x53\x64\xc9\xcb\xf6\x08\xf1\xe6\x98\x19\x79\x75\xc9\x19\x4a\x71\xb6\xd1\x82\xaf\xb2\xb6\x0c\x50\x6a\x4c\x5d\x76\xf5\x00\x83\x98\x00\x1e\x3b\x2c\xf2\x13\x5e\x14\xa9\x3d\x6d\x28\x64\x6c\x2d\x72\xb8\xd7\xaf\x9f\xb3\x29\x5f\xe3\x70\x16\xa9\x38\xf6\xf4\x61\x47\xb3\xc1\xf9\xf3\x31\x9d\x66\xf7\xcd\x9a\x76\x39\x8f\xa7\x4d\x44\xbd\xf6\xc9\x74\x2b\xf8\x9c\xaa\x5f\xc8\x44\x42\xad\x6f\x9d\xbb\xb5\x7c\xb4\x82\x16\x11\x0c\x67\xf9\x52\x7d\x2a\xd1\xe1\xce\xd7\xa8\xd2\x0e\x32\x16\x06\x17\x0c\x74\xdd\xdc\xea\x0b\xac\x99\x3d\x24\x9d\x16\x6b\xcb\xdc\xc3\xf5\xd0\xd4\x5c\x8f\x1e\x43\xad\xf9\x84\xae\x84\x8a\x5d\x47\x57\x9c\x6a\x49\xc8\xa8\x0f\x45\x64\x81\x0d\xb1\x9e\xd2\x84\xc8\x23\x74\xde\xa0\x37\xba\x00\x67\xef\x10\x34\xa1\x5e\x4e\x7a\xca\x05\x0d\x0a\x27\x39\x19\x09\x51\x40\x23\x0f\x6d\x67\x82\xe8\x31\x47\xc6\x77\xc7\x0d\x74\x1a\x44\x57\x09\xaa\x79\x96\x11\x56\x15\x48\xd1\x9a\x17\x50\x9b\x5e\x6e\x64\x78\xff\x01\x37\x3e\x6f\x6c\x6b\xc3\x15\xa3\x6a\xd9\xd2\x5d\x94\x50\xe8\x1e\x3f\xee\x7a\xbd\xd3\x5f\xd4\xf7\xa6\x71\x84\x77\xe5\xd6\xd7\x1e\x9d\x97\xf2\xd7\x77\x44\x7e\x80\x4f\x9d\x55\x14\xa3\xa9\x20\x60\x38\x4f\x7d\x4e\x28\x8b\x89\x90\x8a\x73\xb8\xef\x6e\xcf\x7e\x3c\xbe\x3f\x47\x44\x45\x28\xa1\x0f\x64\xc4\x22\xf9\x78\xa0\xc5\xe3\x7f\xe4\x44\xe9\x9f\x5b\x0c\x2d\x34\x25\x4c\x02\x27\xa0\xaa\x96\x3b\xdf\xbc\x90\x6e\x61\xf4\x7f\xcf\xca\xdf\x2f\x21\xf9\x5a\xfa\x0b\xd0\xae\x03\xb7\x07\x32\x05\x60\x64\xb3\xb4\xb2\x81\x62\x8c\x8a\x37\x6c\xaa\x36\xb5\x41\xb8\x2b\xfb\x7b\xce\xd6\x14\xba\x4e\x8b\x8f\x82\x51\xb4\xc8\x74\x69\x86\x01\x39\x70\xbd\x38\x5a\xf3\x4d\x63\xeb\xab\x98\x48\x91\x56\xe4\x54\xf6\xa2\x30\x17\x52\x82\x10\x60\x21\x9e\x9e\xec\x5d\x6f\x33\x49\xfd\xc4\x82\x8f\x8e\x46\xec\x93\x33\xe4\x17\xbf\x4a\xd7\x84\x89\xcd\xf6\x80\x8a\xe5\x56\xa0\xd9\x98\x4a\xff\x03\xc0\x62\xcb\x3c\x51\xa6\x62\xcc\x94\x6a\x2d\xdd\x0d\xd4\x3c\x69\xe2\x12\x02\xb3\x68\x7e\xb9\x65\xe1\x18\x3a\x1d\x93\x64\x1d\x49\xf4\x7c\x3a\x4c\xa4\xa6\xef\xe8\xa1\xe5\x74\x6e\x52\x13\xa9\x98\x0c\xc8\x81\xae\xc8\x83\xd1\x71\x8c\xf5\x38\x31\x15\x5b\x08\x02\xd3\x6f\x35\xfa\xd9\x24\x38\xea\x5d\xb4\x92\xba\xb1\xfc\x9a\xb0\x43\x1f\x52\x04\xbd\x20\xac\x46\x4c\xe4\x0c\x20\x7b\xbd\x23\x08\x23\x49\x04\x35\x1e\x99\xc8\x99\x65\xac\x91\x6c\xa6\xd9\x84\x96\xfc\xc0\x1b\xc8\x19\xe8\x67\x3c\x97\x10\xc1\x98\x12\xa5\x2f\xa8\xaf\xa1\xce\x9a\x71\xc5\x1d\xa0\x4c\xd0\x94\x2a\xfa\x48\xe4\xfb\x86\xad\xab\x43\x14\x6d\x77\x5e\xe3\x8e\xfb\x57\xef\x17\xea\x0e\x2d\x0d\xfa\x03\x6c\x72\x28\x04\xa4\xb8\xd5\xcd\xdd\xcd\x0a\x91\x39\xc8\x01\x35\x21\x00\x6a\xd2\xf7\x30\xcf\xd9\x32\x03\xb6\x45\xe7\xdc\xc6\xc6\x5a\xb8\x87\x48\x6c\xfb\xb5\xad\x1a\x2c\x5c\x1b\x8a\x58\x80\xdc\x3a\xdb\x5d\x65\xc8\x53\x4c\x93\x22\x7f\xa0\x3a\x50\x4d\x7c\x05\x4a\x5a\x83\x41\xb1\xfd\x94\x68\x4a\xf6\xde\xdb\x8e\x09\xe0\xe7\x67\xa1\x71\x23\x08\x06\x68\x19\xb8\xa9\x87\xb2\x0c\xaf\x77\xb3\xb1\x97\x60\xbd\xd6\x1e\x7b\x05\x7d\x6c\xe9\xd8\xd1\xd7\xb4\x71\xc2\x4f\x18\x8e\x96\x2a\xca\x35\x14\x0f\xdb\x02\x45\x1d\x27\xd8\x70\xd2\x35\x97\xfb\xda\x13\x6f\x88\xf7\xd9\xc1\xe4\xeb\xad\xbe\x5f\xc7\xca\x64\x8e\xaf\xf7\xc9\xd2\x69\x31\x12\xee\x43\xeb\xac\x89\x60\xea\x31\x6e\x2d\xfc\x03\x78\xa3\x0e\x95\xa0\x0e\xcc\xdf\x20\xa5\x74\x62\x68\xdb\x06\x15\x34\xa3\xbe\xed\x52\xb7\x6d\x60\xc2\x9b\xa9\x6b\x17\xd6\x07\xde\xe0\xdb\x86\x18\x9f\x7a\x47\xbf\x86\x5c\xd2\x41\x12\xe1\x2a\xa9\x34\x17\x8d\x33\x43\x57\x38\xe1\xb3\x81\x50\x74\x8a\x23\x75\x87\xb7\xb2\xe0\x62\xdb\xcc\xa6\x61\x81\x6e\x18\xe8\xfc\x4c\x5f\xde\x33\xc2\x88\x80\x8b\x92\xe1\xb4\xc5\x7a\x0f\x4f\x36\x92\xfc\xa1\xc8\x55\x64\xca\x02\x49\x6f\xf1\xc6\xb9\xe2\x29\x56\x34\xc2\x49\xb2\x80\x72\x3f\xfa\xc9\x1c\xcb\xb9\x3b\x9d\x26\x8c\xb5\x8b\x6e\x63\x17\x17\x76\xed\x56\x61\x95\x37\x3a\x13\x2b\xa3\x7c\x47\x58\x9e\xbe\x3b\x41\xff\xb7\x98\xe3\xe9\xe0\xf4\x87\xe1\xf8\xec\xfc\x76\xf0\xfd\xc5\xf0\x2c\x98\x8f\x7d\xf2\xe9\xfc\xf6\xb6\xfe\xeb\x0f\xe7\x77\xf5\x1f\xaf\xaf\xae\xef\x2f\x06\x77\x4d\xad\x5c\x5c\x5d\xfd\x78\x7f\x3d\xfe\x30\x38\xbf\xb8\xbf\x19\x36\x7c\x7a\x7f\xd7\xfe\xf0\xf6\xc7\xf3\xeb\xeb\xe1\x99\x5b\x95\xbf\x05\x14\x0e\xe1\xad\x10\x7a\xde\x3c\x8d\xea\x21\x38\x44\xe5\x17\x4f\xd0\x7d\x15\x88\xdc\xc6\x88\x9a\x3c\x7e\xcd\xe5\x62\xe3\xf4\x88\x47\x0c\xb9\xcf\xf5\xa2\xb4\x7d\x5a\x70\xd3\x84\xf3\x87\x3c\xb3\xa2\xb1\x49\x06\x64\x56\x38\x21\x32\x68\xed\x87\xf3\xbb\x93\x3a\x20\xba\x6f\x2c\x40\x0c\x72\x67\x00\xc6\x85\x9d\x38\x0e\x1c\x38\x13\xe4\x11\x84\x3d\xcf\x81\x83\x1e\xfc\xce\x2c\xeb\xc7\xb4\x86\x99\xaa\x74\x13\xc7\xb6\x28\xab\x9b\x58\xd0\x70\x79\x5f\x97\xad\xa6\x5f\x0e\x7b\xb5\x4c\x48\x84\x73\x13\x6b\x84\xad\x50\x16\x0e\xb8\xa0\x87\xdd\x35\x6a\xe9\xa8\xb1\xc1\xca\x9e\xe9\x89\xcb\x07\x9a\x65\x24\x7e\x57\xd7\x7f\xcb\xd5\x3b\x25\x9c\x3e\xdd\x67\x70\x26\x29\x9b\x19\x9b\xb1\x2b\x5f\x30\xb7\x65\x66\xa8\x34\xf1\x14\x45\x84\x09\x20\xf3\x6a\x49\xcc\xc3\xcc\x53\x88\x7e\xc2\x0a\x3d\x11\x48\x29\xcd\x6d\xfd\x16\x63\xbb\xd5\x67\x1b\xba\x33\x9e\x70\x57\x34\xac\x94\x6a\xda\xca\x8c\x77\x61\xb0\xd1\xdf\x4b\xd2\xc4\x88\xb7\xc8\x0b\x3c\x33\x8d\x02\x77\x76\x22\x09\x8c\xb8\x25\xe6\xc0\xdd\x06\x0d\x1e\xd6\x65\x97\x69\xed\x46\x5a\x71\x59\x68\xb6\xdd\x65\x3c\x0e\x0b\xa1\x24\xcf\xee\x58\x98\xf5\xa3\xbb\xe3\x31\x5e\x68\xe2\x80\x18\x50\x99\x67\x19\x17\x0a\xb5\xb4\x61\xbc\xeb\x66\x7c\x70\xe7\xd8\x79\x78\x1e\x07\x8d\x68\x01\x4e\x36\x14\x15\xe8\x96\x1e\x6e\xd7\xb5\x60\x1c\x21\xd4\x15\x18\x12\x7d\xf5\x91\xb4\x64\x92\x2d\x51\x68\x93\xf1\x64\x9b\xc8\xef\x4c\x5f\xf0\x5d\x8b\x61\x35\xf5\x7e\xe5\x5a\x68\xdc\xf2\x84\x4c\xd5\xb8\x31\x6a\x60\x89\x83\x4c\xb7\xc8\xda\x10\x35\xe8\x6c\xbe\x83\x16\xbb\x5b\x99\xbe\xb3\xf1\x36\x4a\x10\x12\x58\x98\x05\xe7\xca\xd8\x37\x0a\x1b\x18\x72\xab\x09\x92\xb7\xed\xd4\xe6\xc2\x78\x23\x02\xe2\x02\x82\xd5\x98\xf7\x0c\xcb\xa3\x11\x1b\x62\xa8\x6a\xeb\x0d\x59\x2e\x45\x06\xac\x48\x2b\xed\x47\xa5\x0a\x95\x2f\x1a\x44\xd9\x8e\x70\x59\xd0\xbd\xad\x67\x9e\x2c\x50\x51\x85\xb4\xf4\x5d\x97\xd3\x63\xbc\xa6\x4e\x04\x34\x13\xb6\xf5\xf3\x14\xc9\xac\x67\xd7\xcc\xb3\x08\xc0\x81\xb0\x2d\xdd\xd5\x11\xfa\xd9\x79\x0e\x20\x1e\xb5\x28\xe0\xab\xcc\x8d\x93\xe0\x85\x03\xc5\x6b\x5a\xd8\x5d\xe0\xcc\xed\x3a\x42\x75\xf9\x02\x7b\x40\x9b\x86\x55\x2e\x19\x70\x19\x33\x1e\xbd\x75\x60\xb9\xfd\x47\xb7\x64\x79\xbe\xce\x07\x28\x86\x67\x03\x9e\x40\xe8\x60\xc9\xe2\x7f\x98\xcd\x32\x99\x78\xae\xcc\x8d\x55\x4a\x6d\x04\x8e\x3e\x3f\x10\x41\x62\x12\xf5\xd0\x94\x26\x09\xc8\x01\x47\x68\x00\xb5\x64\x21\x91\x4d\x5f\x85\x2e\xea\x99\xce\x18\x5f\x95\xfb\xd3\x42\x4c\x51\x40\x4c\xb7\xed\xc4\x24\x81\x9a\x8a\x3c\xe6\xdd\x50\xd4\x0e\x30\x2d\x34\x6f\xc1\x75\x44\xe0\xee\x48\x16\x6b\x18\x7f\x5f\x23\x68\xb9\x36\xdc\x50\xb7\x6f\x1e\xfa\xc7\x1c\x0b\xcc\x14\x84\xe2\x5a\xd1\x5d\x90\x20\x25\x84\x7c\x06\x45\x9f\x19\x47\x22\xfc\x14\x6e\xae\x0b\x19\x9b\x51\x48\x5c\x8c\x0f\x10\x3d\x22\x47\x50\x2b\x49\x68\x59\x62\x52\xbc\x39\xd7\x92\xc3\x88\xd5\x42\x0c\x8f\xd0\x20\x91\xdc\x7e\x41\x58\x94\x40\xed\xe6\x20\x6a\xd8\x53\xbe\x0d\x4b\x98\x2c\x40\x41\x81\xad\x2c\x9a\xe7\xf6\x41\xf0\xe1\x88\x61\x69\x62\xaa\x12\x38\xe9\xc5\xef\x4d\x05\xef\x2b\x76\xc4\x17\xd9\xa8\xe5\xa8\xf6\xdb\x6e\x92\x29\xdc\xb5\x6c\x83\xe0\x0d\xd8\x98\x22\xf4\x33\x40\xa0\x40\x5f\x63\x85\x12\x82\xa5\x42\xdf\xbe\x5f\x2b\xb6\xd0\x4d\xb0\xe0\xae\xf6\xf8\x16\x09\x3c\x2e\x03\x20\x14\xee\x7c\xc7\x8a\x23\x28\xac\x88\x30\x62\xe4\x29\x0c\xf8\xe4\x10\xa3\xfb\x48\x65\x0e\xe5\xb0\x03\x6b\xa1\x29\x68\x6c\x32\x93\x21\x89\xc2\xa8\x4c\x2d\x7c\xc4\xd9\xfb\x6c\xf8\x8d\x1d\x56\x03\x65\x59\xe5\x89\x1a\xf5\x0c\x20\x89\x8a\x58\xfc\x39\x56\x23\x66\x39\xab\xb3\xbe\x07\xa5\x4b\x07\x49\x52\x8e\x7f\xc7\x60\xc3\x67\x7a\xc2\x50\xcc\xfb\xc8\x2f\xd0\x25\xa8\x5f\x3e\x08\xb9\x64\x5c\x2d\x0e\x8b\xd6\xd4\x46\xcc\xe3\xbd\x84\x6d\x37\x4a\x3b\x4d\xfe\xc9\x17\x14\x82\x1b\xba\xbf\x30\x55\xd5\x3b\x08\xc3\xa4\x69\xc8\x2b\x0e\x56\xdd\x27\xbc\x44\x36\xde\x75\x07\xdd\x45\xe5\x66\xff\x2a\x5c\xb3\x4f\xbc\xc1\x5d\xdb\xb2\xb9\x81\x6c\xb1\x8d\x02\xee\xa3\xe1\x5f\x2a\x62\xa8\x34\xf4\xf3\xb8\x5c\xaa\xa4\x95\x0b\x16\xb9\x6d\x8e\x75\x80\x13\x81\xc6\x41\xaa\x4d\x10\xd9\x0f\xa9\x58\x8e\xf1\xd9\x37\x5b\x22\x77\xb2\xb7\x3d\xfd\x83\x62\xfe\x6e\x2a\x3e\x88\xba\x3e\xf1\x76\x61\x6f\x10\xff\x1d\x47\x10\x80\x0f\x3d\x39\xf7\x61\x1d\x90\xc6\xc1\xf8\x06\x4e\x9b\xaa\x78\x98\x09\x1e\x11\x29\x8f\xd0\x10\x2e\x1a\xfb\x4f\x84\xa7\xce\xa1\x1d\xbc\x3c\x62\x5a\x33\x71\xf8\x15\x41\xfb\x65\x12\x6f\x3a\x01\x06\x0c\x6b\xab\x58\x80\x74\x4d\xb7\x6c\xa0\x4d\x38\x2c\x2e\x68\x03\x60\xdd\xd1\x70\x76\x82\x62\x1e\x3d\x10\x71\x2c\x48\x4c\xe5\x09\xc4\x66\xa9\xd6\xa0\x90\x54\x6b\xdb\x5b\x4b\x1a\x6d\x81\x66\x2b\x72\xd5\x4e\x4d\xff\x36\x09\xcb\x95\xf7\x3c\x40\x74\x0a\xea\x84\x4b\x95\x30\x49\x9a\x0e\xee\x83\x30\x25\x16\x19\xa7\x4c\x79\x53\x56\x65\x21\x9c\xa6\xa1\x85\xb6\xb6\x24\x1f\xb1\x8b\x18\xce\x0d\xa7\x7d\x37\x27\x92\xb8\x80\x35\x33\x29\xc5\x91\xf1\xb2\x18\x76\x91\x61\x35\x97\x90\x51\x5a\x5e\x03\xab\x74\xc1\xa7\x7a\x85\x70\x06\xf1\x6e\xc6\x4a\x51\x7c\xe4\x5d\xc2\x52\xd1\x24\x19\x31\x46\x48\x2c\x11\x38\xc8\xbe\x6a\xcc\x5c\xd6\x9f\x1e\x20\x1c\xc7\xe8\x7f\x7e\xfd\xe1\xe2\x97\xbb\xe1\xf8\xfc\x12\x8c\xd6\xe7\x17\xc3\xf7\x07\xfe\xc7\xab\xfb\x3b\xff\xab\xb1\xb0\x3c\x12\x81\x52\xfc\x00\x2a\x1e\x93\x46\xfe\x83\xec\xc0\x70\xa4\x2e\xa7\x5b\x3f\x91\xc4\x65\x4a\x58\x31\xc5\x43\xc8\xd9\x3d\x6c\xad\xde\x6b\x6c\x7e\x6b\x28\xbf\x37\xfe\x93\xe5\x34\xe8\x88\xc7\x77\xe1\xc4\xc0\x94\x30\xc8\xe6\xb1\xd6\xbe\x42\xf7\x2d\x08\x8e\xb0\x19\x65\x6d\xa1\x0c\x84\x3d\x3e\xa7\x10\xff\x23\x59\xfc\xa4\xd5\xeb\x6b\x4c\x45\x67\xda\x1b\xb2\x47\x2a\x38\x83\xa9\x79\xb3\x96\x3f\x31\x5a\x4f\xc7\xb2\x7a\xa8\xa4\x91\x85\x21\xc6\x2f\x6b\xcd\x19\x68\x02\xc2\x7a\xf5\xe9\x5a\x78\x1d\xf2\x59\x09\x87\x1e\xe0\x51\x9c\x1c\x94\x4d\x11\xa7\xe2\x69\x70\xc4\xee\xae\xce\xae\x4e\x10\x49\xf0\x84\x0b\xc8\x26\x36\x21\xa5\xae\x09\xbb\x60\x11\x4f\x83\x86\x4a\xc8\x11\x07\x28\x2b\x90\x23\x42\x23\xda\x91\x69\x63\x55\x59\x7d\x2e\xea\xb8\x0b\xbb\x55\x01\xed\x64\xaf\xb9\xe8\x72\xfd\xeb\xd7\x60\xe9\x78\xa6\x15\xb9\x0a\xe7\xb5\x77\xf3\x94\x60\x53\xd1\xda\xb8\x85\xac\x2d\xdf\x26\x40\x24\x49\xa9\x40\x9e\x3e\x38\xf2\xc8\x86\x70\x15\x6f\x72\x86\x7e\xfc\x8b\x44\x93\x5c\x8d\x58\xb9\x0d\xce\xd0\xe0\xe7\x5b\xf4\x3d\x56\xd1\xfc\xfd\x88\x5d\x69\x35\xf3\xc7\xbf\xb4\x40\xdc\xac\x8d\xce\xa6\xd7\xe4\x0c\x2b\x7c\xc1\x71\x4c\xd9\xac\x09\x9a\xad\xa8\x9f\x31\xbc\x1b\x9c\xa0\x2b\xab\xc3\x7b\x54\x8a\x22\x53\x37\x68\x08\x18\x32\x4c\xc4\x71\x11\x60\xe5\xac\x0c\x5f\x65\x34\x33\xb8\xb0\x46\xec\xce\x60\xd2\x69\xae\x4a\x15\xca\xb8\xad\xe1\xa2\xb5\x32\x83\xd6\x67\x4c\xd9\xd6\x92\xa8\x57\x07\xc8\xd8\x6f\x86\x95\xc7\x40\x9e\xa9\x33\xfb\x11\x03\x05\xdd\x23\x05\x24\x3c\xc2\x09\xc4\x74\x1f\x06\x36\x3d\xad\xb6\xf3\x1c\xd2\xb6\x21\x4e\x82\x2d\xca\xa9\x17\x3e\xda\xc2\x0b\x65\xe1\x46\x81\x01\x00\xf6\xd1\x7a\x63\x53\xae\x39\x8e\xc1\xa2\x02\xe3\x5b\x62\x56\x47\x7f\xe8\xb1\xa9\xcc\xb2\xe8\xa7\x8e\x1f\x41\xa5\x7f\xe3\x56\xc4\x11\x98\xef\xd9\x02\xd2\x7f\xa0\xe8\x02\x87\xd0\xc1\x82\x3b\x5b\xa2\xac\xed\xa2\xbf\x13\x83\xcf\x46\xcc\x44\x9a\x97\xf6\x25\x44\x55\x09\x7a\xe7\x0c\x02\xe1\x8b\xeb\xd2\x0b\x18\x99\x0d\x8c\xb7\xb2\x7e\x26\xc8\x61\x4c\x14\x11\x29\xd8\x7b\xc2\x35\xd5\x37\xec\x11\xba\x09\xd5\xeb\x98\x47\x79\xea\x90\x65\x21\xbd\xdd\x46\x50\xdb\x4b\xd4\x53\x88\xb9\xd8\x57\x51\x3c\x16\xd1\x9c\x2a\x02\x59\xdd\x9d\xf5\x63\x43\x30\x83\xf0\xd3\xba\xa4\xde\x2e\xf8\x02\xef\xd8\x2e\xea\xd9\x34\x34\xce\xca\x2d\x95\x5a\x5b\x0d\x8c\xb9\xa2\x50\xd2\x65\x81\x7e\xc9\x05\x08\x5b\xe4\x73\xc6\xc1\xc8\x6d\x72\x72\x79\xfc\x95\x44\xe7\xd7\x5a\x02\xd2\x1a\xaf\x3f\x83\xb9\x54\x26\x38\x19\xd2\x3d\xcd\xd7\x26\xdd\xec\x00\x7d\x63\x4a\xb0\x47\xe8\xb3\xfb\xe3\xcf\xff\xf9\x9f\x7f\xfa\xf3\x3a\x81\x62\x4e\x21\x87\x76\x8b\x35\xf2\xe5\x74\xca\x22\x51\xb8\x03\x75\x4e\xb5\x4d\xd8\x97\x39\x80\x6d\xcb\xbf\x09\xca\x5d\x10\x3b\x84\x67\xf6\x84\xcb\xf0\x64\xa2\xd2\xd1\x2c\x22\x09\x24\x51\x07\x65\x0e\xe1\x85\x5d\x2b\xd1\xff\x8f\x25\x20\x52\x63\x7d\x54\x36\x8b\x71\xa2\x89\x17\xaf\x75\x23\xe8\x6b\x6b\xff\x53\xe0\x40\x7c\xef\x2e\x38\x9e\xc4\x44\x98\x31\x79\x93\x9d\x37\x24\x02\x73\x20\x9f\xb3\x84\xc7\x0e\x1e\x52\x92\x0c\x83\x00\xa1\x99\xc1\xd1\x88\x0d\x5d\x35\x7f\x1b\x87\x08\x1f\x19\xcf\xcb\x14\x47\x06\x15\x51\xa2\xaf\x3f\x9f\xe8\xdf\x0e\xd0\xe2\x04\x92\x10\x0e\xd0\x6f\x27\x16\xc4\x06\x0b\x35\xd6\x3f\xbd\x77\xb2\xb6\x6d\x02\x06\x4d\x25\xfa\xea\xf8\x11\x0b\x53\x04\xf8\xd8\x8c\xe8\x2b\xcb\x59\x7d\x5d\xb0\x50\x36\x4f\x38\x7f\xb0\x09\x1a\xb5\x0f\x8f\x1d\x20\x16\x90\xb7\xf7\x9b\x98\xad\xf7\xf9\xf2\x0a\x1d\xc2\x0b\x04\x1d\x65\x13\x74\xf4\x77\xc9\x19\x3a\x5a\xe0\x34\xb1\xbf\xba\xa7\x36\x7f\x04\x4b\x9b\x53\x1d\xfb\x20\x9f\x64\x61\x2c\xa5\xdf\x27\x7c\x02\xb3\xfa\xe4\x66\x6a\x32\x30\x60\xa0\xc5\xed\x53\x5c\x58\x76\x22\x56\x92\x32\xb0\x3e\x29\x57\xe6\x15\xe0\x71\x4d\xb3\xfa\xec\x87\xf4\xdf\xc6\x2f\x0c\x8b\xe2\x92\xc0\x8d\x71\xd8\x47\xaf\xe9\x46\x3f\xa3\xaf\x2d\x0b\x7a\xaf\xef\x18\x9b\xee\x62\x96\xa1\xa9\x83\x85\xef\xe0\x97\xa0\x03\xca\x90\x49\xeb\x5f\xf2\xe5\x6f\xc7\x47\x47\x47\xfe\xeb\x4b\x3d\x95\xff\x17\x51\x25\x49\x32\x35\x2d\xb9\x1b\x6c\x31\x62\x9f\x1c\xf0\xbc\x33\x5e\x17\x50\x7b\x99\xe0\x8a\x47\x3c\x41\x87\x85\x41\x37\xe6\x91\x44\x7f\xd0\x62\x6d\xb0\x94\xf0\xa3\xd6\xe3\x5a\x60\x30\x0d\xd2\xed\x0b\x1d\x2a\x6b\x10\xaf\x1e\xab\x10\x5d\xcb\x2b\xb6\x58\x86\x55\x0c\x80\x16\x34\xe5\x1c\x5b\x04\x2e\x08\xc0\x05\x24\x60\xfd\xa8\x05\xe0\xac\x31\x15\xaa\xf9\xa6\xac\xb1\xdb\x02\xe7\xcc\x90\x75\xcb\x02\x58\x18\x2a\xcb\x19\xcc\x3c\x0f\x42\xf7\x89\xbe\x5c\x58\x08\x85\x2e\xf3\x34\xc5\x62\x71\x5c\x9c\xb6\x3a\x71\x16\x75\x4d\x80\xc7\x24\x6e\x01\xc0\x85\x9b\xd8\xa3\x65\xa3\x18\xac\x78\xe9\x6e\x34\x7f\x76\x23\xa8\xe5\x06\x01\x79\xa6\x92\x21\x61\x11\x8f\x2d\x5d\x17\xe8\x05\x65\x89\xc5\xbf\x53\x97\x55\x5c\x44\x8c\x2c\x8c\x71\x4c\x19\x64\x0d\xfb\x86\xfb\xb8\x85\x7d\xf3\x31\x54\x05\x25\xb3\x35\xdc\xa3\xe7\x57\xb7\xee\x9b\xee\x97\x2e\xac\x43\x59\x64\xc7\x4e\x4b\x74\x16\x09\x81\x9f\x8a\xeb\x17\x62\x3b\x8c\x75\x26\xf7\xd8\x0e\xe6\xdf\xa7\xfc\x9a\x26\xfa\xd6\x02\x1a\x3f\x1a\xb1\xd2\xcf\x07\x88\x24\x34\xa5\xcc\xc7\xd6\x19\xe6\xce\xa7\x46\x7a\x7e\xa0\x4a\x6f\x99\x8c\x1f\x34\x07\x73\x70\x4b\x81\x4a\x35\x60\x0b\x47\x3a\xde\x31\x15\x84\x84\xcb\x40\x47\xd7\xc2\xac\x6e\xe2\xd0\x0a\xa4\x34\x20\x3c\x38\xbf\x23\xa6\x5b\x73\x67\xa9\x08\x17\x0e\xda\x0b\x9a\x3b\x74\x80\xe0\x01\x07\x80\x3e\x4a\x31\xbf\x5e\xfe\x6d\x10\x50\x86\x2c\x4f\xb7\x4d\x56\xb4\xe1\xc3\xaf\x65\xa6\xbb\x16\xc4\xdd\x54\x36\xf1\x95\xb0\x3c\x75\x07\x6a\x9d\x7c\x00\x2b\xfe\xc4\x24\x4a\xb0\x01\x90\xd1\x0d\x41\xe4\xe3\x81\x71\x90\x66\x41\x5f\xe6\x7a\x31\xdd\x98\x1a\x23\x09\x61\x5f\x9b\x7f\xbf\x47\xf6\x6e\xf8\xe6\xc0\xde\xe7\x42\x3a\x04\x64\xbb\xe7\x50\xa3\x8e\xc4\xc6\x86\x0e\x68\xb1\x33\x2c\x62\x63\x2d\x0f\xb5\x0a\x83\x00\xa1\xe5\xaf\x05\xcf\xd1\x13\x95\xf3\x11\xbb\xe3\xce\xe0\x88\x18\xf7\x78\xbb\x07\xa0\x8c\xd6\xfa\xc3\x12\x98\x00\x8c\xba\x89\x02\xb6\x4d\xb1\x32\x51\xb0\x63\x48\x08\xda\x0a\x57\xe8\xae\xf0\x55\x38\xff\xb5\x20\x26\x9f\x18\x6e\x8a\x67\x4b\x99\x1a\x96\x92\xa4\xd4\x5c\xf0\x27\xb6\x29\x64\x97\xbf\xd5\xa0\x15\xa7\x71\x06\x68\x12\xa5\xb5\xf7\x28\xb6\xcf\x91\xe7\xd6\xe9\xee\x0f\x72\xd8\xa8\x0f\x30\xc6\x68\x26\x78\x9e\x79\xc8\x15\x97\xd4\x66\xb6\xc1\xca\x34\xe7\x6c\xca\x4f\xac\x4e\x75\x41\xd9\x83\xa1\xf8\xe7\xda\xa3\x33\x97\xd1\x16\xa2\xab\xb9\x2a\x95\x30\x87\x43\x44\x59\x94\xe4\x70\xf1\x49\x85\xa3\x07\x03\xb6\xdc\x66\xf4\xd5\xdf\x8c\x57\x27\xe3\xb7\x48\x4c\x79\x92\xd8\x6e\x8b\x0b\xb4\x28\xe3\xfb\x48\x31\xc2\xe8\xfe\xe6\xbc\xb9\xef\x07\x5a\x77\xe6\x34\xdf\x9e\x65\x02\x81\xff\xf9\x91\xae\x15\x77\x59\x41\xab\x2b\xe7\x03\x7a\xe3\x52\x1b\x16\xaa\x26\xd2\x8f\x58\x91\x6d\x33\x69\x0d\x34\xd7\x1a\x91\x7a\x35\xcc\xb3\xa5\xd6\xe3\x2d\x01\xc3\x0a\xb0\x2f\x08\x0d\x6a\x47\x2e\x0b\x83\xb5\xe0\xe1\x1a\xd8\x3f\xf0\x7e\xb7\xf9\x54\xde\x5d\x31\x9d\xe5\xc3\x4c\x08\x59\x03\xad\xe6\x56\xbf\xde\x71\x90\xa5\x57\x97\x8d\xf1\x09\x1b\xf4\x79\x27\xb1\x16\x96\xc0\x38\x2f\x15\x98\xef\x44\xd0\x8e\x1c\x8d\x78\x2d\x7d\x8e\x88\x1f\x89\x0b\xc3\xf1\xb2\x98\xeb\x77\x06\xbe\x2d\x5e\x02\xb7\xf7\x16\xda\x06\xc2\x0f\xc4\xd6\x2d\xc3\x26\xb4\xf8\x35\x4e\x3b\xa7\x22\x17\x1d\x9f\xd9\x8f\x3f\xd5\x52\x91\x3d\x2b\xfa\x64\xd3\x8f\x2d\xf0\x56\x8a\x99\x3e\xd9\xae\xd7\x16\x23\xa4\x91\x08\x37\x1a\xd2\x7d\xb6\xd1\x80\x4c\x8f\x1d\xeb\xbe\xd9\xae\x5c\x2b\x4f\xc6\x0e\x8f\x13\x63\x67\x52\x73\x30\x41\x14\xf5\x52\x34\x47\x2b\x9b\x22\x4c\x6d\x95\x04\x8b\x99\x51\x90\x24\x51\xf2\x7d\xc3\x0e\x17\x39\x0f\x5b\xec\xf0\x06\x35\x29\x43\xbf\x27\x88\xdf\xcb\x4e\x9a\x1f\x65\x19\xf3\xd3\xdf\xca\xbe\xba\xab\x15\x9a\xa8\x0c\x91\x19\x23\x2e\x04\x20\x69\xc7\xfa\xac\xb4\x63\x6e\x6d\x59\x9b\xf8\x12\xa7\x1e\x51\xc6\x55\x48\xb5\xf9\x5d\x66\x70\x13\x02\x70\xb5\xed\x63\xd8\xba\x08\x71\x38\x04\x5b\x14\xb0\x6d\x04\x23\x36\x70\xaf\x78\x54\x0a\xd0\xed\x84\x11\xc0\x21\x3e\xd4\x44\x43\x83\x7e\x85\x8b\x55\xb7\x93\x6b\x4b\x8b\x5f\x33\x79\xb3\x5a\x47\x59\xeb\x77\xfe\x36\xb2\x15\x53\x3c\xb4\xe6\xd2\x6a\x35\x8f\xeb\x57\xba\x6f\x06\xf6\x8a\xaa\x95\xc8\x9b\x3a\x5e\xad\x4b\x39\xc4\x21\xdb\x50\x58\xfc\xdc\xc4\x90\x26\x8b\x82\x4c\xf5\x8a\x1b\x9d\xbc\xd2\x59\xfd\xb4\xaa\xad\xb8\x31\xc5\xe9\x58\xf0\xf6\x72\x3e\x1d\x96\xc9\x35\x51\xb2\xef\xcc\x4d\xd9\x81\x05\xfa\x47\x8e\x13\x73\xb9\x31\x4b\x8e\x6e\xd8\x20\x2a\x7f\xf7\x67\x34\x80\xdb\x07\x7d\x02\xbe\x08\x0e\x7e\x68\x4d\x71\x44\xd3\x8c\x08\xc9\x19\x6e\xad\x6b\xf5\xf0\x17\x39\xb6\x35\x43\xc6\x38\x82\x34\xe9\x2d\x66\xd2\xd0\x5a\x38\x29\x8c\x1e\xf2\x09\x11\x8c\x98\xda\x5d\xf0\x1e\x72\xef\x75\x1a\x2e\xc7\xb9\x9a\x7f\x37\x8e\x12\xda\xb9\x90\x09\x64\x17\x0d\xf4\x67\xa7\xe6\xab\x65\x13\x28\xb5\x5f\x1a\x3a\x43\xe6\x19\x32\xcf\x8e\xd0\xf7\x38\x7a\x20\x2c\x46\x59\x92\xcf\xa8\x05\xa3\x81\x1b\x0a\xd8\x65\x60\x9e\x2d\x4f\xcc\xc8\x16\xa6\x7d\x7d\x0d\x8d\x58\x8a\x1f\x0c\xb6\xac\x15\x22\x23\x9c\x24\x6b\x99\x19\x3c\x3d\xd4\x50\xb9\x1c\x72\x8a\xaf\x93\x66\xce\x87\x32\xe7\x03\x0c\xaa\x80\x40\x9c\x33\x84\x01\xd8\xeb\x2b\x89\xf2\xcc\x49\x40\x60\xe9\x4b\xc0\xef\x6a\x26\x09\x05\xf0\xa9\xd6\x83\xe6\x64\xc4\x20\x96\xd5\xb5\xb8\xf0\x5c\x25\x74\xf5\xfb\x90\x93\xa6\xc3\x37\x35\xb0\x36\xdb\x79\x11\x6b\x00\xc6\x2b\x28\xa1\x63\x9c\xae\x9a\x13\x06\x06\x88\xf5\x40\x48\x36\x8d\xc9\xb5\x82\xa6\xb7\x98\xfa\x25\xcc\x19\xb5\xa5\x73\x0a\x94\x08\x17\x2e\xe7\x3c\x49\xc5\xf7\x54\x22\x89\x15\x95\x53\xda\x68\x98\x09\xc1\x84\xb6\x59\x75\xbc\x1e\x82\x51\x03\x7a\x51\x65\x2d\x7c\xdc\xff\x11\xfa\x00\x76\xa6\x40\xf6\xe6\x1e\x0b\xa8\x8d\x25\xa8\x39\x69\x05\xc5\xdd\x45\xc0\x8c\x9b\x41\xf0\xfe\x52\xf3\xa1\xcf\xf1\x38\x42\x83\xc2\xbe\x6f\xd0\x90\x8c\xe5\x7e\xc5\x8c\x48\x22\xc9\x26\xc4\xd7\xc9\x14\x06\x3e\x70\x20\x20\x04\xb2\x8a\xd4\xbf\x17\xd0\xe9\x7e\x98\x4f\x90\x46\x89\x1f\x08\x5b\x66\xef\xe8\x3e\x42\x63\x90\x5a\xaa\x74\x7b\x4b\x17\x37\xc6\xae\x4d\x06\xd8\xfd\xd8\x15\x00\x54\x74\x7a\xac\x97\x5c\x0b\xfa\xd1\x83\x4d\xde\x30\xf6\x4e\x0b\x61\xf5\x34\xe7\x32\x3c\x67\x6e\xff\x8c\xae\x28\x72\xe2\x92\x34\x20\xf9\xc5\x2f\xb0\x89\x7a\x61\x3c\x44\xb8\x82\x51\xfb\x43\x6a\x6c\xb9\x7e\xbf\x91\x63\xa1\xb0\x0c\xe0\x27\x72\x4d\xd5\x4f\xf3\x8f\x7f\x91\x57\x70\x62\x77\x91\x0b\xdf\x5c\xf8\x71\xfb\x38\xf4\x0d\x2d\xf0\x3e\xc2\xaa\xa8\x1a\x89\x63\x8f\xde\x90\xf1\x18\x15\xe4\xb5\x7e\x89\xc8\xd7\x9f\x56\xa5\xb4\x64\xa7\xb9\xad\xa2\xec\x4f\x81\x9b\x1e\x4d\x72\x6a\xaa\x34\x97\x44\x2e\x9b\x2f\x09\xda\xaf\xbd\xfe\xa9\xf4\xf7\x49\x33\x8d\x5d\xf3\x78\x1b\xc2\x5a\x1f\xf0\xb4\x4e\xd7\x1d\xa2\x78\x65\x53\x55\xe9\x25\x2b\x91\xf1\xf6\xf8\xcb\x78\xdc\xbd\x0e\x33\x38\xdc\x27\xf9\xf4\x16\xca\x6a\xb4\x61\x42\x38\x9c\xc9\x39\xf1\x49\x5e\x7a\x9f\x75\x37\x3e\xe5\xa0\x6d\x53\xac\xff\xb6\xb8\xfe\x31\xfa\x3f\xb7\x57\x97\x87\x29\x16\x72\x8e\x21\xe7\xd6\xb5\x75\xe0\x4a\x55\x19\x05\xd4\xf9\x95\x28\x1b\xb1\x43\x34\xe3\x07\xc6\x8b\x79\x82\xe6\x4a\x65\xf2\xe4\xf8\x78\x46\xd5\x3c\x9f\x1c\x45\x3c\x3d\x2e\x96\xe6\x18\x67\xf4\x78\x92\xf0\xc9\xb1\x20\x10\xc7\x7a\xf8\xed\xd1\x77\xdf\xc2\xce\x1c\x3f\x7e\x7b\x0c\xbe\xab\xa3\x19\xff\xc3\xc5\x77\xff\xeb\x4f\x7f\xd6\x0d\x67\x0b\x35\xe7\xec\xc4\xba\x48\x97\xb6\x7d\x68\xe4\xde\x63\xf3\x49\xa5\x97\xff\x75\xf4\x4d\x38\x0c\xfb\x6a\xca\x63\x92\xc8\xe3\xc7\x6f\xc7\x6e\x63\x8e\xb2\x75\x9c\xbe\x05\xbf\xf7\x2b\x5e\xa9\x41\xae\x7f\xff\xff\xd8\xfb\xb6\xe6\x46\x72\x23\xdd\xf7\xfd\x15\x88\x38\x0f\xdd\x7d\x82\xa2\x7c\x89\x8d\xf0\x99\x88\x7d\xe0\x48\x6a\x0f\x6d\xb5\xd4\xd6\x65\xda\x7b\x96\x1b\x1c\xb0\x0a\x24\xb1\x2a\x02\xec\xba\x48\x4d\xaf\xfd\xdf\x4f\x20\x33\x71\xa9\x2b\xab\x48\xaa\xbb\xd7\x67\x1e\xec\x99\x11\x49\x14\x0a\x97\x44\x22\xf3\xcb\xef\x73\x2b\xc6\x86\xfa\xf6\xcd\x4a\xc3\x56\x09\x51\xca\x47\x6c\x98\x27\x51\xcb\x83\x0f\xb8\x80\x39\x47\xaa\xe5\x4a\x3f\x54\x1c\xa2\xd5\xb5\x19\x54\x94\x09\x59\x67\x19\x01\xf1\x38\x86\x20\xb6\x5c\x36\xa1\xdb\x08\x5d\x71\xcc\xf8\xbd\x26\x85\xfe\xa9\xb9\xf3\xe9\x75\x0f\xe4\xcd\x4f\xf0\xd7\x16\x0b\xa2\x5f\x2c\x5f\xfe\x29\x58\xe6\x7b\xea\xf9\x39\xf2\x6c\x5c\x3c\xd0\x17\xdb\xaf\x96\x6e\xac\x79\x76\x18\xa8\x68\x82\x14\x63\x2e\x2f\xe0\x54\x88\xe9\x81\xd6\x54\xda\xaa\x6d\x10\x8b\x25\x72\x98\x6d\x91\x6e\x75\x26\xb2\x31\x7b\x5f\x11\x3c\xf3\x40\xa9\xbb\xf7\x17\xec\xb7\x7f\xf8\x3f\xbf\x9f\xa9\xb7\x0d\x56\x0c\x90\x1b\x3a\x5d\x11\x6e\x0b\x6c\xd7\x86\x67\xb9\x48\xcf\xd3\x65\x74\x8e\x40\x90\x73\xf3\xfb\x33\x7a\xe8\x99\x5e\x9e\x39\x0a\xed\x33\x62\x13\x1e\x6f\xe2\x61\x05\xcd\xa5\xa5\x87\xb0\x29\x02\x5c\x67\x00\xce\x46\xea\x13\xbd\x74\x62\x09\x88\xab\x47\x5d\x15\xbd\x6c\xf8\x17\xd0\x06\x7f\xe7\x08\x97\x78\x66\x9f\xe1\x19\x50\xda\xb7\xe6\x69\xd8\xf4\xed\x12\x79\xcd\x6b\x9b\xb5\x25\xa1\x73\x36\x64\xe0\x9b\x37\x9b\x87\xbd\x63\xfd\x37\x89\x4b\x23\x1b\xb9\x56\x42\x2f\x01\x35\x04\x7e\x81\xcd\x8a\x42\x6c\x48\xe9\x3c\xa8\xf5\x4e\xc5\x16\x0f\x98\x50\x8c\xba\x61\xb8\x8f\x64\xe4\xdf\x37\xce\xaf\xc1\xc8\x7f\xec\xb8\x93\x41\xf9\x46\x03\x7e\x2c\x74\x09\xb7\xd2\x90\x2c\xae\xf9\xfe\xde\x8c\x8d\xb3\x03\x90\xa2\x09\xf5\x9f\x91\xdb\x08\x8a\x15\xc4\x59\xae\xcf\x80\x24\x03\xa8\x17\x50\x23\xa3\x2d\x8d\x0b\x99\xae\x21\xc7\xa4\xf9\x7e\x8f\x7e\x62\xfa\xf3\x4b\xd0\x51\xf2\x49\x32\xa4\x0c\x24\x08\x88\x54\x4a\xa4\x14\xc3\xdf\x7b\xa2\x0e\xcc\x83\x85\x53\xd9\x8d\x00\xf1\x7e\x79\xa8\x5f\xe0\xf0\xbf\x3c\x30\x02\x63\x06\x55\x18\x6b\xbd\xd1\xc6\x9d\xd1\x45\x16\x7c\x88\x55\x3c\x70\x08\xb7\x13\x31\xf3\x2d\x92\x62\x7d\xbb\xb7\x31\x5b\xcb\x7c\x84\x21\x8e\xf0\x4b\x83\x24\x61\x16\x65\x11\x8c\x3d\xfd\x77\xea\x05\xdd\xeb\x06\xb2\xac\x1b\x08\x29\x83\x62\x24\x71\x92\xcb\xbf\x99\x1b\x8c\x59\x52\xae\x62\xc6\x9d\xdc\x08\x0a\x40\xee\xb7\x90\x5e\xd2\x7a\xf3\xad\xd5\x99\xc5\x66\xe0\x1c\x38\x50\x63\x9f\x09\xe0\x0a\x61\x7e\x16\xdf\x77\xd6\x08\xf0\x6b\xdb\x97\x56\x9f\x31\x9e\x5b\x7e\xc2\x61\x5d\xbd\x77\x0d\x10\x15\x61\xbd\xdf\x9e\xde\x05\xd0\xa0\x38\xc6\x68\x10\xac\x6f\xd1\x92\xe4\x57\xc3\x37\x23\x08\x02\x0d\x19\x3b\x78\x08\x2e\xce\xda\x08\x06\x7b\xa1\x6d\x00\x87\x05\x1c\xba\xee\xef\x4d\xf0\x61\x64\xc4\xf2\xd5\x02\xa6\x97\xb5\xcb\xa3\xfb\xe1\xb3\x17\xa3\xdd\x6d\xc5\x88\x2d\x0a\xf8\xfc\xe6\xf6\x21\xcc\x0e\x4b\x7c\xdb\xb3\x68\x2d\xa2\x27\x28\x1c\xc4\x23\x0f\x37\x83\x15\x22\x5e\xec\x66\xca\x4b\xd5\xe5\xda\xa6\x3a\x77\x8e\xbd\xdf\x29\x58\xe8\x94\xc5\x32\xdb\x26\x7c\x07\x49\x25\x85\xb8\x60\x9f\x90\x72\x80\x7a\x63\x0a\xf6\x45\xcf\xfa\xcf\xb4\x99\x95\x89\xff\xdd\xd0\xb1\xe4\xe9\x42\xe6\x29\x4f\x77\xcc\x0f\x66\xdd\x1e\xb0\x4c\x6c\xb8\xca\x65\x34\x53\x1b\xc1\x55\x88\x02\xa2\xa4\x9a\x19\xe4\x58\x0b\xe2\x27\x5d\x2e\x45\x94\x7b\x82\x33\x70\xde\xdd\x48\xed\xdb\x83\xc3\xde\xdd\xed\xbc\xce\x57\xff\x49\x2a\x2c\xa7\x95\x1b\xc0\x98\xd1\x1a\xa2\xa3\xf1\xc0\x50\x36\x48\x1b\xd2\x91\x6b\x2f\x83\xf0\x5f\x76\x4d\xb1\x85\xc8\x5f\x04\xd4\xef\x52\xc1\x51\x93\x8f\x7f\xb4\xbc\xc5\x71\x22\xa0\xcd\xf2\xa9\x01\xf2\x04\x37\x58\x08\x5e\x71\x44\x23\xaa\xc2\x18\xf2\x86\x4a\xa0\x20\xda\xf3\x86\xe0\xef\x6f\xe0\x98\x36\xb7\xc7\xf4\x59\xc4\x33\x55\xa6\x71\x21\x9f\xd1\x6f\x38\xe6\x85\xdb\x4e\x63\x6d\xec\x18\xf7\x8a\x6c\x5e\x41\xe9\xba\x27\xad\x73\x45\x3e\x1d\x42\x72\xf8\xd2\xaf\x79\xab\xb2\x1a\x96\xa1\x77\xdf\x03\x02\x22\x32\x2b\xcc\x44\x3a\x8e\xa5\xec\xb2\x5b\x94\x8e\xa4\x02\x19\xac\x1c\xe0\x8e\x8a\x21\x6a\x15\xbf\x4d\x6d\xcc\x94\xad\xde\x5c\x16\x09\xb2\x12\xb6\x49\xdb\x11\x67\x8d\x45\x9a\x7f\xbb\x8a\x03\x17\x57\x63\x81\x16\x9e\x4b\x02\x07\xe0\x47\xb4\x75\x76\xd5\x0b\x95\x21\x9b\xbd\x95\xc1\x82\x02\xec\x95\xc8\xe1\x34\x8f\x8b\x04\x8b\x11\x21\xbd\x0f\xfc\x37\x3c\x49\x98\xcc\xb3\x99\x72\x74\x3d\x48\xbe\x0c\x16\xd6\x02\x17\x63\xba\x72\xc1\x23\xa0\x59\x92\xf0\x06\x3f\x4c\x46\x32\xaf\x41\x46\x77\xa1\x74\xcc\x76\x2b\x38\xd6\xce\xe0\xb4\xcd\x54\x78\xe7\xaa\x4e\x02\x15\x9a\x80\x54\xf1\x29\x6a\x3e\x3a\x10\xc0\xa0\xef\x3c\x78\x4a\xc6\x6c\x82\x6f\x67\x2e\x5c\x56\x15\x16\x7b\x4b\xf5\xba\x84\xec\x32\xb7\x9a\x3c\xb3\xa5\x36\xfe\xde\xba\xe5\x69\x2e\xa3\x22\xe1\x69\x02\x1c\xd8\xcb\x22\x61\x72\x19\x08\xdc\xc2\x1c\x20\x59\x8b\x99\xae\x48\xc3\x59\x6d\x33\x42\x19\xdf\x88\xa0\x4e\x94\xc2\x3b\x49\x90\x51\x46\x06\x5a\x4c\x55\x9a\xb6\xde\x8d\xd9\x65\x55\x68\x1a\xf6\x44\x40\xf2\x26\x33\x34\x7f\xae\xbf\x41\x89\x13\x0a\x56\xcb\xa5\xb9\x52\xbe\x09\x76\x5d\x97\xf8\xc9\xb0\x74\xb5\xa5\x0a\xef\x46\x29\x36\x96\x38\x3e\x80\xac\x7f\x29\x89\xed\x36\xc4\x3e\xb1\x92\x61\x9d\x0c\x09\xf2\x0e\xe8\xe8\xa7\x40\x37\xbf\xda\xd9\x4d\x87\x9e\x2e\xcc\xe3\xc0\xae\x06\xea\x54\xc3\x3b\x1a\xac\x9c\x10\x9c\xd0\x67\x64\x57\x3c\x1f\x8a\x54\x70\xe0\xff\xe1\x1d\x6d\x44\x85\xb4\x76\x73\x7f\xa4\xe9\x53\x49\xce\x8a\x99\x5e\x99\x5b\xbe\x40\xd4\x8d\x5e\x06\x26\x98\xce\x1b\xd2\xbd\x02\x2a\x68\x67\x13\x16\x82\x25\x52\x3d\xd9\xc2\x6f\xb3\x40\x47\x8c\xfb\xd6\xc1\x46\xe0\x20\xe3\x9e\x6b\xf1\xbc\x9a\x88\xd3\x8f\x70\xc6\xfa\x95\x4f\x35\xdf\x90\x4f\x2e\xea\xd3\x7f\x5a\x3a\x71\x9e\xee\xce\x63\xc1\x9d\x15\x35\x1f\x84\xa2\xed\x1b\xdf\x8f\xeb\x32\x82\x69\x80\xcc\xc8\xe3\xcd\xe5\xd5\xfb\xe9\x4d\x59\x1b\xe4\x2f\x8f\x57\x8f\xe5\xbf\xdc\x3d\xde\xdc\x4c\x6f\xfe\x18\xfe\xe9\xfe\xf1\xe2\xe2\xea\xea\xb2\xfc\xbd\xf7\x93\xe9\x75\xe5\x7b\xe6\x4f\xe5\x2f\x4d\x7e\xbc\xbd\xab\xa8\x91\x58\x29\x91\xe0\x4f\x0f\xd3\x0f\x57\x97\xf3\xdb\xc7\x92\xa0\xc9\xe5\xbf\xdf\x4c\x3e\x4c\x2f\xe6\x0d\xfd\xb9\xbb\xba\xb8\xfd\xf9\xea\x6e\x8f\x1e\x89\x7f\xdf\xc6\x21\x3d\x05\xf4\xe4\x60\x75\x9a\x09\x5b\xa6\x52\xa8\x38\xd9\x21\x32\xd6\xde\x03\x2b\x40\xbc\xf0\xa4\x92\x1b\xa1\x8b\x63\x00\xae\x0f\x6b\xc1\xf4\xb3\x48\xa1\x46\x1d\x5b\xf3\xb2\x59\xad\x0c\x66\x79\x5a\x8f\xa1\x77\xe2\xf8\xf3\x74\xe7\x2a\x45\xba\xba\xe3\xf9\x4d\xe8\x21\x6c\x2b\xd2\xae\xbe\x80\x1f\x91\x16\xdb\x5c\x2e\xda\x21\xcb\x3d\x79\x3f\x86\xdf\x54\x91\x8d\xab\x99\xba\xe0\xa6\xd9\x30\x96\x90\xbb\xc7\x80\x16\xa1\x85\x43\x45\x97\xdc\xaf\x2d\xd0\x6b\x5b\x2c\x12\x19\x31\x19\x57\xa3\x0f\x58\x60\x82\x01\xd6\x2a\x69\xdf\x56\xa4\xe0\xd8\x19\x7f\x79\x9b\x8a\x33\x5e\xe4\x6b\x24\x98\x21\xa0\x30\x51\x2c\xcf\x54\x26\xa2\x54\xe4\x56\x93\x4a\xc4\x56\x6d\x27\x78\x12\x74\x86\xea\x2b\x63\xa0\x72\x18\x07\x04\xca\x2d\x11\x75\xfc\x25\xb6\x3e\x20\xa4\x88\xdf\xef\x1c\x1a\xea\xb1\xcc\xaa\x52\xdd\xe0\xc2\xe2\x87\x56\xb3\xc7\xbc\xb7\xb1\xd4\x4e\xb3\x06\x27\xd9\x22\xab\x9b\x5f\x63\xdf\x1a\x0b\x17\x4a\x19\x08\x4d\xad\xd3\x47\x17\xa9\x80\x43\x84\x12\xe7\xf6\xb6\x0f\x40\x0f\x42\x62\x03\x00\xdb\x5c\x6c\x16\x62\xcd\x93\x25\xc6\xf0\xcc\xd4\xf8\x7d\x55\x5f\xa2\x0f\xfa\x49\xa8\x3b\x9c\xb0\x6f\x62\x0e\x15\xde\x13\x7c\xc5\xad\x8b\x9f\xf8\x80\x9f\xe9\xa3\x5d\x55\xb6\x12\x05\x9c\xa7\x1c\xbd\xea\xe0\x63\x84\x83\x7b\x3e\x4d\x5b\xc4\xb2\x5c\xca\x2f\xa6\xc1\x99\x12\x8d\x8c\x82\x80\xae\xb1\xdc\x27\xce\x2e\x03\xa3\x16\x12\x48\x3c\x09\x05\x6a\x3f\x28\x26\xbd\x77\xcd\x0e\x8b\x36\xd7\xe7\xa2\x23\xfc\x0d\x11\x32\x59\x12\x41\x0a\x73\x22\x76\x9c\xa0\xe4\xec\x49\x8c\xd9\x25\x95\xc5\x9b\xbf\x5c\x5c\x4f\xaf\x6e\x1e\xe6\x17\x77\x57\x97\x57\x37\x0f\xd3\xc9\xf5\x7d\xdf\xed\x77\x8a\xaa\x85\xca\xee\xab\x16\x8e\x38\x0b\x71\x4e\x3b\xcf\x17\xcf\xb9\x97\xf2\xdb\x0e\xa6\x64\x7f\xef\x65\xbc\x9d\xc7\x32\x8b\xcc\xf1\xb7\x9b\x0b\x15\x03\x15\xeb\x41\x4b\xb5\xb9\xa9\xea\x5b\xb8\x6f\x30\xf7\x0d\x6b\x41\xf0\xb4\x7b\xb6\x2b\xda\x7d\x0e\x5c\x6d\x10\xb4\x4b\x85\xd9\xfc\xf1\x4c\x05\xa7\xcd\x78\x3f\xff\xbe\x69\xee\xb8\x77\x2b\x37\x51\x7d\x27\xec\xaf\xcc\xb2\x82\x1b\xfb\x68\xbf\x06\x6c\x0c\x2d\xa3\x42\xfc\x58\x21\x1f\xac\x0c\xb4\x70\x99\xb9\xc9\x6f\xb8\x8a\x79\xae\xd3\x5d\xcb\x2b\xf6\x33\x9e\xe1\xb6\x29\x9b\xd0\xf0\xc8\x56\x42\xc4\x76\x16\xf0\xab\x5c\x55\x97\x12\xb2\xc6\x3e\xdc\xfe\xf9\xea\xe6\x7e\x7e\x75\xf3\xf3\xfc\xe3\xdd\xd5\xfb\xe9\x5f\x1d\xf5\xcd\x96\x67\x4d\xda\x65\xdb\x54\x18\xeb\x62\x8b\xf0\x1b\xed\x0b\x0a\x8a\xd9\x76\x48\x44\x46\x2e\x67\xca\x5a\x96\xd4\x37\xbf\x4e\x75\xb1\x5a\x37\x37\x54\xed\xe5\xc7\xc9\xc3\x4f\x07\x75\x13\x28\x52\x50\x75\x08\x77\x5b\x9d\x47\x50\x2e\xc9\xee\x21\xf9\x60\xa5\x7b\x40\xf4\x03\x5f\x6d\x8a\xc9\xb7\x58\xb4\x83\x6e\x2f\x75\xa3\xd5\xe9\xfc\x37\x7c\xbd\x6d\x01\x3d\x04\x76\xb3\x74\x8c\x00\x82\x15\xc5\xeb\x6a\xad\xfd\xd0\xf0\xb7\xd2\x09\xf6\xbb\xb3\x44\xac\x56\x22\xc6\xe5\x55\x6d\x98\x22\x56\x64\x02\x23\x7f\xae\x37\x8d\x22\xc9\x4b\x1d\x71\x30\x3b\x74\x54\x7f\x03\xfe\xd1\xfd\xa4\xd9\x56\x5c\x58\x09\xf4\x48\xab\x2c\xe7\xaa\x25\xed\xfa\x5c\xc7\x33\xf6\x32\x45\xb7\x29\x73\x85\x13\x14\x20\xb1\x01\x76\xbf\x0f\x0e\x49\x38\x91\x8c\x96\xa2\x88\x47\x20\xaf\x15\x68\xb6\x37\x4c\x02\x44\x1a\xef\xac\x45\x7c\xfd\xe0\x46\xe7\xd5\x89\x78\x61\x20\x30\x8a\x3a\x26\x44\x59\x8a\xd1\x20\x10\x07\x6a\x85\xd1\x0e\x9a\x90\xca\x93\x7f\xa6\xa1\xc7\x5b\x6b\x39\x30\xcb\x2d\xf3\x92\x9b\x20\xe7\xbc\x0d\x8f\x6f\x95\xfc\x70\xdf\xf2\x36\xd5\x71\x11\x59\x6e\x0a\x68\xd6\xe3\x41\x28\xa0\x65\x0f\xd8\x98\x9d\x99\x69\xa6\x4b\x8a\x88\xcf\x80\xe1\x63\xa6\xda\x92\x2f\xa1\xa6\x76\xc3\x0a\xf8\x68\x4f\xad\x63\xe6\xbe\x61\xf4\xdb\xb7\xa0\x1d\xec\x7e\xf5\x67\xcc\x7e\x1d\x9c\xbd\x16\x38\x0d\xcd\xcb\x82\x63\x66\xb5\x7c\x1c\xb7\x95\xa2\x3b\xab\x3a\x0c\xf5\xd3\x0f\x34\x51\xa6\x76\xc2\x23\x72\xcd\xb3\x40\x43\x3e\xec\x38\xbc\x4d\x99\xbe\xa9\xda\x5d\xe7\x09\x1e\x17\x21\xe8\x95\x5f\x19\xe1\x9d\x5a\x66\xd4\xfb\x50\x8a\xc7\xe9\x8a\x0d\x5b\xf8\xa1\x73\xe4\x2e\x2f\x68\xf7\xc0\x60\x25\xbc\x50\xd1\x9a\x6d\x13\x8e\x35\x97\x6b\x9e\xe1\x92\xb6\x20\x03\xbe\x90\x89\xcc\x81\x2e\x02\x73\x5f\x95\x11\x36\x37\x1a\x9e\x3e\x59\x86\x46\xee\xb9\x41\xba\x16\xfd\x91\x60\x4e\xf7\x56\x5f\x15\xce\xe9\xb7\x6c\xf0\x8b\xce\xcc\x99\x5f\x96\x04\xe5\xf4\xd3\x61\x2c\x1e\x2c\x4b\xff\x2e\xc3\x66\x96\x5a\xfc\x58\xfd\x79\x69\xbc\x1b\x0e\xea\xe1\x50\x06\xa2\x1e\x1e\x60\xe6\xab\xc4\xc4\x8d\x3b\x6b\x99\x68\xde\x22\x8e\x69\xdb\x46\x9e\xe1\xb6\xb6\x63\x5d\x2c\xda\x98\x2d\xb1\x57\xdd\xad\x77\xc5\xfd\xed\xbe\x3d\x55\x5c\x30\x34\x80\x3c\x17\xb9\x1c\x16\xda\x08\x5e\x9a\xe7\xe2\x0c\x7e\xde\xdc\x38\xb1\xfe\xf4\x7e\xe7\xda\x42\xf3\x6c\xf7\x8e\x3f\x13\x40\x66\xf5\xd5\xf5\x97\x82\x1b\xd3\x70\xbb\xbc\x47\xfe\x82\x63\x16\x59\x2e\xeb\x2b\xac\x79\x27\x56\x9f\xfa\x50\x4e\xaa\x84\x6b\xa0\x77\xed\x5a\xd3\xdb\xdc\x9b\x5f\xf7\xdf\x90\x65\x05\xe9\x6d\x2a\x35\xb0\x0c\x90\x6e\x75\x07\x05\x58\xe3\x73\x8f\x18\xc9\xcf\x85\x28\x84\x59\xfb\x8b\x22\x5e\xd5\x63\x9b\x03\xbc\x33\xff\x4a\x6b\xfd\xc2\x36\x45\xb4\x66\xb6\x71\x16\x8b\x84\xef\x4a\xaf\x06\xfe\x52\xae\x13\x20\xd5\x3c\x90\xe1\x2f\x2a\xb2\x5c\x6f\x00\x84\xe9\xdb\x4d\x0b\x05\x0b\x9e\xf1\x3c\x4f\xe5\xa2\xc8\x1b\x01\x5b\x25\xc6\x9f\x03\x13\x5a\xf7\x1f\xaf\x2e\xa6\xef\xa7\x95\x6c\xd2\xe4\xfe\xcf\xe1\x7f\x7f\xba\xbd\xfb\xf3\xfb\xeb\xdb\x4f\xe1\xdf\xae\x27\x8f\x37\x17\x3f\xcd\x3f\x5e\x4f\x6e\x4a\x39\xa7\xc9\xc3\xe4\xfe\xea\x61\x4f\x5a\xa9\xfe\xd4\xf6\x89\xe0\x01\x21\x91\x85\x85\x5a\x66\x56\x7b\xbb\xa4\xa7\xfe\xc0\x26\x96\x9e\xa9\x44\x20\x66\x53\x83\x90\x79\x47\x9d\x52\xca\x20\x5e\xf2\x9c\x93\xee\xf3\x98\x4d\x98\xd5\xef\x06\x30\x74\x66\x9c\x05\xe2\xae\x31\xb3\x83\x4d\x18\x8f\x21\xf2\x37\x37\x2f\x3d\xa5\x97\xc4\x1a\x95\x88\x90\xa4\xd8\x56\xfe\xcc\xd4\xd5\xb3\x50\x79\x01\x0c\xaa\x3c\x49\xac\xce\xba\xfd\x42\x50\xe3\x69\x7b\x99\xc9\x8d\x4c\x78\xea\x55\x82\x6e\xa9\x2d\x70\xd8\x6d\x5f\x1d\xa5\x47\x5d\x3a\xc2\x5e\x1e\x1e\xa7\x0c\xfa\x7d\x71\x3d\x05\x17\x28\xca\x2d\x05\xbe\x7d\xf8\x4c\x21\x2b\x11\x3d\x71\xc3\x01\xa0\x9f\x6b\x8a\xa7\xe1\xe3\xe9\xcb\xed\x0b\x31\x3b\x66\x13\xdb\xc8\xf3\x6b\x81\x80\x5c\x27\xed\xbf\x5c\xa9\x3c\xdd\xf5\xf6\x6b\x1e\x80\x43\x35\x03\xdf\x94\xf0\x3e\x65\xe5\x20\x0c\x77\x30\xdb\xfa\x0d\x38\x3b\x16\x8c\x46\xd1\x78\x17\x74\x17\xc0\xd3\xda\xe2\x7f\x27\xe6\x10\xfa\x5e\xc7\x21\xa4\x50\x80\x51\x58\xe8\x42\xc5\x19\x21\x93\x36\x52\x9d\x6f\xf8\x97\x77\xf6\x4d\xb1\x24\xd9\xf1\x77\x03\xdd\x8c\x48\xcc\x4d\x64\x67\x8c\x5c\xf7\x70\xcd\x54\xc7\x78\xed\xf7\x16\xad\x65\x85\x6b\x8f\xbf\xa3\x22\xc6\xea\x59\xec\x9a\xe6\xaf\xa6\xc1\x80\x38\x2e\xda\xf0\xd0\xc8\x36\x15\xe6\x8b\x0e\xc0\x95\x20\x2e\xcf\xfd\x37\x00\xb5\x4b\x3a\x51\xcd\xb6\x3b\xcc\xf2\x1e\xb5\x6d\x1a\xf3\xcb\xaf\x20\xa2\x41\x4f\x32\x73\x86\xd9\x66\x1b\xe8\x24\x60\x3a\xa5\xd1\xcc\x64\xfd\x97\x5e\xb0\x25\x54\x69\x90\x0e\x6c\x2a\x20\xb0\x0d\x53\x61\x59\x5f\x81\x94\xa4\x96\xc2\xb6\x4b\x20\x11\x19\x84\x7b\x95\xb9\x6e\x89\xcf\x05\x65\xec\x7e\xfb\x9b\x61\xe7\x6c\x9e\xee\x98\x65\x18\x0f\xab\x44\xa8\x48\x8a\xce\x5c\xe8\x57\xa1\x64\x13\x53\xd1\x5d\xa1\xcc\x51\x7c\x0a\xb0\x43\xff\x6c\x56\xe5\xa1\xf4\x9f\x7b\x0b\x29\x6c\x20\x36\xc5\xef\xbf\x1a\xb5\xdb\xcf\x15\x46\x37\x7a\x1c\xc0\x76\xa9\xf5\xf0\x40\x5b\xf0\xe8\xe9\x85\xa7\x31\xc6\x0a\x01\x7d\x30\x66\x3f\xe9\x17\xf1\x2c\xd2\x11\x8b\x44\x9a\x73\x22\x7b\xc9\x20\xfd\x0a\x1b\x8a\xda\x99\x29\x40\xb1\x23\x73\x8e\x02\x09\xdd\x5c\xae\xd6\xe6\x3e\x19\x24\xcf\x75\x6a\xcc\x51\x8e\x4c\x5a\x5b\x11\x11\xbd\x46\xcb\x00\x2c\x13\xfe\x5c\x67\xaf\x39\xa4\x12\x9e\x4d\x5d\x29\x9e\xcd\x4e\x59\x26\xed\x2e\xb8\x03\x0d\x18\x19\x4d\x24\x44\x18\xb1\x95\x4e\xb8\x5a\x8d\xc7\x63\x26\xf2\x68\xfc\x6e\xd0\x42\xa7\x06\xc3\x7c\x97\x83\xa0\x26\x5a\x67\x22\xd9\x39\x4a\x08\x57\x24\x60\x86\x19\x6a\x44\x32\x89\x21\x8f\x86\xe5\x7f\x5f\xad\xa8\xff\xba\xa1\xf3\xe6\x9b\xea\xe0\x12\xb4\x96\x76\x40\x98\x63\x40\x4b\xf8\xfd\xe6\x9b\xd7\x41\x25\x95\x2d\xac\x8f\x5a\x0d\xad\x13\xfc\x59\xb7\xc9\xcc\x1e\xc4\xd4\xd4\xd8\x12\x11\x39\x1c\x54\x5b\xd5\x16\xb1\xa8\x94\xbb\x1d\x51\xe9\xd6\x51\xb4\x36\xb0\x5e\xad\x61\xdf\x35\x6c\x8b\xca\x74\x0f\xde\x16\xfb\xb9\xc2\x1b\x5f\x68\x60\x3d\xa0\x2f\xdc\x1d\xe2\x3a\x61\x49\x51\xb2\x83\x1b\x97\xab\x0e\x84\xc8\x72\x1c\x44\xc6\x4b\x81\x7f\xa8\x53\xf1\x99\x03\xc7\x05\x1e\x24\x0a\xb2\x5c\xa7\x7c\x25\xd8\x46\xc4\xb2\xd8\x34\x1a\x1b\xd7\xdd\x63\xd0\x5e\x3a\x29\x36\xed\xc4\x4f\xc7\x3a\xd0\xbe\x93\xf8\x6f\x17\xf0\xb8\xde\x0e\xb4\x17\x54\xb6\x92\x0d\xd4\x5f\x0c\x83\xd3\x58\x9b\x93\x32\x95\x19\x50\x94\x1d\x52\x16\xe6\x9a\xc1\xa6\x21\x5b\xb7\xdb\x62\xf8\xb5\x34\xbb\x67\x36\xbb\x43\x3f\xc9\x70\x56\x21\xc5\xd7\x7e\x28\x54\x31\x64\x83\xe7\x08\x04\x01\x0e\xca\x6b\x82\xdb\x18\x50\xf3\x12\xc8\x05\x1a\xa4\x4c\x7c\xae\xd9\xd2\x16\x1a\x3d\x89\x40\xc2\x30\x06\xd2\xde\x17\xe4\x01\xf9\xf3\x1f\x32\x9b\xb3\x27\x58\x85\xf7\x58\x72\xff\x10\xcc\x0d\x3c\xff\xd6\xa2\x69\xf0\x0d\xb1\x09\x50\x05\x8a\xb9\xca\x1b\x1b\xf0\x60\x33\x68\x0b\x7f\xf2\x33\x2f\x92\xe6\xaf\x53\xfb\xf0\x55\x14\x00\x99\x7c\xba\x67\x38\xd4\x44\xef\x9a\x76\x75\x34\x68\x64\x3f\x9e\x07\x86\x6b\x7e\x80\x27\x58\x9a\x07\x1c\x74\xcb\xef\x6b\x86\x5d\xe4\xd1\xda\x7b\x1e\x65\x25\x4f\x52\x77\xa2\xf7\xdc\x78\xc2\x5a\x84\x4a\x86\x98\x33\xb9\x52\x3a\xe4\x5a\xd7\x4a\x40\x92\xc6\x18\x20\x1d\x36\xcb\x64\xbe\x1f\xd8\x33\x90\x55\x69\xdf\x52\xcb\x35\x02\x36\xe8\x3d\x4b\xb9\x36\xb8\x52\x48\xe4\x62\xb1\xa8\x48\xbc\x13\x91\x58\x50\x95\x66\xb5\x5c\xdd\x3e\x53\xe5\x47\xd5\x06\xc9\x22\x6f\x64\x2a\x90\x1d\x31\x33\xde\x5b\x2e\x9f\xcd\x46\xad\x2f\x6b\xb7\x40\xc1\x02\xd4\xd7\xde\x4c\x61\xb7\x03\x8a\xc5\x27\xb1\xcb\x42\x65\x22\x5a\x51\xac\x6d\x41\x4a\xf3\x3e\x34\x5f\xfb\xa7\x02\x06\x6e\x1e\x28\x2d\xf7\x3b\xcb\xf0\xa1\x1f\xcc\x8f\x3b\x20\x7d\xb5\xc6\xcd\x1a\xf4\x95\x5c\x3e\xa6\x48\x66\xc2\x8f\x33\xcd\xa1\x47\xed\x34\xa8\x70\xfb\xf0\x2c\x5c\x7c\xcd\xfd\x76\xa6\x88\x85\x35\x38\xe4\x8c\xc1\xa9\x4f\x1b\x95\x97\x22\xf7\xe3\xae\x44\x8d\x01\x0c\xb9\x56\x2e\xb6\x59\xfc\xdc\x0a\xdb\xcd\x14\xc9\x87\x83\xfe\x37\xc5\xf0\x1a\x1f\x78\x20\x14\x8c\x26\xb7\x15\xfe\xe5\xaf\x30\x34\x70\xc4\x8e\x86\x12\x57\x78\xfb\x89\x84\x19\xbe\x89\x6a\x44\x5e\x59\xdc\xd5\xfd\xd5\xc5\xdd\xd5\xc3\x57\x83\x87\x59\x6c\xd6\x60\x7c\x98\xed\xe7\xe5\xd5\xfb\xc9\xe3\xf5\xc3\xfc\x72\x7a\xf7\x1a\x00\x31\xfa\xe8\x00\x84\xd8\x3d\x91\x3b\x5f\x68\x95\x8b\x2f\x47\x9d\xc9\x69\xa1\xe6\x7c\x40\xa5\x82\x23\x50\xef\x72\x77\xb0\xd1\x3a\x39\xb5\x63\x8e\x26\x6e\x3e\x3c\xd1\x1c\x17\x75\xa0\x66\xbf\x94\x49\x02\x65\x8e\x2e\xbc\x4e\x45\x41\x66\x50\xc1\xfe\x58\x59\x5e\xb2\xa9\x33\xb5\x28\xb1\x73\x43\xc8\x6f\x6d\x2e\xc1\x58\xe0\xb8\x35\x03\x90\x4a\x28\x1f\xeb\xe2\xaf\x5e\x49\x25\x7c\x37\x50\x8e\xb2\x50\xac\x95\x74\x94\x26\xf1\x35\xab\x58\xc9\xf1\xea\xeb\x6b\xda\x15\x57\x5a\x9f\xd6\xfd\xb4\x1f\xba\x37\xc4\x4d\x2c\x15\x3a\xa6\xa5\xdd\x7c\xdf\xbc\x74\xcf\xfd\x16\x80\x71\x37\x33\xc9\x21\x07\x01\x8a\x8f\x7e\x22\x69\x22\x50\x39\xc2\x27\x27\x9e\x24\xa2\x68\xf4\xb2\x32\xce\xc6\x14\x9a\xb1\x96\x90\xa9\xe0\xc4\xdc\x10\x25\x45\x96\x8b\x94\xc2\x26\x93\x4f\xf7\x33\x85\xb2\xe0\x74\x0a\x91\xba\x00\x3e\x02\x31\x1c\xba\xf4\x7c\xeb\xa1\x84\x16\xec\x2d\xc6\xa8\x37\x82\xab\x0c\xd5\x78\x93\x44\xa4\x7e\x65\x60\x7f\x84\x88\x49\x91\x09\x24\x9b\xfd\xef\x49\x90\x55\xc3\xae\x35\xfd\xa5\x4f\x49\x92\xb4\xba\x9e\xda\xaa\x68\x01\x20\xfa\x9a\x2b\xa7\xa1\x4e\xa1\xef\x2a\x22\x6c\x6d\xe3\x22\x2a\x57\x0d\xf4\x5a\x4b\x0f\xd8\xdc\xaf\x4b\xe9\x84\x4b\xa9\xc7\xb9\x1e\x9e\x12\x6c\xad\x8d\x01\x75\xc2\x00\x3e\xcd\xec\xaa\xf8\x13\xc0\x3f\x99\x61\x6c\x3c\x75\x2a\xf2\x53\x47\x9c\x3a\xa8\x37\x75\x1c\x9c\x73\xd2\x40\x17\xe2\x75\x4e\x6c\x6e\xa7\x53\xd9\xea\x75\x68\xb9\x26\x16\x6f\xa7\x74\x6e\x0b\xec\x1d\xc4\x8d\xf0\x7a\xe6\x0b\x8e\xd9\xa1\xb3\x8f\xc4\x96\x60\xbd\x94\xf9\x91\xea\x30\x0f\x21\x2e\xb0\x54\x44\x89\xbd\x08\x05\x26\x09\x41\xec\x09\x0e\x86\x2c\xbe\xc3\xf5\xc7\xca\x6b\xce\x91\xe5\x1d\x04\x76\xb8\xb9\xbd\xb9\x0a\xa1\x0a\xd3\x9b\x87\xab\x3f\x5e\xdd\x95\xca\x6f\xaf\x6f\x27\xa5\x12\xda\xfb\x87\xbb\x4a\xe5\xec\x8f\xb7\xb7\xd7\x57\x35\xcc\xc3\xd5\xc3\xf4\x43\xa9\xf1\xcb\xc7\xbb\xc9\xc3\xf4\xb6\xf4\xbd\x1f\xa7\x37\x93\xbb\x7f\x0f\xff\x72\x75\x77\x77\x7b\x57\x79\xde\xe3\x45\x37\x7a\xa2\xf4\x1a\xcd\xe1\x1f\x9f\x9c\x0d\x78\x03\x1b\xb7\x71\x59\x9f\xed\x88\x5d\xdc\x13\x84\xb5\x6f\x39\xda\xea\x5a\xdb\x5c\xb0\x31\x4c\x57\x07\xad\xba\xd3\x0b\xca\x95\x86\xee\xf3\x71\x44\xc5\x39\xcf\x1b\xef\xbf\xbd\x03\x13\x24\xe0\xfc\xb9\x10\xe9\x8e\x78\x5e\xf0\xd2\x88\x7f\x89\xb8\x42\xf4\x6a\x2e\x36\x5b\xa8\x86\x0a\x61\x97\x33\xf5\x09\x32\x56\x88\xec\x78\x93\xb1\x3f\x42\xee\xc9\x7e\xd9\x0b\x9d\xc3\xa0\xfc\x05\x9f\xe1\x3e\x1b\xcf\x54\x49\x20\x3a\xf8\x55\xac\xa3\xc2\x45\x33\xc6\x33\x65\xb9\x74\x63\x1d\x65\x63\x38\x7a\xc7\x3a\x5d\x9d\x93\xea\x95\x31\xa6\xfa\x69\xa1\xf5\xd3\xb9\x50\xe7\x70\x39\xc8\xcf\x79\x91\xeb\x73\xc8\x5b\xe3\xe0\x67\xe7\x56\x1c\xc7\xaa\x0b\x65\xe7\x6b\xf9\x2c\xe0\xff\xc6\xeb\x7c\x93\xfc\xaf\x6c\xbb\xfe\x72\xb6\x4a\xd2\x33\xf3\xdb\xb3\xf0\xb7\x67\xf6\xb7\x67\xf6\xb7\x67\xe6\x67\xf8\x7f\xdb\x1d\xc6\xd9\x04\xa9\xf3\xcf\x94\x54\x99\x48\x73\x58\x86\x2f\xa9\xcc\x85\x57\x5e\x67\x6f\xfe\xfb\xbf\xd9\x38\xe5\x2f\x58\xc7\x70\xc9\x73\xfe\x11\x2f\x7a\xff\xf8\xc7\x1b\x88\x6c\x23\xd0\x78\xcb\xd3\xcf\x85\xc8\xcd\x95\x33\x11\x51\xce\xfe\xf7\x4c\x41\x28\x7c\xb3\x9b\xe7\x78\x01\xc6\xcb\x60\x9c\xb1\x7f\xc3\x36\xa7\xc8\x79\x14\x67\xa6\xa5\x16\x88\xa3\xe4\x49\x83\x9e\x5a\x4b\xac\xe4\x73\x72\x49\xdf\x1f\xb0\x5b\x3e\x27\xe5\x2d\x62\x59\xbb\xb3\xcf\x09\x10\x6b\x25\x9a\xdb\xac\x39\x73\x8b\x17\x1c\x16\xea\x5c\xd3\x1e\xa9\xe5\x68\x5e\x35\x5f\xd2\xbc\x57\xee\x91\x77\xd1\x86\x50\x6a\x6a\x61\x10\xb4\xf1\x01\x21\x48\x63\x48\xb3\x43\xee\xf1\x4a\x8a\xda\xf5\xf0\xe6\x60\x1c\x28\x87\xe1\xda\x43\x0f\x32\xfb\xfd\x0f\xe7\xe7\x23\xb6\xca\xe0\x1f\x8b\xcf\xf0\x0f\x48\xe3\x9e\x8a\x3a\xac\x36\x98\x0e\x91\x50\x9f\xe5\xfd\x33\x71\x0a\x38\xc3\xd7\x60\xab\xac\x2c\xd3\x1f\x0b\x15\x27\xc2\x97\x65\x94\x62\x53\x89\xb6\x7a\x8e\x78\x43\xa9\xf2\x82\xc3\x1c\x2f\x44\xc4\x8d\xe1\xab\x3d\x1b\x51\x3e\x7a\x99\x0b\x85\xd7\x92\xd4\x8b\x28\x70\xbc\x42\x40\x8a\x1d\x30\x29\xa0\xcb\xbf\xd9\x82\x48\xbf\x84\x78\xfd\x03\xd2\x3f\x8e\xaa\x1f\x81\xcc\x36\x32\x19\x02\x3f\x17\xaa\x81\x0b\x1b\x38\xc3\x72\xd6\x22\x35\x37\x93\x2d\x57\x31\xcf\x60\x05\x2e\x53\x08\x3b\xa7\x8c\xd7\x3b\x3a\x42\x5c\x94\x2e\x72\xe0\x12\xc0\x14\x4f\x38\x12\x48\x35\x19\xf4\x79\x14\x74\x02\xcf\x04\x60\xbc\xab\xfd\x70\x3c\x53\x4e\xa2\x1e\x41\x09\x78\x65\x89\xf4\x76\x47\x95\xe2\xd5\x41\x97\xf6\x0a\x43\xc3\x3d\xf2\x89\xbf\xea\x77\x47\x4c\x96\x63\x9c\xc0\x6a\x99\x07\x42\x65\x56\x4c\xed\xad\x50\x91\x8e\x45\x9a\xbd\x33\xdb\x10\xb8\x9e\x73\xcf\x19\x29\x33\x3f\x19\x4e\xd1\x9e\xae\x6d\xa6\x79\x47\xff\x6e\x46\xa7\xc4\x83\xd8\xe4\x3e\xec\xdf\x2a\xdf\x7b\x3a\xb2\xa9\xbf\xf4\xaf\x5f\x35\x35\x19\x02\x6c\x2c\xc0\xec\x70\x5f\x10\xb7\x6c\x68\x71\xb1\x51\x12\xc0\x47\xe7\xc4\xaa\x42\x49\x73\x64\xe5\xe6\xc2\x9e\xcf\x14\x9d\xc0\x23\xb6\x14\x3c\x5f\x03\xc2\x28\x7b\x46\x63\x8c\xc7\x7d\xfe\xa2\x7d\x32\xd4\x92\x68\x03\x2a\xa9\xd4\xb8\xbf\xad\xe3\xd7\x20\xb5\xc3\xa3\x1c\x33\x3d\x6d\xf4\xc2\xce\x55\x81\xc1\x6a\x34\x88\x07\x8c\x83\xe5\x64\xae\xea\x1f\x84\x94\xe0\x30\x12\x3b\x8c\xd8\xb3\x6a\x3f\xf0\x03\x63\x78\xf0\xed\x30\x1f\x17\x18\x47\x28\xeb\x24\x50\x13\xee\x33\x1f\x4c\x0f\x89\x31\xc1\x49\x6e\xdb\x54\x1d\x03\x01\x1d\x38\xac\xfe\xc3\xfc\x74\xef\xcd\x21\x13\xa9\x25\x8c\xc6\x77\x45\x62\x9e\xb5\x4c\xe3\xb3\x2d\x4f\xf3\x9d\x5d\xbe\x89\x5c\x00\xcf\x6c\x22\x9f\x04\x9b\xa4\xa9\x7e\x39\xf5\x28\xb4\x9a\x96\x07\x9e\x3d\x9d\x98\xe7\x0b\xe8\xf7\x86\xf0\x74\x35\xd2\x72\x95\xb0\x47\xb1\x98\x1f\x46\x01\xd6\x46\x63\xd6\xf8\x9c\x54\xe4\xe9\x6e\x6e\x16\xe2\x66\xdb\x6a\x29\x7a\xa1\x57\xfb\x3b\xb9\xc3\xd8\xc5\xe0\x7c\xee\xc1\x2e\x56\x9a\xd5\xef\x87\x5d\xac\x81\x38\xac\xce\x2e\x36\xbd\x99\x3e\x4c\x27\xd7\xd3\xff\x5b\x69\xf1\xd3\x64\xfa\x30\xbd\xf9\xe3\xfc\xfd\xed\xdd\xfc\xee\xea\xfe\xf6\xf1\xee\xe2\xaa\x9b\x2e\xa0\xde\x7b\xef\x82\x9f\xb1\xf0\x39\x3f\xb0\x87\x20\x63\x86\xa8\x4f\xf2\xbf\x49\x68\x09\x56\x95\xd9\xcc\x52\xad\x46\xb0\x51\x7f\x60\x57\x69\x3a\xdd\xf0\x95\xf8\x58\x24\x09\xe4\xb5\x11\x62\x7d\x91\x0a\xb8\x78\x8e\xd8\x47\x1d\x4f\x83\xdf\x41\x5d\x48\xe3\x6b\xc0\xf3\x79\x1c\xa7\x22\xcb\xf0\xf1\x23\x7a\x7e\x90\xc5\x75\x35\x27\x84\x62\xe0\xcf\x5c\x26\xe6\xfe\xf6\x03\x48\xbf\xea\xe5\x12\x71\xcc\x23\x87\x60\x67\x9f\x0b\x9d\x73\x26\xbe\x44\x40\x91\xd1\xbc\x4e\xae\xf5\xea\x1b\x60\xc6\x7a\xc4\x09\x5b\x2e\x29\x20\xa8\x31\x6f\x3e\xce\x9b\x0d\x01\xbd\xe5\x07\xfc\xe9\x7b\xfc\x65\x63\xeb\x79\x9e\x9c\xa0\x64\xef\x5a\xaf\x9a\xe9\xcd\xc1\xbb\x26\x4e\x76\xaf\x71\x0e\x05\xc0\x7a\xc5\x32\xa9\x9e\x66\xea\xd3\x5a\x28\xa6\x8b\x14\xff\x04\xd7\x7c\xe3\x66\x26\x45\xb6\x16\x31\xd3\x45\x3e\x62\x2f\x82\x6d\xf8\x0e\xdd\x66\xb8\x13\x38\x4e\x66\x58\x32\x70\x8a\x98\x5f\x27\x52\x19\x6b\xb1\x95\x16\x20\x5a\x9d\xfa\x53\xdc\xb8\x2c\x41\x0c\x3f\x9e\xbf\xad\xeb\x3c\x2d\x01\x25\xa0\x00\xc8\x03\x58\x6c\xa6\x96\x2c\x37\x48\x3e\x69\xfd\x54\x6c\x3d\x95\xd4\x1b\x1b\x25\x86\xe1\x7e\xd6\x32\x66\x71\xb1\x4d\x64\xe4\xec\xee\x8b\x4e\x5b\xf9\xf2\x10\xc9\xdc\xff\xd4\xa9\xe2\xf3\xbb\x5e\xac\x01\x26\x1d\x40\x1a\x3a\x98\xf3\x5e\x99\x3b\x90\x49\x15\x25\x05\x88\x59\x14\x99\x48\xcf\xf2\x54\xae\x56\xe0\x80\xdb\xa2\x8b\xef\x9f\x5c\xd0\x93\x17\x1d\x5f\x5f\x10\x56\xff\x25\x7a\x25\x23\x9e\x84\x28\x33\x9f\x9e\x72\xec\x65\x76\xdb\x93\xd4\x17\x00\x52\x6d\x87\x5a\x59\x19\xb6\xa9\x00\x02\xbd\x39\x98\xf2\x39\x99\xbb\x63\xfa\xbd\x64\xe6\x82\x6e\x55\xc0\x7d\x79\x2c\xb8\xe7\xb6\xaf\x20\x12\x61\x9f\x6d\xf5\x1e\x50\xef\x55\x41\x2e\x46\xbf\x28\x91\x82\x07\x0b\xf9\x37\xf3\xa6\x4a\x83\x6f\xe2\x34\x20\x1c\x50\xcc\x6a\xa0\x2c\x1d\x22\x0e\x4b\x98\x56\xf2\x59\xa8\xaf\x4f\x06\x19\x3c\x20\xe2\xd1\x5a\xcc\xad\x5f\x7e\x6a\x93\xe5\x0e\x80\x81\xc6\xca\x92\x31\x87\xa6\x94\x49\x20\xe0\x89\xf0\xea\x84\x3d\xae\xdb\x2e\x14\x18\xe8\x80\xc6\x9b\x4e\xcc\x63\x51\xd2\xd7\x3e\xfa\x3d\x7b\x99\x66\x9f\xed\xb6\x1d\x61\x9c\x5d\x8a\xe8\x89\x3d\xde\x4d\xb1\x2c\x4b\xe6\xcc\x98\x82\x6c\xed\xc9\xe5\x5b\xef\x6e\x39\x5f\x7d\x43\xd9\x5c\x4f\xf1\xea\x34\x41\x4c\x87\x28\x33\x0d\x85\x2b\xc6\x48\x66\x4e\x30\x7d\x9b\xf0\xdc\x72\xa6\x43\x20\x9e\x65\x1b\xa0\x48\x2f\xf2\x40\x57\x84\x44\x8e\xfb\xf8\x14\xc0\x32\x5e\x0e\xaf\x56\x4f\xf3\x63\xc5\x32\x1c\x24\xf9\xd0\xcb\x5b\x77\x1c\x67\x95\xe8\x05\x54\x1a\xb7\xe7\xc5\x3b\x4c\x83\xd9\x17\xa9\x8c\x87\x1c\x2c\x76\x4c\x6e\xdd\x4f\xbb\x3a\xe8\xa4\x90\xdd\x93\xc0\xa6\x4b\x0c\xb5\x56\x2e\x5e\xd5\x4a\xb6\x7d\xb7\x3c\x48\x4d\x65\x2e\x37\xe5\xfc\x40\xcb\x33\x0b\x71\x25\xdd\xa1\xad\x5d\x7f\x97\xa3\x26\xba\x5e\x1b\xbd\x67\x2c\x7d\x39\x75\xf7\x24\x1f\x51\xe0\x8a\xd5\xb8\xae\xca\x75\x08\x59\xa0\x9d\x3a\x84\xf9\x80\x6e\xb9\x9b\xc4\x12\xfe\xb2\xd7\x8c\x56\xc7\xfd\x81\xb2\x95\x47\xb1\xb7\xbc\xc2\x8e\x2a\x72\xed\x83\xcd\xf0\x3e\x53\xa0\xd0\x0a\x91\xdd\x60\x36\xa6\x71\x2d\xc3\xe4\xc4\x6a\x60\x18\xec\xd6\x1c\x80\x43\x19\x84\x84\xd9\xa6\xc2\xa6\x2d\x76\x22\x77\xf5\x7d\x89\x15\x4f\x80\xa8\xbc\x7b\xeb\x72\x81\xb3\xad\x61\x74\xa4\x14\x10\x43\x27\x4f\x23\xd2\x9b\xad\x56\x42\x11\x16\x4b\xe9\x99\xa2\xc6\xad\x04\x9e\x0b\xec\x97\x20\xef\x23\x8a\xa7\x20\x80\x52\x64\x3a\x79\xa6\x0c\x4e\xc0\x3d\x0b\xe2\x19\xa6\x83\x17\xc6\x35\x35\x17\x31\x48\x2d\x12\xfe\x19\x10\x61\x15\x1d\xb8\x54\xac\x64\x96\x8b\xb0\x4a\x20\xfc\xfd\xc9\x24\x7b\x4a\x77\xb7\xae\xa1\x6f\x95\xec\xd9\xe7\x84\x99\x5d\x3b\xa0\x3f\xbb\xad\x88\xa7\xee\x77\xdd\x8b\xa1\x52\xc8\xe5\x8d\x44\xe9\x14\xc0\x35\x80\xce\x67\x86\x94\x0f\x99\x63\x8d\x75\x93\x44\xc5\xf8\xdc\xe9\x2c\xc1\x14\xad\x0a\x9e\x72\x95\x0b\x91\xcd\x14\xe5\xbd\x90\xba\x24\xac\xce\xc5\x05\xf4\x12\x68\x62\xa0\x6b\x15\xe9\x2c\x47\x26\x00\xf8\xc9\x92\xcb\xa4\x48\x5b\x6f\x3b\xb8\x2a\x0f\x2a\x3f\xec\x1a\xa5\x0b\x68\x96\x35\x4d\x9a\x2b\x64\x09\x76\x91\xab\x9e\xad\x66\xad\xca\x75\x1e\x2d\xaf\x60\x4d\x6e\xff\xf9\x76\xa1\xae\x96\xda\x96\x3f\x64\xf3\xad\x1e\x60\xf1\x48\xd5\xbf\xb1\xb1\xec\x73\x2d\x24\xd3\x91\xbd\xfd\xdc\xc6\xa3\xcb\xb3\x27\x48\x7c\xec\xbb\x09\xee\x0f\xef\xfe\xfe\x77\xfb\xd3\x23\xad\xb6\x0b\x56\xed\x9a\xab\x38\x31\x37\x24\x9e\x57\x4e\x20\x8f\xf7\xe1\x1b\xeb\x27\xb4\x6b\xe2\x59\xac\xe4\x3c\xaa\x01\xed\xf7\x8d\x53\x05\xa1\xdf\xf5\x42\xd5\xa7\x94\x71\xf3\x4d\x78\x4d\x7f\xb2\x93\xd6\x93\xdb\xb0\xed\x4b\x70\x29\x57\xdf\x81\x7b\xff\xa1\x6e\x29\x23\xda\x8a\x74\x7e\x39\xf0\xd7\x91\x9b\x11\x70\xb6\xc6\x98\x85\x54\x7d\x33\x45\x52\x70\x98\xf3\x83\x64\x0f\xd2\x51\x64\xec\xb7\xae\xf8\xe2\xb7\xff\x6a\xc9\x08\x76\x6c\x09\x63\x0d\x8c\x1f\x3a\x8a\x8a\x14\x12\x72\x14\x34\x60\x02\xcf\xa6\x21\x8c\xaa\x13\x3c\x91\x1d\x8c\x02\xdd\xa7\x26\xef\xc1\x45\x89\x4a\x2f\xf5\x00\xc1\x01\x14\xb5\x73\x67\x21\xb1\xaf\xa7\x59\xce\xb2\x5c\x6c\x1b\xad\x52\xc9\xe9\x2a\xeb\x36\x1e\xe1\x76\x79\xd5\xc8\x9e\xbe\xee\x00\x1b\x3d\x09\x2e\x72\x7f\xba\xbf\xbd\x61\x5b\xbe\x03\x44\x52\xae\x49\x70\x13\xf8\x98\xaa\xfb\x77\xdf\x0c\x94\x5f\xbe\xbc\xd9\x70\x4c\x09\x86\xd8\x12\x35\xe4\x4e\x50\xb7\x62\x87\x60\xcd\xd0\x92\x34\x5b\x39\xd5\xc9\xd9\x36\xe1\x4a\x20\x77\x2e\xbc\xff\x98\x55\x1e\x1f\x66\x19\x5d\xbe\x81\x70\x1c\xd0\x01\xb8\xc8\xd3\x5a\x48\x0b\xd5\x84\xe8\x2c\x4b\x51\x1e\x95\x58\x6c\xb5\x11\x9d\x70\xab\x0f\xc8\xa8\xcb\x23\xb3\x4d\xb0\xb8\xd0\x26\x4b\x5d\xbe\x9d\x67\x00\x85\x1b\x30\x51\xdd\xba\x99\x33\x65\x65\xd1\xf4\x4b\xc6\x62\x2c\xbf\x2c\x64\x86\x72\xd3\x18\x8a\x06\x58\x0a\xd9\x17\xcc\x99\xa7\x5c\x65\x66\x42\x21\x9a\x26\x9e\x85\x62\xf5\x62\xbe\xe9\xe5\xb5\xcb\x2c\xe3\x24\x91\x16\x47\xcb\xd0\x07\x8e\xd9\x31\x17\x98\x46\x21\xc7\xfd\x34\xb7\x1f\xf8\xb6\x0b\x38\x7e\x74\x8b\xfb\x66\xc9\x15\x9f\x57\xbd\x4e\x90\x98\x03\x7a\xfe\x12\x7a\x3c\x1c\xbd\x47\x75\xa4\xf9\x69\xe4\xbd\x1c\x20\x54\x7f\x9a\x62\x80\x01\xb6\x27\xe0\x81\x71\xa8\x0e\xe7\x2f\x9b\x5d\x0e\xe4\xe7\x28\x88\x0c\x2f\x37\x66\xf7\x42\xb0\x5f\x9c\xa6\xf2\x2f\x24\xae\x01\x40\x35\x10\xc5\x6e\x1b\xd7\xa9\x5a\xea\xe3\x8c\x41\xba\xaa\x01\xa1\x8e\x1a\x95\xe6\x7e\x1e\x0b\xb5\x82\x6a\x06\xf5\xba\x25\x78\x8d\xef\xb5\x07\x58\xf5\xd1\xdf\xc9\x09\x98\x6f\x7b\x6a\xce\x67\x98\xe2\xc3\xb4\x7f\x4b\x8b\x24\x07\x99\x69\x20\x2e\x7c\x52\xfa\x45\xa1\x2f\x40\x4f\x62\x6f\xcd\xfe\x83\x03\x0c\x18\x08\x09\x5b\x55\xa0\x35\x7c\x07\x4c\x8a\x13\xf7\xdf\xec\x1e\xb3\x14\xd8\x67\xa0\x0a\xcf\xc0\xf9\x21\x92\x6f\xb0\xe6\x6f\x27\x23\xf6\xe3\x88\x5d\x8c\xd8\x78\x3c\x7e\x37\x62\x82\x47\x6b\xdb\x23\xfc\x09\x62\x96\x72\xbe\x32\x6d\x3b\x29\x7a\xff\x00\x60\xbe\x37\x87\x95\x25\x0c\xe1\x81\x60\xbd\x8f\x3c\xd8\x57\xc0\x32\x06\x54\x57\xb2\x19\xdd\x68\xad\xa5\xef\x14\x80\x03\x45\xa4\x53\x0b\x2f\xcc\x72\x9d\x5a\xa8\xd4\x33\x4f\xb9\x54\x50\xdd\xc5\xeb\x40\x51\x7a\x72\xc0\xef\x28\xbe\xf0\x0d\xbc\xbf\x54\x8e\xe2\xca\x0c\xd3\x83\xeb\x7f\xbe\xdb\xca\x08\xc6\xf3\x25\x95\x79\x6e\x4e\xe7\x6c\xa6\xee\xd9\x0f\xff\xc6\x26\xdb\x6d\x22\xd8\x84\xfd\x9d\xfd\xc8\x15\x57\x9c\xfd\xc8\xfe\xce\x2e\xb8\xca\x79\xa2\x8b\xad\x60\x17\xec\xef\x66\xd8\x4c\x7b\x37\xda\x1c\x87\xbb\x11\xe3\x4c\x15\x09\x9e\xfa\x6f\x2d\x0c\xe9\x9d\x7b\x2f\xee\x67\xc7\xea\x39\x67\x7a\x43\x47\xe1\x5f\x5d\x34\x3c\x93\x6a\x95\x88\xdc\xaa\xa8\x97\x00\x63\xf8\x80\x33\x78\xd3\x1f\x66\xca\xc5\xf2\xfe\x6a\x7a\xfc\x57\xf6\x77\x76\x53\x24\x89\xe9\x92\x31\x34\x66\x21\xfd\xc0\x2c\x80\x5f\xa8\xf1\x8b\x7c\x92\x5b\x11\x4b\x0e\x10\x7e\xf3\x5f\xe7\x0f\x30\xdb\xf3\xc2\xd3\xe6\x84\x7b\xda\xd1\xaf\x1f\x63\x7a\x5e\xa5\x2e\xcb\xb1\xf0\xdb\xc9\xef\xb8\xf9\x95\x7f\x3a\xdc\x23\xf2\x64\x61\xb4\x1f\xc8\x61\x45\xea\xfc\x90\xed\xff\x20\x13\x50\x39\x6c\x6d\x5b\x0d\x47\x41\x78\xa8\x1f\x6b\x64\x41\x3c\xe2\xe4\x77\xc8\x1e\x4c\xfe\x7d\x4d\x6e\x8d\x87\xbc\x54\xe9\x06\xbe\xa4\xaf\xf6\xef\x95\x15\x72\xfc\xe3\x3f\x97\xd5\x33\x4a\x43\xac\x65\x2f\x99\x91\x4a\x67\x1f\x29\x76\x01\x75\x82\xe6\x22\xa3\x64\x72\x6e\xb6\xea\xf9\x8d\x56\xe6\xda\x9a\xc9\x15\x32\x14\x00\x80\x25\x03\x4e\x36\xeb\x14\x3c\x94\x5d\xd6\x60\x0b\x80\x7f\x60\xba\x84\xa0\xaa\xdc\x58\x01\x33\x05\xc9\x6e\xa6\xcc\x2f\xe8\x44\x02\x80\xb5\x74\x44\x76\xf8\x34\x2b\x68\x4a\xcf\x22\x83\x1c\x34\xde\xb0\xc0\xba\x34\x40\x8f\x58\x70\x54\x2c\x74\x44\x54\xfc\x26\x20\x71\xa1\xd6\x6c\x85\x2f\x62\xb7\x16\x22\xd1\x6a\x65\x56\x45\x9b\x11\xd0\x1b\x2e\x8f\x81\x34\x84\x5d\xc0\xc6\x5a\x7b\x60\x0e\x4b\xfa\x0a\x4d\x89\x39\x27\x65\xec\xef\xf7\xa4\x39\xed\x22\xb2\xee\x34\xa4\x97\x6b\x79\x89\x23\xeb\x45\x1f\x33\x91\x02\xd3\x22\xe6\xd6\x5d\xb4\x1f\x0f\x4e\x5f\x6f\x8b\x6f\xd4\x6f\x53\x75\x42\x32\x9b\x43\x21\x94\x4d\xb0\xc1\x64\x17\xd4\xeb\xb1\x1e\xbf\x25\x3a\xf3\x35\x15\x61\x1b\xe5\x5f\xe1\x7b\xa6\x35\xfa\xd3\x50\x89\x57\x3b\x7a\xa7\x00\xae\x7d\x46\xc6\xf7\xb9\x5e\xda\x1a\xbe\xfe\x67\x7a\x8d\x73\xbf\x1f\x3e\x22\xe4\xd9\x0c\xb9\xe9\xeb\x0b\xa7\x2d\xdf\xa0\xd5\x9c\x32\x12\xfd\x3a\x5b\x1d\xb0\x5b\xf5\x1e\x7f\xfe\x51\x27\x32\xea\x86\x5b\xd9\xe3\x6a\xad\x5f\x1a\xf0\x2b\x0b\x01\xf8\x43\x8a\xff\x50\xa7\xd0\x43\xcf\x45\x94\xfb\x8c\x5b\xfd\xe5\x7e\x85\x78\x74\xde\xc1\x31\xa2\xec\x86\x0d\x74\x9f\x5c\x0e\x0f\xce\x56\xe0\xd8\x02\x6a\x59\x8c\xb5\x42\x15\x17\xe4\xb6\x23\x4e\x21\xe8\xd2\xc8\x83\x81\x7e\x59\xeb\xc4\xdc\xc5\x54\x4c\x7c\x65\x33\xb5\x15\x69\xa4\x13\x9e\x1b\xf3\xff\x42\x9c\x34\x32\x89\x3d\x7f\xfb\x5b\xc0\x92\x02\xe2\xeb\x1d\x89\xd4\x08\x97\x63\xb6\xcd\x77\x9c\xba\x76\xd9\x59\xa1\xca\xe3\x22\x50\xa7\x03\x87\x75\x2d\xfb\x4f\x04\x62\xc2\xa1\x20\x86\x81\x4a\xb6\xd0\x0c\x7a\xa9\x3f\x83\x22\xbc\x20\x25\xb9\xb4\x52\x58\xf6\xe2\x94\x57\xe6\x95\x96\x59\x75\x28\x81\x77\x0e\xeb\x90\x10\x40\x92\x09\xe8\xce\x46\x70\xf4\xc5\x3c\x0b\x14\x4d\xea\x4c\xf9\xfc\xe8\x9b\x2c\xf4\xcb\x1a\xe7\x19\x69\xd5\x2c\xfc\x6c\xc4\xde\x94\x5e\xf4\x0d\xf0\x92\x29\x0d\xcf\xa3\x1c\x56\x69\x68\x60\xb9\x8e\x98\xcc\x67\x4a\x66\xb8\x32\x53\x91\x88\x67\xd3\xbb\x30\x58\x4c\x58\x17\x7b\x77\xb6\xaf\x0d\x08\x66\x6e\x0b\x5f\x9d\xbe\x29\x6c\xc2\x34\xe4\xb7\xe2\x10\x98\x8e\x45\x66\xfc\x46\x60\xe6\x16\x5f\xcc\x06\x90\x90\x0b\x41\xf8\x47\x2c\x94\xed\x1f\xa0\x42\x50\x42\x6d\xa6\xa6\x4b\xa8\x3e\x84\x9a\xc7\x38\xc6\x5b\xa8\xe5\x6a\x76\x64\x23\x92\x82\xc3\x9a\xee\xe4\x4e\x3e\x1f\x35\x96\x70\x27\x89\x67\x91\xee\x72\x08\xea\xc2\xb8\x2a\xc1\xf3\x35\x93\xf9\x08\x58\x62\xac\xa5\x9c\x29\x1e\x93\x44\x25\x35\x67\x86\x06\xd6\x7d\xc7\x3c\xd3\xe7\x0b\xfd\xdc\xe5\xd8\x1e\x8b\xfa\xc2\x5d\xbd\x4d\xb8\x9a\xe3\x09\xf2\x0d\x70\x5f\x81\xfc\x55\x5b\xaa\xb3\x58\xcc\xed\x12\x3b\x4d\x3f\x9d\xbd\xbf\x2b\x89\xd2\x19\x3f\xd6\x3e\x68\x84\x8b\xc1\x33\x5b\xda\xeb\x89\x8b\xd3\x10\xba\x20\x65\x36\x03\xdb\xdf\x0a\x78\x48\x18\xaf\x20\x11\xec\x6a\xdd\x87\x09\xb3\x2b\xe0\x7b\xc5\x27\xf5\x99\xf9\xca\x19\x52\x9d\xf6\xe1\xd0\x98\x9a\x87\x78\x10\x3c\x66\x4f\xb7\x5e\x17\x22\xd3\x1a\x47\xa9\x43\x65\xec\xdb\x06\xe9\x3e\x84\xed\x0b\x8c\xc3\xb9\x30\x4f\xb3\xbc\x59\x78\x0f\xd3\x0d\xd8\xca\x53\xc6\xa8\xc1\x4e\xf5\x8d\x94\xf8\xaa\x5f\xe8\xd7\x98\x4d\x15\xb3\xee\xde\x88\xbd\xc1\x85\x95\xbd\xa1\x10\x24\x69\xe4\x51\xee\x3c\xa6\xdd\x43\x75\x92\x55\x28\x06\xa2\xd5\xfd\x76\xc3\x4c\x50\x27\xbb\xd1\xab\x8e\xcb\x8f\x12\xd0\xf2\x87\x14\x44\x63\x16\x71\x81\x0d\xd0\x21\x89\xd7\xee\x1d\x3a\xed\xda\x47\xb3\xfd\x0b\xdb\x7c\x17\xfb\xd1\xfe\xd0\x0c\xd1\xb6\xa0\xf3\xd4\x7e\xce\x74\x3a\x53\xb6\x35\x0a\x49\x66\x28\xa7\x50\x6d\x2a\x60\xa7\x21\x9f\x3f\x58\xa9\x00\x62\xb0\x0a\x1a\x20\xcc\xe2\x29\xd8\xaa\x56\x00\x40\x11\x0b\xe1\xd5\x3d\xc7\x6c\xe2\x9f\x66\x1c\x0f\xb3\xc0\x37\x78\xcc\x57\x69\x9a\x92\xc4\x0c\x8a\xcc\x2d\x2b\x54\x00\xac\xcf\x0a\xe0\x36\x5b\x16\xc6\x18\x05\x04\x70\x33\x65\x06\x8f\x2d\x25\xe0\x7e\x69\x5c\x66\xea\x83\xce\x6c\x1d\x77\xe6\xc7\xc3\x62\x48\x69\xd8\xde\x38\x21\x11\xfa\xc3\x25\x1c\xda\x14\xf3\xaf\x28\xcb\x42\x45\x05\x91\x31\xec\x74\x91\xfa\x97\x8a\xb8\x9a\xa9\xff\x32\xc3\x83\xba\x8e\x4e\x14\x55\x2f\x71\x0b\x5b\x25\x5e\xf6\xf6\x17\x6c\xf4\xed\xbf\xbe\xfb\xe5\x1d\xf2\x29\x14\x19\x68\x37\x8d\xca\x07\x88\xe3\x02\x2d\x92\x04\x32\xd1\xf6\x0d\x1c\x0d\x82\x7f\x04\xef\x82\xe5\xd0\xa5\x6e\xae\xca\x2e\x46\x9f\x8d\xde\xb5\x82\x7d\xf0\x79\xc2\x22\x9e\x47\xeb\x33\xeb\xcb\x91\x19\xb3\xa7\x1f\x4d\x1f\x8a\xb8\x18\x4f\xab\x99\x0e\xd3\x5c\x38\xd3\x8d\x63\x80\x2f\xad\x17\xf3\x0a\x00\xac\x79\xa8\x72\xc3\x3b\xfe\x30\x5c\x9c\x5e\x96\xd4\xfb\x79\xee\xeb\x56\x99\xc5\xdf\x38\x29\x4a\xae\xf8\x46\xc4\xec\x0d\xd4\xea\xbc\xb1\x93\x3f\x53\xdb\xc5\x38\xd9\x2d\x73\x22\x17\x32\x83\x32\x06\x0d\x83\x3d\xa7\xdc\x3c\xae\x5f\x93\xf6\x0c\x76\xeb\x45\xab\xd9\xd7\x71\x63\xe3\x9e\xd4\xdf\x61\xc1\x18\x97\x1b\x9d\xfb\x32\x44\xa8\x4c\xa6\xca\xb3\xa7\x11\x5b\xa4\x5c\x01\xfd\x74\x1c\x3a\x55\x7e\x77\xc2\xe5\x19\x99\x7b\x28\x63\xc5\x15\x4f\x76\x80\x1d\x1f\xcd\x14\xd2\x1c\x01\x31\xe1\x2e\x4a\x64\x84\x32\xc8\x15\x3f\x48\x3c\x0b\x95\x5f\x51\x5d\xbf\x05\xa9\x1f\x9b\x5a\x76\x3c\x01\x47\x11\x00\x4e\xcb\xde\x0e\xf7\x04\x08\x3e\xc2\x1a\xa5\x02\xc0\xdb\x8b\x5d\x00\x6a\x75\x0b\x7c\x44\x6a\x28\xc0\x04\xc5\xfe\x52\x2c\x74\x62\xa9\xb4\xa6\x97\x4c\xa7\x40\x27\x9c\x6b\xfa\x93\x8c\xdb\x4e\x31\xa9\x62\xf1\xe5\xa8\x7a\xf6\xee\x03\xc9\xba\x77\xe6\x31\x01\x6b\x6d\xf5\x65\x61\x17\xa5\xc2\x1c\x16\xb9\xbd\xc1\xd5\xbe\x95\x55\x11\x76\x93\x24\x5f\x03\xec\x0d\x01\xd7\x7e\x50\x37\x7c\xc7\xa2\x35\x57\xab\xe0\x0a\x0d\x28\x24\xb1\xd5\x29\xca\xee\x3c\x03\x71\x94\x4e\x6d\xbd\x20\x55\xc1\x11\xea\xdb\x05\xbc\x11\x6c\xa9\x6d\xa9\x1b\x5f\xad\x52\xb1\x82\x12\xee\x99\x2a\xd5\xf1\x02\x69\x96\x65\xfc\xc5\xe7\x74\x95\x41\x9e\x86\x4b\xa0\xed\xd6\x92\xa7\x3b\x57\x44\x46\x9a\x55\x6e\xe8\x6a\xc3\x3a\x62\x52\x8c\x47\xec\x77\x1e\x60\x2a\x22\xad\x5c\x15\x5a\xf3\x3b\x6c\x2b\xa1\xe9\x3d\xb6\xa8\x81\x74\xa0\xb9\xef\xf0\x59\x4d\xf9\xaa\x71\xd1\x74\x96\xf1\xe5\x3c\x2f\x06\xd8\x4a\x52\x37\xbc\x30\x3f\xbe\xc7\xdf\x76\x62\xb0\xf9\xd6\x98\x37\x4b\xf8\x62\xbe\x6f\x2c\xbc\x79\xb6\x67\xe6\x6b\x1a\xeb\xbd\x81\xce\x44\xb7\x07\x3a\x4f\xe1\x52\xda\xaa\xfe\xfd\xb1\xce\xa4\xa5\x52\xbd\xe3\x9d\x86\x86\x32\x2d\x18\x95\x60\xe6\x59\xf5\xba\xd5\x60\x01\x9c\x1e\xbc\x4e\xd1\x6f\x47\xe4\x86\x2b\x98\x2f\x19\xc9\xa6\x03\xa1\xc4\xfa\x01\x1a\x97\x5f\xeb\x6e\xdc\xc6\x37\xd2\x3c\xfc\x8f\x2d\xf7\x62\xeb\x99\x34\x0d\x7a\xb8\x3f\x71\x9c\xd2\x81\xe7\x94\x7b\x3c\x72\x9e\xdb\xe0\xa6\x4e\xe5\x4a\x2a\x9e\xeb\x94\xbd\xfd\x68\x89\x82\xdf\x39\x72\x7b\x18\xc5\x53\x98\x89\xd2\x10\xa1\x99\x68\xbe\x7b\x01\x9e\x59\xc4\xf3\x61\xac\x4d\x4d\x1a\xcd\x7b\xf1\xfa\xe6\x5b\x59\xce\x37\xdb\x90\x70\xd0\x49\x07\xd2\xc8\x24\x38\x08\xcc\x76\x0c\x62\x7c\x32\xf3\x35\x58\x33\x45\x91\x71\x9c\x37\x9d\xda\xc1\x03\xdf\xb6\xed\x6c\xde\x16\xf9\xfc\x40\x12\x0d\x22\xdf\x1d\x48\x43\x58\x4d\xa1\xde\x5d\xdb\x84\x81\xbf\x17\x94\x1c\x6d\x78\x51\xe4\x3f\xcb\xe0\xd4\xc6\x2b\x9e\x33\x1b\xe6\x94\xb4\x5c\x01\x17\x89\x2e\x62\x46\x46\x83\xd2\xb1\xe9\x18\x4f\x1f\x20\x24\x1c\x8f\xdb\xd8\x99\x06\x8a\x82\xb9\xfd\x0d\xbf\x6b\x5e\xe1\xf0\x59\x8b\x85\xeb\xdc\x5a\x34\xb2\xc3\x62\x4f\x84\x44\xf8\xc0\xb7\xdd\x8c\x0f\xdc\xde\x9c\xb1\xc0\xc7\x99\x3b\xeb\x05\x96\xf7\x7e\xcb\x70\xb9\x68\x28\xb0\x23\x0d\x0b\x94\xc1\xbd\x44\xc6\x09\xac\xe7\x30\x90\xdc\xc0\xdf\x58\x4a\xd0\x65\x4f\x47\x3f\xce\x56\xb2\x76\x3f\x6a\xcb\x53\xa1\xf2\x39\x3c\x71\xd8\xc3\xe0\x21\x1f\xe1\xe7\x25\x87\xa4\x57\x40\xf0\x3f\x1e\x34\xc6\x79\x2d\x15\xc2\x7f\xb2\x7b\x8a\x6d\x64\x56\x38\xd6\x9c\x3e\x6f\x25\x60\x4f\x82\x9c\x98\x9b\xb8\x96\xe9\xa2\x17\x3a\x60\xf4\x82\x17\x2a\x99\xce\x5e\x2f\xe4\x7b\x8f\xc2\x1f\xa6\x15\x0a\xf3\x50\x05\xa5\x31\x65\xf6\x6f\x7e\xcd\x61\x55\xb2\x4f\x47\x33\x9e\x33\x33\x7f\x09\xfb\x9b\x48\xb5\x2f\x0b\xc0\xa0\x45\xd8\x70\xa7\x3f\x7c\xb8\xc4\x16\xfa\xbb\x28\xee\x14\xaa\x9b\xc0\x5f\x88\x6d\x02\x6f\x96\x8b\x9d\x75\xf7\x5b\x52\x09\x5b\x11\xe1\x3c\x1c\x78\x6c\x06\x17\xbb\xc0\xbe\xdb\xd0\x97\x3b\x2c\xec\x06\x3d\x87\x7b\x2b\xf1\xb9\x6d\xf8\x96\x70\x5e\x04\x29\xad\x06\xf1\xc7\xf0\x12\xff\xf1\xd7\xff\x1c\xb7\x89\x27\x42\xd7\x87\xc2\x66\x5c\xe7\xdf\xa7\x52\xa8\x18\x92\x72\x3c\xae\xb3\xac\xab\x52\x94\xb6\x64\x9e\xcd\x32\x3c\x49\xf5\x5c\xf3\x39\x98\xcd\x71\x11\x7d\x85\xcc\xae\x37\xb2\x6e\xfb\x96\xf2\x3e\x6d\x47\x75\x36\x8f\x77\x8a\x6f\xea\x72\x93\xaf\xda\xc7\x9d\x14\x49\x0c\x5d\xa4\xa7\xef\xcb\x4e\xc4\x22\x7a\x1a\xea\x13\x1c\x4c\x4d\x2c\xa2\x27\xf6\xd3\xc3\x87\x6b\x94\x04\x92\xd9\x4c\xdd\xf0\x5c\x3e\x8b\xc7\x34\x71\x61\x61\x34\x3e\x45\x9a\xd8\x3d\x52\xa6\xca\xc4\xea\xbf\x02\x54\xcc\x89\x57\xd3\x3a\x0e\x21\x93\xf1\x66\x77\xb6\x28\xa2\x27\x91\x9f\xa7\x5c\xc5\x7a\x83\xaf\x71\x9e\x15\xcb\xa5\xfc\x32\xce\x79\xfa\x6e\x1f\xa6\x7f\xaf\x25\x3d\xe2\x92\x70\x8c\x41\xa9\x5f\x03\x9c\x50\x93\xb7\xcd\x32\x0e\xa5\xda\x9d\x65\xf6\x3c\x91\xce\xa4\x40\xbc\xb1\xe5\x22\x32\xa6\x7e\x36\x3c\x61\xc0\xe8\x35\x1f\xac\x5f\xe9\x8a\xd5\xc6\x58\xd9\xa7\xfb\x36\x42\xf8\x51\xeb\xe4\xd8\x28\x21\x4f\xec\x26\x99\x83\xe2\xcc\x31\x2e\x38\x2e\x00\x77\xd9\x9e\x5e\xba\x7c\x95\xa3\x80\xa4\x58\x83\xd3\x7b\x03\x28\x05\x75\x01\x00\x0c\xd0\x89\x0e\x94\x65\xb6\x6d\x48\x58\x0e\x44\x8b\x42\x1b\x88\x74\x70\x3a\xfa\xb5\xb0\x65\x50\xff\xcb\x7d\x1f\x81\x26\xab\xd2\xc3\x41\x01\x04\xd4\x87\xa9\x3c\xca\x05\x13\x42\x3a\x3d\x37\x8e\xc1\xb3\xed\x78\xa2\x2a\x9d\xb1\x39\xe4\xf9\xcc\x54\xe0\xe5\x20\x13\x89\x85\xe3\xba\x51\x6b\x8a\x31\x94\x96\xe1\xd1\x31\x86\x63\x38\x53\x3b\x83\xd0\x97\xa1\xfa\x10\xe4\x51\x23\xbd\x59\x98\x7b\x3e\x96\x77\x52\xe0\x0d\xdc\xb3\x89\xa5\xa4\x72\x41\x52\xeb\x66\x21\x27\x76\x65\xec\xdd\xd1\x10\xb2\x7b\x85\x26\x6b\xdf\x15\x26\xf4\x89\x4f\x4b\xef\xda\x82\xec\xab\xbe\x81\x34\xd7\xd9\x17\xbe\xcb\x40\xaa\x49\x18\xab\xb8\xc4\x60\x53\xb9\xff\x23\x1f\x02\x71\x74\x67\xa4\x7b\x58\x90\x82\x1b\xbd\x8b\xc4\x9a\x77\x91\x58\x51\x2a\xcf\x25\xf2\x26\x6b\x1e\x9c\x6f\x13\x3f\x4e\x3b\xe3\xc7\x98\xc0\xf9\x9f\x11\x32\xee\x08\x4c\x1d\x19\x1f\x0b\x8e\xc9\x54\x47\x22\xb3\x29\x76\x28\x7a\x00\x73\x6c\x9e\x3d\x62\x1b\x2e\x15\x6d\x83\x3c\x35\x06\x32\x16\x8b\x62\xb5\x6a\x0d\xdb\x7c\xff\xf1\xdf\xf2\x3e\xf9\xa7\x8f\xcf\x75\xb2\xe1\x9c\x22\xc2\x36\xb5\x4f\xc2\xb4\xb1\xf1\x95\xbf\x4e\x50\xed\x44\x11\xc2\x69\x9f\x08\xa1\xc5\x1d\x40\xf9\x07\xb9\xf8\x36\x37\xfc\x6b\xe8\xf0\xeb\x84\x0e\x1b\x73\x23\xd5\x1e\x22\xe5\xc0\x5c\x96\x1d\xe0\x8e\x1e\x1e\xc8\x5c\xe4\x28\xee\xa0\x57\x24\x52\x98\x09\x15\x67\x6c\xc1\xa3\x57\xa0\x32\x82\xd3\xe7\xf8\x18\xc5\x9e\x84\xf7\xbd\xde\x08\x06\x8f\xca\x90\x09\x9c\x51\x85\xcd\x08\x90\x54\xe6\x05\x7d\x96\x98\x72\xd0\x70\x5c\x61\xb6\x3a\xf6\x4e\xeb\x5b\x25\x5e\x98\x39\x0d\x46\x21\xb4\x24\x98\x1e\x90\x88\x78\x47\x2a\xe3\x1e\x87\xea\xca\x89\x53\xb1\xe2\x69\x0c\xe8\x67\xda\x92\x09\x8f\x9e\xcc\xbf\x43\xff\xe8\x89\x04\x7f\xb1\x6c\xb5\x08\xc9\xf2\xad\x49\x15\xa1\xe2\x33\x21\x6d\x7c\xff\xf0\xe7\x19\xe3\x51\xaa\x33\xbc\xc5\x3b\x15\x34\xa8\xbe\x03\x07\xf1\x59\xc6\x05\x4f\xf0\x89\xad\xd1\x3f\x9e\x1d\xc5\xbe\x3b\x09\x44\x10\xc4\x97\x6d\xc2\x55\x79\x4f\xe2\xeb\x02\x7f\x86\xec\x2c\x31\x21\x1a\xa8\xaf\x4a\x67\x17\x2a\x07\xfb\x6d\x85\xde\x67\x2a\x78\xbc\x0b\xc9\x72\xa4\x22\x39\x50\x1e\x6f\xa4\x32\x53\x6f\x35\x6e\x9c\x7d\x85\xa6\x23\x9e\x20\x08\x0c\xa8\xe0\x93\xa4\xb2\xf5\x33\xa6\x84\x71\x59\x78\x2a\x93\x1d\x78\xa9\xdb\x54\x9c\x05\xcf\x09\xf6\x37\x61\xd0\x65\x36\x53\xb6\xb0\xbb\xc8\xc4\xb2\x48\xd0\x97\x85\xdb\x9e\x7b\x01\xda\x87\x8f\xd3\x91\x39\xc6\x72\x22\x60\x0e\x1e\x8c\xb2\x26\xa7\xc0\xf3\xd6\xef\x59\xbd\x62\xde\x9e\xc4\x29\x05\xb8\xe1\x5a\xbf\xd8\xa2\x83\x17\xee\x51\x65\x6d\x67\xc9\xc9\xe2\x9c\xdd\x5e\x8d\xbd\x4f\xd8\x5d\x89\x83\x5e\x96\xee\xa6\xcf\x44\xec\x76\xa2\x54\xf0\x3a\xa4\x08\x46\x18\x14\x11\xb3\x22\xc3\xda\x05\x33\x87\x60\xad\xed\xb5\x19\xab\x39\xac\x9a\x1c\x73\x6f\x27\x33\xad\xd8\xac\xf8\xcd\x6f\x7e\x2f\xd8\x6f\x48\x1e\x16\xac\x0c\x46\xa8\x81\xc6\x09\x5b\x07\x03\xe5\x1e\x20\x90\xe3\xa9\x36\x23\xac\x09\x84\x65\x2b\x27\x01\xc6\xc4\xa3\x35\xcb\x8a\x05\x62\x74\x38\x05\x39\xb9\x72\x2c\x89\xd7\x1a\xe0\x36\x78\x8e\xd9\xde\x0f\x08\x16\x7c\xa4\xf3\xc5\x06\x02\x02\x9c\x20\x0c\x74\x28\x2a\x05\x83\x82\x2f\x09\x06\xfc\x23\x28\x4b\x8d\xd8\x4f\xf2\x59\x8c\xd8\xfd\x96\xa7\x4f\x23\x76\x89\xe1\xd6\x3f\xe9\xc5\xde\xfb\xff\x29\x62\x60\xce\x4d\x3d\x56\x43\x15\xa3\x49\xa3\x80\x1b\x34\x08\xf1\xd7\xa3\x35\x16\x61\x01\x5a\x3d\x28\x52\xbe\x4f\x3f\xa7\x95\x40\xf6\x54\xb7\x98\x76\x58\x5f\xeb\x9d\xa6\x6a\xa5\xfd\x79\x4a\x55\x53\x4d\x48\x13\x73\x8e\xc1\x4a\x34\x2f\x7e\x06\x9e\x89\x4e\x5d\x65\x5f\x46\xe1\x67\x5c\x15\x88\xbf\xc3\x13\xb9\x52\x0b\xd7\xd7\xf1\xb2\x0f\x9e\x6f\xb5\x4e\x1a\xfd\xaf\x93\x0e\x60\x2d\xda\xd9\x77\xf0\xa6\x58\x43\x90\x85\x5e\x89\x1d\x45\x1f\x39\xf3\x71\x36\x0c\xaa\x01\x19\x00\xac\xa6\xb8\x80\x24\x82\x1f\x8e\x50\xce\xc8\x98\x15\x44\x3d\xa2\x23\x62\xd5\xef\xb8\xf5\x10\x8d\x13\x45\x21\xc4\x10\x6d\x57\x8b\xe9\x65\xf5\xe7\xb4\xb8\x85\xd0\xee\x5c\x36\x55\xfe\x0f\xdd\x5c\x80\x23\xae\x07\xea\xb1\xe7\xd6\x80\x5b\xdc\xf9\x3e\xde\x43\x5b\x64\x37\x8f\x12\x9e\xf5\x44\xb2\x35\xda\x9d\x29\x35\x74\x01\xed\xf4\xb7\x99\x3f\x41\x4c\x75\xd3\xf3\xc0\x9c\xa9\x89\xe3\xfd\xf3\xae\x96\x73\x0f\xd1\xcc\xa2\x63\x5c\x9b\x1a\x04\xb3\x7b\x92\xc8\x11\xcb\x8a\x68\x0d\x70\xfd\xb2\x9d\x0a\xed\x56\x7d\xc7\x8e\x66\xca\x38\x2b\xa8\x7a\xc2\x21\x21\xfc\x02\x04\xf9\xf2\x6f\xc2\x79\x43\x84\x0a\x0d\x1d\xa0\x05\x37\x53\xa3\x55\xa3\xb3\x68\x2b\x27\x78\xfa\x24\xe2\x20\xd4\x57\x6c\x63\x9e\x1b\xef\xd9\x1d\x72\xb0\x7e\x1d\x61\xaa\xf5\x3e\xb3\xf0\xc5\x42\x67\xb9\x62\x69\x13\xb9\x14\xd1\x2e\xaa\x11\xa1\x94\x60\x18\xa7\x8b\x29\x1f\x16\x52\xed\x22\xcc\x68\xbe\x29\x7f\xaa\x15\x78\xb3\xb6\xdc\xf5\xff\x4c\xc4\x5a\x0b\x67\xc3\x3f\x7b\x54\x6c\x4f\x9a\xf9\x57\xf0\xd9\x3f\x65\x04\xa9\x9b\xae\xe1\x5f\xc2\x7f\x5a\xfb\x65\xf1\x5d\x70\x63\x25\xaf\xb9\x11\x55\xf6\x7d\x15\xa8\xca\x38\xdc\x37\xc8\xb2\xd9\x92\x88\xdf\xb3\x15\xa8\x0c\x38\x76\x25\xca\x03\x40\xe9\xf4\x53\x3b\x5e\x17\x89\xce\x8a\xb4\x7b\xf3\xdf\x95\x7b\x6d\x9f\xde\x40\xd9\x08\x8b\x6d\xb3\x10\x50\x7d\xde\x05\x1f\xd9\xe7\x28\x98\xfb\x52\xf5\xf7\x84\xb7\x7a\x11\x2c\x42\xa8\x7c\x8b\x86\x55\xed\x77\x41\x0c\x04\x4e\xde\x95\x08\xbd\x80\xca\xe1\x58\x5a\x5c\xa5\x7c\xdf\x77\x85\xe9\x6e\xbc\x83\x55\x68\x82\x4a\xe1\xb2\x5e\x19\xd2\x53\x64\x1f\x3e\xf2\x7c\x8d\x81\x9c\x8d\xce\x49\x4c\x1c\xf9\x4a\x10\xc6\x83\x29\x89\x45\xa2\x17\x20\x4b\x07\xaa\xf1\x6d\xeb\x9c\x16\x67\xaf\xa1\xab\x4f\x58\x9f\xb5\x6d\xf6\x03\xd4\xfc\xa5\x22\x03\xea\x87\x7a\xce\xaf\x2f\x42\x76\x58\xb0\xa9\xde\x5d\x63\xb6\x2e\x6b\xc1\xa6\x3a\x57\xb8\xb1\xea\x00\x97\xbc\x3a\xa0\x46\xe2\x2a\xac\x9b\x33\xc7\x1b\xd1\xa6\x52\x52\x1d\x99\x13\x2b\xef\x6b\x75\x3f\x67\x6a\x82\x9f\x94\x54\xf2\x9d\x26\x86\x43\x24\x92\xc4\x9b\xdb\x7f\x58\x48\xc7\x26\x21\x06\x8e\xfc\xfa\x91\xbf\x71\x41\x78\x64\x04\x75\x6b\x2a\x97\xa9\xf1\xa7\x33\x70\x17\xb2\x62\x71\xe6\x29\x12\x74\x0a\x0e\x06\x30\x68\x6c\x39\xe8\x3c\x01\x73\xca\x59\xc3\x41\x82\x71\x68\xcf\x6d\x6f\xa9\xc4\x78\x42\xe6\x0b\xee\x85\x58\xa3\xeb\xde\xdd\xb5\x63\xdc\x7b\x88\x22\xd9\xfa\x50\x34\xd7\x5d\xf6\xa2\x74\x59\xfa\xd6\x00\xa5\x1e\x08\xa0\x16\x4d\xa4\x7f\x7e\x3b\x51\x1a\xb3\x3e\x76\xe2\xa1\x7c\xb5\xb2\xbb\xc6\x5c\x0e\xc9\x72\xb4\xa3\x38\xbf\x2e\xd0\x14\x26\x30\xdb\xf2\x17\x45\xd4\x04\xdd\xdc\x8e\x07\xd9\x87\x66\x5d\x60\x63\x1f\x6a\xd0\x2c\x6f\x29\x14\x91\xfc\xe4\xd2\x09\x08\x8d\x02\xd5\x47\x9e\x24\x21\x4d\xb6\x0f\x05\xcd\x94\x0f\x18\x98\xe3\x3f\x49\xcc\x3f\xa3\xaa\xe1\x26\x22\x8a\x18\x6a\xe7\xc4\xc8\xd6\xd1\x13\x03\x15\xa5\x91\xce\xf0\x62\xee\xaf\xcf\xfb\x76\xf3\xa9\xfc\xc9\xef\xac\x84\x70\x4f\xc2\x16\x1f\x3b\x7f\x12\xbb\xc1\x7d\x6d\x4e\x99\x78\x5d\x39\x50\xd1\x77\xb5\xdc\x11\x4f\x53\x0b\xd8\xa5\xa7\x32\x9e\xe6\x72\xc9\xa3\x52\x04\xbd\xa5\x9f\x6b\x11\x3d\x6d\xb5\x54\x83\x6d\x51\xd0\x1f\x73\x22\xe5\x22\xcb\x99\x6f\xcd\xc1\x91\x7b\xf1\x37\x96\x0e\x66\x7c\x91\x0c\x50\x09\x16\xb1\xe8\xf9\x75\x38\x73\xc2\x79\xed\xcb\xee\xd4\x57\x19\xe1\xcf\x86\x57\x08\xcb\x74\xc7\x2b\xd1\x6a\xd4\x8f\xe6\x52\x40\x9b\xd7\x0a\x39\x7a\x0e\x36\x67\x25\x56\xaa\xc6\x21\x85\x68\xc4\xaf\x97\xc4\xff\xff\x2e\x89\x80\x8b\x78\xcd\x1b\x62\x73\x79\xd9\xaf\x67\xc4\xf7\x75\x46\x20\x4b\x13\xe2\xe6\x87\x0c\x2d\x75\xf5\xce\xff\xfc\xb8\xc1\x15\x2c\xe8\x49\x36\x60\x9c\xbf\xe2\x19\x17\x3c\x96\xb6\xc8\x40\xe3\xd1\xdb\xe8\x76\x67\x03\xfd\x29\xea\x3d\xda\xa0\x74\xaa\xb6\x7d\xc3\x90\x50\x1e\x2e\x1d\x73\x91\xe8\x1d\x4e\x6c\xaf\x4e\xfd\xae\x92\x22\x7d\x4e\x49\x63\x19\x5d\x9a\xe4\xc6\x5a\x44\x25\x30\x5d\xd8\x61\x19\x03\x56\x40\x9e\xbf\xc9\xdc\xa8\x97\x2d\xa0\xc5\xe7\x5d\xcb\x2c\xff\xb9\xa2\x39\x73\x98\x68\xcd\xab\x65\xf6\x6d\x57\xb1\x9b\xc1\x2f\x3a\x13\xd2\x77\xe5\x94\xb1\x5e\xda\x35\x07\xb4\x41\x56\x65\xc0\xf4\x7b\xc8\x79\xf5\x8b\x1b\xaf\x5f\xd0\x19\x7c\x49\xf9\x76\x2b\x52\x9b\x07\xad\xa5\xaa\x81\xb2\x1f\x9e\x02\x9a\x1b\x6b\x81\xc2\x5f\x95\x23\xd5\x98\x92\x4a\xd3\xf0\x35\x18\xba\x71\xf3\xcc\xdd\x14\x49\xd2\x3a\x73\xfb\x99\xc0\x6f\x1e\xaf\xaf\xe7\x3f\x4f\xae\x1f\xaf\x3a\x99\xb5\x83\xaf\xb5\x8e\x89\xeb\x09\x8d\x89\xd7\xee\x30\x8f\x15\x56\x7c\x4c\xfb\xb7\x46\x8f\xba\x48\x92\x32\xeb\xfa\x4c\xfd\x42\xed\x00\xa8\x0c\x15\x65\xcc\xb8\xb1\xce\x81\x2b\x3f\x1f\xbe\xf6\x8b\x69\xfc\x17\xfc\xed\x19\xf3\x2f\xf1\x03\x68\x83\x90\xe6\x40\xf3\xb8\x12\x62\xf5\x88\xed\x80\x10\xa6\xb6\xed\x70\x6a\x5d\x89\xc3\xb6\xc7\xa3\x02\x46\x3b\x11\x5b\x39\x88\x93\xec\x0e\x1c\xbb\x5f\xca\xd1\x45\x67\xcb\x63\x8c\x10\x41\xbb\x23\x54\x03\x00\x8d\x33\x4f\x98\x3f\x53\x78\xe1\x32\x7d\xca\x75\x7b\x9f\xd8\x94\xd0\x01\x09\x57\xab\x82\xaf\x44\x36\x62\xf6\xe1\x33\xb5\x91\xab\x35\x70\x07\x66\xc5\x96\xc0\x6e\x78\x45\x81\x32\xd3\xca\x12\xaa\xa0\xdd\xa4\x9a\x29\x7a\x27\xb5\xf2\xcd\x23\xe6\xeb\x4f\xf7\xee\x75\x08\x4a\x87\x0d\x91\xa0\x81\x9a\x29\x9c\x5c\x24\x28\xb6\x61\x17\xf0\x97\x79\x5e\x5d\xba\x1c\x04\xaf\x50\xf4\xcf\xd8\xf4\x15\x04\x80\x66\xca\x95\xa9\x20\x28\x8f\xde\x21\x20\xbe\xc5\x2e\xed\xb7\x27\x76\x32\xec\x9e\xa0\xbe\x35\xaf\xfa\xa3\xcf\x00\xb3\xe1\xe6\x03\xd4\xcb\xea\x66\xac\xe7\xd5\x84\x07\x86\xa3\xad\x76\x11\x6a\x93\x9a\x7b\x63\xdf\x0b\xbf\xd3\x9a\x52\xd7\xc5\x22\x19\xd0\x25\xfc\x7e\x67\xa7\xd0\x24\x77\x77\xaa\x47\xcc\xf5\xae\xb2\xb5\xcc\x32\xed\x7a\xec\x42\xeb\x96\x79\x39\x61\xf4\xb2\xd4\x29\xfa\xc1\xbe\xc1\x28\xa2\xfc\x90\xf5\xd2\xa3\xa0\xa0\x3a\x44\xd6\xfa\x74\x75\x28\x91\xd9\x41\xdd\xf1\xfe\x53\xef\x1e\x39\x0f\x81\x0e\xbb\x41\x16\x96\xce\xb9\x92\x81\x6d\x31\x93\x14\xbc\xb2\x32\x60\x12\xcd\x8b\xd9\x3c\xa8\xd1\x65\xd6\xff\xc8\x2d\xa2\x91\x9f\xb9\x11\x74\x32\x2a\xd2\xcc\x98\x4b\xb2\x77\x64\xb5\x75\xca\xf8\x4c\x59\x3e\x59\x6b\x8e\x27\x16\x14\x90\xba\xbf\x62\x91\xc6\x16\xf9\x18\xc1\x63\xcd\x99\x56\xc2\x5a\xc3\x99\xb2\xda\x71\x23\xc6\x17\x99\x95\x64\xe3\x6a\xe7\x74\xd2\xa4\x13\xc1\xe0\x8a\x01\xda\x62\xbf\xcd\xab\xb8\x01\xa5\x73\xfe\x5f\xcc\xff\xfe\xf1\x2f\xff\x2f\x00\x00\xff\xff\xcf\x3b\xcd\x57\x48\x83\x04\x00") +var _adminSwaggerJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x23\x37\x96\x2f\x0c\xff\x3f\x9f\x02\xb7\xfa\x46\xd8\xee\xd6\x62\xbb\x67\xfa\xed\xd1\xc4\x8d\xf7\xa1\x25\x56\x59\xd7\x2a\x49\xad\xc5\x1e\x3f\xc3\x0e\x1a\xcc\x04\x49\xb4\x32\x81\x34\x80\x94\x8a\xee\xe8\xef\xfe\x04\x0e\x96\x44\x6e\x64\x72\x91\x44\x95\x73\x26\xa2\xad\x62\x66\x62\x3d\x38\x38\xeb\xef\xfc\xf3\xdf\x10\x7a\x27\x9f\xf0\x6c\x46\xc4\xbb\x13\xf4\xee\xdb\xa3\xaf\xdf\x1d\xe8\xdf\x28\x9b\xf2\x77\x27\x48\x3f\x47\xe8\x9d\xa2\x2a\x21\xfa\xf9\x34\x59\x28\x42\xe3\xe4\x58\x12\xf1\x48\x23\x72\x8c\xe3\x94\xb2\xa3\x4c\x70\xc5\xe1\x43\x84\xde\x3d\x12\x21\x29\x67\xfa\x75\xfb\x27\x62\x5c\x21\x49\xd4\xbb\x7f\x43\xe8\x5f\xd0\xbc\x8c\xe6\x24\x25\xf2\xdd\x09\xfa\x1f\xf3\xd1\x5c\xa9\xcc\x35\xa0\xff\x96\xfa\xdd\xbf\xc3\xbb\x11\x67\x32\x2f\xbd\x8c\xb3\x2c\xa1\x11\x56\x94\xb3\xe3\x7f\x48\xce\x8a\x77\x33\xc1\xe3\x3c\xea\xf8\x2e\x56\x73\x59\xcc\xf1\x18\x67\xf4\xf8\xf1\x9b\x63\x1c\x29\xfa\x48\xc6\x09\xce\x59\x34\x1f\x67\x09\x66\xf2\xf8\x9f\x34\xd6\x73\xfc\x07\x89\xd4\xbf\xe0\x1f\x31\x4f\x31\x65\xe6\x6f\x86\x53\xf2\x2f\xdf\x0e\x42\xef\x66\x44\x05\xff\xd4\xb3\xcd\xd3\x14\x8b\x85\x5e\x91\xf7\x44\x45\x73\xa4\xe6\x04\x99\x7e\x90\x5b\x22\x3e\x45\x18\x9d\x08\x32\x3d\xf9\x45\x90\xe9\xd8\x2d\xf4\x91\x59\xe0\x0b\x18\xcd\x75\x82\xd9\x2f\x47\x76\x99\xa0\x65\x9e\x11\x01\x73\x3b\x8f\x75\xeb\x1f\x88\x1a\x40\xb3\xc5\xfb\xe1\xdb\x82\xc8\x8c\x33\x49\x64\x69\x78\x08\xbd\xfb\xf6\xeb\xaf\x2b\x3f\x21\xf4\x2e\x26\x32\x12\x34\x53\x76\x2f\x07\x48\xe6\x51\x44\xa4\x9c\xe6\x09\x72\x2d\x85\x83\x31\x53\xd5\x1b\x8b\x6b\x8d\x21\xf4\xee\x7f\x0b\x32\xd5\xed\xfc\xe1\x38\x26\x53\xca\xa8\x6e\x57\x1a\xfa\x09\x46\x5b\xfa\xea\x5f\xff\xd6\xf4\xf7\xbf\x82\x19\x65\x58\xe0\x94\x28\x22\x8a\x1d\x37\xff\x57\x99\x8b\xde\x23\xdd\x79\xb1\x8f\xd5\x81\x57\x66\x7b\x89\x53\xa2\xf7\x44\xef\x94\xfd\x02\xfe\x16\x44\xf2\x5c\x44\x04\x4d\x48\xc2\xd9\x4c\x22\xc5\x6b\x6b\x40\xa1\x05\x4d\x5e\xd5\x27\x82\xfc\x9a\x53\x41\xf4\x5e\x29\x91\x93\xca\x53\xb5\xc8\x60\x90\x52\x09\xca\x66\xe1\x52\xfc\xeb\xa0\xd3\xd4\x0c\x55\xae\x31\x33\xf3\x41\xeb\xc4\x46\x6c\xe0\x5e\x89\x30\x43\x13\x82\xf4\x59\xa4\x31\x11\x24\x46\x58\x22\x8c\x64\x3e\x91\x44\xa1\x27\xaa\xe6\x94\xe9\x7f\x67\x24\xa2\x53\x1a\xb9\x35\xdb\x9f\xb5\x81\x3f\x97\xaf\xcc\xbd\x24\x42\x0f\xfc\x91\xc6\x24\x46\x8f\x38\xc9\x09\x9a\x72\x51\x5a\x9e\xa3\x11\xbb\x9b\xeb\x75\x48\x27\x94\xc1\xc9\xd3\x6b\xe9\x28\xe4\x4f\x6e\xb9\xfe\x84\x74\x7f\x28\x67\xf4\xd7\x9c\x24\x0b\x44\x63\xc2\x14\x9d\x52\x22\xab\xad\xfd\x89\x43\xff\x38\x41\x87\x48\xaf\x33\x11\x0a\xd6\x9b\x33\x45\x3e\x29\x89\x0e\x51\x42\x1f\x08\xfa\xe2\x82\x4a\x85\x06\xd7\xe7\x5f\x1c\xa0\x2f\xcc\x79\x41\xc0\x9b\xbe\x78\x81\x15\xf6\x7f\xff\x3d\x38\x7a\x0a\xcf\xaa\x87\xee\xdd\x40\x9f\xe6\x5b\x73\x35\x14\x2d\xfc\xfd\xdf\xc2\x76\xec\x7e\x2d\xe7\xb7\x05\xb3\xb5\x9c\xb6\x2b\x7f\x85\x65\x2a\xb3\x56\xa9\x77\x68\x5b\xce\xaa\xdb\xad\xb2\x56\xf9\xb6\x78\xab\x9e\xc2\x73\xf3\xd7\x6d\x98\x2b\x56\x40\xf5\x98\x32\x73\x48\xfc\x99\x11\x52\x9f\x13\x47\xbd\x7b\xc2\x52\xb6\xe1\xb5\xc1\xcc\x02\x76\xeb\xb8\x68\xb0\x2a\x7b\x38\xef\x84\xa6\x74\xd5\xfe\x9e\xb3\x58\x8b\x5c\x96\xd9\xb1\x3c\x9d\x10\xa1\x97\xc1\xb1\x3d\x98\xed\x44\xb3\x41\x95\x0b\x46\xe2\x0e\xd3\xfc\x35\x27\x62\xb1\x64\x9e\x53\x9c\xc8\xb6\x89\x52\xa6\x88\x96\x6f\x2b\x8f\xa7\x5c\xa4\x58\xd9\x17\xfe\xf2\xef\xeb\x2e\x84\xe2\x0f\x64\xd5\xfe\x9f\x9b\xdd\x8c\xb0\x04\x32\x48\xf3\x44\xd1\x2c\x21\x28\xc3\x33\x22\xed\x8a\xe4\x89\x92\x07\xf0\x9a\x96\xa9\x89\x38\xf4\x37\x10\xf4\xe0\x6e\xde\x5c\xc2\x2f\x68\xea\x05\x48\x46\x3e\x29\x68\x69\xc4\xe0\xee\x85\x25\x0a\x6f\x94\x67\x58\xca\xcd\x68\x46\x72\xa1\xc6\x93\xc5\xd1\x03\xa9\xf5\xdb\x4a\x39\x98\x21\xac\x94\xa0\x93\x5c\x11\x3d\x6f\xdd\x86\xbb\x3b\x81\x3d\x9a\x0b\xba\x0b\x6b\x78\xbd\x09\xc7\x54\x90\x08\xe6\xb6\xce\x81\xf1\x5f\xe9\x79\x6b\xfd\x65\x61\x66\xff\x40\x16\x20\x8f\x34\xac\x80\xdf\xf2\x11\x1b\x31\x74\x88\xce\x86\xb7\xa7\xc3\xcb\xb3\xf3\xcb\x0f\x27\xe8\xbb\x05\x8a\xc9\x14\xe7\x89\x3a\x40\x53\x4a\x92\x58\x22\x2c\x08\x34\x49\x62\x2d\x73\xe8\xc1\x10\x16\x53\x36\x43\x5c\xc4\x44\x3c\xdf\x32\x56\x9e\x12\x96\xa7\x95\x7b\x05\x7e\x2f\x46\x5f\xf9\x42\x8b\x18\xfe\x51\xe9\xc9\xdf\x6b\x0b\x0c\x33\xd6\x7d\x07\xad\xbd\x98\x50\x13\xcd\x69\x12\x0b\xc2\x8e\x15\x96\x0f\x63\xf2\x89\x44\xb9\xb9\x93\xff\x59\xfe\x61\xac\x25\x53\x1e\x93\xf2\x2f\xa5\x7f\x14\xa2\xd0\xda\x9f\x7a\x2d\x75\xed\x2f\x41\xa7\xed\xf6\x1d\xfc\x42\xe3\xc6\xb7\xe1\x97\x15\x73\x70\xef\x2c\x19\xac\x7b\xa5\x75\x54\xee\x05\x2b\xf1\x35\xbe\x23\x88\x12\x8b\x31\x56\x8a\xa4\x99\x5a\x53\x5f\xc7\x28\xd1\x72\xe5\x32\x39\xf2\x92\xc7\x64\xe8\xfa\xfb\x05\x19\x71\x96\xc4\x68\xb2\xb0\x5c\x6b\x4a\x04\x61\x11\x69\x6f\xe1\x0e\xcb\x87\xa2\x85\x55\xc2\x68\xa9\x3f\xf9\x9e\x0b\xfd\xf9\x5b\x10\x48\x4b\x03\x7f\x09\x99\x74\xd3\x13\xf7\xd9\x59\x08\x36\xe4\x1f\xbd\x3d\x61\xfb\x95\xec\x6a\x7d\xe0\x02\xc9\x85\x54\x24\x5d\x69\x87\x78\x3b\x0b\x61\x2f\x88\x7d\x1d\x70\xe5\x8e\xfa\x1d\x9c\xfa\xf2\x8d\xdb\x1f\xef\x35\x96\x6c\x57\x56\xc4\x7d\x9f\xa7\xf3\xe1\x2c\x9f\xea\xad\xdb\xbe\xc0\x89\xf1\x26\xa6\x59\x92\x05\x77\x3d\xc8\x67\x32\x37\xb4\xee\x95\x5b\xed\x31\x0c\x60\x85\xa2\x59\xb6\x43\xfb\xf3\xa7\x3f\x0d\x2d\x34\xc6\x1c\xa7\xe6\x54\x06\xc6\x2a\x14\x71\x61\x64\xc1\xd8\x9e\x77\xa3\x6b\x0e\xee\x06\xb7\xc3\xbb\x13\x34\x40\x31\x56\x58\x1f\x70\x41\x32\x41\x24\x61\x0a\xf4\x78\xfd\xbd\x5a\xa0\x94\xc7\x24\x31\x1a\xe7\x7b\x2d\xf9\xa2\x33\xac\xf0\x29\x56\x38\xe1\xb3\x23\x34\x80\x7f\xea\x8f\xa9\x44\x38\x91\x1c\x61\x47\x56\x24\x76\x4d\x60\x16\x3b\xd6\x82\x51\xc4\xd3\x8c\x26\xde\x06\xef\x8d\x2b\x94\xc5\xf4\x91\xc6\x39\x4e\x10\x9f\x68\xae\xa2\x35\xe4\xe1\x23\x61\x2a\xc7\x49\xb2\x40\x38\x49\x90\xed\xd6\xbd\x80\xe4\x9c\xe7\x49\xac\xdb\x75\xa3\x94\x34\xa5\x09\x16\x5a\x05\x37\xa3\xbd\xb2\x6d\xa1\xbb\x39\xf1\x63\x85\x71\xe9\xd5\x4c\xf1\x03\x91\x88\x2a\x94\x71\x29\xe9\x24\x29\xce\xfc\xfd\x39\x82\x71\x9f\x5e\x9c\x83\x3e\x1f\x29\xc4\x0d\x0f\x75\x9d\x5b\xfb\x8d\xeb\x31\xc5\x8c\x11\xe8\x98\xab\x39\x11\xb6\x7b\xfb\xf2\x6b\xab\xe6\xf7\x97\xb7\xd7\xc3\xd3\xf3\xf7\xe7\xc3\xb3\xba\x6e\x7e\x37\xb8\xfd\xa1\xfe\xeb\x4f\x57\x37\x3f\xbc\xbf\xb8\xfa\xa9\xfe\xe4\x62\x70\x7f\x79\xfa\xfd\xf8\xfa\x62\x70\x59\x7f\x68\xc9\xaa\xb3\x9a\x1f\x8e\x6c\xcd\xb3\xd5\xdb\x34\x9f\xcb\xa6\x79\xf0\xf9\x1a\x35\xa7\x34\x01\x1d\xb4\xb3\x41\xd3\xdb\x10\xec\x97\x28\xc3\x52\x1a\xc9\xc8\x8c\xe0\x68\xc4\x3e\x72\xa1\x19\xd8\x94\x6b\x1e\xa1\xa5\x27\x25\xf2\x48\x51\x36\xf3\x1f\x9d\xa0\x51\xfe\xf5\xd7\x7f\x8e\x2e\x28\x7b\x80\xbf\xc8\x3e\x2e\x4e\x6f\xf1\xed\x2d\xbe\xbf\x2f\x8b\xaf\x16\x7d\x8e\x43\x43\xef\x6e\x43\x86\xb4\x70\xc1\xb2\x5c\x81\x28\xc1\x73\xa5\xff\xd4\x5d\x02\x79\x2c\x09\x1c\xea\x66\x50\xfc\x40\x94\x7f\x51\x8b\x36\x6f\xc1\x8e\xf8\x13\x17\x0f\xd3\x84\x3f\xf9\x81\x7f\x20\x4a\x8f\xfd\xc6\xf6\xd2\x87\x12\xf5\xa1\x44\xaf\x1b\x4a\xb4\x57\xc6\xbc\xe7\x67\x7e\x65\xcb\x9f\xe1\x80\x2d\x9e\xac\x56\x47\x55\x8b\x1f\x2a\x70\x33\xbd\x08\xd7\x2c\x3b\x73\x56\x70\xce\xd2\xcb\x6f\x85\x7b\x96\x06\xfd\xf2\x9c\xf3\x77\xe1\x6f\xe9\xdd\x29\x1b\x2e\xd4\x9b\x64\xb0\x1d\xef\x8e\x17\x73\x86\x3c\x3f\xc3\xaf\xc5\x36\xac\x13\xcc\xb0\x46\xf4\x42\xe7\x70\x85\x15\xf1\x09\x8d\x01\x09\x4d\x11\x08\xf5\x90\x83\xc6\x18\x83\xed\x82\x0a\x36\xbd\x9b\xba\x87\x09\x7c\x20\xaa\xf4\xf2\x5b\xb9\x9b\x4a\x83\x7e\xf9\xbb\xe9\x77\x1a\x1d\xd0\x87\x03\x3c\xe3\xd2\x7d\xee\x37\xda\xfe\x3a\xfc\x7f\x07\x1e\xfe\xde\xa5\xbf\xd6\x1a\x7d\x5e\x3e\xfc\xcf\xd5\x69\xff\x36\xbd\xf4\xbd\x5b\xbe\x77\xcb\xbf\x86\xff\xe4\xed\xb9\xe5\x9f\x57\x3d\x2d\x8e\xd7\xd8\xd1\x82\xd5\xd7\x82\x43\xf9\xaf\x0e\x4e\x1a\xf8\xcb\xa9\x7c\xeb\x06\x8d\xb7\xea\x70\x67\xc5\xf8\x86\x70\x84\x7e\xb1\x84\xb4\x42\x9d\xab\x7d\xf7\x16\xd4\xb9\xfa\xa0\x9f\x5f\x87\x7b\x35\xe6\xfb\x4c\x97\xe7\x1b\x61\x03\xeb\xdf\x96\x9f\xb1\x4c\xde\xcb\xe2\xcf\x9f\x8d\xbf\x37\x13\x7a\x3b\xb2\xf7\x2b\x5c\xbc\x1d\x6f\xdd\x9d\xe7\x64\x35\x5c\xb3\xc1\xed\xb4\x2a\xc3\xaa\xfa\x35\x25\xf2\xdb\x37\x79\xdf\xbe\x44\x92\x55\x7f\xe1\xf6\x17\xae\x6d\xaa\xbf\x70\x3f\xe3\x0b\x77\xef\xe0\x6f\xf6\x26\x02\xb4\x0f\x22\xef\x81\x31\xfa\x18\xf2\x1d\x2e\x4e\x1f\x43\xde\xc7\x90\xff\xce\x62\xc8\xb7\xd1\x9e\x36\xc5\xa2\x7c\x0d\x3d\xaa\x57\xa3\x7a\x35\x2a\xfc\xbd\x57\xa3\x7a\x35\xaa\x57\xa3\x3e\x73\x14\xd1\x5e\x87\xea\xbe\x10\xbd\x0e\xd5\x79\xa9\x7a\x1d\x6a\xc9\xe2\xf4\x3a\x54\xaf\x43\xfd\xbe\x74\x28\xf2\x48\x98\x92\x90\x8c\x16\x6a\x14\xef\x32\x2e\xdb\x35\xa1\x90\x3b\x34\x68\x41\xd0\x66\x39\x29\x0c\x02\x97\x7e\x41\x73\x2c\x11\x8f\xa2\x5c\x54\xce\x40\x55\x0f\x3a\x15\x04\x2b\x02\x2d\xe8\x0f\xdf\x82\xfe\x53\x9f\xee\x4b\xc5\xe0\x4f\x78\x5c\xa3\x76\x73\x10\x9a\x9e\x2c\x97\x47\x76\x36\xf5\x5f\x73\xd2\x4d\xfd\x7b\x46\xa2\x56\x58\x3e\xec\x98\xa8\x4b\xb9\x16\x1b\x11\x35\xb4\xf0\x56\x88\xba\x3e\xdd\xdf\x0d\x51\x37\x4d\x7d\x1f\x88\xfa\xc9\xe6\xf1\xef\x98\xb0\x6b\xf0\x00\x1b\x11\xb7\x6f\xe5\xad\x10\x78\xf3\xb4\x7f\x37\x44\xde\x36\xfd\xd7\x25\x74\x9f\x22\xd9\x99\xc4\xef\x04\x9d\xcd\xb4\x9a\x01\x1a\x9e\x26\xc5\xd5\x35\x82\x8a\xa4\xc0\x95\x64\xed\x5f\x7d\x0b\x24\xed\x07\x6b\xc6\xfe\xbb\xa1\xe5\xda\xbc\xf7\x84\x88\x8f\x05\x89\xf8\x23\xd4\x0b\xeb\x46\xcc\x37\x04\x28\x18\xf8\x75\x26\xc8\x23\xe5\xb9\x4c\x16\x87\x22\x67\xc8\x31\x7f\xe4\x9b\x37\xd6\xea\x27\x9a\x24\x88\x33\xad\x7f\x29\x2c\x94\x7b\xac\xf5\x6f\xc1\x53\x38\x15\x09\x96\x0a\x3d\x30\xfe\xc4\xd0\x14\xd3\x24\x17\x04\x65\x9c\x32\x75\x34\x62\xe7\x0c\xdd\x98\x31\x42\xde\xc0\x01\xca\xa5\x3e\x4b\x11\x66\x8c\x2b\x14\xcd\x31\x9b\x11\x84\xd9\xc2\x26\xe0\x16\x94\x81\xb8\x40\x79\x16\x63\xad\xf8\xce\x49\x35\x4a\xcf\x8f\x11\xcc\x77\x54\x22\x2a\x11\xf9\xa4\x04\x49\x49\xb2\xd0\x7d\x68\xda\x57\x1c\xd9\xf5\x31\x43\xb5\xe9\x7c\x44\x08\x2e\x24\x64\x1c\x4c\x16\xbf\x61\xa6\x28\x23\x08\x14\x25\x69\x4c\x73\x87\xe8\x82\x4b\x30\xdb\xfc\xf0\x57\x89\xa2\x24\x97\x8a\x88\x03\x34\xc9\x67\x52\x6b\x8a\x59\x82\xd5\x94\x8b\x54\x8f\x90\x32\xa9\xf0\x84\x26\x54\x2d\x0e\x50\x8a\xa3\xb9\x69\x0b\xd6\x40\x1e\x8c\x58\xcc\x9f\x98\x54\x82\x60\xdf\xbb\x7b\x88\xbe\x0c\x9f\x19\x02\x90\x5f\x1d\x40\xda\x21\x4d\xb5\xba\x1b\x0c\xbf\xd8\x71\xb3\x27\xba\x11\x12\xa3\x09\x89\x70\x2e\xad\x87\x41\x89\x05\x22\x9f\xe6\x38\x97\xb0\x77\x7a\x7a\x36\x67\x23\xe2\x69\x96\x10\x45\x10\x9d\x22\x25\x28\x89\x11\x9e\x61\xaa\x97\xee\x96\x2c\x01\x41\xf7\x44\x6f\x37\xd0\x52\xfd\x2f\xa0\x7e\xa7\x5c\x10\x14\x13\x85\x69\xb2\xd4\xeb\x64\xbf\xed\xb9\xdc\x5b\xe2\x72\xe5\x0d\xdf\x0b\x36\x67\x40\xfc\x77\x70\x69\x33\x6b\xba\x8f\x70\xb2\xe5\xfd\x7d\x63\x07\xd5\xd3\xf6\xdb\xa2\x6d\xb3\x6b\xfb\x43\xdc\x2f\x16\x83\xdd\xbd\xa2\x45\x51\xcd\xe2\x4d\xd1\xf4\x4b\x84\x05\xf4\x0e\xe7\xde\xe1\xdc\xba\x32\x6f\xd3\xe1\xbc\x37\x1e\xa3\xde\xe7\xfc\x4c\x3e\x67\x2a\x7b\xa7\x73\xef\x74\xee\xba\x40\xbd\xd3\xb9\x77\x3a\xbf\x5d\xa7\xf3\x73\xe2\x3e\xef\x14\xdd\xf9\x4d\x89\xd6\xbd\x58\xdd\x8b\xd5\x3d\x84\xb3\x9f\xda\xae\x58\x98\xfb\xfa\x5d\x4c\x12\xa2\x48\xbb\x3d\x8b\x88\x54\x6b\x0b\xe6\x7a\xa6\x4c\xcb\x71\x33\x41\xa4\xdc\x96\x21\xf9\x86\xdf\x26\x5b\xf2\xc3\xef\xa1\xe6\x7b\x3e\xd5\xf3\xa9\x4d\xa6\xb6\x3f\xa6\xd9\xe0\x30\xbf\x94\x6d\xd6\xf3\xdf\x2c\x6f\x97\xfe\xee\x8d\x1b\xb2\xf0\x8b\x1a\x0a\xd7\x52\xbb\xe2\xfe\x70\x5b\x3a\xdf\x92\x1f\x9b\xbe\xde\x26\x33\x36\x63\xef\x39\x71\xcf\x89\x7b\x4e\xfc\xb6\x39\xb1\x3b\xc9\xaf\xea\x22\x33\x7e\xba\x71\x96\x60\x36\xa6\xb1\x3c\xfe\x67\xa1\xcb\x3f\x97\x87\x4c\x1f\xa8\xd8\xa4\x98\xfa\x94\x4e\xf1\x8b\xfe\x24\x29\x0c\xe6\x1e\x33\x73\x85\x13\xcd\xd8\xd8\xaf\x13\xcc\xce\xe3\x37\xe1\x47\x6b\x9c\xfd\x4b\xf8\xd4\xb6\xe1\xe3\x58\x81\xa7\x03\x53\x66\x4c\x78\x45\x5e\x6d\xc9\x40\xb9\x1f\x27\x7c\x1b\xae\x1e\x4c\x2c\x60\xec\x8e\x5f\x07\x8b\xb2\x7f\xd3\xee\xfd\x3a\x7d\x2e\x61\xef\xb9\xe8\x38\xe1\xde\x73\xb1\xbf\x9e\x8b\xd7\x72\x47\xbe\xf0\xf1\x7c\x29\xb1\xae\x7b\x10\xbe\x89\x56\x83\xa0\xd6\x3c\x4b\x38\x8e\x97\xb9\x62\x0a\xc1\x2b\x04\x47\x59\x19\x89\x5f\x7c\xf6\x16\x84\xb5\x62\xb4\xbf\xb3\x48\xbe\xfa\xc4\xf7\x45\x4b\x79\xc1\x50\xbe\x66\x12\x5f\x43\x25\x79\x1b\xf8\xa9\xc5\x78\xfb\xd0\xbe\xde\xa2\xf4\xfa\x16\xa5\x3e\xb4\xaf\x57\x01\xf7\x4c\x05\xec\x43\xfb\xfa\xd0\xbe\x5e\x41\x5e\x3e\xed\x5e\x41\xfe\x2c\x42\xfb\x3a\x89\xda\xcf\x88\xbd\xb9\xbd\xd0\xdd\xcb\xdc\xee\xbd\x5e\xe6\xee\x65\xee\xcf\x54\xe6\xde\x8f\x15\xee\x05\xee\x5e\xe0\xee\x05\xee\x5e\xe0\xee\x05\xee\x9d\x2f\x63\x2f\x70\xbf\x64\x81\xce\x66\xa9\x7b\x45\x92\xcd\x5b\xf5\xe5\xf4\xe2\x76\x2f\x6e\xef\xb7\xb8\xbd\x37\x13\x7a\x3b\x65\x1e\xbb\xcd\xa7\x2f\x52\xde\x17\x29\xef\x8b\x94\x3f\x7b\x91\x72\xf7\x75\x87\x8c\x0f\x7b\xb8\x14\x56\xb9\x34\x80\x8f\x82\xcc\xa8\x54\xc0\xfe\xbb\xc8\x2b\xab\x13\x3d\xde\xaa\x9c\xd2\xa7\x7a\xf8\xa7\xbd\xd4\xd2\x4b\x2d\xbf\x53\xa9\x65\x8f\x62\xc1\xf6\x22\x63\x25\xc5\x2a\x9a\xe3\x49\x42\xc6\xde\xe8\x23\xbb\xea\xc1\x17\x54\x2a\x89\xa2\x5c\x2a\x9e\xb6\x5f\x2e\x1f\x5d\x0f\x03\xdf\xc1\x29\x67\x53\x3a\xcb\xcd\xdd\x62\xc0\x39\x83\x13\x5d\x48\x82\x8b\x8c\xac\xf2\x54\x35\xb4\xfe\x26\xae\xa5\xe6\xa1\xbf\xd4\xed\xb4\x8e\xe0\x5e\x18\xf9\xac\xd4\xad\x65\xad\xf1\xcd\xf0\xf6\xea\xfe\xe6\x74\x78\x82\x06\x59\x96\x50\x63\x77\x37\xa4\x40\x7f\xd3\x93\x42\x0a\xcb\x87\x62\x2f\x85\x21\x73\x83\x61\x0b\x86\x7e\x2d\x1b\xa3\x43\x74\x7a\x71\x7f\x7b\x37\xbc\x69\x69\xd0\x12\x0a\xe4\xad\x92\x34\x4b\xb0\x22\x31\x7a\xc8\x27\x44\x30\xa2\xa5\x1d\x8b\x74\x5b\x98\xff\x4d\xa3\xc3\xff\x1e\x9e\xde\xdf\x9d\x5f\x5d\x8e\xff\x76\x3f\xbc\x1f\x9e\x20\x47\x71\xba\x59\x3d\x2e\x3d\x8a\x78\xc1\x70\xaa\x35\x10\xfd\x43\x91\x29\xfb\x6b\x4e\x72\x82\xb0\x94\x74\xc6\x52\x02\x88\xc0\xa5\x16\xdd\x80\x2f\x06\xdf\x0d\x2f\xca\x2d\xcf\x49\x08\xbf\x8b\x12\x3c\x21\x89\xf5\x47\x80\x89\x5d\x13\x7a\x00\x55\x6c\x1c\x15\xb9\x59\xd5\xbf\xdd\x0f\x2e\xce\xef\x7e\x1e\x5f\xbd\x1f\xdf\x0e\x6f\x7e\x3c\x3f\x1d\x8e\xad\x54\x79\x3a\xd0\xfd\x96\x7a\xb2\xc2\x27\xfa\x35\xc7\x89\xd6\x4e\xf8\xd4\xe1\xf1\xa2\xa7\x39\x61\x28\x67\x40\x71\x46\xe5\xd1\x7a\x90\xef\x54\x9f\x32\x33\xa3\xeb\x8b\xfb\x0f\xe7\x97\xe3\xab\x1f\x87\x37\x37\xe7\x67\xc3\x13\x74\x4b\x12\x50\x0a\xdc\xa2\xc3\x2e\x66\x49\x3e\xa3\x0c\xd1\x34\x4b\x88\x5e\x0d\x6c\xb3\x89\xe7\xf8\x91\x72\x61\x8f\xee\x8c\x3e\x12\x66\xd6\x11\xce\x2c\xb4\xef\x84\xef\x71\xb0\x74\x57\x97\xef\xcf\x3f\x9c\xa0\x41\x1c\xfb\x39\x48\x68\xa3\x44\x39\x0e\xd6\xf9\xb0\x3c\x6c\xcd\x1c\xa0\x7b\x43\x44\xfc\x91\x08\x41\x63\x52\xa1\xa3\xc1\xed\xed\xf9\x87\xcb\x8f\xc3\xcb\x3b\x58\x31\x25\x78\x22\xd1\x9c\x3f\x81\x29\x1b\x66\x08\x16\xee\x47\x4c\x13\xe8\xcc\x6d\x16\x67\xe8\x69\x4e\xc1\xfd\x01\xc0\xcc\xbe\x67\xa3\x9f\x89\x9c\xbd\xba\x75\xb6\x74\xf0\xea\x6a\x4b\xf5\x24\xd5\xdf\xa8\x1c\x8b\x65\x2f\x94\xa8\xbc\xfe\xe2\x2a\x6a\xad\x7f\x51\x21\xb7\x76\x65\xad\x46\x2f\xed\x33\x2d\xf6\xba\xb3\xae\x56\x5e\xc3\x17\xbb\x66\x35\xe3\x8d\x5f\xa2\x2a\xeb\x0d\xf8\x3d\x97\xc2\x3e\x05\x39\x93\xbf\x58\xe5\x7e\x85\x69\x3a\xf8\xe2\x2d\x5c\xae\xe1\x70\xf7\xe8\x22\xbd\x09\xe5\x1a\x27\x1e\xa7\x44\xe1\x18\x2b\xac\xd9\xd3\x8c\xa8\x23\x74\xc5\xe0\xd9\x1d\x96\x0f\x07\xc8\x15\xa4\x40\x5c\xa0\x42\x70\x7c\x81\x6c\xc9\x37\x62\x93\x59\x5f\x99\xe9\x95\xf2\x5e\x29\x6f\x5e\x99\x3e\x72\xa7\x65\x85\x77\x75\x31\xae\x65\xc6\xdc\xdd\xfd\x65\x5a\x7c\xbb\x57\xd8\xcb\xda\x2d\x77\x7a\xa1\x99\x62\x28\xfd\x6d\x65\xfe\xaf\xbf\xad\xfa\xdb\xaa\xbf\xad\xf6\x60\x85\x5f\xdd\x06\xdc\xc0\xdd\x5f\xd5\x08\xbc\x4a\x3b\xdd\x18\xc5\xa8\xd0\x46\xd7\xc1\x31\xfa\xa5\x2b\x5c\x51\xf1\x0d\x7d\x1b\x66\xdf\x60\x92\x2f\x91\xa9\xb0\xd3\xcb\xdc\x84\x00\xf7\xfa\xe9\x33\xde\xf8\x3d\xa8\xd4\x4e\x41\xa5\xf6\x63\xae\xcf\x92\xd5\xb0\x7b\x53\xf4\xdb\xc8\x64\xe8\xd1\xa3\xfa\x58\xfd\x3e\x56\x1f\x7e\xef\xd1\xa3\x76\x47\xad\xcf\x2b\x5d\xf3\x98\x8c\x2b\x35\x3e\xfc\x3f\xc7\x55\xcf\x4f\xe9\x49\xe8\x06\x2a\x3d\x28\x92\x17\xa0\x75\x1a\xef\xb2\x2e\xc8\x25\x8f\x49\xe7\xda\x20\xa5\x97\xf7\x5c\x06\x77\xf3\x34\xb2\x78\x69\xe0\xcf\x2c\x89\xb7\x6c\xf9\xe7\x68\xd8\x69\x20\xe0\xde\xca\xb3\x72\xa1\x3e\x57\x80\xe8\x82\x43\xbd\x21\x4f\x45\x37\x36\xee\xc2\x54\xc6\x2d\xcc\xbc\xf9\xb9\x67\xe9\xcd\x8f\x9f\x07\x06\xa2\x3b\x47\x07\xb3\x4a\xf8\xf6\xdb\xb0\xab\x84\x23\x7e\x09\xcb\xca\xd2\xbd\xff\xec\xb8\xfa\x32\x4a\xee\x79\x7b\xc7\xe5\xfa\x5c\x39\x7c\x8f\xda\xb0\xcc\xd6\xd1\xc3\x22\xf4\xa6\x96\xfd\x99\x70\x6f\x6a\x79\xd3\xa6\x16\xe3\xa2\x1d\x67\x58\x10\xa6\x1a\x44\xea\xea\x75\x02\xaf\x87\x69\xb4\x4e\xea\x80\x06\x90\x96\x68\x91\xbd\x90\xfd\x55\xf5\x79\xd9\x5e\xac\x60\x10\x24\xb7\x1c\xff\xb3\xf8\xdb\x0b\xeb\x25\x50\xef\x25\xd1\x49\x06\xbe\x59\xea\x3b\x3a\xb7\x81\x4a\xdb\xa7\xbf\x60\x55\x12\x05\x13\xf2\x48\x92\x95\xf1\x4c\xd7\xe6\xed\xb7\x95\xf5\x52\x1b\xf4\xcb\xc6\x36\xd5\x37\xbe\xdb\x01\x72\x3b\x43\x4d\x06\x47\x90\x26\xa0\xa5\x51\x3e\x2d\x2e\x06\x89\x9e\x68\x92\x40\x92\x38\x24\xb1\xb4\xdd\x00\xbf\xbb\x88\x87\xd6\x9d\x7f\xd5\xb8\x87\x26\xee\xd0\xc4\x12\xba\xd8\x53\x77\x95\x06\xe7\x88\x0d\x32\x94\x40\x1b\x5a\x61\x80\xfd\x3c\x38\xc1\x07\xa2\x5e\x8a\x0d\x6c\x7a\xf6\x97\x9e\x7b\x41\xa6\x44\x10\x16\x91\x3d\xf4\xb6\xaf\x13\x06\xf2\x93\x99\xa4\x8d\x01\xf1\xd9\xa1\xe1\x54\x15\xb7\x7a\x5a\x49\xd4\xed\x93\x03\xfb\xe4\xc0\x3e\x39\xb0\x7a\xd4\xfb\xe4\xc0\x3e\x39\x70\x93\xe2\xe9\x67\xf0\xf8\xb5\xa4\x0a\xd3\xfb\xe7\x21\x58\x98\xb9\xf4\xb2\xc5\xef\x46\xb3\x70\x1b\xbe\x17\x9a\x85\x39\x6b\xab\xcc\x0f\xa5\x1f\x1b\x42\xac\x5f\xdc\x24\xb1\x09\xd3\x28\xd9\x25\xce\xe0\xf5\x37\xc9\x3a\xaa\x43\xef\x6d\x14\x28\xd8\xba\xe7\xe3\x24\xb5\x23\xd0\x6d\xe2\xd6\x63\xf8\x76\xe7\xbd\x2f\x1c\xb4\x8d\xee\xf7\x95\x8f\x6e\x57\x5a\x7b\x0f\x2c\x36\x9f\x11\x8f\xec\xad\x37\xaf\x9c\x2b\x51\x63\x86\x6f\x76\xba\xbd\xb1\xaa\x37\x56\xf5\xc6\xaa\xde\x58\xd5\x1b\xab\x50\x6f\xac\x5a\xdb\x58\xf5\x19\xc9\x54\xbd\xe1\xaa\x17\xab\x76\x37\xdd\x7d\xd5\x32\xf7\xc9\x5a\xd7\x19\xf8\xb6\xc8\xa1\x5a\x19\x79\x6f\xa7\xfd\xcb\x8a\x90\xfb\x6b\x37\x82\xb7\xc3\xaf\xe4\x73\xb3\xa4\x6d\x02\x8b\xdd\x8e\x7e\xb6\x71\xc5\x7d\x35\xb8\xc6\xb5\xea\xc3\x9e\x97\x2c\x4e\x1f\xf6\xdc\x87\x3d\xef\x5d\xd8\xf3\xce\x95\x95\x8c\xcb\x65\x80\x44\xa6\x1a\xca\xd2\xfc\x67\x77\x67\x43\xa2\x11\x90\x82\x29\x84\x13\x93\x2c\xe1\x0b\xb0\xa4\x2c\xb9\xce\x5d\x17\xd7\x35\x89\x7a\xdf\x6f\x74\x37\xf2\x97\xd2\x39\xf6\x45\x26\x2d\xe6\xbd\x17\x52\xe8\xf1\x3f\x2b\xe9\xfc\x9d\xf0\x32\x19\x22\x9f\xa8\x84\x5b\x69\x35\x61\x8f\x58\xf3\x93\xa0\x1a\x95\xbd\x07\x27\xb9\x0a\x72\xf7\xa4\x16\xac\x32\x22\xd4\x22\x78\x93\xa4\x99\x5a\xfc\xd7\x88\x51\xe5\x3d\x6c\x74\xc6\xb8\x30\x5c\x4d\x7f\x3c\xc7\x2c\x4e\x88\xd0\x97\xaa\x6b\x27\xc2\x8c\x71\x05\xe2\x06\xcc\x20\x46\x8f\x14\x1b\xe1\x64\x70\x7d\xde\xd9\xcf\xfc\x86\x4e\xd7\x4b\xd7\x1f\x5a\x71\xd7\x7d\x48\xf8\x04\x8a\x92\xe5\x65\x9d\x5e\x37\xd0\x7b\x46\x4b\x3b\xf7\x5a\x0c\x41\x61\xf9\x50\x05\x0e\x29\x67\xa1\x8f\x97\x42\x89\xac\x78\xb7\x84\x31\xbf\xfc\xd5\x0a\xdc\x48\xf9\x99\x05\x20\x81\xc7\x30\xe4\xea\x38\xdc\x8f\x61\x87\xee\xb7\xa2\x65\xf7\x8b\xab\xc6\x0a\x3f\x0a\xa2\xc4\x62\x8c\x95\xd2\x4c\x66\x97\x18\x27\x77\x58\x3e\x74\xc6\x38\x29\xbd\xbc\xe7\x2c\xa7\x84\x71\x52\x1e\xf8\xb3\xb3\x9c\x8e\xd4\xb9\x82\x33\xbd\xbd\xfc\xf8\xae\x67\x6d\x8d\x89\xff\x5e\x72\xe5\xbb\xf1\x9e\x55\x66\xda\xb7\x98\x37\xbf\x8c\x99\xee\xcd\x08\x2b\xfc\xfc\x73\x3c\xb9\xe5\xdb\xa9\x3f\xa2\xcb\xd6\xe8\xb3\xab\x6d\x58\x11\x3a\x56\xcc\xed\x8d\xd4\x38\xac\xca\x4d\xbb\x1e\xd5\xf3\x98\xb9\x83\xdd\xe8\xeb\x4a\xf7\x75\xa5\xfb\xba\xd2\xcf\x5e\x57\xba\x9b\xd2\xd9\x59\xe3\xec\xaa\x6e\x76\xd3\x35\xdb\x15\xcd\x67\xf0\xd2\x76\xd7\x06\x2f\xa8\x2c\xab\x83\x6f\xc2\x65\x5b\x1a\xf1\x4b\xe0\xa3\xfd\x4e\x15\xc1\x5e\x0b\x7c\x96\x75\xfb\x5c\x55\xc0\x3d\xd7\xff\x7a\x64\xb7\x1e\xc5\xbe\x0f\xc0\xd8\xe1\xe2\xf4\x01\x18\x7d\x00\xc6\x67\x1b\x80\xd1\xae\x4d\xd0\x78\xeb\x74\xbd\x35\x2b\x48\x79\xa3\x80\xf8\x05\x44\x29\x2c\x1f\xba\xd6\x94\xd2\xa2\xf2\x79\xfc\x26\xa4\xfa\xc6\x09\xbf\x84\x74\xdf\xd7\x29\xda\x69\x9d\xa2\xbd\x9b\x76\x2f\xf8\xf5\x82\x5f\x2f\xdb\x74\x9c\x70\x2f\xdb\xec\xaf\x6c\xf3\x5a\x0a\xcb\xe7\x04\xa1\xab\x85\xa7\x52\x66\xcc\xd2\x00\x5b\x03\x47\x03\xee\x81\x3c\x4b\x38\x8e\x57\x05\xe1\xfc\x82\x0a\xb9\x66\x89\x68\x66\xda\xd5\x1f\xbc\x05\xc9\x4c\x8f\xd3\x8c\xf8\x77\x13\x4b\x1b\x4e\xf9\x55\xc3\x68\x81\x5e\x21\x78\xac\x14\x84\xf6\x5c\x5a\x47\x95\x86\x3b\x29\x18\xf2\xdb\xb7\x42\xc5\x2f\xa1\x4e\x7c\xc6\x0e\x81\xde\xe8\xff\xfb\x2c\x74\xbe\x37\x52\x6a\xaf\xca\xf5\x59\x94\xbd\x11\xbf\x57\x74\x7b\x45\x77\xe7\xcb\xb8\x4f\x8a\xee\x2b\x4a\xd4\x26\x2d\xe4\x59\xca\x16\x6e\x26\x5b\xf7\xa2\x75\x2f\x5a\xf7\xa2\xf5\x67\x2b\x5a\xef\xc7\x0a\xf7\x72\x75\x2f\x57\xf7\x72\x75\x2f\x57\xf7\x72\xf5\xce\x97\xb1\x97\xab\x2b\x72\x35\xfc\xe5\xd2\xa2\xd7\x15\xb2\x3b\x0b\xd7\x1d\x72\xa0\xdf\x8a\x64\xdd\x4b\xd5\xbd\x54\xbd\xdf\x52\xf5\xde\x4c\xe8\xf3\x4b\x7c\xec\x53\x07\xfb\xd4\xc1\x3e\x75\xf0\x35\x52\x07\x1d\x2f\x59\x26\xa1\xd4\x05\x8b\x1f\x6b\x1c\x68\x6f\x65\x8b\x62\xb4\x9b\x86\x75\xec\x6a\xa9\x1d\xb0\xfc\x26\x95\xa5\x4a\xbf\xb9\x86\xf6\xa8\xde\xd4\x81\x93\x16\x34\xa3\x70\xe3\x5b\x8d\x08\xf6\x93\x7d\xf3\x6d\x81\x7f\xd7\x47\xdd\xd7\x9b\x42\xc1\xae\xf5\xf5\xa6\x9e\x71\xde\xee\x70\xad\x98\xb9\xa3\x51\x63\xe3\x7d\xa3\xd3\x7e\xf5\x00\xb9\xf6\x93\xfe\xaa\xe1\x72\x8d\x37\x49\x2d\x59\xe7\xf8\x9f\x8d\x17\xc5\x2b\x94\xd9\x5a\xfb\x76\xf8\x40\xd4\xe7\x72\x35\xf4\x65\xb6\xfa\x7a\x10\x3b\x9a\xee\x46\xac\xff\xcd\xce\xb6\x2f\x2a\xd6\x17\x15\xeb\x8b\x8a\xf5\x45\xc5\xfa\xa2\x62\xe8\x77\x5e\x54\x6c\x6d\xf1\xd1\x8c\xe3\x73\x91\x20\xfb\xa2\x62\xbd\x10\xb9\xbb\xe9\xfe\xbe\x84\xc8\x3d\xb4\x20\xec\x45\xf5\x34\x6f\x41\x78\x75\x9c\x0f\x37\x92\xae\x58\x1f\x6e\x41\x7b\xbc\x0f\xfb\x7f\x3d\xde\x47\x8f\xf7\xd1\x32\xeb\x3e\x98\xb5\xc7\xfb\x40\x7d\xb8\x66\x1f\xae\xb9\xcf\xe1\x9a\x1d\xb6\xb1\xc7\xfb\xe8\x28\xce\x3d\x13\xe6\x87\x93\xb9\xd6\xc2\xfd\xf8\xa9\xae\x68\xec\xad\x94\xe6\xc6\xfa\x3b\xc3\xff\xa8\x4e\x7b\x2f\x54\x92\x17\xc4\x01\x69\xa2\xeb\xce\x0a\xc8\xdb\xc0\x03\x71\xa3\xed\x13\x17\xfb\x10\xeb\xfd\x0f\xb1\xde\xbb\xc4\xc5\xbd\x91\x64\x7b\x75\xaf\xcf\x5d\xec\x73\x17\x7b\x65\xb8\x57\x86\x77\xbe\x8c\xfb\xa4\x0c\xbf\xb2\x84\xfd\x8c\xb8\x20\xdb\xc9\xda\xbd\xa8\x6d\xde\xeb\x45\xed\x5e\xd4\xfe\x4c\x45\xed\xfd\x58\xe1\x5e\xce\xee\xe5\xec\x5e\xce\xee\xe5\xec\x5e\xce\xde\xf9\x32\xf6\x72\xf6\x8b\xe1\x84\x34\x09\xdb\x1d\xf3\x6d\xde\x92\xa4\xdd\x4b\xd9\xbd\x94\xbd\xdf\x52\xf6\xde\x4c\xa8\xc7\x0c\xe9\x31\x43\x7a\xcc\x90\x1e\x33\x64\x23\xf9\xe6\xdf\xec\xb1\x7c\x17\xdc\xc4\xfe\xca\x7e\xf7\x5d\xc2\x27\x77\x8b\x8c\xe8\xff\x9e\xd1\x94\x30\x09\xd2\x28\x55\x8b\x50\x9e\x69\x59\xf9\xfa\x9a\xbf\xbb\x3d\xbf\xfc\x70\x11\x66\xd3\xbc\xfb\x78\x7f\x71\x77\x7e\x3d\xb8\xf1\xeb\xe2\x67\x15\xae\x85\xfd\xae\x24\x92\x59\x92\xbf\x21\x5a\xf7\x84\x53\x73\xab\xb0\xca\xe5\x66\x23\xbb\x19\xde\x0e\x6f\x7e\x84\x6c\xa0\xf1\xd9\xf9\xed\xe0\xbb\x8b\x12\x41\x94\x9e\x0f\x4e\xff\x76\x7f\x7e\xd3\xfe\x7c\xf8\xdf\xe7\xb7\x77\xb7\x6d\x4f\x6f\x86\x17\xc3\xc1\x6d\xfb\xd7\xef\x07\xe7\x17\xf7\x37\xc3\xa5\xeb\xb1\x74\xb4\xcb\x95\x10\x09\x8b\x04\x71\xfe\x28\xb2\x5c\x43\x14\x6b\x88\xbc\xf8\xe8\xd8\x61\x53\x5f\x27\xe8\xde\xea\xf4\xd4\x36\x6e\x18\x6c\xd0\x90\x51\x46\x62\x2a\xf1\x24\x21\x71\xad\x25\xb7\x86\x6d\x2d\xe1\xd2\xa0\x9e\xb4\xf6\xec\x45\x4e\xcd\xf3\x22\xc3\x0b\x10\xe4\x28\x2a\xc2\xe2\x86\x3e\xcc\x3e\xb4\xf6\xc0\x34\xef\xa2\x8f\xa4\xd4\x53\x94\x0b\x41\x98\x4a\x16\x88\x7c\xa2\x52\xc9\x5a\xa3\x6e\xfb\xda\x9a\xb5\x77\xaa\x6f\x70\x8e\x25\x9a\x10\xc2\xca\xe3\x17\x24\x21\x58\x36\x8c\xd9\xee\x7e\xb7\x65\xf1\x7b\x65\xad\x31\xe6\x32\x9a\x62\x9a\xe4\x82\x54\x4e\x0b\x4f\x33\x2c\xa8\xe4\x6c\xf8\x49\xdf\x65\xfa\x20\x5f\xc1\xe7\x5c\x6c\x76\x62\x86\x7f\x0b\x29\xf8\xb2\xfc\xcf\x0f\x77\xe5\x7f\x95\xce\xfc\xc5\x5d\xf9\x5f\xcb\x69\x3d\x68\xb8\x4a\xd9\x87\xe8\xc3\xdd\x09\xfa\x00\x21\x4e\x02\xdd\xcd\xb1\xa1\xd8\x8b\xbb\x13\x74\x41\xa4\x84\x5f\x8a\x8f\x15\x55\x09\xcc\xed\x3b\xca\xb0\x58\x20\x37\x7d\x93\xe8\x8a\xa3\x39\x22\x7e\x69\xaa\x8b\xc7\xfe\x91\x33\x50\xdd\x8b\xd5\xbb\xe0\x33\x1a\xe1\x64\xbb\x45\x1c\x5c\x96\xf8\xc0\xd5\xcd\xd2\xa5\x08\xdf\xae\xaf\xc5\xe0\xf2\x0c\x92\x48\xdd\x50\x1b\x66\x7e\x49\xa4\x26\x92\x88\xb3\xd8\x7a\x69\xf4\xed\xbf\x08\x84\xfa\x7f\x70\x48\xc4\xcd\x25\x65\x33\xdd\x22\x3a\x46\x57\x37\x23\x76\x25\x62\x63\x08\x25\x5a\x1a\x36\x34\x47\x25\x62\x5c\x21\x9a\x66\x5c\x28\xcc\x94\x56\x04\x40\x0c\xb0\x2b\x62\x38\xc0\x29\x4f\xd3\x5c\x61\x7d\xd0\x6a\x8b\xca\x8c\x39\xe4\x96\xa8\xf3\x18\x5c\x2b\x0d\x6b\x68\xe4\x84\x62\x2e\x99\xd0\xed\x6b\x19\xa5\xac\x43\xd3\xb8\xa6\xca\xba\x26\xb0\x10\xb8\x2c\x4d\xbc\xa3\x8a\xa4\xd5\xf7\x3b\x06\x79\xfe\xab\xd1\x40\x70\x6a\x92\x2a\x88\x18\x88\x68\x4e\x15\x89\x94\x3e\x82\x1b\xd1\xc4\xfd\xe5\x0f\x97\x57\x3f\x85\x12\xc4\xbb\xc1\xc7\xb3\xbf\xfc\x7b\xe9\x87\x9b\x8f\xb5\x1f\xc6\x3f\xfe\xa5\xf6\xcb\xff\x6f\x29\x3d\x55\x7b\xaa\xe9\xf9\xc1\x5c\x0e\x41\xa4\x06\x9b\xb0\x9b\x2a\xa2\x29\x9e\x11\x24\xf3\x4c\x53\x80\x3c\x2a\xef\xaf\x16\x29\x2f\x38\x8e\x29\x9b\x99\x0c\xd0\x0b\xaa\x88\xc0\xc9\x47\x9c\xbd\x77\xf6\xeb\x0d\x56\xe7\xff\xde\x96\xf2\x75\xdf\xfd\x3c\xf8\x18\x66\xfc\xbe\xbb\xbe\xb9\xba\xbb\x5a\x3a\xeb\x52\x0b\xf5\x63\xa4\x1f\x9f\xc0\xff\xa2\x63\xa4\x5b\xf7\x92\x6f\x4a\x14\xd6\x1a\x01\xfa\xd2\x24\xcd\xf9\x44\x1a\xca\x12\x38\x35\x99\xa0\x29\x85\x2b\xc5\x58\xf0\xbe\x32\xc2\xb5\xd7\x1e\xfc\xb9\x31\x1f\x80\xb6\xec\x2e\x65\x16\x63\x11\xa3\x7f\xc8\x6a\xfa\x38\x18\x8e\xcd\x0f\x24\x46\x87\x68\xae\x54\x26\x4f\x8e\x8f\x9f\x9e\x9e\x8e\xf4\xdb\x47\x5c\xcc\x8e\xf5\x1f\x87\x84\x1d\xcd\x55\x9a\x98\x74\x79\xbd\x0a\x27\xe8\x5a\x70\x7d\x85\x80\x82\x4e\x04\xc5\x09\xfd\x8d\xc4\x68\x62\xf8\x1f\x9f\xa2\x5f\x22\x2e\xc8\x51\xb1\x31\xd6\xa8\x64\xef\x11\x6b\x78\x3a\xd6\x2f\x35\x30\x93\xea\x7e\xa2\x98\x44\x34\xb6\x62\x06\x61\x11\x07\xcb\xa3\xf1\x55\xe8\xf6\x5c\xa6\xa1\xd6\x68\xb2\x5c\x15\xcb\x19\x28\x2b\x38\x26\x41\xb6\xbb\xe2\x65\x82\xd3\x8a\xcf\xb9\x51\x5b\x73\xad\xa2\xeb\xbb\x15\xc3\xad\xea\x5e\xcd\xf4\x84\x23\x9e\xa0\x49\x3e\x9d\x12\x11\x3a\xa4\x0f\xb4\x36\x43\x25\x12\x24\xe2\x69\x0a\x12\x83\xfe\x2a\x97\x86\xaa\x61\xc5\xec\x68\x8f\x46\x0c\xf6\x5f\xab\x39\x40\x01\x31\x07\x56\xc7\x08\x89\x11\x66\x0b\xd3\xcd\x24\x9f\x86\xed\x1b\x18\x0a\x1c\x23\xaa\x46\x6c\x90\x24\x48\x90\x94\x2b\x12\xe4\x50\x82\xf3\xac\xbc\xe0\xc0\x22\x05\xc9\x12\x1c\x91\xd8\xd0\x43\xc2\x23\x9c\xa0\x29\x4d\x88\x5c\x48\x45\xd2\xb0\x81\x2f\xc1\x56\xa3\xd7\x8c\x4a\x14\xf3\x27\x96\x70\x6c\xe7\x51\xfd\xec\xab\xf2\x69\x1c\x3a\x88\x80\xa1\x10\x5c\xc0\xff\xfc\x40\x59\xbc\x33\x0e\x75\x7f\x3b\xbc\x09\xff\x7d\xfb\xf3\xed\xdd\xf0\xe3\x7a\xdc\xc7\x53\x16\x0c\x0f\x74\xf8\x13\x74\x6b\x16\x81\x0b\x2d\x11\x89\x96\x49\x7d\xb4\xa4\x54\xfc\xc0\xe3\x0d\xb9\xef\xc7\xc1\xe5\xfd\xa0\xc4\x51\x6e\x4f\xbf\x1f\x9e\xdd\x57\xf4\x01\x3b\xbf\x92\x0c\x6f\xd4\xbf\xf0\xb7\xd3\xef\xcf\x2f\xce\xc6\x0d\x0a\xe3\xbb\x9b\xe1\xe9\xd5\x8f\xc3\x9b\x42\xb7\x6b\x5c\xa2\xca\x60\xaa\xcc\xea\xce\x30\xa5\x39\x8f\xd1\x64\xd1\x0c\x08\xa1\x25\xe7\x04\x7c\xb1\x05\x24\x8a\x69\xf5\x04\x78\x93\xc3\xe6\x28\xbe\x48\x79\x4c\x0e\xec\x3b\x80\xa4\x61\x8c\x2b\x46\x62\x6e\x6e\x58\xf7\x8e\x59\x60\xa8\x30\x20\x17\x7e\xe1\x4e\xd0\x00\x49\xfd\x62\xae\x0f\xb5\xa0\xb3\x19\x18\x0e\x2b\x43\x35\xad\xd9\x4f\x61\x79\xe1\x3b\xb3\xff\x99\xe0\x70\xce\x75\xb7\xd6\xe2\xec\xad\x12\xe6\x43\x40\x5d\x29\xb7\x28\x30\x18\x1c\x1a\x86\xe6\x36\x4b\x2f\x42\xeb\x7a\x99\xf3\x68\xec\x45\xfa\x70\x01\xdb\x92\xc6\xde\x99\x09\xf2\x48\x79\x1e\x7c\x6a\x81\x3d\x4a\x3b\xde\xd8\x7c\xb1\x00\xb0\x6c\xc6\x28\x52\x69\xc6\x93\x47\x63\x0b\x9a\x85\x3d\x42\x0b\x53\xc1\xd3\x86\x36\xca\xc7\xe4\xfc\xea\x56\x09\xac\xc8\x6c\x71\x66\x59\xc6\xe6\xc7\xe3\xec\xea\xa7\xcb\x8b\xab\xc1\xd9\x78\x38\xf8\x50\x3e\xf1\xfe\xc9\xed\xdd\xcd\x70\xf0\xb1\xfc\x68\x7c\x79\x75\x37\x76\x6f\x2c\x25\xf9\x96\x0e\xea\xf7\x74\xf9\xc5\x13\xa4\x59\x2e\xb0\x46\x07\x78\x17\xf0\xc7\x09\x99\x72\x61\xf8\x7c\xea\x42\x17\xac\x08\xe3\xd6\xd6\xea\x62\x95\x59\x9c\x80\x65\xac\xa9\x49\x63\xf5\x56\x82\xe0\x14\xee\x09\xcc\xd0\x90\xc5\x87\x57\xd3\xc3\x5b\xf3\x63\x8a\xc5\x03\x11\xfe\xd3\x27\x41\x95\x22\xac\xa4\xd2\x61\x37\x64\xaf\x24\x16\x1d\x1c\xa1\x1b\xcd\xf7\xf5\xfb\xfe\x52\xd3\xc4\x1e\x13\x85\x69\x22\xed\x60\x4b\xeb\x7a\x82\x2e\xb0\x98\x15\x76\xb8\x2f\xf9\x74\x6a\x1a\xfb\xca\x0c\x43\xdf\x61\xa5\x59\x34\xf0\x5e\x4d\x1a\xee\x5e\x84\xfe\xec\xcb\x5e\x1e\xae\x53\xd5\x7d\xb6\x1d\x4d\xdd\x5f\xc3\x8a\x1b\x8d\xbd\xa4\x1b\xda\x27\x0d\xb4\x06\x13\x37\x8f\x97\x5f\x32\xcd\x6d\xd7\xc9\xa9\xfc\x62\x03\x39\x99\x5c\x2a\xbd\xf3\x53\xad\x6d\x36\xd0\x12\xf9\x44\xad\xc1\x20\x1c\x77\x85\x84\x8a\x66\xc0\xbc\x8a\xb3\x8c\x60\x21\x9b\x76\xbb\x2c\x06\xb6\xec\xbd\xe9\x29\xec\xc3\x6e\xb2\xeb\xe7\x00\x71\x06\x06\x07\x2f\x44\x54\x28\xb2\x03\x0d\x98\xb6\x6a\x14\x70\x0d\x68\x4b\x57\x16\xd9\xe8\x23\x95\x5a\x69\x34\x3f\x7e\x67\x21\x97\x36\x23\x88\xf7\x83\xf3\x8b\x8a\x70\x31\x3e\x1b\xbe\x1f\xdc\x5f\x2c\x37\x13\x96\xbe\xab\x6e\x31\x3a\x44\xfa\x79\xd9\x6f\x4e\xa7\xe6\xce\x70\xc0\x51\x46\xa5\x25\x0c\x8c\x56\x16\xaa\xc6\xd8\xab\x63\x92\x25\x7c\x91\x12\x06\x26\x9e\xd2\x4d\xa8\xd7\x73\x8a\xa9\xbd\x5a\x82\xc1\x82\x15\xc7\x9a\xdd\xe0\x1a\x3b\x74\x68\x55\x24\xf6\x37\x6f\x19\xac\xaa\xc2\xba\xaf\x8d\xf7\xcc\xfe\xe7\x56\x61\xb5\xe1\x19\x1b\x9c\xde\x9d\xff\x38\x2c\xeb\x87\xa7\xdf\x9f\xff\xd8\x24\xd5\x8c\x3f\x0c\x2f\x87\x37\x83\xbb\x15\xc2\x49\xa5\xc9\x26\xe1\x44\xea\x01\x57\xbd\xa7\x54\xfa\x88\xa0\xc8\x40\x5e\x21\xaa\x24\x7a\xa4\x92\x4e\x28\x00\x84\x59\x4f\xe4\xfd\x39\x70\xd6\x47\x9c\xd0\x98\xaa\x85\x13\x5f\x4c\xbf\xe5\x7d\xd4\x9c\xd4\xb6\x6f\xcc\x0e\xa1\x7f\x12\xac\x7c\x66\x73\xdc\xa4\x4f\x10\xe8\xb6\x8f\xa0\xb4\x05\x9f\x31\x2d\x48\xb3\x19\x11\x66\x38\xe0\x7d\x09\xc7\x12\x3c\xd7\xa3\x0a\x85\x95\x62\xd5\xbc\xd0\x3a\x23\x8c\x08\x00\x81\xf3\x9d\x18\x41\x4a\x10\xf6\x85\x96\xb9\xb2\x84\x46\x54\x25\x0b\x14\x81\x0d\x0b\xcc\x99\x29\x66\x78\x66\x85\x03\x50\x73\x2a\x24\xf1\x37\x83\xa2\x76\x35\xb5\xa6\xfd\x3b\x4a\x36\x3c\x66\xf7\x97\x67\xc3\xf7\xe7\x97\x65\x12\xf8\xfe\xfc\x43\x49\x84\xfd\x38\x3c\x3b\xbf\x2f\xdd\xe6\x5a\x92\x5d\x2e\xd7\x57\x9b\x6d\x38\x8a\xfe\xa5\x13\x74\x66\x3e\x3d\xd1\x8b\xdb\x00\x11\xe7\x95\xdf\xca\x3a\xdc\xb8\x90\x3c\xf7\xc7\x90\x29\xd1\xe8\x97\xe8\x6a\x42\xb2\x3e\xc8\x92\x0d\xa9\x39\x54\xa1\xd6\xf7\x65\xd5\xa9\x5c\x9d\xb2\x7b\x11\x82\x2e\x8f\x0a\xcb\x52\x18\xc3\x00\x46\x83\x36\x23\x56\x83\x5b\xab\x60\xd8\x3f\x82\x8b\x3a\xcd\xa5\x32\xae\x44\x20\x4e\xf4\xf0\x57\xa9\x17\x14\x5c\x8d\x47\xe8\x96\x90\x11\x73\xd6\x83\x19\x55\xf3\x7c\x72\x14\xf1\xf4\xb8\xc0\x27\x3c\xc6\x19\x4d\xb1\x96\xa4\x89\x58\x1c\x4f\x12\x3e\x39\x4e\xb1\x54\x44\x1c\x67\x0f\x33\x88\x80\x71\xee\xd4\x63\xdf\xec\x8c\xff\xe1\xe2\xcf\x5f\x1f\x5e\xfc\xf5\xeb\x77\x75\x0b\x59\xdb\xfe\x0f\x59\x84\x33\x99\x27\x36\x62\x4e\x84\x6b\xe3\x8e\x7c\x4e\x56\xed\xf7\x65\x79\xbb\xb6\xd3\x5f\x4f\xaf\xef\x4b\x16\xeb\xf2\x3f\x3f\x0e\x3f\x5e\xdd\xfc\x5c\xe2\x94\x77\x57\x37\x83\x0f\x25\x86\x3a\xbc\xfe\x7e\xf8\x71\x78\x33\xb8\x18\xbb\x87\xdb\xd8\xde\x7e\x60\xfc\x89\x95\x97\x46\x3a\x0e\x58\xeb\xe9\x04\xbd\xe7\x02\xfd\xe0\x77\xf2\x70\x82\x25\x5c\x31\xee\xce\x92\x07\x28\xe3\x31\x30\x5e\x44\xb2\x39\x49\x89\xc0\x89\xb5\x19\x48\xc5\x05\x9e\x99\x9b\x5e\x46\x02\xab\x68\x8e\x64\x86\x23\x72\x80\x22\xa0\x86\xd9\x01\x6c\x0a\xa8\x5a\x7c\x56\xb5\xf3\xdd\xe4\x4c\xd1\x94\x38\x15\xdc\xfe\xf3\xce\x6c\xc6\x06\x9b\x73\x75\xf7\x7d\x59\xd8\x7b\x7f\xf1\xf3\xdd\x70\x7c\x7b\xf6\xc3\xd2\xf5\x34\x9f\x95\x46\x76\x0b\x01\x48\xa7\x3c\xc9\x53\x16\xfe\xbd\xf9\xd8\xce\x2f\xef\x86\x1f\xaa\xa3\xbb\x1a\xdc\x95\x29\xe3\xa6\x1c\xe0\xf6\xee\xbb\xab\xab\x8b\x61\xc9\x25\xfc\xee\x6c\x70\x37\xbc\x3b\xff\x58\xa2\x9f\xb3\xfb\x1b\x83\x46\xb8\x6c\x9a\x6e\x04\x0d\x13\xd5\xd3\x0a\xa7\xb9\x6b\x56\xd8\x89\x13\x0d\x6c\x40\xb9\x39\xcb\x87\x01\xdc\x8e\x09\x07\x03\xab\xce\xa1\x37\xa9\x46\x66\xa4\x8d\xec\x50\x95\xb7\x09\xb5\xb3\xe3\xa5\x1b\xbd\x8c\x2b\xdf\xf9\x21\x18\x28\x50\xa3\x6c\xe3\x24\xe1\x4f\x26\x94\x37\xa5\xfa\x56\xb6\xc0\x68\xfa\x15\x59\x78\x08\x8f\x1a\x38\x5e\x79\x5b\x48\x24\x88\xfa\xc8\x73\xa6\x36\x27\xb9\xc1\x65\x89\xef\x0c\x2f\x7f\x1c\xff\x38\x28\x53\xe0\xf9\xc5\x72\x56\x13\x36\xd1\x70\x15\x0f\x2e\x7f\xf6\x97\x30\x04\x7c\x1f\x78\x0d\xd5\xc8\xae\x51\x42\xb5\xd8\x1b\x61\xad\xbd\x26\x20\xd1\x20\x42\xc1\xe4\x90\xea\xc9\x41\x80\x69\x66\xfc\x49\x86\x3f\x99\x41\x9e\xb8\x3f\x2a\xed\x49\x58\x17\xb0\xa6\xba\x78\x7a\x68\xc7\x6a\xd5\x0c\x11\xf6\x48\x05\x07\x3c\x5b\xf4\x88\x05\xd5\xd2\xb8\x69\x59\xcf\xf5\x04\xfe\x77\xbd\x36\xc1\x30\x5a\x61\x5c\xb7\x5c\xa8\x33\x1f\xc8\xbb\x99\x35\xa4\x29\xa0\xb5\x1e\xca\xda\x6c\xe8\xa8\x7f\xdb\xb0\x39\x5b\x06\xfc\x96\x27\xfc\x6b\x72\x46\x71\xa2\x19\xc0\xee\xe4\xc5\xc1\xe5\xed\x79\x59\x7e\x2c\xab\x19\x01\x5f\xde\x58\x5e\x04\x43\xa5\x19\xb9\x53\x26\x6e\xff\x76\x61\xb4\x0b\x00\x3d\x36\xe7\x36\x50\x2c\x40\x00\x72\x28\x28\x19\x16\xb2\xf2\x85\x44\x00\x84\x56\x04\x5c\xe9\x3b\x0b\xc2\x99\x1e\x39\x8d\x47\x8c\x7c\xca\x08\x93\x10\x1c\x60\xee\xb3\xc2\xd7\x2e\x8f\xd0\xf9\x14\x58\x82\x7e\x9d\xa1\x9c\x59\x07\x98\xbe\x70\xcd\x20\x0f\xb4\x28\x6b\x87\xe0\x35\x44\x30\xbc\x30\xe2\x82\xa5\x8a\xc1\x8f\xd8\x4f\xde\x89\x06\x8f\xa6\x5c\x33\x20\xbd\x8b\xb6\xbd\x13\x84\x99\xa4\x07\x48\x2b\x2c\xd5\x3d\x85\xd4\x01\xad\x50\xda\x10\x2e\xcd\x69\xec\x9f\x2f\x7f\x0d\xd4\xe2\x84\xc3\xcb\xa0\xf9\x2e\xa8\x5c\x05\x2d\xa2\x71\x62\x3c\x26\xe3\xee\x77\x42\xc4\x05\xb1\x7e\x96\xb5\xaf\x81\x55\x8c\xfd\x0e\xcb\x87\x9a\xef\xe1\x9c\x49\x85\x59\x44\x4e\x13\x2c\x37\x0c\x42\x72\x36\x8e\x83\xb2\xc4\x71\x73\x73\x7f\x7d\x77\xfe\xdd\x0a\x2e\x5f\xfd\xb8\x1e\x06\x14\x25\xb9\x73\xcf\x4d\x04\xc7\x31\xd2\xec\x73\xc6\x8d\x2b\xd0\x0a\xfe\x05\xf4\xb7\xc9\xeb\xf1\x01\x95\x25\xd8\xf1\x22\x1d\xc1\xda\x39\x42\x57\x02\xb5\x0b\x81\x22\xbd\x12\x28\x30\x79\xb8\xad\x06\xcf\xa2\x29\x48\x62\xad\x5b\x59\x82\xd5\x94\x8b\xd4\x70\xf9\xd2\xa4\x4d\xe3\xcb\x1b\xa5\x4c\x11\x21\xf2\x4c\x51\x87\xe5\x5e\x95\x52\xa1\xc2\x3b\x9f\x7d\x24\x52\xe2\x19\xd9\xc6\x01\xdd\xa4\x3c\xdc\xfe\x18\xfe\x13\x1c\xcc\x5d\x64\xff\xd2\x08\x5d\xe4\xbb\xa3\xa7\x2b\xf6\xde\x04\xf2\x5c\xf3\x84\x46\x1b\x06\xdc\xbd\x1f\x9c\x5f\x8c\xcf\x3f\x6a\x25\x7e\x70\x37\xbc\x28\x89\x12\xf0\x6c\xf0\xfe\x6e\x78\x63\x41\xac\x07\xdf\x5d\x0c\xc7\x97\x57\x67\xc3\xdb\xf1\xe9\xd5\xc7\xeb\x8b\xe1\x8a\xc8\x9c\xd6\xc6\xeb\xd6\xd5\xea\xab\x27\xb5\x5f\x60\x87\x35\x2f\x0b\xed\x65\x90\x35\x86\x69\x02\x4e\x70\x6e\x9c\xe1\x18\x31\x1e\x13\xf8\x59\x3a\xeb\x8c\x47\x8e\x46\xe7\xea\x8b\x24\x41\x38\x57\x3c\xc5\xe0\xb5\x49\x16\x23\x86\x27\x9a\xb5\xe2\x24\x09\xc2\xbb\x44\xce\x98\x66\xb1\xba\x31\x03\xd1\x1e\x25\x44\xb3\xf3\x2c\x48\xf6\xb3\x7e\x83\x29\x65\x10\x69\x9b\x62\xf1\x60\xdc\x4c\x45\x97\xc5\xa1\x90\x08\xcb\x11\xd3\xe3\x22\xd6\x30\xd4\x65\x85\x4f\x3a\xbd\xd5\xba\x3a\x29\x7e\x20\x7a\x55\xd2\x3c\x9a\xa3\x4c\xf0\x99\x20\x52\x5a\xdb\x72\x84\x99\x09\x40\xb0\xaf\xeb\x6b\x68\xc4\x18\xd7\x4b\xe1\x4c\xd8\x31\xc9\x08\x8b\x09\x8b\xa8\x49\xeb\x03\xdf\xbd\x37\x6d\xce\x04\xce\xe6\x48\x72\x70\x7a\xc3\xb2\x83\xfd\xca\x7c\xe4\x6e\x32\x33\x63\xf3\x38\xb4\x40\x8b\x5c\xf3\x89\x2b\x90\x13\xcd\x2a\xc3\xc7\xee\x32\x74\x6e\x17\x63\x07\x4c\xb3\x84\x28\x03\xd6\x0f\x4b\x0e\x9b\xa1\xd7\xba\xb4\x1f\x7a\x9b\x9a\x36\x41\x5f\xd8\x6e\xcc\x58\xda\x11\x1d\x35\x58\xb6\xed\x91\x42\xdf\x63\x16\x27\xba\x15\xe7\xc3\x28\x9f\x45\x48\x45\x19\x68\xaa\x71\xa7\x71\x9b\x5b\x34\xc2\xb9\xdc\xe6\x1a\xad\xe4\x62\x1a\xab\xe0\x61\x11\x14\x02\xe4\x6d\x13\x31\x61\x75\x33\xcd\x22\x71\xc2\xed\x2a\x99\xd7\x73\x53\xff\x09\xc1\x68\x5a\xae\xd9\x4c\x50\x16\xd1\x0c\x27\x1b\xe9\x7e\x95\x60\x7c\x1b\xe3\xfe\x25\x9d\x6a\xf2\xf9\xaa\xe6\xb6\x55\x44\xa4\x90\xa0\x6c\x87\xe9\xb7\x70\x0d\x4b\x92\xcd\x6a\x20\xb2\x88\x26\xc1\x82\xe7\xc6\x1f\x07\xeb\x42\xe2\x86\xa3\x7a\xd4\xb4\xdd\xfa\x64\xe0\x72\x00\xf4\x06\x9b\x6d\x22\x7f\xda\xd6\xaf\xd2\x8a\xed\xdd\x04\xe3\xe1\xe4\xba\xb9\xcd\xa6\x1d\x08\x1e\xfe\x6b\x19\xed\x7c\xc4\x99\xa6\x19\x0b\xdb\x8f\x8b\x39\x5a\x25\xc9\x56\x05\x73\xf1\x33\x81\xef\xdc\xe7\x85\x74\xdf\x8d\x62\x09\x6d\x00\x54\xbd\x93\x52\x0c\x41\x90\x63\x6e\x69\x7c\x9a\x6b\x59\x16\x61\x88\x42\x40\x5f\x92\xa3\xd9\x11\x72\x45\x18\x0e\xd0\xe0\xfa\x7a\x78\x79\x76\x80\x88\x8a\xbe\x72\x31\x8b\x36\x60\x69\xc4\x14\xb7\xd2\xca\xc2\x15\xd0\x48\x89\x98\x91\xd2\x9c\x5d\x74\x13\x84\x2a\xcf\xa8\x54\x36\x7c\x56\xf3\x95\xa0\xd4\x09\x4d\xab\x62\xb6\xa1\x90\x5c\xcd\xb7\x21\x0d\x2c\x65\x9e\x6a\x5d\x76\x4c\x71\x3a\x16\x3c\xd9\x86\x29\x9c\xc1\x54\x40\x5d\xf6\xe9\xf9\x14\xa7\x48\x37\x6b\x43\x41\xbc\xcb\xd1\x8b\x74\x5a\x30\xd2\x7c\x59\xdf\x9b\xc1\xbd\xe5\xbc\x0f\x36\x1e\x8d\xba\x10\x08\x48\xdf\x6f\x61\x15\x85\xd9\x78\x6c\x2d\xf5\x63\x1c\x45\x5a\xe5\xde\xf1\xa4\x82\xfa\x39\xce\x25\x60\x3b\x7a\xb6\x69\xae\xa2\x73\x37\xcc\x4c\x73\x30\x08\x06\xd6\x57\xae\xe4\x11\x2d\xda\x6f\xe8\x77\xb2\xa8\xf5\xea\x2a\xdc\xdc\x4b\x6f\x52\x31\x97\xb0\x24\xb0\x93\xd2\x54\xc8\x51\x73\xb2\x40\x73\xfc\x48\x4a\x5d\xba\x84\x18\xdd\xf0\x82\xe7\xa2\x89\xd1\x8d\xd8\x19\xc9\x04\xd1\x92\x7e\xd5\x81\xe2\x69\xfa\xa6\x4c\x89\x3d\x5d\xf7\x74\xfd\xe6\xe9\xfa\xd4\x14\x4a\x1a\xf8\xc2\x58\x5b\x09\x70\xa6\xb1\x71\xc6\x79\x32\xee\x60\x13\xe9\xbe\xe2\x25\x4f\x58\xa5\x6c\x14\x40\x02\xf0\x1c\xe4\xa3\xd2\xb5\xc9\xf5\x5d\x17\xa4\xd8\xda\xe1\x2d\x59\x06\xe7\x32\x0b\xea\xe5\x6c\x73\xde\x9b\x5a\x59\xd6\x12\x7a\x76\x31\xe7\xd4\xc8\x37\xde\x5d\x16\xd6\x3f\x2d\x1d\x26\x27\x8a\x50\x56\xab\xc6\x66\xe8\x59\x2f\xb0\x91\x3b\x7e\xcd\xb9\xc2\xf2\xab\xa3\x11\xd3\x42\xd4\x03\x59\x18\x73\xab\x16\x53\xfe\xa8\x65\xf1\x43\x49\x98\x84\x70\xef\x3f\x1a\xf7\x9c\x26\x71\x67\xae\x36\xaa\xa9\x29\x02\x07\x41\xd7\xbe\x17\x08\xd1\xb5\x8d\x5a\x29\xa9\x08\x80\x06\x39\xdf\xcc\xc5\x3e\x33\xc3\x9f\x11\x05\x29\xd6\x8a\x2a\xd0\x99\x62\x53\x65\xae\x36\xf4\x95\xa6\x2b\x43\x15\x82\x83\x9f\x24\xce\xb7\x63\xfc\xb2\xde\xc6\x4a\xce\xe8\xb5\x85\x5b\x1b\xf3\x7e\xec\xec\x46\x91\xe0\xb5\xd2\x6d\x58\x22\xb3\xd3\x13\xc3\x0e\x9c\xff\x9a\xb0\xa3\x27\xfa\x40\x33\x12\x53\x0c\x11\xf0\xfa\x5f\xc7\x7a\x5e\x7f\x38\xbd\xb9\xba\x1c\x17\x99\x3c\xff\x35\x62\x83\x44\x72\x9f\xa5\x80\x18\x67\x3e\xdc\x3e\x13\xc4\x89\x84\x76\x2e\x60\x75\x2d\xcc\x88\x23\xd6\x36\x82\x98\x47\xf2\x08\x3f\xc9\x23\x9c\xe2\xdf\x38\x03\x57\xfa\x00\xfe\x3c\x4d\x78\x1e\xff\x84\x55\x34\x3f\x86\x73\xad\x8e\xc9\x23\x61\xca\xb8\xa9\xf4\x72\xc5\x90\xbc\x2b\x21\x5a\xff\x0f\x7a\xcc\x45\x52\x91\xd4\x9a\x6c\x44\x32\x85\xfe\x1f\x41\x26\x9c\xab\xe6\x4b\x8a\x4f\xa7\x92\xac\x75\x21\x15\x4a\xda\xed\x15\xfa\xeb\x5f\xbe\xfe\x46\x93\xd0\x26\x6b\x7c\x7e\x7b\x35\xd6\xdf\xff\xe1\xcc\x7e\x2f\xd7\x60\x77\x57\x59\xc1\xda\x1c\xf1\x98\xc0\xf9\x9c\xc1\xed\x27\xc0\x79\x01\xec\x0d\xc8\xa1\xd8\xc7\x26\xee\x76\x56\x6a\x7d\x3b\x95\x6d\xa3\xc5\x04\x15\x3b\x98\x23\x3a\x44\x8c\xa3\xd4\xc4\x9a\x62\x86\xfe\xfd\x87\xef\x9a\x37\x30\x17\x74\xa3\x0e\xa9\x85\x6b\x08\xba\x94\xf4\x37\x22\x91\xa6\x1a\x4d\xc5\x3c\xd5\x5d\x0b\x22\xe7\x3c\x89\xd1\x13\x01\x35\xc9\xc6\x81\x7a\xad\x5c\x90\x11\x0b\x9b\x80\x90\x43\x84\x13\xc5\x67\x04\xee\x6a\xa7\xa8\x29\x22\xb4\xa8\x62\xb2\x34\x14\x17\xe4\xc0\x40\x7d\xdd\xfe\xd9\xc5\x56\xc3\x34\xe1\x91\x4b\x6a\xb1\x26\xb9\x78\xd2\x3c\xf3\x69\xd5\xf4\x8a\xda\x6d\xf8\xd5\x4d\xb6\x66\xdb\xe6\xa5\xb1\x49\x28\xd6\x86\x55\xdd\x99\xe6\xc1\xd0\x88\xb3\x71\x42\xd9\xc3\x46\x9b\x71\xe5\x44\x39\xdd\x82\x5d\x33\xdd\xa2\xb7\x73\x1b\x0b\xc8\x1a\xe7\xe3\x7d\x9e\x24\x26\xb5\x25\xdc\x1e\x90\xbb\xcc\xba\x81\x30\x90\x99\x1c\x50\x12\x5b\xbf\x97\xd5\x84\x05\x61\x10\xf0\x36\x62\x93\x85\xf5\xd9\xca\x03\x24\xf3\x68\xee\x32\xf3\x22\xce\xa4\x16\xa3\xb9\x40\x11\x4f\x53\x53\xdc\x94\x11\xa4\x38\x4f\xa4\x8d\x76\x67\x87\x0a\x47\x6a\xc4\x8a\xfe\x56\x9c\x3c\x53\x01\x69\xbb\xd4\xbd\xee\x2e\x9d\xa2\xd2\xd2\x52\x81\x9b\xc6\x21\x66\x03\x18\xc1\x8c\x27\x2a\x40\x7f\xe0\xf5\xb3\x64\x36\xac\x45\x33\x90\x73\x2e\xd4\x38\x6e\xe4\x39\x2b\x89\xa6\xca\x08\x19\x39\x4c\x20\x68\x98\x3f\x6a\xe1\x9f\x3c\x79\xe3\xeb\xb2\x21\x68\xaa\x5e\x36\x82\x6e\xc7\x68\xe9\xc8\xd6\x25\xc1\x96\xb5\x32\x08\x1e\x51\x39\x26\x7c\xd5\x18\x6f\xe1\xab\x53\xfd\xd1\xd2\xc5\xab\x9e\x3b\x27\x04\xf1\xb8\x00\x9b\x33\xf7\xba\xcd\x08\x59\xb6\xa6\x16\x3a\xe1\xf9\x32\x47\x97\x4d\xe5\xbe\x6c\xc9\xd5\x63\x01\x93\xbd\x24\x20\x6b\x62\x31\xa1\x4a\x60\x51\x42\x0a\xf1\xfa\xa0\x24\x58\x40\x7c\xd6\x88\x19\xdc\x38\xa3\x29\xc4\x28\xa6\x12\x12\x44\xe0\x2e\x0d\x9c\x61\xa8\x9b\x12\x58\x39\xda\x45\x9e\xa3\x89\x3f\x87\xc0\xb2\x82\x34\x1c\xb3\xd3\x1d\x79\x7c\x2c\xad\x9f\xf1\x28\x2f\x04\xb9\x08\x24\x5c\x8b\xa9\x83\x28\x93\x74\x36\x57\x88\x32\x6b\x77\xc4\xc9\x8c\x0b\xaa\xe6\xa9\x3c\x40\x93\x5c\x6a\x2d\xd4\x04\xab\x99\x78\x14\xa2\xa2\x4e\x5c\x68\xdb\x24\xe2\xb8\xd2\x60\x5d\x45\xd9\x80\x34\xba\x1d\xca\x61\xe5\xae\x58\x41\x38\x03\x8f\x33\x58\x6d\x83\x42\xdd\x46\x03\x4f\x89\x4c\x1c\x20\x77\xc8\x4e\x50\x05\xa4\xed\x1c\x00\x2a\xe4\xce\xbc\x14\x2f\x51\x88\x0b\x99\x64\x50\x41\x5c\xec\x36\x48\x5e\x65\x64\x4a\x83\xde\xe4\x9d\x4e\x69\xa6\x1a\x03\xb7\xea\xae\xa2\x9b\x00\xf3\xa7\xdb\x62\x43\x32\x16\x50\x33\x20\xb5\x8d\xd8\x2d\x21\xed\x40\x6e\xb5\xbd\x37\xa5\x71\x61\x0a\x36\xd1\x63\x39\xc9\x6f\xe3\xc4\x3e\x1b\xde\x9e\xde\x9c\x5f\x1b\xc8\x89\xab\x9b\x8f\x83\xbb\x71\x83\x5f\xbb\xe1\xad\x8f\x83\x9b\x1f\xce\x56\xbf\xf6\xfd\x5d\x39\x2b\xbb\xe1\x95\x9b\xdb\xe5\xc9\x1c\x1d\x86\xd8\x90\x14\xd6\xd8\xcf\x09\xca\x16\x6a\xce\x99\x0f\x51\x88\x4b\xbc\xe9\x10\x99\x8c\x60\x05\x21\x44\x42\xaa\x06\xc7\xe1\x1d\xc4\xe5\xac\x96\x30\xcb\x9b\x65\x60\xd8\x76\x2a\x1a\xad\x71\x22\x3f\x24\x7c\x02\x7e\xeb\xbc\x54\xe2\x76\x49\x04\xfa\x96\xf1\x3e\x67\x54\x66\x09\x5e\xd4\x7a\x58\x75\xe5\x5c\xe2\x94\x40\xc4\x71\x81\x1f\xe7\x92\x45\xf4\xce\x40\x02\x93\xbf\xd7\xe9\x14\x32\x99\x14\xc5\x8a\xa0\x09\x51\x4f\x90\x37\xe7\x7e\xf5\xb6\x54\x17\x30\x22\x8f\x46\x0c\xcc\x39\x23\xbd\xc8\x71\x0e\xd1\x7e\xa3\x77\x07\x68\xf4\x2e\x26\x8f\x24\xe1\x99\xde\x79\xfd\x43\xcb\x25\x33\x4c\x31\x4d\x2e\xb9\xf2\x96\xb9\x6d\xf6\x53\x90\x88\x66\x20\x99\x8f\x89\x6e\xf7\xe5\x04\x8f\x12\x25\x3b\x76\x06\x63\x40\x38\x8e\xb5\x92\x0d\xac\xcc\x0d\xaf\x08\x01\x62\xc1\xd4\x4b\xb5\x32\xd7\x11\x29\xbc\xf9\xdb\xf4\x18\xb6\x59\x36\x7b\x36\xee\x80\x77\x0c\xbf\x90\x92\xe1\x42\x71\x7c\xc7\x1d\xb5\x8e\xfb\x36\x1d\xa3\xd5\x03\x5d\x3d\x80\x7a\x2d\xd6\x10\x98\xfd\x00\x6f\xf5\x77\x2b\x05\x4d\x7f\xdb\x46\x61\x49\x76\x10\x19\x6d\x6e\x73\x35\x9d\x9a\xac\x1c\x71\x94\x70\x59\x86\x3a\xe9\x3c\xe8\x53\xfb\xe9\xb2\x71\x0f\x43\x67\xb1\xbe\xd6\xd7\xf2\x47\x37\x2c\x7c\x05\xcb\xcf\xb0\x09\x65\x1d\x1c\xf6\xed\x03\x44\x21\x58\x0e\xe4\xe9\xa4\x48\xfc\x66\x31\x2a\xac\xd8\x23\x56\x84\x1c\x48\xf4\x44\x12\x88\x52\x8a\x78\x9a\x81\x85\xd6\x0e\xd7\xb6\x44\x62\x13\xf0\x79\x80\x78\xae\x74\x63\x26\xa5\xc2\xd9\xe0\x6c\xbe\x46\x61\xb5\x36\xae\x13\x1b\xbb\xec\x71\x81\x0d\xad\x1b\x56\x48\x19\xfa\x40\x14\xb4\x02\xb8\xeb\xe1\x04\x41\xcc\xab\x46\xc0\x35\xaf\xfd\x16\x27\xca\xce\x64\x8d\x9d\x2f\x70\x2f\xbe\x4b\xf8\x64\xb9\x8e\x07\x8d\xa3\xfb\x9b\x73\x67\x50\x2a\xc2\x5f\x02\xf0\xd9\x92\x43\x68\x78\x7d\x33\x3c\x1d\xdc\x0d\xcf\x8e\xd0\xbd\x24\x7a\x79\xfc\x74\x21\x3d\xd6\x4b\x94\x66\xe4\x16\x48\x83\x49\x45\x70\x9b\x1e\x4b\x84\x28\x25\xb1\xae\x60\x1c\x65\x94\x8d\xe5\x84\x0d\x18\x17\xd4\xda\x59\x00\x17\xa6\x3a\x4f\x1b\x58\xb5\xea\x04\x42\x98\xcb\xf8\xed\x04\x19\x99\xf1\xa6\xf5\xc0\xaa\x55\xe4\x53\x0e\xc8\x7a\xee\xc9\xc0\xd1\x52\x73\x42\x05\xea\x34\x2d\x43\x54\xe3\xee\x73\x0a\x22\x94\x3f\xe2\x6c\x79\xf6\x20\x7e\x2a\x11\xad\x91\x64\x02\xd7\xeb\x73\x9f\x03\xc7\xd6\xc6\x86\x15\x6e\x3f\xc1\xc2\x1f\x61\x78\xab\xe7\x9b\x26\x60\x5f\x3a\x1b\x47\x38\xb1\xca\x20\x6c\x18\xa2\x44\x70\x76\xe0\x17\xca\x50\xe9\x4a\x3c\x40\x53\xfa\xc9\x36\x5a\x84\x27\xbb\x57\x03\x7f\x75\x4b\x38\xdc\x1c\xd7\xcf\xd4\x1a\x62\xc3\x35\x7c\xbf\x34\x3c\x8b\x4b\xa5\xa5\x2e\x2d\xb9\x0a\x12\x71\xa1\x6f\x0a\xe8\xb6\x30\x22\xaf\x12\x19\x14\x16\x7a\x51\xea\x46\xf5\x65\xa7\xbf\x28\x21\x11\x63\x45\x0e\x15\x5d\x99\xbf\x6a\x53\x1c\x20\x19\x02\xab\x00\xcd\xa9\xb8\x79\x26\x64\x86\x99\x8b\xac\x6d\x19\xae\xbb\xf2\xb6\x60\x55\x5a\x82\xc5\x90\xdd\x03\xf2\x15\x64\x6e\x94\xc6\x21\x33\x58\xcf\xa5\xe3\xb0\xc1\x0b\xfb\xb0\x6c\x4f\xd8\xc7\x52\xb4\x0c\x36\xcf\xe2\x7d\x1a\x6c\x82\xa5\x42\x76\x4c\x6d\x9a\x64\x20\xe1\x3f\xaf\x0d\xad\xa4\x9a\x75\x35\x9f\x69\x12\x2a\x2b\x21\x04\x0c\xdb\xd2\xc1\x5e\x18\x90\x8f\x94\x88\x99\x13\x84\x4d\x25\x5d\x7f\xb6\x6d\x49\x5d\x77\x4b\x84\xcc\x04\x62\xac\xeb\x4d\x1f\xa1\x01\xab\xc1\x1d\xb9\xb0\x9a\xd2\x7a\x99\x3b\x09\x27\x4f\x78\x21\x51\x26\x0c\x32\x88\x09\xbc\x76\x93\x87\x78\xc7\xf2\x47\xde\x93\xad\x5c\xe4\x3b\x02\x55\x7a\x75\xcc\x93\x93\x7b\xc7\xcf\xe0\x89\xa9\x04\x05\x7b\x81\xbc\x68\xae\x50\x35\x3b\xb0\x3a\x45\xc6\xd1\x1c\xb3\x19\x19\x3b\x1b\xd9\x26\xda\x92\x6e\xe7\x14\x9a\x39\xb3\xad\x34\x5f\x4e\xd7\x46\x61\xb2\xe5\x3b\xcc\xab\xde\xfe\xa3\x0f\x81\x54\x78\x46\x90\x19\x51\x27\xab\x62\x29\xe0\xc7\x62\xc5\x82\x9e\x60\x5b\x1d\x96\x83\xa0\xdb\x84\x77\x88\x5c\xb9\xc0\x13\x92\xbc\x8e\xe3\x1b\xba\xb6\xb6\x55\x70\xb6\x98\x60\x6e\x82\x9e\xc0\x1c\x5b\x61\x19\xd6\xf8\x2a\xf2\xa6\xd0\xee\x65\xf3\x2c\x15\xaf\xde\x62\xa2\xae\xd4\xc3\x26\x53\x6d\x2b\x00\x11\x5e\x7b\x41\xa1\x84\x26\xfb\x48\x78\xfd\x55\x4d\x82\x9b\x0d\x24\xa8\xd7\xd0\x32\x8e\xad\x0b\x36\xac\x9c\xca\xc6\x39\xe2\x1d\x8b\x98\x9d\x4f\x11\xe3\x8c\x20\x2a\x8b\x97\x55\x39\x9b\xc5\x23\xac\x68\x11\xdf\x18\x5f\x7c\x91\x25\x5f\x3b\xe7\xb9\x2d\x2d\x45\xee\xbb\xb7\x0d\xb8\xf4\x5c\x46\xb4\xa2\x8a\xc5\x02\x10\x1a\x0d\x1f\x2e\xcb\x74\x2b\xc7\xb9\x73\x81\xfb\xce\x01\x70\x06\x81\x96\x8a\x23\x10\x23\x2b\x83\x43\x06\xc6\xd2\xbe\x64\x3f\xb2\x28\x23\x23\xe6\x2d\x1b\x40\x88\x54\xa2\x14\x67\xe0\x92\x61\x5c\x15\x5f\x19\xd4\x1c\xe5\xb7\xf0\xc0\x09\xe2\xd2\x94\x40\x6a\x59\x81\x55\xa6\x1d\x77\xfd\x16\xeb\x5a\x46\x27\x74\xc8\xaa\x33\xfa\x48\x98\xa3\xe9\x03\x77\x26\xf4\xa0\x5c\xa7\xc9\xe2\x10\x43\x94\x28\x89\x43\xc3\xf5\x72\x8e\x64\x0c\x32\xfb\x60\x8f\xec\xbe\x64\x77\x8d\x51\x10\x06\xe3\xaa\x04\x4e\xee\xe2\x7a\x43\x2a\xb5\xb0\xab\x26\x91\x17\x4b\xf4\x47\xc6\xd5\x1f\x03\x60\x5a\x67\xbc\x80\x4f\x9d\x09\xea\xa0\x56\x71\x03\x0e\xad\x25\x1c\x84\x03\x80\xa4\x95\x2b\xbf\xad\x6b\xb7\x88\x5b\x7e\x56\x69\x74\x58\x4f\x62\x6a\x2b\x59\xd4\x3b\x5c\x51\xf5\x5a\xa8\x1a\x3c\x4d\x55\xb4\xe2\xa4\x97\x0c\x9d\x72\x95\x87\xd5\xef\x45\x27\xcf\x6a\x2d\xa1\x7b\x1b\x6a\x4b\x3b\x07\xbe\xac\xc0\xb0\x6d\xb6\x4b\x6c\x92\xa6\xd7\x26\x97\x8b\x72\xe4\x91\xad\x62\xd0\x02\xd2\x7a\x34\x62\xef\xb9\xb0\x57\xb0\xb4\x30\xf1\x13\x1c\x3d\x1c\x12\x16\x23\x9c\xab\xb9\x01\x4b\xb5\x7e\x85\x85\xa5\x06\x2d\x69\x00\xd9\x78\x24\x04\x2a\x23\x2c\x62\x57\xb0\xe0\x91\xbb\x51\x8c\x58\xd0\x08\x00\xd1\x43\x9d\x1e\xa8\x34\xda\xa6\x6a\x12\xa9\xf5\xab\xb6\xb5\x68\xaa\xa1\x59\xab\xa0\xb9\xfc\x9c\x95\x6a\x82\x02\x84\x3e\xc4\xa7\xf0\x69\x7d\x75\xce\x9d\xb5\xd1\xe9\x77\x9a\x9e\xeb\x5e\x88\x03\xab\x51\x18\x93\x94\x9d\x81\x96\x74\xbe\x76\xbc\xb6\x04\xfa\x3a\xcd\x05\x44\x5b\x36\xb5\xf9\x65\x34\xa7\x49\xe1\xbb\xf8\xea\xc0\x0f\x53\x37\x99\x90\x47\x92\x18\xc8\xf1\x48\x40\x60\xb5\xb1\x1a\x7e\x8d\xfe\x8f\xa9\x2b\x89\xbe\x19\xb1\x0f\xc0\x86\x93\x64\x01\x80\x88\xbe\x65\xac\x2a\xcd\x3c\x34\x0e\x40\xd9\x4c\x0e\x54\x1e\x88\xd9\xeb\x39\x7e\x24\x23\xe6\x9a\xf9\x3f\xe8\x01\xfd\x09\x7d\xd3\xa6\xde\xb9\xf8\xe8\x67\xb6\x73\xbc\x0f\xa2\x8f\x83\x5b\xce\x32\x4a\xcb\x6f\x9c\x19\xa4\x64\x84\x6c\x00\x46\xf0\xb8\xc6\x94\x3d\xf2\xa8\x16\x84\x1f\x9e\x5a\x2c\x08\x53\x63\xc6\x63\x32\x26\x0d\x2e\xcd\x25\x4c\x42\x0b\x01\x97\x3c\x26\x2b\x1d\x92\x9e\x99\xfe\x04\xa6\x1b\x99\x4f\xfc\x76\x40\x7e\xb6\x4f\xc6\xf5\xd6\x87\x32\xa5\x35\x8f\xdc\x83\x87\x6e\x32\xee\x4d\x9d\xa9\x2e\xca\xef\x00\x2e\x04\x3b\x80\x66\x87\x5e\x82\x95\x4b\x61\xad\x1e\xc7\xaa\x23\x40\xbf\xac\x67\x6e\x2f\xab\x00\x16\x15\x4a\x57\x08\x3a\xa3\x5a\x7e\xef\xee\xb0\x05\x4e\xb8\x89\x37\xc3\x60\x44\x76\x72\x67\x14\x4b\xe1\x70\x32\x0e\x3d\xfd\x15\x4e\xc8\x09\xcf\xab\x02\xbc\x5d\x00\x2a\xc3\xe4\x5a\x2b\xab\x2f\x34\x1f\x9e\x99\x04\x2e\x32\xa7\x26\x65\x7a\x70\x7a\x81\xf4\xe9\xe0\xa9\xc1\x15\x82\x45\xcb\xd5\x9c\x0b\xfa\x5b\x6b\x82\x49\xbb\x8c\x5e\x78\x5a\x8b\x7c\x1c\x33\xce\xb2\xb4\x0e\xc4\x6a\x44\x0a\x55\xd2\x4a\x9a\x74\x26\x34\xc9\x01\x42\x53\xb3\xd9\x69\x9e\x18\xdc\xfd\x88\x8b\xd8\x14\xbe\x96\xa5\xec\x1f\x88\xa2\x74\xe2\x3d\x56\xbe\x41\x6a\x91\x06\x2d\xb2\xbf\xb1\xe0\x2c\x15\x40\xff\x96\x93\x7c\x47\x09\x54\xaf\x1a\x72\x7a\x87\x67\xb2\x88\x21\x35\x6b\xa3\x79\x73\xb1\xbe\xbf\xea\x99\xca\x20\xe5\xd0\x59\x16\x3d\x82\x8f\x51\xc9\x4d\x5d\xc7\xb5\x2c\x3a\x37\x06\xb9\x7c\x07\x26\x9d\x97\x88\xe7\xa8\xcb\x48\x0d\xec\xc7\x92\xdf\xa3\x4f\xc0\xab\xb2\x88\x67\xb2\x93\x38\x08\xf8\x8a\xf4\xf1\x8c\x26\x93\x0d\x98\x5c\x5d\xa8\x5e\x1a\xd4\x5a\x18\x50\x3c\x5b\x6b\xc8\x85\x55\x1c\xa2\xe6\x9f\x04\x05\x80\xaf\x45\xf1\xb2\x2f\x61\xea\xae\x8b\x90\xc7\x68\x29\xc5\x88\xb5\x10\xd7\xe1\x96\x70\xd1\xcc\xe3\xd7\x30\x40\xd8\x86\xca\x5d\xd7\xfd\xf6\x6d\x27\xc2\xb0\xa4\x7d\x3d\x12\x75\x74\x8f\x95\x87\xc1\x17\x72\x78\x1d\x03\xa2\x17\x6d\x5e\xee\x64\x78\x72\x1c\x47\x38\x9a\xb7\x4e\x6a\xc2\x79\x42\x30\x6b\x93\x5e\x1b\x1f\x57\x8f\x88\xc1\xa6\x04\xd6\x9d\x24\x00\xd0\xea\x96\xc0\x16\xf5\x2b\xc4\x77\x16\x03\xb0\xb6\xe1\xe1\x06\x89\xc3\x0d\x54\x11\xe6\x2c\x3f\x94\xcd\x12\x52\x5d\x2b\x8b\x80\x7e\x60\x3b\x49\xa2\x3c\x09\xaa\xfa\x65\x44\xe8\x51\xeb\x25\x7e\x24\x4c\xeb\x0c\x76\x1c\xce\x99\xf1\xe4\xf2\x59\x7d\x2d\x9f\x03\xdf\xb5\xf3\xa7\x41\xd2\x58\x3c\x62\x70\x70\x79\xf9\xb0\x6a\x5a\x95\x5a\xcd\x08\xed\x52\x1b\x9f\xce\x40\x88\x58\xfb\x78\xde\x96\xcd\xc4\x6b\x9f\x49\xd3\xf7\x18\x62\x0c\xb6\x76\xad\x05\xee\x97\x22\xd3\xde\x6c\xac\x43\x53\x7a\x21\x23\x32\x44\x6d\x94\x41\x5e\x82\xa0\x8d\x36\x34\x9f\x67\xbd\x4b\x8a\xea\x05\xee\x36\xe8\x38\x94\xa5\xae\xea\x8e\x8e\x67\xb0\x4e\x2e\x3b\xb7\x17\x36\xe2\xb6\xec\xb2\xf5\xe9\x19\x45\x98\xa3\xad\xcf\xa9\x04\x86\xe4\x72\x48\x09\xfe\xc9\x68\xd8\x54\x1a\x0b\x98\xab\x52\x90\x66\x6a\x61\x8b\x5a\xc1\xbd\x18\xa6\x64\x1a\xc0\xae\x26\xf7\x70\xf5\x8e\x8c\x4b\x0e\xe2\xa6\xce\xa0\x23\x6b\x56\x68\x6c\xd2\x2d\x74\x08\x00\x51\x49\xb8\x6f\x8b\x06\x31\xf5\x41\xc7\x38\x69\xb5\x65\xed\x80\x69\x42\x96\x64\x91\x64\x6f\xb1\x3b\x95\xc8\x89\xe6\x5d\x38\x49\x2a\xf3\xc2\x90\xcd\xaa\x7c\x8d\xb0\x49\x51\xc8\xb4\xbb\xb3\x3a\xc1\x13\xb2\x96\x7b\xfa\xc2\x7c\xb0\x94\x8a\xe0\x15\x48\x35\xcd\xb2\x64\xd1\x0d\xb5\x29\x0c\xbd\x6b\xc4\xb8\x5a\x35\xb0\x10\x19\x6b\xe9\xdd\x54\x46\x97\xda\x6c\x88\x92\x44\xb9\xa0\x6a\x31\xb6\x46\xbf\xee\x4c\xeb\xd6\x7e\x79\x6a\x3f\xec\xa2\x51\x9f\x20\xd7\x9f\x33\x32\xc2\x3d\x25\xa8\x29\x80\x62\xa7\xd0\x65\xbb\xb5\x96\xdc\x88\x7d\xb3\x6c\x61\x1d\xf8\x4e\xb7\xa1\xea\x2e\x36\x1d\x9e\x2d\xac\x30\xe6\x53\x07\x6b\xd3\x7d\x61\xab\x15\x27\xd6\xb0\x96\x3a\xf4\xdc\x4c\x50\x2e\x6c\x61\x87\x2e\x41\x6d\x29\xfe\x34\xce\xb0\xc0\x49\x42\x12\x2a\xd3\xcd\x6d\xbb\x7f\xfe\x76\xe9\x68\x4f\x4d\x01\x12\x69\xcb\xf9\x7c\xa2\x69\x9e\x22\x96\xa7\x13\x2b\xe5\x62\xf9\x10\x62\x17\xba\x4c\x6b\x03\xc1\xe3\x06\x58\xca\xf7\x16\x01\x1a\xe5\x88\x05\xb8\xc4\xd6\x54\x81\xa3\x39\x25\x8f\x80\x9a\x28\x18\x91\xf2\x08\x5d\x72\x45\x4e\xd0\x47\x9c\xdd\x81\xa0\x66\x2a\x02\xce\x8c\x75\x1c\x4b\xa4\xa5\xd6\x9c\x51\x75\x30\x62\x16\xcc\xd8\xad\xca\x71\xc4\x99\x01\xb4\x8c\x60\x61\x7d\x13\x60\xee\x75\xc8\x8e\xca\xe5\xa5\x51\xd9\xb2\xd8\x02\x3f\x8d\x83\xe8\xd5\xb1\xc9\x0e\x58\x83\x8e\x6f\xf0\x93\x89\xd7\x86\x0a\xf8\xe6\xeb\x25\x92\xbb\x0d\x88\xb2\x05\x60\x0c\x8e\xab\x0b\x1c\xe1\x16\x4c\xc0\x97\xae\x32\xd1\xa9\x5f\xd2\x23\x72\x84\xbe\x4b\xf8\x44\x1e\x20\xe9\x31\x8f\x5d\x81\x7e\x79\x60\x1c\x54\xf0\x6f\x93\xc9\xf3\x95\x5b\xfd\x82\xef\x43\xd5\xb6\x29\xfd\x64\x30\x0c\xe4\x9f\x4f\x8e\x8f\xd3\xc5\xe1\x24\x8f\x1e\x88\xd2\x7f\x81\x4c\xd1\xb8\x42\x0e\x00\x08\x37\xc1\x09\xad\x5a\x9d\x3a\x14\x51\x27\x8a\xb4\x20\x76\x92\x00\xec\xb5\xbe\xd2\x7d\x5d\x4c\x87\x5c\xc3\x59\x73\xd1\x3f\x3b\x65\x91\xb7\x1d\xaf\x12\x5e\xee\xcb\x68\x2b\xa6\xee\x67\x08\xd3\x3b\x4d\xf0\xac\xa2\xb2\xac\xa1\xa4\x5c\xa5\xd4\x52\x91\x9e\x3b\xc4\x5b\xe8\x53\x56\x8e\x32\xfb\xc2\xb9\x23\xc1\xad\x68\xdd\x2d\x47\x23\x36\x90\xe8\x89\x98\x72\x9e\x90\x52\x06\xde\x89\x9c\xca\xb9\x4f\x28\x03\x7b\x29\x34\x6a\xd0\x4c\x4d\xd2\xbb\x55\x1c\x9d\x66\xe5\xfc\x37\x56\x03\xc5\x89\x24\x07\xba\x61\x40\xb4\x72\x81\x84\xe8\x49\xe0\x2c\x23\x62\xc4\x2c\x32\x25\xe0\x2f\x73\x6e\x83\x44\xda\xa2\xc9\x7b\x8d\x72\xbf\x34\xca\x41\x25\xb4\x1c\x2a\xdc\xa6\xa0\xf4\xc8\xa2\x90\x9f\xb3\x4f\x79\x95\xb3\x74\x35\x03\x18\x2f\x7c\x1c\x73\x22\x03\xc3\x33\xf2\xf6\xa3\x84\x4e\x89\xbe\x31\x47\x4c\x2f\x7d\x68\x24\x37\x98\xbe\x0e\xe2\x57\x77\x1a\x09\x2e\xa5\x8d\x16\x37\xed\x2c\xcf\xf9\xd9\xa2\x7c\x98\x01\x26\x36\x85\xfb\xab\x85\xc4\x82\x67\xae\xa4\x98\x7d\xd8\x5c\xcf\xbd\xad\xa9\x95\x05\xc4\x8a\xb5\x58\xa3\x84\xd8\xf1\xe9\xc5\xb9\xaf\x9b\x53\xe9\xba\x5e\x43\x2c\x04\x73\x6e\xaf\x22\x56\x9f\x71\x50\x4f\xac\xd2\xc4\x92\x8a\x62\xab\x37\xab\x1c\xa3\xba\x0d\x52\x57\x65\xeb\x57\xdd\x59\x15\x9a\x59\x15\x4a\xbd\xa3\x6d\x6a\x61\x85\x11\x08\x39\xcf\xed\x15\x06\x61\x41\xbf\x25\x15\x4e\xb3\x30\x4d\xd0\x41\x15\xda\x69\x9a\xa3\xd6\xc6\xb8\x5f\x14\x42\x39\xc2\x26\x02\xa3\x3a\xb8\xda\x56\xac\xe7\xa5\xb9\xb3\xc8\xcc\xbb\x08\xbd\x7d\xb9\xbc\xdb\x64\x51\x44\x9a\x49\x2b\x6f\xb8\xaa\xbf\x2d\xb6\xea\x09\xf1\x28\xd4\xad\x1b\xba\x6d\x62\x9d\x47\xab\x11\x04\x4b\x1b\x42\x00\xf9\x67\x95\xdc\x94\x35\x4c\x9a\x7e\xcc\x26\x83\xf5\xd0\xe3\xbe\x07\x57\x8d\x2d\x65\x14\xb9\x83\x48\x85\x20\x8f\x44\x00\xed\xd8\x38\x15\x56\x3e\xaa\x38\x11\x04\xc7\x8b\x60\x45\xbc\x93\xdc\xf4\x0c\x26\x1d\x49\x53\xad\x74\x82\x38\xcd\xf8\x21\xcf\x9c\x9c\x5d\x7a\x0b\x40\xfb\xe9\x54\xdf\x58\x81\x8b\x5d\x7f\xc1\x0e\xc9\x27\x2a\x95\xd6\x4b\x1a\xe2\x0b\x5d\x23\x70\x4b\x43\x29\x9f\x39\xb1\x37\xdc\xe8\xdd\xe0\xbb\xab\x9b\xbb\xe1\xd9\xe8\x5d\x11\x51\xee\x52\xa6\x3c\x08\x8d\xc3\x14\xe7\x6c\xc4\x7c\x10\xa8\xc7\x5c\x85\xbd\x44\x38\x8e\x0b\xc4\x6b\xab\xf8\x18\x39\x63\x29\x47\x0e\x4e\xc5\xca\xf0\xcf\x25\xcd\xdc\x43\xde\xcc\xbe\x9e\xac\x25\xee\x9e\xd2\xc9\x31\xd9\x3f\x4b\xd2\x34\x76\x74\xd9\x84\x70\x91\xca\xe8\x87\x44\x39\x3c\x33\x46\x9e\x9c\x7c\x0f\xb7\xf3\x31\x36\x97\xf0\x7a\xdc\xce\x6d\xc8\x06\x9b\xfa\x9e\x7e\x22\xf1\x4d\x8b\x54\xb5\x93\x2c\x8c\x4e\xd1\x6b\x8d\xbb\x90\x33\xba\x8e\x96\xea\xa7\x72\xaf\xbf\xeb\xce\x96\xae\x0a\x14\xa8\x02\xd1\x11\xe0\x1c\x15\xc2\x28\x22\x42\x61\xca\xd0\x14\x0e\x36\x8b\x16\x08\xb0\x38\x08\xf8\x5d\xbf\x45\x29\x65\x90\xed\xbe\x6c\x69\xef\xcb\xf3\x58\xa7\x94\xff\xf9\xe5\xfd\x5d\x49\x54\xfd\xfe\xea\xbe\x5c\x47\x7a\xf0\xf3\x52\x59\xb5\xd2\xc2\xb2\x00\x97\x60\x8a\x45\xe6\x9c\x05\xb6\xf4\x2b\xd3\x34\xd1\x0f\x44\xfd\xa8\xf9\x32\x67\xbb\x08\x2b\xb7\x72\x16\x38\x9c\xc8\xf8\xd1\x34\xbc\x06\x19\xd8\xa1\x2c\xc9\x1d\x70\x92\x1c\xf4\x80\x6c\x0f\x61\x22\xfb\x91\xa9\x98\x3c\xd0\xcd\x81\xca\xe8\x02\xb4\xb4\xbe\xc4\x99\x5e\x2e\x03\x2f\xe8\x30\x09\x83\xe6\xf8\xd4\x7c\xdc\x11\xa1\x29\x08\x13\xd6\x6d\x15\x4b\x89\x06\xd7\xe7\x0d\x6b\x7d\x51\xb5\xc9\x7f\x5e\xe5\x1d\x12\xef\x1e\xd8\x75\x65\x87\x20\xdf\x6b\x2f\x8a\x3a\xd8\x99\x6e\x57\xcf\xc1\x78\x51\xaf\xcb\xae\xd9\x7d\x40\xaf\x6c\x92\x67\x4b\x79\x9c\x2b\x80\x2a\xd7\x4b\x6d\x2a\x96\x61\x4d\x14\x99\x70\x40\x36\xae\x3e\x44\x4e\xa9\x07\x6d\x1e\x84\x48\x2a\xdc\x14\x90\xb4\xce\xda\x9d\xa1\xcb\x14\xb3\xe9\x02\x2f\xf3\xa3\xa1\x68\x8f\x3e\x00\x78\x0a\xae\x40\x99\x0b\xb6\xb4\xc9\xc0\xe1\x74\x43\x6a\x5b\x0f\x91\xa6\x18\x9f\xb3\x27\x5a\x6c\x56\x9c\x61\xab\x14\x83\x84\xef\x90\xc3\x9b\x0a\x4d\x1d\x8d\x58\x10\x01\x20\x8d\x4c\xae\xcf\x88\x03\xeb\x87\x0a\x90\x0c\x80\x5e\x21\xeb\xc1\xdf\xcc\xa5\x1d\xa8\xe6\x1c\xab\x79\x19\x6e\xbf\xd6\x8f\x3d\x9d\x72\x8e\x5d\x66\x97\x53\xef\x6d\x60\x55\x68\xfc\x80\xf6\x02\x80\x6d\xdb\x31\xd8\xf7\x40\xa3\xc6\x41\xf9\xa6\x20\x1b\x38\xe6\x44\xb2\x2f\x94\xcf\x9d\xa3\x89\x2d\x11\x80\xab\xf6\x56\x2d\x72\x60\x6a\x5b\x5e\x7e\xc0\x77\x00\x77\xb3\xae\x54\x1b\x1c\xab\x95\x36\x14\xe7\x34\x03\x4a\x08\x83\x3b\xa0\xd3\x36\x6c\x9a\x4f\x19\x89\x36\xc1\xe4\xb8\xc6\x02\xa7\x44\x11\xb1\x2c\xbe\xa3\x5c\x5c\x15\x62\x17\xdc\x0e\xda\x7e\xcd\x2e\x1a\xe4\xf9\x6a\x89\x02\xaf\x7a\x5d\xac\xc2\xd8\xf0\xb3\x58\x0b\x4e\x48\x4f\xe3\x47\x0b\xb5\xbf\xe6\x2c\x6c\x3f\xc5\x34\x6c\xf8\x4a\x00\xa9\xb2\xed\x9c\x5e\x06\x5b\xe2\xae\x86\xd2\x50\x8a\xbf\xd8\x13\x50\x89\xd5\xa3\x6c\x43\x93\x58\xc5\x4b\x77\xc2\xbb\x5d\xc8\xb8\xcb\x49\xac\x1c\xaa\x52\x30\x3a\x50\x09\xc8\xfb\x06\x58\xa1\x19\x11\x02\x84\x96\xa6\x90\xb3\xc0\x8f\x62\xf1\xc2\x0a\x6b\xa3\x95\xac\xaa\xc5\x56\x2a\xcb\xb5\x82\xc7\xed\x2a\x5b\xbe\x97\x68\x76\x2d\xd1\xac\x61\xdb\x33\xd4\x49\x44\x05\xb8\xc3\x16\x41\xb5\x19\xd7\xe5\x09\x42\x32\x87\xbd\x22\x6d\x25\x45\xb8\xfa\x29\xf3\xff\x2a\x73\x70\x47\xd4\x21\xa9\x36\x65\xa9\x1d\x05\xfe\x11\x70\x8f\x24\xa1\x34\x60\x03\x15\x60\xb4\x26\xae\xcc\x98\xa0\xcf\x2f\x8d\x77\x05\xb2\x45\x17\x3c\x47\x4f\x54\x6a\x5d\x78\xc4\x20\xf0\xca\x9b\xaa\x15\x47\xe6\xc5\x03\x78\x0b\xf2\xca\x65\x3e\x49\xa9\x42\x38\x98\x61\xc9\x5e\x76\x60\xcf\xb3\xfe\x00\x66\xdc\x98\xb8\xdc\x84\x79\xb2\xe2\xd0\x6c\x60\xfc\x29\x1a\xd9\x36\x37\x39\x08\x12\x7d\xde\xec\xe4\x40\xe3\x09\x35\xcc\xc6\x33\xd7\xa7\x27\xa3\x66\x6b\x83\x45\x61\x04\xa8\x4c\x2a\x55\xe5\x6e\xb1\xd8\x8b\x2b\x52\x93\x8b\x8d\xe8\x94\x9b\x5c\xbc\xbe\x8b\xe4\xe4\xb6\xb2\x3d\xcb\x92\xd5\xdc\x27\x2d\xc6\x59\x97\x04\xa9\xb8\x8b\x44\x0e\x25\xa5\xeb\x56\x49\x69\xdf\x60\xa2\x8a\x08\xeb\xcd\xe3\x75\xd7\x51\x07\x8b\x84\x97\x90\x8a\x82\xfc\xb5\x32\xc8\x06\xa9\x72\x7e\xc6\x15\x24\x29\x44\x50\xd2\xb8\x96\x38\x37\x62\xcd\x12\xc8\x72\x9e\xb8\x6d\xcc\xfb\x4e\xe1\xa4\x82\xf3\xe7\x66\x61\x2d\x5a\x3f\xf9\xa8\x21\xa3\x2c\xdb\xe2\xc4\x55\x11\xb3\xf0\x3f\xb5\x28\x20\x20\x78\x6c\x92\xc1\xd9\x70\x2a\x3b\x46\xa4\xaf\x3c\x17\xf6\xd2\xdd\xa1\x6a\x57\xe3\xce\x9d\x03\xf8\xbd\x8c\x6c\xb9\xb1\x8b\x40\x75\x6a\x7c\xc5\x8d\xb8\x49\xd1\x45\x40\x69\xdc\x19\xb6\x64\x35\xdd\x5b\x37\x7e\x00\xae\x47\x3b\x74\x6c\xc2\x30\x3c\xe2\x71\x65\x4b\x4a\x13\xb6\xc5\xac\x9f\x61\xd2\xeb\x16\xca\x0c\x5c\x61\xc2\x86\x4f\xd2\xd0\x6e\x00\x15\x32\x6d\xd4\x59\x85\x0f\x7b\xd1\x2e\x67\x31\x11\x8c\x60\x35\x7f\xb9\xa0\xf5\xd3\x6d\x8d\xd3\x2f\x16\xc0\x7e\xba\x93\x2a\xc9\x95\xa0\xf0\x35\xe3\xc1\xd7\x08\xae\x2e\x6a\x66\xd6\x14\xc7\xa6\xea\xf4\x05\xa6\xc7\x3a\x54\xba\x55\x5c\x7b\xb3\x32\xf7\x3c\x11\xfe\x0d\x56\x9f\x5a\x6c\xbf\x3e\xec\x61\xa5\xd1\x15\x4b\xf2\x59\x84\xd2\x3f\x7f\x74\xf7\xb2\x9a\xa6\x79\x10\xf0\x0d\x85\x65\x15\xa6\xcc\x72\xaf\x65\x31\xde\x5a\xa2\x4c\x71\x53\x58\xf7\xde\x27\x0c\x7c\xf6\xf9\x02\x7d\xf4\x78\x1f\x3d\xde\x47\x8f\xaf\x15\x3d\xbe\xcc\xcc\xe8\x3d\x5f\x50\xe3\xad\x54\x99\xc3\xac\xe3\x0a\x6d\x6d\xf3\xa8\x6e\x67\xa9\x0b\x43\x62\xec\x2f\xf6\x87\xc6\xa8\x98\xda\x67\xd5\xd9\x86\x56\x43\xb6\xa8\x1a\xdf\xb1\x88\x13\x0b\x9f\x65\x63\x56\xcb\x56\x9e\x65\x06\xc9\x11\xfb\x9e\x3f\x91\x47\x22\x0e\x10\x56\x28\xe5\x5a\x49\x0f\xa2\x50\x80\xe0\x4a\x48\xcc\x26\xda\x00\xa3\x4b\x9c\x92\xd8\xd4\xd9\x0a\x22\xdb\xac\x59\xd4\x3a\x34\x9b\x50\x22\x01\xf0\xd0\x6c\x83\x8b\x4e\x18\x31\x13\x6d\x66\x22\x9c\xe0\x4e\xa6\x6e\x62\x40\xd7\x7f\xf4\xee\xd6\x3f\x1e\xa1\x3b\x7d\x0f\x50\x59\x1e\x6f\x00\x1a\xd5\x36\xb6\x11\x9b\x09\x9e\x67\xde\x52\xc5\x27\xa6\xe0\xa2\x01\x9c\xae\xbb\x5b\x61\x30\xce\xd7\x1a\xe1\x58\x6b\xbc\xcb\x09\xe7\x55\x02\x11\x37\x42\x5e\x09\x09\x48\x73\x09\x1f\x5d\x65\xa3\x9d\x8d\x97\x34\xc0\x9b\x58\x86\x1f\xfd\x4c\x2e\xdc\x33\x22\xc1\xf6\xe2\x6d\xdb\xa5\xf4\xd7\x72\x8a\x75\xe3\x38\x97\x59\x1e\xbd\x77\xc0\x59\xd0\x9b\xb3\xb7\x8b\xce\x6d\x64\x95\xc9\xad\xb3\xfc\xf8\xd9\x6c\x92\x9d\x03\x28\xdb\xf8\xc5\x75\x2e\x32\x0e\x12\x4f\xb2\x70\xd9\xe6\x16\xa0\x2a\xe3\x59\x6e\xa2\xc7\x68\x18\x4c\xd4\x48\xd9\x54\xaa\x8f\x58\x45\x73\xcd\xdf\x0b\xa0\xa6\x1d\x45\xd5\x15\x5c\xf9\x79\xed\x94\x0d\x33\x38\x0d\x7b\x6f\x31\xdc\x77\xb0\x5b\x9b\xfb\xd5\x45\x58\xbb\x1b\x3b\xd5\xfd\x95\x6a\xc9\x07\xd6\x47\xf7\x89\x7d\xa2\x27\xba\x8a\x8a\x56\x8d\xbf\x1b\x6d\x95\x0b\x05\xed\x3c\x5e\x6f\x0b\xe4\x8b\x33\x8b\x33\x54\xbc\x68\xeb\x02\xb6\x38\xd9\x37\x2c\xf4\x6d\xbd\x27\x50\x39\xbe\xb0\x6b\xa6\x38\xd3\xc2\xba\xe2\xfa\x96\x14\x33\x23\x2f\x9a\xfa\x93\x08\xa3\x5c\x50\x77\xf6\x2b\xa9\xac\xed\xd4\x01\x76\xc0\xe3\xb0\x10\x4c\x84\x83\x1a\x59\xc6\xad\x8e\x23\x95\x63\x1f\xfe\x07\x34\xe1\x4a\xef\x9a\xb4\x5d\xe7\xbe\x16\x4e\x8c\x6a\xd8\xd3\x95\x84\xbd\xc5\x2e\xe3\x26\x58\xb6\x4e\x27\x8d\xb2\x59\x80\xe9\xd6\x6c\x8b\xed\x02\xd9\xde\xf8\x65\x37\xd8\xf9\xc6\x4f\x9d\xec\xb3\xc9\xb7\x4b\x30\x67\x5a\x3f\x5f\x25\xc0\x96\x42\x9d\x6d\xb8\xa9\x95\x9e\x42\xb4\x3d\x6b\x27\x03\xd0\x4c\x0a\xee\x70\x6c\xa5\xa9\xff\xf2\x7f\x99\x12\x3f\x66\x69\xfe\x0b\x71\x31\x62\xe6\xf7\x03\x0f\xaf\xaf\x5f\x28\x70\x2b\x71\x4a\x0a\x64\x3f\x51\xc6\x00\x03\x24\x04\x8b\xe1\x64\x30\x4a\x3d\xba\xb8\x1e\xc3\x43\x3e\x21\x82\x11\x3d\x34\x97\x33\xed\x99\x59\x8a\x19\x9e\x01\x22\xea\x01\xc4\x9f\x81\xb8\x5a\x88\xfc\x86\xa4\x4d\x99\x36\xe0\x56\x9a\x59\xda\x94\xcb\xa2\xda\x24\xf4\x69\x44\x59\x0b\xc8\x58\x04\x31\x34\x53\xff\x8d\xed\x7f\x33\x89\xfd\x6e\x70\xfb\xc3\xf8\x66\x78\x7b\x75\x7f\x73\x5a\x12\xdb\x4f\x2f\xee\x6f\xef\x86\x37\x8d\xcf\x8a\x74\xc5\xbf\xdd\x0f\xef\x5b\x1e\xb9\x06\x2e\x06\xdf\x0d\x4b\xa5\x5b\xff\x76\x3f\xb8\x38\xbf\xfb\x79\x7c\xf5\x7e\x7c\x3b\xbc\xf9\xf1\xfc\x74\x38\xbe\xbd\x1e\x9e\x9e\xbf\x3f\x3f\x1d\xe8\x2f\xc3\x77\xaf\x2f\xee\x3f\x9c\x5f\x8e\x5d\x70\x6f\xf8\xe8\xa7\xab\x9b\x1f\xde\x5f\x5c\xfd\x34\x0e\xba\xbc\xba\x7c\x7f\xfe\xa1\x69\x16\x83\xdb\xdb\xf3\x0f\x97\x1f\x87\x97\xcb\x4b\xc4\x36\xaf\x46\x6b\xf5\xc9\xe0\x22\x0b\x8c\x33\x81\x98\x34\x59\x58\xd2\xa6\xbf\x81\x8b\xe0\xda\xd0\xe3\xe1\x81\xfb\xcb\x14\x74\x3d\xd4\x2c\xd0\x79\x9f\x0a\xee\x31\x62\xde\x3d\xe8\x2f\x55\x28\xe8\x6d\xb3\x4f\x4b\xa3\x3d\x41\x03\x38\x2b\xa0\x30\x94\x3a\x05\xcc\x09\x3f\x52\xe7\x50\x46\xa6\x58\x7f\x4a\xc1\xb7\x8c\x0e\x51\x75\xc3\xcb\x0d\xda\x39\xc1\x10\xac\x77\x2c\x5e\x76\x1a\x64\x35\xb1\x15\x28\xe5\x04\x39\x0e\x4d\x8c\xda\x6e\x20\x33\x17\x0c\xa7\x34\x32\x3f\x54\x50\x23\x51\x81\x90\x50\x6d\xb1\x44\x60\xe5\x96\xe7\x04\xfd\xf0\xd7\x62\x50\xe0\x29\xb0\x06\x82\xbc\x56\x08\xcc\x3e\x10\xb9\x59\xd5\x55\xe4\x59\xea\xc9\x1d\x73\x6b\xc2\x85\x73\x6b\xeb\xc5\x82\x5b\x27\x67\x01\x4a\x52\xc9\xc7\xa3\x8f\xb7\x99\x51\x85\xc6\x4f\xd0\x2d\x20\x34\xc8\x42\x75\xd7\xbb\x98\x25\xf9\x8c\x32\x44\xd3\x2c\x21\x45\xa5\xe1\x09\x99\xe3\x47\xca\x1d\xea\xbe\x29\x4e\x00\xeb\x68\x45\x2b\x74\x88\x5a\x0f\xca\x09\x1a\xc4\xb1\x2c\x33\xb8\x12\xe5\x38\x96\x79\x58\x1e\x76\x08\x6c\xc4\x62\xcf\x36\x2b\x74\x54\x1c\x39\x58\xb1\xdd\x63\x50\xd4\xd9\x61\xf9\xee\xdd\x0a\x4f\x55\x3e\x8c\x1d\x29\x8f\x37\x12\x06\xee\xb0\x7c\x70\xac\x79\x95\x40\xe0\xd0\x40\xb6\xeb\xd1\xc2\x82\x74\xed\xd4\xaf\xec\x18\x0e\xda\x66\x7d\xb6\x82\xd9\xae\xe8\xd2\xcd\x38\xa9\x54\x1c\xea\xdc\x5f\xa9\x62\x51\x63\x67\x3b\xf5\xaa\x34\x4b\x63\x70\x24\xc7\x9e\xfe\xd7\x98\xc7\x35\x7c\x7a\xe5\xbf\x5c\x2a\xb2\x8d\x83\x75\x5b\xd7\xd7\x52\xcb\xd3\xb4\xfe\x96\xa5\x74\xb8\x23\x54\x9a\xee\xc2\x20\xe0\xc5\xd3\x08\xdc\x6a\x98\x32\x5b\x45\x84\x78\xbf\x8f\xab\x9b\xab\xcf\xb1\xaf\x6c\x85\x27\xfc\xb1\xa4\x5c\xa6\x44\x4a\xdc\x82\x59\x11\x98\xc4\xb6\x61\x0c\xfe\x84\xda\x0f\x3b\xd2\x93\x3b\x93\x77\xfa\xab\x65\x46\x9f\x9b\x50\x33\x76\x13\xd5\x02\x6b\xec\xe2\x59\xd1\x95\xc9\x6a\xd3\xfc\xe5\xa0\x08\x59\xe1\x22\x88\xe4\x69\x73\xb3\x74\x34\xab\x55\x17\xac\xb1\x38\x4c\xe8\x2a\x5b\x3f\xd2\x25\x68\x7d\x63\x20\x5f\xeb\xbf\xc0\xe5\xf5\x59\x83\xea\x4a\x7e\xc5\xb0\x70\xae\xa9\x11\x0f\x36\xb7\xd0\x96\x7a\x80\xb0\x49\x26\x2c\xa4\x29\x99\x47\x73\xe3\xcd\xd1\x57\xc6\xc1\x88\x3d\x05\x1b\x52\x0a\xb7\x1d\x84\x2d\x01\x08\xe2\x27\x7d\xdc\xe8\x63\x29\x88\x19\x44\x46\x0a\x11\xb5\x01\x21\x18\xc7\x5b\x51\xf5\x66\x05\x81\x07\xfb\xb5\x05\xa9\x6f\x50\xe2\xac\xa1\x0a\x7f\x53\xa1\x33\x3f\xb7\xa0\xbe\xd8\x16\x9a\x72\xd7\x21\x04\x25\xce\x9a\x46\xb0\x83\x0a\x67\x2f\x8a\x4a\xec\x93\x22\x4d\x0e\x6d\x3a\xb1\x30\x05\x7a\xba\x6e\xb5\xff\xe4\x66\xf4\x27\xe3\x77\xc8\x5b\x70\x2d\x82\xd6\x3c\x30\x31\x3a\xd4\x32\xab\xcb\xb7\xb6\x01\x0f\x12\x1d\x1a\xb0\xb3\x2f\x20\x9e\x71\x70\x7d\xfe\xc5\x01\xfa\x22\xcc\xe9\xfa\x62\xa3\x03\x68\xc7\x6d\xab\x9c\x81\x36\x55\x0a\xec\x2f\x1f\x3b\xd8\xab\xca\x49\xb4\x7b\x66\x0f\x22\x6a\x3b\x87\xfa\xcb\xd2\x37\xe0\x04\x86\xaa\x5d\xc6\x4f\xea\xc3\x8a\xad\x0b\xc8\xc8\xb8\x54\x36\xac\x5d\x3c\x62\x93\x45\xd5\xc9\x73\xe0\xbd\x3c\x9d\x4f\xe9\xd6\x95\xa8\x74\x7b\xf5\x24\xe0\x1d\x87\xbb\x2e\xbf\x0f\x56\xa4\x15\x0f\x4c\x64\x33\x9f\x06\x5c\xac\x2d\x1a\xa0\x8f\x13\x6f\x9a\x55\xc9\x5e\xe6\x16\xb3\x71\x53\x56\xc9\x3f\x6f\x8d\xdc\x3a\x04\x57\x0f\x9a\x56\xc4\xc6\xd5\xb7\x08\xd7\x3d\x95\x3d\x2f\x95\xed\x22\xaf\xa0\x3c\xb8\xf5\x2f\xd0\x53\x23\xc7\x05\xcd\x38\x83\xab\x56\x26\x3c\x83\x2f\x95\x2b\x5b\x5d\xe7\x73\x4d\x9f\x6f\xb0\x26\xab\x9d\xbe\xb7\x26\x70\xc0\xb8\x5d\xeb\x63\xad\x0e\x75\xa0\x6c\xed\x14\x4e\x4d\x0e\xa1\xa2\x29\x39\x40\x9c\x25\x8b\x20\xd8\xc1\x9e\x57\x20\x37\x13\x0b\x34\x27\x54\xb8\x4e\x2c\xcc\xdc\x5a\x49\xe7\x6b\x4a\xe3\x6d\x34\xb2\x45\xa4\xc9\xe5\xe0\xe3\xf0\x6c\x3c\xbc\xbc\x3b\xbf\xfb\xb9\x01\x42\xb0\xfc\xd8\xa1\x08\x06\x2f\xdc\xfe\x7c\x7b\x37\xfc\x38\xfe\x30\xbc\x1c\xde\x0c\xee\x56\x20\x0c\x2e\xeb\xac\x0d\xbd\x2e\x97\x4d\xea\xdb\x3a\x08\x76\xce\xcc\xdb\xd0\x7b\x1d\x67\x30\xe8\x84\x92\x16\xac\x41\x93\x60\xcf\x62\x22\x50\x4c\x1e\x49\xc2\xb3\xc2\xac\xda\xb8\x60\x01\x08\x61\x43\xfb\xcb\x80\x08\xa1\xcd\xea\x1a\x9f\x20\x53\xa2\x2a\xa8\xd2\xe9\x1b\x04\x91\x0f\x0b\xc2\xbe\x50\x88\x7c\xca\x12\x1a\x51\x15\x24\xe0\x71\x61\xdd\x2b\xc6\x7d\x08\x51\xa0\x2b\x88\x6b\x67\xd1\x28\x3b\xd7\xf9\x43\x4f\x7a\x5d\xdb\xf7\x27\xca\x83\x62\xad\xac\x7b\xb2\x03\xc5\xbe\xc5\x69\x5c\xc3\xec\xda\x60\x74\xcf\x61\x1e\xa8\x67\xc2\xd8\x24\xba\x16\x3c\xaf\xe6\x41\xae\xbe\x0d\x97\xc5\xc9\x94\xce\xf5\xf2\x40\x99\x6e\x94\xfa\xca\xe1\x2e\xa5\x7a\x80\x3b\xc0\xb7\xb0\x31\xe2\x6b\x06\x2c\xd4\xca\x5c\x30\x13\xdb\x89\x91\x20\x29\x57\x5a\x01\x33\x11\x01\x07\x5a\xa8\xa2\x38\xa1\xbf\x01\x12\x94\x20\x47\x41\x04\x05\x24\xda\xc5\x61\xc4\xa5\x45\x69\x38\x1a\xb1\xb3\xe1\xf5\xcd\xf0\x54\x33\xa4\x23\x74\x2f\x01\xe4\xa9\x34\xf5\x33\x4b\xde\x46\x1c\x0b\x23\x19\x28\x93\x8a\xe0\xb6\x60\x30\x22\x04\x17\xdd\xf9\x83\xef\x6f\x08\xdf\x35\x93\x37\x3c\x2b\xd9\xa6\x9c\x01\xe0\xb2\xb5\x98\x6b\x10\x9b\xbf\xf3\xd4\xa7\x1b\xfc\x54\x5a\x91\x10\xe4\x02\x24\x91\xf2\xaa\x3f\xe3\x6a\x03\x86\x63\xf7\xf9\x95\xfa\xbc\x86\x6f\x97\xcd\xf3\x0e\x42\xec\xa4\x2a\x00\x21\x0d\x66\xa4\x2f\xd6\x51\x99\x67\xab\xa8\x28\x5e\x03\x10\xa3\x42\xfa\x13\x32\xc3\x0c\x89\x9c\xb1\x0a\x42\x68\x68\x69\xab\x07\xcd\xac\x7b\x54\xf5\x9a\xe1\x94\xe7\x0c\x94\x06\x08\x63\x6d\x18\x8c\xcc\x08\x53\x2b\x06\xf3\x5a\x70\x27\x95\xa1\xee\x2f\xe2\x49\xc3\x40\xdb\x40\x4f\x9a\xfc\x49\x50\x31\x76\xbd\x6b\xd9\x05\xe5\x95\x9c\x4a\xfa\x50\xf9\xfb\xb9\x59\xcb\xc6\xf2\x61\xeb\xee\xee\xb0\x7c\x58\xdd\x55\x4c\xa2\x87\x75\x2f\x9b\x6a\x06\x64\x62\x0b\xee\xd6\x8c\x7d\x0b\xfd\xd4\x56\x94\x80\x3a\xcb\xd1\x03\xfa\xfe\xee\xe3\x05\x9a\x52\x2d\xf7\xea\x6b\xe5\x12\x6b\x19\xfb\x5e\x24\xbe\x88\xbd\x91\x41\x72\x91\xf8\xbb\x17\x36\xde\x89\x52\x81\x94\xa0\x6f\x34\x3c\x23\xce\xd8\x2b\x2c\xa6\x5d\xa5\xa2\x84\xc0\x2c\xe6\xa9\x99\xc7\xb1\xcc\xa7\x53\xfa\xe9\x48\x61\xf1\xd5\x1a\x12\xcd\x69\xc9\xc1\x56\x21\x23\x1b\x3e\x69\x21\x16\xc1\xaa\xb0\x52\x4e\x18\x3e\x12\xa6\x76\x22\x64\x43\x13\x0d\x19\xde\xdd\x4c\xe5\xa6\xbc\xde\xf9\x59\xc1\xa1\x7d\x99\xf7\x20\x34\x47\x09\x0c\x97\x95\xcd\xaa\xb1\x7e\xe1\x36\x6f\xf5\x63\x67\x07\x28\xbc\x5a\x5f\x97\x15\xf1\xdd\x76\xb5\x8b\x32\xbb\x45\x6c\xa6\x83\x28\xdf\x10\xf3\x45\x12\xa3\x8a\x07\x58\x03\x56\xc3\xaa\xee\xb9\xe9\x73\x8e\x65\xb5\xcb\x95\x5b\xbe\x01\xc0\x49\xa9\x99\x0f\x04\xf2\xff\x76\x11\x4d\xbd\x4e\x9e\x37\x0c\xe4\x5e\x24\x10\x07\xbc\xd4\x14\x63\x4a\xfc\xea\xe3\xeb\xc5\x13\xdc\x41\xd0\x34\x83\xd1\x92\x0f\xc9\x04\x81\xa2\xf3\x27\xe8\x3a\x21\x5a\x7c\xc8\xb5\x08\x91\x27\x89\x03\x83\x5a\x2e\xe2\xac\x05\x60\xf6\xec\xf3\x0a\x04\xe8\x25\x13\x73\x60\x68\xcb\x67\x16\xac\xc1\xee\xb3\xf3\x83\xf5\x05\x3b\x28\x58\xc3\xca\xaa\x10\x30\xe0\x85\x09\xfe\x04\x7b\x08\x2e\x71\x63\xfa\x9b\x66\xf3\x82\xc8\x39\x6f\xcd\x88\x0b\x67\xfb\x3c\x73\x70\x4b\xf9\x8c\x93\xb0\x91\x77\xe3\xb6\xe0\xe0\x0e\x97\xf3\x99\x69\xa2\x51\x24\x58\x36\x45\x8f\x62\xef\x43\x18\x2c\x34\xa7\x0d\x65\xb3\x43\x03\xc7\x5c\x61\x2f\x0a\x61\xb2\x0a\xfb\x7b\x21\x91\x2f\x8c\x03\xd1\x7f\x5e\x58\x41\x8b\xb8\x76\xaa\x64\x51\xf1\x09\xe9\x3b\x7d\x3d\x2e\x6b\xb3\x1f\x8a\x26\xf4\x80\x9b\x59\x9b\x05\xb0\x07\xb9\xcd\xc6\xb6\xc8\x12\xc0\x97\xdd\x62\x33\xe5\x46\x9d\xa2\x9d\x81\x6e\xeb\xc7\x01\xb1\xac\x48\xf8\x7a\x2e\x77\x4e\x89\x5a\x4a\x13\xe8\x21\xa3\xd6\x87\x8c\xb2\xd5\x0c\x3c\xed\x01\xc0\x9b\x12\x90\xd1\x5d\x78\x6c\xaa\x97\xbc\xb5\xb2\xae\x4a\xb5\x29\xed\x4e\xa7\xbc\x9a\xd2\x17\xfa\xdc\x9f\x6d\xe9\xf2\xd1\x93\x59\x8c\x21\x53\x71\x9b\xb0\x8f\xd2\xfc\x8d\xb9\x1a\xda\x24\x31\x32\x69\xe9\x06\xd0\xd6\xae\x9d\x37\xd5\x67\x58\x10\xa6\x46\xec\x46\x8f\xc2\x7c\x51\xb8\xfe\x8b\x6a\xf5\xa4\xa8\xed\x38\x45\xd8\x7e\x05\x8b\xde\x16\x79\x25\xc7\xe6\x25\xd0\x85\x9e\x31\x7b\xfa\x3b\xf3\x8e\x49\x66\xb7\x60\x2e\x7a\xaa\x74\x5a\xe8\x8d\x5a\xd8\x8b\xe6\x14\x72\xc9\x63\x22\xed\xe5\x41\x95\x05\x0b\xf0\xa2\x72\x4e\x1c\xac\x2e\x7c\xe6\xf9\x57\x13\x73\x75\x9a\x29\x73\x16\x21\x39\x62\x41\x1f\x4b\x50\x18\x8d\x76\xb8\xa1\xd8\x0f\xfb\x4c\x63\xef\x69\x81\x7f\x9a\x1d\xe2\x82\xce\x28\x0b\x0a\xb5\xd8\xe9\xa5\x38\x03\x7b\xa2\x39\x83\x7c\xea\xef\x9f\x3b\x1b\xd6\x7e\x04\x23\xfe\x9f\xff\xfe\xfb\x11\x6d\x33\xb7\xcb\xb1\x5d\x81\x7d\xd8\xc9\xf5\xb6\x25\xdc\xf9\x00\x1e\xa2\x05\x76\x40\xe6\x13\x8f\xdd\x5c\x0a\xd5\x2f\x7e\xb5\x97\x9b\x26\x1a\xae\xe6\xc6\xbf\x58\x26\x77\x30\xc6\x8b\x7c\xf9\x2d\x1b\xb0\xb8\xc2\x03\x5d\xb8\x19\x83\x28\x4f\x07\xfe\x6f\xa2\xf3\x74\xfb\x95\x0b\xa5\xc2\xa0\x02\x94\xb6\x6d\xa2\xe1\xe6\x58\x3e\x5f\xc8\x43\x63\x45\x15\x63\xa5\x0c\xef\xc8\x55\xc1\x0f\x66\x90\x26\x8b\x4e\xef\x4a\x2e\x89\x30\x07\xda\xc3\xf9\xa0\x7a\xd1\x65\x88\x7d\x5b\xe1\xc3\x21\x29\xa6\x6b\xc5\x69\xeb\xf7\x9b\x11\xf2\x4a\x46\x5c\x3c\x23\x62\x1c\xe7\xa5\xa0\xdc\x55\x6d\x5f\xeb\x8f\xce\x72\xb5\x58\xdd\xbe\x4c\x70\xf4\xb0\x0e\x2a\xa1\x7e\xbf\xa5\xd9\xd5\x82\x61\x10\x3a\x51\x16\x0e\x5b\x30\xff\x48\x05\xf3\xcf\xc6\xf2\x95\xb4\x76\xb8\x68\x18\x54\xcd\x0e\x84\x7b\x7b\x13\x19\x64\x62\x18\x39\x9a\xe4\x85\x95\xc3\x63\xbd\xc7\x47\x23\xf6\xde\x14\x4b\x00\xc5\xc3\x0c\x20\x82\x44\x0a\xf2\x29\xe3\x92\x94\x32\x7b\x1a\xf0\xdb\x6d\x66\x9e\x1d\x46\xb3\x4c\x5a\xa9\x5a\xbe\x95\x48\xfa\xea\xe8\x8d\xf5\x0d\xaf\x4f\xb9\x99\x02\xb7\x92\x7a\x22\x9a\x51\x4d\x3b\xe3\xc6\x93\xb6\xfe\xd4\xbb\x96\xff\x28\x62\x65\x00\xc7\x47\x25\x8b\x03\xe4\xa7\x57\x21\x88\x84\x3c\x12\x30\x53\xc2\x18\x43\x94\xfe\xb2\xa9\xa9\x85\x9d\xac\x3a\x40\x45\x5a\x1d\xb0\x05\x14\x57\x47\x50\x4e\x3e\x6a\xa2\xc5\x72\x5a\xc5\xd6\x19\x40\x4d\x0e\xff\x35\xa4\xd0\x41\x58\xad\x60\x41\x14\x22\x9f\x14\xb1\xc5\xf6\xee\x5c\x8e\x56\x3d\xac\x1b\x35\xa7\x99\xb4\x8b\x48\xbb\xa7\x8a\xda\x44\x6c\x66\xae\x4b\x42\x8b\xdd\xbd\x6f\x93\xb2\xe6\x98\xc5\x36\xd3\xd0\xca\xd2\x5a\xa6\x80\xd9\x19\x3b\x90\x8f\xc1\xb6\xf9\x72\x01\xcc\xb3\x69\xd3\xe0\x51\xc3\x45\xe6\xf4\x22\x2d\x99\x83\xdb\x9a\x0b\x2d\xa0\xe6\x4c\xd1\x44\x13\x87\x1d\x83\xd6\x9a\x73\xe6\x81\xd6\x20\x62\xb8\x0d\xcb\x8b\x4a\x49\xd9\x6c\x6c\x57\xd2\x25\xcd\x75\xbb\x18\xca\x34\xf5\xd1\x34\x65\x7e\xfc\xce\x35\xb4\xdc\xce\x6b\xc8\x1a\x70\x96\x5c\xba\x1e\x08\xd6\x8c\xbb\xc9\x58\x80\x2c\x97\xe5\x37\xa6\xb1\x59\x0a\x6a\x6a\xba\xc2\x44\xd7\x31\x52\x80\x58\x57\xcf\x8f\x2f\xae\x10\x69\x53\xf0\x4c\x62\x0d\x44\x40\xab\x96\x1c\x43\xd9\x9a\x5b\x78\xce\xbc\x88\x66\x8b\xf6\xf8\x0c\xea\x4a\x9a\x22\x76\xdd\xd9\x30\x6f\x9c\x24\x13\x1c\x3d\x78\x65\xc3\xab\xdc\x5c\x38\xd0\x73\x2d\xa0\x42\x55\x27\x43\x5c\x7a\xa0\x11\x48\x37\xa1\x17\xc6\x20\xa4\xd8\x61\x17\x9d\x9b\x55\xb3\x10\x4f\x06\x12\xc7\x8c\xde\xc4\x8c\xc7\x24\x4b\xf8\x22\x6d\xb9\xcf\xaa\xa9\x59\xdb\x44\x40\xb4\x65\x86\xed\xf4\x2a\xab\x30\xbd\xb5\x2f\xb3\x5a\x9e\xc7\x0e\xf0\x7a\xd6\xe0\x92\x1f\x12\x3e\x01\x2b\x9f\xd5\xb2\x5d\xee\x42\x10\x42\x5f\x3d\xcf\xeb\x66\x54\x54\x4f\x24\x95\x59\x82\x17\xcb\x7a\x30\xb1\xfc\xcf\xbb\x6f\x26\xf7\x7b\xb5\x11\xac\x7b\x14\x6c\xe3\xe7\xcf\x81\xc0\x7a\xe1\x24\x01\xf3\xae\xe1\x5f\x15\x63\x92\x49\xa2\x3a\xca\x04\xd7\x82\x02\x1f\x31\x85\x67\x6e\x73\xad\x70\xc9\x9f\x18\x11\x72\x4e\xb3\x52\xb5\xb7\xad\xc3\x6e\x2d\x45\xdb\xff\x98\x20\xd3\x35\x78\x27\xcf\x0e\x0d\xf2\x83\xa6\x0f\x99\xe1\xa8\x30\xfe\x45\x09\x96\x92\x4e\x17\x01\x60\x83\x8f\x60\x84\xb4\x98\xb2\xb6\x1c\x14\x58\x6a\x62\x34\x66\x7c\xbb\xc9\x58\xde\x3e\x5b\xeb\xbe\x7c\xfc\x68\x1c\x22\x63\xe9\xfb\xa4\x8e\xce\xe1\x6e\x6a\x8b\xd2\xd1\x8a\xa4\x69\x52\xb3\x37\xcb\x30\x5e\x0a\xaa\xd2\x6e\x46\x28\x84\x49\x3b\x6c\xab\xc8\x78\x20\x85\x10\x64\x44\x95\x52\xd4\x60\xf3\xb5\xe2\xe4\xcc\x9f\x9a\x38\x3d\x08\x03\xe4\xaa\x17\x1f\x1f\x20\xb9\x15\x78\x51\x17\xba\x38\x23\x09\xd9\x49\x24\xeb\x06\x44\x52\xf5\xb0\x07\xe4\xb1\x94\x34\x0a\x90\xf4\xd5\xc6\x85\x0d\x02\x6c\x5b\x20\x50\x9a\x87\xfe\x93\x19\xa8\x8d\xb1\x6d\xda\x45\xb0\x7f\xc1\x2a\x77\xd5\x5d\x9a\xb0\xd4\x4c\x0b\x96\xe4\x8a\x6e\x4a\x74\x55\x74\xea\xe5\x95\x7d\x24\xb5\x57\x0e\x45\xad\x8d\xeb\x03\xe9\x12\x71\xb0\xf2\x00\x6c\xc4\x81\xea\x7c\xba\x1b\x5d\x58\x3f\xa1\xe2\x68\x46\x94\x29\xac\xed\xab\x87\xbf\x25\x9a\xd8\x59\x20\xfd\x8e\x56\xbf\xf9\x90\xaf\x77\x6a\x6f\x89\x92\xee\x4a\xa8\xc1\xd3\xd9\xcd\xd9\xc3\x2d\xd8\x8f\x63\x69\x04\xd7\xcf\x5e\x6e\xd9\x3a\xf9\xdc\x8e\xcc\xa6\x60\xff\x8e\x04\x2a\x33\xc7\xd8\x7e\xe1\xd3\xad\x4b\x40\x43\xb8\x04\xce\x66\xd6\xe8\xf5\xb9\x5e\x95\xb4\x3f\x77\xd1\x6b\x7d\x1a\xaf\x8e\xaa\xa0\xee\x5e\x1e\x5c\x4f\x1e\x74\xe0\x85\x7b\x78\xf9\xb7\x1d\x83\xfd\xbc\x7f\xf6\x40\x38\xac\x5d\x89\xbb\x13\x11\xdf\x10\x99\xec\x85\xa4\x58\xdb\x8a\x97\x92\x17\x0f\x1d\x7a\x4c\x81\xc5\xb2\xbf\x5b\xb4\x1f\x27\xf9\xc6\xba\x81\x9e\xef\x82\x5d\x4d\x2f\x3b\xa1\x0f\x00\x52\xc4\x90\x6f\x9a\xdb\xca\x0c\x70\x78\x83\x90\xb1\x9a\xef\x61\x45\x30\x9e\x1d\x5e\xa7\x30\xbc\xda\x72\x3e\xc7\xf6\xda\xe4\xa2\xce\x9b\xfb\x9c\xa4\xb6\xee\x58\x76\xa1\xa3\x3c\xb3\x17\xc7\x52\x63\xf0\x41\x1f\x13\xdb\xed\x16\x6d\x80\x2c\x71\x5b\xb6\xcb\x43\xd6\x54\xb6\x6a\xfb\xf4\x68\x97\x72\x36\xce\x04\x99\xd2\x4f\x1b\x89\xe2\xd7\xf0\xa9\x55\x2f\xf5\x32\x57\x0a\x61\x81\x7b\x06\x0a\x67\x05\x71\x7b\x76\xa5\x6d\xb1\x9c\x11\x2b\x32\xce\x6c\xba\xd9\x03\x59\x20\x2e\x4a\x3f\x6d\x0a\xae\xb7\xfb\xa2\x5d\x66\x5f\xe7\x4a\x65\xf2\xe4\xf8\x78\x46\xd5\x3c\x9f\x1c\x45\x3c\x35\xe1\xe6\x5c\xcc\xcc\x1f\xc7\x54\xca\x9c\xc8\xe3\x6f\xbf\xf9\xa6\xd8\xe2\x09\x8e\x1e\x66\x06\xae\xa4\xee\x77\x2a\x6d\xf9\x6d\xbd\xb0\xed\xfa\xa5\x1e\x04\x67\x63\xf2\x49\x13\xa9\xdc\x14\xc8\xe6\x5e\x12\x89\x06\x3f\xdd\x22\xb9\x60\x0a\x7f\x3a\x41\x1f\x29\x03\x01\xe4\x7b\x9e\x0b\x89\xce\xf0\xe2\x90\x4f\x0f\x53\xce\xd4\x1c\x7d\x84\xff\xb5\x3f\x3d\x11\xf2\x80\x7e\x26\x58\xd8\xfd\xb5\x25\x91\x7c\x75\xdd\x39\x86\x5c\x5c\x89\xc8\xa3\x5e\xe1\x6f\xfe\x03\xa5\xa6\xe5\x13\xf4\xf5\xf1\x37\xff\x81\xfe\x08\xff\xff\xff\x47\x7f\x6c\xd1\xd4\xd6\x83\xc2\x81\xc2\x99\x37\x65\x77\xdc\x41\x65\xa5\x36\xa8\x25\x7c\x2a\x78\xb1\x53\x8d\x2d\x3f\xd0\xe8\x81\x4f\xa7\x63\x45\x53\x62\x72\x83\xc6\x58\xd4\x60\x54\x37\xc4\x15\xa4\xb6\xf2\xa9\xa0\x06\x6e\xdb\xd5\x56\xb0\x9d\x9a\x4c\x68\x77\xdc\x64\x5e\x54\x7e\x84\x20\x90\x52\x35\x4d\x2a\xe1\x2b\x12\xeb\x53\xb1\x4e\xc0\x87\xb3\xce\xd4\xeb\xb3\x17\xc8\x01\x61\x35\x5f\x1f\xb8\x15\x46\x21\x9a\x40\x0d\xbb\x90\x8d\xc7\xa1\x16\x1e\xf9\xd9\xc4\xbc\xc1\xd4\x5e\x2b\xde\x4d\xd6\x3a\x5f\x1d\xea\x76\xcb\xc5\x56\xf2\xf2\x03\xa9\xc5\xdc\x76\xac\x23\xe2\x6a\x48\x86\x75\xa5\x21\xe9\x94\x0b\x8f\xef\x69\xf4\x5a\x5b\x6d\x6c\xb5\x15\x8a\x0a\x13\x1c\xd4\xed\xd0\xeb\xa9\x9f\xf9\x4f\x56\x0d\x13\x22\x85\xdc\xdb\x45\x1d\x25\x18\xad\xbe\xe2\x34\x4b\x6c\x18\x71\x03\x08\xd8\xaa\x0d\xbd\xf5\x79\xdf\xd0\x38\x84\xad\x41\xc8\x3e\x73\x92\x89\xcd\x49\x6e\xde\xcf\x5c\x44\xe4\x94\x6f\x17\xb6\x98\x50\x56\x8b\x77\xee\x5e\xa2\x23\x28\x56\x6e\x8a\xb1\x38\x9c\x4c\x1e\x17\xc2\x9e\x31\xeb\x5a\x74\xf6\x00\xa0\xaf\x3c\x1b\x00\x7a\xda\x05\x06\x5c\x0d\x33\x7c\x0b\xae\x6d\x0c\x7f\x05\xc3\x73\x90\xf3\x15\xa4\x79\x81\x35\x2f\xdc\x10\x36\xcf\xd4\x0e\x39\x40\x02\x43\x1c\x9b\x9a\x63\x66\x54\xc2\x29\x8e\x28\x9b\x1d\x04\x88\x69\x90\xf8\x1d\x72\xe0\x26\xba\xb8\xc3\xf2\x61\xb7\xb1\x59\x5b\xd7\x52\xa3\x71\x51\xcf\xc7\x62\x1c\x18\x5b\x30\xad\xc1\x45\x29\x2c\x1f\xda\x40\x3e\x6a\x08\x43\x4b\x46\xe7\x97\xc2\xe1\x12\x2d\x1b\x9f\x4b\x24\x25\xa1\x08\x0a\xf0\xe1\xae\x8a\xa6\xc5\x1b\x73\xb9\x40\x18\xee\x4d\x9a\x90\xb8\x0a\xb4\xb7\x64\xfc\x72\xce\x85\x1a\x6f\x08\x51\x58\x4d\x86\x65\xe4\x30\x01\x58\x06\xfe\x48\xc4\x23\x25\x4f\x65\xa4\xbf\x75\x68\xd1\xd8\x19\x82\x40\x24\x80\x82\x4b\xb5\x26\x1d\x1b\x7b\x37\x5b\x18\xde\xa4\xcf\x33\x96\x0f\xd2\xd7\x14\x44\x32\xc5\x49\x72\x80\x04\xc9\xa5\xa9\x69\x29\x49\x32\x3d\x74\xa8\xec\x31\x4a\xf8\x8c\x46\x38\x41\x93\x84\x47\x0f\x72\xc4\xf4\xdd\xcc\x66\x86\x2f\x64\x82\x47\x44\xca\x40\x98\x29\xf2\x5c\x6d\xf6\x11\x14\x14\x54\x44\xa4\x94\x51\xa9\x68\xe4\xa4\x94\x22\xb5\xdc\x94\x8f\xd5\xea\x65\xc4\x4d\x19\x44\x18\xae\x16\xae\x88\xc1\x89\xcb\x99\xad\xdf\x01\x37\xa4\x85\x7f\x72\x71\xb5\x6d\x07\x68\x07\x68\x56\x8e\x42\xc6\xaa\x7c\x20\x57\x1c\xa9\x53\xfb\x19\x1c\xe3\x65\x24\x70\x53\x3e\x51\x9e\x20\xfd\x49\xf3\x20\xc9\x8e\x2e\x8b\xa8\xe1\x92\xb0\xe0\x83\x69\xf7\x0c\x5c\x07\x86\xdc\x02\xa9\xb3\x8a\xa6\xf5\x2a\x82\x94\x01\x25\x63\xaa\x8e\x46\xca\xa2\x24\x8f\x7d\xd1\x30\x7d\xeb\x3e\x6a\x22\x71\xcb\xa3\xd7\x5e\xdf\xcd\x07\x08\x4b\xf4\x44\x92\x44\xff\xd7\x04\x0d\x1f\x7a\x0c\x6f\xcd\x92\x0d\xce\x3a\x74\xe2\xb8\x74\x2b\x45\xc1\x24\xf6\xa4\xd6\xa5\xbf\xb7\xd7\xe5\xcc\x2b\x25\x33\xbd\x3c\x6b\x72\x68\xbd\xd2\xad\x78\x87\xa5\xb1\x95\xc9\x16\x80\x5b\xda\x07\xd5\xd1\x00\x24\x9a\x32\xa4\x0d\xc5\xc1\xd3\x47\x5a\xd4\x75\xb5\xbd\x2d\x35\x10\xe9\x19\x75\xb2\x0e\x85\x44\xb1\xb1\xc5\xb3\x32\x95\x1a\xd2\x00\x35\x05\xc1\xcd\x84\x40\x4d\xc8\xa3\x88\x90\xb8\x31\xbe\x54\x8f\x68\xef\xf0\xfc\xae\xb1\x9a\x9b\xa4\xf5\x94\x2b\x53\x56\xd0\xe0\xf9\x39\xcb\x95\x01\x80\x9b\x24\x7c\x02\x17\x12\x40\xfd\xb9\xa4\xd7\x20\x61\xce\xcc\x9b\xc4\xe8\xcb\xe0\x7e\xf1\x80\x0a\x5f\x35\x03\xcf\x95\x56\x64\x0f\x60\xfe\xaa\x26\xb3\x56\xb0\xbf\x72\x65\xac\x23\x74\x5d\x41\x01\x09\x2b\x4b\x63\x7d\x6d\x2c\x45\x94\x79\x25\x68\xc0\xca\x24\x9e\x6f\x87\xd6\x84\x06\x2c\xf5\xb9\x03\x68\xc0\xca\x3c\x5b\xa2\xf2\xf9\xec\x59\xb3\x89\xf5\xa4\x2e\x78\xf7\x14\x2f\x83\x46\x65\x44\xbc\x12\x09\xba\x03\xb9\x68\x22\xc4\xfd\x82\x3d\xac\xd4\x8f\x7b\x5d\xd8\xc3\xca\x60\xf6\x19\xf6\xb0\x32\xd4\xfd\x85\x3d\x6c\x18\x68\x07\xd8\x43\xe3\xb6\x1f\x6b\xa2\xee\xc6\x14\x20\x65\x65\x92\x4f\x6f\xe1\xde\x5d\x3a\xc6\x53\x13\x12\x60\xae\x31\x27\x4a\x5a\x14\x60\x18\xad\xcd\x6e\x6c\x0b\x74\xc2\x72\x2b\xda\xf3\x7e\x35\x2a\x8d\x21\x21\x4b\x30\x2b\x5f\x1d\x50\x22\x5e\x90\x48\x93\x9f\x61\x54\x4a\x60\x26\x61\xaa\x07\xd6\x5c\xa7\x47\x61\x2c\xd4\x11\xce\x6c\xb6\x78\x5b\x71\x8e\xfd\xc9\x8b\x5d\x0f\x51\x12\x80\xee\x4a\xac\xbe\x13\x4c\xd5\xc7\x0a\xbe\xfd\x9c\x3f\x59\xc9\x11\xc8\xcf\x10\x63\x2b\xe9\x41\xa7\x63\x6b\x53\x68\x5b\x31\xca\x14\x99\x55\x45\xfa\xe2\xb0\x50\xa6\xfe\xfc\xed\x4a\x0e\x64\x70\xfc\x9c\xf5\x22\x40\x99\xb7\xd0\x21\xbe\x9e\x0d\x89\x6d\x91\x7b\xa9\xb5\x6b\x3d\x1d\x73\xa3\x4a\x94\x62\xea\xf4\xfc\x5c\x82\x73\x6e\x4e\xe5\x88\x99\x04\x2e\x5b\x5b\xed\x08\xbd\x87\xd2\x99\x38\xcd\x12\x72\x80\xfc\xfc\xa8\xa6\xa0\x51\xfe\xf5\xd7\x7f\x26\xe8\x6b\x94\x12\xcc\x4a\x26\x16\xd0\xea\xf5\x95\x07\x40\x71\x6a\x4e\x46\xac\x71\x2b\xd0\xf0\x93\xa9\xc6\xe3\x22\xf8\xce\xd9\x94\x3b\x93\x0d\x94\x84\xc3\xd1\x1c\xc9\x7c\x62\x6a\x9a\x06\x26\x36\xa7\xe7\x5d\xf0\x19\xb8\x9e\xe1\x26\x76\x83\xde\x18\x20\xb3\xc2\x70\x3a\x02\x64\x96\xa6\xd6\x03\x64\x36\x9f\xbe\xbd\x05\xc8\xac\xec\x79\x37\x80\xcc\xa6\x2d\xdf\x00\x20\xb3\xd4\xcc\x67\x03\x90\x59\x59\xd1\xcf\x06\x20\xb3\x32\xaf\x1e\x20\xf3\x33\x01\xc8\x5c\xcd\x47\x1a\x21\x20\x9b\x0f\xef\x7a\x10\x90\x8d\xfa\x55\x3b\x8b\xd8\x16\x6f\x07\xa4\xb9\x17\x86\x80\x2c\x4d\xa0\x0f\x77\x5b\x3f\xdc\xad\x91\xf8\x6c\xdf\x7a\x78\x2e\x06\xae\x7a\x91\x75\x04\x81\x2c\xed\x4f\x67\xd3\xe7\x2e\x28\xf1\x79\x03\x2c\xc1\x03\xd3\xd5\x1c\x32\x28\xad\xa2\xb4\xd0\xb1\x5a\x32\x72\xe0\x5d\x46\x73\x0a\xdd\xf9\x3d\xe5\x6e\x10\xa8\x59\x59\x5e\xef\xb3\x31\xb4\xb8\x4b\xe3\x7c\x43\x5d\xf4\x2d\xe8\xd5\xe5\xb2\xad\xe9\x1c\x71\x83\x00\x27\x49\xb3\x61\x90\xa6\x74\x57\xcd\xae\xba\xc8\x3c\x34\x11\x68\x53\xb5\x34\x3d\x7d\x3d\x99\xe1\x18\xd9\xb8\x92\x9d\x08\xb8\x09\xe6\xcb\x19\x95\x4a\xb4\x86\x2a\xd5\x46\xb8\x8d\x1b\x36\xcb\x37\x01\x41\x99\x6d\xf6\x59\x4a\x52\x2e\x56\xc5\x49\x35\x7e\x69\x2b\x3a\x6c\xf2\x29\xc9\xe6\x24\xd5\x42\xd0\x78\xdd\x46\xba\xee\xb7\xcf\xe1\xb4\xa9\x44\x26\x6e\xb1\x44\x04\x81\x93\x55\xbf\x1b\x1b\x80\xc0\xce\xdb\xbd\xed\x36\x5b\x08\xc3\x35\xad\xf8\x0e\xc2\x75\xb9\xb5\xc4\xbe\x54\x72\xa5\x03\x7d\x37\xc6\x8b\xf8\x70\x9d\xd5\x11\x21\x4b\x62\x41\x96\xc1\x00\x15\x5f\xd9\x7a\xa7\x6b\x84\x09\xd4\x5d\xa8\x61\xb1\xcb\xf5\x83\x47\x5a\x40\x2c\xeb\xcb\x03\xbe\x65\x49\xc4\x61\x28\x51\x97\x06\x53\x5f\xaf\x12\x95\x38\x4d\x6c\x0b\x22\xc9\x45\x6b\xd0\x68\x17\x2b\x64\xa4\x72\x9c\x80\x9a\x17\x16\x69\xab\x6e\xea\x64\xd1\x90\x85\xd6\xcd\xcc\x4d\x99\xfa\xcb\xbf\xaf\xb5\x9b\x5a\x25\xb1\xeb\x06\x85\x65\x70\x14\x11\x69\x0c\xa3\x36\xa8\x18\x4f\xf8\x23\xd4\x94\xd9\x66\x57\xf5\x51\xd6\xf3\xd6\x0c\xde\x23\xc3\xc6\x05\xa9\x1b\x71\x61\x2e\x78\x3e\x9b\x3b\xdb\x8b\x3e\x33\x7a\x6a\x4d\x7b\xf9\x63\xcd\xc0\xb9\xf6\x5e\x7e\x97\xd3\x64\x33\xcb\xd6\x6d\xa9\xda\xce\x87\xf3\x3b\x24\xe7\xfe\xb4\x4e\xa0\xd9\xc6\x8d\xad\x0f\xba\x7b\x9f\xf6\x5b\x6f\x64\x87\x6e\x0e\x1c\x1a\xe2\x94\x27\x09\x98\x89\x25\x49\x1f\xc3\x22\xd9\x61\xf7\x30\xe1\x3b\xba\x61\x69\x78\xf8\x1a\x9c\x4d\x52\xe1\x34\xeb\x24\x7f\x5d\x1b\xd1\x50\x22\x37\xfa\xaa\xa7\xd9\x84\xc1\x71\x46\x58\x93\x6d\xea\xa7\x7a\x8d\x88\x37\x16\x8c\xe8\x22\xd3\x76\x16\x90\xe8\x96\xe4\x85\x83\x12\x57\xcc\x63\x5f\x03\x13\x2b\xcc\xce\xc7\x09\x16\xd7\x8c\x8b\xf6\x30\x8a\xcf\x40\x2f\xf1\x88\x0d\x4a\xe9\x11\xae\x20\xec\x64\x51\xc4\x57\x1b\x1d\x22\x64\x66\x80\xee\x6f\x0d\x2b\xe0\x03\xd1\x7f\x81\xa6\x63\xb0\x44\x4d\xb8\xa2\x0b\x49\x84\xe0\x70\x12\x1f\xe2\x68\x11\x25\x34\x0a\x74\xe6\x99\xc0\xd9\xbc\x89\xe3\xb9\x9d\xef\x41\x50\x5e\x0b\x04\xa5\xad\x64\xcd\x3a\xe1\xe0\x8e\xae\x18\x4e\x49\x0f\xce\xd2\x04\xce\x72\xe0\xe1\x07\x58\x51\x7c\xe7\x15\xb3\xda\xeb\xe7\xae\x47\x68\x79\x05\x84\x96\x4d\x0e\x5f\x01\xbf\x52\x3a\x76\x3d\x6a\xcc\xbb\x4e\xa8\x31\xfe\x12\xdc\x2b\x20\x90\xf6\xf3\xf8\xca\x00\x13\xf5\x81\xbd\x26\x4a\x4c\x83\xb8\xb0\x8e\xdc\xb4\x0c\x26\x66\x19\x5d\x74\x5a\x97\xd7\x05\x6d\x59\x6f\x65\xd6\xc2\x63\x69\xbc\xbb\xf6\x04\x9d\xa5\x7d\x1b\xf6\xe4\xdc\xec\x32\x63\x66\xbd\xea\x82\x61\xd6\xcc\x3a\x0a\xd6\x7a\x09\x34\x9e\x1e\xde\x56\x12\x4d\x51\xda\x69\xb3\x44\x9a\x81\xf3\x41\x13\x81\xe6\x3c\x89\x4d\x98\x57\xb0\x5a\xbe\x03\x1f\xbe\xed\x17\xc8\x6d\xc6\x6d\x46\x22\xa3\x6d\x15\xf5\x99\x96\xa5\xcb\xf8\x4d\x7c\xeb\x29\x33\x81\xfc\xbb\xdb\xb4\x99\x70\x65\x37\x4d\x9d\x59\x31\xb8\x65\xa2\xc7\x86\xe9\x33\x41\x8f\x4b\xbd\x74\x6e\x76\x9d\x3c\x75\x55\x62\xd9\x20\x88\xaa\x56\x48\x6b\x7b\xac\x96\x14\x7f\x1a\x67\x58\xe0\x24\x21\x09\x95\xe9\xb3\x45\x72\x9e\x96\xdd\xb5\xfa\xac\x0a\x6e\x4c\x44\x2c\x4f\x27\x86\x14\xdd\x40\x6c\xf9\x3e\xc5\x91\xc8\x59\x88\x34\xe5\x37\x06\xb9\xf2\x6e\x39\xdc\x0b\x60\x55\x8a\xe6\x50\x2b\x72\x8a\xa9\x60\x44\xb6\x56\xe6\x23\x51\x2e\xa8\x5a\x8c\x6d\xa1\xc3\xee\x07\xee\xd6\x7e\x79\x6a\x3f\x5c\xee\xe1\x76\x49\xfa\xae\x3f\x5f\x58\x31\x23\x02\xaa\xb6\xb8\xfa\x23\x41\x31\x47\x0b\xc2\x40\x7c\xe9\x17\x88\x5d\xad\x5d\xdb\x6d\x31\xd7\xf8\x69\x1c\xa4\xc1\x8c\xa3\x2a\x71\xac\x3a\xac\x4d\x30\x40\xcb\x26\xf9\xcc\x40\x38\x2d\x5e\xe4\x67\x28\xfa\x60\x63\xdd\x4d\xd3\x7a\xc0\x81\x2b\x18\xec\x95\xc5\xc6\x04\xb9\xf4\x56\xa9\x6a\x19\x27\x66\x8c\xab\xe6\x72\x5f\x4b\x06\x3b\x08\xbe\xea\x30\xe2\xa0\x93\x1d\x0d\x5b\x1f\x74\x21\xf2\x4c\xd1\x49\x1d\xa9\x46\xed\xae\x08\xe4\x20\x81\x14\x6e\xe7\x66\x28\x75\x6b\x2a\x43\x96\x38\xb1\x9d\x9d\x96\xff\x2d\xac\x93\x03\xfc\xa1\x6c\x96\x90\x52\xf2\xd5\x55\x4a\x81\x0a\xcd\xf9\x01\x03\xb4\xa6\xce\xb2\x6d\xf6\x0b\x17\xee\x81\xa1\xbe\xa4\x31\x11\x1d\x8d\xd8\x40\xa2\x27\x82\x18\xb1\x88\x10\x0d\x95\x23\xbd\x55\x1b\x4a\xf1\x4c\x88\xee\xc9\xc7\xa6\x68\xe1\x81\x2a\xe9\xab\x41\x99\x3e\xa6\x38\x91\xe4\x40\x37\x0c\x45\x24\x15\x87\xa0\x49\x8c\x9e\x04\xce\x32\x22\x46\xcc\x86\xe0\x83\xc3\x85\xf3\xc4\xb4\xdf\x16\x1a\x6a\xd7\x80\x8c\x23\x1c\xcd\x5f\x68\x8f\x30\x64\x50\x44\x73\x12\xbb\x5c\xe4\xf2\xf6\xb8\x79\x1b\x83\xf5\x1a\x9b\x75\x3e\x75\xd5\x8c\x0e\x6c\x27\x49\xa4\x39\x8a\x2f\x6e\x9b\x11\xa1\x47\xad\x69\xf8\x91\x30\x44\xa7\x6e\x1c\x36\x76\x07\x3d\x81\x67\x4a\x93\xfe\x23\xa6\x89\x49\xee\x77\x5d\x3b\x21\xd0\x98\xdf\x47\xcc\xb8\xbb\x59\x54\x4a\x2b\xa4\x8c\xca\xb9\xe6\xd4\x39\xf8\x24\x41\xcd\x58\x4b\xf2\x8c\x63\x59\x36\x32\x1a\xf5\x8d\xfe\x56\x32\x6f\x1c\x96\x52\xa6\xa2\x00\x8d\x07\x82\x25\x5d\x41\xa5\x65\x72\x66\x1f\x7a\x5f\x0f\xbd\x6f\x5e\x9b\x7d\x0c\xbf\xf7\x87\x65\xdd\x10\xfc\xb6\xed\xdf\x85\x04\xb9\xc3\x50\xfc\x57\x8e\x59\x7f\x9e\x70\xf5\xd7\xcd\x2f\x78\x8e\xd4\x82\x3e\x00\xff\xed\x05\xe0\xb7\x1f\xdb\xb5\x82\xf0\x57\x00\x32\xb9\x5e\xb6\x8d\x78\xf6\x08\x3d\xcf\x1a\xf5\xec\xa3\x36\x82\x2f\x3a\x46\x3e\x17\x10\x42\x7d\xf4\xf3\x33\x45\x3f\x37\x2c\xf1\x7a\x11\xd0\x1b\xd9\x56\x5e\x3e\x38\xb3\x5a\x63\xff\x39\x03\x34\x57\x45\xc7\xe4\x93\xf1\xb3\x1f\xbd\xc6\x39\x77\x3d\x81\x3f\x79\xa2\x30\x22\x91\xd0\x74\x36\x21\x71\x0c\xf6\x7b\xc5\x6d\x85\xd4\x82\x76\x9c\x1e\xa6\x99\x2f\x96\x9a\xd8\x71\xc2\xd9\x4c\xd2\xd8\x40\x11\x98\x5a\xfc\x25\x2d\x11\x52\x70\x61\x7f\x93\x84\x08\x67\xfe\x15\xe8\x4b\x49\xb5\xdc\x1f\x98\x84\x05\x8a\x39\x91\xec\x0b\x65\xb4\x32\xcc\x16\xe8\x81\xf1\xa7\x84\xc4\x33\xd8\xa1\xea\x60\x0e\x11\x25\x07\x88\x2a\xff\x99\x80\x9c\x5d\x9e\xab\x91\x1e\x3b\x04\xf5\x18\x11\x90\xd8\x6f\x83\x5a\xc0\xbe\x99\xaf\x8e\x10\x3a\x67\x68\x8a\x23\x75\x80\x64\x3e\x29\xda\x8f\xb9\x29\xee\xaa\xd5\x9c\x60\xe2\x45\x23\x7d\x70\x6e\x43\xe7\xcd\x67\xc3\x71\x07\x4d\xae\x83\x84\xe2\xad\x82\x98\x1e\xf1\x36\xd0\x8c\x1f\x73\x69\xbd\xdd\x88\x33\x7f\xf4\x2d\xf8\x88\xc7\xd6\x85\x8a\x9c\x06\xa7\x96\xf1\xb8\xd5\xa8\x54\x99\xca\xba\x63\x29\x22\xce\x6c\x21\x50\xeb\x11\x80\x76\xcd\x72\xc7\xfc\x89\x49\x25\x08\x4e\xad\x15\x56\x5f\x35\x10\xad\x60\xe2\xcd\xf4\xe8\xa9\x30\x22\xc6\x3a\x5b\x7c\x41\xd9\x83\xde\xdd\x02\x4d\x18\xea\x2a\x43\xcf\x4d\x9b\x96\xe9\x1b\x8f\x9c\x72\x66\x3c\x31\xdb\xec\x9f\xa4\x33\x86\x93\x35\x95\xdc\xda\xca\xd5\x9d\x27\xce\x78\x65\xc5\x05\x2d\x45\x18\xab\x0a\x32\x3d\xae\x65\x44\xa8\xcc\x37\x74\xdd\x60\x14\x93\x8c\xb0\x98\xb0\x68\x01\x24\xc2\x00\x57\x42\x30\x9c\x20\x0c\xdf\xe1\xe4\x08\x9d\x99\x44\x06\x2f\xe1\xd9\x6b\x1d\x2e\xf4\x14\x33\x3a\xd5\x82\x22\x58\xbb\xec\x28\x47\xcc\x0c\xd3\x19\x9b\x83\x62\xd5\x7e\xc5\x1a\x76\xe6\x3b\xca\x70\x29\x73\x64\x83\xf3\x94\xe4\x6b\x05\x07\x07\x66\xab\x45\x1b\xc4\xb6\xc2\xab\x50\xaf\xd7\xd8\x0c\x24\xa1\xcc\x37\xd2\xdd\x21\xb8\x32\xcd\x22\x61\xa4\x30\x58\xb4\xe7\x24\xc9\x82\x52\xb9\x19\x16\x4a\xba\xa3\x6d\x70\x52\xf5\x2d\x93\xe6\xcc\x20\x54\x18\x4b\xc3\x93\xc5\xa2\xb4\xce\x8c\xa2\xf1\xa3\x11\x3b\x57\x5f\x48\xcd\xf9\x38\x9b\x25\x0b\x84\xe3\x47\x2a\x0b\xcc\xed\x88\x33\x99\xa7\x44\x54\x2a\xd0\x5b\xbc\x5a\xec\x48\x53\x8f\x4d\xcb\xfc\x8f\x38\xa1\xb1\xee\xd6\xc8\x18\x33\x34\x21\x53\x2d\x3f\x65\x58\x48\x67\x11\x6b\x70\x69\xda\xcd\x8d\xf5\x5a\xbd\x1a\xb7\xfc\x31\x64\x88\x28\x2d\x78\x27\xb6\x3a\xf0\x71\x95\x73\xda\x55\x5f\xc2\x35\x27\xb5\x49\xa1\xe5\x02\x8e\x5d\x85\xb3\x55\x10\x2a\x0e\xc6\x2b\x37\x21\x2c\xba\x1f\x27\x4b\x9b\xc1\xad\xc5\x01\x2a\x13\xb4\xa3\x36\x86\xd6\x90\x6b\x12\x0a\xc2\x85\x54\x58\xd1\xc8\x8a\xed\x5c\xd8\x8b\xc3\x5e\x2c\xed\x5b\x7b\xb6\x25\x6a\xb1\x8c\x70\x52\xdf\xe1\x25\x5e\x33\xf3\xfe\x72\xde\x6a\x8f\x9b\x69\x7b\x69\xd2\x4a\xc4\x93\x64\x1d\x44\xed\xca\xcc\x4f\x8b\xcf\x97\x8f\xa8\xe8\x47\x6f\x80\xdb\x0b\x38\x35\xc6\xf7\x88\x13\x2b\xa1\x4a\x65\x77\x29\x7c\xc9\xdc\x6e\x0b\xeb\xdb\x1c\x31\x3e\x35\x05\x51\xdb\xbc\x92\x99\xe0\x29\x5d\x07\xda\xcd\x38\xea\x6e\x5c\x14\xe1\x0a\xe1\xcd\xc5\x1a\xea\x53\x64\xc9\xcb\xf6\x08\xf1\xe6\x98\x19\x79\x75\xc9\x19\x4a\x71\xb6\xd1\x82\xaf\xb2\xb6\x0c\x50\x6a\x4c\x5d\x76\xf5\x00\xb2\x97\x00\x7c\x39\x2c\xf2\x13\x5e\x14\xa9\x3d\x6d\xa0\x5d\x6c\x2d\x72\xb8\xd7\xaf\x9f\xb3\x29\x5f\xe3\x70\x16\xa9\x38\xf6\xf4\x61\x47\xb3\xc1\xf9\xf3\x31\x9d\x66\xf7\xcd\x9a\x76\x39\x8f\xa7\x4d\x44\xbd\xf6\xc9\x74\x2b\xf8\x9c\xaa\x5f\xc8\x44\x42\xad\x6f\x9d\xbb\xb5\x7c\xb4\x82\x16\x11\x0c\x67\xf9\x52\x7d\x2c\xd1\xe1\xce\xd7\xa8\xd2\x0e\x32\x16\x06\x17\x0c\x74\xdd\xdc\xea\x0b\xac\x99\x3d\x24\x9d\x16\x6b\xcb\xdc\xc3\xf5\xc0\xc7\x5c\x8f\x1e\x72\xac\xf9\x84\xae\x44\x56\x5d\x47\x57\x9c\x6a\x49\xc8\xa8\x0f\x45\x64\x81\x0d\xb1\x9e\xd2\x84\xc8\x23\x74\xde\xa0\x37\xba\x00\x67\xef\x10\x34\xa1\x5e\x4e\x7a\xca\x05\x0d\xea\x0c\x39\x19\x09\x51\x00\xef\x0e\x6d\x67\x82\xe8\x31\x47\xc6\x77\xc7\x0d\xd2\x18\x44\x57\x09\xaa\x79\x96\x11\x56\x15\x48\xd1\x9a\x17\x50\x9b\x5e\x6e\x64\x78\xff\x01\x37\x3e\x6f\x6c\x4b\xa9\x15\xa3\x6a\xd9\xd2\x5d\x54\x1c\xe8\x1e\x3f\xee\x7a\xbd\xd3\x5f\xd4\xf7\xa6\x71\x84\x77\xe5\xd6\xd7\x1e\x9d\x97\xf2\xd7\x77\x44\xbe\x87\x4f\x9d\x55\x14\xa3\xa9\x20\x60\x38\x4f\x7d\x4e\x28\x8b\x89\x90\x8a\x73\xb8\xef\x6e\xcf\x7e\x38\xbe\x3f\x47\x44\x45\x28\xa1\x0f\x64\xc4\x22\xf9\x78\xa0\xc5\xe3\x5f\x73\xa2\xf4\xcf\x2d\x86\x16\x9a\x12\x26\x81\x13\x50\x55\xcb\x9d\x6f\x5e\x48\xb7\x30\xfa\xbf\x67\xe5\xef\x97\x90\x7c\x2d\xfd\x05\x68\xd7\x61\xc1\x03\x99\x02\x8e\xb0\x59\x5a\xd9\x40\x31\x46\xc5\x1b\x36\x15\x67\xda\x20\xdc\x95\xfd\x23\x67\x6b\x0a\x5d\xa7\xc5\x47\xc1\x28\x5a\x64\xba\x34\xc3\x00\xb4\xb7\x5e\x1c\xad\xf9\xa6\xb1\xf5\x55\x4c\xa4\x48\x2b\x72\x2a\x7b\x51\xc7\x0a\x29\x41\x08\xb0\x10\x4f\x4f\xf6\xae\xb7\x99\xa4\x7e\x62\xc1\x47\x47\x23\xf6\xd1\x19\xf2\x8b\x5f\xa5\x6b\xc2\xc4\x66\x7b\xfc\xc1\x72\x2b\xd0\x6c\x4c\xa5\xff\x01\x50\xa4\x65\x9e\x28\x53\x60\x65\x4a\xb5\x96\xee\x06\x6a\x9e\x34\x71\x09\x81\x59\x34\xbf\xdc\xb2\xce\x0a\x9d\x8e\x49\xb2\x8e\x24\x7a\x3e\x1d\x26\x52\xd3\x77\xf4\xd0\x72\x3a\x37\x29\x21\x54\x4c\x06\xe4\x40\x57\x13\xc1\xe8\x38\xc6\x7a\x9c\x98\x02\x27\x04\x81\xe9\xb7\x1a\xfd\x6c\x12\x1c\xf5\x2e\x5a\x49\xdd\x58\x7e\x4d\xd8\xa1\x0f\x29\x82\x5e\x10\x56\x23\x26\x72\x06\x08\xb7\xde\x11\x84\x91\x24\x82\x1a\x8f\x4c\xe4\xcc\x32\xd6\x48\x36\xd3\x6c\x42\x4b\x7e\xe0\x0d\xe4\x0c\xf4\x33\x9e\x4b\x88\x60\x4c\x89\xd2\x17\xd4\x97\x50\x96\xcc\xb8\xe2\x0e\x50\x26\x68\x4a\x15\x7d\x24\xf2\xab\x86\xad\x3b\xc5\x0a\x27\x7c\x36\x10\x8a\x4e\x71\xa4\xee\xf0\x56\x1a\x38\xb6\xcd\x6c\x1a\xd6\xe1\x86\x81\xce\xcf\xf4\xe2\xcf\x08\x23\x02\x26\xaa\x75\xf2\xe6\x23\x0c\x4f\x36\xe2\xdc\x50\xd3\x23\x32\x55\x10\xa4\xb7\x58\xe0\x5c\xf1\x54\xeb\xb7\x38\x49\x16\x50\xdd\x40\x3f\x99\x63\x39\x77\x1b\x6d\xc2\x90\xba\xdc\x4d\x76\x71\x4f\x71\x34\x27\xb7\x0a\xab\xbc\xd1\x18\x5c\x19\xe5\x3b\xc2\xf2\xf4\xdd\x09\xfa\x9f\x62\x8e\xa7\x83\xd3\xef\x87\xe3\xb3\xf3\xdb\xc1\x77\x17\xc3\xb3\x60\x3e\xf6\xc9\xc7\xf3\xdb\xdb\xfa\xaf\xdf\x9f\xdf\xd5\x7f\xbc\xbe\xba\xbe\xbf\x18\xdc\x35\xb5\x72\x71\x75\xf5\xc3\xfd\xf5\xf8\xfd\xe0\xfc\xe2\xfe\x66\xd8\xf0\xe9\xfd\x5d\xfb\xc3\xdb\x1f\xce\xaf\xaf\x87\x67\x6e\x55\xfe\x1e\x9c\x2e\x08\x4f\x82\xd0\xc1\xe6\x69\x54\x0f\xe0\x21\x2a\xbf\x78\x82\xee\xab\xb8\xab\x36\xc6\xc7\xe4\x61\x3e\x61\xa9\x79\x18\x84\x72\x8d\x18\x72\x9f\xeb\x45\x69\xfb\xd4\x78\x41\xa3\x39\x41\x09\xe7\x0f\x79\x66\x59\x9b\x49\xe6\x60\xdc\x18\x7e\x88\x0c\x5a\xfb\xfe\xfc\xee\xa4\x8e\xff\xea\x1b\x0b\x10\x1f\xdc\x19\x80\x71\x61\xc7\x4e\xc1\x96\x92\x09\xf2\x08\x87\xd5\x9b\x4a\x83\x1e\xfc\xce\x2c\xeb\xc7\xb4\x86\x99\xaa\x74\x13\xc7\xb6\x06\x9d\x9b\x58\xd0\x70\x79\x5f\x97\xad\xa6\x5f\x0e\x03\x78\x8f\x26\x24\xc2\xb9\xf1\x15\xeb\x7b\x4a\x08\x2e\xc2\x01\x17\xf4\xb0\xbb\x46\x2d\x1d\x35\x36\x58\xd9\x33\x3d\x71\xf9\x40\xb3\x8c\xc4\xef\xea\xf2\x4b\xb9\x58\x99\x84\xd3\xa7\xfb\x0c\xce\xa4\xd6\xeb\x41\xe7\x77\x68\xcd\x73\x8b\xaa\x4f\xa5\xf1\x87\x15\x1e\x42\x00\x22\xd4\x77\x82\x47\xd5\xa5\xe0\xbd\xc6\x0a\x3d\x11\x48\x09\xca\x2d\x5c\xbd\xd1\xbd\xf5\xd9\x86\xee\x8c\x27\xc3\xd5\x48\x29\xa5\x0a\xb5\x32\xe3\x5d\x08\xdc\xfa\x7b\x49\x9a\x18\xf1\x16\x79\x1d\x67\xa6\x51\xe0\xce\x2e\x94\x00\x46\xdc\xe2\x33\x72\xb7\x41\x83\x85\x7c\x89\x7c\x55\xbf\x91\x56\x5c\x16\x9a\x6d\x77\x19\x8f\xcb\x65\x2d\x01\x34\x76\x1f\x58\x09\xc4\x6f\xe5\x5a\xdd\xf1\x18\x2f\x34\x71\x40\x0c\x8f\xcc\xb3\x8c\x0b\x85\x5a\xda\x30\xde\x11\x33\x3e\xb8\x73\xec\x3c\x3c\x8f\x83\x46\xb4\x84\x21\x1b\x30\x94\xbb\xa5\xf7\xd9\x75\x2d\x18\x47\x08\x55\x02\x8a\xa0\x07\x5b\x4f\x4b\x2a\x75\x89\x42\x9b\x84\xdf\x6d\x22\xf7\x32\x7d\xc1\x77\xad\xfd\xd1\xd4\xfb\x95\x6b\xa1\x71\xcb\x13\x32\x55\xe3\x46\xaf\xcf\x12\x03\xa7\x6e\x91\xb5\x65\x44\xd3\xd9\x7c\x07\x2d\x76\xd7\x12\xbe\xb5\xfe\x52\xad\x1a\x04\x16\x02\xc1\xb9\x32\xf2\x69\xa1\xc3\x20\xb7\x9a\x60\x5e\xb0\x9d\xda\x58\x66\x2f\x04\x6a\x99\xff\x81\xf1\x27\xe6\x2d\xfb\xf2\x68\xc4\x86\x18\x8a\xf8\x79\x45\xc4\x85\x38\x83\x16\xb0\x52\xfe\x2f\x15\xe4\x7a\xd1\x20\x98\x76\x84\xb2\x82\xee\x6d\xf9\xd6\x64\x81\x8a\xa2\x6b\xa5\xef\xba\x9c\x1e\x63\xf5\x76\x22\xa0\x99\xb0\x2d\x17\xa4\x48\x66\x2d\xf3\x66\x9e\x85\x03\x15\xdc\xee\xba\xab\x23\xf4\x93\xb3\xfc\x40\x3c\x51\x51\xaf\x50\x99\x1b\x27\xc1\x0b\x07\x6a\xd4\xb4\xb0\xbb\xc0\x09\xda\x75\x84\xd1\xf2\x05\xf6\x80\x04\x0d\xab\x5c\x52\xc0\x19\x33\x16\xd9\x35\xc2\x29\x4f\xfd\x47\xb7\x64\x79\xbc\xf5\x7b\xa8\xfd\x63\x1d\xd6\x20\x74\xb0\x64\xf1\xbf\xcc\x66\x99\x4c\x0a\x87\xea\x6f\x6b\xb1\x58\x0f\xaa\x3e\x3f\xe0\x01\x34\x89\x16\x68\x4a\x93\x04\xe4\x80\x23\x34\x80\xd2\x79\x90\x88\xa0\xaf\x42\x17\xb5\x46\x67\x8c\xaf\x8a\xdd\x6e\x21\xa6\x28\x20\xa6\xdb\x76\x62\x92\x40\x4d\x45\x1e\xda\x6e\x28\x6a\x07\x39\xc9\x9a\xb7\xe0\x3a\xa2\x63\xf7\x4c\xe4\x35\x94\xf7\xd7\x08\x3a\xab\x0d\x37\xf8\xf0\x5f\xcd\x43\xff\x90\x63\x81\x99\x82\x50\x2a\x2b\xba\x0b\x12\x84\xf4\x92\x4f\x10\xac\xc8\x8c\x21\x18\x7e\x0a\x37\xd7\xb9\xfc\x67\x14\x12\x4f\xe2\x03\x44\x8f\xc8\xd1\x81\x2d\x28\x2e\xf3\x49\xf1\xe6\x5c\x4b\x0e\x23\x56\x0b\x11\x39\x42\x83\x44\x72\xfb\x05\x61\x51\x02\xa5\x2a\x83\xa8\x2f\x4f\xf9\xd6\xad\x34\x59\x80\x82\x02\x5b\x59\x34\xcf\xed\x83\xe0\xc3\x11\xc3\xd2\xf8\xc4\x13\x38\xe9\xc5\xef\x4d\xf5\x7d\x4b\x71\x12\xcf\x08\x47\x5c\xbb\x86\x9e\x6d\x93\x4c\x9d\x92\x65\x1b\x04\x6f\xc0\xc6\x14\xa1\x3b\x41\x06\x31\xfa\x12\x2b\x94\x10\x2c\x15\xfa\xe6\xab\xb5\x62\x43\xdc\x04\x0b\xee\x6a\x8f\x6f\x11\x80\xed\x22\x38\xdb\x8a\x94\x43\x1d\x29\x84\x11\x23\x4f\x61\xc0\x0e\x87\x18\xab\x47\x2a\x73\xa8\xfe\x19\xe4\x8c\x98\xfa\x8d\x26\xb3\x0c\x82\x60\x8d\xca\xd4\xc2\x47\x1c\x5c\x9f\x75\x9f\xda\x61\x35\x50\x96\x55\x9e\xa8\x51\xcf\x00\x52\xa2\x88\xa5\x9c\x63\x35\x62\x96\xb3\xba\xb0\x91\xa0\x52\xdb\x20\x49\xca\xf1\x8b\x18\x42\x74\x99\x9e\x30\xd4\x2e\x3d\xf2\x0b\x74\x09\xea\x97\x0f\x22\x2b\x17\x86\xf7\x87\x45\x6b\x6a\x23\xe6\xf3\xf5\xc3\xb6\x1b\xa5\x9d\x26\xfb\xf2\x0b\x0a\xc1\x0d\xdd\x5f\x98\x22\xb2\x1d\x84\x61\xd2\x34\xe4\x15\x07\xab\x6e\xd3\x5f\x22\x1b\xef\xba\x83\xee\xa2\x72\xb3\x7d\x1c\xae\xd9\x27\xde\x60\x6e\x6f\xd9\xdc\x40\xb6\xd8\x46\x01\xf7\xd1\x8c\x2f\xe5\xf1\x2d\x0d\xfd\x3c\x86\x5c\x8a\xd5\x5c\xb0\xc8\x4d\x70\xac\x03\x0c\xdd\x34\x0e\x42\xa5\x83\xc8\x4c\x08\xa5\x77\x8c\xcf\xbe\xd9\xe2\x79\xcd\xde\xf6\xf4\x0f\x8a\xf9\xbb\xa9\xf8\x20\xb8\xfa\xc4\xdb\x85\xbd\x41\xfc\x0f\x1c\x41\x00\x25\xf4\xe4\x42\x37\xeb\x80\x02\x0e\x86\x11\x83\x31\xbf\x51\x3c\xb4\xf5\xa0\x8f\xd0\x10\x2e\x1a\x57\x1e\x1a\x4f\x9d\x43\x22\x78\x79\xc4\xb4\x66\xe2\xf2\x8f\x83\xf6\xcb\x24\xde\x74\x02\x0c\x98\xc9\x56\xbe\x9c\x74\x35\xc6\x76\x9b\x36\xe1\xb0\x54\xa0\x0d\x80\xe5\x45\xc3\xd9\x09\x8a\x79\xf4\x40\xc4\xb1\x20\x31\x95\x27\xe0\x5b\x57\xad\x4e\xbd\x54\x6b\xdb\x5b\x4b\x1a\x6d\x81\x02\x2b\x72\x0d\x4e\x4d\xff\x36\x88\xde\x55\x33\x3b\x40\x74\x0a\xea\x84\x0b\x75\x35\x49\x36\x2e\x5d\x9b\x30\x25\x16\x19\xa7\x4c\x79\x53\x56\x65\x21\x9c\xa6\xa1\x85\xb6\xb6\x20\x6d\xb1\x8b\x18\x9c\x0d\xa7\x7d\x37\x27\x92\xb8\x80\x03\x33\x29\xc5\x91\xf1\xb2\x18\x76\x91\x61\x35\x97\x90\x11\x54\x5e\x03\xab\x74\xc1\xa7\x7a\x85\x70\x06\xf1\x0a\xc6\x4a\x51\x7c\xe4\xf3\x56\xa4\xa2\x49\x32\x62\x8c\x90\x58\x22\x48\xde\xf9\xa2\x31\xf3\x4c\x7f\x7a\x80\x70\x1c\xa3\xff\xfd\xe5\xfb\x8b\x9f\xef\x86\xe3\xf3\x4b\x30\x5a\x9f\x5f\x0c\xbf\x3a\xf0\x3f\x5e\xdd\xdf\xf9\x5f\x8d\x85\xe5\x91\x08\x94\xe2\x07\x50\xf1\x98\x34\xf2\x1f\x64\x77\x84\x23\x75\x39\x79\xfa\x89\x24\x2e\xd2\xd5\x8a\x29\x1e\x02\xc8\xee\x61\x6b\xb1\x42\x63\xf3\x5b\x43\xf9\xbd\xf1\x9f\x2c\xa7\x41\x47\x3c\xbe\x0b\x27\x06\xa6\x84\x41\x34\xb6\xb5\xf6\x15\xba\x6f\x41\x70\x84\xcd\x28\x6b\x8b\xc7\x23\xec\xf1\x39\x85\xf8\x1f\xc8\xe2\x47\xad\x5e\x5f\x63\x2a\x3a\xd3\xde\x90\x3d\x52\xc1\x19\x4c\xcd\x9b\xb5\xfc\x89\xd1\x7a\x3a\x96\xd5\x43\x25\x8d\x2c\x0c\x31\x1a\x59\x6b\xcc\x67\x13\x90\xc9\xab\x4f\xd7\xc2\x23\x90\x4f\x4a\xb8\xec\x4f\x8f\xc2\xe1\xa0\x08\xfc\x45\x53\xd0\xe0\x88\xdd\x5d\x9d\x5d\x9d\x20\x92\xe0\x09\x17\x90\x0d\x66\x42\x82\x5c\x13\x76\xc1\x22\x9e\x06\x0d\x95\x32\x7f\x0f\x50\x56\x64\xfe\x86\x46\xb4\x23\xd3\xc6\xaa\x2a\xc2\x5c\xd4\xf3\x66\x77\xab\x02\xda\xc9\x5e\x73\xd1\xe5\xfa\xd7\xaf\xc1\xd2\xf1\x4c\x2b\x72\x15\xce\x6b\xef\xe6\x29\xc1\xa6\x80\xa7\x71\x0b\x59\x5b\xbe\x0d\x60\x4d\x92\x52\x3d\x20\x7d\x70\xe4\x91\x75\xc1\x17\x6f\x72\x86\x7e\xf8\xab\x44\x93\x5c\x8d\x58\xb9\x0d\xce\xd0\xe0\xa7\x5b\xf4\x1d\x56\xd1\xfc\xab\x11\xbb\xd2\x6a\xe6\x0f\x7f\x6d\x81\x28\x58\x1b\x5d\x47\xaf\xc9\x19\x56\xf8\x82\xe3\x98\xb2\x59\x13\xb4\x4e\x81\x7f\x3e\xbc\x1b\x9c\xa0\x2b\xab\xc3\xfb\xac\xe2\x22\xd3\x2a\x68\x08\x18\x32\x4c\xc4\x71\x11\x60\xe5\xac\x0c\x3f\x62\x34\x33\xb8\xb0\x46\xec\xce\x60\x0a\x69\xae\x4a\x15\xca\xb8\xc5\xe0\xd7\x5a\x99\x41\x5b\x32\xa6\x6c\x6b\x49\xd4\xab\x03\x64\xec\x37\xc3\xca\x63\x20\xcf\xd4\x99\xfd\x88\x81\x82\xee\x33\x3d\x13\x1e\xe1\x04\x62\xf2\x0e\x03\x9b\x9e\x56\xdb\x79\x0e\x69\x77\x10\x0c\xc3\x16\xe5\xd0\x59\x9f\x09\xea\x85\xb2\x70\xa3\xc0\x00\x00\xfb\x68\xbd\xb1\x29\xd7\x1c\xc7\x60\x89\x80\xf1\x2d\x31\xab\xa3\x3f\xf4\xd8\x22\x66\x59\xf4\x53\xc7\x8f\xa0\xb0\xb1\x71\x2b\xe2\x08\xcc\xf7\x6c\x01\xe1\xdb\x00\x9a\xcd\x21\xf4\xa3\xe0\xce\x96\x28\x6b\xbb\xe8\xef\xc4\xe0\xb3\x11\x33\x91\x82\xa5\x7d\x09\xb3\xe2\x83\xde\x39\x83\x40\xc6\xe2\xba\xf4\x02\x46\x66\x03\x1b\xad\xac\x9f\x09\x72\x18\x13\x45\x44\x0a\xf6\x9e\x70\x4d\xf5\x0d\x7b\x84\x6e\x42\xf5\x3a\xe6\x51\x9e\x3a\x64\x40\x48\x4f\xb4\x11\x70\xf6\x12\xf5\x14\x62\x2e\xf6\x55\x14\x8f\x45\x34\xa7\x8a\x40\x56\x5e\x67\xfd\xd8\x10\xcc\x20\xfc\xb4\x2e\xa9\xb7\x0b\xbe\xc0\x3b\xb6\x8b\x5a\x33\x0d\x8d\xb3\x72\x4b\xa5\xd6\x56\x03\x9b\xad\x28\x74\x71\x59\xa0\x97\x71\x01\xc2\x16\xf9\x94\x71\x30\x72\x9b\x9c\x2a\x1e\x7f\x21\xd1\xf9\xb5\x96\x80\xb4\xc6\xeb\xcf\x60\x2e\x95\x09\x2e\x83\x74\x1d\xf3\xb5\x49\x17\x38\x40\x5f\x9b\x8a\xb3\x11\xfa\xe4\xfe\xf8\xcb\x7f\xfc\xc7\x9f\xff\xb2\x4e\x3a\x89\x53\xc8\xa1\xdd\x62\x8d\x7c\x39\x84\xb2\x48\x14\xee\x40\x9d\x53\x6d\xb1\x0b\xf6\x00\xb6\x2d\xff\x26\x28\x45\x41\xec\x10\x9e\xd9\x13\x2e\xc3\x93\x89\x4a\x47\xb3\x88\x24\x90\x44\x1d\x94\x39\x84\x17\x76\xad\x44\xff\xbf\x96\x80\x80\x8c\xf5\x51\xd9\x2c\xc6\x89\x26\x5e\xbc\xd6\x8d\xa0\x2f\xad\xfd\x4f\x81\x03\xf1\x2b\x77\xc1\xf1\x24\x26\xc2\x56\xab\x76\x26\x3b\x6f\x48\x04\xe6\x40\x3e\x65\x09\x8f\x1d\xbc\x97\x24\x19\x06\x01\x42\x33\x83\xa3\x11\x1b\xba\xe2\xc5\x06\x9e\xc2\x7c\x64\x3c\x2f\x53\x1c\x19\x54\x2b\x89\xbe\xfc\x74\xa2\x7f\x3b\x40\x8b\x13\x08\x22\x3d\x40\xbf\x9d\x58\x10\x02\x2c\xd4\x58\xff\xf4\x95\x93\xb5\x6d\x13\x30\x68\x2a\xd1\x17\xc7\x8f\x58\x98\x9a\x87\xc7\x66\x44\x5f\x58\xce\xea\xeb\xba\x84\xb2\x79\xc2\xf9\x83\x0d\xb0\xad\x7d\x78\xec\x00\x4d\x80\xbc\xbd\xdf\xc4\x6c\xbd\xcf\x77\x54\xe8\xd0\x96\x5e\x3e\xca\x26\xe8\xe8\x1f\x92\x33\x74\xb4\xc0\x69\x62\x7f\x75\x4f\x6d\xfc\x2f\x96\xc8\x15\xdf\x76\x41\x3e\xc9\xc2\x58\x4a\xbf\x4b\xf8\x04\x66\xf5\xd1\xcd\xd4\x44\xd0\xc2\x40\x8b\xdb\xa7\xb8\xb0\xec\x44\xac\x24\x65\x60\x19\x52\xae\xcc\x2b\xc0\xe3\x9a\x66\xf5\xc9\x0f\xe9\xbf\x8d\x5f\x18\x16\xc5\x25\xf1\x19\xe3\xb0\x8f\x5e\xd3\x8d\x7e\x42\x5f\x5a\x16\xf4\x95\xbe\x63\x6c\xb8\xb2\x59\x86\xa6\x0e\x16\xbe\x83\x9f\x83\x0e\x28\x43\x26\x2d\x73\xc9\x97\xbf\x1d\x1f\x1d\x1d\xf9\xaf\x2f\xf5\x54\xfe\x5f\x44\x95\x24\xc9\xd4\xb4\xe4\x6e\xb0\xc5\x88\x7d\x74\xc0\xc1\xce\x78\x5d\x40\x25\x41\xd1\xec\x88\x27\xe8\xb0\x30\xe8\xc6\x3c\x92\xe8\x0f\x5a\xac\x0d\x96\x12\x7e\xd4\x7a\x5c\x0b\x8c\x99\x41\x2a\x7c\xa1\x43\x65\x0d\xe2\xd5\x63\x15\xa2\xa3\x78\xc5\x16\xcb\x10\x85\x1a\x68\x41\x53\xce\xb1\x45\x50\x11\x42\xbf\x4c\x3e\x29\x78\xd4\x02\x50\xd3\x18\xca\xde\x7c\x53\xd6\xd8\x6d\x81\x53\x63\xc8\xba\x65\x01\x2c\x8c\x88\xe5\x0c\x66\x9e\x07\xa1\xfb\x44\x5f\x2e\x2c\x84\xb2\x95\x79\x9a\x62\xb1\x38\x2e\x4e\x5b\x9d\x38\x0b\x5c\x7a\xe0\x31\x89\x5b\x00\x70\xe1\x26\xf6\x68\xd9\x28\x06\x2b\x5e\xba\x1b\xcd\x9f\xdd\x08\x6a\xf1\x40\x40\x9e\xa9\x44\x45\x58\xc4\x63\x4b\xd7\x45\xf6\x69\x59\x62\xf1\xef\xd4\x65\x15\x17\x11\x23\x0b\x63\x1c\x53\x26\x33\xda\xbe\xe1\x3e\x6e\x61\xdf\x7c\x0c\x55\xdd\xc8\x6c\x0d\xf7\xe8\xf9\xd5\xad\xfb\xa6\xfb\xa5\x0b\xeb\x50\x16\xd9\xb1\xd3\x12\x9d\x45\x42\xe0\xa7\xe2\xfa\x85\xd8\x0e\x63\x9d\xc9\x7d\x6e\xae\xf9\xf7\x29\xbf\xa6\x89\xbe\xb5\x80\xc6\x8f\x46\xac\xf4\xf3\x01\x22\x09\x4d\x29\xf3\xb1\x75\x86\xb9\xf3\xa9\x91\x9e\x1f\xa8\xd2\x5b\x26\xe3\x07\xcd\xc1\x1c\x5c\x46\xa0\x52\x0d\xd8\xc2\x91\x8e\x77\x4c\x59\x0b\x44\x2e\xf5\xb8\x0a\x1d\x5d\x0b\xb3\xba\x89\x43\x2b\x90\xd2\x80\xf0\xe0\xfc\x8e\x98\x6e\xcd\x9d\xa5\x22\x5c\x38\x68\x2f\x68\xee\xd0\x01\xba\x06\x1c\x00\xfa\x28\xc5\xfc\x7a\xf9\xb7\x41\x40\x19\xb2\x3c\xdd\x36\xd9\xc4\x86\x0f\xbf\x96\x99\xee\x5a\x10\x77\x53\xd9\xc4\x25\xc2\xf2\xd4\x1d\xa8\x35\x28\x6e\x68\xc5\x9f\x98\x44\x09\x36\x00\x00\xba\x21\x88\x7c\x3c\x30\x0e\xd2\x2c\xe8\xcb\x5c\x2f\xa6\x1b\x83\x11\x9f\x10\xf6\xa5\xf9\xf7\x57\xc8\xde\x0d\x5f\x1f\xd8\xfb\x5c\x48\x87\x60\x69\xf7\x1c\x6a\x0c\x91\xd8\xd8\xd0\x01\xed\x6f\x86\x45\x6c\xac\xe5\xa1\x56\x61\x32\x78\xb5\xfc\xb5\xe0\x39\x7a\xa2\x72\x3e\x62\x77\xdc\x19\x1c\x11\xe3\x1e\x2f\xf1\x00\x94\xd1\x5a\x7f\x58\x02\x13\x80\x51\x37\x51\x80\x66\xc2\x5b\xe5\x1a\x41\x14\xec\x98\xf1\x98\x6c\x87\x0b\x71\x57\xf8\x2a\x9c\xff\x5a\x10\x93\x0f\x06\x37\x45\x5b\x3a\x2d\x91\x72\x4d\xdb\x7c\x75\xe3\xe1\x1e\xb2\xed\x40\x49\xbb\x27\xb6\x29\xe4\x8a\xbf\xd5\xa0\x15\xa7\x71\x06\xd9\xc0\xa5\xb5\xf7\x28\x84\xdb\x6e\x42\x54\x4e\x55\x59\xb9\x02\xfe\xea\x33\x73\x8f\x60\xd9\x7d\x80\x31\x46\x33\xc1\xf3\xcc\xa7\xcc\xbb\x74\x3f\xb3\x0d\x56\xa6\x39\x67\x53\x7e\x62\x75\xaa\x0b\xca\x1e\x0c\xc5\x3f\xd7\x1e\x19\xa0\x49\x12\x97\xd0\x71\x5c\x95\x31\x98\xc3\x21\xa2\x2c\x4a\x72\xb8\xf8\xa4\xc2\xd1\x83\x01\xcb\x6c\x33\xfa\xea\x6f\xc6\xab\x93\x29\x5b\x24\xa6\x3c\x49\x6c\xb7\xc5\x05\x5a\x94\x61\x7c\xa4\x18\x61\x74\x7f\x73\xde\xdc\xf7\x03\xad\x3b\x73\x9a\x6f\xcf\x32\x81\xc0\xff\xfc\x40\xd7\x8a\xbb\xac\xa0\x0d\x91\x12\xa9\x7b\xe3\x52\x1b\x96\x9d\x26\xd2\x0f\x58\x91\x6d\x33\xa1\x0c\xb4\xca\x1a\x91\x7a\x35\xcc\x9a\xa5\xd6\xe3\x2d\x01\x5f\x0a\xb0\x16\x08\x0d\x6a\x47\x9e\x09\x83\xb5\xe0\xe1\x1a\xd8\x0d\xf0\x7e\xb7\xf9\x54\xde\x5d\x31\x9d\xe5\xc3\x4c\x08\x59\x03\x6d\xe0\x56\xbf\xde\x71\x90\xa5\x57\x97\x8d\xf1\x09\x1b\xf4\x60\x27\xb1\x16\x96\xc0\x38\x2f\x15\x08\xee\x44\xd0\x8e\x1c\x8d\x78\x2d\x7d\x8e\x88\x1f\x89\x0b\xc3\xf1\xb2\x98\xeb\x77\x06\xbe\x2d\x5e\x02\x27\xf6\x16\xda\x06\xc2\x0f\xc4\xd6\x2d\xc3\x26\xb4\xf8\x35\x4e\x1b\x58\x74\xf3\x4e\x14\x1d\x9f\xd9\x8f\x3f\xea\x6f\x9b\x59\xd1\x47\xc8\xe2\xf3\xc0\x29\x29\x66\xfa\x64\xbb\x5e\x5b\x8c\x90\x46\x22\xdc\x68\x48\xf7\xd9\x46\x03\x32\x3d\x76\xac\xdb\x63\xbb\x72\xad\x3c\x19\x3b\x3c\x4e\x8c\x9d\x49\xcd\xc1\x04\x51\xe0\xdd\x6b\x8e\x56\x36\x45\x18\x6c\xfc\x04\x8b\x99\x51\x90\x24\x51\xf2\xab\x86\x1d\x2e\x72\x1e\xb6\xd8\xe1\x0d\x6a\x8a\x85\x7e\x4f\x10\xbf\x97\x9d\x34\x3f\xca\x32\x66\x9b\xbf\x95\x7d\x75\x3e\x2b\x34\x51\x19\x22\x6b\x45\x5c\x08\x40\x42\x8d\xf5\x59\x69\xc7\x4c\xd9\xb2\xb6\xe4\x25\x4e\x3d\x22\x80\xab\x70\x67\xf3\xbb\xcc\xe0\x26\x04\xe0\x06\xdb\xc7\xb0\x75\x11\xc9\x70\x08\xb6\xa8\x53\xdb\x08\x46\x6c\xe0\x5e\xf1\x59\xc5\xa0\xdb\x09\x23\x80\x43\x7c\xa8\x89\x86\x06\xfd\x0a\x17\xab\x6e\x27\xd7\x32\x89\x75\x93\x37\xab\x75\x30\xb5\x7e\xe7\x6f\x23\x8b\x78\xef\xa1\xd1\x96\x56\x1b\x78\x5c\xbf\x52\x71\x33\x30\x4b\x54\xad\x24\xdb\xd4\xf1\x6a\x5d\xca\x21\x46\xd8\x86\xc2\xe2\xb5\x26\x86\x34\x59\x14\x64\xaa\x57\xdc\xe8\xe4\x95\xce\xea\xa7\x55\x6d\xc5\x8d\x29\x4e\xc7\x82\xb7\x97\x63\xe8\xb0\x4c\xae\x89\x92\x7d\x67\x6e\x60\xa3\x17\xe8\xd7\x1c\x27\xe6\x72\x63\x96\x1c\xdd\xb0\x41\x54\xfe\xf6\x2f\x68\x00\xb7\x0f\xfa\x08\x7c\x11\x1c\xfc\xd0\x9a\xe2\x88\xa6\x19\x11\x92\x33\xdc\x5a\x97\xe4\xe1\xaf\x72\x6c\x31\xdf\xc7\x38\x8a\x78\x5e\xc7\x77\x5f\x63\x26\x0d\xad\x85\x93\xc2\xe8\x21\x9f\x10\xc1\x88\xa9\xbd\x02\xef\x21\xf7\x5e\xa7\xe1\x72\x9c\xab\xf9\xb7\xe3\x28\xa1\x9d\x81\xe8\x21\xbb\x68\xa0\x3f\x3b\x35\x5f\x2d\x9b\x40\xa9\xfd\xd2\xd0\x19\x32\xcf\x90\x79\x76\x84\xbe\xc3\xd1\x03\x61\x31\xca\x92\x7c\x46\x2d\x98\x00\xdc\x50\xc0\x2e\x03\xf3\x6c\x79\x62\x46\xb6\x30\xed\xeb\x6b\x68\xc4\x52\xfc\x60\xb0\x01\xad\x10\x19\xe1\x24\x59\xcb\xcc\xe0\xe9\xa1\x86\xaa\xe2\x32\xdf\x7d\x9d\x1b\x73\x3e\x94\x39\x1f\x60\x50\x05\x04\xc9\x9c\x21\x0c\xc0\x2c\x5f\x48\x94\x67\x4e\x02\x02\x4b\x5f\x02\x7e\x57\x33\x49\x28\x60\x4c\xb5\x1e\x34\x27\x23\x06\xb1\xac\xae\xc5\x85\xe7\x2a\xa1\xab\xdf\x87\x9c\x34\x1d\xbe\xa9\x81\x25\xd8\xce\x8b\x58\x03\xa0\x5c\x41\x09\x1d\xe3\x74\xd5\x9c\x30\x30\x40\x74\x6f\x19\x34\x9a\xee\x9b\x56\x8a\xc9\xb5\x82\xa6\xb7\x98\xfa\x25\xcc\x19\xb5\xa5\x0f\xac\x91\x3c\x08\x97\x73\x9e\xa4\xe2\x7b\x2a\x91\xc4\x8a\xca\x29\x6d\x34\xcc\x84\x60\x10\xdb\xac\x3a\x5e\x0f\x81\xa2\x01\x7d\xa2\xb2\x16\x3e\xee\xff\x08\xbd\x07\x3b\x53\x20\x7b\x73\x8f\xe5\xd0\xc6\x12\xd4\x9c\xb4\x82\x1a\xee\x22\x60\xc6\xcd\x20\x78\x7f\xa9\xf9\xd0\xe7\x78\x1c\xa1\x41\x61\xdf\x37\x68\x16\xc6\x72\xbf\x62\x46\x24\x91\x64\x13\xe2\xeb\x64\x0a\x03\x1f\x38\x10\x10\x02\x59\x45\xea\xdf\x0b\xe8\x5b\x3f\xcc\x27\x48\xa3\xc4\x0f\x84\x2d\xb3\x77\x74\x1f\xa1\x31\x48\x2d\x55\xba\xbd\xa5\x8b\x1b\x63\xd7\x26\x03\xec\x7e\xec\x0a\x00\x11\x3a\x3d\xd6\x4b\xae\x05\xfd\xe8\xc1\x26\x6f\x18\x7b\xa7\x85\x20\x79\x9a\x73\x19\x9e\x33\xb7\x7f\x46\x57\x14\x39\x71\x49\x1a\x90\xfc\xe2\x17\xd8\x44\xbd\x30\x1e\x22\x94\xc0\xa8\xfd\x21\x35\xb6\x5c\xbf\xdf\xc8\xb1\x50\x58\x06\xf0\x13\xb9\xa6\xea\xa7\xf9\x87\xbf\xca\x2b\x38\xb1\xbb\xc8\x85\x6f\x2e\xdc\xb5\x7d\x1c\xfa\x86\x16\x78\x1f\x61\x55\x54\xfd\xc2\xb1\x47\x6f\xc8\x78\x8c\x0a\xf2\x5a\xbf\xc4\xd7\xeb\x4f\xab\x52\x1a\xac\xd3\xdc\x56\x51\xf6\xc7\xc0\x4d\x8f\x26\x39\x35\x55\x36\x4b\x22\x97\xcd\x97\x04\xed\xd7\x5e\xff\x54\xfa\xfb\xa4\x99\xc6\xae\x79\xbc\x0d\x61\xad\x0f\x58\x57\xa7\xeb\x0e\x51\xbc\xb2\xa9\x2a\xe8\x92\x95\xc8\x78\x7b\xfc\x65\x3c\xee\x5e\x47\x13\x1c\xee\x93\x7c\x7a\x0b\xb0\xe8\x6d\x98\x10\x0e\x27\x6c\x4e\x7c\x92\x97\xde\x67\xdd\x8d\x4f\x39\x68\xdb\x14\xeb\xbf\x2d\xae\x7f\x8c\xfe\xef\xed\xd5\xe5\x61\x8a\x85\x9c\x63\xc8\xb9\x75\x6d\x1d\xb8\x52\x23\x46\x01\x75\x7e\x25\xca\x46\xec\x10\xcd\xf8\x81\xf1\x62\x9e\xa0\xb9\x52\x99\x3c\x39\x3e\x9e\x51\x35\xcf\x27\x47\x11\x4f\x8f\x8b\xa5\x39\xc6\x19\x3d\x9e\x24\x7c\x72\x2c\x08\xc4\xb1\x1e\x7e\x73\xf4\xed\x37\xb0\x33\xc7\x8f\xdf\x1c\x83\xef\xea\x68\xc6\xff\x70\xf1\xed\x7f\xfe\xf9\x2f\xba\xe1\x6c\xa1\xe6\x9c\x9d\x58\x17\xe9\xd2\xb6\x0f\x8d\xdc\x7b\x6c\x3e\xa9\xf4\xf2\x9f\x47\x5f\x87\xc3\xb0\xaf\xa6\x3c\x26\x89\x3c\x7e\xfc\x66\xec\x36\xe6\x28\x5b\xc7\xe9\x5b\xf0\x7b\xbf\xe2\x95\x1a\xb2\xfa\x77\x4f\x31\xce\xd4\xb7\x6a\x57\x1a\x8e\x4a\x18\xa5\xbc\xc5\x81\x79\x20\x35\x3f\xf8\x1a\x0a\x98\x17\xa4\x5a\x54\xfa\x75\xc1\xbd\x5b\x45\x9b\xb5\x92\x32\xc1\xeb\x4c\x23\x00\x8e\x35\x26\x88\x0c\xd3\xa6\xe8\x36\x1b\x5d\xb1\xcd\xfa\x3d\x27\x04\xf2\xae\xb1\x8f\xed\x74\x37\xc4\x3d\x4e\xcc\xd7\x2e\x16\x84\x3f\x39\xbc\xe3\x5d\xa0\x04\x77\xac\xc7\xe4\xc1\x4f\x0d\xf1\xc0\x58\xdc\xb8\x5a\x86\x31\xc7\x72\xb3\xa0\xa2\x81\x81\x18\xf3\x7e\x01\x5f\x45\xd2\x76\xe8\x58\xa5\xcb\xda\x86\x62\x7f\x16\x1c\x26\x33\x55\xca\xe5\x11\x7a\x5f\x29\x58\x53\x04\x4a\xdd\xbc\x3f\x45\xdf\xfc\xf5\x3f\xff\x3c\x62\x5f\x36\x70\x31\x88\xdc\xe0\x62\x66\xe3\xb6\x80\x77\xa5\x58\x2a\x22\x8e\xc5\x34\x3a\x36\x81\x20\xc7\xfa\xfb\x43\xdb\xe9\x21\x9f\x1e\x7a\x08\xd4\x43\x8b\x06\x79\x94\xc6\xeb\x25\x34\x97\x48\xcf\x84\x4d\xd9\x80\x6b\x09\xc1\xd9\x06\xfa\x84\x4f\x3d\xd8\xb5\x89\xab\x37\xb8\xf8\x7c\xda\xf0\x07\xd4\x76\xfd\xca\x03\x2e\x61\xe9\xfa\x28\x10\x50\xda\x8f\xe6\x6e\xd0\x90\x1d\x89\x3c\xa7\xda\xe6\x78\x49\x28\x9c\xad\xb3\xf0\xcd\x87\xad\x08\x7b\x37\xf9\xdf\xb6\x38\xa8\x41\x93\xe5\x8c\xf0\x29\x44\x0d\x81\x5c\xe0\xbc\xa2\x60\x1b\x62\x5c\x05\xb9\xde\x82\x64\xe6\x82\x09\x8b\x89\x36\x2c\xf7\x96\x88\xca\xab\xd6\xf9\x39\x10\x95\xb7\x5d\x77\xcb\x50\x5e\x69\xc1\xb7\x0d\x5d\x32\x47\x69\x1d\x2f\xae\x7e\x7f\xa5\xc7\xc6\xf3\x01\x70\xd1\x84\xf5\x3b\x0d\xb6\x11\x24\x2b\x90\x43\xc5\x0f\x01\x24\x03\xa0\x17\x0c\xc6\x79\x9b\x1b\x17\x3c\x5d\xeb\x5c\x93\xfa\xfd\x0e\xe3\x34\xee\xcf\x4f\xc1\x40\xad\x4c\x62\xab\x65\xdb\x10\x10\xca\x18\x11\xd6\x86\xbf\xf2\x46\x5d\xd3\x0f\x16\x6e\xe5\xf2\x08\x90\x42\x2e\x0f\xf1\xa7\x7d\xfc\x2f\x0e\x98\xc0\x11\x82\x2c\x8c\x39\x4f\xb9\x16\x67\x78\x2e\x83\x87\x26\x8b\x07\x2e\xe1\x56\xd9\x2b\xc5\x99\x01\xc5\x7a\xbd\xd9\xe8\xa3\xa5\x1f\x19\x13\x47\xf8\xd2\x5a\x90\xfe\x93\x32\x88\xf9\x8a\xf1\x7b\xf4\xe9\xe5\x74\x03\x5e\xd6\x14\x4c\xca\x50\xf1\xcb\x62\xca\xd2\xdf\xb4\x06\xa3\x49\xca\x67\xcc\xf8\x9b\xdb\x04\x05\x18\xec\xb7\x10\x5e\xd2\x49\xf3\xad\xd9\x99\x79\xba\xe6\x1e\xf8\xa0\xc6\x2e\x1b\x80\x99\x09\xf3\x73\xf1\x7d\x87\x8d\x01\x7e\x6d\xe7\xd2\xd5\xd7\x8a\xc7\x0e\x9f\x70\xbd\xa1\xde\xfa\x06\x2c\x14\x61\x7d\xdc\x05\xbc\x0b\x44\x83\x9a\x35\x36\x0c\xc1\xc9\x16\x2d\x4e\x7e\xb6\xfe\x61\x84\x82\x0e\xeb\xac\x1d\x74\x62\x88\xb3\xb6\x82\xc1\x59\x68\x5b\xc0\xf5\x0c\x0e\xcb\xf4\xf7\xa6\xf0\x61\x83\x88\x55\x64\x0b\xe8\x51\xd6\x94\x47\xff\xe1\x63\x51\x4c\x70\x91\x91\x03\x34\xc9\xe1\xf9\xe5\xd5\x5d\xe8\x1d\xfe\xff\xd8\x7b\xb7\xe6\x36\x72\x24\x6d\xf8\x7e\x7e\x05\x22\xbe\x0b\xdb\x5f\x50\xf4\x1c\x62\x23\x36\x3a\x62\x2f\xd8\x92\x3c\xcd\x19\x59\xd2\xe8\xd0\xee\x7d\x97\x1b\x34\x58\x05\x92\x58\x15\x01\xba\x0e\x92\xb9\x3b\xf3\xdf\xdf\x40\x66\xe2\x50\x47\x56\x91\x94\xdb\x3b\x6f\x5f\x74\xdb\x96\x48\x14\x0a\x87\x44\x22\xf3\xc9\xe7\x91\xf8\xb6\x67\xd1\x5a\x44\x4f\x50\x38\x88\x47\x1e\x6e\x06\x2b\x24\xb9\xd8\xcd\x94\x97\x1a\xca\xb5\x4d\x75\xee\x1c\xfb\xb2\x63\x20\xd7\x29\x8b\x65\xb6\x4d\xf8\x0e\x92\x4a\x0a\x71\xc1\x3e\x21\xe5\x00\xf5\xc6\x14\xec\x8b\x9e\xf5\x9f\x69\x33\x2b\x5e\x22\x7f\xf0\x58\xf2\x74\x21\xf3\x94\xa7\x3b\xe6\x07\xb3\x6e\x0f\x58\x26\x36\x5c\xe5\x32\x9a\xa9\x8d\xe0\x2a\x44\x01\x51\x52\xcd\x0c\x72\xac\x05\xf1\x93\x2e\x97\x22\xca\x3d\xc1\x19\x38\xef\x6e\xa4\xf6\xed\xc1\x61\xef\xee\x76\x5e\xe7\xab\xff\x24\x15\x96\xd3\xca\x0d\x60\xcc\x68\x0d\xd1\xd1\x78\x60\x28\x1b\xa4\xa9\xe8\xc8\xb5\x97\x41\xf8\x97\x5d\x53\x4e\xdf\xdb\x15\x1c\x35\xf9\xf8\x47\xd3\x93\x1f\x27\xe2\xd6\x2c\x7f\x17\x20\x4f\x70\x83\x85\xe0\x15\x47\x34\xa2\x2a\x8c\x21\x6f\xa8\x04\x0a\xa2\x3d\x6f\x08\xfe\xfe\x06\x8e\x69\x73\x7b\x4c\x9f\x45\x3c\x53\x65\x1a\x17\xf2\x19\xfd\x86\x63\x5e\x78\xe7\x34\xd6\xc6\x8e\x71\xaf\xc8\xe6\x25\x94\xae\x7b\xd2\x3a\x57\xe4\xd3\x21\x04\xd4\xac\x1c\xfd\x0a\x1a\x33\xbd\x43\xde\x5e\x9b\x87\x84\x35\x48\x87\xab\x94\x5d\x76\x8b\xd2\x91\x54\x20\x83\x95\x03\xdc\x51\x31\x44\xad\xe2\xb7\xa9\x8d\x99\xb2\xd5\x9b\xcb\x22\x41\x56\xc2\x36\x69\x22\xe2\xac\xb1\x48\xf3\x5f\xaf\xe2\xc0\xc5\xd5\x58\xa0\x65\xe4\x92\xc0\x01\xf8\xd1\x49\xf9\xc3\xd2\x15\x2a\x43\x5d\x41\x2b\x63\x02\x05\xd8\x2b\x91\xc3\x69\x1e\x17\x09\x16\x23\x42\x7a\x1f\xf8\x6f\x78\x92\x30\x99\x67\x33\xe5\xe8\x7a\x90\x7c\x19\x2c\xac\x05\x2e\xc6\x74\xe5\x82\x47\x40\xb3\x24\xc1\x0a\x7e\x98\x8c\x64\x5e\x83\x8c\xee\x42\xea\xff\xed\x56\x70\xac\x9d\xc1\x69\x9b\xa9\xf0\xce\x55\x9d\x04\x2a\x34\x01\xa9\xc9\x53\xd4\x7c\x74\x20\x80\x41\x9f\x73\xf0\x94\x8c\xd9\x04\xdf\xce\x5c\xb8\xac\xaa\x1f\xf6\x96\xea\x75\x09\xd9\x65\x6e\x35\x79\xe6\x04\xee\xdd\xbd\x75\xcb\xd3\x5c\x46\x45\xc2\xd3\x04\x38\xb0\x97\x45\xc2\xe4\x32\x10\x28\x84\x39\x40\xb2\x16\x33\x5d\x91\x86\xb3\xda\x66\x84\x32\xbe\x11\x41\x9d\x28\x85\x77\x92\x20\xa3\x8c\x0c\xb4\x98\xaa\x34\x6d\xbd\x1b\xb3\x8b\xaa\x50\x28\xec\x89\x80\xe4\x4d\x66\x68\xfe\x5c\x7f\x83\x12\x27\x14\x1c\x95\x4b\x73\xa5\x7c\x13\xec\xba\x36\xc9\x6d\x9e\x3d\x0d\x4c\x57\x5b\xaa\xf0\x6e\x94\x62\x63\x89\xe3\x03\xc8\x32\x97\x92\xd8\x6e\x43\xb4\x74\xd0\x9e\x0a\x03\x3b\x19\x12\xe4\x1d\xd0\xd1\x4f\x81\xee\x71\xb5\xb3\x9b\x0e\x3d\x44\x98\xc7\x81\x5d\x0d\xd4\x45\x86\x77\x34\x58\x39\x21\x38\xa1\xcf\xc8\xae\x78\x3e\x14\xa9\xe0\xc0\xff\xc3\x3b\xda\x88\x0a\x69\xed\xe6\xfe\x48\xd3\xa7\x92\x1c\x09\x33\xbd\x32\xb7\x7c\x81\xa8\x1b\xbd\x0c\x4c\x30\x9d\x37\xa4\x5b\x02\x54\xd0\xce\x26\x2c\x04\x4b\xa4\x7a\xb2\x85\xdf\x66\x81\x8e\x18\xf7\xad\x83\x8d\xc0\x41\xc6\x3d\xd7\xe2\x79\x35\x11\xa7\x1f\xe1\x8c\xf5\x2b\x9f\x6a\xbe\x21\xdb\x9e\x0c\xe2\xc6\xb7\x2f\xdc\xf4\x1e\xfd\xa7\xa5\x13\xe7\xe9\xee\x3c\x16\xdc\x89\xc7\x60\x80\x38\x0b\xc4\xad\x5b\xc7\xf7\x76\x5d\x46\x30\x0d\x90\x19\x79\xbc\xbe\xb8\xfc\x30\xbd\x2e\x6b\x83\xfc\xed\xf1\xf2\xb1\xfc\x93\xbb\xc7\xeb\xeb\xe9\xf5\x9f\xc3\x1f\xdd\x3f\x9e\x9f\x5f\x5e\x5e\x94\x3f\xf7\x61\x32\xbd\xaa\x7c\xce\xfc\xa8\xfc\xa1\xc9\x8f\x37\x77\x15\x35\x12\x2b\x25\x12\xfc\xe8\x61\xfa\xf1\xf2\x62\x7e\xf3\x58\x12\x34\xb9\xf8\xf7\xeb\xc9\xc7\xe9\xf9\xbc\xa1\x3f\x77\x97\xe7\x37\x3f\x5f\xde\xed\xd1\x23\xf1\xef\xdb\x38\xa4\xa7\x80\x9e\x1c\xac\x4e\x33\x61\xcb\x54\x0a\x15\x27\x3b\x44\xc6\xda\x7b\x60\x05\x88\x17\x9e\x54\x72\x23\x74\x71\x0c\xc0\xf5\x61\x2d\x98\x7e\x16\x29\xd4\xa8\x63\x6b\x54\xd0\xc6\xb3\xa7\x56\x06\xb3\x3c\xad\xc7\xd0\x3b\x71\xfc\x79\xba\x73\x95\x22\x5d\xdd\xf1\xfc\x26\xf4\x10\xb6\x15\x69\x57\x5f\xc0\x8f\x48\x8b\x6d\x2e\x17\xed\x90\xe5\x9e\xbc\x1f\xc3\x6f\xaa\xc8\xc6\xd5\x4c\x5d\x70\xdd\x6c\x18\x4b\xc8\xdd\x63\x40\x8b\xd0\xc2\xa1\xa2\x4b\xee\xdb\x16\xe8\xb5\x2d\x16\x89\x8c\x98\x8c\xab\xd1\x07\x2c\x30\xc1\x00\x6b\x95\xb4\x6f\x2b\x52\x70\xec\x8c\xbf\xbc\x4d\xc5\x19\x2f\xf2\xb5\xd5\x83\x76\x75\x46\x48\xa2\x27\xa2\x54\xe4\x81\x76\x39\xa9\xed\x04\x4f\x82\xce\x50\x7d\x65\x0c\x54\x0e\xe3\x80\x40\xb9\x25\xa2\x8e\xdf\xc4\xd6\x07\x84\x14\xf1\xf3\x9d\x43\x43\x3d\x96\x59\x55\x6a\x15\x5c\x58\xfc\xa5\xd5\xec\x31\xef\x6d\x2c\xb5\xd3\xac\xc1\x49\xb6\xc8\xea\xe6\xd7\xd8\xb7\xc6\xc2\x85\x52\x06\x42\x53\xeb\xf4\xab\xf3\x54\xc0\x21\x42\x89\x73\x7b\xdb\x07\xa0\x07\x21\xb1\x01\x80\x6d\x2e\x36\x0b\xb1\xe6\xc9\x12\x63\x78\x66\x6a\xfc\xbe\xaa\x2f\xd1\x07\xfd\x24\xd4\x1d\x4e\xd8\xaf\x62\x0e\x15\xde\x13\x7c\xc5\xad\x8b\x9f\xf8\x80\x9f\xe9\xa3\x5d\x55\xb6\x12\x05\x25\xcb\xd1\xab\x0e\x7e\x8d\x70\x70\xcf\xa7\x69\x8b\x58\x96\x4b\xf9\xd5\x34\x38\x53\xa2\x91\x51\x10\xd0\x35\x96\xfb\xc4\xd9\x65\x60\xd4\x42\x02\x89\x27\xa1\x40\xed\x07\xc5\x40\xf7\xae\xd9\x61\xd1\xe6\xfa\x5c\x74\x84\xbf\x21\x42\x26\x4b\x22\x48\x61\x4e\xc4\x8e\x13\x94\x9c\x3d\x89\x31\xbb\xa0\xb2\x78\xf3\x93\xf3\xab\xe9\xe5\xf5\xc3\xfc\xfc\xee\xf2\xe2\xf2\xfa\x61\x3a\xb9\xba\xef\xbb\xfd\x4e\x51\xb5\x50\xd9\x7d\xd5\xc2\x11\x67\x21\xde\xd3\xce\xf3\xc5\x73\xee\xa5\xfc\xb6\x83\x29\xd9\xdf\x7b\x19\x6f\xe7\xb1\xcc\x22\x73\xfc\xed\xe6\x42\xc5\x40\xc5\x7a\xd0\x52\x6d\x6e\xaa\xfa\x16\xee\x13\xcc\x7d\xc2\x5a\x10\x3c\xed\x9e\xed\x8a\x76\xbf\x07\xae\x36\x08\xda\xa5\xc2\x6c\xfe\x78\xa6\x82\xd3\x66\xbc\x9f\x7f\xdf\x34\x77\xdc\xbb\x95\x9b\xa8\xbe\x13\xf6\x57\x66\x59\xc1\x8d\x7d\xb4\x1f\x03\x36\x86\x96\x51\x21\x7e\xac\x90\x0f\x56\x06\x5a\x86\xcc\xdc\xe4\x37\x5c\xc5\x3c\xd7\xe9\xae\xe5\x15\xfb\x19\xcf\x70\xdb\x94\x4d\x68\x78\x64\x2b\x21\x62\x3b\x0b\xf8\x51\xae\xaa\x4b\x09\x59\x63\x1f\x6e\xfe\x7a\x79\x7d\x3f\xbf\xbc\xfe\x79\x7e\x7b\x77\xf9\x61\xfa\x8b\xa3\xbe\xd9\xf2\xac\x49\xbb\x6c\x9b\x0a\x63\x5d\x6c\x11\x7e\xa3\x7d\x41\x41\x31\xdb\x0e\x89\xc8\xc8\xe5\x4c\x59\xcb\x92\xfa\xe6\xd7\xa9\x2e\x56\xeb\xe6\x86\xaa\xbd\xbc\x9d\x3c\xfc\x74\x50\x37\x81\x22\x05\x55\x87\x70\xb7\xd5\x79\x04\xe5\x92\xec\x1e\x92\x0f\x56\xba\x07\x44\x3f\xf0\xd1\xa6\x98\x7c\x8b\x45\x3b\xe8\xf6\x52\x37\x5a\x9d\xce\x7f\xc3\xc7\xdb\x16\xd0\x43\x60\x37\x4b\xc7\x08\x20\x58\x51\xbc\xae\xd6\xda\x0f\x0d\x3f\x2b\x9d\x60\x7f\x3c\x4b\xc4\x6a\x25\x62\x5c\x5e\xd5\x86\x29\x62\x45\x26\x30\xf2\xe7\x7a\xd3\x28\x92\xbc\xd4\x11\x07\xb3\x43\x47\xf5\x37\xe0\xb7\xee\x2b\xcd\xb6\xe2\xdc\x4a\xd8\x46\x5a\x65\x39\x57\x2d\x69\xd7\xe7\x3a\x9e\xb1\x97\x29\xba\x49\x99\x2b\x9c\xa0\x00\x89\x0d\xb0\xfb\x7d\x70\x48\xc2\x89\x64\xb4\x14\x45\x3c\x02\x79\xad\x40\x73\xb7\x61\x12\x20\xd2\x78\x67\x2d\xe2\xeb\x07\x37\x3a\xaf\x4e\xc4\x0b\x03\x81\x51\xd4\x31\x21\xca\x52\x8c\x06\x81\x38\x50\x2b\x8c\x76\xd0\x84\x54\x9e\xfc\x33\x0d\x3d\xde\x5a\xcb\x81\x59\x6e\x99\x97\xdc\x04\x39\xe7\x6d\x78\x7c\xab\xe4\x87\xfb\x96\xb7\xa9\x8e\x8b\xc8\x72\x53\x40\xb3\x1e\x0f\x42\x01\x2d\x7b\xc0\xc6\xec\xcc\x4c\x33\x5d\x52\x44\x7c\x06\x0c\x1f\x33\xd5\x96\x7c\xb1\x36\xa0\x25\xcc\x75\x6b\x4f\xad\x63\xe6\xbe\x61\xf4\xdb\xb7\xa0\x1d\xec\x7e\xf5\x67\xcc\x7e\x1c\x9c\xbd\x16\x38\x0d\xcd\xcb\x82\x63\x66\xb5\x7c\x1c\xb7\x95\xa2\x3b\xab\x3a\x0c\xf5\xd3\x0f\x34\x51\xa6\x76\xc2\x23\x72\xcd\x33\xf4\x5c\xf3\x68\x5d\xee\x38\xbc\x4d\x99\xbe\xa9\xda\x5d\xe7\x09\x1e\x17\x21\xe8\x95\x5f\x19\xe1\x9d\x5a\x66\xd4\xfb\x50\x8a\xc7\xe9\x8a\x0d\x5b\xf8\xa1\x73\xe4\x2e\x2f\x68\xf7\xc0\x60\x25\xbc\x50\xd1\x9a\x6d\x13\x8e\x35\x97\x6b\x9e\xe1\x92\xb6\x20\x03\xbe\x90\x89\xcc\x81\x2e\x02\x73\x5f\x95\x11\x36\x37\x1a\x9e\x3e\x59\x86\x46\xee\xb9\x41\xba\x16\xfd\x91\x60\x4e\x2f\x5f\xfd\x2d\xe1\x9c\x7e\xcb\x06\xdf\xe8\xcc\x9c\xf9\x65\x49\x50\x4e\x3f\x1d\xc6\xe2\xc1\xb2\xf4\xef\x32\x6c\x66\xa9\xc5\xdb\xea\xd7\x4b\xe3\xdd\x70\x50\x0f\x87\x32\x10\xf5\xf0\x00\x33\x5f\x25\x26\x6e\xdc\x59\xcb\x44\xf3\x16\x71\x4c\xdb\x36\xf2\x0c\xb7\xb5\x1d\xeb\x62\xd1\xc6\x6c\x89\xbd\xea\x6e\xbd\x2b\xee\x6f\xf7\xed\xa9\xe2\x82\xa1\x01\xe4\xb9\xc8\xe5\xb0\xd0\x46\xf0\xd2\x3c\x17\x67\xf0\xf5\xe6\xc6\x89\xf5\xa7\xf7\x3b\xd7\x16\x9a\x67\xbb\x77\xfc\x99\x00\x32\xab\xaf\xae\xbf\x15\xdc\x98\x86\x9b\xe5\x3d\xf2\x17\x1c\xb3\xc8\x72\x59\x5f\x61\xcd\x3b\xb1\xfa\xd4\x87\x72\x52\x25\x5c\x03\xbd\x6b\xd7\x9a\xde\xe6\xde\x7c\xbb\xff\x86\x2c\x2b\x48\x6f\x53\xa9\x81\x65\x80\x74\xab\x3b\x28\xc0\x1a\x9f\x7b\xc4\x48\x7e\x29\x44\x21\xcc\xda\x5f\x14\xf1\xaa\x1e\xdb\x1c\xe0\x9d\xf9\x57\x5a\xeb\x17\xb6\x29\xa2\x35\xb3\x8d\xb3\x58\x24\x7c\x57\x7a\x35\xf0\x97\x72\x9d\x00\xa9\xe6\x81\x0c\x7f\x51\x91\xe5\x7a\x03\x20\x4c\xdf\x6e\x5a\x28\x58\xf0\x8c\xe7\x79\x2a\x17\x45\xde\x08\xd8\x2a\x31\xfe\x1c\x98\xd0\xba\xbf\xbd\x3c\x9f\x7e\x98\x56\xb2\x49\x93\xfb\xbf\x86\xff\xfe\x74\x73\xf7\xd7\x0f\x57\x37\x9f\xc2\x9f\x5d\x4d\x1e\xaf\xcf\x7f\x9a\xdf\x5e\x4d\xae\x4b\x39\xa7\xc9\xc3\xe4\xfe\xf2\x61\x4f\x5a\xa9\xfe\xd4\xf6\x89\xe0\x01\x21\x91\x85\x85\x5a\x66\x56\x7b\xbb\xa4\xa7\xfe\xc0\x26\x96\x9e\xa9\x44\x20\x66\x53\x83\x90\x79\x47\x9d\x52\xca\x20\x5e\xf0\x9c\x93\xee\xf3\x98\x4d\x98\xd5\xef\x06\x30\x74\x66\x9c\x05\xe2\xae\x31\xb3\x83\x4d\x18\x8f\x21\xf2\x37\x37\x2f\x3d\xa5\x97\xc4\x1a\x95\x88\x90\xa4\xd8\x56\xfe\xcc\xd4\xe5\xb3\x50\x79\x01\x0c\xaa\x3c\x49\xac\xce\xba\xfd\x40\x50\xe3\x69\x7b\x99\xc9\x8d\x4c\x78\xea\x55\x82\x6e\xa8\x2d\x70\xd8\x6d\x5f\x1d\xa5\x47\x5d\x3a\xc2\x5e\x1e\x1e\xa7\x0c\xfa\x7d\x7e\x35\x05\x17\x28\xca\x2d\x05\xbe\x7d\xf8\x4c\x21\x2b\x11\x3d\x71\xc3\x01\xa0\x9f\x6b\x8a\xa7\xe1\xe3\xe9\xc3\xed\x0b\x31\x3b\x66\x13\xdb\xc8\xf3\x6b\x81\x80\x5c\x27\xed\x5f\x2e\x55\x9e\xee\x7a\xfb\x35\x0f\xc0\xa1\x9a\x81\x6f\x4a\x78\x9f\xb2\x72\x10\x86\x3b\x98\x6d\xfd\x1a\x9c\x1d\x0b\x46\xa3\x68\xbc\x0b\xba\x0b\xe0\x69\x6d\xf1\xbf\x13\x73\x08\x7d\xaf\xe3\x10\x52\x28\xc0\x28\x2c\x74\xa1\xe2\x8c\x90\x49\x1b\xa9\xde\x6f\xf8\xd7\x77\xf6\x4d\xb1\x24\xd9\xf1\x77\x03\xdd\x8c\x48\xcc\x4d\x64\x67\x8c\x5c\xf7\x70\xcd\x54\xc7\x78\xed\xf7\x16\xad\x65\x85\x6b\x8f\xbf\xa3\x22\xc6\xea\x59\xec\x9a\xe6\xaf\xa6\xc1\x80\x38\x2e\xda\xf0\xd0\xc8\x36\x15\xe6\x83\x0e\xc0\x95\x20\x2e\xcf\xfd\x1b\x80\xda\x25\x9d\xa8\x66\xdb\x1d\x66\x79\x8f\xda\x36\x8d\xf9\xe5\x57\x10\xd1\xa0\x27\x99\x39\xc3\x6c\xb3\x0d\x74\x12\x30\x9d\xd2\x68\x66\xb2\xfe\x4b\x2f\xd8\x12\xaa\x34\x48\x07\x36\x15\x10\xd8\x86\xa9\xb0\xac\xaf\x40\x4a\x52\x4b\x61\xdb\x25\x90\x88\x0c\xc2\xbd\xca\x5c\xb7\xc4\x97\x82\x32\x76\x7f\xf8\xfd\xb0\x73\x36\x4f\x77\xcc\x32\x8c\x87\x55\x22\x54\x24\x45\x67\x2e\xf4\xab\x50\xb2\x89\xa9\xe8\xae\x50\xe6\x28\x3e\x05\xd8\xa1\x7f\x36\xab\xf2\x50\xfa\xe7\xde\x42\x0a\x1b\x88\x4d\xf1\xf3\xaf\x46\xed\xf6\x73\x85\xd1\x8d\x1e\x07\xb0\x5d\x6a\x3d\x3c\xd0\x16\x3c\x7a\x7a\xe1\x69\x8c\xb1\x42\x40\x1f\x8c\xd9\x4f\xfa\x45\x3c\x8b\x74\xc4\x22\x91\xe6\x9c\xc8\x5e\x32\x48\xbf\xc2\x86\xa2\x76\x66\x0a\x50\xec\xc8\x9c\xa3\x40\x42\x37\x97\xab\xb5\xb9\x4f\x06\xc9\x73\x9d\x1a\x73\x94\x23\x93\xd6\x56\x44\x44\xaf\xd1\x32\x00\xcb\x84\x3f\xd7\xd9\x6b\x0e\xa9\x84\x67\x53\x57\x8a\x67\xb3\x53\x96\x49\xbb\x0b\xee\x40\x03\x46\x46\x13\x09\x11\x46\x6c\xa5\x13\xae\x56\xe3\xf1\x98\x89\x3c\x1a\xbf\x1b\xb4\xd0\xa9\xc1\x30\xdf\xe5\x20\xa8\x89\xd6\x99\x48\x76\x8e\x12\xc2\x15\x09\x98\x61\x86\x1a\x91\x4c\x62\xc8\xa3\x61\xf9\xdf\x57\x2b\xea\xbf\x6d\xe8\xbc\xf9\xa6\x3a\xb8\x04\xad\xa5\x1d\x10\xe6\x18\xd0\x12\x7e\xbe\xf9\xe6\x75\x50\x49\x65\x0b\xeb\xa3\x56\x43\xeb\x04\x7f\xd6\x6d\x32\xb3\x07\x31\x35\x35\xb6\x44\x44\x0e\x07\xd5\x56\xb5\x45\x2c\x2a\xe5\x6e\x47\x54\xba\x75\x14\xad\x0d\xac\x57\x6b\xd8\x77\x0d\xdb\xa2\x32\xdd\x83\xb7\xc5\x7e\xae\xf0\xc6\x17\x1a\x58\x0f\xe8\x0b\x77\x87\xb8\x4e\x58\x52\x94\xec\xe0\xc6\xe5\xaa\x03\x21\xb2\x1c\x07\x91\xf1\x52\xe0\x1f\xea\x54\x7c\xe6\xc0\x71\x81\x07\x89\x82\x2c\xd7\x29\x5f\x09\xb6\x11\xb1\x2c\x36\x8d\xc6\xc6\x75\xf7\x18\xb4\x97\x4e\x8a\x4d\x3b\xf1\xd3\xb1\x0e\xb4\xef\x24\xfe\xed\x1c\x1e\xd7\xdb\x81\xf6\x82\xca\x56\xb2\x81\xfa\x8b\x61\x70\x1a\x6b\x73\x52\xa6\x32\x03\x8a\xb2\x43\xca\xc2\x5c\x33\xd8\x34\x64\xeb\x76\x5b\x0c\xbf\x96\x66\xf7\xcc\x66\x77\xe8\x2b\x19\xce\x2a\xa4\xf8\xda\x0f\x85\x2a\x86\x6c\xf0\x1c\x81\x20\xc0\x41\x79\x4d\x70\x1b\x03\x6a\x5e\x02\xb9\x40\x83\x94\x89\xcf\x35\x5b\xda\x42\xa3\x27\x11\x48\x18\xc6\x40\xda\xfb\x82\x3c\x20\x7f\xfd\xd7\xcc\xe6\xec\x09\x56\xe1\x3d\x96\xdc\x3f\x04\x73\x03\xcf\x7f\xb0\x68\x1a\x7c\x43\x6c\x02\x54\x81\x62\xae\xf2\xc6\x06\x3c\xd8\x0c\xda\xc2\xaf\xfc\xcc\x8b\xa4\xf9\xe3\xd4\x3e\x7c\x14\x05\x40\x26\x9f\xee\x19\x0e\x35\xd1\xbb\xa6\x5d\x1d\x0d\x1a\xd9\x8f\xe7\x81\xe1\x9a\x1f\xe0\x09\x96\xe6\x01\x07\xdd\xf2\xfb\x9a\x61\x17\x79\xb4\xf6\x9e\x47\x59\xc9\x93\xd4\x9d\xe8\x3d\x37\x9e\xb0\x16\xa1\x92\x21\xe6\x4c\xae\x94\x0e\xb9\xd6\xb5\x12\x90\xa4\x31\x06\x48\x87\xcd\x32\x99\xef\x07\xf6\x0c\x64\x55\xda\xb7\xd4\x72\x8d\x80\x0d\x7a\xcf\x52\xae\x0d\xae\x14\x12\xb9\x58\x2c\x2a\x12\xef\x44\x24\x16\x54\xa5\x59\x2d\x57\xb7\xcf\x54\xf9\x51\xb5\x41\xb2\xc8\x1b\x99\x0a\x64\x47\xcc\x8c\xf7\x96\xcb\x67\xb3\x51\xeb\xcb\xda\x2d\x50\xb0\x00\xf5\xb5\x37\x53\xd8\xed\x80\x62\xf1\x49\xec\xb2\x50\x99\x88\x56\x14\x6b\x5b\x90\xd2\xbc\x0f\xcd\xd7\xfe\xa9\x80\x81\x9b\x07\x4a\xcb\xfd\xce\x32\x7c\xe8\x47\xf3\xe5\x0e\x48\x5f\xad\x71\xb3\x06\x7d\x25\x97\x8f\x29\x92\x99\xf0\xe3\x4c\x73\xe8\x51\x3b\x0d\x2a\xdc\x3e\x3c\x0b\x17\x5f\x73\xbf\x9d\x29\x62\x61\x0d\x0e\x39\x63\x70\xea\xd3\x46\xe5\xa5\xc8\xfd\xb8\x2b\x51\x63\x00\x43\xae\x95\x8b\x6d\x16\x3f\xb7\xc2\x76\x33\x45\xf2\xe1\xa0\xff\x4d\x31\xbc\xc6\x07\x1e\x08\x05\xa3\xc9\x6d\x85\x7f\xf9\x2b\x0c\x0d\x1c\xb1\xa3\xa1\xc4\x15\xde\x7e\x22\x61\x86\x6f\xa2\x1a\x91\x57\x16\x77\x75\x7f\x79\x7e\x77\xf9\xf0\xcd\xe0\x61\x16\x9b\x35\x18\x1f\x66\xfb\x79\x71\xf9\x61\xf2\x78\xf5\x30\xbf\x98\xde\xbd\x06\x40\x8c\x7e\x75\x00\x42\xec\x9e\xc8\x9d\xcf\xb5\xca\xc5\xd7\xa3\xce\xe4\xb4\x50\x73\x3e\xa0\x52\xc1\x11\xa8\x77\xb9\x3b\xd8\x68\x9d\x9c\xda\x31\x47\x13\x37\x1f\x9e\x68\x8e\x8b\x3a\x50\xb3\x5f\xca\x24\x81\x32\x47\x17\x5e\xa7\xa2\x20\x33\xa8\x60\x7f\xac\x2c\x2f\xd9\xd4\x99\x5a\x94\xd8\xb9\x21\xe4\xb7\x36\x97\x60\x2c\x70\xdc\x9a\x01\x48\x25\x94\x8f\x75\xf1\x57\xaf\xa4\x12\xbe\x1b\x28\x47\x59\x28\xd6\x4a\x3a\x4a\x93\xf8\x9a\x55\xac\xe4\x78\xf5\xf5\x35\xed\x8a\x2b\xad\x4f\xeb\x7e\xda\x5f\xba\x37\xc4\x4d\x2c\x15\x3a\xa6\xa5\xdd\x7c\xdf\xbc\x74\xdf\xfb\x2d\x00\xe3\x6e\x66\x92\x43\x0e\x02\x14\x1f\xfd\x44\xd2\x44\xa0\x72\x84\x4f\x4e\x3c\x49\x44\xd1\xe8\x65\x65\x9c\x8d\x29\x34\x63\x2d\x21\x53\xc1\x89\xb9\x21\x4a\x8a\x2c\x17\x29\x85\x4d\x26\x9f\xee\x67\x0a\x65\xc1\xe9\x14\x22\x75\x01\x7c\x04\x62\x38\x74\xe9\xf9\xd6\x43\x09\x2d\xd8\x5b\x8c\x51\x6f\x04\x57\x19\xaa\xf1\x26\x89\x48\xfd\xca\xc0\xfe\x08\x11\x93\x22\x13\x48\x36\xfb\xef\x93\x20\xab\x86\x5d\x6b\xfa\x4b\xbf\x25\x49\xd2\xea\x7a\x6a\xab\xa2\x05\x80\xe8\x6b\xae\x9c\x86\x3a\x85\xbe\xab\x88\xb0\xb5\x8d\x8b\xa8\x5c\x35\xd0\x6b\x2d\x3d\x60\x73\xbf\x2d\xa5\x13\x2e\xa5\x1e\xe7\x7a\x78\x4a\xb0\xb5\x36\x06\xd4\x09\x03\xf8\x34\xb3\xab\xe2\x4f\x00\xff\x64\x86\xb1\xf1\xd4\xa9\xc8\x4f\x1d\x71\xea\xa0\xde\xd4\x71\x70\xce\x49\x03\x5d\x88\xd7\x39\xb1\xb9\x9d\x4e\x65\xab\xd7\xa1\xe5\x9a\x58\xbc\x9d\xd2\xb9\x2d\xb0\x77\x10\x37\xc2\xeb\x99\x0f\x38\x66\x87\xce\x3e\x12\x5b\x82\xf5\x52\xe6\x47\xaa\xc3\x3c\x84\xb8\xc0\x52\x11\x25\xf6\x22\x14\x98\x24\x04\xb1\x27\x38\x18\xb2\xf8\x0e\xd7\x1f\x2b\xaf\x39\x47\x96\x77\x10\xd8\xe1\xfa\xe6\xfa\x32\x84\x2a\x4c\xaf\x1f\x2e\xff\x7c\x79\x57\x2a\xbf\xbd\xba\x99\x94\x4a\x68\xef\x1f\xee\x2a\x95\xb3\x3f\xde\xdc\x5c\x5d\xd6\x30\x0f\x97\x0f\xd3\x8f\xa5\xc6\x2f\x1e\xef\x26\x0f\xd3\x9b\xd2\xe7\x7e\x9c\x5e\x4f\xee\xfe\x3d\xfc\xc9\xe5\xdd\xdd\xcd\x5d\xe5\x79\x8f\xe7\xdd\xe8\x89\xd2\x6b\x34\x87\x7f\x7c\x72\x36\xe0\x0d\x6c\xdc\xc6\x65\x7d\xb6\x23\x76\x71\x4f\x10\xd6\xbe\xe5\x68\xab\x6b\x6d\x73\xc1\xc6\x30\x5d\x1d\xb4\xea\x4e\x2f\x28\x57\x1a\xba\x2f\xc7\x11\x15\xe7\x3c\x6f\xbc\xff\xf6\x0e\x4c\x90\x80\xf3\x97\x42\xa4\x3b\xe2\x79\xc1\x4b\x23\xfe\x24\xe2\x0a\xd1\xab\xb9\xd8\x6c\xa1\x1a\x2a\x84\x5d\xce\xd4\x27\xc8\x58\x21\xb2\xe3\x4d\xc6\xfe\x0c\xb9\x27\xfb\x61\x2f\x74\x0e\x83\xf2\x37\x7c\x86\xfb\xdd\x78\xa6\x4a\x02\xd1\xc1\xb7\x62\x1d\x15\x2e\x9a\x31\x9e\x29\xcb\xa5\x1b\xeb\x28\x1b\xc3\xd1\x3b\xd6\xe9\xea\x3d\xa9\x5e\x19\x63\xaa\x9f\x16\x5a\x3f\xbd\x17\xea\x3d\x5c\x0e\xf2\xf7\xbc\xc8\xf5\x7b\xc8\x5b\xe3\xe0\x67\xef\xad\x38\x8e\x55\x17\xca\xde\xaf\xe5\xb3\x80\xff\x8d\xd7\xf9\x26\xf9\xff\xb2\xed\xfa\xeb\xd9\x2a\x49\xcf\xcc\x77\xcf\xc2\xef\x9e\xd9\xef\x9e\xd9\xef\x9e\x99\xaf\xe1\xff\xb6\x3b\x8c\xb3\x09\x52\xe7\x9f\x29\xa9\x32\x91\xe6\xb0\x0c\x5f\x52\x99\x0b\xaf\xbc\xce\xde\xfc\xcf\xff\xb0\x71\xca\x5f\xb0\x8e\xe1\x82\xe7\xfc\x16\x2f\x7a\xff\xf8\xc7\x1b\x88\x6c\x23\xd0\x78\xcb\xd3\x2f\x85\xc8\xcd\x95\x33\x11\x51\xce\xfe\xff\x99\x82\x50\xf8\x66\x37\xcf\xf1\x02\x8c\x97\xc1\x38\x63\xff\x86\x6d\x4e\x91\xf3\x28\xce\x4c\x4b\x2d\x10\x47\xc9\x93\x06\x3d\xb5\x96\x58\xc9\x97\xe4\x82\x3e\x3f\x60\xb7\x7c\x49\xca\x5b\xc4\xb2\x76\x67\x5f\x12\x20\xd6\x4a\x34\xb7\x59\x73\xe6\x16\x2f\x38\x2c\xd4\xb9\xa6\x3d\x52\xcb\xd1\xbc\x6a\xbe\xa4\x79\xaf\xdc\x23\xef\xa2\x0d\xa1\xd4\xd4\xc2\x20\x68\xe3\x03\x42\x90\xc6\x90\x66\x87\xdc\xe3\x95\x14\xb5\xeb\xe1\xcd\xc1\x38\x50\x0e\xc3\xb5\x87\x1e\x64\xf6\xa7\x1f\xde\xbf\x1f\xb1\x55\x06\x7f\x2c\xbe\xc0\x1f\x90\xc6\x3d\x15\x75\x58\x6d\x30\x1d\x22\xa1\x3e\xcb\xfb\x67\xe2\x14\x70\x86\x6f\xc1\x56\x59\x59\xa6\x3f\x16\x2a\x4e\x84\x2f\xcb\x28\xc5\xa6\x12\x6d\xf5\x1c\xf1\x86\x52\xe5\x05\x87\x39\x5e\x88\x88\x1b\xc3\x57\x7b\x36\xa2\x7c\xf4\x32\x17\x0a\xaf\x25\xa9\x17\x51\xe0\x78\x85\x80\x14\x3b\x60\x52\x40\x97\x7f\xb3\x05\x91\x7e\x09\xf1\xfa\x07\xa4\x7f\x1c\x55\x7f\x05\x32\xdb\xc8\x64\x08\xfc\x5c\xa8\x06\x2e\x6c\xe0\x0c\xcb\x59\x8b\xd4\xdc\x4c\xb6\x5c\xc5\x3c\x83\x15\xb8\x4c\x21\xec\x9c\x32\x5e\xef\xe8\x08\x71\x51\xba\xc8\x81\x4b\x00\x53\x3c\xe1\x48\x20\xd5\x64\xd0\xe7\x51\xd0\x09\x3c\x13\x80\xf1\xae\xf6\xc5\xf1\x4c\x39\x89\x7a\x04\x25\xe0\x95\x25\xd2\xdb\x1d\x55\x8a\x57\x07\x5d\xda\x2b\x0c\x0d\xf7\xc8\x27\xfe\xaa\x9f\x1d\x31\x59\x8e\x71\x02\xab\x65\x1e\x08\x95\x59\x31\xb5\xb7\x42\x45\x3a\x16\x69\xf6\xce\x6c\x43\xe0\x7a\xce\x3d\x67\xa4\xcc\xfc\x64\x38\x45\x7b\xba\xb6\x99\xe6\x1d\xfd\xbb\x19\x9d\x12\x0f\x62\x93\xfb\xb0\x7f\xab\x7c\xef\xe9\xc8\xa6\xfe\xd2\x5f\xbf\x69\x6a\x32\x04\xd8\x58\x80\xd9\xe1\xbe\x20\x6e\xd9\xd0\xe2\x62\xa3\x24\x80\x8f\xce\x89\x55\x85\x92\xe6\xc8\xca\xcd\x85\x3d\x9f\x29\x3a\x81\x47\x6c\x29\x78\xbe\x06\x84\x51\xf6\x8c\xc6\x18\x8f\xfb\xfc\x45\xfb\x64\xa8\x25\xd1\x06\x54\x52\xa9\x71\x7f\x5b\xc7\x8f\x41\x6a\x87\x47\x39\x66\x7a\xda\xe8\x85\x9d\xab\x02\x83\xd5\x68\x10\x0f\x18\x07\xcb\xc9\x5c\xd5\x3f\x08\x29\xc1\x61\x24\x76\x18\xb1\x67\xd5\x7e\xe0\x2f\x8c\xe1\xc1\xb7\xc3\x7c\x5c\x60\x1c\xa1\xac\x93\x40\x4d\xb8\xcf\x7c\x30\x3d\x24\xc6\x04\x27\xb9\x6d\x53\x75\x0c\x04\x74\xe0\xb0\xfa\x0f\xf3\xd5\xbd\x37\x87\x4c\xa4\x96\x30\x1a\xdf\x15\x89\x79\xd6\x32\x8d\xcf\xb6\x3c\xcd\x77\x76\xf9\x26\x72\x01\x3c\xb3\x89\x7c\x12\x6c\x92\xa6\xfa\xe5\xd4\xa3\xd0\x6a\x5a\x1e\x78\xf6\x74\x62\x9e\x2f\xa0\xdf\x1b\xc2\xd3\xd5\x48\xcb\x55\xc2\x1e\xc5\x62\x7e\x18\x05\x58\x1b\x8d\x59\xe3\x73\x52\x91\xa7\xbb\xb9\x59\x88\x9b\x6d\xab\xa5\xe8\x85\x5e\xed\xef\xe4\x0e\x63\x17\x83\xf3\xb9\x07\xbb\x58\x69\x56\xbf\x1f\x76\xb1\x06\xe2\xb0\x3a\xbb\xd8\xf4\x7a\xfa\x30\x9d\x5c\x4d\xff\x4f\xa5\xc5\x4f\x93\xe9\xc3\xf4\xfa\xcf\xf3\x0f\x37\x77\xf3\xbb\xcb\xfb\x9b\xc7\xbb\xf3\xcb\x6e\xba\x80\x7a\xef\xbd\x0b\x7e\xc6\xc2\xe7\xfc\xc0\x1e\x82\x8c\x19\xa2\x3e\xc9\xff\x26\xa1\x25\x58\x55\x66\x33\x4b\xb5\x1a\xc1\x46\xfd\x81\x5d\xa6\xe9\x74\xc3\x57\xe2\xb6\x48\x12\xc8\x6b\x23\xc4\xfa\x3c\x15\x70\xf1\x1c\xb1\x5b\x1d\x4f\x83\xef\x41\x5d\x48\xe3\x6b\xc0\xf3\x79\x1c\xa7\x22\xcb\xf0\xf1\x23\x7a\x7e\x90\xc5\x75\x35\x27\x84\x62\xe0\xcf\x5c\x26\xe6\xfe\xf6\x03\x48\xbf\xea\xe5\x12\x71\xcc\x23\x87\x60\x67\x5f\x0a\x9d\x73\x26\xbe\x46\x40\x91\xd1\xbc\x4e\xae\xf4\xea\x57\xc0\x8c\xf5\x88\x13\xb6\x5c\x52\x40\x50\x63\xde\x7c\x9c\x37\x1b\x02\x7a\xcb\x8f\xf8\xd5\x0f\xf8\xcd\xc6\xd6\xf3\x3c\x39\x41\xc9\xde\x95\x5e\x35\xd3\x9b\x83\x77\x4d\x9c\xec\x5e\xe3\x1c\x0a\x80\xf5\x8a\x65\x52\x3d\xcd\xd4\xa7\xb5\x50\x4c\x17\x29\xfe\x08\xae\xf9\xc6\xcd\x4c\x8a\x6c\x2d\x62\xa6\x8b\x7c\xc4\x5e\x04\xdb\xf0\x1d\xba\xcd\x70\x27\x70\x9c\xcc\xb0\x64\xe0\x14\x31\xdf\x4e\xa4\x32\xd6\x62\x2b\x2d\x40\xb4\x3a\xf5\xa7\xb8\x71\x59\x82\x18\x7e\x3c\x7f\x5b\xd7\x79\x5a\x02\x4a\x40\x01\x90\x07\xb0\xd8\x4c\x2d\x59\x6e\x90\x7c\xd2\xfa\xa9\xd8\x7a\x2a\xa9\x37\x36\x4a\x0c\xc3\xfd\xac\x65\xcc\xe2\x62\x9b\xc8\xc8\xd9\xdd\x17\x9d\xb6\xf2\xe5\x21\x92\xb9\xff\xa9\x53\xc5\xe7\x77\xbd\x58\x03\x4c\x3a\x80\x34\x74\x30\xe7\xbd\x32\x77\x20\x93\x2a\x4a\x0a\x10\xb3\x28\x32\x91\x9e\xe5\xa9\x5c\xad\xc0\x01\xb7\x45\x17\xdf\x3f\xb9\xa0\x27\x2f\x3a\xbe\xbe\x20\xac\xfe\x4b\xf4\x4a\x46\x3c\x09\x51\x66\x3e\x3d\xe5\xd8\xcb\xec\xb6\x27\xa9\x2f\x00\xa4\xda\x0e\xb5\xb2\x32\x6c\x53\x01\x04\x7a\x73\x30\xe5\x73\x32\x77\xc7\xf4\x7b\xc9\xcc\x05\xdd\xaa\x80\xfb\xf2\x58\x70\xcf\x6d\x5f\x41\x24\xc2\x3e\xdb\xea\x3d\xa0\xde\xab\x82\x5c\x8c\x7e\x51\x22\x05\x0f\x16\xf2\x6f\xe6\x4d\x95\x06\xdf\xc4\x69\x40\x38\xa0\x98\xd5\x40\x59\x3a\x44\x1c\x96\x30\xad\xe4\xb3\x50\xdf\x9e\x0c\x32\x78\x40\xc4\xa3\xb5\x98\x5b\xbf\xfc\xd4\x26\xcb\x1d\x00\x03\x8d\x95\x25\x63\x0e\x4d\x29\x93\x40\xc0\x13\xe1\xd5\x09\x7b\x5c\xb7\x5d\x28\x30\xd0\x01\x8d\x37\x9d\x98\xc7\xa2\xa4\xaf\x7d\xf4\x7b\xf6\x32\xcd\x3e\xdb\x6d\x3b\xc2\x38\xbb\x10\xd1\x13\x7b\xbc\x9b\x62\x59\x96\xcc\x99\x31\x05\xd9\xda\x93\xcb\xb7\xde\xdd\x72\xbe\xfa\x15\x65\x73\x3d\xc5\xab\xd3\x04\x31\x1d\xa2\xcc\x34\x14\xae\x18\x23\x99\x39\xc1\xf4\x6d\xc2\x73\xcb\x99\x0e\x81\x78\x96\x6d\x80\x22\xbd\xc8\x03\x5d\x11\x12\x39\xee\xe3\x53\x00\xcb\x78\x39\xbc\x5a\x3d\xcd\x8f\x15\xcb\x70\x90\xe4\x43\x2f\x6f\xdd\x71\x9c\x55\xa2\x17\x50\x69\xdc\x9e\x17\xef\x30\x0d\x66\x5f\xa4\x32\x1e\x72\xb0\xd8\x31\xb9\x71\x5f\xed\xea\xa0\x93\x42\x76\x4f\x02\x9b\x2e\x31\xd4\x5a\xb9\x78\x55\x2b\xd9\xf6\xdd\xf2\x20\x35\x95\xb9\xdc\x94\xf3\x03\x2d\xcf\x2c\xc4\x95\x74\x87\xb6\x76\xfd\x5d\x8e\x9a\xe8\x7a\x6d\xf4\x9e\xb1\xf4\xe5\xd4\xdd\x93\x7c\x44\x81\x2b\x56\xe3\xba\x2a\xd7\x21\x64\x81\x76\xea\x10\xe6\x03\xba\xe5\x6e\x12\x4b\xf8\xcb\x5e\x33\x5a\x1d\xf7\x07\xca\x56\x1e\xc5\xde\xf2\x0a\x3b\xaa\xc8\xb5\x0f\x36\xc3\xfb\x4c\x81\x42\x2b\x44\x76\x83\xd9\x98\xc6\xb5\x0c\x93\x13\xab\x81\x61\xb0\x5b\x73\x00\x0e\x65\x10\x12\x66\x9b\x0a\x9b\xb6\xd8\x89\xdc\xd5\xf7\x25\x56\x3c\x01\xa2\xf2\xee\xad\xcb\x05\xce\xb6\x86\xd1\x91\x52\x40\x0c\x9d\x3c\x8d\x48\x6f\xb6\x5a\x09\x45\x58\x2c\xa5\x67\x8a\x1a\xb7\x12\x78\x2e\xb0\x5f\x82\xbc\x8f\x28\x9e\x82\x00\x4a\x91\xe9\xe4\x99\x32\x38\x01\xf7\x2c\x88\x67\x98\x0e\x9e\x1b\xd7\xd4\x5c\xc4\x20\xb5\x48\xf8\x67\x40\x84\x55\x74\xe0\x52\xb1\x92\x59\x2e\xc2\x2a\x81\xf0\xfb\x27\x93\xec\x29\xdd\xdd\xba\x86\xbe\x55\xb2\x67\x9f\x13\x66\x76\xed\x80\xfe\xec\xb6\x22\x9e\xba\xef\x75\x2f\x86\x4a\x21\x97\x37\x12\xa5\x53\x00\xd7\x00\x3a\x9f\x19\x52\x3e\x64\x8e\x35\xd6\x4d\x12\x15\xe3\x73\xa7\xb3\x04\x53\xb4\x2a\x78\xca\x55\x2e\x44\x36\x53\x94\xf7\x42\xea\x92\xb0\x3a\x17\x17\xd0\x4b\xa0\x89\x81\xae\x55\xa4\xb3\x1c\x99\x00\xe0\x2b\x4b\x2e\x93\x22\x6d\xbd\xed\xe0\xaa\x3c\xa8\xfc\xb0\x6b\x94\xce\xa1\x59\xd6\x34\x69\xae\x90\x25\xd8\x45\xae\x7a\xb6\x9a\xb5\x2a\xd7\x79\xb4\xbc\x82\x35\xb9\xfd\xe7\xdb\x85\xba\x5a\x6a\x5b\xfe\x35\x9b\x6f\xf5\x00\x8b\x47\xaa\xfe\x8d\x8d\x65\x5f\x6a\x21\x99\x8e\xec\xed\x97\x36\x1e\x5d\x9e\x3d\x41\xe2\x63\xdf\x4d\x70\x7f\x78\xf7\x4f\x7f\xdc\x9f\x1e\x69\xb5\x5d\xb0\x6a\xd7\x5c\xc5\x89\xb9\x21\xf1\xbc\x72\x02\x79\xbc\x0f\xdf\x58\x3f\xa1\x5d\x13\xcf\x62\x25\xe7\x51\x0d\x68\xbf\x6f\x9c\x2a\x08\xfd\xae\x17\xaa\x3e\xa5\x8c\x9b\x6f\xc2\x6b\xfa\x93\x9d\xb4\x9e\xdc\x86\x6d\x5f\x82\x4b\xb9\xfa\x0e\xdc\xfb\x8f\x75\x4b\x19\xd1\x56\xa4\xf3\xcb\x81\xbf\x8e\xdc\x8c\x80\xb3\x35\xc6\x2c\xa4\xea\x9b\x29\x92\x82\xc3\x9c\x1f\x24\x7b\x90\x8e\x22\x63\x7f\x70\xc5\x17\x7f\xf8\x17\x4b\x46\xb0\x63\x4b\x18\x6b\x60\xfc\xd0\x51\x54\xa4\x90\x90\xa3\xa0\x01\x13\x78\x36\x0d\x61\x54\x9d\xe0\x89\xec\x60\x14\xe8\x3e\x35\x79\x0f\x2e\x4a\x54\x7a\xa9\x07\x08\x0e\xa0\xa8\x9d\x3b\x0b\x89\x7d\x3d\xcd\x72\x96\xe5\x62\xdb\x68\x95\x4a\x4e\x57\x59\xb7\xf1\x08\xb7\xcb\xab\x46\xf6\xf4\x75\x07\xd8\xe8\x49\x70\x91\xfb\xcb\xfd\xcd\x35\xdb\xf2\x1d\x20\x92\x72\x4d\x82\x9b\xc0\xc7\x54\xdd\xbf\xfb\x66\xa0\xfc\xf2\xe5\xcd\x86\x63\x4a\x30\xc4\x96\xa8\x21\x77\x82\xba\x15\x3b\x04\x6b\x86\x96\xa4\xd9\xca\xa9\x4e\xce\xb6\x09\x57\x02\xb9\x73\xe1\xfd\xc7\xac\xf2\xf8\x30\xcb\xe8\xf2\x0d\x84\xe3\x80\x0e\xc0\x45\x9e\xd6\x42\x5a\xa8\x26\x44\x67\x59\x8a\xf2\xa8\xc4\x62\xab\x8d\xe8\x84\x5b\x7d\x44\x46\x5d\x1e\x99\x6d\x82\xc5\x85\x36\x59\xea\xf2\xed\x3c\x03\x28\xdc\x80\x89\xea\xd6\xcd\x9c\x29\x2b\x8b\xa6\x5f\x32\x16\x63\xf9\x65\x21\x33\x94\x9b\xc6\x50\x34\xc0\x52\xc8\xbe\x60\xce\x3c\xe5\x2a\x33\x13\x0a\xd1\x34\xf1\x2c\x14\xab\x17\xf3\x4d\x2f\xae\x5c\x66\x19\x27\x89\xb4\x38\x5a\x86\x3e\x70\xcc\x8e\xb9\xc0\x34\x0a\x39\xee\xa7\xb9\xfd\xc8\xb7\x5d\xc0\xf1\xa3\x5b\xdc\x37\x4b\xae\xf8\xbc\xea\x75\x82\xc4\x1c\xd0\xf3\x97\xd0\xe3\xe1\xe8\x3d\xaa\x23\xcd\x4f\x23\xef\xe5\x00\xa1\xfa\xd3\x14\x03\x0c\xb0\x3d\x01\x0f\x8c\x43\x75\x38\x7f\xd9\xec\x72\x20\x3f\x47\x41\x64\x78\xb9\x31\xbb\x17\x82\x7d\x76\x9a\xca\x9f\x49\x5c\x03\x80\x6a\x20\x8a\xdd\x36\xae\x53\xb5\xd4\xc7\x19\x83\x74\x55\x03\x42\x1d\x35\x2a\xcd\xfd\x3c\x16\x6a\x05\xd5\x0c\xea\x75\x4b\xf0\x1a\xdf\x6b\x0f\xb0\xea\xd6\xdf\xc9\x09\x98\x6f\x7b\x6a\xce\x67\x98\xe2\xc3\xb4\x7f\x4b\x8b\x24\x07\x99\x69\x20\x2e\x7c\x52\xfa\x45\xa1\x2f\x40\x4f\x62\x6f\xcd\xfe\x83\x03\x0c\x18\x08\x09\x5b\x55\xa0\x35\x7c\x07\x4c\x8a\x13\xf7\x6f\x76\x8f\x59\x0a\xec\x33\x50\x85\x67\xe0\xfc\x10\xc9\x37\x58\xf3\xb7\x93\x11\xfb\x71\xc4\xce\x47\x6c\x3c\x1e\xbf\x1b\x31\xc1\xa3\xb5\xed\x11\x7e\x05\x31\x4b\x39\x5f\x99\xb6\x9d\x14\xbd\x7f\x00\x30\xdf\x9b\xc3\xca\x12\x86\xf0\x40\xb0\xde\x47\x1e\xec\x2b\x60\x19\x03\xaa\x2b\xd9\x8c\x6e\xb4\xd6\xd2\x77\x0a\xc0\x81\x22\xd2\xa9\x85\x17\x66\xb9\x4e\x2d\x54\xea\x99\xa7\x5c\x2a\xa8\xee\xe2\x75\xa0\x28\x3d\x39\xe0\x77\x14\x5f\xf9\x06\xde\x5f\x2a\x47\x71\x65\x86\xe9\xc1\xf5\x3f\xdf\x6d\x65\x04\xe3\xf9\x92\xca\x3c\x37\xa7\x73\x36\x53\xf7\xec\x87\x7f\x63\x93\xed\x36\x11\x6c\xc2\xfe\xce\x7e\xe4\x8a\x2b\xce\x7e\x64\x7f\x67\xe7\x5c\xe5\x3c\xd1\xc5\x56\xb0\x73\xf6\x77\x33\x6c\xa6\xbd\x6b\x6d\x8e\xc3\xdd\x88\x71\xa6\x8a\x04\x4f\xfd\xb7\x16\x86\xf4\xce\xbd\x17\xf7\xb3\x63\xf5\x9c\x33\xbd\xa1\xa3\xf0\x17\x17\x0d\xcf\xa4\x5a\x25\x22\xb7\x2a\xea\x25\xc0\x18\x3e\xe0\x0c\xde\xf4\x87\x99\x72\xb1\xbc\x5f\x4c\x8f\x7f\x61\x7f\x67\xd7\x45\x92\x98\x2e\x19\x43\x63\x16\xd2\x0f\xcc\x02\xf8\x85\x1a\xbf\xc8\x27\xb9\x15\xb1\xe4\x00\xe1\x37\xff\x7a\xff\x00\xb3\x3d\x2f\x3c\x6d\x4e\xb8\xa7\x1d\xfd\xfa\x31\xa6\xe7\x55\xea\xb2\x1c\x0b\xbf\x9d\xfc\x8e\x9b\x5f\xf9\xab\xc3\x3d\x22\x4f\x16\x46\xfb\x81\x1c\x56\xa4\xce\x0f\xd9\xfe\x0f\x32\x01\x95\xc3\xd6\xb6\xd5\x70\x14\x84\x87\xfa\xb1\x46\x16\xc4\x23\x4e\x7e\x87\xec\xc1\xe4\xdf\xd7\xe4\xd6\x78\xc8\x4b\x95\x6e\xe0\x4b\xfa\x6a\xff\x5e\x59\x21\xc7\x3f\xfe\x73\x59\x3d\xa3\x34\xc4\x5a\xf6\x92\x19\xa9\x74\xf6\x91\x62\x17\x50\x27\x68\x2e\x32\x4a\x26\xef\xcd\x56\x7d\x7f\xad\x95\xb9\xb6\x66\x72\x85\x0c\x05\x00\x60\xc9\x80\x93\xcd\x3a\x05\x0f\x65\x97\x35\xd8\x02\xe0\x1f\x98\x2e\x21\xa8\x2a\x37\x56\xc0\x4c\x41\xb2\x9b\x29\xf3\x0d\x3a\x91\x00\x60\x2d\x1d\x91\x1d\x3e\xcd\x0a\x9a\xd2\xb3\xc8\x20\x07\x8d\x37\x2c\xb0\x2e\x0d\xd0\x23\x16\x1c\x15\x0b\x1d\x11\x15\xbf\x0e\x48\x5c\xa8\x35\x5b\xe1\x8b\xd8\xad\x85\x48\xb4\x5a\x99\x55\xd1\x66\x04\xf4\x86\xcb\x63\x20\x0d\x61\x17\xb0\xb1\xd6\x1e\x98\xc3\x92\x3e\x42\x53\x62\xce\x49\x19\xfb\xfb\x3d\x69\x4e\xbb\x88\xac\x3b\x0d\xe9\xe5\x5a\x5e\xe2\xc8\x7a\xd1\xc7\x4c\xa4\xc0\xb4\x88\xb9\x75\x17\xed\xc7\x83\xd3\xd7\xdb\xe2\x1b\xf5\xdb\x54\x9d\x90\xcc\xe6\x50\x08\x65\x13\x6c\x30\xd9\x05\xf5\x7a\xac\xc7\x5f\x13\x9d\xf9\x9a\x8a\xb0\x8d\xf2\xaf\xf0\x39\xd3\x1a\xfd\x68\xa8\xc4\xab\x1d\xbd\x53\x00\xd7\xbe\x20\xe3\xfb\x5c\x2f\x6d\x0d\x5f\xff\x33\xbd\xc6\xb9\xdf\x0f\x1f\x11\xf2\x6c\x86\xdc\xf4\xf5\x85\xd3\x96\x6f\xd0\x6a\x4e\x19\x89\x7e\x9d\xad\x0e\xd8\x8d\xfa\x80\x5f\xbf\xd5\x89\x8c\xba\xe1\x56\xf6\xb8\x5a\xeb\x97\x06\xfc\xca\x42\x00\xfe\x90\xe2\x3f\xd4\x29\xf4\xd0\x73\x11\xe5\x3e\xe3\x56\x7f\xb9\xdf\x20\x1e\x9d\x77\x70\x8c\x28\xbb\x61\x03\xdd\x27\x97\xc3\x83\xb3\x15\x38\xb6\x80\x5a\x16\x63\xad\x50\xc5\x05\xb9\xed\x88\x53\x08\xba\x34\xf2\x60\xa0\x5f\xd6\x3a\x31\x77\x31\x15\x13\x5f\xd9\x4c\x6d\x45\x1a\xe9\x84\xe7\xc6\xfc\xbf\x10\x27\x8d\x4c\x62\xcf\xdf\xfe\x16\xb0\xa4\x80\xf8\x7a\x47\x22\x35\xc2\xe5\x98\x6d\xf3\x1d\xa7\xae\x5d\x76\x56\xa8\xf2\xb8\x08\xd4\xe9\xc0\x61\x5d\xcb\xfe\x13\x81\x98\x70\x28\x88\x61\xa0\x92\x2d\x34\x83\x5e\xea\xcf\xa0\x08\x2f\x48\x49\x2e\xad\x14\x96\xbd\x38\xe5\x95\x79\xa5\x65\x56\x1d\x4a\xe0\x9d\xc3\x3a\x24\x04\x90\x64\x02\xba\xb3\x11\x1c\x7d\x31\xcf\x02\x45\x93\x3a\x53\x3e\x3f\xfa\x26\x0b\xfd\xb2\xc6\x79\x46\x5a\x35\x0b\x3f\x1b\xb1\x37\xa5\x17\x7d\x03\xbc\x64\x4a\xc3\xf3\x28\x87\x55\x1a\x1a\x58\xae\x23\x26\xf3\x99\x92\x19\xae\xcc\x54\x24\xe2\xd9\xf4\x2e\x0c\x16\x13\xd6\xc5\xde\x9d\xed\x6b\x03\x82\x99\xdb\xc2\x57\xa7\x6f\x0a\x9b\x30\x0d\xf9\xad\x38\x04\xa6\x63\x91\x19\xbf\x11\x98\xb9\xc5\x57\xb3\x01\x24\xe4\x42\x10\xfe\x11\x0b\x65\xfb\x07\xa8\x10\x94\x50\x9b\xa9\xe9\x12\xaa\x0f\xa1\xe6\x31\x8e\xf1\x16\x6a\xb9\x9a\x1d\xd9\x88\xa4\xe0\xb0\xa6\x3b\xb9\x93\xcf\x47\x8d\x25\xdc\x49\xe2\x59\xa4\xbb\x1c\x82\xba\x30\xae\x4a\xf0\x7c\xcd\x64\x3e\x02\x96\x18\x6b\x29\x67\x8a\xc7\x24\x51\x49\xcd\x99\xa1\x81\x75\xdf\x31\xcf\xf4\xfb\x85\x7e\xee\x72\x6c\x8f\x45\x7d\xe1\xae\xde\x26\x5c\xcd\xf1\x04\xf9\x15\x70\x5f\x81\xfc\x55\x5b\xaa\xb3\x58\xcc\xed\x12\x3b\x4d\x3f\x9d\xbd\xbf\x2b\x89\xd2\x19\x3f\xd6\x3e\x68\x84\x8b\xc1\x33\x5b\xda\xeb\x89\x8b\xd3\x10\xba\x20\x65\x36\x03\xdb\xdf\x0a\x78\x48\x18\xaf\x20\x11\xec\x6a\xdd\x87\x09\xb3\x2b\xe0\x7b\xc5\x27\xf5\x99\xf9\xca\x19\x52\x9d\xf6\xe1\xd0\x98\x9a\x87\x78\x10\x3c\x66\x4f\xb7\x5e\x17\x22\xd3\x1a\x47\xa9\x43\x65\xec\xdb\x06\xe9\x3e\x84\xed\x0b\x8c\xc3\xb9\x30\x4f\xb3\xbc\x59\x78\x0f\xd3\x0d\xd8\xca\x53\xc6\xa8\xc1\x4e\xf5\x8d\x94\xf8\xaa\x5f\xe8\xd7\x98\x4d\x15\xb3\xee\xde\x88\xbd\xc1\x85\x95\xbd\xa1\x10\x24\x69\xe4\x51\xee\x3c\xa6\xdd\x43\x75\x92\x55\x28\x06\xa2\xd5\xfd\x76\xc3\x4c\x50\x27\xbb\xd1\xab\x8e\xcb\x8f\x12\xd0\xf2\x87\x14\x44\x63\x16\x71\x81\x0d\xd0\x21\x89\xd7\xee\x1d\x3a\xed\xda\x47\xb3\xfd\x0b\xdb\x7c\x17\xfb\xd1\x7e\xd1\x0c\xd1\xb6\xa0\xf3\xd4\xfe\x9e\xe9\x74\xa6\x6c\x6b\x14\x92\xcc\x50\x4e\xa1\xda\x54\xc0\x4e\x43\x3e\x7f\xb0\x52\x01\xc4\x60\x15\x34\x40\x98\xc5\x53\xb0\x55\xad\x00\x80\x22\x16\xc2\xab\x7b\x8e\xd9\xc4\x3f\xcd\x38\x1e\x66\x81\x6f\xf0\x98\xaf\xd2\x34\x25\x89\x19\x14\x99\x5b\x56\xa8\x00\x58\x9f\x15\xc0\x6d\xb6\x2c\x8c\x31\x0a\x08\xe0\x66\xca\x0c\x1e\x5b\x4a\xc0\xfd\xd2\xb8\xcc\xd4\x47\x9d\xd9\x3a\xee\xcc\x8f\x87\xc5\x90\xd2\xb0\xbd\x71\x42\x22\xf4\x83\x0b\x38\xb4\x29\xe6\x5f\x51\x96\x85\x8a\x0a\x22\x63\xd8\xe9\x22\xf5\x2f\x15\x71\x35\x53\xff\x65\x86\x07\x75\x1d\x9d\x28\xaa\x5e\xe2\x16\xb6\x4a\xbc\xec\xed\x67\x6c\xf4\xed\xbf\xbc\xfb\xfc\x0e\xf9\x14\x8a\x0c\xb4\x9b\x46\xe5\x03\xc4\x71\x81\x16\x49\x02\x99\x68\xfb\x06\x8e\x06\xc1\x3f\x82\x77\xc1\x72\xe8\x52\x37\x57\x65\x17\xa3\xcf\x46\xef\x5a\xc1\x3e\xf8\x3c\x61\x11\xcf\xa3\xf5\x99\xf5\xe5\xc8\x8c\xd9\xd3\x8f\xa6\x0f\x45\x5c\x8c\xa7\xd5\x4c\x87\x69\x2e\x9c\xe9\xc6\x31\xc0\x97\xd6\x8b\x79\x05\x00\xd6\x3c\x54\xb9\xe1\x1d\x7f\x18\x2e\x4e\x2f\x4b\xea\xfd\x3c\xf7\x71\xab\xcc\xe2\x6f\x9c\x14\x25\x57\x7c\x23\x62\xf6\x06\x6a\x75\xde\xd8\xc9\x9f\xa9\xed\x62\x9c\xec\x96\x39\x91\x0b\x99\x41\x19\x83\x86\xc1\x9e\x53\x6e\x1e\xd7\xaf\x49\x7b\x06\xbb\xf5\xa2\xd5\xec\xeb\xb8\xb1\x71\x4f\xea\xef\xb0\x60\x8c\xcb\x8d\xce\x7d\x19\x22\x54\x26\x53\xe5\xd9\xd3\x88\x2d\x52\xae\x80\x7e\x3a\x0e\x9d\x2a\xbf\x3b\xe1\xf2\x8c\xcc\x3d\x94\xb1\xe2\x8a\x27\x3b\xc0\x8e\x8f\x66\x0a\x69\x8e\x80\x98\x70\x17\x25\x32\x42\x19\xe4\x8a\x1f\x24\x9e\x85\xca\x2f\xa9\xae\xdf\x82\xd4\x8f\x4d\x2d\x3b\x9e\x80\xa3\x08\x00\xa7\x65\x6f\x87\x7b\x02\x04\x1f\x61\x8d\x52\x01\xe0\xed\xc5\x2e\x00\xb5\xba\x05\x3e\x22\x35\x14\x60\x82\x62\x7f\x2b\x16\x3a\xb1\x54\x5a\xd3\x0b\xa6\x53\xa0\x13\xce\x35\xfd\x48\xc6\x6d\xa7\x98\x54\xb1\xf8\x7a\x54\x3d\x7b\xf7\x81\x64\xdd\x3b\xf3\x98\x80\xb5\xb6\xfa\xb2\xb0\x8b\x52\x61\x0e\x8b\xdc\xde\xe0\x6a\x9f\xca\xaa\x08\xbb\x49\x92\xaf\x01\xf6\x86\x80\x6b\x3f\xa8\x1b\xbe\x63\xd1\x9a\xab\x55\x70\x85\x06\x14\x92\xd8\xea\x14\x65\x77\x9e\x81\x38\x4a\xa7\xb6\x5e\x90\xaa\xe0\x08\xf5\xed\x02\xde\x08\xb6\xd4\xb6\xd4\x8d\xaf\x56\xa9\x58\x41\x09\xf7\x4c\x95\xea\x78\x81\x34\xcb\x32\xfe\xe2\x73\xba\xca\x20\x4f\xc3\x25\xd0\x76\x6b\xc9\xd3\x9d\x2b\x22\x23\xcd\x2a\x37\x74\xb5\x61\x1d\x31\x29\xc6\x23\xf6\x47\x0f\x30\x15\x91\x56\xae\x0a\xad\xf9\x1d\xb6\x95\xd0\xf4\x1e\x5b\xd4\x40\x3a\xd0\xdc\x77\xf8\x5d\x4d\xf9\xaa\x71\xd1\x74\x96\xf1\xe5\x3c\x2f\x06\xd8\x4a\x52\x37\x3c\x37\x5f\xbe\xc7\xef\x76\x62\xb0\xf9\xd6\x98\x37\x4b\xf8\x62\x3e\x6f\x2c\xbc\x79\xb6\x67\xe6\x6b\x1a\xeb\xbd\x81\xce\x44\xb7\x07\x3a\x4f\xe1\x52\xda\xaa\xfe\xfd\xb1\xce\xa4\xa5\x52\xbd\xe3\x9d\x86\x86\x32\x2d\x18\x95\x60\xe6\x59\xf5\xba\xd5\x60\x01\x9c\x1e\xbc\x4e\xd1\x6f\x47\xe4\x86\x2b\x98\x2f\x19\xc9\xa6\x03\xa1\xc4\xfa\x01\x1a\x97\xdf\xea\x6e\xdc\xc6\x37\xd2\x3c\xfc\x8f\x2d\xf7\x62\xeb\x99\x34\x0d\x7a\xb8\x3f\x71\x9c\xd2\x81\xe7\x94\x7b\x3c\x72\x9e\xdb\xe0\xa6\x4e\xe5\x4a\x2a\x9e\xeb\x94\xbd\xbd\xb5\x44\xc1\xef\x1c\xb9\x3d\x8c\xe2\x29\xcc\x44\x69\x88\xd0\x4c\x34\xdf\xbd\x00\xcf\x2c\xe2\xf9\x30\xd6\xa6\x26\x8d\xe6\xbd\x78\x7d\xf3\xa9\x2c\xe7\x9b\x6d\x48\x38\xe8\xa4\x03\x69\x64\x12\x1c\x04\x66\x3b\x06\x31\x3e\x99\xf9\x1a\xac\x99\xa2\xc8\x38\xce\x9b\x4e\xed\xe0\x81\x6f\xdb\x76\x36\x6f\x8b\x7c\x7e\x20\x89\x06\x91\xef\x0e\xa4\x21\xac\xa6\x50\xef\xae\x6c\xc2\xc0\xdf\x0b\x4a\x8e\x36\xbc\x28\xf2\x9f\x65\x70\x6a\xe3\x15\xcf\x99\x0d\x73\x4a\x5a\xae\x80\xf3\x44\x17\x31\x23\xa3\x41\xe9\xd8\x74\x8c\xa7\x0f\x10\x12\x8e\xc7\x6d\xec\x4c\x03\x45\xc1\xdc\xfe\x86\xef\x35\xaf\x70\xf8\x5d\x8b\x85\xeb\xdc\x5a\x34\xb2\xc3\x62\x4f\x84\x44\xf8\xc8\xb7\xdd\x8c\x0f\xdc\xde\x9c\xb1\xc0\xc7\x99\x3b\xeb\x05\x96\xf7\x7e\xcb\x70\xb9\x68\x28\xb0\x23\x0d\x0b\x94\xc1\xbd\x44\xc6\x09\xac\xe7\x30\x90\xdc\xc0\xdf\x58\x4a\xd0\x65\x4f\x47\x3f\xce\x56\xb2\x76\x3f\x6a\xcb\x53\xa1\xf2\x39\x3c\x71\xd8\xc3\xe0\x21\xb7\xf0\xf5\x92\x43\xd2\x2b\x20\xf8\x1f\x0f\x1a\xe3\xbc\x96\x0a\xe1\x3f\xd9\x3d\xc5\x36\x32\x2b\x1c\x6b\x4e\x9f\xb7\x12\xb0\x27\x41\x4e\xcc\x4d\x5c\xcb\x74\xd1\x0b\x1d\x30\x7a\xc1\x0b\x95\x4c\x67\xaf\x17\xf2\xbd\x47\xe1\x0f\xd3\x0a\x85\x79\xa8\x82\xd2\x98\x32\xfb\x33\xbf\xe6\xb0\x2a\xd9\xa7\xa3\x19\xcf\x99\x99\xbf\x84\xfd\xb7\x48\xb5\x2f\x0b\xc0\xa0\x45\xd8\x70\xa7\x3f\x7c\xb8\xc4\x16\xfa\xbb\x28\xee\x14\xaa\x9b\xc0\x4f\x88\x6d\x02\x6f\x96\x8b\x9d\x75\xf7\x5b\x52\x09\x5b\x11\xe1\x3c\x1c\x78\x6c\x06\x17\xbb\xc0\xbe\xdb\xd0\x97\x3b\x2c\xec\x06\x7d\x0f\xf7\x56\xe2\x73\xdb\xf0\x2d\xe1\xbc\x08\x52\x5a\x0d\xe2\x8f\xe1\x25\xfe\xe3\x97\xff\x1c\xb7\x89\x27\x42\xd7\x87\xc2\x66\x5c\xe7\x3f\xa4\x52\xa8\x18\x92\x72\x3c\xae\xb3\xac\xab\x52\x94\xb6\x64\x9e\xcd\x32\x3c\x49\xf5\x5c\xf3\x39\x98\xcd\x71\x11\x7d\x83\xcc\xae\x37\xb2\x6e\xfb\x96\xf2\x3e\x6d\x47\x75\x36\x8f\x77\x8a\x6f\xea\x72\x93\xaf\xda\xc7\x9d\x14\x49\x0c\x5d\xa4\xa7\xef\xcb\x4e\xc4\x22\x7a\x1a\xea\x13\x1c\x4c\x4d\x2c\xa2\x27\xf6\xd3\xc3\xc7\x2b\x94\x04\x92\xd9\x4c\x5d\xf3\x5c\x3e\x8b\xc7\x34\x71\x61\x61\x34\x3e\x45\x9a\xd8\x3d\x52\xa6\xca\xc4\xea\xbf\x02\x54\xcc\x89\x57\xd3\x3a\x0e\x21\x93\xf1\x66\x77\xb6\x28\xa2\x27\x91\xbf\x4f\xb9\x8a\xf5\x06\x5f\xe3\x7d\x56\x2c\x97\xf2\xeb\x38\xe7\xe9\xbb\x7d\x98\xfe\xbd\x96\xf4\x88\x4b\xc2\x31\x06\xa5\x7e\x0d\x70\x42\x4d\xde\x36\xcb\x38\x94\x6a\x77\x96\xd9\xf3\x44\x3a\x93\x02\xf1\xc6\x96\x8b\xc8\x98\xfa\xd9\xf0\x84\x01\xa3\xd7\x7c\xb0\x7e\xa3\x2b\x56\x1b\x63\x65\x9f\xee\xdb\x08\xe1\xad\xd6\xc9\xb1\x51\x42\x9e\xd8\x4d\x32\x07\xc5\x99\x63\x5c\x70\x5c\x00\xee\xb2\x3d\xbd\x70\xf9\x2a\x47\x01\x49\xb1\x06\xa7\xf7\x06\x50\x0a\xea\x02\x00\x18\xa0\x13\x1d\x28\xcb\x6c\xdb\x90\xb0\x1c\x88\x16\x85\x36\x10\xe9\xe0\x74\xf4\x6b\x61\xcb\xa0\xfe\x97\xfb\x3e\x02\x4d\x56\xa5\x87\x83\x02\x08\xa8\x0f\x53\x79\x94\x0b\x26\x84\x74\x7a\x6e\x1c\x83\x67\xdb\xf1\x44\x55\x3a\x63\x73\xc8\xf3\x99\xa9\xc0\xcb\x41\x26\x12\x0b\xc7\x75\xa3\xd6\x14\x63\x28\x2d\xc3\xa3\x63\x0c\xc7\x70\xa6\x76\x06\xa1\x2f\x42\xf5\x21\xc8\xa3\x46\x7a\xb3\x30\xf7\x7c\x2c\xef\xa4\xc0\x1b\xb8\x67\x13\x4b\x49\xe5\x82\xa4\xd6\xcd\x42\x4e\xec\xca\xd8\xbb\xa3\x21\x64\xf7\x0a\x4d\xd6\xbe\x2b\x4c\xe8\x13\x9f\x96\xde\xb5\x05\xd9\x57\x7d\x03\x69\xae\xb3\x2f\x7c\x97\x81\x54\x93\x30\x56\x71\x89\xc1\xa6\x72\xff\x47\x3e\x04\xe2\xe8\xce\x48\xf7\xb0\x20\x05\x37\x7a\x17\x89\x35\xef\x22\xb1\xa2\x54\x9e\x4b\xe4\x4d\xd6\x3c\x38\xbf\x4e\xfc\x38\xed\x8c\x1f\x63\x02\xe7\x7f\x47\xc8\xb8\x23\x30\x75\x64\x7c\x2c\x38\x26\x53\x1d\x89\xcc\xa6\xd8\xa1\xe8\x01\xcc\xb1\x79\xf6\x88\x6d\xb8\x54\xb4\x0d\xf2\xd4\x18\xc8\x58\x2c\x8a\xd5\xaa\x35\x6c\xf3\xfd\xc7\x7f\xcb\xfb\xe4\x9f\x3e\x3e\xd7\xc9\x86\x73\x8a\x08\xdb\xd4\x3e\x09\xd3\xc6\xc6\x57\xfe\x36\x41\xb5\x13\x45\x08\xa7\x7d\x22\x84\x16\x77\x00\xe5\x1f\xe4\xe2\xdb\xdc\xf0\x6f\xa1\xc3\x6f\x13\x3a\x6c\xcc\x8d\x54\x7b\x88\x94\x03\x73\x59\x76\x80\x3b\x7a\x78\x20\x73\x91\xa3\xb8\x83\x5e\x91\x48\x61\x26\x54\x9c\xb1\x05\x8f\x5e\x81\xca\x08\x4e\x9f\xe3\x63\x14\x7b\x12\xde\xf7\x7a\x23\x18\x3c\x2a\x43\x26\x70\x46\x15\x36\x23\x40\x52\x99\x17\xf4\x59\x62\xca\x41\xc3\x71\x85\xd9\xea\xd8\x3b\xad\x6f\x95\x78\x61\xe6\x34\x18\x85\xd0\x92\x60\x7a\x40\x22\xe2\x1d\xa9\x8c\x7b\x1c\xaa\x2b\x27\x4e\xc5\x8a\xa7\x31\xa0\x9f\x69\x4b\x26\x3c\x7a\x32\x7f\x87\xfe\xd1\x13\x09\xfe\x62\xd9\x6a\x11\x92\xe5\x5b\x93\x2a\x42\xc5\x67\x42\xda\xf8\xfe\xe1\xd7\x33\xc6\xa3\x54\x67\x78\x8b\x77\x2a\x68\x50\x7d\x07\x0e\xe2\xb3\x8c\x0b\x9e\xe0\x13\x5b\xa3\x7f\x3c\x3b\x8a\x7d\x77\x12\x88\x20\x88\xaf\xdb\x84\xab\xf2\x9e\xc4\xd7\x05\xfe\x0c\xd9\x59\x62\x42\x34\x50\xdf\x94\xce\x2e\x54\x0e\xf6\xdb\x0a\xbd\xcf\x54\xf0\x78\x17\x92\xe5\x48\x45\x72\xa0\x3c\xde\x48\x65\xa6\xde\x6a\xdc\x38\xfb\x0a\x4d\x47\x3c\x41\x10\x18\x50\xc1\x27\x49\x65\xeb\x67\x4c\x09\xe3\xb2\xf0\x54\x26\x3b\xf0\x52\xb7\xa9\x38\x0b\x9e\x13\xec\x6f\xc2\xa0\xcb\x6c\xa6\x6c\x61\x77\x91\x89\x65\x91\xa0\x2f\x0b\xb7\x3d\xf7\x02\xb4\x0f\x1f\xa7\x23\x73\x8c\xe5\x44\xc0\x1c\x3c\x18\x65\x4d\x4e\x81\xe7\xad\xdf\xb3\x7a\xc5\xbc\x3d\x89\x53\x0a\x70\xc3\xb5\x7e\xb1\x45\x07\x2f\xdc\xa3\xca\xda\xce\x92\x93\xc5\x39\xbb\xbd\x1a\x7b\x9f\xb0\xbb\x12\x07\xbd\x2c\xdd\x4d\xbf\x13\xb1\xdb\x89\x52\xc1\xeb\x90\x22\x18\x61\x50\x44\xcc\x8a\x0c\x6b\x17\xcc\x1c\x82\xb5\xb6\xd7\x66\xac\xe6\xb0\x6a\x72\xcc\xbd\x9d\xcc\xb4\x62\xb3\xe2\xf7\xbf\xff\x93\x60\xbf\x27\x79\x58\xb0\x32\x18\xa1\x06\x1a\x27\x6c\x1d\x0c\x94\x7b\x80\x40\x8e\xa7\xda\x8c\xb0\x26\x10\x96\xad\x9c\x04\x18\x13\x8f\xd6\x2c\x2b\x16\x88\xd1\xe1\x14\xe4\xe4\xca\xb1\x24\x5e\x69\x80\xdb\xe0\x39\x66\x7b\x3f\x20\x58\x70\x4b\xe7\x8b\x0d\x04\x04\x38\x41\x18\xe8\x50\x54\x0a\x06\x05\x5f\x12\x0c\xf8\x2d\x28\x4b\x8d\xd8\x4f\xf2\x59\x8c\xd8\xfd\x96\xa7\x4f\x23\x76\x81\xe1\xd6\xbf\xe8\xc5\xde\xfb\xff\x29\x62\x60\xce\x4d\x3d\x56\x43\x15\xa3\x49\xa3\x80\x1b\x34\x08\xf1\xd7\xa3\x35\x16\x61\x01\x5a\x3d\x28\x52\xbe\x4f\x3f\xa7\x95\x40\xf6\x54\xb7\x98\x76\x58\x5f\xeb\x9d\xa6\x6a\xa5\xfd\x79\x4a\x55\x53\x4d\x48\x13\x73\x8e\xc1\x4a\x34\x2f\x7e\x06\x9e\x89\x4e\x5d\x65\x5f\x46\xe1\x67\x5c\x15\x88\xbf\xc3\x13\xb9\x52\x0b\xd7\xd7\xf1\xb2\x0f\x9e\x6f\xb5\x4e\x1a\xfd\xaf\x93\x0e\x60\x2d\xda\xd9\x77\xf0\xa6\x58\x43\x90\x85\x5e\x89\x1d\x45\x1f\x39\xf3\x71\x36\x0c\xaa\x01\x19\x00\xac\xa6\xb8\x80\x24\x82\x1f\x8e\x50\xce\xc8\x98\x15\x44\x3d\xa2\x23\x62\xd5\xef\xb8\xf5\x10\x8d\x13\x45\x21\xc4\x10\x6d\x57\x8b\xe9\x65\xf5\xe7\xb4\xb8\x85\xd0\xee\x5c\x36\x55\xfe\x0f\xdd\x5c\x80\x23\xae\x07\xea\xb1\xe7\xd6\x80\x5b\xdc\xf9\x3e\xde\x43\x5b\x64\x37\x8f\x12\x9e\xf5\x44\xb2\x35\xda\x9d\x29\x35\x74\x0e\xed\xf4\xb7\x99\x3f\x41\x4c\x75\xd3\xf3\xc0\x9c\xa9\x89\xe3\xfd\xf3\xae\x96\x73\x0f\xd1\xcc\xa2\x63\x5c\x9b\x1a\x04\xb3\x7b\x92\xc8\x11\xcb\x8a\x68\x0d\x70\xfd\xb2\x9d\x0a\xed\x56\x7d\xc7\x8e\x66\xca\x38\x2b\xa8\x7a\xc2\x21\x21\xfc\x02\x04\xf9\xf2\xbf\x85\xf3\x86\x08\x15\x1a\x3a\x40\x0b\x6e\xa6\x46\xab\x46\x67\xd1\x56\x4e\xf0\xf4\x49\xc4\x41\xa8\xaf\xd8\xc6\x3c\x37\xde\xb3\x3b\xe4\x60\xfd\x3a\xc2\x54\xeb\x7d\x66\xe1\x8b\x85\xce\x72\xc5\xd2\x26\x72\x29\xa2\x5d\x54\x23\x42\x29\xc1\x30\x4e\x17\x53\x3e\x2c\xa4\xda\x45\x98\xd1\x7c\x53\xfe\x54\x2b\xf0\x66\x6d\xb9\xeb\xff\x9d\x88\xb5\x16\xce\x86\x7f\xf6\xa8\xd8\x9e\x34\xf3\x6f\xe0\xb3\x7f\xca\x08\x52\x37\x5d\xc3\xef\xc2\x3f\xad\xfd\xb2\xf8\x2e\xb8\xb1\x92\xd7\xdc\x88\x2a\xfb\xbe\x0a\x54\x65\x1c\xee\x1b\x64\xd9\x6c\x49\xc4\xef\xd9\x0a\x54\x06\x1c\xbb\x12\xe5\x01\xa0\x74\xfa\xaa\x1d\xaf\xf3\x44\x67\x45\xda\xbd\xf9\xef\xca\xbd\xb6\x4f\x6f\xa0\x6c\x84\xc5\xb6\x59\x08\xa8\x3e\xef\x82\x8f\xec\x73\x14\xcc\x7d\xa9\xfa\x7d\xc2\x5b\xbd\x08\x16\x21\x54\xbe\x45\xc3\xaa\xf6\xbd\x20\x06\x02\x27\xef\x4a\x84\x5e\x40\xe5\x70\x2c\x2d\xae\x52\xbe\xef\xbb\xc2\x74\x37\xde\xc1\x2a\x34\x41\xa5\x70\x59\xaf\x0c\xe9\x29\xb2\x0f\xb7\x3c\x5f\x63\x20\x67\xa3\x73\x12\x13\x47\xbe\x12\x84\xf1\x60\x4a\x62\x91\xe8\x05\xc8\xd2\x81\x6a\x7c\xdb\x3a\xa7\xc5\xd9\x6b\xe8\xea\x13\xd6\x67\x6d\x9b\xfd\x00\x35\x7f\xa9\xc8\x80\xfa\xa1\x9e\xf3\xeb\x8b\x90\x1d\x16\x6c\xaa\x77\xd7\x98\xad\x8b\x5a\xb0\xa9\xce\x15\x6e\xac\x3a\xc0\x25\x2f\x0f\xa8\x91\xb8\x0c\xeb\xe6\xcc\xf1\x46\xb4\xa9\x94\x54\x47\xe6\xc4\xca\xfb\x5a\xdd\xcf\x99\x9a\xe0\x6f\x4a\x2a\xf9\x4e\x13\xc3\x21\x12\x49\xe2\xcd\xed\x3f\x2c\xa4\x63\x93\x10\x03\x47\x7e\xfd\xc8\xdf\xb8\x20\x3c\x32\x82\xba\x35\x95\xcb\xd4\xf8\xd3\x19\xb8\x0b\x59\xb1\x38\xf3\x14\x09\x3a\x05\x07\x03\x18\x34\xb6\x1c\x74\x9e\x80\x39\xe5\xac\xe1\x20\xc1\x38\xb4\xe7\xb6\xb7\x54\x62\x3c\x21\xf3\x05\xf7\x42\xac\xd1\x75\xef\xee\xda\x31\xee\x3d\x44\x91\x6c\x7d\x28\x9a\xeb\x2e\x7b\x51\xba\x2c\xfd\xda\x00\xa5\x1e\x08\xa0\x16\x4d\xa4\x7f\x7e\x3b\x51\x1a\xb3\x3e\x76\xe2\xa1\x7c\xb5\xb2\xbb\xc6\x5c\x0e\xc9\x72\xb4\xa3\x38\xbf\x2d\xd0\x14\x26\x30\xdb\xf2\x17\x45\xd4\x04\xdd\xdc\x8e\x07\xd9\x87\x66\x5d\x60\x63\x1f\x6a\xd0\x2c\x6f\x29\x14\x91\xfc\xe4\xd2\x09\x08\x8d\x02\xd5\x47\x9e\x24\x21\x4d\xb6\x0f\x05\xcd\x94\x0f\x18\x98\xe3\x3f\x49\xcc\x9f\x51\xd5\x70\x13\x11\x45\x0c\xb5\x73\x62\x64\xeb\xe8\x89\x81\x8a\xd2\x48\x67\x78\x31\xf7\xd7\xe7\x7d\xbb\xf9\x54\xfe\xe4\x77\x56\x42\xb8\x27\x61\x8b\x8f\x9d\x3f\x89\xdd\xe0\xbe\x36\xa7\x4c\xbc\xae\x1c\xa8\xe8\xbb\x5a\xee\x88\xa7\xa9\x05\xec\xd2\x53\x19\x4f\x73\xb9\xe4\x51\x29\x82\xde\xd2\xcf\xb5\x88\x9e\xb6\x5a\xaa\xc1\xb6\x28\xe8\x8f\x39\x91\x72\x91\xe5\xcc\xb7\xe6\xe0\xc8\xbd\xf8\x1b\x4b\x07\x33\xbe\x48\x06\xa8\x04\x8b\x58\xf4\xfc\x3a\x9c\x39\xe1\xbc\xf6\x65\x77\xea\xab\x8c\xf0\x67\xc3\x2b\x84\x65\xba\xe3\x95\x68\x35\xea\x47\x73\x29\xa0\xcd\x6b\x85\x1c\x3d\x07\x9b\xb3\x12\x2b\x55\xe3\x90\x42\x34\xe2\xb7\x4b\xe2\xff\x7b\x97\x44\xc0\x45\xbc\xe6\x0d\xb1\xb9\xbc\xec\xb7\x33\xe2\xfb\x3a\x23\x90\xa5\x09\x71\xf3\x43\x86\x96\xba\x7a\xe7\xbf\x7e\xdc\xe0\x0a\x16\xf4\x24\x1b\x30\xce\xdf\xf0\x8c\x0b\x1e\x4b\x5b\x64\xa0\xf1\xe8\x6d\x74\xbb\xb3\x81\xfe\x14\xf5\x1e\x6d\x50\x3a\x55\xdb\xbe\x61\x48\x28\x0f\x97\x8e\xb9\x48\xf4\x0e\x27\xb6\x57\xa7\x7e\x57\x49\x91\x3e\xa7\xa4\xb1\x8c\x2e\x4d\x72\x6d\x2d\xa2\x12\x98\x2e\xec\xb0\x8c\x01\x2b\x20\xcf\xdf\x64\x6e\xd4\xcb\x16\xd0\xe2\xf3\xae\x64\x96\xff\x5c\xd1\x9c\x39\x4c\xb4\xe6\xd5\x32\xfb\xb6\xab\xd8\xcd\xe0\x1b\x9d\x09\xe9\xbb\x72\xca\x58\x2f\xed\x9a\x03\xda\x20\xab\x32\x60\xfa\x3d\xe4\xbc\xfa\xec\xc6\xeb\x33\x3a\x83\x2f\x29\xdf\x6e\x45\x6a\xf3\xa0\xb5\x54\x35\x50\xf6\xc3\x53\x40\x73\x63\x2d\x50\xf8\xab\x72\xa4\x1a\x53\x52\x69\x1a\x3e\x06\x43\x37\x6e\x9e\xb9\xeb\x22\x49\x5a\x67\x6e\x3f\x13\xf8\xf5\xe3\xd5\xd5\xfc\xe7\xc9\xd5\xe3\x65\x27\xb3\x76\xf0\xb1\xd6\x31\x71\x3d\xa1\x31\xf1\xda\x1d\xe6\xb1\xc2\x8a\x8f\x69\xff\xd6\xe8\x51\x17\x49\x52\x66\x5d\x9f\xa9\xcf\xd4\x0e\x80\xca\x50\x51\xc6\x8c\x1b\xeb\x1c\xb8\xf2\xf3\xe1\x63\x9f\x4d\xe3\x9f\xf1\xbb\x67\xcc\xbf\xc4\x0f\xa0\x0d\x42\x9a\x03\xcd\xe3\x4a\x88\xd5\x23\xb6\x03\x42\x98\xda\xb6\xc3\xa9\x75\x25\x0e\xdb\x1e\x8f\x0a\x18\xed\x44\x6c\xe5\x20\x4e\xb2\x3b\x70\xec\x3e\x97\xa3\x8b\xce\x96\xc7\x18\x21\x82\x76\x47\xa8\x06\x00\x1a\x67\x9e\x30\x7f\xa6\xf0\xc2\x65\xfa\x94\xeb\xf6\x3e\xb1\x29\xa1\x03\x12\xae\x56\x05\x5f\x89\x6c\xc4\xec\xc3\x67\x6a\x23\x57\x6b\xe0\x0e\xcc\x8a\x2d\x81\xdd\xf0\x8a\x02\x65\xa6\x95\x25\x54\x41\xbb\x49\x35\x53\xf4\x4e\x6a\xe5\x9b\x47\xcc\xd7\x5f\xee\xdd\xeb\x10\x94\x0e\x1b\x22\x41\x03\x35\x53\x38\xb9\x48\x50\x6c\xc3\x2e\xe0\x2f\xf3\xbc\xba\x74\x39\x08\x5e\xa1\xe8\x9f\xb1\xe9\x2b\x08\x00\xcd\x94\x2b\x53\x41\x50\x1e\xbd\x43\x40\x7c\x8b\x5d\xda\x6f\x4f\xec\x64\xd8\x3d\x41\x7d\x6b\x5e\xf5\x47\x9f\x01\x66\xc3\xcd\x07\xa8\x97\xd5\xcd\x58\xcf\xab\x09\x0f\x0c\x47\x5b\xed\x22\xd4\x26\x35\xf7\xc6\xbe\x17\x7e\xa6\x35\xa5\xae\x8b\x45\x32\xa0\x4b\xf8\xf9\xce\x4e\xa1\x49\xee\xee\x54\x8f\x98\xeb\x5d\x65\x6b\x99\x65\xda\xf5\xd8\x85\xd6\x2d\xf3\x72\xc2\xe8\x65\xa9\x53\xf4\x85\x7d\x83\x51\x44\xf9\x21\xeb\xa5\x47\x41\x41\x75\x88\xac\xf5\xe9\xea\x50\x22\xb3\x83\xba\xe3\xfd\xa7\xde\x3d\x72\x1e\x02\x1d\x76\x83\x2c\x2c\x9d\x73\x25\x03\xdb\x62\x26\x29\x78\x65\x65\xc0\x24\x9a\x17\xb3\x79\x50\xa3\xcb\xac\xff\x91\x5b\x44\x23\x3f\x73\x23\xe8\x64\x54\xa4\x99\x31\x97\x64\xef\xc8\x6a\xeb\x94\xf1\x99\xb2\x7c\xb2\xd6\x1c\x4f\x2c\x28\x20\x75\x3f\xc5\x22\x8d\x2d\xf2\x31\x82\xc7\x9a\x33\xad\x84\xb5\x86\x33\x65\xb5\xe3\x46\x8c\x2f\x32\x2b\xc9\xc6\xd5\xce\xe9\xa4\x49\x27\x82\xc1\x15\x03\xb4\xc5\x7e\x9b\x57\x71\x03\x4a\xe7\xfc\xef\xcc\x7f\xff\xf8\xdd\xff\x0d\x00\x00\xff\xff\x24\xee\xa6\x9d\x9a\x77\x04\x00") func adminSwaggerJsonBytes() ([]byte, error) { return bindataRead( @@ -93,7 +93,7 @@ func adminSwaggerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "admin.swagger.json", size: 295752, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} + info := bindataFileInfo{name: "admin.swagger.json", size: 292762, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java index 23292f1bde..6037e79688 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/ExecutionOuterClass.java @@ -24045,16 +24045,6 @@ public interface ExecutionUpdateRequestOrBuilder extends * .flyteidl.admin.ExecutionState state = 2; */ flyteidl.admin.ExecutionOuterClass.ExecutionState getState(); - - /** - * 
-     * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
-     * execution DAG and remove all stored results from datacatalog.
-     *
- * - * bool evict_cache = 3; - */ - boolean getEvictCache(); } /** * Protobuf type {@code flyteidl.admin.ExecutionUpdateRequest} @@ -24115,11 +24105,6 @@ private ExecutionUpdateRequest( state_ = rawValue; break; } - case 24: { - - evictCache_ = input.readBool(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -24210,20 +24195,6 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionState getState() { return result == null ? flyteidl.admin.ExecutionOuterClass.ExecutionState.UNRECOGNIZED : result; } - public static final int EVICT_CACHE_FIELD_NUMBER = 3; - private boolean evictCache_; - /** - * 
-     * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
-     * execution DAG and remove all stored results from datacatalog.
-     *
- * - * bool evict_cache = 3; - */ - public boolean getEvictCache() { - return evictCache_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -24244,9 +24215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (state_ != flyteidl.admin.ExecutionOuterClass.ExecutionState.EXECUTION_ACTIVE.getNumber()) { output.writeEnum(2, state_); } - if (evictCache_ != false) { - output.writeBool(3, evictCache_); - } unknownFields.writeTo(output); } @@ -24264,10 +24232,6 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeEnumSize(2, state_); } - if (evictCache_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, evictCache_); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -24289,8 +24253,6 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getId())) return false; } if (state_ != other.state_) return false; - if (getEvictCache() - != other.getEvictCache()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -24308,9 +24270,6 @@ public int hashCode() { } hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + state_; - hash = (37 * hash) + EVICT_CACHE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getEvictCache()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -24452,8 +24411,6 @@ public Builder clear() { } state_ = 0; - evictCache_ = false; - return this; } @@ -24486,7 +24443,6 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateRequest buildPartial() result.id_ = idBuilder_.build(); } result.state_ = state_; - result.evictCache_ = evictCache_; onBuilt(); return result; } @@ -24541,9 +24497,6 @@ public Builder mergeFrom(flyteidl.admin.ExecutionOuterClass.ExecutionUpdateReque if (other.state_ != 0) { setStateValue(other.getStateValue()); } - if (other.getEvictCache() != false) { - setEvictCache(other.getEvictCache()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -24790,47 +24743,6 @@ public Builder clearState() { onChanged(); return this; } - - private boolean evictCache_ ; - /** - * 
-       * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
-       * execution DAG and remove all stored results from datacatalog.
-       *
- * - * bool evict_cache = 3; - */ - public boolean getEvictCache() { - return evictCache_; - } - /** - * 
-       * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
-       * execution DAG and remove all stored results from datacatalog.
-       *
- * - * bool evict_cache = 3; - */ - public Builder setEvictCache(boolean value) { - - evictCache_ = value; - onChanged(); - return this; - } - /** - * 
-       * Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the
-       * execution DAG and remove all stored results from datacatalog.
-       *
- * - * bool evict_cache = 3; - */ - public Builder clearEvictCache() { - - evictCache_ = false; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -25856,34 +25768,6 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionStateChangeDetails getDefault public interface ExecutionUpdateResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:flyteidl.admin.ExecutionUpdateResponse) com.google.protobuf.MessageOrBuilder { - - /** - * 
-     * List of errors encountered during cache eviction (if any).
-     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-     *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - boolean hasCacheEvictionErrors(); - /** - * 
-     * List of errors encountered during cache eviction (if any).
-     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-     *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors(); - /** - * 
-     * List of errors encountered during cache eviction (if any).
-     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-     *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder(); } /** * Protobuf type {@code flyteidl.admin.ExecutionUpdateResponse} @@ -25913,7 +25797,6 @@ private ExecutionUpdateResponse( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -25924,19 +25807,6 @@ private ExecutionUpdateResponse( case 0: done = true; break; - case 10: { - flyteidl.core.Errors.CacheEvictionErrorList.Builder subBuilder = null; - if (cacheEvictionErrors_ != null) { - subBuilder = cacheEvictionErrors_.toBuilder(); - } - cacheEvictionErrors_ = input.readMessage(flyteidl.core.Errors.CacheEvictionErrorList.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(cacheEvictionErrors_); - cacheEvictionErrors_ = subBuilder.buildPartial(); - } - - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -25969,42 +25839,6 @@ private ExecutionUpdateResponse( flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse.class, flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse.Builder.class); } - public static final int CACHE_EVICTION_ERRORS_FIELD_NUMBER = 1; - private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; - /** - * 
-     * List of errors encountered during cache eviction (if any).
-     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-     *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public boolean hasCacheEvictionErrors() { - return cacheEvictionErrors_ != null; - } - /** - * 
-     * List of errors encountered during cache eviction (if any).
-     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-     *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { - return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; - } - /** - * 
-     * List of errors encountered during cache eviction (if any).
-     * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-     *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { - return getCacheEvictionErrors(); - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -26019,9 +25853,6 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (cacheEvictionErrors_ != null) { - output.writeMessage(1, getCacheEvictionErrors()); - } unknownFields.writeTo(output); } @@ -26031,10 +25862,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (cacheEvictionErrors_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getCacheEvictionErrors()); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -26050,11 +25877,6 @@ public boolean equals(final java.lang.Object obj) { } flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse other = (flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse) obj; - if (hasCacheEvictionErrors() != other.hasCacheEvictionErrors()) return false; - if (hasCacheEvictionErrors()) { - if (!getCacheEvictionErrors() - .equals(other.getCacheEvictionErrors())) return false; - } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -26066,10 +25888,6 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasCacheEvictionErrors()) { - hash = (37 * hash) + CACHE_EVICTION_ERRORS_FIELD_NUMBER; - hash = (53 * hash) + getCacheEvictionErrors().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -26203,12 +26021,6 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrors_ = null; - } else { - cacheEvictionErrors_ = null; - cacheEvictionErrorsBuilder_ = null; - } return this; } @@ -26235,11 +26047,6 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse build() { @java.lang.Override public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse buildPartial() { flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse result = new flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse(this); - if (cacheEvictionErrorsBuilder_ == null) { - result.cacheEvictionErrors_ = cacheEvictionErrors_; - } else { - result.cacheEvictionErrors_ = cacheEvictionErrorsBuilder_.build(); - } onBuilt(); return result; } @@ -26288,9 +26095,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse other) { if (other == flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse.getDefaultInstance()) return this; - if (other.hasCacheEvictionErrors()) { - mergeCacheEvictionErrors(other.getCacheEvictionErrors()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -26319,168 +26123,6 @@ public Builder mergeFrom( } return this; } - - private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> cacheEvictionErrorsBuilder_; - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public boolean hasCacheEvictionErrors() { - return cacheEvictionErrorsBuilder_ != null || cacheEvictionErrors_ != null; - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { - if (cacheEvictionErrorsBuilder_ == null) { - return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; - } else { - return cacheEvictionErrorsBuilder_.getMessage(); - } - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder setCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { - if (cacheEvictionErrorsBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - cacheEvictionErrors_ = value; - onChanged(); - } else { - cacheEvictionErrorsBuilder_.setMessage(value); - } - - return this; - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder setCacheEvictionErrors( - flyteidl.core.Errors.CacheEvictionErrorList.Builder builderForValue) { - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrors_ = builderForValue.build(); - onChanged(); - } else { - cacheEvictionErrorsBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder mergeCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { - if (cacheEvictionErrorsBuilder_ == null) { - if (cacheEvictionErrors_ != null) { - cacheEvictionErrors_ = - flyteidl.core.Errors.CacheEvictionErrorList.newBuilder(cacheEvictionErrors_).mergeFrom(value).buildPartial(); - } else { - cacheEvictionErrors_ = value; - } - onChanged(); - } else { - cacheEvictionErrorsBuilder_.mergeFrom(value); - } - - return this; - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder clearCacheEvictionErrors() { - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrors_ = null; - onChanged(); - } else { - cacheEvictionErrors_ = null; - cacheEvictionErrorsBuilder_ = null; - } - - return this; - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorList.Builder getCacheEvictionErrorsBuilder() { - - onChanged(); - return getCacheEvictionErrorsFieldBuilder().getBuilder(); - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { - if (cacheEvictionErrorsBuilder_ != null) { - return cacheEvictionErrorsBuilder_.getMessageOrBuilder(); - } else { - return cacheEvictionErrors_ == null ? - flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; - } - } - /** - * 
-       * List of errors encountered during cache eviction (if any).
-       * Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set.
-       *
- * - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> - getCacheEvictionErrorsFieldBuilder() { - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrorsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder>( - getCacheEvictionErrors(), - getParentForChildren(), - isClean()); - cacheEvictionErrors_ = null; - } - return cacheEvictionErrorsBuilder_; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -26651,112 +26293,109 @@ public flyteidl.admin.ExecutionOuterClass.ExecutionUpdateResponse getDefaultInst "\n\036flyteidl/admin/execution.proto\022\016flytei" + "dl.admin\032\'flyteidl/admin/cluster_assignm" + "ent.proto\032\033flyteidl/admin/common.proto\032\034" + - "flyteidl/core/literals.proto\032\032flyteidl/c" + - "ore/errors.proto\032\035flyteidl/core/executio" + - "n.proto\032\036flyteidl/core/identifier.proto\032" + - "\034flyteidl/core/security.proto\032\036google/pr" + - "otobuf/duration.proto\032\037google/protobuf/t" + - "imestamp.proto\032\036google/protobuf/wrappers" + - ".proto\"\237\001\n\026ExecutionCreateRequest\022\017\n\007pro" + - "ject\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014\n\004name\030\003 \001(\t" + - "\022+\n\004spec\030\004 \001(\0132\035.flyteidl.admin.Executio" + - "nSpec\022)\n\006inputs\030\005 \001(\0132\031.flyteidl.core.Li" + - "teralMap\"\177\n\030ExecutionRelaunchRequest\0226\n\002" + - "id\030\001 \001(\0132*.flyteidl.core.WorkflowExecuti" + - "onIdentifier\022\014\n\004name\030\003 \001(\t\022\027\n\017overwrite_" + - "cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027ExecutionRecoverRe" + - "quest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workfl" + - "owExecutionIdentifier\022\014\n\004name\030\002 \001(\t\0223\n\010m" + - "etadata\030\003 \001(\0132!.flyteidl.admin.Execution" + - "Metadata\"Q\n\027ExecutionCreateResponse\0226\n\002i" + - "d\030\001 \001(\0132*.flyteidl.core.WorkflowExecutio" + - "nIdentifier\"U\n\033WorkflowExecutionGetReque" + - "st\0226\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowE" + - "xecutionIdentifier\"\243\001\n\tExecution\0226\n\002id\030\001" + - " \001(\0132*.flyteidl.core.WorkflowExecutionId" + - "entifier\022+\n\004spec\030\002 \001(\0132\035.flyteidl.admin." + - "ExecutionSpec\0221\n\007closure\030\003 \001(\0132 .flyteid" + - "l.admin.ExecutionClosure\"M\n\rExecutionLis" + - "t\022-\n\nexecutions\030\001 \003(\0132\031.flyteidl.admin.E" + - "xecution\022\r\n\005token\030\002 \001(\t\"X\n\016LiteralMapBlo" + - "b\022/\n\006values\030\001 \001(\0132\031.flyteidl.core.Litera" + - "lMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n\004data\"1\n\rAbo" + - "rtMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n\tprincipal\030\002" + - " \001(\t\"\360\005\n\020ExecutionClosure\0225\n\007outputs\030\001 \001" + - "(\0132\036.flyteidl.admin.LiteralMapBlobB\002\030\001H\000" + - "\022.\n\005error\030\002 \001(\0132\035.flyteidl.core.Executio" + - "nErrorH\000\022\031\n\013abort_cause\030\n \001(\tB\002\030\001H\000\0227\n\016a" + - "bort_metadata\030\014 \001(\0132\035.flyteidl.admin.Abo" + - "rtMetadataH\000\0224\n\013output_data\030\r \001(\0132\031.flyt" + - "eidl.core.LiteralMapB\002\030\001H\000\0226\n\017computed_i" + - "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMapB\002" + - "\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl.core.Workfl" + - "owExecution.Phase\022.\n\nstarted_at\030\005 \001(\0132\032." + - "google.protobuf.Timestamp\022+\n\010duration\030\006 " + - "\001(\0132\031.google.protobuf.Duration\022.\n\ncreate" + - "d_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022." + - "\n\nupdated_at\030\010 \001(\0132\032.google.protobuf.Tim" + - "estamp\0223\n\rnotifications\030\t \003(\0132\034.flyteidl" + - ".admin.Notification\022.\n\013workflow_id\030\013 \001(\013" + - "2\031.flyteidl.core.Identifier\022I\n\024state_cha" + - "nge_details\030\016 \001(\0132+.flyteidl.admin.Execu" + - "tionStateChangeDetailsB\017\n\routput_result\"" + - "+\n\016SystemMetadata\022\031\n\021execution_cluster\030\001" + - " \001(\t\"\332\003\n\021ExecutionMetadata\022=\n\004mode\030\001 \001(\016" + - "2/.flyteidl.admin.ExecutionMetadata.Exec" + - "utionMode\022\021\n\tprincipal\030\002 \001(\t\022\017\n\007nesting\030" + - "\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132\032.google.pro" + - "tobuf.Timestamp\022E\n\025parent_node_execution" + - "\030\005 \001(\0132&.flyteidl.core.NodeExecutionIden" + - "tifier\022G\n\023reference_execution\030\020 \001(\0132*.fl" + - "yteidl.core.WorkflowExecutionIdentifier\022" + - "7\n\017system_metadata\030\021 \001(\0132\036.flyteidl.admi" + - "n.SystemMetadata\"g\n\rExecutionMode\022\n\n\006MAN" + - "UAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYSTEM\020\002\022\014\n\010RELA" + - "UNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r\n\tRECOVERED\020" + - "\005\"G\n\020NotificationList\0223\n\rnotifications\030\001" + - " \003(\0132\034.flyteidl.admin.Notification\"\200\006\n\rE" + - "xecutionSpec\022.\n\013launch_plan\030\001 \001(\0132\031.flyt" + - "eidl.core.Identifier\022-\n\006inputs\030\002 \001(\0132\031.f" + - "lyteidl.core.LiteralMapB\002\030\001\0223\n\010metadata\030" + - "\003 \001(\0132!.flyteidl.admin.ExecutionMetadata" + - "\0229\n\rnotifications\030\005 \001(\0132 .flyteidl.admin" + - ".NotificationListH\000\022\025\n\013disable_all\030\006 \001(\010" + - "H\000\022&\n\006labels\030\007 \001(\0132\026.flyteidl.admin.Labe" + - "ls\0220\n\013annotations\030\010 \001(\0132\033.flyteidl.admin" + - ".Annotations\0228\n\020security_context\030\n \001(\0132\036" + - ".flyteidl.core.SecurityContext\022/\n\tauth_r" + - "ole\030\020 \001(\0132\030.flyteidl.admin.AuthRoleB\002\030\001\022" + - ";\n\022quality_of_service\030\021 \001(\0132\037.flyteidl.c" + - "ore.QualityOfService\022\027\n\017max_parallelism\030" + - "\022 \001(\005\022C\n\026raw_output_data_config\030\023 \001(\0132#." + - "flyteidl.admin.RawOutputDataConfig\022=\n\022cl" + - "uster_assignment\030\024 \001(\0132!.flyteidl.admin." + - "ClusterAssignment\0221\n\rinterruptible\030\025 \001(\013" + - "2\032.google.protobuf.BoolValue\022\027\n\017overwrit" + - "e_cache\030\026 \001(\010B\030\n\026notification_overridesJ" + - "\004\010\004\020\005\"b\n\031ExecutionTerminateRequest\0226\n\002id" + - "\030\001 \001(\0132*.flyteidl.core.WorkflowExecution" + - "Identifier\022\r\n\005cause\030\002 \001(\t\"\034\n\032ExecutionTe" + - "rminateResponse\"Y\n\037WorkflowExecutionGetD" + - "ataRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.W" + - "orkflowExecutionIdentifier\"\336\001\n WorkflowE" + - "xecutionGetDataResponse\022,\n\007outputs\030\001 \001(\013" + - "2\027.flyteidl.admin.UrlBlobB\002\030\001\022+\n\006inputs\030" + - "\002 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013fu" + - "ll_inputs\030\003 \001(\0132\031.flyteidl.core.LiteralM" + - "ap\022/\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core" + - ".LiteralMap\"\224\001\n\026ExecutionUpdateRequest\0226" + - "\n\002id\030\001 \001(\0132*.flyteidl.core.WorkflowExecu" + - "tionIdentifier\022-\n\005state\030\002 \001(\0162\036.flyteidl" + - ".admin.ExecutionState\022\023\n\013evict_cache\030\003 \001" + - "(\010\"\220\001\n\033ExecutionStateChangeDetails\022-\n\005st" + - "ate\030\001 \001(\0162\036.flyteidl.admin.ExecutionStat" + - "e\022/\n\013occurred_at\030\002 \001(\0132\032.google.protobuf" + - ".Timestamp\022\021\n\tprincipal\030\003 \001(\t\"_\n\027Executi" + - "onUpdateResponse\022D\n\025cache_eviction_error" + - "s\030\001 \001(\0132%.flyteidl.core.CacheEvictionErr" + - "orList*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" + + "flyteidl/core/literals.proto\032\035flyteidl/c" + + "ore/execution.proto\032\036flyteidl/core/ident" + + "ifier.proto\032\034flyteidl/core/security.prot" + + "o\032\036google/protobuf/duration.proto\032\037googl" + + "e/protobuf/timestamp.proto\032\036google/proto" + + "buf/wrappers.proto\"\237\001\n\026ExecutionCreateRe" + + "quest\022\017\n\007project\030\001 \001(\t\022\016\n\006domain\030\002 \001(\t\022\014" + + "\n\004name\030\003 \001(\t\022+\n\004spec\030\004 \001(\0132\035.flyteidl.ad" + + "min.ExecutionSpec\022)\n\006inputs\030\005 \001(\0132\031.flyt" + + "eidl.core.LiteralMap\"\177\n\030ExecutionRelaunc" + + "hRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" + + "kflowExecutionIdentifier\022\014\n\004name\030\003 \001(\t\022\027" + + "\n\017overwrite_cache\030\004 \001(\010J\004\010\002\020\003\"\224\001\n\027Execut" + + "ionRecoverRequest\0226\n\002id\030\001 \001(\0132*.flyteidl" + + ".core.WorkflowExecutionIdentifier\022\014\n\004nam" + + "e\030\002 \001(\t\0223\n\010metadata\030\003 \001(\0132!.flyteidl.adm" + + "in.ExecutionMetadata\"Q\n\027ExecutionCreateR" + + "esponse\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Work" + + "flowExecutionIdentifier\"U\n\033WorkflowExecu" + + "tionGetRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.co" + + "re.WorkflowExecutionIdentifier\"\243\001\n\tExecu" + + "tion\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workflo" + + "wExecutionIdentifier\022+\n\004spec\030\002 \001(\0132\035.fly" + + "teidl.admin.ExecutionSpec\0221\n\007closure\030\003 \001" + + "(\0132 .flyteidl.admin.ExecutionClosure\"M\n\r" + + "ExecutionList\022-\n\nexecutions\030\001 \003(\0132\031.flyt" + + "eidl.admin.Execution\022\r\n\005token\030\002 \001(\t\"X\n\016L" + + "iteralMapBlob\022/\n\006values\030\001 \001(\0132\031.flyteidl" + + ".core.LiteralMapB\002\030\001H\000\022\r\n\003uri\030\002 \001(\tH\000B\006\n" + + "\004data\"1\n\rAbortMetadata\022\r\n\005cause\030\001 \001(\t\022\021\n" + + "\tprincipal\030\002 \001(\t\"\360\005\n\020ExecutionClosure\0225\n" + + "\007outputs\030\001 \001(\0132\036.flyteidl.admin.LiteralM" + + "apBlobB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl.c" + + "ore.ExecutionErrorH\000\022\031\n\013abort_cause\030\n \001(" + + "\tB\002\030\001H\000\0227\n\016abort_metadata\030\014 \001(\0132\035.flytei" + + "dl.admin.AbortMetadataH\000\0224\n\013output_data\030" + + "\r \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0226" + + "\n\017computed_inputs\030\003 \001(\0132\031.flyteidl.core." + + "LiteralMapB\002\030\001\0225\n\005phase\030\004 \001(\0162&.flyteidl" + + ".core.WorkflowExecution.Phase\022.\n\nstarted" + + "_at\030\005 \001(\0132\032.google.protobuf.Timestamp\022+\n" + + "\010duration\030\006 \001(\0132\031.google.protobuf.Durati" + + "on\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf" + + ".Timestamp\022.\n\nupdated_at\030\010 \001(\0132\032.google." + + "protobuf.Timestamp\0223\n\rnotifications\030\t \003(" + + "\0132\034.flyteidl.admin.Notification\022.\n\013workf" + + "low_id\030\013 \001(\0132\031.flyteidl.core.Identifier\022" + + "I\n\024state_change_details\030\016 \001(\0132+.flyteidl" + + ".admin.ExecutionStateChangeDetailsB\017\n\rou" + + "tput_result\"+\n\016SystemMetadata\022\031\n\021executi" + + "on_cluster\030\001 \001(\t\"\332\003\n\021ExecutionMetadata\022=" + + "\n\004mode\030\001 \001(\0162/.flyteidl.admin.ExecutionM" + + "etadata.ExecutionMode\022\021\n\tprincipal\030\002 \001(\t" + + "\022\017\n\007nesting\030\003 \001(\r\0220\n\014scheduled_at\030\004 \001(\0132" + + "\032.google.protobuf.Timestamp\022E\n\025parent_no" + + "de_execution\030\005 \001(\0132&.flyteidl.core.NodeE" + + "xecutionIdentifier\022G\n\023reference_executio" + + "n\030\020 \001(\0132*.flyteidl.core.WorkflowExecutio" + + "nIdentifier\0227\n\017system_metadata\030\021 \001(\0132\036.f" + + "lyteidl.admin.SystemMetadata\"g\n\rExecutio" + + "nMode\022\n\n\006MANUAL\020\000\022\r\n\tSCHEDULED\020\001\022\n\n\006SYST" + + "EM\020\002\022\014\n\010RELAUNCH\020\003\022\022\n\016CHILD_WORKFLOW\020\004\022\r" + + "\n\tRECOVERED\020\005\"G\n\020NotificationList\0223\n\rnot" + + "ifications\030\001 \003(\0132\034.flyteidl.admin.Notifi" + + "cation\"\200\006\n\rExecutionSpec\022.\n\013launch_plan\030" + + "\001 \001(\0132\031.flyteidl.core.Identifier\022-\n\006inpu" + + "ts\030\002 \001(\0132\031.flyteidl.core.LiteralMapB\002\030\001\022" + + "3\n\010metadata\030\003 \001(\0132!.flyteidl.admin.Execu" + + "tionMetadata\0229\n\rnotifications\030\005 \001(\0132 .fl" + + "yteidl.admin.NotificationListH\000\022\025\n\013disab" + + "le_all\030\006 \001(\010H\000\022&\n\006labels\030\007 \001(\0132\026.flyteid" + + "l.admin.Labels\0220\n\013annotations\030\010 \001(\0132\033.fl" + + "yteidl.admin.Annotations\0228\n\020security_con" + + "text\030\n \001(\0132\036.flyteidl.core.SecurityConte" + + "xt\022/\n\tauth_role\030\020 \001(\0132\030.flyteidl.admin.A" + + "uthRoleB\002\030\001\022;\n\022quality_of_service\030\021 \001(\0132" + + "\037.flyteidl.core.QualityOfService\022\027\n\017max_" + + "parallelism\030\022 \001(\005\022C\n\026raw_output_data_con" + + "fig\030\023 \001(\0132#.flyteidl.admin.RawOutputData" + + "Config\022=\n\022cluster_assignment\030\024 \001(\0132!.fly" + + "teidl.admin.ClusterAssignment\0221\n\rinterru" + + "ptible\030\025 \001(\0132\032.google.protobuf.BoolValue" + + "\022\027\n\017overwrite_cache\030\026 \001(\010B\030\n\026notificatio" + + "n_overridesJ\004\010\004\020\005\"b\n\031ExecutionTerminateR" + + "equest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Workf" + + "lowExecutionIdentifier\022\r\n\005cause\030\002 \001(\t\"\034\n" + + "\032ExecutionTerminateResponse\"Y\n\037WorkflowE" + + "xecutionGetDataRequest\0226\n\002id\030\001 \001(\0132*.fly" + + "teidl.core.WorkflowExecutionIdentifier\"\336" + + "\001\n WorkflowExecutionGetDataResponse\022,\n\007o" + + "utputs\030\001 \001(\0132\027.flyteidl.admin.UrlBlobB\002\030" + + "\001\022+\n\006inputs\030\002 \001(\0132\027.flyteidl.admin.UrlBl" + + "obB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132\031.flyteidl.c" + + "ore.LiteralMap\022/\n\014full_outputs\030\004 \001(\0132\031.f" + + "lyteidl.core.LiteralMap\"\177\n\026ExecutionUpda" + + "teRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wo" + + "rkflowExecutionIdentifier\022-\n\005state\030\002 \001(\016" + + "2\036.flyteidl.admin.ExecutionState\"\220\001\n\033Exe" + + "cutionStateChangeDetails\022-\n\005state\030\001 \001(\0162" + + "\036.flyteidl.admin.ExecutionState\022/\n\013occur" + + "red_at\030\002 \001(\0132\032.google.protobuf.Timestamp" + + "\022\021\n\tprincipal\030\003 \001(\t\"\031\n\027ExecutionUpdateRe" + + "sponse*>\n\016ExecutionState\022\024\n\020EXECUTION_AC" + "TIVE\020\000\022\026\n\022EXECUTION_ARCHIVED\020\001B7Z5github" + ".com/flyteorg/flyteidl/gen/pb-go/flyteid" + "l/adminb\006proto3" @@ -26775,7 +26414,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( flyteidl.admin.ClusterAssignmentOuterClass.getDescriptor(), flyteidl.admin.Common.getDescriptor(), flyteidl.core.Literals.getDescriptor(), - flyteidl.core.Errors.getDescriptor(), flyteidl.core.Execution.getDescriptor(), flyteidl.core.IdentifierOuterClass.getDescriptor(), flyteidl.core.Security.getDescriptor(), @@ -26896,7 +26534,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_ExecutionUpdateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_ExecutionUpdateRequest_descriptor, - new java.lang.String[] { "Id", "State", "EvictCache", }); + new java.lang.String[] { "Id", "State", }); internal_static_flyteidl_admin_ExecutionStateChangeDetails_descriptor = getDescriptor().getMessageTypes().get(19); internal_static_flyteidl_admin_ExecutionStateChangeDetails_fieldAccessorTable = new @@ -26908,11 +26546,10 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_ExecutionUpdateResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_ExecutionUpdateResponse_descriptor, - new java.lang.String[] { "CacheEvictionErrors", }); + new java.lang.String[] { }); flyteidl.admin.ClusterAssignmentOuterClass.getDescriptor(); flyteidl.admin.Common.getDescriptor(); flyteidl.core.Literals.getDescriptor(); - flyteidl.core.Errors.getDescriptor(); flyteidl.core.Execution.getDescriptor(); flyteidl.core.IdentifierOuterClass.getDescriptor(); flyteidl.core.Security.getDescriptor(); diff --git a/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java index 0243a44e8a..a5aeb376d3 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/TaskExecutionOuterClass.java @@ -10302,1366 +10302,6 @@ public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionGetDataResponse getDe } - public interface TaskExecutionUpdateRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:flyteidl.admin.TaskExecutionUpdateRequest) - com.google.protobuf.MessageOrBuilder { - - /** - * 
-     * Identifier of the task execution to update
-     *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - boolean hasId(); - /** - * 
-     * Identifier of the task execution to update
-     *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId(); - /** - * 
-     * Identifier of the task execution to update
-     *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder(); - - /** - * 
-     * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
-     * execution DAG and remove all stored results from datacatalog.
-     *
- * - * bool evict_cache = 2; - */ - boolean getEvictCache(); - } - /** - * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateRequest} - */ - public static final class TaskExecutionUpdateRequest extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:flyteidl.admin.TaskExecutionUpdateRequest) - TaskExecutionUpdateRequestOrBuilder { - private static final long serialVersionUID = 0L; - // Use TaskExecutionUpdateRequest.newBuilder() to construct. - private TaskExecutionUpdateRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private TaskExecutionUpdateRequest() { - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private TaskExecutionUpdateRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder subBuilder = null; - if (id_ != null) { - subBuilder = id_.toBuilder(); - } - id_ = input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(id_); - id_ = subBuilder.buildPartial(); - } - - break; - } - case 16: { - - evictCache_ = input.readBool(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.Builder.class); - } - - public static final int ID_FIELD_NUMBER = 1; - private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; - /** - * 
-     * Identifier of the task execution to update
-     *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public boolean hasId() { - return id_ != null; - } - /** - * 
-     * Identifier of the task execution to update
-     *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { - return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; - } - /** - * 
-     * Identifier of the task execution to update
-     *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { - return getId(); - } - - public static final int EVICT_CACHE_FIELD_NUMBER = 2; - private boolean evictCache_; - /** - * 
-     * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
-     * execution DAG and remove all stored results from datacatalog.
-     *
- * - * bool evict_cache = 2; - */ - public boolean getEvictCache() { - return evictCache_; - } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (id_ != null) { - output.writeMessage(1, getId()); - } - if (evictCache_ != false) { - output.writeBool(2, evictCache_); - } - unknownFields.writeTo(output); - } - - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (id_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getId()); - } - if (evictCache_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, evictCache_); - } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest)) { - return super.equals(obj); - } - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest other = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest) obj; - - if (hasId() != other.hasId()) return false; - if (hasId()) { - if (!getId() - .equals(other.getId())) return false; - } - if (getEvictCache() - != other.getEvictCache()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasId()) { - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId().hashCode(); - } - hash = (37 * hash) + EVICT_CACHE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getEvictCache()); - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateRequest} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:flyteidl.admin.TaskExecutionUpdateRequest) - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequestOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.Builder.class); - } - - // Construct using flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (idBuilder_ == null) { - id_ = null; - } else { - id_ = null; - idBuilder_ = null; - } - evictCache_ = false; - - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest getDefaultInstanceForType() { - return flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.getDefaultInstance(); - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest build() { - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest buildPartial() { - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest result = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest(this); - if (idBuilder_ == null) { - result.id_ = id_; - } else { - result.id_ = idBuilder_.build(); - } - result.evictCache_ = evictCache_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest) { - return mergeFrom((flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest other) { - if (other == flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest.getDefaultInstance()) return this; - if (other.hasId()) { - mergeId(other.getId()); - } - if (other.getEvictCache() != false) { - setEvictCache(other.getEvictCache()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> idBuilder_; - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public boolean hasId() { - return idBuilder_ != null || id_ != null; - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { - if (idBuilder_ == null) { - return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; - } else { - return idBuilder_.getMessage(); - } - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public Builder setId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { - if (idBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - id_ = value; - onChanged(); - } else { - idBuilder_.setMessage(value); - } - - return this; - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public Builder setId( - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder builderForValue) { - if (idBuilder_ == null) { - id_ = builderForValue.build(); - onChanged(); - } else { - idBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public Builder mergeId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { - if (idBuilder_ == null) { - if (id_ != null) { - id_ = - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder(id_).mergeFrom(value).buildPartial(); - } else { - id_ = value; - } - onChanged(); - } else { - idBuilder_.mergeFrom(value); - } - - return this; - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public Builder clearId() { - if (idBuilder_ == null) { - id_ = null; - onChanged(); - } else { - id_ = null; - idBuilder_ = null; - } - - return this; - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getIdBuilder() { - - onChanged(); - return getIdFieldBuilder().getBuilder(); - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { - if (idBuilder_ != null) { - return idBuilder_.getMessageOrBuilder(); - } else { - return id_ == null ? - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; - } - } - /** - * 
-       * Identifier of the task execution to update
-       *
- * - * .flyteidl.core.TaskExecutionIdentifier id = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> - getIdFieldBuilder() { - if (idBuilder_ == null) { - idBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder>( - getId(), - getParentForChildren(), - isClean()); - id_ = null; - } - return idBuilder_; - } - - private boolean evictCache_ ; - /** - * 
-       * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
-       * execution DAG and remove all stored results from datacatalog.
-       *
- * - * bool evict_cache = 2; - */ - public boolean getEvictCache() { - return evictCache_; - } - /** - * 
-       * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
-       * execution DAG and remove all stored results from datacatalog.
-       *
- * - * bool evict_cache = 2; - */ - public Builder setEvictCache(boolean value) { - - evictCache_ = value; - onChanged(); - return this; - } - /** - * 
-       * Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the
-       * execution DAG and remove all stored results from datacatalog.
-       *
- * - * bool evict_cache = 2; - */ - public Builder clearEvictCache() { - - evictCache_ = false; - onChanged(); - return this; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:flyteidl.admin.TaskExecutionUpdateRequest) - } - - // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateRequest) - private static final flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest(); - } - - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public TaskExecutionUpdateRequest parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new TaskExecutionUpdateRequest(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateRequest getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - - public interface TaskExecutionUpdateResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:flyteidl.admin.TaskExecutionUpdateResponse) - com.google.protobuf.MessageOrBuilder { - - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - boolean hasCacheEvictionErrors(); - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors(); - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder(); - } - /** - * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateResponse} - */ - public static final class TaskExecutionUpdateResponse extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:flyteidl.admin.TaskExecutionUpdateResponse) - TaskExecutionUpdateResponseOrBuilder { - private static final long serialVersionUID = 0L; - // Use TaskExecutionUpdateResponse.newBuilder() to construct. - private TaskExecutionUpdateResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private TaskExecutionUpdateResponse() { - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private TaskExecutionUpdateResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - flyteidl.core.Errors.CacheEvictionErrorList.Builder subBuilder = null; - if (cacheEvictionErrors_ != null) { - subBuilder = cacheEvictionErrors_.toBuilder(); - } - cacheEvictionErrors_ = input.readMessage(flyteidl.core.Errors.CacheEvictionErrorList.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(cacheEvictionErrors_); - cacheEvictionErrors_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.Builder.class); - } - - public static final int CACHE_EVICTION_ERRORS_FIELD_NUMBER = 1; - private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public boolean hasCacheEvictionErrors() { - return cacheEvictionErrors_ != null; - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { - return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { - return getCacheEvictionErrors(); - } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (cacheEvictionErrors_ != null) { - output.writeMessage(1, getCacheEvictionErrors()); - } - unknownFields.writeTo(output); - } - - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (cacheEvictionErrors_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getCacheEvictionErrors()); - } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse)) { - return super.equals(obj); - } - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse other = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse) obj; - - if (hasCacheEvictionErrors() != other.hasCacheEvictionErrors()) return false; - if (hasCacheEvictionErrors()) { - if (!getCacheEvictionErrors() - .equals(other.getCacheEvictionErrors())) return false; - } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasCacheEvictionErrors()) { - hash = (37 * hash) + CACHE_EVICTION_ERRORS_FIELD_NUMBER; - hash = (53 * hash) + getCacheEvictionErrors().hashCode(); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code flyteidl.admin.TaskExecutionUpdateResponse} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:flyteidl.admin.TaskExecutionUpdateResponse) - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponseOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.class, flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.Builder.class); - } - - // Construct using flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrors_ = null; - } else { - cacheEvictionErrors_ = null; - cacheEvictionErrorsBuilder_ = null; - } - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return flyteidl.admin.TaskExecutionOuterClass.internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDefaultInstanceForType() { - return flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.getDefaultInstance(); - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse build() { - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse buildPartial() { - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse result = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse(this); - if (cacheEvictionErrorsBuilder_ == null) { - result.cacheEvictionErrors_ = cacheEvictionErrors_; - } else { - result.cacheEvictionErrors_ = cacheEvictionErrorsBuilder_.build(); - } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse) { - return mergeFrom((flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse other) { - if (other == flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse.getDefaultInstance()) return this; - if (other.hasCacheEvictionErrors()) { - mergeCacheEvictionErrors(other.getCacheEvictionErrors()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private flyteidl.core.Errors.CacheEvictionErrorList cacheEvictionErrors_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> cacheEvictionErrorsBuilder_; - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public boolean hasCacheEvictionErrors() { - return cacheEvictionErrorsBuilder_ != null || cacheEvictionErrors_ != null; - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorList getCacheEvictionErrors() { - if (cacheEvictionErrorsBuilder_ == null) { - return cacheEvictionErrors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; - } else { - return cacheEvictionErrorsBuilder_.getMessage(); - } - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder setCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { - if (cacheEvictionErrorsBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - cacheEvictionErrors_ = value; - onChanged(); - } else { - cacheEvictionErrorsBuilder_.setMessage(value); - } - - return this; - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder setCacheEvictionErrors( - flyteidl.core.Errors.CacheEvictionErrorList.Builder builderForValue) { - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrors_ = builderForValue.build(); - onChanged(); - } else { - cacheEvictionErrorsBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder mergeCacheEvictionErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { - if (cacheEvictionErrorsBuilder_ == null) { - if (cacheEvictionErrors_ != null) { - cacheEvictionErrors_ = - flyteidl.core.Errors.CacheEvictionErrorList.newBuilder(cacheEvictionErrors_).mergeFrom(value).buildPartial(); - } else { - cacheEvictionErrors_ = value; - } - onChanged(); - } else { - cacheEvictionErrorsBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public Builder clearCacheEvictionErrors() { - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrors_ = null; - onChanged(); - } else { - cacheEvictionErrors_ = null; - cacheEvictionErrorsBuilder_ = null; - } - - return this; - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorList.Builder getCacheEvictionErrorsBuilder() { - - onChanged(); - return getCacheEvictionErrorsFieldBuilder().getBuilder(); - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getCacheEvictionErrorsOrBuilder() { - if (cacheEvictionErrorsBuilder_ != null) { - return cacheEvictionErrorsBuilder_.getMessageOrBuilder(); - } else { - return cacheEvictionErrors_ == null ? - flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : cacheEvictionErrors_; - } - } - /** - * .flyteidl.core.CacheEvictionErrorList cache_eviction_errors = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> - getCacheEvictionErrorsFieldBuilder() { - if (cacheEvictionErrorsBuilder_ == null) { - cacheEvictionErrorsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder>( - getCacheEvictionErrors(), - getParentForChildren(), - isClean()); - cacheEvictionErrors_ = null; - } - return cacheEvictionErrorsBuilder_; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:flyteidl.admin.TaskExecutionUpdateResponse) - } - - // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionUpdateResponse) - private static final flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse(); - } - - public static flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public TaskExecutionUpdateResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new TaskExecutionUpdateResponse(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_admin_TaskExecutionGetRequest_descriptor; private static final @@ -11697,16 +10337,6 @@ public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDef private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_admin_TaskExecutionGetDataResponse_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -11718,55 +10348,49 @@ public flyteidl.admin.TaskExecutionOuterClass.TaskExecutionUpdateResponse getDef java.lang.String[] descriptorData = { "\n#flyteidl/admin/task_execution.proto\022\016f" + "lyteidl.admin\032\033flyteidl/admin/common.pro" + - "to\032\032flyteidl/core/errors.proto\032\035flyteidl" + - "/core/execution.proto\032\036flyteidl/core/ide" + - "ntifier.proto\032\034flyteidl/core/literals.pr" + - "oto\032\032flyteidl/event/event.proto\032\037google/" + - "protobuf/timestamp.proto\032\036google/protobu" + - "f/duration.proto\032\034google/protobuf/struct" + - ".proto\"M\n\027TaskExecutionGetRequest\0222\n\002id\030" + - "\001 \001(\0132&.flyteidl.core.TaskExecutionIdent" + - "ifier\"\263\001\n\030TaskExecutionListRequest\022A\n\021no" + - "de_execution_id\030\001 \001(\0132&.flyteidl.core.No" + - "deExecutionIdentifier\022\r\n\005limit\030\002 \001(\r\022\r\n\005" + - "token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t\022%\n\007sort_by\030" + - "\005 \001(\0132\024.flyteidl.admin.Sort\"\240\001\n\rTaskExec" + - "ution\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" + - "ecutionIdentifier\022\021\n\tinput_uri\030\002 \001(\t\0225\n\007" + - "closure\030\003 \001(\0132$.flyteidl.admin.TaskExecu" + - "tionClosure\022\021\n\tis_parent\030\004 \001(\010\"Z\n\021TaskEx" + - "ecutionList\0226\n\017task_executions\030\001 \003(\0132\035.f" + - "lyteidl.admin.TaskExecution\022\r\n\005token\030\002 \001" + - "(\t\"\336\004\n\024TaskExecutionClosure\022\030\n\noutput_ur" + - "i\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\0132\035.flyteidl." + - "core.ExecutionErrorH\000\0224\n\013output_data\030\014 \001" + - "(\0132\031.flyteidl.core.LiteralMapB\002\030\001H\000\0221\n\005p" + - "hase\030\003 \001(\0162\".flyteidl.core.TaskExecution" + - ".Phase\022$\n\004logs\030\004 \003(\0132\026.flyteidl.core.Tas" + - "kLog\022.\n\nstarted_at\030\005 \001(\0132\032.google.protob" + - "uf.Timestamp\022+\n\010duration\030\006 \001(\0132\031.google." + - "protobuf.Duration\022.\n\ncreated_at\030\007 \001(\0132\032." + - "google.protobuf.Timestamp\022.\n\nupdated_at\030" + - "\010 \001(\0132\032.google.protobuf.Timestamp\022,\n\013cus" + - "tom_info\030\t \001(\0132\027.google.protobuf.Struct\022" + - "\016\n\006reason\030\n \001(\t\022\021\n\ttask_type\030\013 \001(\t\0227\n\010me" + - "tadata\030\020 \001(\0132%.flyteidl.event.TaskExecut" + - "ionMetadata\022\025\n\revent_version\030\021 \001(\005B\017\n\rou" + - "tput_result\"Q\n\033TaskExecutionGetDataReque" + - "st\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskExecu" + - "tionIdentifier\"\332\001\n\034TaskExecutionGetDataR" + - "esponse\022+\n\006inputs\030\001 \001(\0132\027.flyteidl.admin" + - ".UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(\0132\027.flyteidl" + - ".admin.UrlBlobB\002\030\001\022.\n\013full_inputs\030\003 \001(\0132" + - "\031.flyteidl.core.LiteralMap\022/\n\014full_outpu" + - "ts\030\004 \001(\0132\031.flyteidl.core.LiteralMap\"e\n\032T" + - "askExecutionUpdateRequest\0222\n\002id\030\001 \001(\0132&." + - "flyteidl.core.TaskExecutionIdentifier\022\023\n" + - "\013evict_cache\030\002 \001(\010\"c\n\033TaskExecutionUpdat" + - "eResponse\022D\n\025cache_eviction_errors\030\001 \001(\013" + - "2%.flyteidl.core.CacheEvictionErrorListB" + - "7Z5github.com/flyteorg/flyteidl/gen/pb-g" + - "o/flyteidl/adminb\006proto3" + "to\032\035flyteidl/core/execution.proto\032\036flyte" + + "idl/core/identifier.proto\032\034flyteidl/core" + + "/literals.proto\032\032flyteidl/event/event.pr" + + "oto\032\037google/protobuf/timestamp.proto\032\036go" + + "ogle/protobuf/duration.proto\032\034google/pro" + + "tobuf/struct.proto\"M\n\027TaskExecutionGetRe" + + "quest\0222\n\002id\030\001 \001(\0132&.flyteidl.core.TaskEx" + + "ecutionIdentifier\"\263\001\n\030TaskExecutionListR" + + "equest\022A\n\021node_execution_id\030\001 \001(\0132&.flyt" + + "eidl.core.NodeExecutionIdentifier\022\r\n\005lim" + + "it\030\002 \001(\r\022\r\n\005token\030\003 \001(\t\022\017\n\007filters\030\004 \001(\t" + + "\022%\n\007sort_by\030\005 \001(\0132\024.flyteidl.admin.Sort\"" + + "\240\001\n\rTaskExecution\0222\n\002id\030\001 \001(\0132&.flyteidl" + + ".core.TaskExecutionIdentifier\022\021\n\tinput_u" + + "ri\030\002 \001(\t\0225\n\007closure\030\003 \001(\0132$.flyteidl.adm" + + "in.TaskExecutionClosure\022\021\n\tis_parent\030\004 \001" + + "(\010\"Z\n\021TaskExecutionList\0226\n\017task_executio" + + "ns\030\001 \003(\0132\035.flyteidl.admin.TaskExecution\022" + + "\r\n\005token\030\002 \001(\t\"\336\004\n\024TaskExecutionClosure\022" + + "\030\n\noutput_uri\030\001 \001(\tB\002\030\001H\000\022.\n\005error\030\002 \001(\013" + + "2\035.flyteidl.core.ExecutionErrorH\000\0224\n\013out" + + "put_data\030\014 \001(\0132\031.flyteidl.core.LiteralMa" + + "pB\002\030\001H\000\0221\n\005phase\030\003 \001(\0162\".flyteidl.core.T" + + "askExecution.Phase\022$\n\004logs\030\004 \003(\0132\026.flyte" + + "idl.core.TaskLog\022.\n\nstarted_at\030\005 \001(\0132\032.g" + + "oogle.protobuf.Timestamp\022+\n\010duration\030\006 \001" + + "(\0132\031.google.protobuf.Duration\022.\n\ncreated" + + "_at\030\007 \001(\0132\032.google.protobuf.Timestamp\022.\n" + + "\nupdated_at\030\010 \001(\0132\032.google.protobuf.Time" + + "stamp\022,\n\013custom_info\030\t \001(\0132\027.google.prot" + + "obuf.Struct\022\016\n\006reason\030\n \001(\t\022\021\n\ttask_type" + + "\030\013 \001(\t\0227\n\010metadata\030\020 \001(\0132%.flyteidl.even" + + "t.TaskExecutionMetadata\022\025\n\revent_version" + + "\030\021 \001(\005B\017\n\routput_result\"Q\n\033TaskExecution" + + "GetDataRequest\0222\n\002id\030\001 \001(\0132&.flyteidl.co" + + "re.TaskExecutionIdentifier\"\332\001\n\034TaskExecu" + + "tionGetDataResponse\022+\n\006inputs\030\001 \001(\0132\027.fl" + + "yteidl.admin.UrlBlobB\002\030\001\022,\n\007outputs\030\002 \001(" + + "\0132\027.flyteidl.admin.UrlBlobB\002\030\001\022.\n\013full_i" + + "nputs\030\003 \001(\0132\031.flyteidl.core.LiteralMap\022/" + + "\n\014full_outputs\030\004 \001(\0132\031.flyteidl.core.Lit" + + "eralMapB7Z5github.com/flyteorg/flyteidl/" + + "gen/pb-go/flyteidl/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -11780,7 +10404,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { flyteidl.admin.Common.getDescriptor(), - flyteidl.core.Errors.getDescriptor(), flyteidl.core.Execution.getDescriptor(), flyteidl.core.IdentifierOuterClass.getDescriptor(), flyteidl.core.Literals.getDescriptor(), @@ -11831,20 +10454,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_TaskExecutionGetDataResponse_descriptor, new java.lang.String[] { "Inputs", "Outputs", "FullInputs", "FullOutputs", }); - internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor = - getDescriptor().getMessageTypes().get(7); - internal_static_flyteidl_admin_TaskExecutionUpdateRequest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_admin_TaskExecutionUpdateRequest_descriptor, - new java.lang.String[] { "Id", "EvictCache", }); - internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor = - getDescriptor().getMessageTypes().get(8); - internal_static_flyteidl_admin_TaskExecutionUpdateResponse_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_admin_TaskExecutionUpdateResponse_descriptor, - new java.lang.String[] { "CacheEvictionErrors", }); flyteidl.admin.Common.getDescriptor(); - flyteidl.core.Errors.getDescriptor(); flyteidl.core.Execution.getDescriptor(); flyteidl.core.IdentifierOuterClass.getDescriptor(); flyteidl.core.Literals.getDescriptor(); diff --git a/flyteidl/gen/pb-java/flyteidl/service/Admin.java b/flyteidl/gen/pb-java/flyteidl/service/Admin.java index b8c4772d7e..9f79f3bb8a 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Admin.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Admin.java @@ -38,264 +38,253 @@ public static void registerAllExtensions( "admin/task_execution.proto\032\034flyteidl/adm" + "in/version.proto\032\033flyteidl/admin/common." + "proto\032\'flyteidl/admin/description_entity" + - ".proto\032\036flyteidl/core/identifier.proto2\323" + - "O\n\014AdminService\022m\n\nCreateTask\022!.flyteidl" + - ".admin.TaskCreateRequest\032\".flyteidl.admi" + - "n.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/api/v1/ta" + - "sks:\001*\022\210\001\n\007GetTask\022 .flyteidl.admin.Obje" + - "ctGetRequest\032\024.flyteidl.admin.Task\"E\202\323\344\223" + - "\002?\022=/api/v1/tasks/{id.project}/{id.domai" + - "n}/{id.name}/{id.version}\022\227\001\n\013ListTaskId" + - "s\0220.flyteidl.admin.NamedEntityIdentifier" + - "ListRequest\032).flyteidl.admin.NamedEntity" + - "IdentifierList\"+\202\323\344\223\002%\022#/api/v1/task_ids" + - "/{project}/{domain}\022\256\001\n\tListTasks\022#.flyt" + - "eidl.admin.ResourceListRequest\032\030.flyteid" + - "l.admin.TaskList\"b\202\323\344\223\002\\\0220/api/v1/tasks/" + - "{id.project}/{id.domain}/{id.name}Z(\022&/a" + - "pi/v1/tasks/{id.project}/{id.domain}\022}\n\016" + - "CreateWorkflow\022%.flyteidl.admin.Workflow" + - "CreateRequest\032&.flyteidl.admin.WorkflowC" + - "reateResponse\"\034\202\323\344\223\002\026\"\021/api/v1/workflows" + - ":\001*\022\224\001\n\013GetWorkflow\022 .flyteidl.admin.Obj" + - "ectGetRequest\032\030.flyteidl.admin.Workflow\"" + - "I\202\323\344\223\002C\022A/api/v1/workflows/{id.project}/" + - "{id.domain}/{id.name}/{id.version}\022\237\001\n\017L" + - "istWorkflowIds\0220.flyteidl.admin.NamedEnt" + - "ityIdentifierListRequest\032).flyteidl.admi" + - "n.NamedEntityIdentifierList\"/\202\323\344\223\002)\022\'/ap" + - "i/v1/workflow_ids/{project}/{domain}\022\276\001\n" + - "\rListWorkflows\022#.flyteidl.admin.Resource" + - "ListRequest\032\034.flyteidl.admin.WorkflowLis" + - "t\"j\202\323\344\223\002d\0224/api/v1/workflows/{id.project" + - "}/{id.domain}/{id.name}Z,\022*/api/v1/workf" + - "lows/{id.project}/{id.domain}\022\206\001\n\020Create" + - "LaunchPlan\022\'.flyteidl.admin.LaunchPlanCr" + - "eateRequest\032(.flyteidl.admin.LaunchPlanC" + - "reateResponse\"\037\202\323\344\223\002\031\"\024/api/v1/launch_pl" + - "ans:\001*\022\233\001\n\rGetLaunchPlan\022 .flyteidl.admi" + - "n.ObjectGetRequest\032\032.flyteidl.admin.Laun" + - "chPlan\"L\202\323\344\223\002F\022D/api/v1/launch_plans/{id" + - ".project}/{id.domain}/{id.name}/{id.vers" + - "ion}\022\242\001\n\023GetActiveLaunchPlan\022\'.flyteidl." + - "admin.ActiveLaunchPlanRequest\032\032.flyteidl" + - ".admin.LaunchPlan\"F\202\323\344\223\002@\022>/api/v1/activ" + - "e_launch_plans/{id.project}/{id.domain}/" + - "{id.name}\022\234\001\n\025ListActiveLaunchPlans\022+.fl" + - "yteidl.admin.ActiveLaunchPlanListRequest" + - "\032\036.flyteidl.admin.LaunchPlanList\"6\202\323\344\223\0020" + - "\022./api/v1/active_launch_plans/{project}/" + - "{domain}\022\244\001\n\021ListLaunchPlanIds\0220.flyteid" + - "l.admin.NamedEntityIdentifierListRequest" + - "\032).flyteidl.admin.NamedEntityIdentifierL" + - "ist\"2\202\323\344\223\002,\022*/api/v1/launch_plan_ids/{pr" + - "oject}/{domain}\022\310\001\n\017ListLaunchPlans\022#.fl" + - "yteidl.admin.ResourceListRequest\032\036.flyte" + - "idl.admin.LaunchPlanList\"p\202\323\344\223\002j\0227/api/v" + - "1/launch_plans/{id.project}/{id.domain}/" + - "{id.name}Z/\022-/api/v1/launch_plans/{id.pr" + - "oject}/{id.domain}\022\266\001\n\020UpdateLaunchPlan\022" + - "\'.flyteidl.admin.LaunchPlanUpdateRequest" + - "\032(.flyteidl.admin.LaunchPlanUpdateRespon" + - "se\"O\202\323\344\223\002I\032D/api/v1/launch_plans/{id.pro" + + ".proto2\274L\n\014AdminService\022m\n\nCreateTask\022!." + + "flyteidl.admin.TaskCreateRequest\032\".flyte" + + "idl.admin.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/a" + + "pi/v1/tasks:\001*\022\210\001\n\007GetTask\022 .flyteidl.ad" + + "min.ObjectGetRequest\032\024.flyteidl.admin.Ta" + + "sk\"E\202\323\344\223\002?\022=/api/v1/tasks/{id.project}/{" + + "id.domain}/{id.name}/{id.version}\022\227\001\n\013Li" + + "stTaskIds\0220.flyteidl.admin.NamedEntityId" + + "entifierListRequest\032).flyteidl.admin.Nam" + + "edEntityIdentifierList\"+\202\323\344\223\002%\022#/api/v1/" + + "task_ids/{project}/{domain}\022\256\001\n\tListTask" + + "s\022#.flyteidl.admin.ResourceListRequest\032\030" + + ".flyteidl.admin.TaskList\"b\202\323\344\223\002\\\0220/api/v" + + "1/tasks/{id.project}/{id.domain}/{id.nam" + + "e}Z(\022&/api/v1/tasks/{id.project}/{id.dom" + + "ain}\022}\n\016CreateWorkflow\022%.flyteidl.admin." + + "WorkflowCreateRequest\032&.flyteidl.admin.W" + + "orkflowCreateResponse\"\034\202\323\344\223\002\026\"\021/api/v1/w" + + "orkflows:\001*\022\224\001\n\013GetWorkflow\022 .flyteidl.a" + + "dmin.ObjectGetRequest\032\030.flyteidl.admin.W" + + "orkflow\"I\202\323\344\223\002C\022A/api/v1/workflows/{id.p" + + "roject}/{id.domain}/{id.name}/{id.versio" + + "n}\022\237\001\n\017ListWorkflowIds\0220.flyteidl.admin." + + "NamedEntityIdentifierListRequest\032).flyte" + + "idl.admin.NamedEntityIdentifierList\"/\202\323\344" + + "\223\002)\022\'/api/v1/workflow_ids/{project}/{dom" + + "ain}\022\276\001\n\rListWorkflows\022#.flyteidl.admin." + + "ResourceListRequest\032\034.flyteidl.admin.Wor" + + "kflowList\"j\202\323\344\223\002d\0224/api/v1/workflows/{id" + + ".project}/{id.domain}/{id.name}Z,\022*/api/" + + "v1/workflows/{id.project}/{id.domain}\022\206\001" + + "\n\020CreateLaunchPlan\022\'.flyteidl.admin.Laun" + + "chPlanCreateRequest\032(.flyteidl.admin.Lau" + + "nchPlanCreateResponse\"\037\202\323\344\223\002\031\"\024/api/v1/l" + + "aunch_plans:\001*\022\233\001\n\rGetLaunchPlan\022 .flyte" + + "idl.admin.ObjectGetRequest\032\032.flyteidl.ad" + + "min.LaunchPlan\"L\202\323\344\223\002F\022D/api/v1/launch_p" + + "lans/{id.project}/{id.domain}/{id.name}/" + + "{id.version}\022\242\001\n\023GetActiveLaunchPlan\022\'.f" + + "lyteidl.admin.ActiveLaunchPlanRequest\032\032." + + "flyteidl.admin.LaunchPlan\"F\202\323\344\223\002@\022>/api/" + + "v1/active_launch_plans/{id.project}/{id." + + "domain}/{id.name}\022\234\001\n\025ListActiveLaunchPl" + + "ans\022+.flyteidl.admin.ActiveLaunchPlanLis" + + "tRequest\032\036.flyteidl.admin.LaunchPlanList" + + "\"6\202\323\344\223\0020\022./api/v1/active_launch_plans/{p" + + "roject}/{domain}\022\244\001\n\021ListLaunchPlanIds\0220" + + ".flyteidl.admin.NamedEntityIdentifierLis" + + "tRequest\032).flyteidl.admin.NamedEntityIde" + + "ntifierList\"2\202\323\344\223\002,\022*/api/v1/launch_plan" + + "_ids/{project}/{domain}\022\310\001\n\017ListLaunchPl" + + "ans\022#.flyteidl.admin.ResourceListRequest" + + "\032\036.flyteidl.admin.LaunchPlanList\"p\202\323\344\223\002j" + + "\0227/api/v1/launch_plans/{id.project}/{id." + + "domain}/{id.name}Z/\022-/api/v1/launch_plan" + + "s/{id.project}/{id.domain}\022\266\001\n\020UpdateLau" + + "nchPlan\022\'.flyteidl.admin.LaunchPlanUpdat" + + "eRequest\032(.flyteidl.admin.LaunchPlanUpda" + + "teResponse\"O\202\323\344\223\002I\032D/api/v1/launch_plans" + + "/{id.project}/{id.domain}/{id.name}/{id." + + "version}:\001*\022\201\001\n\017CreateExecution\022&.flytei" + + "dl.admin.ExecutionCreateRequest\032\'.flytei" + + "dl.admin.ExecutionCreateResponse\"\035\202\323\344\223\002\027" + + "\"\022/api/v1/executions:\001*\022\216\001\n\021RelaunchExec" + + "ution\022(.flyteidl.admin.ExecutionRelaunch" + + "Request\032\'.flyteidl.admin.ExecutionCreate" + + "Response\"&\202\323\344\223\002 \"\033/api/v1/executions/rel" + + "aunch:\001*\022\213\001\n\020RecoverExecution\022\'.flyteidl" + + ".admin.ExecutionRecoverRequest\032\'.flyteid" + + "l.admin.ExecutionCreateResponse\"%\202\323\344\223\002\037\"" + + "\032/api/v1/executions/recover:\001*\022\225\001\n\014GetEx" + + "ecution\022+.flyteidl.admin.WorkflowExecuti" + + "onGetRequest\032\031.flyteidl.admin.Execution\"" + + "=\202\323\344\223\0027\0225/api/v1/executions/{id.project}" + + "/{id.domain}/{id.name}\022\244\001\n\017UpdateExecuti" + + "on\022&.flyteidl.admin.ExecutionUpdateReque" + + "st\032\'.flyteidl.admin.ExecutionUpdateRespo" + + "nse\"@\202\323\344\223\002:\0325/api/v1/executions/{id.proj" + + "ect}/{id.domain}/{id.name}:\001*\022\271\001\n\020GetExe" + + "cutionData\022/.flyteidl.admin.WorkflowExec" + + "utionGetDataRequest\0320.flyteidl.admin.Wor" + + "kflowExecutionGetDataResponse\"B\202\323\344\223\002<\022:/" + + "api/v1/data/executions/{id.project}/{id." + + "domain}/{id.name}\022\211\001\n\016ListExecutions\022#.f" + + "lyteidl.admin.ResourceListRequest\032\035.flyt" + + "eidl.admin.ExecutionList\"3\202\323\344\223\002-\022+/api/v" + + "1/executions/{id.project}/{id.domain}\022\255\001" + + "\n\022TerminateExecution\022).flyteidl.admin.Ex" + + "ecutionTerminateRequest\032*.flyteidl.admin" + + ".ExecutionTerminateResponse\"@\202\323\344\223\002:*5/ap" + + "i/v1/executions/{id.project}/{id.domain}" + + "/{id.name}:\001*\022\322\001\n\020GetNodeExecution\022\'.fly" + + "teidl.admin.NodeExecutionGetRequest\032\035.fl" + + "yteidl.admin.NodeExecution\"v\202\323\344\223\002p\022n/api" + + "/v1/node_executions/{id.execution_id.pro" + + "ject}/{id.execution_id.domain}/{id.execu" + + "tion_id.name}/{id.node_id}\022\336\001\n\022ListNodeE" + + "xecutions\022(.flyteidl.admin.NodeExecution" + + "ListRequest\032!.flyteidl.admin.NodeExecuti" + + "onList\"{\202\323\344\223\002u\022s/api/v1/node_executions/" + + "{workflow_execution_id.project}/{workflo" + + "w_execution_id.domain}/{workflow_executi" + + "on_id.name}\022\245\004\n\031ListNodeExecutionsForTas" + + "k\022/.flyteidl.admin.NodeExecutionForTaskL" + + "istRequest\032!.flyteidl.admin.NodeExecutio" + + "nList\"\263\003\202\323\344\223\002\254\003\022\251\003/api/v1/children/task_" + + "executions/{task_execution_id.node_execu" + + "tion_id.execution_id.project}/{task_exec" + + "ution_id.node_execution_id.execution_id." + + "domain}/{task_execution_id.node_executio" + + "n_id.execution_id.name}/{task_execution_" + + "id.node_execution_id.node_id}/{task_exec" + + "ution_id.task_id.project}/{task_executio" + + "n_id.task_id.domain}/{task_execution_id." + + "task_id.name}/{task_execution_id.task_id" + + ".version}/{task_execution_id.retry_attem" + + "pt}\022\356\001\n\024GetNodeExecutionData\022+.flyteidl." + + "admin.NodeExecutionGetDataRequest\032,.flyt" + + "eidl.admin.NodeExecutionGetDataResponse\"" + + "{\202\323\344\223\002u\022s/api/v1/data/node_executions/{i" + + "d.execution_id.project}/{id.execution_id" + + ".domain}/{id.execution_id.name}/{id.node" + + "_id}\022\177\n\017RegisterProject\022&.flyteidl.admin" + + ".ProjectRegisterRequest\032\'.flyteidl.admin" + + ".ProjectRegisterResponse\"\033\202\323\344\223\002\025\"\020/api/v" + + "1/projects:\001*\022q\n\rUpdateProject\022\027.flyteid" + + "l.admin.Project\032%.flyteidl.admin.Project" + + "UpdateResponse\" \202\323\344\223\002\032\032\025/api/v1/projects" + + "/{id}:\001*\022f\n\014ListProjects\022\".flyteidl.admi" + + "n.ProjectListRequest\032\030.flyteidl.admin.Pr" + + "ojects\"\030\202\323\344\223\002\022\022\020/api/v1/projects\022\231\001\n\023Cre" + + "ateWorkflowEvent\022-.flyteidl.admin.Workfl" + + "owExecutionEventRequest\032..flyteidl.admin" + + ".WorkflowExecutionEventResponse\"#\202\323\344\223\002\035\"" + + "\030/api/v1/events/workflows:\001*\022\211\001\n\017CreateN" + + "odeEvent\022).flyteidl.admin.NodeExecutionE" + + "ventRequest\032*.flyteidl.admin.NodeExecuti" + + "onEventResponse\"\037\202\323\344\223\002\031\"\024/api/v1/events/" + + "nodes:\001*\022\211\001\n\017CreateTaskEvent\022).flyteidl." + + "admin.TaskExecutionEventRequest\032*.flytei" + + "dl.admin.TaskExecutionEventResponse\"\037\202\323\344" + + "\223\002\031\"\024/api/v1/events/tasks:\001*\022\200\003\n\020GetTask" + + "Execution\022\'.flyteidl.admin.TaskExecution" + + "GetRequest\032\035.flyteidl.admin.TaskExecutio" + + "n\"\243\002\202\323\344\223\002\234\002\022\231\002/api/v1/task_executions/{i" + + "d.node_execution_id.execution_id.project" + + "}/{id.node_execution_id.execution_id.dom" + + "ain}/{id.node_execution_id.execution_id." + + "name}/{id.node_execution_id.node_id}/{id" + + ".task_id.project}/{id.task_id.domain}/{i" + + "d.task_id.name}/{id.task_id.version}/{id" + + ".retry_attempt}\022\230\002\n\022ListTaskExecutions\022(" + + ".flyteidl.admin.TaskExecutionListRequest" + + "\032!.flyteidl.admin.TaskExecutionList\"\264\001\202\323" + + "\344\223\002\255\001\022\252\001/api/v1/task_executions/{node_ex" + + "ecution_id.execution_id.project}/{node_e" + + "xecution_id.execution_id.domain}/{node_e" + + "xecution_id.execution_id.name}/{node_exe" + + "cution_id.node_id}\022\234\003\n\024GetTaskExecutionD" + + "ata\022+.flyteidl.admin.TaskExecutionGetDat" + + "aRequest\032,.flyteidl.admin.TaskExecutionG" + + "etDataResponse\"\250\002\202\323\344\223\002\241\002\022\236\002/api/v1/data/" + + "task_executions/{id.node_execution_id.ex" + + "ecution_id.project}/{id.node_execution_i" + + "d.execution_id.domain}/{id.node_executio" + + "n_id.execution_id.name}/{id.node_executi" + + "on_id.node_id}/{id.task_id.project}/{id." + + "task_id.domain}/{id.task_id.name}/{id.ta" + + "sk_id.version}/{id.retry_attempt}\022\343\001\n\035Up" + + "dateProjectDomainAttributes\0224.flyteidl.a" + + "dmin.ProjectDomainAttributesUpdateReques" + + "t\0325.flyteidl.admin.ProjectDomainAttribut" + + "esUpdateResponse\"U\202\323\344\223\002O\032J/api/v1/projec" + + "t_domain_attributes/{attributes.project}" + + "/{attributes.domain}:\001*\022\301\001\n\032GetProjectDo" + + "mainAttributes\0221.flyteidl.admin.ProjectD" + + "omainAttributesGetRequest\0322.flyteidl.adm" + + "in.ProjectDomainAttributesGetResponse\"<\202" + + "\323\344\223\0026\0224/api/v1/project_domain_attributes" + + "/{project}/{domain}\022\315\001\n\035DeleteProjectDom" + + "ainAttributes\0224.flyteidl.admin.ProjectDo" + + "mainAttributesDeleteRequest\0325.flyteidl.a" + + "dmin.ProjectDomainAttributesDeleteRespon" + + "se\"?\202\323\344\223\0029*4/api/v1/project_domain_attri" + + "butes/{project}/{domain}:\001*\022\266\001\n\027UpdatePr" + + "ojectAttributes\022..flyteidl.admin.Project" + + "AttributesUpdateRequest\032/.flyteidl.admin" + + ".ProjectAttributesUpdateResponse\":\202\323\344\223\0024" + + "\032//api/v1/project_attributes/{attributes" + + ".project}:\001*\022\237\001\n\024GetProjectAttributes\022+." + + "flyteidl.admin.ProjectAttributesGetReque" + + "st\032,.flyteidl.admin.ProjectAttributesGet" + + "Response\",\202\323\344\223\002&\022$/api/v1/project_attrib" + + "utes/{project}\022\253\001\n\027DeleteProjectAttribut" + + "es\022..flyteidl.admin.ProjectAttributesDel" + + "eteRequest\032/.flyteidl.admin.ProjectAttri" + + "butesDeleteResponse\"/\202\323\344\223\002)*$/api/v1/pro" + + "ject_attributes/{project}:\001*\022\344\001\n\030UpdateW" + + "orkflowAttributes\022/.flyteidl.admin.Workf" + + "lowAttributesUpdateRequest\0320.flyteidl.ad" + + "min.WorkflowAttributesUpdateResponse\"e\202\323" + + "\344\223\002_\032Z/api/v1/workflow_attributes/{attri" + + "butes.project}/{attributes.domain}/{attr" + + "ibutes.workflow}:\001*\022\267\001\n\025GetWorkflowAttri" + + "butes\022,.flyteidl.admin.WorkflowAttribute" + + "sGetRequest\032-.flyteidl.admin.WorkflowAtt" + + "ributesGetResponse\"A\202\323\344\223\002;\0229/api/v1/work" + + "flow_attributes/{project}/{domain}/{work" + + "flow}\022\303\001\n\030DeleteWorkflowAttributes\022/.fly" + + "teidl.admin.WorkflowAttributesDeleteRequ" + + "est\0320.flyteidl.admin.WorkflowAttributesD" + + "eleteResponse\"D\202\323\344\223\002>*9/api/v1/workflow_" + + "attributes/{project}/{domain}/{workflow}" + + ":\001*\022\240\001\n\027ListMatchableAttributes\022..flytei" + + "dl.admin.ListMatchableAttributesRequest\032" + + "/.flyteidl.admin.ListMatchableAttributes" + + "Response\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attr" + + "ibutes\022\237\001\n\021ListNamedEntities\022&.flyteidl." + + "admin.NamedEntityListRequest\032\037.flyteidl." + + "admin.NamedEntityList\"A\202\323\344\223\002;\0229/api/v1/n" + + "amed_entities/{resource_type}/{project}/" + + "{domain}\022\247\001\n\016GetNamedEntity\022%.flyteidl.a" + + "dmin.NamedEntityGetRequest\032\033.flyteidl.ad" + + "min.NamedEntity\"Q\202\323\344\223\002K\022I/api/v1/named_e" + + "ntities/{resource_type}/{id.project}/{id" + + ".domain}/{id.name}\022\276\001\n\021UpdateNamedEntity" + + "\022(.flyteidl.admin.NamedEntityUpdateReque" + + "st\032).flyteidl.admin.NamedEntityUpdateRes" + + "ponse\"T\202\323\344\223\002N\032I/api/v1/named_entities/{r" + + "esource_type}/{id.project}/{id.domain}/{" + + "id.name}:\001*\022l\n\nGetVersion\022!.flyteidl.adm" + + "in.GetVersionRequest\032\".flyteidl.admin.Ge" + + "tVersionResponse\"\027\202\323\344\223\002\021\022\017/api/v1/versio" + + "n\022\304\001\n\024GetDescriptionEntity\022 .flyteidl.ad" + + "min.ObjectGetRequest\032!.flyteidl.admin.De" + + "scriptionEntity\"g\202\323\344\223\002a\022_/api/v1/descrip" + + "tion_entities/{id.resource_type}/{id.pro" + "ject}/{id.domain}/{id.name}/{id.version}" + - ":\001*\022\201\001\n\017CreateExecution\022&.flyteidl.admin" + - ".ExecutionCreateRequest\032\'.flyteidl.admin" + - ".ExecutionCreateResponse\"\035\202\323\344\223\002\027\"\022/api/v" + - "1/executions:\001*\022\216\001\n\021RelaunchExecution\022(." + - "flyteidl.admin.ExecutionRelaunchRequest\032" + - "\'.flyteidl.admin.ExecutionCreateResponse" + - "\"&\202\323\344\223\002 \"\033/api/v1/executions/relaunch:\001*" + - "\022\213\001\n\020RecoverExecution\022\'.flyteidl.admin.E" + - "xecutionRecoverRequest\032\'.flyteidl.admin." + - "ExecutionCreateResponse\"%\202\323\344\223\002\037\"\032/api/v1" + - "/executions/recover:\001*\022\225\001\n\014GetExecution\022" + - "+.flyteidl.admin.WorkflowExecutionGetReq" + - "uest\032\031.flyteidl.admin.Execution\"=\202\323\344\223\0027\022" + - "5/api/v1/executions/{id.project}/{id.dom" + - "ain}/{id.name}\022\244\001\n\017UpdateExecution\022&.fly" + - "teidl.admin.ExecutionUpdateRequest\032\'.fly" + - "teidl.admin.ExecutionUpdateResponse\"@\202\323\344" + - "\223\002:\0325/api/v1/executions/{id.project}/{id" + - ".domain}/{id.name}:\001*\022\271\001\n\020GetExecutionDa" + - "ta\022/.flyteidl.admin.WorkflowExecutionGet" + - "DataRequest\0320.flyteidl.admin.WorkflowExe" + - "cutionGetDataResponse\"B\202\323\344\223\002<\022:/api/v1/d" + - "ata/executions/{id.project}/{id.domain}/" + - "{id.name}\022\211\001\n\016ListExecutions\022#.flyteidl." + - "admin.ResourceListRequest\032\035.flyteidl.adm" + - "in.ExecutionList\"3\202\323\344\223\002-\022+/api/v1/execut" + - "ions/{id.project}/{id.domain}\022\255\001\n\022Termin" + - "ateExecution\022).flyteidl.admin.ExecutionT" + - "erminateRequest\032*.flyteidl.admin.Executi" + - "onTerminateResponse\"@\202\323\344\223\002:*5/api/v1/exe" + - "cutions/{id.project}/{id.domain}/{id.nam" + - "e}:\001*\022\322\001\n\020GetNodeExecution\022\'.flyteidl.ad" + - "min.NodeExecutionGetRequest\032\035.flyteidl.a" + - "dmin.NodeExecution\"v\202\323\344\223\002p\022n/api/v1/node" + - "_executions/{id.execution_id.project}/{i" + - "d.execution_id.domain}/{id.execution_id." + - "name}/{id.node_id}\022\336\001\n\022ListNodeExecution" + - "s\022(.flyteidl.admin.NodeExecutionListRequ" + - "est\032!.flyteidl.admin.NodeExecutionList\"{" + - "\202\323\344\223\002u\022s/api/v1/node_executions/{workflo" + - "w_execution_id.project}/{workflow_execut" + - "ion_id.domain}/{workflow_execution_id.na" + - "me}\022\245\004\n\031ListNodeExecutionsForTask\022/.flyt" + - "eidl.admin.NodeExecutionForTaskListReque" + - "st\032!.flyteidl.admin.NodeExecutionList\"\263\003" + - "\202\323\344\223\002\254\003\022\251\003/api/v1/children/task_executio" + - "ns/{task_execution_id.node_execution_id." + - "execution_id.project}/{task_execution_id" + - ".node_execution_id.execution_id.domain}/" + - "{task_execution_id.node_execution_id.exe" + - "cution_id.name}/{task_execution_id.node_" + - "execution_id.node_id}/{task_execution_id" + - ".task_id.project}/{task_execution_id.tas" + - "k_id.domain}/{task_execution_id.task_id." + - "name}/{task_execution_id.task_id.version" + - "}/{task_execution_id.retry_attempt}\022\356\001\n\024" + - "GetNodeExecutionData\022+.flyteidl.admin.No" + - "deExecutionGetDataRequest\032,.flyteidl.adm" + - "in.NodeExecutionGetDataResponse\"{\202\323\344\223\002u\022" + - "s/api/v1/data/node_executions/{id.execut" + - "ion_id.project}/{id.execution_id.domain}" + - "/{id.execution_id.name}/{id.node_id}\022\177\n\017" + - "RegisterProject\022&.flyteidl.admin.Project" + - "RegisterRequest\032\'.flyteidl.admin.Project" + - "RegisterResponse\"\033\202\323\344\223\002\025\"\020/api/v1/projec" + - "ts:\001*\022q\n\rUpdateProject\022\027.flyteidl.admin." + - "Project\032%.flyteidl.admin.ProjectUpdateRe" + - "sponse\" \202\323\344\223\002\032\032\025/api/v1/projects/{id}:\001*" + - "\022f\n\014ListProjects\022\".flyteidl.admin.Projec" + - "tListRequest\032\030.flyteidl.admin.Projects\"\030" + - "\202\323\344\223\002\022\022\020/api/v1/projects\022\231\001\n\023CreateWorkf" + - "lowEvent\022-.flyteidl.admin.WorkflowExecut" + - "ionEventRequest\032..flyteidl.admin.Workflo" + - "wExecutionEventResponse\"#\202\323\344\223\002\035\"\030/api/v1" + - "/events/workflows:\001*\022\211\001\n\017CreateNodeEvent" + - "\022).flyteidl.admin.NodeExecutionEventRequ" + - "est\032*.flyteidl.admin.NodeExecutionEventR" + - "esponse\"\037\202\323\344\223\002\031\"\024/api/v1/events/nodes:\001*" + - "\022\211\001\n\017CreateTaskEvent\022).flyteidl.admin.Ta" + - "skExecutionEventRequest\032*.flyteidl.admin" + - ".TaskExecutionEventResponse\"\037\202\323\344\223\002\031\"\024/ap" + - "i/v1/events/tasks:\001*\022\200\003\n\020GetTaskExecutio" + - "n\022\'.flyteidl.admin.TaskExecutionGetReque" + - "st\032\035.flyteidl.admin.TaskExecution\"\243\002\202\323\344\223" + - "\002\234\002\022\231\002/api/v1/task_executions/{id.node_e" + - "xecution_id.execution_id.project}/{id.no" + - "de_execution_id.execution_id.domain}/{id" + - ".node_execution_id.execution_id.name}/{i" + - "d.node_execution_id.node_id}/{id.task_id" + - ".project}/{id.task_id.domain}/{id.task_i" + - "d.name}/{id.task_id.version}/{id.retry_a" + - "ttempt}\022\230\002\n\022ListTaskExecutions\022(.flyteid" + - "l.admin.TaskExecutionListRequest\032!.flyte" + - "idl.admin.TaskExecutionList\"\264\001\202\323\344\223\002\255\001\022\252\001" + - "/api/v1/task_executions/{node_execution_" + - "id.execution_id.project}/{node_execution" + - "_id.execution_id.domain}/{node_execution" + - "_id.execution_id.name}/{node_execution_i" + - "d.node_id}\022\234\003\n\024GetTaskExecutionData\022+.fl" + - "yteidl.admin.TaskExecutionGetDataRequest" + - "\032,.flyteidl.admin.TaskExecutionGetDataRe" + - "sponse\"\250\002\202\323\344\223\002\241\002\022\236\002/api/v1/data/task_exe" + - "cutions/{id.node_execution_id.execution_" + - "id.project}/{id.node_execution_id.execut" + - "ion_id.domain}/{id.node_execution_id.exe" + - "cution_id.name}/{id.node_execution_id.no" + - "de_id}/{id.task_id.project}/{id.task_id." + - "domain}/{id.task_id.name}/{id.task_id.ve" + - "rsion}/{id.retry_attempt}\022\224\003\n\023UpdateTask" + - "Execution\022*.flyteidl.admin.TaskExecution" + - "UpdateRequest\032+.flyteidl.admin.TaskExecu" + - "tionUpdateResponse\"\243\002\202\323\344\223\002\234\002\022\231\002/api/v1/t" + - "ask_executions/{id.node_execution_id.exe" + - "cution_id.project}/{id.node_execution_id" + - ".execution_id.domain}/{id.node_execution" + - "_id.execution_id.name}/{id.node_executio" + - "n_id.node_id}/{id.task_id.project}/{id.t" + - "ask_id.domain}/{id.task_id.name}/{id.tas" + - "k_id.version}/{id.retry_attempt}\022\343\001\n\035Upd" + - "ateProjectDomainAttributes\0224.flyteidl.ad" + - "min.ProjectDomainAttributesUpdateRequest" + - "\0325.flyteidl.admin.ProjectDomainAttribute" + - "sUpdateResponse\"U\202\323\344\223\002O\032J/api/v1/project" + - "_domain_attributes/{attributes.project}/" + - "{attributes.domain}:\001*\022\301\001\n\032GetProjectDom" + - "ainAttributes\0221.flyteidl.admin.ProjectDo" + - "mainAttributesGetRequest\0322.flyteidl.admi" + - "n.ProjectDomainAttributesGetResponse\"<\202\323" + - "\344\223\0026\0224/api/v1/project_domain_attributes/" + - "{project}/{domain}\022\315\001\n\035DeleteProjectDoma" + - "inAttributes\0224.flyteidl.admin.ProjectDom" + - "ainAttributesDeleteRequest\0325.flyteidl.ad" + - "min.ProjectDomainAttributesDeleteRespons" + - "e\"?\202\323\344\223\0029*4/api/v1/project_domain_attrib" + - "utes/{project}/{domain}:\001*\022\266\001\n\027UpdatePro" + - "jectAttributes\022..flyteidl.admin.ProjectA" + - "ttributesUpdateRequest\032/.flyteidl.admin." + - "ProjectAttributesUpdateResponse\":\202\323\344\223\0024\032" + - "//api/v1/project_attributes/{attributes." + - "project}:\001*\022\237\001\n\024GetProjectAttributes\022+.f" + - "lyteidl.admin.ProjectAttributesGetReques" + - "t\032,.flyteidl.admin.ProjectAttributesGetR" + - "esponse\",\202\323\344\223\002&\022$/api/v1/project_attribu" + - "tes/{project}\022\253\001\n\027DeleteProjectAttribute" + - "s\022..flyteidl.admin.ProjectAttributesDele" + - "teRequest\032/.flyteidl.admin.ProjectAttrib" + - "utesDeleteResponse\"/\202\323\344\223\002)*$/api/v1/proj" + - "ect_attributes/{project}:\001*\022\344\001\n\030UpdateWo" + - "rkflowAttributes\022/.flyteidl.admin.Workfl" + - "owAttributesUpdateRequest\0320.flyteidl.adm" + - "in.WorkflowAttributesUpdateResponse\"e\202\323\344" + - "\223\002_\032Z/api/v1/workflow_attributes/{attrib" + - "utes.project}/{attributes.domain}/{attri" + - "butes.workflow}:\001*\022\267\001\n\025GetWorkflowAttrib" + - "utes\022,.flyteidl.admin.WorkflowAttributes" + - "GetRequest\032-.flyteidl.admin.WorkflowAttr" + - "ibutesGetResponse\"A\202\323\344\223\002;\0229/api/v1/workf" + - "low_attributes/{project}/{domain}/{workf" + - "low}\022\303\001\n\030DeleteWorkflowAttributes\022/.flyt" + - "eidl.admin.WorkflowAttributesDeleteReque" + - "st\0320.flyteidl.admin.WorkflowAttributesDe" + - "leteResponse\"D\202\323\344\223\002>*9/api/v1/workflow_a" + - "ttributes/{project}/{domain}/{workflow}:" + - "\001*\022\240\001\n\027ListMatchableAttributes\022..flyteid" + - "l.admin.ListMatchableAttributesRequest\032/" + - ".flyteidl.admin.ListMatchableAttributesR" + - "esponse\"$\202\323\344\223\002\036\022\034/api/v1/matchable_attri" + - "butes\022\237\001\n\021ListNamedEntities\022&.flyteidl.a" + - "dmin.NamedEntityListRequest\032\037.flyteidl.a" + - "dmin.NamedEntityList\"A\202\323\344\223\002;\0229/api/v1/na" + - "med_entities/{resource_type}/{project}/{" + - "domain}\022\247\001\n\016GetNamedEntity\022%.flyteidl.ad" + - "min.NamedEntityGetRequest\032\033.flyteidl.adm" + - "in.NamedEntity\"Q\202\323\344\223\002K\022I/api/v1/named_en" + - "tities/{resource_type}/{id.project}/{id." + - "domain}/{id.name}\022\276\001\n\021UpdateNamedEntity\022" + - "(.flyteidl.admin.NamedEntityUpdateReques" + - "t\032).flyteidl.admin.NamedEntityUpdateResp" + - "onse\"T\202\323\344\223\002N\032I/api/v1/named_entities/{re" + - "source_type}/{id.project}/{id.domain}/{i" + - "d.name}:\001*\022l\n\nGetVersion\022!.flyteidl.admi" + - "n.GetVersionRequest\032\".flyteidl.admin.Get" + - "VersionResponse\"\027\202\323\344\223\002\021\022\017/api/v1/version" + - "\022\304\001\n\024GetDescriptionEntity\022 .flyteidl.adm" + - "in.ObjectGetRequest\032!.flyteidl.admin.Des" + - "criptionEntity\"g\202\323\344\223\002a\022_/api/v1/descript" + - "ion_entities/{id.resource_type}/{id.proj" + - "ect}/{id.domain}/{id.name}/{id.version}\022" + - "\222\002\n\027ListDescriptionEntities\022,.flyteidl.a" + - "dmin.DescriptionEntityListRequest\032%.flyt" + - "eidl.admin.DescriptionEntityList\"\241\001\202\323\344\223\002" + - "\232\001\022O/api/v1/description_entities/{resour" + - "ce_type}/{id.project}/{id.domain}/{id.na" + - "me}ZG\022E/api/v1/description_entities/{res" + - "ource_type}/{id.project}/{id.domain}B9Z7" + - "github.com/flyteorg/flyteidl/gen/pb-go/f" + - "lyteidl/serviceb\006proto3" + "\022\222\002\n\027ListDescriptionEntities\022,.flyteidl." + + "admin.DescriptionEntityListRequest\032%.fly" + + "teidl.admin.DescriptionEntityList\"\241\001\202\323\344\223" + + "\002\232\001\022O/api/v1/description_entities/{resou" + + "rce_type}/{id.project}/{id.domain}/{id.n" + + "ame}ZG\022E/api/v1/description_entities/{re" + + "source_type}/{id.project}/{id.domain}B9Z" + + "7github.com/flyteorg/flyteidl/gen/pb-go/" + + "flyteidl/serviceb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -324,7 +313,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( flyteidl.admin.VersionOuterClass.getDescriptor(), flyteidl.admin.Common.getDescriptor(), flyteidl.admin.DescriptionEntityOuterClass.getDescriptor(), - flyteidl.core.IdentifierOuterClass.getDescriptor(), }, assigner); com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); @@ -347,7 +335,6 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( flyteidl.admin.VersionOuterClass.getDescriptor(); flyteidl.admin.Common.getDescriptor(); flyteidl.admin.DescriptionEntityOuterClass.getDescriptor(); - flyteidl.core.IdentifierOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/flyteidl/gen/pb-java/flyteidl/service/Cache.java b/flyteidl/gen/pb-java/flyteidl/service/Cache.java new file mode 100644 index 0000000000..a285e6a05a --- /dev/null +++ b/flyteidl/gen/pb-java/flyteidl/service/Cache.java @@ -0,0 +1,2111 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: flyteidl/service/cache.proto + +package flyteidl.service; + +public final class Cache { + private Cache() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface EvictExecutionCacheRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictExecutionCacheRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * Identifier of execution to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + boolean hasId(); + /** + * 
+     * Identifier of execution to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getId(); + /** + * 
+     * Identifier of execution to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getIdOrBuilder(); + } + /** + * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest} + */ + public static final class EvictExecutionCacheRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.service.EvictExecutionCacheRequest) + EvictExecutionCacheRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use EvictExecutionCacheRequest.newBuilder() to construct. + private EvictExecutionCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private EvictExecutionCacheRequest() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private EvictExecutionCacheRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null; + if (id_ != null) { + subBuilder = id_.toBuilder(); + } + id_ = input.readMessage(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(id_); + id_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class); + } + + public static final int ID_FIELD_NUMBER = 1; + private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier id_; + /** + * 
+     * Identifier of execution to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public boolean hasId() { + return id_ != null; + } + /** + * 
+     * Identifier of execution to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getId() { + return id_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : id_; + } + /** + * 
+     * Identifier of execution to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getIdOrBuilder() { + return getId(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (id_ != null) { + output.writeMessage(1, getId()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (id_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getId()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.service.Cache.EvictExecutionCacheRequest)) { + return super.equals(obj); + } + flyteidl.service.Cache.EvictExecutionCacheRequest other = (flyteidl.service.Cache.EvictExecutionCacheRequest) obj; + + if (hasId() != other.hasId()) return false; + if (hasId()) { + if (!getId() + .equals(other.getId())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasId()) { + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.service.Cache.EvictExecutionCacheRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictExecutionCacheRequest) + flyteidl.service.Cache.EvictExecutionCacheRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class); + } + + // Construct using flyteidl.service.Cache.EvictExecutionCacheRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (idBuilder_ == null) { + id_ = null; + } else { + id_ = null; + idBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() { + return flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest build() { + flyteidl.service.Cache.EvictExecutionCacheRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest buildPartial() { + flyteidl.service.Cache.EvictExecutionCacheRequest result = new flyteidl.service.Cache.EvictExecutionCacheRequest(this); + if (idBuilder_ == null) { + result.id_ = id_; + } else { + result.id_ = idBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.service.Cache.EvictExecutionCacheRequest) { + return mergeFrom((flyteidl.service.Cache.EvictExecutionCacheRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.service.Cache.EvictExecutionCacheRequest other) { + if (other == flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance()) return this; + if (other.hasId()) { + mergeId(other.getId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.service.Cache.EvictExecutionCacheRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.service.Cache.EvictExecutionCacheRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier id_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> idBuilder_; + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public boolean hasId() { + return idBuilder_ != null || id_ != null; + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getId() { + if (idBuilder_ == null) { + return id_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : id_; + } else { + return idBuilder_.getMessage(); + } + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public Builder setId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (idBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + id_ = value; + onChanged(); + } else { + idBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public Builder setId( + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) { + if (idBuilder_ == null) { + id_ = builderForValue.build(); + onChanged(); + } else { + idBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public Builder mergeId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (idBuilder_ == null) { + if (id_ != null) { + id_ = + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.newBuilder(id_).mergeFrom(value).buildPartial(); + } else { + id_ = value; + } + onChanged(); + } else { + idBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public Builder clearId() { + if (idBuilder_ == null) { + id_ = null; + onChanged(); + } else { + id_ = null; + idBuilder_ = null; + } + + return this; + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getIdBuilder() { + + onChanged(); + return getIdFieldBuilder().getBuilder(); + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getIdOrBuilder() { + if (idBuilder_ != null) { + return idBuilder_.getMessageOrBuilder(); + } else { + return id_ == null ? + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : id_; + } + } + /** + * 
+       * Identifier of execution to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> + getIdFieldBuilder() { + if (idBuilder_ == null) { + idBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder>( + getId(), + getParentForChildren(), + isClean()); + id_ = null; + } + return idBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictExecutionCacheRequest) + } + + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest) + private static final flyteidl.service.Cache.EvictExecutionCacheRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictExecutionCacheRequest(); + } + + public static flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public EvictExecutionCacheRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new EvictExecutionCacheRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface EvictTaskExecutionCacheRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictTaskExecutionCacheRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * Identifier of task execution to evict cache for.
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + boolean hasId(); + /** + * 
+     * Identifier of task execution to evict cache for.
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId(); + /** + * 
+     * Identifier of task execution to evict cache for.
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder(); + } + /** + * Protobuf type {@code flyteidl.service.EvictTaskExecutionCacheRequest} + */ + public static final class EvictTaskExecutionCacheRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.service.EvictTaskExecutionCacheRequest) + EvictTaskExecutionCacheRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use EvictTaskExecutionCacheRequest.newBuilder() to construct. + private EvictTaskExecutionCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private EvictTaskExecutionCacheRequest() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private EvictTaskExecutionCacheRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder subBuilder = null; + if (id_ != null) { + subBuilder = id_.toBuilder(); + } + id_ = input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(id_); + id_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictTaskExecutionCacheRequest.class, flyteidl.service.Cache.EvictTaskExecutionCacheRequest.Builder.class); + } + + public static final int ID_FIELD_NUMBER = 1; + private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; + /** + * 
+     * Identifier of task execution to evict cache for.
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public boolean hasId() { + return id_ != null; + } + /** + * 
+     * Identifier of task execution to evict cache for.
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { + return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + } + /** + * 
+     * Identifier of task execution to evict cache for.
+     *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { + return getId(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (id_ != null) { + output.writeMessage(1, getId()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (id_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getId()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.service.Cache.EvictTaskExecutionCacheRequest)) { + return super.equals(obj); + } + flyteidl.service.Cache.EvictTaskExecutionCacheRequest other = (flyteidl.service.Cache.EvictTaskExecutionCacheRequest) obj; + + if (hasId() != other.hasId()) return false; + if (hasId()) { + if (!getId() + .equals(other.getId())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasId()) { + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.service.Cache.EvictTaskExecutionCacheRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code flyteidl.service.EvictTaskExecutionCacheRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictTaskExecutionCacheRequest) + flyteidl.service.Cache.EvictTaskExecutionCacheRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictTaskExecutionCacheRequest.class, flyteidl.service.Cache.EvictTaskExecutionCacheRequest.Builder.class); + } + + // Construct using flyteidl.service.Cache.EvictTaskExecutionCacheRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (idBuilder_ == null) { + id_ = null; + } else { + id_ = null; + idBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstanceForType() { + return flyteidl.service.Cache.EvictTaskExecutionCacheRequest.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest build() { + flyteidl.service.Cache.EvictTaskExecutionCacheRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest buildPartial() { + flyteidl.service.Cache.EvictTaskExecutionCacheRequest result = new flyteidl.service.Cache.EvictTaskExecutionCacheRequest(this); + if (idBuilder_ == null) { + result.id_ = id_; + } else { + result.id_ = idBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.service.Cache.EvictTaskExecutionCacheRequest) { + return mergeFrom((flyteidl.service.Cache.EvictTaskExecutionCacheRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.service.Cache.EvictTaskExecutionCacheRequest other) { + if (other == flyteidl.service.Cache.EvictTaskExecutionCacheRequest.getDefaultInstance()) return this; + if (other.hasId()) { + mergeId(other.getId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.service.Cache.EvictTaskExecutionCacheRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.service.Cache.EvictTaskExecutionCacheRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> idBuilder_; + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public boolean hasId() { + return idBuilder_ != null || id_ != null; + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { + if (idBuilder_ == null) { + return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + } else { + return idBuilder_.getMessage(); + } + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder setId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (idBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + id_ = value; + onChanged(); + } else { + idBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder setId( + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder builderForValue) { + if (idBuilder_ == null) { + id_ = builderForValue.build(); + onChanged(); + } else { + idBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder mergeId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (idBuilder_ == null) { + if (id_ != null) { + id_ = + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder(id_).mergeFrom(value).buildPartial(); + } else { + id_ = value; + } + onChanged(); + } else { + idBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public Builder clearId() { + if (idBuilder_ == null) { + id_ = null; + onChanged(); + } else { + id_ = null; + idBuilder_ = null; + } + + return this; + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getIdBuilder() { + + onChanged(); + return getIdFieldBuilder().getBuilder(); + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { + if (idBuilder_ != null) { + return idBuilder_.getMessageOrBuilder(); + } else { + return id_ == null ? + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + } + } + /** + * 
+       * Identifier of task execution to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> + getIdFieldBuilder() { + if (idBuilder_ == null) { + idBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder>( + getId(), + getParentForChildren(), + isClean()); + id_ = null; + } + return idBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictTaskExecutionCacheRequest) + } + + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictTaskExecutionCacheRequest) + private static final flyteidl.service.Cache.EvictTaskExecutionCacheRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictTaskExecutionCacheRequest(); + } + + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public EvictTaskExecutionCacheRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new EvictTaskExecutionCacheRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface EvictCacheResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictCacheResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + boolean hasErrors(); + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + flyteidl.core.Errors.CacheEvictionErrorList getErrors(); + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getErrorsOrBuilder(); + } + /** + * Protobuf type {@code flyteidl.service.EvictCacheResponse} + */ + public static final class EvictCacheResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.service.EvictCacheResponse) + EvictCacheResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use EvictCacheResponse.newBuilder() to construct. + private EvictCacheResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private EvictCacheResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private EvictCacheResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + flyteidl.core.Errors.CacheEvictionErrorList.Builder subBuilder = null; + if (errors_ != null) { + subBuilder = errors_.toBuilder(); + } + errors_ = input.readMessage(flyteidl.core.Errors.CacheEvictionErrorList.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(errors_); + errors_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictCacheResponse.class, flyteidl.service.Cache.EvictCacheResponse.Builder.class); + } + + public static final int ERRORS_FIELD_NUMBER = 1; + private flyteidl.core.Errors.CacheEvictionErrorList errors_; + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public boolean hasErrors() { + return errors_ != null; + } + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList getErrors() { + return errors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : errors_; + } + /** + * 
+     * List of errors encountered during cache eviction (if any).
+     *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getErrorsOrBuilder() { + return getErrors(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (errors_ != null) { + output.writeMessage(1, getErrors()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (errors_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getErrors()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.service.Cache.EvictCacheResponse)) { + return super.equals(obj); + } + flyteidl.service.Cache.EvictCacheResponse other = (flyteidl.service.Cache.EvictCacheResponse) obj; + + if (hasErrors() != other.hasErrors()) return false; + if (hasErrors()) { + if (!getErrors() + .equals(other.getErrors())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasErrors()) { + hash = (37 * hash) + ERRORS_FIELD_NUMBER; + hash = (53 * hash) + getErrors().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictCacheResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictCacheResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictCacheResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.service.Cache.EvictCacheResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code flyteidl.service.EvictCacheResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictCacheResponse) + flyteidl.service.Cache.EvictCacheResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictCacheResponse.class, flyteidl.service.Cache.EvictCacheResponse.Builder.class); + } + + // Construct using flyteidl.service.Cache.EvictCacheResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (errorsBuilder_ == null) { + errors_ = null; + } else { + errors_ = null; + errorsBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheResponse_descriptor; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() { + return flyteidl.service.Cache.EvictCacheResponse.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.service.Cache.EvictCacheResponse build() { + flyteidl.service.Cache.EvictCacheResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictCacheResponse buildPartial() { + flyteidl.service.Cache.EvictCacheResponse result = new flyteidl.service.Cache.EvictCacheResponse(this); + if (errorsBuilder_ == null) { + result.errors_ = errors_; + } else { + result.errors_ = errorsBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.service.Cache.EvictCacheResponse) { + return mergeFrom((flyteidl.service.Cache.EvictCacheResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.service.Cache.EvictCacheResponse other) { + if (other == flyteidl.service.Cache.EvictCacheResponse.getDefaultInstance()) return this; + if (other.hasErrors()) { + mergeErrors(other.getErrors()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.service.Cache.EvictCacheResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.service.Cache.EvictCacheResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private flyteidl.core.Errors.CacheEvictionErrorList errors_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> errorsBuilder_; + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public boolean hasErrors() { + return errorsBuilder_ != null || errors_ != null; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList getErrors() { + if (errorsBuilder_ == null) { + return errors_ == null ? flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : errors_; + } else { + return errorsBuilder_.getMessage(); + } + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public Builder setErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { + if (errorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + errors_ = value; + onChanged(); + } else { + errorsBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public Builder setErrors( + flyteidl.core.Errors.CacheEvictionErrorList.Builder builderForValue) { + if (errorsBuilder_ == null) { + errors_ = builderForValue.build(); + onChanged(); + } else { + errorsBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public Builder mergeErrors(flyteidl.core.Errors.CacheEvictionErrorList value) { + if (errorsBuilder_ == null) { + if (errors_ != null) { + errors_ = + flyteidl.core.Errors.CacheEvictionErrorList.newBuilder(errors_).mergeFrom(value).buildPartial(); + } else { + errors_ = value; + } + onChanged(); + } else { + errorsBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public Builder clearErrors() { + if (errorsBuilder_ == null) { + errors_ = null; + onChanged(); + } else { + errors_ = null; + errorsBuilder_ = null; + } + + return this; + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorList.Builder getErrorsBuilder() { + + onChanged(); + return getErrorsFieldBuilder().getBuilder(); + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + public flyteidl.core.Errors.CacheEvictionErrorListOrBuilder getErrorsOrBuilder() { + if (errorsBuilder_ != null) { + return errorsBuilder_.getMessageOrBuilder(); + } else { + return errors_ == null ? + flyteidl.core.Errors.CacheEvictionErrorList.getDefaultInstance() : errors_; + } + } + /** + * 
+       * List of errors encountered during cache eviction (if any).
+       *
+ * + * .flyteidl.core.CacheEvictionErrorList errors = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder> + getErrorsFieldBuilder() { + if (errorsBuilder_ == null) { + errorsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Errors.CacheEvictionErrorList, flyteidl.core.Errors.CacheEvictionErrorList.Builder, flyteidl.core.Errors.CacheEvictionErrorListOrBuilder>( + getErrors(), + getParentForChildren(), + isClean()); + errors_ = null; + } + return errorsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictCacheResponse) + } + + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictCacheResponse) + private static final flyteidl.service.Cache.EvictCacheResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictCacheResponse(); + } + + public static flyteidl.service.Cache.EvictCacheResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public EvictCacheResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new EvictCacheResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_service_EvictCacheResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_service_EvictCacheResponse_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\034flyteidl/service/cache.proto\022\020flyteidl" + + ".service\032\034google/api/annotations.proto\032\032" + + "flyteidl/core/errors.proto\032\036flyteidl/cor" + + "e/identifier.proto\"T\n\032EvictExecutionCach" + + "eRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" + + "kflowExecutionIdentifier\"T\n\036EvictTaskExe" + + "cutionCacheRequest\0222\n\002id\030\001 \001(\0132&.flyteid" + + "l.core.TaskExecutionIdentifier\"K\n\022EvictC" + + "acheResponse\0225\n\006errors\030\001 \001(\0132%.flyteidl." + + "core.CacheEvictionErrorList2\345\004\n\014CacheSer" + + "vice\022\261\001\n\023EvictExecutionCache\022,.flyteidl." + + "service.EvictExecutionCacheRequest\032$.fly" + + "teidl.service.EvictCacheResponse\"F\202\323\344\223\002@" + + "*;/api/v1/cache/executions/{id.project}/" + + "{id.domain}/{id.name}:\001*\022\240\003\n\027EvictTaskEx" + + "ecutionCache\0220.flyteidl.service.EvictTas" + + "kExecutionCacheRequest\032$.flyteidl.servic" + + "e.EvictCacheResponse\"\254\002\202\323\344\223\002\245\002*\237\002/api/v1" + + "/cache/task_executions/{id.node_executio" + + "n_id.execution_id.project}/{id.node_exec" + + "ution_id.execution_id.domain}/{id.node_e" + + "xecution_id.execution_id.name}/{id.node_" + + "execution_id.node_id}/{id.task_id.projec" + + "t}/{id.task_id.domain}/{id.task_id.name}" + + "/{id.task_id.version}/{id.retry_attempt}" + + ":\001*B9Z7github.com/flyteorg/flyteidl/gen/" + + "pb-go/flyteidl/serviceb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + com.google.api.AnnotationsProto.getDescriptor(), + flyteidl.core.Errors.getDescriptor(), + flyteidl.core.IdentifierOuterClass.getDescriptor(), + }, assigner); + internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor, + new java.lang.String[] { "Id", }); + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor, + new java.lang.String[] { "Id", }); + internal_static_flyteidl_service_EvictCacheResponse_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_flyteidl_service_EvictCacheResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_service_EvictCacheResponse_descriptor, + new java.lang.String[] { "Errors", }); + com.google.protobuf.ExtensionRegistry registry = + com.google.protobuf.ExtensionRegistry.newInstance(); + registry.add(com.google.api.AnnotationsProto.http); + com.google.protobuf.Descriptors.FileDescriptor + .internalUpdateFileDescriptor(descriptor, registry); + com.google.api.AnnotationsProto.getDescriptor(); + flyteidl.core.Errors.getDescriptor(); + flyteidl.core.IdentifierOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index db08e80787..47b860efcf 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -10978,9 +10978,6 @@ export namespace flyteidl { /** ExecutionUpdateRequest state */ state?: (flyteidl.admin.ExecutionState|null); - - /** ExecutionUpdateRequest evictCache */ - evictCache?: (boolean|null); } /** Represents an ExecutionUpdateRequest. */ @@ -10998,9 +10995,6 @@ export namespace flyteidl { /** ExecutionUpdateRequest state. */ public state: flyteidl.admin.ExecutionState; - /** ExecutionUpdateRequest evictCache. */ - public evictCache: boolean; - /** * Creates a new ExecutionUpdateRequest instance using the specified properties. * @param [properties] Properties to set @@ -11100,9 +11094,6 @@ export namespace flyteidl { /** Properties of an ExecutionUpdateResponse. */ interface IExecutionUpdateResponse { - - /** ExecutionUpdateResponse cacheEvictionErrors */ - cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); } /** Represents an ExecutionUpdateResponse. */ @@ -11114,9 +11105,6 @@ export namespace flyteidl { */ constructor(properties?: flyteidl.admin.IExecutionUpdateResponse); - /** ExecutionUpdateResponse cacheEvictionErrors. */ - public cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); - /** * Creates a new ExecutionUpdateResponse instance using the specified properties. * @param [properties] Properties to set @@ -16221,116 +16209,6 @@ export namespace flyteidl { public static verify(message: { [k: string]: any }): (string|null); } - /** Properties of a TaskExecutionUpdateRequest. */ - interface ITaskExecutionUpdateRequest { - - /** TaskExecutionUpdateRequest id */ - id?: (flyteidl.core.ITaskExecutionIdentifier|null); - - /** TaskExecutionUpdateRequest evictCache */ - evictCache?: (boolean|null); - } - - /** Represents a TaskExecutionUpdateRequest. */ - class TaskExecutionUpdateRequest implements ITaskExecutionUpdateRequest { - - /** - * Constructs a new TaskExecutionUpdateRequest. - * @param [properties] Properties to set - */ - constructor(properties?: flyteidl.admin.ITaskExecutionUpdateRequest); - - /** TaskExecutionUpdateRequest id. */ - public id?: (flyteidl.core.ITaskExecutionIdentifier|null); - - /** TaskExecutionUpdateRequest evictCache. */ - public evictCache: boolean; - - /** - * Creates a new TaskExecutionUpdateRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns TaskExecutionUpdateRequest instance - */ - public static create(properties?: flyteidl.admin.ITaskExecutionUpdateRequest): flyteidl.admin.TaskExecutionUpdateRequest; - - /** - * Encodes the specified TaskExecutionUpdateRequest message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateRequest.verify|verify} messages. - * @param message TaskExecutionUpdateRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: flyteidl.admin.ITaskExecutionUpdateRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a TaskExecutionUpdateRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns TaskExecutionUpdateRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.TaskExecutionUpdateRequest; - - /** - * Verifies a TaskExecutionUpdateRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - } - - /** Properties of a TaskExecutionUpdateResponse. */ - interface ITaskExecutionUpdateResponse { - - /** TaskExecutionUpdateResponse cacheEvictionErrors */ - cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); - } - - /** Represents a TaskExecutionUpdateResponse. */ - class TaskExecutionUpdateResponse implements ITaskExecutionUpdateResponse { - - /** - * Constructs a new TaskExecutionUpdateResponse. - * @param [properties] Properties to set - */ - constructor(properties?: flyteidl.admin.ITaskExecutionUpdateResponse); - - /** TaskExecutionUpdateResponse cacheEvictionErrors. */ - public cacheEvictionErrors?: (flyteidl.core.ICacheEvictionErrorList|null); - - /** - * Creates a new TaskExecutionUpdateResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns TaskExecutionUpdateResponse instance - */ - public static create(properties?: flyteidl.admin.ITaskExecutionUpdateResponse): flyteidl.admin.TaskExecutionUpdateResponse; - - /** - * Encodes the specified TaskExecutionUpdateResponse message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateResponse.verify|verify} messages. - * @param message TaskExecutionUpdateResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: flyteidl.admin.ITaskExecutionUpdateResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a TaskExecutionUpdateResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns TaskExecutionUpdateResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.TaskExecutionUpdateResponse; - - /** - * Verifies a TaskExecutionUpdateResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - } - /** Properties of a GetVersionResponse. */ interface IGetVersionResponse { @@ -17940,20 +17818,6 @@ export namespace flyteidl { */ public getTaskExecutionData(request: flyteidl.admin.ITaskExecutionGetDataRequest): Promise; - /** - * Calls UpdateTaskExecution. - * @param request TaskExecutionUpdateRequest message or plain object - * @param callback Node-style callback called with the error, if any, and TaskExecutionUpdateResponse - */ - public updateTaskExecution(request: flyteidl.admin.ITaskExecutionUpdateRequest, callback: flyteidl.service.AdminService.UpdateTaskExecutionCallback): void; - - /** - * Calls UpdateTaskExecution. - * @param request TaskExecutionUpdateRequest message or plain object - * @returns Promise - */ - public updateTaskExecution(request: flyteidl.admin.ITaskExecutionUpdateRequest): Promise; - /** * Calls UpdateProjectDomainAttributes. * @param request ProjectDomainAttributesUpdateRequest message or plain object @@ -18433,13 +18297,6 @@ export namespace flyteidl { */ type GetTaskExecutionDataCallback = (error: (Error|null), response?: flyteidl.admin.TaskExecutionGetDataResponse) => void; - /** - * Callback as used by {@link flyteidl.service.AdminService#updateTaskExecution}. - * @param error Error, if any - * @param [response] TaskExecutionUpdateResponse - */ - type UpdateTaskExecutionCallback = (error: (Error|null), response?: flyteidl.admin.TaskExecutionUpdateResponse) => void; - /** * Callback as used by {@link flyteidl.service.AdminService#updateProjectDomainAttributes}. * @param error Error, if any @@ -18899,6 +18756,228 @@ export namespace flyteidl { type GetPublicClientConfigCallback = (error: (Error|null), response?: flyteidl.service.PublicClientAuthConfigResponse) => void; } + /** Properties of an EvictExecutionCacheRequest. */ + interface IEvictExecutionCacheRequest { + + /** EvictExecutionCacheRequest id */ + id?: (flyteidl.core.IWorkflowExecutionIdentifier|null); + } + + /** Represents an EvictExecutionCacheRequest. */ + class EvictExecutionCacheRequest implements IEvictExecutionCacheRequest { + + /** + * Constructs a new EvictExecutionCacheRequest. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.service.IEvictExecutionCacheRequest); + + /** EvictExecutionCacheRequest id. */ + public id?: (flyteidl.core.IWorkflowExecutionIdentifier|null); + + /** + * Creates a new EvictExecutionCacheRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns EvictExecutionCacheRequest instance + */ + public static create(properties?: flyteidl.service.IEvictExecutionCacheRequest): flyteidl.service.EvictExecutionCacheRequest; + + /** + * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages. + * @param message EvictExecutionCacheRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.service.IEvictExecutionCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EvictExecutionCacheRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictExecutionCacheRequest; + + /** + * Verifies an EvictExecutionCacheRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of an EvictTaskExecutionCacheRequest. */ + interface IEvictTaskExecutionCacheRequest { + + /** EvictTaskExecutionCacheRequest id */ + id?: (flyteidl.core.ITaskExecutionIdentifier|null); + } + + /** Represents an EvictTaskExecutionCacheRequest. */ + class EvictTaskExecutionCacheRequest implements IEvictTaskExecutionCacheRequest { + + /** + * Constructs a new EvictTaskExecutionCacheRequest. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.service.IEvictTaskExecutionCacheRequest); + + /** EvictTaskExecutionCacheRequest id. */ + public id?: (flyteidl.core.ITaskExecutionIdentifier|null); + + /** + * Creates a new EvictTaskExecutionCacheRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns EvictTaskExecutionCacheRequest instance + */ + public static create(properties?: flyteidl.service.IEvictTaskExecutionCacheRequest): flyteidl.service.EvictTaskExecutionCacheRequest; + + /** + * Encodes the specified EvictTaskExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictTaskExecutionCacheRequest.verify|verify} messages. + * @param message EvictTaskExecutionCacheRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.service.IEvictTaskExecutionCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EvictTaskExecutionCacheRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EvictTaskExecutionCacheRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictTaskExecutionCacheRequest; + + /** + * Verifies an EvictTaskExecutionCacheRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of an EvictCacheResponse. */ + interface IEvictCacheResponse { + + /** EvictCacheResponse errors */ + errors?: (flyteidl.core.ICacheEvictionErrorList|null); + } + + /** Represents an EvictCacheResponse. */ + class EvictCacheResponse implements IEvictCacheResponse { + + /** + * Constructs a new EvictCacheResponse. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.service.IEvictCacheResponse); + + /** EvictCacheResponse errors. */ + public errors?: (flyteidl.core.ICacheEvictionErrorList|null); + + /** + * Creates a new EvictCacheResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns EvictCacheResponse instance + */ + public static create(properties?: flyteidl.service.IEvictCacheResponse): flyteidl.service.EvictCacheResponse; + + /** + * Encodes the specified EvictCacheResponse message. Does not implicitly {@link flyteidl.service.EvictCacheResponse.verify|verify} messages. + * @param message EvictCacheResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.service.IEvictCacheResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EvictCacheResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EvictCacheResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictCacheResponse; + + /** + * Verifies an EvictCacheResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Represents a CacheService */ + class CacheService extends $protobuf.rpc.Service { + + /** + * Constructs a new CacheService service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new CacheService service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): CacheService; + + /** + * Calls EvictExecutionCache. + * @param request EvictExecutionCacheRequest message or plain object + * @param callback Node-style callback called with the error, if any, and EvictCacheResponse + */ + public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest, callback: flyteidl.service.CacheService.EvictExecutionCacheCallback): void; + + /** + * Calls EvictExecutionCache. + * @param request EvictExecutionCacheRequest message or plain object + * @returns Promise + */ + public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest): Promise; + + /** + * Calls EvictTaskExecutionCache. + * @param request EvictTaskExecutionCacheRequest message or plain object + * @param callback Node-style callback called with the error, if any, and EvictCacheResponse + */ + public evictTaskExecutionCache(request: flyteidl.service.IEvictTaskExecutionCacheRequest, callback: flyteidl.service.CacheService.EvictTaskExecutionCacheCallback): void; + + /** + * Calls EvictTaskExecutionCache. + * @param request EvictTaskExecutionCacheRequest message or plain object + * @returns Promise + */ + public evictTaskExecutionCache(request: flyteidl.service.IEvictTaskExecutionCacheRequest): Promise; + } + + namespace CacheService { + + /** + * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}. + * @param error Error, if any + * @param [response] EvictCacheResponse + */ + type EvictExecutionCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; + + /** + * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}. + * @param error Error, if any + * @param [response] EvictCacheResponse + */ + type EvictTaskExecutionCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; + } + /** Properties of a CreateUploadLocationResponse. */ interface ICreateUploadLocationResponse { diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index b2554aa4ee..9b2f28629b 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -26415,7 +26415,6 @@ * @interface IExecutionUpdateRequest * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [id] ExecutionUpdateRequest id * @property {flyteidl.admin.ExecutionState|null} [state] ExecutionUpdateRequest state - * @property {boolean|null} [evictCache] ExecutionUpdateRequest evictCache */ /** @@ -26449,14 +26448,6 @@ */ ExecutionUpdateRequest.prototype.state = 0; - /** - * ExecutionUpdateRequest evictCache. - * @member {boolean} evictCache - * @memberof flyteidl.admin.ExecutionUpdateRequest - * @instance - */ - ExecutionUpdateRequest.prototype.evictCache = false; - /** * Creates a new ExecutionUpdateRequest instance using the specified properties. * @function create @@ -26485,8 +26476,6 @@ $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.state != null && message.hasOwnProperty("state")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.state); - if (message.evictCache != null && message.hasOwnProperty("evictCache")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.evictCache); return writer; }; @@ -26514,9 +26503,6 @@ case 2: message.state = reader.int32(); break; - case 3: - message.evictCache = reader.bool(); - break; default: reader.skipType(tag & 7); break; @@ -26549,9 +26535,6 @@ case 1: break; } - if (message.evictCache != null && message.hasOwnProperty("evictCache")) - if (typeof message.evictCache !== "boolean") - return "evictCache: boolean expected"; return null; }; @@ -26715,7 +26698,6 @@ * Properties of an ExecutionUpdateResponse. * @memberof flyteidl.admin * @interface IExecutionUpdateResponse - * @property {flyteidl.core.ICacheEvictionErrorList|null} [cacheEvictionErrors] ExecutionUpdateResponse cacheEvictionErrors */ /** @@ -26733,14 +26715,6 @@ this[keys[i]] = properties[keys[i]]; } - /** - * ExecutionUpdateResponse cacheEvictionErrors. - * @member {flyteidl.core.ICacheEvictionErrorList|null|undefined} cacheEvictionErrors - * @memberof flyteidl.admin.ExecutionUpdateResponse - * @instance - */ - ExecutionUpdateResponse.prototype.cacheEvictionErrors = null; - /** * Creates a new ExecutionUpdateResponse instance using the specified properties. * @function create @@ -26765,8 +26739,6 @@ ExecutionUpdateResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) - $root.flyteidl.core.CacheEvictionErrorList.encode(message.cacheEvictionErrors, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; @@ -26788,9 +26760,6 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.cacheEvictionErrors = $root.flyteidl.core.CacheEvictionErrorList.decode(reader, reader.uint32()); - break; default: reader.skipType(tag & 7); break; @@ -26810,11 +26779,6 @@ ExecutionUpdateResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) { - var error = $root.flyteidl.core.CacheEvictionErrorList.verify(message.cacheEvictionErrors); - if (error) - return "cacheEvictionErrors." + error; - } return null; }; @@ -38763,247 +38727,6 @@ return TaskExecutionGetDataResponse; })(); - admin.TaskExecutionUpdateRequest = (function() { - - /** - * Properties of a TaskExecutionUpdateRequest. - * @memberof flyteidl.admin - * @interface ITaskExecutionUpdateRequest - * @property {flyteidl.core.ITaskExecutionIdentifier|null} [id] TaskExecutionUpdateRequest id - * @property {boolean|null} [evictCache] TaskExecutionUpdateRequest evictCache - */ - - /** - * Constructs a new TaskExecutionUpdateRequest. - * @memberof flyteidl.admin - * @classdesc Represents a TaskExecutionUpdateRequest. - * @implements ITaskExecutionUpdateRequest - * @constructor - * @param {flyteidl.admin.ITaskExecutionUpdateRequest=} [properties] Properties to set - */ - function TaskExecutionUpdateRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * TaskExecutionUpdateRequest id. - * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} id - * @memberof flyteidl.admin.TaskExecutionUpdateRequest - * @instance - */ - TaskExecutionUpdateRequest.prototype.id = null; - - /** - * TaskExecutionUpdateRequest evictCache. - * @member {boolean} evictCache - * @memberof flyteidl.admin.TaskExecutionUpdateRequest - * @instance - */ - TaskExecutionUpdateRequest.prototype.evictCache = false; - - /** - * Creates a new TaskExecutionUpdateRequest instance using the specified properties. - * @function create - * @memberof flyteidl.admin.TaskExecutionUpdateRequest - * @static - * @param {flyteidl.admin.ITaskExecutionUpdateRequest=} [properties] Properties to set - * @returns {flyteidl.admin.TaskExecutionUpdateRequest} TaskExecutionUpdateRequest instance - */ - TaskExecutionUpdateRequest.create = function create(properties) { - return new TaskExecutionUpdateRequest(properties); - }; - - /** - * Encodes the specified TaskExecutionUpdateRequest message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateRequest.verify|verify} messages. - * @function encode - * @memberof flyteidl.admin.TaskExecutionUpdateRequest - * @static - * @param {flyteidl.admin.ITaskExecutionUpdateRequest} message TaskExecutionUpdateRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - TaskExecutionUpdateRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.id != null && message.hasOwnProperty("id")) - $root.flyteidl.core.TaskExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.evictCache != null && message.hasOwnProperty("evictCache")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.evictCache); - return writer; - }; - - /** - * Decodes a TaskExecutionUpdateRequest message from the specified reader or buffer. - * @function decode - * @memberof flyteidl.admin.TaskExecutionUpdateRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {flyteidl.admin.TaskExecutionUpdateRequest} TaskExecutionUpdateRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - TaskExecutionUpdateRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.TaskExecutionUpdateRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.id = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); - break; - case 2: - message.evictCache = reader.bool(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Verifies a TaskExecutionUpdateRequest message. - * @function verify - * @memberof flyteidl.admin.TaskExecutionUpdateRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - TaskExecutionUpdateRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.id != null && message.hasOwnProperty("id")) { - var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.id); - if (error) - return "id." + error; - } - if (message.evictCache != null && message.hasOwnProperty("evictCache")) - if (typeof message.evictCache !== "boolean") - return "evictCache: boolean expected"; - return null; - }; - - return TaskExecutionUpdateRequest; - })(); - - admin.TaskExecutionUpdateResponse = (function() { - - /** - * Properties of a TaskExecutionUpdateResponse. - * @memberof flyteidl.admin - * @interface ITaskExecutionUpdateResponse - * @property {flyteidl.core.ICacheEvictionErrorList|null} [cacheEvictionErrors] TaskExecutionUpdateResponse cacheEvictionErrors - */ - - /** - * Constructs a new TaskExecutionUpdateResponse. - * @memberof flyteidl.admin - * @classdesc Represents a TaskExecutionUpdateResponse. - * @implements ITaskExecutionUpdateResponse - * @constructor - * @param {flyteidl.admin.ITaskExecutionUpdateResponse=} [properties] Properties to set - */ - function TaskExecutionUpdateResponse(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * TaskExecutionUpdateResponse cacheEvictionErrors. - * @member {flyteidl.core.ICacheEvictionErrorList|null|undefined} cacheEvictionErrors - * @memberof flyteidl.admin.TaskExecutionUpdateResponse - * @instance - */ - TaskExecutionUpdateResponse.prototype.cacheEvictionErrors = null; - - /** - * Creates a new TaskExecutionUpdateResponse instance using the specified properties. - * @function create - * @memberof flyteidl.admin.TaskExecutionUpdateResponse - * @static - * @param {flyteidl.admin.ITaskExecutionUpdateResponse=} [properties] Properties to set - * @returns {flyteidl.admin.TaskExecutionUpdateResponse} TaskExecutionUpdateResponse instance - */ - TaskExecutionUpdateResponse.create = function create(properties) { - return new TaskExecutionUpdateResponse(properties); - }; - - /** - * Encodes the specified TaskExecutionUpdateResponse message. Does not implicitly {@link flyteidl.admin.TaskExecutionUpdateResponse.verify|verify} messages. - * @function encode - * @memberof flyteidl.admin.TaskExecutionUpdateResponse - * @static - * @param {flyteidl.admin.ITaskExecutionUpdateResponse} message TaskExecutionUpdateResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - TaskExecutionUpdateResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) - $root.flyteidl.core.CacheEvictionErrorList.encode(message.cacheEvictionErrors, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Decodes a TaskExecutionUpdateResponse message from the specified reader or buffer. - * @function decode - * @memberof flyteidl.admin.TaskExecutionUpdateResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {flyteidl.admin.TaskExecutionUpdateResponse} TaskExecutionUpdateResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - TaskExecutionUpdateResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.TaskExecutionUpdateResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.cacheEvictionErrors = $root.flyteidl.core.CacheEvictionErrorList.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Verifies a TaskExecutionUpdateResponse message. - * @function verify - * @memberof flyteidl.admin.TaskExecutionUpdateResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - TaskExecutionUpdateResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.cacheEvictionErrors != null && message.hasOwnProperty("cacheEvictionErrors")) { - var error = $root.flyteidl.core.CacheEvictionErrorList.verify(message.cacheEvictionErrors); - if (error) - return "cacheEvictionErrors." + error; - } - return null; - }; - - return TaskExecutionUpdateResponse; - })(); - admin.GetVersionResponse = (function() { /** @@ -42678,39 +42401,6 @@ * @variation 2 */ - /** - * Callback as used by {@link flyteidl.service.AdminService#updateTaskExecution}. - * @memberof flyteidl.service.AdminService - * @typedef UpdateTaskExecutionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {flyteidl.admin.TaskExecutionUpdateResponse} [response] TaskExecutionUpdateResponse - */ - - /** - * Calls UpdateTaskExecution. - * @function updateTaskExecution - * @memberof flyteidl.service.AdminService - * @instance - * @param {flyteidl.admin.ITaskExecutionUpdateRequest} request TaskExecutionUpdateRequest message or plain object - * @param {flyteidl.service.AdminService.UpdateTaskExecutionCallback} callback Node-style callback called with the error, if any, and TaskExecutionUpdateResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(AdminService.prototype.updateTaskExecution = function updateTaskExecution(request, callback) { - return this.rpcCall(updateTaskExecution, $root.flyteidl.admin.TaskExecutionUpdateRequest, $root.flyteidl.admin.TaskExecutionUpdateResponse, request, callback); - }, "name", { value: "UpdateTaskExecution" }); - - /** - * Calls UpdateTaskExecution. - * @function updateTaskExecution - * @memberof flyteidl.service.AdminService - * @instance - * @param {flyteidl.admin.ITaskExecutionUpdateRequest} request TaskExecutionUpdateRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ - /** * Callback as used by {@link flyteidl.service.AdminService#updateProjectDomainAttributes}. * @memberof flyteidl.service.AdminService @@ -44035,6 +43725,443 @@ return AuthMetadataService; })(); + service.EvictExecutionCacheRequest = (function() { + + /** + * Properties of an EvictExecutionCacheRequest. + * @memberof flyteidl.service + * @interface IEvictExecutionCacheRequest + * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [id] EvictExecutionCacheRequest id + */ + + /** + * Constructs a new EvictExecutionCacheRequest. + * @memberof flyteidl.service + * @classdesc Represents an EvictExecutionCacheRequest. + * @implements IEvictExecutionCacheRequest + * @constructor + * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set + */ + function EvictExecutionCacheRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EvictExecutionCacheRequest id. + * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} id + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @instance + */ + EvictExecutionCacheRequest.prototype.id = null; + + /** + * Creates a new EvictExecutionCacheRequest instance using the specified properties. + * @function create + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set + * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest instance + */ + EvictExecutionCacheRequest.create = function create(properties) { + return new EvictExecutionCacheRequest(properties); + }; + + /** + * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages. + * @function encode + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {flyteidl.service.IEvictExecutionCacheRequest} message EvictExecutionCacheRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EvictExecutionCacheRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.id != null && message.hasOwnProperty("id")) + $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EvictExecutionCacheRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictExecutionCacheRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.id = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies an EvictExecutionCacheRequest message. + * @function verify + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EvictExecutionCacheRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.id != null && message.hasOwnProperty("id")) { + var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.id); + if (error) + return "id." + error; + } + return null; + }; + + return EvictExecutionCacheRequest; + })(); + + service.EvictTaskExecutionCacheRequest = (function() { + + /** + * Properties of an EvictTaskExecutionCacheRequest. + * @memberof flyteidl.service + * @interface IEvictTaskExecutionCacheRequest + * @property {flyteidl.core.ITaskExecutionIdentifier|null} [id] EvictTaskExecutionCacheRequest id + */ + + /** + * Constructs a new EvictTaskExecutionCacheRequest. + * @memberof flyteidl.service + * @classdesc Represents an EvictTaskExecutionCacheRequest. + * @implements IEvictTaskExecutionCacheRequest + * @constructor + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest=} [properties] Properties to set + */ + function EvictTaskExecutionCacheRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EvictTaskExecutionCacheRequest id. + * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} id + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @instance + */ + EvictTaskExecutionCacheRequest.prototype.id = null; + + /** + * Creates a new EvictTaskExecutionCacheRequest instance using the specified properties. + * @function create + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @static + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest=} [properties] Properties to set + * @returns {flyteidl.service.EvictTaskExecutionCacheRequest} EvictTaskExecutionCacheRequest instance + */ + EvictTaskExecutionCacheRequest.create = function create(properties) { + return new EvictTaskExecutionCacheRequest(properties); + }; + + /** + * Encodes the specified EvictTaskExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictTaskExecutionCacheRequest.verify|verify} messages. + * @function encode + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @static + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} message EvictTaskExecutionCacheRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EvictTaskExecutionCacheRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.id != null && message.hasOwnProperty("id")) + $root.flyteidl.core.TaskExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes an EvictTaskExecutionCacheRequest message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.service.EvictTaskExecutionCacheRequest} EvictTaskExecutionCacheRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EvictTaskExecutionCacheRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictTaskExecutionCacheRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.id = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies an EvictTaskExecutionCacheRequest message. + * @function verify + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EvictTaskExecutionCacheRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.id != null && message.hasOwnProperty("id")) { + var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.id); + if (error) + return "id." + error; + } + return null; + }; + + return EvictTaskExecutionCacheRequest; + })(); + + service.EvictCacheResponse = (function() { + + /** + * Properties of an EvictCacheResponse. + * @memberof flyteidl.service + * @interface IEvictCacheResponse + * @property {flyteidl.core.ICacheEvictionErrorList|null} [errors] EvictCacheResponse errors + */ + + /** + * Constructs a new EvictCacheResponse. + * @memberof flyteidl.service + * @classdesc Represents an EvictCacheResponse. + * @implements IEvictCacheResponse + * @constructor + * @param {flyteidl.service.IEvictCacheResponse=} [properties] Properties to set + */ + function EvictCacheResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EvictCacheResponse errors. + * @member {flyteidl.core.ICacheEvictionErrorList|null|undefined} errors + * @memberof flyteidl.service.EvictCacheResponse + * @instance + */ + EvictCacheResponse.prototype.errors = null; + + /** + * Creates a new EvictCacheResponse instance using the specified properties. + * @function create + * @memberof flyteidl.service.EvictCacheResponse + * @static + * @param {flyteidl.service.IEvictCacheResponse=} [properties] Properties to set + * @returns {flyteidl.service.EvictCacheResponse} EvictCacheResponse instance + */ + EvictCacheResponse.create = function create(properties) { + return new EvictCacheResponse(properties); + }; + + /** + * Encodes the specified EvictCacheResponse message. Does not implicitly {@link flyteidl.service.EvictCacheResponse.verify|verify} messages. + * @function encode + * @memberof flyteidl.service.EvictCacheResponse + * @static + * @param {flyteidl.service.IEvictCacheResponse} message EvictCacheResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EvictCacheResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.errors != null && message.hasOwnProperty("errors")) + $root.flyteidl.core.CacheEvictionErrorList.encode(message.errors, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes an EvictCacheResponse message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.service.EvictCacheResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.service.EvictCacheResponse} EvictCacheResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EvictCacheResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictCacheResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.errors = $root.flyteidl.core.CacheEvictionErrorList.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies an EvictCacheResponse message. + * @function verify + * @memberof flyteidl.service.EvictCacheResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EvictCacheResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.errors != null && message.hasOwnProperty("errors")) { + var error = $root.flyteidl.core.CacheEvictionErrorList.verify(message.errors); + if (error) + return "errors." + error; + } + return null; + }; + + return EvictCacheResponse; + })(); + + service.CacheService = (function() { + + /** + * Constructs a new CacheService service. + * @memberof flyteidl.service + * @classdesc Represents a CacheService + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function CacheService(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } + + (CacheService.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = CacheService; + + /** + * Creates new CacheService service using the specified rpc implementation. + * @function create + * @memberof flyteidl.service.CacheService + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {CacheService} RPC service. Useful where requests and/or responses are streamed. + */ + CacheService.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; + + /** + * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}. + * @memberof flyteidl.service.CacheService + * @typedef EvictExecutionCacheCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {flyteidl.service.EvictCacheResponse} [response] EvictCacheResponse + */ + + /** + * Calls EvictExecutionCache. + * @function evictExecutionCache + * @memberof flyteidl.service.CacheService + * @instance + * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object + * @param {flyteidl.service.CacheService.EvictExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(CacheService.prototype.evictExecutionCache = function evictExecutionCache(request, callback) { + return this.rpcCall(evictExecutionCache, $root.flyteidl.service.EvictExecutionCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); + }, "name", { value: "EvictExecutionCache" }); + + /** + * Calls EvictExecutionCache. + * @function evictExecutionCache + * @memberof flyteidl.service.CacheService + * @instance + * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}. + * @memberof flyteidl.service.CacheService + * @typedef EvictTaskExecutionCacheCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {flyteidl.service.EvictCacheResponse} [response] EvictCacheResponse + */ + + /** + * Calls EvictTaskExecutionCache. + * @function evictTaskExecutionCache + * @memberof flyteidl.service.CacheService + * @instance + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} request EvictTaskExecutionCacheRequest message or plain object + * @param {flyteidl.service.CacheService.EvictTaskExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(CacheService.prototype.evictTaskExecutionCache = function evictTaskExecutionCache(request, callback) { + return this.rpcCall(evictTaskExecutionCache, $root.flyteidl.service.EvictTaskExecutionCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); + }, "name", { value: "EvictTaskExecutionCache" }); + + /** + * Calls EvictTaskExecutionCache. + * @function evictTaskExecutionCache + * @memberof flyteidl.service.CacheService + * @instance + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} request EvictTaskExecutionCacheRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return CacheService; + })(); + service.CreateUploadLocationResponse = (function() { /** diff --git a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py index 51566608f9..628d13ded7 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.py @@ -14,7 +14,6 @@ from flyteidl.admin import cluster_assignment_pb2 as flyteidl_dot_admin_dot_cluster__assignment__pb2 from flyteidl.admin import common_pb2 as flyteidl_dot_admin_dot_common__pb2 from flyteidl.core import literals_pb2 as flyteidl_dot_core_dot_literals__pb2 -from flyteidl.core import errors_pb2 as flyteidl_dot_core_dot_errors__pb2 from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 from flyteidl.core import security_pb2 as flyteidl_dot_core_dot_security__pb2 @@ -23,7 +22,7 @@ from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x66lyteidl/admin/execution.proto\x12\x0e\x66lyteidl.admin\x1a\'flyteidl/admin/cluster_assignment.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc4\x01\n\x16\x45xecutionCreateRequest\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x16\n\x06\x64omain\x18\x02 \x01(\tR\x06\x64omain\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x31\n\x04spec\x18\x04 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12\x31\n\x06inputs\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\"\x99\x01\n\x18\x45xecutionRelaunchRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\'\n\x0foverwrite_cache\x18\x04 \x01(\x08R\x0eoverwriteCacheJ\x04\x08\x02\x10\x03\"\xa8\x01\n\x17\x45xecutionRecoverRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\"U\n\x17\x45xecutionCreateResponse\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"Y\n\x1bWorkflowExecutionGetRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\xb6\x01\n\tExecution\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x31\n\x04spec\x18\x02 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12:\n\x07\x63losure\x18\x03 \x01(\x0b\x32 .flyteidl.admin.ExecutionClosureR\x07\x63losure\"`\n\rExecutionList\x12\x39\n\nexecutions\x18\x01 \x03(\x0b\x32\x19.flyteidl.admin.ExecutionR\nexecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"e\n\x0eLiteralMapBlob\x12\x37\n\x06values\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\x06values\x12\x12\n\x03uri\x18\x02 \x01(\tH\x00R\x03uriB\x06\n\x04\x64\x61ta\"C\n\rAbortMetadata\x12\x14\n\x05\x63\x61use\x18\x01 \x01(\tR\x05\x63\x61use\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\"\x98\x07\n\x10\x45xecutionClosure\x12>\n\x07outputs\x18\x01 \x01(\x0b\x32\x1e.flyteidl.admin.LiteralMapBlobB\x02\x18\x01H\x00R\x07outputs\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12%\n\x0b\x61\x62ort_cause\x18\n \x01(\tB\x02\x18\x01H\x00R\nabortCause\x12\x46\n\x0e\x61\x62ort_metadata\x18\x0c \x01(\x0b\x32\x1d.flyteidl.admin.AbortMetadataH\x00R\rabortMetadata\x12@\n\x0boutput_data\x18\r \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x46\n\x0f\x63omputed_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x0e\x63omputedInputs\x12<\n\x05phase\x18\x04 \x01(\x0e\x32&.flyteidl.core.WorkflowExecution.PhaseR\x05phase\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x42\n\rnotifications\x18\t \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\x12:\n\x0bworkflow_id\x18\x0b \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12]\n\x14state_change_details\x18\x0e \x01(\x0b\x32+.flyteidl.admin.ExecutionStateChangeDetailsR\x12stateChangeDetailsB\x0f\n\routput_result\"=\n\x0eSystemMetadata\x12+\n\x11\x65xecution_cluster\x18\x01 \x01(\tR\x10\x65xecutionCluster\"\xba\x04\n\x11\x45xecutionMetadata\x12\x43\n\x04mode\x18\x01 \x01(\x0e\x32/.flyteidl.admin.ExecutionMetadata.ExecutionModeR\x04mode\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\x12\x18\n\x07nesting\x18\x03 \x01(\rR\x07nesting\x12=\n\x0cscheduled_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bscheduledAt\x12Z\n\x15parent_node_execution\x18\x05 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x13parentNodeExecution\x12[\n\x13reference_execution\x18\x10 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12G\n\x0fsystem_metadata\x18\x11 \x01(\x0b\x32\x1e.flyteidl.admin.SystemMetadataR\x0esystemMetadata\"g\n\rExecutionMode\x12\n\n\x06MANUAL\x10\x00\x12\r\n\tSCHEDULED\x10\x01\x12\n\n\x06SYSTEM\x10\x02\x12\x0c\n\x08RELAUNCH\x10\x03\x12\x12\n\x0e\x43HILD_WORKFLOW\x10\x04\x12\r\n\tRECOVERED\x10\x05\"V\n\x10NotificationList\x12\x42\n\rnotifications\x18\x01 \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\"\xd2\x07\n\rExecutionSpec\x12:\n\x0blaunch_plan\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nlaunchPlan\x12\x35\n\x06inputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x06inputs\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\x12H\n\rnotifications\x18\x05 \x01(\x0b\x32 .flyteidl.admin.NotificationListH\x00R\rnotifications\x12!\n\x0b\x64isable_all\x18\x06 \x01(\x08H\x00R\ndisableAll\x12.\n\x06labels\x18\x07 \x01(\x0b\x32\x16.flyteidl.admin.LabelsR\x06labels\x12=\n\x0b\x61nnotations\x18\x08 \x01(\x0b\x32\x1b.flyteidl.admin.AnnotationsR\x0b\x61nnotations\x12I\n\x10security_context\x18\n \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12\x39\n\tauth_role\x18\x10 \x01(\x0b\x32\x18.flyteidl.admin.AuthRoleB\x02\x18\x01R\x08\x61uthRole\x12M\n\x12quality_of_service\x18\x11 \x01(\x0b\x32\x1f.flyteidl.core.QualityOfServiceR\x10qualityOfService\x12\'\n\x0fmax_parallelism\x18\x12 \x01(\x05R\x0emaxParallelism\x12X\n\x16raw_output_data_config\x18\x13 \x01(\x0b\x32#.flyteidl.admin.RawOutputDataConfigR\x13rawOutputDataConfig\x12P\n\x12\x63luster_assignment\x18\x14 \x01(\x0b\x32!.flyteidl.admin.ClusterAssignmentR\x11\x63lusterAssignment\x12@\n\rinterruptible\x18\x15 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\rinterruptible\x12\'\n\x0foverwrite_cache\x18\x16 \x01(\x08R\x0eoverwriteCacheB\x18\n\x16notification_overridesJ\x04\x08\x04\x10\x05\"m\n\x19\x45xecutionTerminateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x14\n\x05\x63\x61use\x18\x02 \x01(\tR\x05\x63\x61use\"\x1c\n\x1a\x45xecutionTerminateResponse\"]\n\x1fWorkflowExecutionGetDataRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\x88\x02\n WorkflowExecutionGetDataResponse\x12\x35\n\x07outputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12\x33\n\x06inputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputs\"\xab\x01\n\x16\x45xecutionUpdateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x34\n\x05state\x18\x02 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\x12\x1f\n\x0b\x65vict_cache\x18\x03 \x01(\x08R\nevictCache\"\xae\x01\n\x1b\x45xecutionStateChangeDetails\x12\x34\n\x05state\x18\x01 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\x12;\n\x0boccurred_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\noccurredAt\x12\x1c\n\tprincipal\x18\x03 \x01(\tR\tprincipal\"t\n\x17\x45xecutionUpdateResponse\x12Y\n\x15\x63\x61\x63he_eviction_errors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x13\x63\x61\x63heEvictionErrors*>\n\x0e\x45xecutionState\x12\x14\n\x10\x45XECUTION_ACTIVE\x10\x00\x12\x16\n\x12\x45XECUTION_ARCHIVED\x10\x01\x42\xb4\x01\n\x12\x63om.flyteidl.adminB\x0e\x45xecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x66lyteidl/admin/execution.proto\x12\x0e\x66lyteidl.admin\x1a\'flyteidl/admin/cluster_assignment.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc4\x01\n\x16\x45xecutionCreateRequest\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x16\n\x06\x64omain\x18\x02 \x01(\tR\x06\x64omain\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x31\n\x04spec\x18\x04 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12\x31\n\x06inputs\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\"\x99\x01\n\x18\x45xecutionRelaunchRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\'\n\x0foverwrite_cache\x18\x04 \x01(\x08R\x0eoverwriteCacheJ\x04\x08\x02\x10\x03\"\xa8\x01\n\x17\x45xecutionRecoverRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\"U\n\x17\x45xecutionCreateResponse\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"Y\n\x1bWorkflowExecutionGetRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\xb6\x01\n\tExecution\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x31\n\x04spec\x18\x02 \x01(\x0b\x32\x1d.flyteidl.admin.ExecutionSpecR\x04spec\x12:\n\x07\x63losure\x18\x03 \x01(\x0b\x32 .flyteidl.admin.ExecutionClosureR\x07\x63losure\"`\n\rExecutionList\x12\x39\n\nexecutions\x18\x01 \x03(\x0b\x32\x19.flyteidl.admin.ExecutionR\nexecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"e\n\x0eLiteralMapBlob\x12\x37\n\x06values\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\x06values\x12\x12\n\x03uri\x18\x02 \x01(\tH\x00R\x03uriB\x06\n\x04\x64\x61ta\"C\n\rAbortMetadata\x12\x14\n\x05\x63\x61use\x18\x01 \x01(\tR\x05\x63\x61use\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\"\x98\x07\n\x10\x45xecutionClosure\x12>\n\x07outputs\x18\x01 \x01(\x0b\x32\x1e.flyteidl.admin.LiteralMapBlobB\x02\x18\x01H\x00R\x07outputs\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12%\n\x0b\x61\x62ort_cause\x18\n \x01(\tB\x02\x18\x01H\x00R\nabortCause\x12\x46\n\x0e\x61\x62ort_metadata\x18\x0c \x01(\x0b\x32\x1d.flyteidl.admin.AbortMetadataH\x00R\rabortMetadata\x12@\n\x0boutput_data\x18\r \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x46\n\x0f\x63omputed_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x0e\x63omputedInputs\x12<\n\x05phase\x18\x04 \x01(\x0e\x32&.flyteidl.core.WorkflowExecution.PhaseR\x05phase\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x42\n\rnotifications\x18\t \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\x12:\n\x0bworkflow_id\x18\x0b \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12]\n\x14state_change_details\x18\x0e \x01(\x0b\x32+.flyteidl.admin.ExecutionStateChangeDetailsR\x12stateChangeDetailsB\x0f\n\routput_result\"=\n\x0eSystemMetadata\x12+\n\x11\x65xecution_cluster\x18\x01 \x01(\tR\x10\x65xecutionCluster\"\xba\x04\n\x11\x45xecutionMetadata\x12\x43\n\x04mode\x18\x01 \x01(\x0e\x32/.flyteidl.admin.ExecutionMetadata.ExecutionModeR\x04mode\x12\x1c\n\tprincipal\x18\x02 \x01(\tR\tprincipal\x12\x18\n\x07nesting\x18\x03 \x01(\rR\x07nesting\x12=\n\x0cscheduled_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bscheduledAt\x12Z\n\x15parent_node_execution\x18\x05 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x13parentNodeExecution\x12[\n\x13reference_execution\x18\x10 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12G\n\x0fsystem_metadata\x18\x11 \x01(\x0b\x32\x1e.flyteidl.admin.SystemMetadataR\x0esystemMetadata\"g\n\rExecutionMode\x12\n\n\x06MANUAL\x10\x00\x12\r\n\tSCHEDULED\x10\x01\x12\n\n\x06SYSTEM\x10\x02\x12\x0c\n\x08RELAUNCH\x10\x03\x12\x12\n\x0e\x43HILD_WORKFLOW\x10\x04\x12\r\n\tRECOVERED\x10\x05\"V\n\x10NotificationList\x12\x42\n\rnotifications\x18\x01 \x03(\x0b\x32\x1c.flyteidl.admin.NotificationR\rnotifications\"\xd2\x07\n\rExecutionSpec\x12:\n\x0blaunch_plan\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nlaunchPlan\x12\x35\n\x06inputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01R\x06inputs\x12=\n\x08metadata\x18\x03 \x01(\x0b\x32!.flyteidl.admin.ExecutionMetadataR\x08metadata\x12H\n\rnotifications\x18\x05 \x01(\x0b\x32 .flyteidl.admin.NotificationListH\x00R\rnotifications\x12!\n\x0b\x64isable_all\x18\x06 \x01(\x08H\x00R\ndisableAll\x12.\n\x06labels\x18\x07 \x01(\x0b\x32\x16.flyteidl.admin.LabelsR\x06labels\x12=\n\x0b\x61nnotations\x18\x08 \x01(\x0b\x32\x1b.flyteidl.admin.AnnotationsR\x0b\x61nnotations\x12I\n\x10security_context\x18\n \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12\x39\n\tauth_role\x18\x10 \x01(\x0b\x32\x18.flyteidl.admin.AuthRoleB\x02\x18\x01R\x08\x61uthRole\x12M\n\x12quality_of_service\x18\x11 \x01(\x0b\x32\x1f.flyteidl.core.QualityOfServiceR\x10qualityOfService\x12\'\n\x0fmax_parallelism\x18\x12 \x01(\x05R\x0emaxParallelism\x12X\n\x16raw_output_data_config\x18\x13 \x01(\x0b\x32#.flyteidl.admin.RawOutputDataConfigR\x13rawOutputDataConfig\x12P\n\x12\x63luster_assignment\x18\x14 \x01(\x0b\x32!.flyteidl.admin.ClusterAssignmentR\x11\x63lusterAssignment\x12@\n\rinterruptible\x18\x15 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\rinterruptible\x12\'\n\x0foverwrite_cache\x18\x16 \x01(\x08R\x0eoverwriteCacheB\x18\n\x16notification_overridesJ\x04\x08\x04\x10\x05\"m\n\x19\x45xecutionTerminateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x14\n\x05\x63\x61use\x18\x02 \x01(\tR\x05\x63\x61use\"\x1c\n\x1a\x45xecutionTerminateResponse\"]\n\x1fWorkflowExecutionGetDataRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"\x88\x02\n WorkflowExecutionGetDataResponse\x12\x35\n\x07outputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12\x33\n\x06inputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputs\"\x8a\x01\n\x16\x45xecutionUpdateRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\x12\x34\n\x05state\x18\x02 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\"\xae\x01\n\x1b\x45xecutionStateChangeDetails\x12\x34\n\x05state\x18\x01 \x01(\x0e\x32\x1e.flyteidl.admin.ExecutionStateR\x05state\x12;\n\x0boccurred_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\noccurredAt\x12\x1c\n\tprincipal\x18\x03 \x01(\tR\tprincipal\"\x19\n\x17\x45xecutionUpdateResponse*>\n\x0e\x45xecutionState\x12\x14\n\x10\x45XECUTION_ACTIVE\x10\x00\x12\x16\n\x12\x45XECUTION_ARCHIVED\x10\x01\x42\xb4\x01\n\x12\x63om.flyteidl.adminB\x0e\x45xecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.admin.execution_pb2', globals()) @@ -49,50 +48,50 @@ _WORKFLOWEXECUTIONGETDATARESPONSE.fields_by_name['outputs']._serialized_options = b'\030\001' _WORKFLOWEXECUTIONGETDATARESPONSE.fields_by_name['inputs']._options = None _WORKFLOWEXECUTIONGETDATARESPONSE.fields_by_name['inputs']._serialized_options = b'\030\001' - _EXECUTIONSTATE._serialized_start=5127 - _EXECUTIONSTATE._serialized_end=5189 - _EXECUTIONCREATEREQUEST._serialized_start=369 - _EXECUTIONCREATEREQUEST._serialized_end=565 - _EXECUTIONRELAUNCHREQUEST._serialized_start=568 - _EXECUTIONRELAUNCHREQUEST._serialized_end=721 - _EXECUTIONRECOVERREQUEST._serialized_start=724 - _EXECUTIONRECOVERREQUEST._serialized_end=892 - _EXECUTIONCREATERESPONSE._serialized_start=894 - _EXECUTIONCREATERESPONSE._serialized_end=979 - _WORKFLOWEXECUTIONGETREQUEST._serialized_start=981 - _WORKFLOWEXECUTIONGETREQUEST._serialized_end=1070 - _EXECUTION._serialized_start=1073 - _EXECUTION._serialized_end=1255 - _EXECUTIONLIST._serialized_start=1257 - _EXECUTIONLIST._serialized_end=1353 - _LITERALMAPBLOB._serialized_start=1355 - _LITERALMAPBLOB._serialized_end=1456 - _ABORTMETADATA._serialized_start=1458 - _ABORTMETADATA._serialized_end=1525 - _EXECUTIONCLOSURE._serialized_start=1528 - _EXECUTIONCLOSURE._serialized_end=2448 - _SYSTEMMETADATA._serialized_start=2450 - _SYSTEMMETADATA._serialized_end=2511 - _EXECUTIONMETADATA._serialized_start=2514 - _EXECUTIONMETADATA._serialized_end=3084 - _EXECUTIONMETADATA_EXECUTIONMODE._serialized_start=2981 - _EXECUTIONMETADATA_EXECUTIONMODE._serialized_end=3084 - _NOTIFICATIONLIST._serialized_start=3086 - _NOTIFICATIONLIST._serialized_end=3172 - _EXECUTIONSPEC._serialized_start=3175 - _EXECUTIONSPEC._serialized_end=4153 - _EXECUTIONTERMINATEREQUEST._serialized_start=4155 - _EXECUTIONTERMINATEREQUEST._serialized_end=4264 - _EXECUTIONTERMINATERESPONSE._serialized_start=4266 - _EXECUTIONTERMINATERESPONSE._serialized_end=4294 - _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_start=4296 - _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_end=4389 - _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_start=4392 - _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_end=4656 - _EXECUTIONUPDATEREQUEST._serialized_start=4659 - _EXECUTIONUPDATEREQUEST._serialized_end=4830 - _EXECUTIONSTATECHANGEDETAILS._serialized_start=4833 - _EXECUTIONSTATECHANGEDETAILS._serialized_end=5007 - _EXECUTIONUPDATERESPONSE._serialized_start=5009 - _EXECUTIONUPDATERESPONSE._serialized_end=5125 + _EXECUTIONSTATE._serialized_start=4975 + _EXECUTIONSTATE._serialized_end=5037 + _EXECUTIONCREATEREQUEST._serialized_start=341 + _EXECUTIONCREATEREQUEST._serialized_end=537 + _EXECUTIONRELAUNCHREQUEST._serialized_start=540 + _EXECUTIONRELAUNCHREQUEST._serialized_end=693 + _EXECUTIONRECOVERREQUEST._serialized_start=696 + _EXECUTIONRECOVERREQUEST._serialized_end=864 + _EXECUTIONCREATERESPONSE._serialized_start=866 + _EXECUTIONCREATERESPONSE._serialized_end=951 + _WORKFLOWEXECUTIONGETREQUEST._serialized_start=953 + _WORKFLOWEXECUTIONGETREQUEST._serialized_end=1042 + _EXECUTION._serialized_start=1045 + _EXECUTION._serialized_end=1227 + _EXECUTIONLIST._serialized_start=1229 + _EXECUTIONLIST._serialized_end=1325 + _LITERALMAPBLOB._serialized_start=1327 + _LITERALMAPBLOB._serialized_end=1428 + _ABORTMETADATA._serialized_start=1430 + _ABORTMETADATA._serialized_end=1497 + _EXECUTIONCLOSURE._serialized_start=1500 + _EXECUTIONCLOSURE._serialized_end=2420 + _SYSTEMMETADATA._serialized_start=2422 + _SYSTEMMETADATA._serialized_end=2483 + _EXECUTIONMETADATA._serialized_start=2486 + _EXECUTIONMETADATA._serialized_end=3056 + _EXECUTIONMETADATA_EXECUTIONMODE._serialized_start=2953 + _EXECUTIONMETADATA_EXECUTIONMODE._serialized_end=3056 + _NOTIFICATIONLIST._serialized_start=3058 + _NOTIFICATIONLIST._serialized_end=3144 + _EXECUTIONSPEC._serialized_start=3147 + _EXECUTIONSPEC._serialized_end=4125 + _EXECUTIONTERMINATEREQUEST._serialized_start=4127 + _EXECUTIONTERMINATEREQUEST._serialized_end=4236 + _EXECUTIONTERMINATERESPONSE._serialized_start=4238 + _EXECUTIONTERMINATERESPONSE._serialized_end=4266 + _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_start=4268 + _WORKFLOWEXECUTIONGETDATAREQUEST._serialized_end=4361 + _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_start=4364 + _WORKFLOWEXECUTIONGETDATARESPONSE._serialized_end=4628 + _EXECUTIONUPDATEREQUEST._serialized_start=4631 + _EXECUTIONUPDATEREQUEST._serialized_end=4769 + _EXECUTIONSTATECHANGEDETAILS._serialized_start=4772 + _EXECUTIONSTATECHANGEDETAILS._serialized_end=4946 + _EXECUTIONUPDATERESPONSE._serialized_start=4948 + _EXECUTIONUPDATERESPONSE._serialized_end=4973 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi index 7c214bd80a..20c0988866 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/execution_pb2.pyi @@ -1,7 +1,6 @@ from flyteidl.admin import cluster_assignment_pb2 as _cluster_assignment_pb2 from flyteidl.admin import common_pb2 as _common_pb2 from flyteidl.core import literals_pb2 as _literals_pb2 -from flyteidl.core import errors_pb2 as _errors_pb2 from flyteidl.core import execution_pb2 as _execution_pb2 from flyteidl.core import identifier_pb2 as _identifier_pb2 from flyteidl.core import security_pb2 as _security_pb2 @@ -199,20 +198,16 @@ class ExecutionTerminateResponse(_message.Message): def __init__(self) -> None: ... class ExecutionUpdateRequest(_message.Message): - __slots__ = ["evict_cache", "id", "state"] - EVICT_CACHE_FIELD_NUMBER: _ClassVar[int] + __slots__ = ["id", "state"] ID_FIELD_NUMBER: _ClassVar[int] STATE_FIELD_NUMBER: _ClassVar[int] - evict_cache: bool id: _identifier_pb2.WorkflowExecutionIdentifier state: ExecutionState - def __init__(self, id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., state: _Optional[_Union[ExecutionState, str]] = ..., evict_cache: bool = ...) -> None: ... + def __init__(self, id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., state: _Optional[_Union[ExecutionState, str]] = ...) -> None: ... class ExecutionUpdateResponse(_message.Message): - __slots__ = ["cache_eviction_errors"] - CACHE_EVICTION_ERRORS_FIELD_NUMBER: _ClassVar[int] - cache_eviction_errors: _errors_pb2.CacheEvictionErrorList - def __init__(self, cache_eviction_errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ... + __slots__ = [] + def __init__(self) -> None: ... class LiteralMapBlob(_message.Message): __slots__ = ["uri", "values"] diff --git a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py index 7cf2297d4b..38521dc88a 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.py @@ -12,7 +12,6 @@ from flyteidl.admin import common_pb2 as flyteidl_dot_admin_dot_common__pb2 -from flyteidl.core import errors_pb2 as flyteidl_dot_core_dot_errors__pb2 from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 from flyteidl.core import literals_pb2 as flyteidl_dot_core_dot_literals__pb2 @@ -22,7 +21,7 @@ from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#flyteidl/admin/task_execution.proto\x12\x0e\x66lyteidl.admin\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"Q\n\x17TaskExecutionGetRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\xe3\x01\n\x18TaskExecutionListRequest\x12R\n\x11node_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12\x14\n\x05limit\x18\x02 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x03 \x01(\tR\x05token\x12\x18\n\x07\x66ilters\x18\x04 \x01(\tR\x07\x66ilters\x12-\n\x07sort_by\x18\x05 \x01(\x0b\x32\x14.flyteidl.admin.SortR\x06sortBy\"\xc1\x01\n\rTaskExecution\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\x12\x1b\n\tinput_uri\x18\x02 \x01(\tR\x08inputUri\x12>\n\x07\x63losure\x18\x03 \x01(\x0b\x32$.flyteidl.admin.TaskExecutionClosureR\x07\x63losure\x12\x1b\n\tis_parent\x18\x04 \x01(\x08R\x08isParent\"q\n\x11TaskExecutionList\x12\x46\n\x0ftask_executions\x18\x01 \x03(\x0b\x32\x1d.flyteidl.admin.TaskExecutionR\x0etaskExecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"\xea\x05\n\x14TaskExecutionClosure\x12#\n\noutput_uri\x18\x01 \x01(\tB\x02\x18\x01H\x00R\toutputUri\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12@\n\x0boutput_data\x18\x0c \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x38\n\x05phase\x18\x03 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\x12*\n\x04logs\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x04logs\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x38\n\x0b\x63ustom_info\x18\t \x01(\x0b\x32\x17.google.protobuf.StructR\ncustomInfo\x12\x16\n\x06reason\x18\n \x01(\tR\x06reason\x12\x1b\n\ttask_type\x18\x0b \x01(\tR\x08taskType\x12\x41\n\x08metadata\x18\x10 \x01(\x0b\x32%.flyteidl.event.TaskExecutionMetadataR\x08metadata\x12#\n\revent_version\x18\x11 \x01(\x05R\x0c\x65ventVersionB\x0f\n\routput_result\"U\n\x1bTaskExecutionGetDataRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\x84\x02\n\x1cTaskExecutionGetDataResponse\x12\x33\n\x06inputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12\x35\n\x07outputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputs\"u\n\x1aTaskExecutionUpdateRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\x12\x1f\n\x0b\x65vict_cache\x18\x02 \x01(\x08R\nevictCache\"x\n\x1bTaskExecutionUpdateResponse\x12Y\n\x15\x63\x61\x63he_eviction_errors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x13\x63\x61\x63heEvictionErrorsB\xb8\x01\n\x12\x63om.flyteidl.adminB\x12TaskExecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#flyteidl/admin/task_execution.proto\x12\x0e\x66lyteidl.admin\x1a\x1b\x66lyteidl/admin/common.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"Q\n\x17TaskExecutionGetRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\xe3\x01\n\x18TaskExecutionListRequest\x12R\n\x11node_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12\x14\n\x05limit\x18\x02 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x03 \x01(\tR\x05token\x12\x18\n\x07\x66ilters\x18\x04 \x01(\tR\x07\x66ilters\x12-\n\x07sort_by\x18\x05 \x01(\x0b\x32\x14.flyteidl.admin.SortR\x06sortBy\"\xc1\x01\n\rTaskExecution\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\x12\x1b\n\tinput_uri\x18\x02 \x01(\tR\x08inputUri\x12>\n\x07\x63losure\x18\x03 \x01(\x0b\x32$.flyteidl.admin.TaskExecutionClosureR\x07\x63losure\x12\x1b\n\tis_parent\x18\x04 \x01(\x08R\x08isParent\"q\n\x11TaskExecutionList\x12\x46\n\x0ftask_executions\x18\x01 \x03(\x0b\x32\x1d.flyteidl.admin.TaskExecutionR\x0etaskExecutions\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\"\xea\x05\n\x14TaskExecutionClosure\x12#\n\noutput_uri\x18\x01 \x01(\tB\x02\x18\x01H\x00R\toutputUri\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.ExecutionErrorH\x00R\x05\x65rror\x12@\n\x0boutput_data\x18\x0c \x01(\x0b\x32\x19.flyteidl.core.LiteralMapB\x02\x18\x01H\x00R\noutputData\x12\x38\n\x05phase\x18\x03 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\x12*\n\x04logs\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x04logs\x12\x39\n\nstarted_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x35\n\x08\x64uration\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08\x64uration\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x39\n\nupdated_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x38\n\x0b\x63ustom_info\x18\t \x01(\x0b\x32\x17.google.protobuf.StructR\ncustomInfo\x12\x16\n\x06reason\x18\n \x01(\tR\x06reason\x12\x1b\n\ttask_type\x18\x0b \x01(\tR\x08taskType\x12\x41\n\x08metadata\x18\x10 \x01(\x0b\x32%.flyteidl.event.TaskExecutionMetadataR\x08metadata\x12#\n\revent_version\x18\x11 \x01(\x05R\x0c\x65ventVersionB\x0f\n\routput_result\"U\n\x1bTaskExecutionGetDataRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"\x84\x02\n\x1cTaskExecutionGetDataResponse\x12\x33\n\x06inputs\x18\x01 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x06inputs\x12\x35\n\x07outputs\x18\x02 \x01(\x0b\x32\x17.flyteidl.admin.UrlBlobB\x02\x18\x01R\x07outputs\x12:\n\x0b\x66ull_inputs\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\nfullInputs\x12<\n\x0c\x66ull_outputs\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x0b\x66ullOutputsB\xb8\x01\n\x12\x63om.flyteidl.adminB\x12TaskExecutionProtoP\x01Z5github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.admin.task_execution_pb2', globals()) @@ -38,22 +37,18 @@ _TASKEXECUTIONGETDATARESPONSE.fields_by_name['inputs']._serialized_options = b'\030\001' _TASKEXECUTIONGETDATARESPONSE.fields_by_name['outputs']._options = None _TASKEXECUTIONGETDATARESPONSE.fields_by_name['outputs']._serialized_options = b'\030\001' - _TASKEXECUTIONGETREQUEST._serialized_start=328 - _TASKEXECUTIONGETREQUEST._serialized_end=409 - _TASKEXECUTIONLISTREQUEST._serialized_start=412 - _TASKEXECUTIONLISTREQUEST._serialized_end=639 - _TASKEXECUTION._serialized_start=642 - _TASKEXECUTION._serialized_end=835 - _TASKEXECUTIONLIST._serialized_start=837 - _TASKEXECUTIONLIST._serialized_end=950 - _TASKEXECUTIONCLOSURE._serialized_start=953 - _TASKEXECUTIONCLOSURE._serialized_end=1699 - _TASKEXECUTIONGETDATAREQUEST._serialized_start=1701 - _TASKEXECUTIONGETDATAREQUEST._serialized_end=1786 - _TASKEXECUTIONGETDATARESPONSE._serialized_start=1789 - _TASKEXECUTIONGETDATARESPONSE._serialized_end=2049 - _TASKEXECUTIONUPDATEREQUEST._serialized_start=2051 - _TASKEXECUTIONUPDATEREQUEST._serialized_end=2168 - _TASKEXECUTIONUPDATERESPONSE._serialized_start=2170 - _TASKEXECUTIONUPDATERESPONSE._serialized_end=2290 + _TASKEXECUTIONGETREQUEST._serialized_start=300 + _TASKEXECUTIONGETREQUEST._serialized_end=381 + _TASKEXECUTIONLISTREQUEST._serialized_start=384 + _TASKEXECUTIONLISTREQUEST._serialized_end=611 + _TASKEXECUTION._serialized_start=614 + _TASKEXECUTION._serialized_end=807 + _TASKEXECUTIONLIST._serialized_start=809 + _TASKEXECUTIONLIST._serialized_end=922 + _TASKEXECUTIONCLOSURE._serialized_start=925 + _TASKEXECUTIONCLOSURE._serialized_end=1671 + _TASKEXECUTIONGETDATAREQUEST._serialized_start=1673 + _TASKEXECUTIONGETDATAREQUEST._serialized_end=1758 + _TASKEXECUTIONGETDATARESPONSE._serialized_start=1761 + _TASKEXECUTIONGETDATARESPONSE._serialized_end=2021 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi index 892fbf4522..6b0035fe1d 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/task_execution_pb2.pyi @@ -1,5 +1,4 @@ from flyteidl.admin import common_pb2 as _common_pb2 -from flyteidl.core import errors_pb2 as _errors_pb2 from flyteidl.core import execution_pb2 as _execution_pb2 from flyteidl.core import identifier_pb2 as _identifier_pb2 from flyteidl.core import literals_pb2 as _literals_pb2 @@ -103,17 +102,3 @@ class TaskExecutionListRequest(_message.Message): sort_by: _common_pb2.Sort token: str def __init__(self, node_execution_id: _Optional[_Union[_identifier_pb2.NodeExecutionIdentifier, _Mapping]] = ..., limit: _Optional[int] = ..., token: _Optional[str] = ..., filters: _Optional[str] = ..., sort_by: _Optional[_Union[_common_pb2.Sort, _Mapping]] = ...) -> None: ... - -class TaskExecutionUpdateRequest(_message.Message): - __slots__ = ["evict_cache", "id"] - EVICT_CACHE_FIELD_NUMBER: _ClassVar[int] - ID_FIELD_NUMBER: _ClassVar[int] - evict_cache: bool - id: _identifier_pb2.TaskExecutionIdentifier - def __init__(self, id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., evict_cache: bool = ...) -> None: ... - -class TaskExecutionUpdateResponse(_message.Message): - __slots__ = ["cache_eviction_errors"] - CACHE_EVICTION_ERRORS_FIELD_NUMBER: _ClassVar[int] - cache_eviction_errors: _errors_pb2.CacheEvictionErrorList - def __init__(self, cache_eviction_errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ... diff --git a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py index 822e0e4105..140635d761 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py @@ -27,10 +27,9 @@ from flyteidl.admin import version_pb2 as flyteidl_dot_admin_dot_version__pb2 from flyteidl.admin import common_pb2 as flyteidl_dot_admin_dot_common__pb2 from flyteidl.admin import description_entity_pb2 as flyteidl_dot_admin_dot_description__entity__pb2 -from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/admin.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1c\x66lyteidl/admin/project.proto\x1a.flyteidl/admin/project_domain_attributes.proto\x1a\'flyteidl/admin/project_attributes.proto\x1a\x19\x66lyteidl/admin/task.proto\x1a\x1d\x66lyteidl/admin/workflow.proto\x1a(flyteidl/admin/workflow_attributes.proto\x1a flyteidl/admin/launch_plan.proto\x1a\x1a\x66lyteidl/admin/event.proto\x1a\x1e\x66lyteidl/admin/execution.proto\x1a\'flyteidl/admin/matchable_resource.proto\x1a#flyteidl/admin/node_execution.proto\x1a#flyteidl/admin/task_execution.proto\x1a\x1c\x66lyteidl/admin/version.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\'flyteidl/admin/description_entity.proto\x1a\x1e\x66lyteidl/core/identifier.proto2\xd3O\n\x0c\x41\x64minService\x12m\n\nCreateTask\x12!.flyteidl.admin.TaskCreateRequest\x1a\".flyteidl.admin.TaskCreateResponse\"\x18\x82\xd3\xe4\x93\x02\x12:\x01*\"\r/api/v1/tasks\x12\x88\x01\n\x07GetTask\x12 .flyteidl.admin.ObjectGetRequest\x1a\x14.flyteidl.admin.Task\"E\x82\xd3\xe4\x93\x02?\x12=/api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x97\x01\n\x0bListTaskIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"+\x82\xd3\xe4\x93\x02%\x12#/api/v1/task_ids/{project}/{domain}\x12\xae\x01\n\tListTasks\x12#.flyteidl.admin.ResourceListRequest\x1a\x18.flyteidl.admin.TaskList\"b\x82\xd3\xe4\x93\x02\\Z(\x12&/api/v1/tasks/{id.project}/{id.domain}\x12\x30/api/v1/tasks/{id.project}/{id.domain}/{id.name}\x12}\n\x0e\x43reateWorkflow\x12%.flyteidl.admin.WorkflowCreateRequest\x1a&.flyteidl.admin.WorkflowCreateResponse\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v1/workflows\x12\x94\x01\n\x0bGetWorkflow\x12 .flyteidl.admin.ObjectGetRequest\x1a\x18.flyteidl.admin.Workflow\"I\x82\xd3\xe4\x93\x02\x43\x12\x41/api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x9f\x01\n\x0fListWorkflowIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"/\x82\xd3\xe4\x93\x02)\x12\'/api/v1/workflow_ids/{project}/{domain}\x12\xbe\x01\n\rListWorkflows\x12#.flyteidl.admin.ResourceListRequest\x1a\x1c.flyteidl.admin.WorkflowList\"j\x82\xd3\xe4\x93\x02\x64Z,\x12*/api/v1/workflows/{id.project}/{id.domain}\x12\x34/api/v1/workflows/{id.project}/{id.domain}/{id.name}\x12\x86\x01\n\x10\x43reateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanCreateRequest\x1a(.flyteidl.admin.LaunchPlanCreateResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/launch_plans\x12\x9b\x01\n\rGetLaunchPlan\x12 .flyteidl.admin.ObjectGetRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"L\x82\xd3\xe4\x93\x02\x46\x12\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\xa2\x01\n\x13GetActiveLaunchPlan\x12\'.flyteidl.admin.ActiveLaunchPlanRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"F\x82\xd3\xe4\x93\x02@\x12>/api/v1/active_launch_plans/{id.project}/{id.domain}/{id.name}\x12\x9c\x01\n\x15ListActiveLaunchPlans\x12+.flyteidl.admin.ActiveLaunchPlanListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"6\x82\xd3\xe4\x93\x02\x30\x12./api/v1/active_launch_plans/{project}/{domain}\x12\xa4\x01\n\x11ListLaunchPlanIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"2\x82\xd3\xe4\x93\x02,\x12*/api/v1/launch_plan_ids/{project}/{domain}\x12\xc8\x01\n\x0fListLaunchPlans\x12#.flyteidl.admin.ResourceListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"p\x82\xd3\xe4\x93\x02jZ/\x12-/api/v1/launch_plans/{id.project}/{id.domain}\x12\x37/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}\x12\xb6\x01\n\x10UpdateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanUpdateRequest\x1a(.flyteidl.admin.LaunchPlanUpdateResponse\"O\x82\xd3\xe4\x93\x02I:\x01*\x1a\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x81\x01\n\x0f\x43reateExecution\x12&.flyteidl.admin.ExecutionCreateRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v1/executions\x12\x8e\x01\n\x11RelaunchExecution\x12(.flyteidl.admin.ExecutionRelaunchRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"&\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/api/v1/executions/relaunch\x12\x8b\x01\n\x10RecoverExecution\x12\'.flyteidl.admin.ExecutionRecoverRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\"\x1a/api/v1/executions/recover\x12\x95\x01\n\x0cGetExecution\x12+.flyteidl.admin.WorkflowExecutionGetRequest\x1a\x19.flyteidl.admin.Execution\"=\x82\xd3\xe4\x93\x02\x37\x12\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xa4\x01\n\x0fUpdateExecution\x12&.flyteidl.admin.ExecutionUpdateRequest\x1a\'.flyteidl.admin.ExecutionUpdateResponse\"@\x82\xd3\xe4\x93\x02::\x01*\x1a\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xb9\x01\n\x10GetExecutionData\x12/.flyteidl.admin.WorkflowExecutionGetDataRequest\x1a\x30.flyteidl.admin.WorkflowExecutionGetDataResponse\"B\x82\xd3\xe4\x93\x02<\x12:/api/v1/data/executions/{id.project}/{id.domain}/{id.name}\x12\x89\x01\n\x0eListExecutions\x12#.flyteidl.admin.ResourceListRequest\x1a\x1d.flyteidl.admin.ExecutionList\"3\x82\xd3\xe4\x93\x02-\x12+/api/v1/executions/{id.project}/{id.domain}\x12\xad\x01\n\x12TerminateExecution\x12).flyteidl.admin.ExecutionTerminateRequest\x1a*.flyteidl.admin.ExecutionTerminateResponse\"@\x82\xd3\xe4\x93\x02::\x01**5/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xd2\x01\n\x10GetNodeExecution\x12\'.flyteidl.admin.NodeExecutionGetRequest\x1a\x1d.flyteidl.admin.NodeExecution\"v\x82\xd3\xe4\x93\x02p\x12n/api/v1/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\xde\x01\n\x12ListNodeExecutions\x12(.flyteidl.admin.NodeExecutionListRequest\x1a!.flyteidl.admin.NodeExecutionList\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/node_executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa5\x04\n\x19ListNodeExecutionsForTask\x12/.flyteidl.admin.NodeExecutionForTaskListRequest\x1a!.flyteidl.admin.NodeExecutionList\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03\x12\xa9\x03/api/v1/children/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}\x12\xee\x01\n\x14GetNodeExecutionData\x12+.flyteidl.admin.NodeExecutionGetDataRequest\x1a,.flyteidl.admin.NodeExecutionGetDataResponse\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/data/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\x7f\n\x0fRegisterProject\x12&.flyteidl.admin.ProjectRegisterRequest\x1a\'.flyteidl.admin.ProjectRegisterResponse\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/v1/projects\x12q\n\rUpdateProject\x12\x17.flyteidl.admin.Project\x1a%.flyteidl.admin.ProjectUpdateResponse\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x1a\x15/api/v1/projects/{id}\x12\x66\n\x0cListProjects\x12\".flyteidl.admin.ProjectListRequest\x1a\x18.flyteidl.admin.Projects\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/api/v1/projects\x12\x99\x01\n\x13\x43reateWorkflowEvent\x12-.flyteidl.admin.WorkflowExecutionEventRequest\x1a..flyteidl.admin.WorkflowExecutionEventResponse\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v1/events/workflows\x12\x89\x01\n\x0f\x43reateNodeEvent\x12).flyteidl.admin.NodeExecutionEventRequest\x1a*.flyteidl.admin.NodeExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/nodes\x12\x89\x01\n\x0f\x43reateTaskEvent\x12).flyteidl.admin.TaskExecutionEventRequest\x1a*.flyteidl.admin.TaskExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/tasks\x12\x80\x03\n\x10GetTaskExecution\x12\'.flyteidl.admin.TaskExecutionGetRequest\x1a\x1d.flyteidl.admin.TaskExecution\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x98\x02\n\x12ListTaskExecutions\x12(.flyteidl.admin.TaskExecutionListRequest\x1a!.flyteidl.admin.TaskExecutionList\"\xb4\x01\x82\xd3\xe4\x93\x02\xad\x01\x12\xaa\x01/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}\x12\x9c\x03\n\x14GetTaskExecutionData\x12+.flyteidl.admin.TaskExecutionGetDataRequest\x1a,.flyteidl.admin.TaskExecutionGetDataResponse\"\xa8\x02\x82\xd3\xe4\x93\x02\xa1\x02\x12\x9e\x02/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x94\x03\n\x13UpdateTaskExecution\x12*.flyteidl.admin.TaskExecutionUpdateRequest\x1a+.flyteidl.admin.TaskExecutionUpdateResponse\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\xe3\x01\n\x1dUpdateProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesUpdateRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesUpdateResponse\"U\x82\xd3\xe4\x93\x02O:\x01*\x1aJ/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}\x12\xc1\x01\n\x1aGetProjectDomainAttributes\x12\x31.flyteidl.admin.ProjectDomainAttributesGetRequest\x1a\x32.flyteidl.admin.ProjectDomainAttributesGetResponse\"<\x82\xd3\xe4\x93\x02\x36\x12\x34/api/v1/project_domain_attributes/{project}/{domain}\x12\xcd\x01\n\x1d\x44\x65leteProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesDeleteRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesDeleteResponse\"?\x82\xd3\xe4\x93\x02\x39:\x01**4/api/v1/project_domain_attributes/{project}/{domain}\x12\xb6\x01\n\x17UpdateProjectAttributes\x12..flyteidl.admin.ProjectAttributesUpdateRequest\x1a/.flyteidl.admin.ProjectAttributesUpdateResponse\":\x82\xd3\xe4\x93\x02\x34:\x01*\x1a//api/v1/project_attributes/{attributes.project}\x12\x9f\x01\n\x14GetProjectAttributes\x12+.flyteidl.admin.ProjectAttributesGetRequest\x1a,.flyteidl.admin.ProjectAttributesGetResponse\",\x82\xd3\xe4\x93\x02&\x12$/api/v1/project_attributes/{project}\x12\xab\x01\n\x17\x44\x65leteProjectAttributes\x12..flyteidl.admin.ProjectAttributesDeleteRequest\x1a/.flyteidl.admin.ProjectAttributesDeleteResponse\"/\x82\xd3\xe4\x93\x02):\x01**$/api/v1/project_attributes/{project}\x12\xe4\x01\n\x18UpdateWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesUpdateRequest\x1a\x30.flyteidl.admin.WorkflowAttributesUpdateResponse\"e\x82\xd3\xe4\x93\x02_:\x01*\x1aZ/api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow}\x12\xb7\x01\n\x15GetWorkflowAttributes\x12,.flyteidl.admin.WorkflowAttributesGetRequest\x1a-.flyteidl.admin.WorkflowAttributesGetResponse\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xc3\x01\n\x18\x44\x65leteWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesDeleteRequest\x1a\x30.flyteidl.admin.WorkflowAttributesDeleteResponse\"D\x82\xd3\xe4\x93\x02>:\x01**9/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xa0\x01\n\x17ListMatchableAttributes\x12..flyteidl.admin.ListMatchableAttributesRequest\x1a/.flyteidl.admin.ListMatchableAttributesResponse\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/api/v1/matchable_attributes\x12\x9f\x01\n\x11ListNamedEntities\x12&.flyteidl.admin.NamedEntityListRequest\x1a\x1f.flyteidl.admin.NamedEntityList\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/named_entities/{resource_type}/{project}/{domain}\x12\xa7\x01\n\x0eGetNamedEntity\x12%.flyteidl.admin.NamedEntityGetRequest\x1a\x1b.flyteidl.admin.NamedEntity\"Q\x82\xd3\xe4\x93\x02K\x12I/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12\xbe\x01\n\x11UpdateNamedEntity\x12(.flyteidl.admin.NamedEntityUpdateRequest\x1a).flyteidl.admin.NamedEntityUpdateResponse\"T\x82\xd3\xe4\x93\x02N:\x01*\x1aI/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12l\n\nGetVersion\x12!.flyteidl.admin.GetVersionRequest\x1a\".flyteidl.admin.GetVersionResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/v1/version\x12\xc4\x01\n\x14GetDescriptionEntity\x12 .flyteidl.admin.ObjectGetRequest\x1a!.flyteidl.admin.DescriptionEntity\"g\x82\xd3\xe4\x93\x02\x61\x12_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x92\x02\n\x17ListDescriptionEntities\x12,.flyteidl.admin.DescriptionEntityListRequest\x1a%.flyteidl.admin.DescriptionEntityList\"\xa1\x01\x82\xd3\xe4\x93\x02\x9a\x01ZG\x12\x45/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\x12O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nAdminProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/admin.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1c\x66lyteidl/admin/project.proto\x1a.flyteidl/admin/project_domain_attributes.proto\x1a\'flyteidl/admin/project_attributes.proto\x1a\x19\x66lyteidl/admin/task.proto\x1a\x1d\x66lyteidl/admin/workflow.proto\x1a(flyteidl/admin/workflow_attributes.proto\x1a flyteidl/admin/launch_plan.proto\x1a\x1a\x66lyteidl/admin/event.proto\x1a\x1e\x66lyteidl/admin/execution.proto\x1a\'flyteidl/admin/matchable_resource.proto\x1a#flyteidl/admin/node_execution.proto\x1a#flyteidl/admin/task_execution.proto\x1a\x1c\x66lyteidl/admin/version.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\'flyteidl/admin/description_entity.proto2\xbcL\n\x0c\x41\x64minService\x12m\n\nCreateTask\x12!.flyteidl.admin.TaskCreateRequest\x1a\".flyteidl.admin.TaskCreateResponse\"\x18\x82\xd3\xe4\x93\x02\x12:\x01*\"\r/api/v1/tasks\x12\x88\x01\n\x07GetTask\x12 .flyteidl.admin.ObjectGetRequest\x1a\x14.flyteidl.admin.Task\"E\x82\xd3\xe4\x93\x02?\x12=/api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x97\x01\n\x0bListTaskIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"+\x82\xd3\xe4\x93\x02%\x12#/api/v1/task_ids/{project}/{domain}\x12\xae\x01\n\tListTasks\x12#.flyteidl.admin.ResourceListRequest\x1a\x18.flyteidl.admin.TaskList\"b\x82\xd3\xe4\x93\x02\\Z(\x12&/api/v1/tasks/{id.project}/{id.domain}\x12\x30/api/v1/tasks/{id.project}/{id.domain}/{id.name}\x12}\n\x0e\x43reateWorkflow\x12%.flyteidl.admin.WorkflowCreateRequest\x1a&.flyteidl.admin.WorkflowCreateResponse\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v1/workflows\x12\x94\x01\n\x0bGetWorkflow\x12 .flyteidl.admin.ObjectGetRequest\x1a\x18.flyteidl.admin.Workflow\"I\x82\xd3\xe4\x93\x02\x43\x12\x41/api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x9f\x01\n\x0fListWorkflowIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"/\x82\xd3\xe4\x93\x02)\x12\'/api/v1/workflow_ids/{project}/{domain}\x12\xbe\x01\n\rListWorkflows\x12#.flyteidl.admin.ResourceListRequest\x1a\x1c.flyteidl.admin.WorkflowList\"j\x82\xd3\xe4\x93\x02\x64Z,\x12*/api/v1/workflows/{id.project}/{id.domain}\x12\x34/api/v1/workflows/{id.project}/{id.domain}/{id.name}\x12\x86\x01\n\x10\x43reateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanCreateRequest\x1a(.flyteidl.admin.LaunchPlanCreateResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/launch_plans\x12\x9b\x01\n\rGetLaunchPlan\x12 .flyteidl.admin.ObjectGetRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"L\x82\xd3\xe4\x93\x02\x46\x12\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\xa2\x01\n\x13GetActiveLaunchPlan\x12\'.flyteidl.admin.ActiveLaunchPlanRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"F\x82\xd3\xe4\x93\x02@\x12>/api/v1/active_launch_plans/{id.project}/{id.domain}/{id.name}\x12\x9c\x01\n\x15ListActiveLaunchPlans\x12+.flyteidl.admin.ActiveLaunchPlanListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"6\x82\xd3\xe4\x93\x02\x30\x12./api/v1/active_launch_plans/{project}/{domain}\x12\xa4\x01\n\x11ListLaunchPlanIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"2\x82\xd3\xe4\x93\x02,\x12*/api/v1/launch_plan_ids/{project}/{domain}\x12\xc8\x01\n\x0fListLaunchPlans\x12#.flyteidl.admin.ResourceListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"p\x82\xd3\xe4\x93\x02jZ/\x12-/api/v1/launch_plans/{id.project}/{id.domain}\x12\x37/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}\x12\xb6\x01\n\x10UpdateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanUpdateRequest\x1a(.flyteidl.admin.LaunchPlanUpdateResponse\"O\x82\xd3\xe4\x93\x02I:\x01*\x1a\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x81\x01\n\x0f\x43reateExecution\x12&.flyteidl.admin.ExecutionCreateRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v1/executions\x12\x8e\x01\n\x11RelaunchExecution\x12(.flyteidl.admin.ExecutionRelaunchRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"&\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/api/v1/executions/relaunch\x12\x8b\x01\n\x10RecoverExecution\x12\'.flyteidl.admin.ExecutionRecoverRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\"\x1a/api/v1/executions/recover\x12\x95\x01\n\x0cGetExecution\x12+.flyteidl.admin.WorkflowExecutionGetRequest\x1a\x19.flyteidl.admin.Execution\"=\x82\xd3\xe4\x93\x02\x37\x12\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xa4\x01\n\x0fUpdateExecution\x12&.flyteidl.admin.ExecutionUpdateRequest\x1a\'.flyteidl.admin.ExecutionUpdateResponse\"@\x82\xd3\xe4\x93\x02::\x01*\x1a\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xb9\x01\n\x10GetExecutionData\x12/.flyteidl.admin.WorkflowExecutionGetDataRequest\x1a\x30.flyteidl.admin.WorkflowExecutionGetDataResponse\"B\x82\xd3\xe4\x93\x02<\x12:/api/v1/data/executions/{id.project}/{id.domain}/{id.name}\x12\x89\x01\n\x0eListExecutions\x12#.flyteidl.admin.ResourceListRequest\x1a\x1d.flyteidl.admin.ExecutionList\"3\x82\xd3\xe4\x93\x02-\x12+/api/v1/executions/{id.project}/{id.domain}\x12\xad\x01\n\x12TerminateExecution\x12).flyteidl.admin.ExecutionTerminateRequest\x1a*.flyteidl.admin.ExecutionTerminateResponse\"@\x82\xd3\xe4\x93\x02::\x01**5/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xd2\x01\n\x10GetNodeExecution\x12\'.flyteidl.admin.NodeExecutionGetRequest\x1a\x1d.flyteidl.admin.NodeExecution\"v\x82\xd3\xe4\x93\x02p\x12n/api/v1/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\xde\x01\n\x12ListNodeExecutions\x12(.flyteidl.admin.NodeExecutionListRequest\x1a!.flyteidl.admin.NodeExecutionList\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/node_executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa5\x04\n\x19ListNodeExecutionsForTask\x12/.flyteidl.admin.NodeExecutionForTaskListRequest\x1a!.flyteidl.admin.NodeExecutionList\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03\x12\xa9\x03/api/v1/children/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}\x12\xee\x01\n\x14GetNodeExecutionData\x12+.flyteidl.admin.NodeExecutionGetDataRequest\x1a,.flyteidl.admin.NodeExecutionGetDataResponse\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/data/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\x7f\n\x0fRegisterProject\x12&.flyteidl.admin.ProjectRegisterRequest\x1a\'.flyteidl.admin.ProjectRegisterResponse\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/v1/projects\x12q\n\rUpdateProject\x12\x17.flyteidl.admin.Project\x1a%.flyteidl.admin.ProjectUpdateResponse\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x1a\x15/api/v1/projects/{id}\x12\x66\n\x0cListProjects\x12\".flyteidl.admin.ProjectListRequest\x1a\x18.flyteidl.admin.Projects\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/api/v1/projects\x12\x99\x01\n\x13\x43reateWorkflowEvent\x12-.flyteidl.admin.WorkflowExecutionEventRequest\x1a..flyteidl.admin.WorkflowExecutionEventResponse\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v1/events/workflows\x12\x89\x01\n\x0f\x43reateNodeEvent\x12).flyteidl.admin.NodeExecutionEventRequest\x1a*.flyteidl.admin.NodeExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/nodes\x12\x89\x01\n\x0f\x43reateTaskEvent\x12).flyteidl.admin.TaskExecutionEventRequest\x1a*.flyteidl.admin.TaskExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/tasks\x12\x80\x03\n\x10GetTaskExecution\x12\'.flyteidl.admin.TaskExecutionGetRequest\x1a\x1d.flyteidl.admin.TaskExecution\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x98\x02\n\x12ListTaskExecutions\x12(.flyteidl.admin.TaskExecutionListRequest\x1a!.flyteidl.admin.TaskExecutionList\"\xb4\x01\x82\xd3\xe4\x93\x02\xad\x01\x12\xaa\x01/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}\x12\x9c\x03\n\x14GetTaskExecutionData\x12+.flyteidl.admin.TaskExecutionGetDataRequest\x1a,.flyteidl.admin.TaskExecutionGetDataResponse\"\xa8\x02\x82\xd3\xe4\x93\x02\xa1\x02\x12\x9e\x02/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\xe3\x01\n\x1dUpdateProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesUpdateRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesUpdateResponse\"U\x82\xd3\xe4\x93\x02O:\x01*\x1aJ/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}\x12\xc1\x01\n\x1aGetProjectDomainAttributes\x12\x31.flyteidl.admin.ProjectDomainAttributesGetRequest\x1a\x32.flyteidl.admin.ProjectDomainAttributesGetResponse\"<\x82\xd3\xe4\x93\x02\x36\x12\x34/api/v1/project_domain_attributes/{project}/{domain}\x12\xcd\x01\n\x1d\x44\x65leteProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesDeleteRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesDeleteResponse\"?\x82\xd3\xe4\x93\x02\x39:\x01**4/api/v1/project_domain_attributes/{project}/{domain}\x12\xb6\x01\n\x17UpdateProjectAttributes\x12..flyteidl.admin.ProjectAttributesUpdateRequest\x1a/.flyteidl.admin.ProjectAttributesUpdateResponse\":\x82\xd3\xe4\x93\x02\x34:\x01*\x1a//api/v1/project_attributes/{attributes.project}\x12\x9f\x01\n\x14GetProjectAttributes\x12+.flyteidl.admin.ProjectAttributesGetRequest\x1a,.flyteidl.admin.ProjectAttributesGetResponse\",\x82\xd3\xe4\x93\x02&\x12$/api/v1/project_attributes/{project}\x12\xab\x01\n\x17\x44\x65leteProjectAttributes\x12..flyteidl.admin.ProjectAttributesDeleteRequest\x1a/.flyteidl.admin.ProjectAttributesDeleteResponse\"/\x82\xd3\xe4\x93\x02):\x01**$/api/v1/project_attributes/{project}\x12\xe4\x01\n\x18UpdateWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesUpdateRequest\x1a\x30.flyteidl.admin.WorkflowAttributesUpdateResponse\"e\x82\xd3\xe4\x93\x02_:\x01*\x1aZ/api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow}\x12\xb7\x01\n\x15GetWorkflowAttributes\x12,.flyteidl.admin.WorkflowAttributesGetRequest\x1a-.flyteidl.admin.WorkflowAttributesGetResponse\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xc3\x01\n\x18\x44\x65leteWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesDeleteRequest\x1a\x30.flyteidl.admin.WorkflowAttributesDeleteResponse\"D\x82\xd3\xe4\x93\x02>:\x01**9/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xa0\x01\n\x17ListMatchableAttributes\x12..flyteidl.admin.ListMatchableAttributesRequest\x1a/.flyteidl.admin.ListMatchableAttributesResponse\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/api/v1/matchable_attributes\x12\x9f\x01\n\x11ListNamedEntities\x12&.flyteidl.admin.NamedEntityListRequest\x1a\x1f.flyteidl.admin.NamedEntityList\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/named_entities/{resource_type}/{project}/{domain}\x12\xa7\x01\n\x0eGetNamedEntity\x12%.flyteidl.admin.NamedEntityGetRequest\x1a\x1b.flyteidl.admin.NamedEntity\"Q\x82\xd3\xe4\x93\x02K\x12I/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12\xbe\x01\n\x11UpdateNamedEntity\x12(.flyteidl.admin.NamedEntityUpdateRequest\x1a).flyteidl.admin.NamedEntityUpdateResponse\"T\x82\xd3\xe4\x93\x02N:\x01*\x1aI/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12l\n\nGetVersion\x12!.flyteidl.admin.GetVersionRequest\x1a\".flyteidl.admin.GetVersionResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/v1/version\x12\xc4\x01\n\x14GetDescriptionEntity\x12 .flyteidl.admin.ObjectGetRequest\x1a!.flyteidl.admin.DescriptionEntity\"g\x82\xd3\xe4\x93\x02\x61\x12_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x92\x02\n\x17ListDescriptionEntities\x12,.flyteidl.admin.DescriptionEntityListRequest\x1a%.flyteidl.admin.DescriptionEntityList\"\xa1\x01\x82\xd3\xe4\x93\x02\x9a\x01ZG\x12\x45/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\x12O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nAdminProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.admin_pb2', globals()) @@ -110,8 +109,6 @@ _ADMINSERVICE.methods_by_name['ListTaskExecutions']._serialized_options = b'\202\323\344\223\002\255\001\022\252\001/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}' _ADMINSERVICE.methods_by_name['GetTaskExecutionData']._options = None _ADMINSERVICE.methods_by_name['GetTaskExecutionData']._serialized_options = b'\202\323\344\223\002\241\002\022\236\002/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}' - _ADMINSERVICE.methods_by_name['UpdateTaskExecution']._options = None - _ADMINSERVICE.methods_by_name['UpdateTaskExecution']._serialized_options = b'\202\323\344\223\002\234\002\022\231\002/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}' _ADMINSERVICE.methods_by_name['UpdateProjectDomainAttributes']._options = None _ADMINSERVICE.methods_by_name['UpdateProjectDomainAttributes']._serialized_options = b'\202\323\344\223\002O:\001*\032J/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}' _ADMINSERVICE.methods_by_name['GetProjectDomainAttributes']._options = None @@ -144,6 +141,6 @@ _ADMINSERVICE.methods_by_name['GetDescriptionEntity']._serialized_options = b'\202\323\344\223\002a\022_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}' _ADMINSERVICE.methods_by_name['ListDescriptionEntities']._options = None _ADMINSERVICE.methods_by_name['ListDescriptionEntities']._serialized_options = b'\202\323\344\223\002\232\001ZG\022E/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\022O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}' - _ADMINSERVICE._serialized_start=641 - _ADMINSERVICE._serialized_end=10836 + _ADMINSERVICE._serialized_start=609 + _ADMINSERVICE._serialized_end=10397 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.pyi index d0120eb22e..a9028cea2a 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.pyi @@ -14,7 +14,6 @@ from flyteidl.admin import task_execution_pb2 as _task_execution_pb2 from flyteidl.admin import version_pb2 as _version_pb2 from flyteidl.admin import common_pb2 as _common_pb2 from flyteidl.admin import description_entity_pb2 as _description_entity_pb2 -from flyteidl.core import identifier_pb2 as _identifier_pb2 from google.protobuf import descriptor as _descriptor from typing import ClassVar as _ClassVar diff --git a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py index 2cf58a61d4..bdbf086526 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2_grpc.py @@ -210,11 +210,6 @@ def __init__(self, channel): request_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataRequest.SerializeToString, response_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataResponse.FromString, ) - self.UpdateTaskExecution = channel.unary_unary( - '/flyteidl.service.AdminService/UpdateTaskExecution', - request_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateRequest.SerializeToString, - response_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateResponse.FromString, - ) self.UpdateProjectDomainAttributes = channel.unary_unary( '/flyteidl.service.AdminService/UpdateProjectDomainAttributes', request_serializer=flyteidl_dot_admin_dot_project__domain__attributes__pb2.ProjectDomainAttributesUpdateRequest.SerializeToString, @@ -560,13 +555,6 @@ def GetTaskExecutionData(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def UpdateTaskExecution(self, request, context): - """Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - """ - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - def UpdateProjectDomainAttributes(self, request, context): """Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. """ @@ -861,11 +849,6 @@ def add_AdminServiceServicer_to_server(servicer, server): request_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataRequest.FromString, response_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionGetDataResponse.SerializeToString, ), - 'UpdateTaskExecution': grpc.unary_unary_rpc_method_handler( - servicer.UpdateTaskExecution, - request_deserializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateRequest.FromString, - response_serializer=flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateResponse.SerializeToString, - ), 'UpdateProjectDomainAttributes': grpc.unary_unary_rpc_method_handler( servicer.UpdateProjectDomainAttributes, request_deserializer=flyteidl_dot_admin_dot_project__domain__attributes__pb2.ProjectDomainAttributesUpdateRequest.FromString, @@ -1570,23 +1553,6 @@ def GetTaskExecutionData(request, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - @staticmethod - def UpdateTaskExecution(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/flyteidl.service.AdminService/UpdateTaskExecution', - flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateRequest.SerializeToString, - flyteidl_dot_admin_dot_task__execution__pb2.TaskExecutionUpdateResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - @staticmethod def UpdateProjectDomainAttributes(request, target, diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py new file mode 100644 index 0000000000..a6cd025b91 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: flyteidl/service/cache.proto +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + +from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 +from flyteidl.core import errors_pb2 as flyteidl_dot_core_dot_errors__pb2 +from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"X\n\x1a\x45victExecutionCacheRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"X\n\x1e\x45victTaskExecutionCacheRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\xe5\x04\n\x0c\x43\x61\x63heService\x12\xb1\x01\n\x13\x45victExecutionCache\x12,.flyteidl.service.EvictExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"F\x82\xd3\xe4\x93\x02@:\x01**;/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}\x12\xa0\x03\n\x17\x45victTaskExecutionCache\x12\x30.flyteidl.service.EvictTaskExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xac\x02\x82\xd3\xe4\x93\x02\xa5\x02:\x01**\x9f\x02/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') + +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.cache_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nCacheProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service' + _CACHESERVICE.methods_by_name['EvictExecutionCache']._options = None + _CACHESERVICE.methods_by_name['EvictExecutionCache']._serialized_options = b'\202\323\344\223\002@:\001**;/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}' + _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._options = None + _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._serialized_options = b'\202\323\344\223\002\245\002:\001**\237\002/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}' + _EVICTEXECUTIONCACHEREQUEST._serialized_start=140 + _EVICTEXECUTIONCACHEREQUEST._serialized_end=228 + _EVICTTASKEXECUTIONCACHEREQUEST._serialized_start=230 + _EVICTTASKEXECUTIONCACHEREQUEST._serialized_end=318 + _EVICTCACHERESPONSE._serialized_start=320 + _EVICTCACHERESPONSE._serialized_end=403 + _CACHESERVICE._serialized_start=406 + _CACHESERVICE._serialized_end=1019 +# @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi new file mode 100644 index 0000000000..52aa9c54c0 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi @@ -0,0 +1,26 @@ +from google.api import annotations_pb2 as _annotations_pb2 +from flyteidl.core import errors_pb2 as _errors_pb2 +from flyteidl.core import identifier_pb2 as _identifier_pb2 +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union + +DESCRIPTOR: _descriptor.FileDescriptor + +class EvictCacheResponse(_message.Message): + __slots__ = ["errors"] + ERRORS_FIELD_NUMBER: _ClassVar[int] + errors: _errors_pb2.CacheEvictionErrorList + def __init__(self, errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ... + +class EvictExecutionCacheRequest(_message.Message): + __slots__ = ["id"] + ID_FIELD_NUMBER: _ClassVar[int] + id: _identifier_pb2.WorkflowExecutionIdentifier + def __init__(self, id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ...) -> None: ... + +class EvictTaskExecutionCacheRequest(_message.Message): + __slots__ = ["id"] + ID_FIELD_NUMBER: _ClassVar[int] + id: _identifier_pb2.TaskExecutionIdentifier + def __init__(self, id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ...) -> None: ... diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py new file mode 100644 index 0000000000..80b802f242 --- /dev/null +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py @@ -0,0 +1,104 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +"""Client and server classes corresponding to protobuf-defined services.""" +import grpc + +from flyteidl.service import cache_pb2 as flyteidl_dot_service_dot_cache__pb2 + + +class CacheServiceStub(object): + """CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. + """ + + def __init__(self, channel): + """Constructor. + + Args: + channel: A grpc.Channel. + """ + self.EvictExecutionCache = channel.unary_unary( + '/flyteidl.service.CacheService/EvictExecutionCache', + request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString, + response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, + ) + self.EvictTaskExecutionCache = channel.unary_unary( + '/flyteidl.service.CacheService/EvictTaskExecutionCache', + request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.SerializeToString, + response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, + ) + + +class CacheServiceServicer(object): + """CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. + """ + + def EvictExecutionCache(self, request, context): + """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + def EvictTaskExecutionCache(self, request, context): + """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + +def add_CacheServiceServicer_to_server(servicer, server): + rpc_method_handlers = { + 'EvictExecutionCache': grpc.unary_unary_rpc_method_handler( + servicer.EvictExecutionCache, + request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.FromString, + response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, + ), + 'EvictTaskExecutionCache': grpc.unary_unary_rpc_method_handler( + servicer.EvictTaskExecutionCache, + request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.FromString, + response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, + ), + } + generic_handler = grpc.method_handlers_generic_handler( + 'flyteidl.service.CacheService', rpc_method_handlers) + server.add_generic_rpc_handlers((generic_handler,)) + + + # This class is part of an EXPERIMENTAL API. +class CacheService(object): + """CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. + """ + + @staticmethod + def EvictExecutionCache(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictExecutionCache', + flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString, + flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def EvictTaskExecutionCache(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictTaskExecutionCache', + flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.SerializeToString, + flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md index 77d8ba3f7f..48565101a9 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/README.md @@ -91,6 +91,7 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**get_project_attributes**](docs/AdminServiceApi.md#get_project_attributes) | **GET** /api/v1/project_attributes/{project} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**get_project_domain_attributes**](docs/AdminServiceApi.md#get_project_domain_attributes) | **GET** /api/v1/project_domain_attributes/{project}/{domain} | Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. *AdminServiceApi* | [**get_task**](docs/AdminServiceApi.md#get_task) | **GET** /api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Task` definition. +*AdminServiceApi* | [**get_task_execution**](docs/AdminServiceApi.md#get_task_execution) | **GET** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**get_task_execution_data**](docs/AdminServiceApi.md#get_task_execution_data) | **GET** /api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**get_version**](docs/AdminServiceApi.md#get_version) | **GET** /api/v1/version | *AdminServiceApi* | [**get_workflow**](docs/AdminServiceApi.md#get_workflow) | **GET** /api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version} | Fetch a :ref:`ref_flyteidl.admin.Workflow` definition. @@ -124,7 +125,6 @@ Class | Method | HTTP request | Description *AdminServiceApi* | [**update_project**](docs/AdminServiceApi.md#update_project) | **PUT** /api/v1/projects/{id} | Updates an existing :ref:`ref_flyteidl.admin.Project` flyteidl.admin.Project should be passed but the domains property should be empty; it will be ignored in the handler as domains cannot be updated via this API. *AdminServiceApi* | [**update_project_attributes**](docs/AdminServiceApi.md#update_project_attributes) | **PUT** /api/v1/project_attributes/{attributes.project} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` at the project level *AdminServiceApi* | [**update_project_domain_attributes**](docs/AdminServiceApi.md#update_project_domain_attributes) | **PUT** /api/v1/project_domain_attributes/{attributes.project}/{attributes.domain} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. -*AdminServiceApi* | [**update_task_execution**](docs/AdminServiceApi.md#update_task_execution) | **GET** /api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt} | Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. *AdminServiceApi* | [**update_workflow_attributes**](docs/AdminServiceApi.md#update_workflow_attributes) | **PUT** /api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow} | Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. @@ -230,7 +230,6 @@ Class | Method | HTTP request | Description - [AdminTaskExecutionEventResponse](docs/AdminTaskExecutionEventResponse.md) - [AdminTaskExecutionGetDataResponse](docs/AdminTaskExecutionGetDataResponse.md) - [AdminTaskExecutionList](docs/AdminTaskExecutionList.md) - - [AdminTaskExecutionUpdateResponse](docs/AdminTaskExecutionUpdateResponse.md) - [AdminTaskList](docs/AdminTaskList.md) - [AdminTaskResourceAttributes](docs/AdminTaskResourceAttributes.md) - [AdminTaskResourceSpec](docs/AdminTaskResourceSpec.md) @@ -254,7 +253,6 @@ Class | Method | HTTP request | Description - [AdminWorkflowList](docs/AdminWorkflowList.md) - [AdminWorkflowSpec](docs/AdminWorkflowSpec.md) - [BlobTypeBlobDimensionality](docs/BlobTypeBlobDimensionality.md) - - [CacheEvictionErrorCode](docs/CacheEvictionErrorCode.md) - [CatalogReservationStatus](docs/CatalogReservationStatus.md) - [ComparisonExpressionOperator](docs/ComparisonExpressionOperator.md) - [ConjunctionExpressionLogicalOperator](docs/ConjunctionExpressionLogicalOperator.md) @@ -272,8 +270,6 @@ Class | Method | HTTP request | Description - [CoreBlobType](docs/CoreBlobType.md) - [CoreBooleanExpression](docs/CoreBooleanExpression.md) - [CoreBranchNode](docs/CoreBranchNode.md) - - [CoreCacheEvictionError](docs/CoreCacheEvictionError.md) - - [CoreCacheEvictionErrorList](docs/CoreCacheEvictionErrorList.md) - [CoreCatalogArtifactTag](docs/CoreCatalogArtifactTag.md) - [CoreCatalogCacheStatus](docs/CoreCatalogCacheStatus.md) - [CoreCatalogMetadata](docs/CoreCatalogMetadata.md) diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py index 0d0c8c18d7..6e2a90c3da 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/__init__.py @@ -122,7 +122,6 @@ from flyteadmin.models.admin_task_execution_event_response import AdminTaskExecutionEventResponse from flyteadmin.models.admin_task_execution_get_data_response import AdminTaskExecutionGetDataResponse from flyteadmin.models.admin_task_execution_list import AdminTaskExecutionList -from flyteadmin.models.admin_task_execution_update_response import AdminTaskExecutionUpdateResponse from flyteadmin.models.admin_task_list import AdminTaskList from flyteadmin.models.admin_task_resource_attributes import AdminTaskResourceAttributes from flyteadmin.models.admin_task_resource_spec import AdminTaskResourceSpec @@ -146,7 +145,6 @@ from flyteadmin.models.admin_workflow_list import AdminWorkflowList from flyteadmin.models.admin_workflow_spec import AdminWorkflowSpec from flyteadmin.models.blob_type_blob_dimensionality import BlobTypeBlobDimensionality -from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode from flyteadmin.models.catalog_reservation_status import CatalogReservationStatus from flyteadmin.models.comparison_expression_operator import ComparisonExpressionOperator from flyteadmin.models.conjunction_expression_logical_operator import ConjunctionExpressionLogicalOperator @@ -164,8 +162,6 @@ from flyteadmin.models.core_blob_type import CoreBlobType from flyteadmin.models.core_boolean_expression import CoreBooleanExpression from flyteadmin.models.core_branch_node import CoreBranchNode -from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError -from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList from flyteadmin.models.core_catalog_artifact_tag import CoreCatalogArtifactTag from flyteadmin.models.core_catalog_cache_status import CoreCatalogCacheStatus from flyteadmin.models.core_catalog_metadata import CoreCatalogMetadata diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py index 988e40befa..580832f37b 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/api/admin_service_api.py @@ -2342,6 +2342,171 @@ def get_task_with_http_info(self, id_project, id_domain, id_name, id_version, ** _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) + def get_task_execution(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 + """Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.get_task_execution(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) + :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) + :param str id_node_execution_id_node_id: (required) + :param str id_task_id_project: Name of the project the resource belongs to. (required) + :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_task_id_name: User provided value for the resource. (required) + :param str id_task_id_version: Specific version of the resource. (required) + :param int id_retry_attempt: (required) + :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects + :return: FlyteidladminTaskExecution + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.get_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 + else: + (data) = self.get_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 + return data + + def get_task_execution_with_http_info(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 + """Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.get_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) + :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) + :param str id_node_execution_id_node_id: (required) + :param str id_task_id_project: Name of the project the resource belongs to. (required) + :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) + :param str id_task_id_name: User provided value for the resource. (required) + :param str id_task_id_version: Specific version of the resource. (required) + :param int id_retry_attempt: (required) + :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects + :return: FlyteidladminTaskExecution + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['id_node_execution_id_execution_id_project', 'id_node_execution_id_execution_id_domain', 'id_node_execution_id_execution_id_name', 'id_node_execution_id_node_id', 'id_task_id_project', 'id_task_id_domain', 'id_task_id_name', 'id_task_id_version', 'id_retry_attempt', 'id_task_id_resource_type'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method get_task_execution" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'id_node_execution_id_execution_id_project' is set + if ('id_node_execution_id_execution_id_project' not in params or + params['id_node_execution_id_execution_id_project'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_project` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_node_execution_id_execution_id_domain' is set + if ('id_node_execution_id_execution_id_domain' not in params or + params['id_node_execution_id_execution_id_domain'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_domain` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_node_execution_id_execution_id_name' is set + if ('id_node_execution_id_execution_id_name' not in params or + params['id_node_execution_id_execution_id_name'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_name` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_node_execution_id_node_id' is set + if ('id_node_execution_id_node_id' not in params or + params['id_node_execution_id_node_id'] is None): + raise ValueError("Missing the required parameter `id_node_execution_id_node_id` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_project' is set + if ('id_task_id_project' not in params or + params['id_task_id_project'] is None): + raise ValueError("Missing the required parameter `id_task_id_project` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_domain' is set + if ('id_task_id_domain' not in params or + params['id_task_id_domain'] is None): + raise ValueError("Missing the required parameter `id_task_id_domain` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_name' is set + if ('id_task_id_name' not in params or + params['id_task_id_name'] is None): + raise ValueError("Missing the required parameter `id_task_id_name` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_task_id_version' is set + if ('id_task_id_version' not in params or + params['id_task_id_version'] is None): + raise ValueError("Missing the required parameter `id_task_id_version` when calling `get_task_execution`") # noqa: E501 + # verify the required parameter 'id_retry_attempt' is set + if ('id_retry_attempt' not in params or + params['id_retry_attempt'] is None): + raise ValueError("Missing the required parameter `id_retry_attempt` when calling `get_task_execution`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id_node_execution_id_execution_id_project' in params: + path_params['id.node_execution_id.execution_id.project'] = params['id_node_execution_id_execution_id_project'] # noqa: E501 + if 'id_node_execution_id_execution_id_domain' in params: + path_params['id.node_execution_id.execution_id.domain'] = params['id_node_execution_id_execution_id_domain'] # noqa: E501 + if 'id_node_execution_id_execution_id_name' in params: + path_params['id.node_execution_id.execution_id.name'] = params['id_node_execution_id_execution_id_name'] # noqa: E501 + if 'id_node_execution_id_node_id' in params: + path_params['id.node_execution_id.node_id'] = params['id_node_execution_id_node_id'] # noqa: E501 + if 'id_task_id_project' in params: + path_params['id.task_id.project'] = params['id_task_id_project'] # noqa: E501 + if 'id_task_id_domain' in params: + path_params['id.task_id.domain'] = params['id_task_id_domain'] # noqa: E501 + if 'id_task_id_name' in params: + path_params['id.task_id.name'] = params['id_task_id_name'] # noqa: E501 + if 'id_task_id_version' in params: + path_params['id.task_id.version'] = params['id_task_id_version'] # noqa: E501 + if 'id_retry_attempt' in params: + path_params['id.retry_attempt'] = params['id_retry_attempt'] # noqa: E501 + + query_params = [] + if 'id_task_id_resource_type' in params: + query_params.append(('id.task_id.resource_type', params['id_task_id_resource_type'])) # noqa: E501 + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['application/json']) # noqa: E501 + + # HTTP header `Content-Type` + header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 + ['application/json']) # noqa: E501 + + # Authentication setting + auth_settings = [] # noqa: E501 + + return self.api_client.call_api( + '/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}', 'GET', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='FlyteidladminTaskExecution', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) + def get_task_execution_data(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 """Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 @@ -6439,175 +6604,6 @@ def update_project_domain_attributes_with_http_info(self, attributes_project, at _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) - def update_task_execution(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 - """Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async_req=True - >>> thread = api.update_task_execution(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) - >>> result = thread.get() - - :param async_req bool - :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) - :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) - :param str id_node_execution_id_node_id: (required) - :param str id_task_id_project: Name of the project the resource belongs to. (required) - :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_task_id_name: User provided value for the resource. (required) - :param str id_task_id_version: Specific version of the resource. (required) - :param int id_retry_attempt: (required) - :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects - :param bool evict_cache: Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. - :return: AdminTaskExecutionUpdateResponse - If the method is called asynchronously, - returns the request thread. - """ - kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 - else: - (data) = self.update_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs) # noqa: E501 - return data - - def update_task_execution_with_http_info(self, id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, **kwargs): # noqa: E501 - """Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async_req=True - >>> thread = api.update_task_execution_with_http_info(id_node_execution_id_execution_id_project, id_node_execution_id_execution_id_domain, id_node_execution_id_execution_id_name, id_node_execution_id_node_id, id_task_id_project, id_task_id_domain, id_task_id_name, id_task_id_version, id_retry_attempt, async_req=True) - >>> result = thread.get() - - :param async_req bool - :param str id_node_execution_id_execution_id_project: Name of the project the resource belongs to. (required) - :param str id_node_execution_id_execution_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_node_execution_id_execution_id_name: User or system provided value for the resource. (required) - :param str id_node_execution_id_node_id: (required) - :param str id_task_id_project: Name of the project the resource belongs to. (required) - :param str id_task_id_domain: Name of the domain the resource belongs to. A domain can be considered as a subset within a specific project. (required) - :param str id_task_id_name: User provided value for the resource. (required) - :param str id_task_id_version: Specific version of the resource. (required) - :param int id_retry_attempt: (required) - :param str id_task_id_resource_type: Identifies the specific type of resource that this identifier corresponds to. - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects. Eventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects in a similar manner to other Flyte objects - :param bool evict_cache: Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. - :return: AdminTaskExecutionUpdateResponse - If the method is called asynchronously, - returns the request thread. - """ - - all_params = ['id_node_execution_id_execution_id_project', 'id_node_execution_id_execution_id_domain', 'id_node_execution_id_execution_id_name', 'id_node_execution_id_node_id', 'id_task_id_project', 'id_task_id_domain', 'id_task_id_name', 'id_task_id_version', 'id_retry_attempt', 'id_task_id_resource_type', 'evict_cache'] # noqa: E501 - all_params.append('async_req') - all_params.append('_return_http_data_only') - all_params.append('_preload_content') - all_params.append('_request_timeout') - - params = locals() - for key, val in six.iteritems(params['kwargs']): - if key not in all_params: - raise TypeError( - "Got an unexpected keyword argument '%s'" - " to method update_task_execution" % key - ) - params[key] = val - del params['kwargs'] - # verify the required parameter 'id_node_execution_id_execution_id_project' is set - if ('id_node_execution_id_execution_id_project' not in params or - params['id_node_execution_id_execution_id_project'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_project` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_node_execution_id_execution_id_domain' is set - if ('id_node_execution_id_execution_id_domain' not in params or - params['id_node_execution_id_execution_id_domain'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_domain` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_node_execution_id_execution_id_name' is set - if ('id_node_execution_id_execution_id_name' not in params or - params['id_node_execution_id_execution_id_name'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_execution_id_name` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_node_execution_id_node_id' is set - if ('id_node_execution_id_node_id' not in params or - params['id_node_execution_id_node_id'] is None): - raise ValueError("Missing the required parameter `id_node_execution_id_node_id` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_project' is set - if ('id_task_id_project' not in params or - params['id_task_id_project'] is None): - raise ValueError("Missing the required parameter `id_task_id_project` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_domain' is set - if ('id_task_id_domain' not in params or - params['id_task_id_domain'] is None): - raise ValueError("Missing the required parameter `id_task_id_domain` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_name' is set - if ('id_task_id_name' not in params or - params['id_task_id_name'] is None): - raise ValueError("Missing the required parameter `id_task_id_name` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_task_id_version' is set - if ('id_task_id_version' not in params or - params['id_task_id_version'] is None): - raise ValueError("Missing the required parameter `id_task_id_version` when calling `update_task_execution`") # noqa: E501 - # verify the required parameter 'id_retry_attempt' is set - if ('id_retry_attempt' not in params or - params['id_retry_attempt'] is None): - raise ValueError("Missing the required parameter `id_retry_attempt` when calling `update_task_execution`") # noqa: E501 - - collection_formats = {} - - path_params = {} - if 'id_node_execution_id_execution_id_project' in params: - path_params['id.node_execution_id.execution_id.project'] = params['id_node_execution_id_execution_id_project'] # noqa: E501 - if 'id_node_execution_id_execution_id_domain' in params: - path_params['id.node_execution_id.execution_id.domain'] = params['id_node_execution_id_execution_id_domain'] # noqa: E501 - if 'id_node_execution_id_execution_id_name' in params: - path_params['id.node_execution_id.execution_id.name'] = params['id_node_execution_id_execution_id_name'] # noqa: E501 - if 'id_node_execution_id_node_id' in params: - path_params['id.node_execution_id.node_id'] = params['id_node_execution_id_node_id'] # noqa: E501 - if 'id_task_id_project' in params: - path_params['id.task_id.project'] = params['id_task_id_project'] # noqa: E501 - if 'id_task_id_domain' in params: - path_params['id.task_id.domain'] = params['id_task_id_domain'] # noqa: E501 - if 'id_task_id_name' in params: - path_params['id.task_id.name'] = params['id_task_id_name'] # noqa: E501 - if 'id_task_id_version' in params: - path_params['id.task_id.version'] = params['id_task_id_version'] # noqa: E501 - if 'id_retry_attempt' in params: - path_params['id.retry_attempt'] = params['id_retry_attempt'] # noqa: E501 - - query_params = [] - if 'id_task_id_resource_type' in params: - query_params.append(('id.task_id.resource_type', params['id_task_id_resource_type'])) # noqa: E501 - if 'evict_cache' in params: - query_params.append(('evict_cache', params['evict_cache'])) # noqa: E501 - - header_params = {} - - form_params = [] - local_var_files = {} - - body_params = None - # HTTP header `Accept` - header_params['Accept'] = self.api_client.select_header_accept( - ['application/json']) # noqa: E501 - - # HTTP header `Content-Type` - header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 - ['application/json']) # noqa: E501 - - # Authentication setting - auth_settings = [] # noqa: E501 - - return self.api_client.call_api( - '/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}', 'GET', - path_params, - query_params, - header_params, - body=body_params, - post_params=form_params, - files=local_var_files, - response_type='AdminTaskExecutionUpdateResponse', # noqa: E501 - auth_settings=auth_settings, - async_req=params.get('async_req'), - _return_http_data_only=params.get('_return_http_data_only'), - _preload_content=params.get('_preload_content', True), - _request_timeout=params.get('_request_timeout'), - collection_formats=collection_formats) - def update_workflow_attributes(self, attributes_project, attributes_domain, attributes_workflow, body, **kwargs): # noqa: E501 """Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project, domain and workflow. # noqa: E501 diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py index 65fcc13ce8..26f0f636dc 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/__init__.py @@ -115,7 +115,6 @@ from flyteadmin.models.admin_task_execution_event_response import AdminTaskExecutionEventResponse from flyteadmin.models.admin_task_execution_get_data_response import AdminTaskExecutionGetDataResponse from flyteadmin.models.admin_task_execution_list import AdminTaskExecutionList -from flyteadmin.models.admin_task_execution_update_response import AdminTaskExecutionUpdateResponse from flyteadmin.models.admin_task_list import AdminTaskList from flyteadmin.models.admin_task_resource_attributes import AdminTaskResourceAttributes from flyteadmin.models.admin_task_resource_spec import AdminTaskResourceSpec @@ -139,7 +138,6 @@ from flyteadmin.models.admin_workflow_list import AdminWorkflowList from flyteadmin.models.admin_workflow_spec import AdminWorkflowSpec from flyteadmin.models.blob_type_blob_dimensionality import BlobTypeBlobDimensionality -from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode from flyteadmin.models.catalog_reservation_status import CatalogReservationStatus from flyteadmin.models.comparison_expression_operator import ComparisonExpressionOperator from flyteadmin.models.conjunction_expression_logical_operator import ConjunctionExpressionLogicalOperator @@ -157,8 +155,6 @@ from flyteadmin.models.core_blob_type import CoreBlobType from flyteadmin.models.core_boolean_expression import CoreBooleanExpression from flyteadmin.models.core_branch_node import CoreBranchNode -from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError -from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList from flyteadmin.models.core_catalog_artifact_tag import CoreCatalogArtifactTag from flyteadmin.models.core_catalog_cache_status import CoreCatalogCacheStatus from flyteadmin.models.core_catalog_metadata import CoreCatalogMetadata diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py index 014b9af1b9..5bbddc57b0 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_request.py @@ -35,30 +35,25 @@ class AdminExecutionUpdateRequest(object): """ swagger_types = { 'id': 'CoreWorkflowExecutionIdentifier', - 'state': 'AdminExecutionState', - 'evict_cache': 'bool' + 'state': 'AdminExecutionState' } attribute_map = { 'id': 'id', - 'state': 'state', - 'evict_cache': 'evict_cache' + 'state': 'state' } - def __init__(self, id=None, state=None, evict_cache=None): # noqa: E501 + def __init__(self, id=None, state=None): # noqa: E501 """AdminExecutionUpdateRequest - a model defined in Swagger""" # noqa: E501 self._id = None self._state = None - self._evict_cache = None self.discriminator = None if id is not None: self.id = id if state is not None: self.state = state - if evict_cache is not None: - self.evict_cache = evict_cache @property def id(self): @@ -102,29 +97,6 @@ def state(self, state): self._state = state - @property - def evict_cache(self): - """Gets the evict_cache of this AdminExecutionUpdateRequest. # noqa: E501 - - Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. # noqa: E501 - - :return: The evict_cache of this AdminExecutionUpdateRequest. # noqa: E501 - :rtype: bool - """ - return self._evict_cache - - @evict_cache.setter - def evict_cache(self, evict_cache): - """Sets the evict_cache of this AdminExecutionUpdateRequest. - - Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog. # noqa: E501 - - :param evict_cache: The evict_cache of this AdminExecutionUpdateRequest. # noqa: E501 - :type: bool - """ - - self._evict_cache = evict_cache - def to_dict(self): """Returns the model properties as a dict""" result = {} diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py index 2993e7d509..9e9f90ee7e 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_execution_update_response.py @@ -16,8 +16,6 @@ import six -from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList # noqa: F401,E501 - class AdminExecutionUpdateResponse(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -33,45 +31,15 @@ class AdminExecutionUpdateResponse(object): and the value is json key in definition. """ swagger_types = { - 'cache_eviction_errors': 'CoreCacheEvictionErrorList' } attribute_map = { - 'cache_eviction_errors': 'cache_eviction_errors' } - def __init__(self, cache_eviction_errors=None): # noqa: E501 + def __init__(self): # noqa: E501 """AdminExecutionUpdateResponse - a model defined in Swagger""" # noqa: E501 - - self._cache_eviction_errors = None self.discriminator = None - if cache_eviction_errors is not None: - self.cache_eviction_errors = cache_eviction_errors - - @property - def cache_eviction_errors(self): - """Gets the cache_eviction_errors of this AdminExecutionUpdateResponse. # noqa: E501 - - List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. # noqa: E501 - - :return: The cache_eviction_errors of this AdminExecutionUpdateResponse. # noqa: E501 - :rtype: CoreCacheEvictionErrorList - """ - return self._cache_eviction_errors - - @cache_eviction_errors.setter - def cache_eviction_errors(self, cache_eviction_errors): - """Sets the cache_eviction_errors of this AdminExecutionUpdateResponse. - - List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. # noqa: E501 - - :param cache_eviction_errors: The cache_eviction_errors of this AdminExecutionUpdateResponse. # noqa: E501 - :type: CoreCacheEvictionErrorList - """ - - self._cache_eviction_errors = cache_eviction_errors - def to_dict(self): """Returns the model properties as a dict""" result = {} diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py deleted file mode 100644 index 7fb9ae6ed7..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/admin_task_execution_update_response.py +++ /dev/null @@ -1,117 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -import pprint -import re # noqa: F401 - -import six - -from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList # noqa: F401,E501 - - -class AdminTaskExecutionUpdateResponse(object): - """NOTE: This class is auto generated by the swagger code generator program. - - Do not edit the class manually. - """ - - """ - Attributes: - swagger_types (dict): The key is attribute name - and the value is attribute type. - attribute_map (dict): The key is attribute name - and the value is json key in definition. - """ - swagger_types = { - 'cache_eviction_errors': 'CoreCacheEvictionErrorList' - } - - attribute_map = { - 'cache_eviction_errors': 'cache_eviction_errors' - } - - def __init__(self, cache_eviction_errors=None): # noqa: E501 - """AdminTaskExecutionUpdateResponse - a model defined in Swagger""" # noqa: E501 - - self._cache_eviction_errors = None - self.discriminator = None - - if cache_eviction_errors is not None: - self.cache_eviction_errors = cache_eviction_errors - - @property - def cache_eviction_errors(self): - """Gets the cache_eviction_errors of this AdminTaskExecutionUpdateResponse. # noqa: E501 - - - :return: The cache_eviction_errors of this AdminTaskExecutionUpdateResponse. # noqa: E501 - :rtype: CoreCacheEvictionErrorList - """ - return self._cache_eviction_errors - - @cache_eviction_errors.setter - def cache_eviction_errors(self, cache_eviction_errors): - """Sets the cache_eviction_errors of this AdminTaskExecutionUpdateResponse. - - - :param cache_eviction_errors: The cache_eviction_errors of this AdminTaskExecutionUpdateResponse. # noqa: E501 - :type: CoreCacheEvictionErrorList - """ - - self._cache_eviction_errors = cache_eviction_errors - - def to_dict(self): - """Returns the model properties as a dict""" - result = {} - - for attr, _ in six.iteritems(self.swagger_types): - value = getattr(self, attr) - if isinstance(value, list): - result[attr] = list(map( - lambda x: x.to_dict() if hasattr(x, "to_dict") else x, - value - )) - elif hasattr(value, "to_dict"): - result[attr] = value.to_dict() - elif isinstance(value, dict): - result[attr] = dict(map( - lambda item: (item[0], item[1].to_dict()) - if hasattr(item[1], "to_dict") else item, - value.items() - )) - else: - result[attr] = value - if issubclass(AdminTaskExecutionUpdateResponse, dict): - for key, value in self.items(): - result[key] = value - - return result - - def to_str(self): - """Returns the string representation of the model""" - return pprint.pformat(self.to_dict()) - - def __repr__(self): - """For `print` and `pprint`""" - return self.to_str() - - def __eq__(self, other): - """Returns true if both objects are equal""" - if not isinstance(other, AdminTaskExecutionUpdateResponse): - return False - - return self.__dict__ == other.__dict__ - - def __ne__(self, other): - """Returns true if both objects are not equal""" - return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py deleted file mode 100644 index 1a329f8ee4..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/cache_eviction_error_code.py +++ /dev/null @@ -1,92 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -import pprint -import re # noqa: F401 - -import six - - -class CacheEvictionErrorCode(object): - """NOTE: This class is auto generated by the swagger code generator program. - - Do not edit the class manually. - """ - - """ - allowed enum values - """ - UNKNOWN = "UNKNOWN" - - """ - Attributes: - swagger_types (dict): The key is attribute name - and the value is attribute type. - attribute_map (dict): The key is attribute name - and the value is json key in definition. - """ - swagger_types = { - } - - attribute_map = { - } - - def __init__(self): # noqa: E501 - """CacheEvictionErrorCode - a model defined in Swagger""" # noqa: E501 - self.discriminator = None - - def to_dict(self): - """Returns the model properties as a dict""" - result = {} - - for attr, _ in six.iteritems(self.swagger_types): - value = getattr(self, attr) - if isinstance(value, list): - result[attr] = list(map( - lambda x: x.to_dict() if hasattr(x, "to_dict") else x, - value - )) - elif hasattr(value, "to_dict"): - result[attr] = value.to_dict() - elif isinstance(value, dict): - result[attr] = dict(map( - lambda item: (item[0], item[1].to_dict()) - if hasattr(item[1], "to_dict") else item, - value.items() - )) - else: - result[attr] = value - if issubclass(CacheEvictionErrorCode, dict): - for key, value in self.items(): - result[key] = value - - return result - - def to_str(self): - """Returns the string representation of the model""" - return pprint.pformat(self.to_dict()) - - def __repr__(self): - """For `print` and `pprint`""" - return self.to_str() - - def __eq__(self, other): - """Returns true if both objects are equal""" - if not isinstance(other, CacheEvictionErrorCode): - return False - - return self.__dict__ == other.__dict__ - - def __ne__(self, other): - """Returns true if both objects are not equal""" - return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py deleted file mode 100644 index 3a79208320..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error.py +++ /dev/null @@ -1,234 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -import pprint -import re # noqa: F401 - -import six - -from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode # noqa: F401,E501 -from flyteadmin.models.core_node_execution_identifier import CoreNodeExecutionIdentifier # noqa: F401,E501 -from flyteadmin.models.core_task_execution_identifier import CoreTaskExecutionIdentifier # noqa: F401,E501 -from flyteadmin.models.core_workflow_execution_identifier import CoreWorkflowExecutionIdentifier # noqa: F401,E501 - - -class CoreCacheEvictionError(object): - """NOTE: This class is auto generated by the swagger code generator program. - - Do not edit the class manually. - """ - - """ - Attributes: - swagger_types (dict): The key is attribute name - and the value is attribute type. - attribute_map (dict): The key is attribute name - and the value is json key in definition. - """ - swagger_types = { - 'code': 'CacheEvictionErrorCode', - 'message': 'str', - 'node_execution_id': 'CoreNodeExecutionIdentifier', - 'task_execution_id': 'CoreTaskExecutionIdentifier', - 'workflow_execution_id': 'CoreWorkflowExecutionIdentifier' - } - - attribute_map = { - 'code': 'code', - 'message': 'message', - 'node_execution_id': 'node_execution_id', - 'task_execution_id': 'task_execution_id', - 'workflow_execution_id': 'workflow_execution_id' - } - - def __init__(self, code=None, message=None, node_execution_id=None, task_execution_id=None, workflow_execution_id=None): # noqa: E501 - """CoreCacheEvictionError - a model defined in Swagger""" # noqa: E501 - - self._code = None - self._message = None - self._node_execution_id = None - self._task_execution_id = None - self._workflow_execution_id = None - self.discriminator = None - - if code is not None: - self.code = code - if message is not None: - self.message = message - if node_execution_id is not None: - self.node_execution_id = node_execution_id - if task_execution_id is not None: - self.task_execution_id = task_execution_id - if workflow_execution_id is not None: - self.workflow_execution_id = workflow_execution_id - - @property - def code(self): - """Gets the code of this CoreCacheEvictionError. # noqa: E501 - - Error code to match type of cache eviction error encountered. # noqa: E501 - - :return: The code of this CoreCacheEvictionError. # noqa: E501 - :rtype: CacheEvictionErrorCode - """ - return self._code - - @code.setter - def code(self, code): - """Sets the code of this CoreCacheEvictionError. - - Error code to match type of cache eviction error encountered. # noqa: E501 - - :param code: The code of this CoreCacheEvictionError. # noqa: E501 - :type: CacheEvictionErrorCode - """ - - self._code = code - - @property - def message(self): - """Gets the message of this CoreCacheEvictionError. # noqa: E501 - - More detailed error message explaining the reason for the cache eviction failure. # noqa: E501 - - :return: The message of this CoreCacheEvictionError. # noqa: E501 - :rtype: str - """ - return self._message - - @message.setter - def message(self, message): - """Sets the message of this CoreCacheEvictionError. - - More detailed error message explaining the reason for the cache eviction failure. # noqa: E501 - - :param message: The message of this CoreCacheEvictionError. # noqa: E501 - :type: str - """ - - self._message = message - - @property - def node_execution_id(self): - """Gets the node_execution_id of this CoreCacheEvictionError. # noqa: E501 - - ID of the node execution the cache eviction failed for. # noqa: E501 - - :return: The node_execution_id of this CoreCacheEvictionError. # noqa: E501 - :rtype: CoreNodeExecutionIdentifier - """ - return self._node_execution_id - - @node_execution_id.setter - def node_execution_id(self, node_execution_id): - """Sets the node_execution_id of this CoreCacheEvictionError. - - ID of the node execution the cache eviction failed for. # noqa: E501 - - :param node_execution_id: The node_execution_id of this CoreCacheEvictionError. # noqa: E501 - :type: CoreNodeExecutionIdentifier - """ - - self._node_execution_id = node_execution_id - - @property - def task_execution_id(self): - """Gets the task_execution_id of this CoreCacheEvictionError. # noqa: E501 - - ID of the task execution the cache eviction failed for (if the node execution was part of a task execution). # noqa: E501 - - :return: The task_execution_id of this CoreCacheEvictionError. # noqa: E501 - :rtype: CoreTaskExecutionIdentifier - """ - return self._task_execution_id - - @task_execution_id.setter - def task_execution_id(self, task_execution_id): - """Sets the task_execution_id of this CoreCacheEvictionError. - - ID of the task execution the cache eviction failed for (if the node execution was part of a task execution). # noqa: E501 - - :param task_execution_id: The task_execution_id of this CoreCacheEvictionError. # noqa: E501 - :type: CoreTaskExecutionIdentifier - """ - - self._task_execution_id = task_execution_id - - @property - def workflow_execution_id(self): - """Gets the workflow_execution_id of this CoreCacheEvictionError. # noqa: E501 - - ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution). # noqa: E501 - - :return: The workflow_execution_id of this CoreCacheEvictionError. # noqa: E501 - :rtype: CoreWorkflowExecutionIdentifier - """ - return self._workflow_execution_id - - @workflow_execution_id.setter - def workflow_execution_id(self, workflow_execution_id): - """Sets the workflow_execution_id of this CoreCacheEvictionError. - - ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution). # noqa: E501 - - :param workflow_execution_id: The workflow_execution_id of this CoreCacheEvictionError. # noqa: E501 - :type: CoreWorkflowExecutionIdentifier - """ - - self._workflow_execution_id = workflow_execution_id - - def to_dict(self): - """Returns the model properties as a dict""" - result = {} - - for attr, _ in six.iteritems(self.swagger_types): - value = getattr(self, attr) - if isinstance(value, list): - result[attr] = list(map( - lambda x: x.to_dict() if hasattr(x, "to_dict") else x, - value - )) - elif hasattr(value, "to_dict"): - result[attr] = value.to_dict() - elif isinstance(value, dict): - result[attr] = dict(map( - lambda item: (item[0], item[1].to_dict()) - if hasattr(item[1], "to_dict") else item, - value.items() - )) - else: - result[attr] = value - if issubclass(CoreCacheEvictionError, dict): - for key, value in self.items(): - result[key] = value - - return result - - def to_str(self): - """Returns the string representation of the model""" - return pprint.pformat(self.to_dict()) - - def __repr__(self): - """For `print` and `pprint`""" - return self.to_str() - - def __eq__(self, other): - """Returns true if both objects are equal""" - if not isinstance(other, CoreCacheEvictionError): - return False - - return self.__dict__ == other.__dict__ - - def __ne__(self, other): - """Returns true if both objects are not equal""" - return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py deleted file mode 100644 index 1d6f926d2f..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/flyteadmin/models/core_cache_eviction_error_list.py +++ /dev/null @@ -1,117 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -import pprint -import re # noqa: F401 - -import six - -from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError # noqa: F401,E501 - - -class CoreCacheEvictionErrorList(object): - """NOTE: This class is auto generated by the swagger code generator program. - - Do not edit the class manually. - """ - - """ - Attributes: - swagger_types (dict): The key is attribute name - and the value is attribute type. - attribute_map (dict): The key is attribute name - and the value is json key in definition. - """ - swagger_types = { - 'errors': 'list[CoreCacheEvictionError]' - } - - attribute_map = { - 'errors': 'errors' - } - - def __init__(self, errors=None): # noqa: E501 - """CoreCacheEvictionErrorList - a model defined in Swagger""" # noqa: E501 - - self._errors = None - self.discriminator = None - - if errors is not None: - self.errors = errors - - @property - def errors(self): - """Gets the errors of this CoreCacheEvictionErrorList. # noqa: E501 - - - :return: The errors of this CoreCacheEvictionErrorList. # noqa: E501 - :rtype: list[CoreCacheEvictionError] - """ - return self._errors - - @errors.setter - def errors(self, errors): - """Sets the errors of this CoreCacheEvictionErrorList. - - - :param errors: The errors of this CoreCacheEvictionErrorList. # noqa: E501 - :type: list[CoreCacheEvictionError] - """ - - self._errors = errors - - def to_dict(self): - """Returns the model properties as a dict""" - result = {} - - for attr, _ in six.iteritems(self.swagger_types): - value = getattr(self, attr) - if isinstance(value, list): - result[attr] = list(map( - lambda x: x.to_dict() if hasattr(x, "to_dict") else x, - value - )) - elif hasattr(value, "to_dict"): - result[attr] = value.to_dict() - elif isinstance(value, dict): - result[attr] = dict(map( - lambda item: (item[0], item[1].to_dict()) - if hasattr(item[1], "to_dict") else item, - value.items() - )) - else: - result[attr] = value - if issubclass(CoreCacheEvictionErrorList, dict): - for key, value in self.items(): - result[key] = value - - return result - - def to_str(self): - """Returns the string representation of the model""" - return pprint.pformat(self.to_dict()) - - def __repr__(self): - """For `print` and `pprint`""" - return self.to_str() - - def __eq__(self, other): - """Returns true if both objects are equal""" - if not isinstance(other, CoreCacheEvictionErrorList): - return False - - return self.__dict__ == other.__dict__ - - def __ne__(self, other): - """Returns true if both objects are not equal""" - return not self == other diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py index fa88b7e9da..4e4bee3a26 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py +++ b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_service_api.py @@ -176,6 +176,13 @@ def test_get_task(self): """ pass + def test_get_task_execution(self): + """Test case for get_task_execution + + Fetches a :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 + """ + pass + def test_get_task_execution_data(self): """Test case for get_task_execution_data @@ -406,13 +413,6 @@ def test_update_project_domain_attributes(self): """ pass - def test_update_task_execution(self): - """Test case for update_task_execution - - Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. # noqa: E501 - """ - pass - def test_update_workflow_attributes(self): """Test case for update_workflow_attributes diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py deleted file mode 100644 index 22bc72e8a3..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_admin_task_execution_update_response.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -from __future__ import absolute_import - -import unittest - -import flyteadmin -from flyteadmin.models.admin_task_execution_update_response import AdminTaskExecutionUpdateResponse # noqa: E501 -from flyteadmin.rest import ApiException - - -class TestAdminTaskExecutionUpdateResponse(unittest.TestCase): - """AdminTaskExecutionUpdateResponse unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def testAdminTaskExecutionUpdateResponse(self): - """Test AdminTaskExecutionUpdateResponse""" - # FIXME: construct object with mandatory attributes with example values - # model = flyteadmin.models.admin_task_execution_update_response.AdminTaskExecutionUpdateResponse() # noqa: E501 - pass - - -if __name__ == '__main__': - unittest.main() diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py deleted file mode 100644 index 1224645b89..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_cache_eviction_error_code.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -from __future__ import absolute_import - -import unittest - -import flyteadmin -from flyteadmin.models.cache_eviction_error_code import CacheEvictionErrorCode # noqa: E501 -from flyteadmin.rest import ApiException - - -class TestCacheEvictionErrorCode(unittest.TestCase): - """CacheEvictionErrorCode unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def testCacheEvictionErrorCode(self): - """Test CacheEvictionErrorCode""" - # FIXME: construct object with mandatory attributes with example values - # model = flyteadmin.models.cache_eviction_error_code.CacheEvictionErrorCode() # noqa: E501 - pass - - -if __name__ == '__main__': - unittest.main() diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py deleted file mode 100644 index e7447bad81..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -from __future__ import absolute_import - -import unittest - -import flyteadmin -from flyteadmin.models.core_cache_eviction_error import CoreCacheEvictionError # noqa: E501 -from flyteadmin.rest import ApiException - - -class TestCoreCacheEvictionError(unittest.TestCase): - """CoreCacheEvictionError unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def testCoreCacheEvictionError(self): - """Test CoreCacheEvictionError""" - # FIXME: construct object with mandatory attributes with example values - # model = flyteadmin.models.core_cache_eviction_error.CoreCacheEvictionError() # noqa: E501 - pass - - -if __name__ == '__main__': - unittest.main() diff --git a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py b/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py deleted file mode 100644 index dfe1a21054..0000000000 --- a/flyteidl/gen/pb_python/flyteidl/service/flyteadmin/test/test_core_cache_eviction_error_list.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding: utf-8 - -""" - flyteidl/service/admin.proto - - No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) # noqa: E501 - - OpenAPI spec version: version not set - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -from __future__ import absolute_import - -import unittest - -import flyteadmin -from flyteadmin.models.core_cache_eviction_error_list import CoreCacheEvictionErrorList # noqa: E501 -from flyteadmin.rest import ApiException - - -class TestCoreCacheEvictionErrorList(unittest.TestCase): - """CoreCacheEvictionErrorList unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def testCoreCacheEvictionErrorList(self): - """Test CoreCacheEvictionErrorList""" - # FIXME: construct object with mandatory attributes with example values - # model = flyteadmin.models.core_cache_eviction_error_list.CoreCacheEvictionErrorList() # noqa: E501 - pass - - -if __name__ == '__main__': - unittest.main() diff --git a/flyteidl/protos/docs/admin/admin.rst b/flyteidl/protos/docs/admin/admin.rst index 36d4f73294..99b5b4096d 100644 --- a/flyteidl/protos/docs/admin/admin.rst +++ b/flyteidl/protos/docs/admin/admin.rst @@ -1373,7 +1373,6 @@ ExecutionUpdateRequest "id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of the execution to update" "state", ":ref:`ref_flyteidl.admin.ExecutionState`", "", "State to set as the new value active/archive" - "evict_cache", ":ref:`ref_bool`", "", "Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog." @@ -1390,13 +1389,6 @@ ExecutionUpdateResponse -.. csv-table:: ExecutionUpdateResponse type fields - :header: "Field", "Type", "Label", "Description" - :widths: auto - - "cache_eviction_errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "List of errors encountered during cache eviction (if any). Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set." - - @@ -3799,49 +3791,6 @@ See :ref:`ref_flyteidl.admin.TaskExecution` for more details - -.. _ref_flyteidl.admin.TaskExecutionUpdateRequest: - -TaskExecutionUpdateRequest ------------------------------------------------------------------- - - - - - -.. csv-table:: TaskExecutionUpdateRequest type fields - :header: "Field", "Type", "Label", "Description" - :widths: auto - - "id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "Identifier of the task execution to update" - "evict_cache", ":ref:`ref_bool`", "", "Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the execution DAG and remove all stored results from datacatalog." - - - - - - - -.. _ref_flyteidl.admin.TaskExecutionUpdateResponse: - -TaskExecutionUpdateResponse ------------------------------------------------------------------- - - - - - -.. csv-table:: TaskExecutionUpdateResponse type fields - :header: "Field", "Type", "Label", "Description" - :widths: auto - - "cache_eviction_errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "" - - - - - - .. end messages diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst index 82466acf37..e371bdd1e9 100644 --- a/flyteidl/protos/docs/service/service.rst +++ b/flyteidl/protos/docs/service/service.rst @@ -74,7 +74,6 @@ Standard response codes for both are defined here: https://github.com/grpc-ecosy "GetTaskExecution", ":ref:`ref_flyteidl.admin.TaskExecutionGetRequest`", ":ref:`ref_flyteidl.admin.TaskExecution`", "Fetches a :ref:`ref_flyteidl.admin.TaskExecution`." "ListTaskExecutions", ":ref:`ref_flyteidl.admin.TaskExecutionListRequest`", ":ref:`ref_flyteidl.admin.TaskExecutionList`", "Fetches a list of :ref:`ref_flyteidl.admin.TaskExecution`." "GetTaskExecutionData", ":ref:`ref_flyteidl.admin.TaskExecutionGetDataRequest`", ":ref:`ref_flyteidl.admin.TaskExecutionGetDataResponse`", "Fetches input and output data for a :ref:`ref_flyteidl.admin.TaskExecution`." - "UpdateTaskExecution", ":ref:`ref_flyteidl.admin.TaskExecutionUpdateRequest`", ":ref:`ref_flyteidl.admin.TaskExecutionUpdateResponse`", "Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`." "UpdateProjectDomainAttributes", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesUpdateRequest`", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesUpdateResponse`", "Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain." "GetProjectDomainAttributes", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesGetRequest`", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesGetResponse`", "Fetches custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain." "DeleteProjectDomainAttributes", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesDeleteRequest`", ":ref:`ref_flyteidl.admin.ProjectDomainAttributesDeleteResponse`", "Deletes custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain." @@ -226,6 +225,110 @@ RPCs defined in this service must be anonymously accessible. +.. _ref_flyteidl/service/cache.proto: + +flyteidl/service/cache.proto +================================================================== + + + + + +.. _ref_flyteidl.service.EvictCacheResponse: + +EvictCacheResponse +------------------------------------------------------------------ + + + + + +.. csv-table:: EvictCacheResponse type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "List of errors encountered during cache eviction (if any)." + + + + + + + +.. _ref_flyteidl.service.EvictExecutionCacheRequest: + +EvictExecutionCacheRequest +------------------------------------------------------------------ + + + + + +.. csv-table:: EvictExecutionCacheRequest type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of execution to evict cache for." + + + + + + + +.. _ref_flyteidl.service.EvictTaskExecutionCacheRequest: + +EvictTaskExecutionCacheRequest +------------------------------------------------------------------ + + + + + +.. csv-table:: EvictTaskExecutionCacheRequest type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "Identifier of task execution to evict cache for." + + + + + + +.. + end messages + + +.. + end enums + + +.. + end HasExtensions + + + +.. _ref_flyteidl.service.CacheService: + +CacheService +------------------------------------------------------------------ + +CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. + +.. csv-table:: CacheService service methods + :header: "Method Name", "Request Type", "Response Type", "Description" + :widths: auto + + "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`." + "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictTaskExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`." + +.. + end services + + + + .. _ref_flyteidl/service/dataproxy.proto: flyteidl/service/dataproxy.proto diff --git a/flyteidl/protos/flyteidl/admin/execution.proto b/flyteidl/protos/flyteidl/admin/execution.proto index 7ac671c94d..6a7c164227 100644 --- a/flyteidl/protos/flyteidl/admin/execution.proto +++ b/flyteidl/protos/flyteidl/admin/execution.proto @@ -6,7 +6,6 @@ option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"; import "flyteidl/admin/cluster_assignment.proto"; import "flyteidl/admin/common.proto"; import "flyteidl/core/literals.proto"; -import "flyteidl/core/errors.proto"; import "flyteidl/core/execution.proto"; import "flyteidl/core/identifier.proto"; import "flyteidl/core/security.proto"; @@ -368,10 +367,6 @@ message ExecutionUpdateRequest { // State to set as the new value active/archive ExecutionState state = 2; - - // Indicates the cache of this (finished) execution should be evicted, instructing flyteadmin to traverse the - // execution DAG and remove all stored results from datacatalog. - bool evict_cache = 3; } message ExecutionStateChangeDetails { @@ -385,8 +380,4 @@ message ExecutionStateChangeDetails { string principal = 3; } -message ExecutionUpdateResponse { - // List of errors encountered during cache eviction (if any). - // Will only be populated if `evict_cache` of :ref:`ref_flyteidl.admin.ExecutionUpdateRequest` is set. - core.CacheEvictionErrorList cache_eviction_errors = 1; -} +message ExecutionUpdateResponse {} diff --git a/flyteidl/protos/flyteidl/admin/task_execution.proto b/flyteidl/protos/flyteidl/admin/task_execution.proto index 87e3657b13..36d9b77e1d 100644 --- a/flyteidl/protos/flyteidl/admin/task_execution.proto +++ b/flyteidl/protos/flyteidl/admin/task_execution.proto @@ -4,7 +4,6 @@ package flyteidl.admin; option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"; import "flyteidl/admin/common.proto"; -import "flyteidl/core/errors.proto"; import "flyteidl/core/execution.proto"; import "flyteidl/core/identifier.proto"; import "flyteidl/core/literals.proto"; @@ -150,16 +149,3 @@ message TaskExecutionGetDataResponse { // Full_outputs will only be populated if they are under a configured size threshold. core.LiteralMap full_outputs = 4; } - -message TaskExecutionUpdateRequest { - // Identifier of the task execution to update - core.TaskExecutionIdentifier id = 1; - - // Indicates the cache of this (finished) task execution should be evicted, instructing flyteadmin to traverse the - // execution DAG and remove all stored results from datacatalog. - bool evict_cache = 2; -} - -message TaskExecutionUpdateResponse { - core.CacheEvictionErrorList cache_eviction_errors = 1; -} diff --git a/flyteidl/protos/flyteidl/service/admin.proto b/flyteidl/protos/flyteidl/service/admin.proto index 2124617217..f6cfdee092 100644 --- a/flyteidl/protos/flyteidl/service/admin.proto +++ b/flyteidl/protos/flyteidl/service/admin.proto @@ -19,7 +19,6 @@ import "flyteidl/admin/task_execution.proto"; import "flyteidl/admin/version.proto"; import "flyteidl/admin/common.proto"; import "flyteidl/admin/description_entity.proto"; -import "flyteidl/core/identifier.proto"; // import "protoc-gen-swagger/options/annotations.proto"; // The following defines an RPC service that is also served over HTTP via grpc-gateway. @@ -460,16 +459,6 @@ service AdminService { // }; } - // Update execution belonging to project domain :ref:`ref_flyteidl.admin.TaskExecution`. - rpc UpdateTaskExecution (flyteidl.admin.TaskExecutionUpdateRequest) returns (flyteidl.admin.TaskExecutionUpdateResponse) { - option (google.api.http) = { - get: "/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" - }; - // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { - // description: "Updates an existing task execution belonging to a project domain." - // }; - } - // Creates or updates custom :ref:`ref_flyteidl.admin.MatchableAttributesConfiguration` for a project and domain. rpc UpdateProjectDomainAttributes (flyteidl.admin.ProjectDomainAttributesUpdateRequest) returns (flyteidl.admin.ProjectDomainAttributesUpdateResponse) { option (google.api.http) = { diff --git a/flyteidl/protos/flyteidl/service/cache.proto b/flyteidl/protos/flyteidl/service/cache.proto new file mode 100644 index 0000000000..33a5bcbd35 --- /dev/null +++ b/flyteidl/protos/flyteidl/service/cache.proto @@ -0,0 +1,50 @@ +syntax = "proto3"; +package flyteidl.service; + +option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"; + +import "google/api/annotations.proto"; +// import "protoc-gen-swagger/options/annotations.proto"; + +import "flyteidl/core/errors.proto"; +import "flyteidl/core/identifier.proto"; + +message EvictExecutionCacheRequest { + // Identifier of execution to evict cache for. + core.WorkflowExecutionIdentifier id = 1; +} + +message EvictTaskExecutionCacheRequest { + // Identifier of task execution to evict cache for. + core.TaskExecutionIdentifier id = 1; +} + +message EvictCacheResponse { + // List of errors encountered during cache eviction (if any). + core.CacheEvictionErrorList errors = 1; +} + +// CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. +service CacheService { + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + rpc EvictExecutionCache (EvictExecutionCacheRequest) returns (EvictCacheResponse) { + option (google.api.http) = { + delete: "/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}" + body: "*" + }; + // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { + // description: "Evicts all cached data for the referenced (workflow) execution." + // }; + } + + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + rpc EvictTaskExecutionCache (EvictTaskExecutionCacheRequest) returns (EvictCacheResponse) { + option (google.api.http) = { + delete: "/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" + body: "*" + }; + // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { + // description: "Evicts all cached data for the referenced task execution." + // }; + } +} From 419570e54990a2d4eced3b69f25d549e81731406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Fri, 11 Nov 2022 11:07:08 +0100 Subject: [PATCH 14/57] Refactored new cache service to share EvictCacheRequest for both endpoints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../go/admin/mocks/CacheServiceClient.go | 16 +- .../go/admin/mocks/CacheServiceServer.go | 16 +- .../go/admin/mocks/isEvictCacheRequest_Id.go | 15 + .../pb-cpp/flyteidl/service/cache.grpc.pb.cc | 28 +- .../pb-cpp/flyteidl/service/cache.grpc.pb.h | 116 +- .../gen/pb-cpp/flyteidl/service/cache.pb.cc | 701 +++----- .../gen/pb-cpp/flyteidl/service/cache.pb.h | 372 ++--- .../gen/pb-go/flyteidl/service/cache.pb.go | 205 +-- .../gen/pb-go/flyteidl/service/cache.pb.gw.go | 104 +- .../pb-go/flyteidl/service/cache.swagger.json | 59 +- .../gen/pb-java/flyteidl/service/Cache.java | 1426 +++++++---------- flyteidl/gen/pb-js/flyteidl.d.ts | 113 +- flyteidl/gen/pb-js/flyteidl.js | 228 +-- .../pb_python/flyteidl/service/cache_pb2.py | 20 +- .../pb_python/flyteidl/service/cache_pb2.pyi | 20 +- .../flyteidl/service/cache_pb2_grpc.py | 12 +- flyteidl/protos/docs/service/service.rst | 42 +- flyteidl/protos/flyteidl/service/cache.proto | 24 +- 18 files changed, 1397 insertions(+), 2120 deletions(-) create mode 100644 flyteidl/clients/go/admin/mocks/isEvictCacheRequest_Id.go diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go index 0d8e354d98..adc22ff3e8 100644 --- a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go +++ b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go @@ -25,7 +25,7 @@ func (_m CacheServiceClient_EvictExecutionCache) Return(_a0 *service.EvictCacheR return &CacheServiceClient_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictExecutionCache { +func (_m *CacheServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictExecutionCache { c_call := _m.On("EvictExecutionCache", ctx, in, opts) return &CacheServiceClient_EvictExecutionCache{Call: c_call} } @@ -36,7 +36,7 @@ func (_m *CacheServiceClient) OnEvictExecutionCacheMatch(matchers ...interface{} } // EvictExecutionCache provides a mock function with given fields: ctx, in, opts -func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { +func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -47,7 +47,7 @@ func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *servi ret := _m.Called(_ca...) var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { r0 = rf(ctx, in, opts...) } else { if ret.Get(0) != nil { @@ -56,7 +56,7 @@ func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *servi } var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { r1 = ret.Error(1) @@ -73,7 +73,7 @@ func (_m CacheServiceClient_EvictTaskExecutionCache) Return(_a0 *service.EvictCa return &CacheServiceClient_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceClient) OnEvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictTaskExecutionCache { +func (_m *CacheServiceClient) OnEvictTaskExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictTaskExecutionCache { c_call := _m.On("EvictTaskExecutionCache", ctx, in, opts) return &CacheServiceClient_EvictTaskExecutionCache{Call: c_call} } @@ -84,7 +84,7 @@ func (_m *CacheServiceClient) OnEvictTaskExecutionCacheMatch(matchers ...interfa } // EvictTaskExecutionCache provides a mock function with given fields: ctx, in, opts -func (_m *CacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { +func (_m *CacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -95,7 +95,7 @@ func (_m *CacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *s ret := _m.Called(_ca...) var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { r0 = rf(ctx, in, opts...) } else { if ret.Get(0) != nil { @@ -104,7 +104,7 @@ func (_m *CacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *s } var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { r1 = ret.Error(1) diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go index d30d216737..82cb91fb7f 100644 --- a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go +++ b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go @@ -22,7 +22,7 @@ func (_m CacheServiceServer_EvictExecutionCache) Return(_a0 *service.EvictCacheR return &CacheServiceServer_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) *CacheServiceServer_EvictExecutionCache { +func (_m *CacheServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) *CacheServiceServer_EvictExecutionCache { c_call := _m.On("EvictExecutionCache", _a0, _a1) return &CacheServiceServer_EvictExecutionCache{Call: c_call} } @@ -33,11 +33,11 @@ func (_m *CacheServiceServer) OnEvictExecutionCacheMatch(matchers ...interface{} } // EvictExecutionCache provides a mock function with given fields: _a0, _a1 -func (_m *CacheServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { +func (_m *CacheServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) (*service.EvictCacheResponse, error) { ret := _m.Called(_a0, _a1) var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest) *service.EvictCacheResponse); ok { + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest) *service.EvictCacheResponse); ok { r0 = rf(_a0, _a1) } else { if ret.Get(0) != nil { @@ -46,7 +46,7 @@ func (_m *CacheServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *serv } var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest) error); ok { r1 = rf(_a0, _a1) } else { r1 = ret.Error(1) @@ -63,7 +63,7 @@ func (_m CacheServiceServer_EvictTaskExecutionCache) Return(_a0 *service.EvictCa return &CacheServiceServer_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceServer) OnEvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) *CacheServiceServer_EvictTaskExecutionCache { +func (_m *CacheServiceServer) OnEvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) *CacheServiceServer_EvictTaskExecutionCache { c_call := _m.On("EvictTaskExecutionCache", _a0, _a1) return &CacheServiceServer_EvictTaskExecutionCache{Call: c_call} } @@ -74,11 +74,11 @@ func (_m *CacheServiceServer) OnEvictTaskExecutionCacheMatch(matchers ...interfa } // EvictTaskExecutionCache provides a mock function with given fields: _a0, _a1 -func (_m *CacheServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { +func (_m *CacheServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) (*service.EvictCacheResponse, error) { ret := _m.Called(_a0, _a1) var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest) *service.EvictCacheResponse); ok { + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest) *service.EvictCacheResponse); ok { r0 = rf(_a0, _a1) } else { if ret.Get(0) != nil { @@ -87,7 +87,7 @@ func (_m *CacheServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 * } var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest) error); ok { r1 = rf(_a0, _a1) } else { r1 = ret.Error(1) diff --git a/flyteidl/clients/go/admin/mocks/isEvictCacheRequest_Id.go b/flyteidl/clients/go/admin/mocks/isEvictCacheRequest_Id.go new file mode 100644 index 0000000000..601036a404 --- /dev/null +++ b/flyteidl/clients/go/admin/mocks/isEvictCacheRequest_Id.go @@ -0,0 +1,15 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import mock "github.com/stretchr/testify/mock" + +// isEvictCacheRequest_Id is an autogenerated mock type for the isEvictCacheRequest_Id type +type isEvictCacheRequest_Id struct { + mock.Mock +} + +// isEvictCacheRequest_Id provides a mock function with given fields: +func (_m *isEvictCacheRequest_Id) isEvictCacheRequest_Id() { + _m.Called() +} diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc index 90e90e8e59..692729e9d4 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc @@ -35,11 +35,11 @@ CacheService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& chann , rpcmethod_EvictTaskExecutionCache_(CacheService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} -::grpc::Status CacheService::Stub::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { +::grpc::Status CacheService::Stub::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictExecutionCache_, context, request, response); } -void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); } @@ -47,7 +47,7 @@ void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientC ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); } -void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); } @@ -55,19 +55,19 @@ void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientC ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, true); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, false); } -::grpc::Status CacheService::Stub::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { +::grpc::Status CacheService::Stub::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictTaskExecutionCache_, context, request, response); } -void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); } @@ -75,7 +75,7 @@ void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::Cli ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); } -void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); } @@ -83,11 +83,11 @@ void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::Cli ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, true); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, false); } @@ -95,26 +95,26 @@ CacheService::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, - new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( std::mem_fn(&CacheService::Service::EvictExecutionCache), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( CacheService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, - new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( std::mem_fn(&CacheService::Service::EvictTaskExecutionCache), this))); } CacheService::Service::~Service() { } -::grpc::Status CacheService::Service::EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { +::grpc::Status CacheService::Service::EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { (void) context; (void) request; (void) response; return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } -::grpc::Status CacheService::Service::EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { +::grpc::Status CacheService::Service::EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { (void) context; (void) request; (void) response; diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h index 8632f26b5a..cdceb4c687 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h @@ -50,69 +50,69 @@ class CacheService final { public: virtual ~StubInterface() {} // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - virtual ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + virtual ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); } // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); } class experimental_async_interface { public: virtual ~experimental_async_interface() {} // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; }; virtual class experimental_async_interface* experimental_async() { return nullptr; } private: - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; }; class Stub final : public StubInterface { public: Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel); - ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); } - ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); } class experimental_async final : public StubInterface::experimental_async_interface { public: - void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; private: friend class Stub; @@ -125,10 +125,10 @@ class CacheService final { private: std::shared_ptr< ::grpc::ChannelInterface> channel_; class experimental_async async_stub_{this}; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; const ::grpc::internal::RpcMethod rpcmethod_EvictExecutionCache_; const ::grpc::internal::RpcMethod rpcmethod_EvictTaskExecutionCache_; }; @@ -139,9 +139,9 @@ class CacheService final { Service(); virtual ~Service(); // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - virtual ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); + virtual ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); + virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); }; template class WithAsyncMethod_EvictExecutionCache : public BaseClass { @@ -155,11 +155,11 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEvictExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEvictExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); } }; @@ -175,11 +175,11 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); } }; @@ -191,17 +191,17 @@ class CacheService final { public: ExperimentalWithCallbackMethod_EvictExecutionCache() { ::grpc::Service::experimental().MarkMethodCallback(0, - new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( [this](::grpc::ServerContext* context, - const ::flyteidl::service::EvictExecutionCacheRequest* request, + const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { return this->EvictExecutionCache(context, request, response, controller); })); } void SetMessageAllocatorFor_EvictExecutionCache( - ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { - static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( + ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( ::grpc::Service::experimental().GetHandler(0)) ->SetMessageAllocator(allocator); } @@ -209,11 +209,11 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template class ExperimentalWithCallbackMethod_EvictTaskExecutionCache : public BaseClass { @@ -222,17 +222,17 @@ class CacheService final { public: ExperimentalWithCallbackMethod_EvictTaskExecutionCache() { ::grpc::Service::experimental().MarkMethodCallback(1, - new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( [this](::grpc::ServerContext* context, - const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, + const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { return this->EvictTaskExecutionCache(context, request, response, controller); })); } void SetMessageAllocatorFor_EvictTaskExecutionCache( - ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { - static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( + ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( ::grpc::Service::experimental().GetHandler(1)) ->SetMessageAllocator(allocator); } @@ -240,11 +240,11 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; typedef ExperimentalWithCallbackMethod_EvictExecutionCache > ExperimentalCallbackService; template @@ -259,7 +259,7 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -276,7 +276,7 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -293,7 +293,7 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -313,7 +313,7 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -340,7 +340,7 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -365,7 +365,7 @@ class CacheService final { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -378,18 +378,18 @@ class CacheService final { public: WithStreamedUnaryMethod_EvictExecutionCache() { ::grpc::Service::MarkMethodStreamed(0, - new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictExecutionCache::StreamedEvictExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictExecutionCache::StreamedEvictExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_EvictExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable regular version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } // replace default version of method with streamed unary - virtual ::grpc::Status StreamedEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; + virtual ::grpc::Status StreamedEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; }; template class WithStreamedUnaryMethod_EvictTaskExecutionCache : public BaseClass { @@ -398,18 +398,18 @@ class CacheService final { public: WithStreamedUnaryMethod_EvictTaskExecutionCache() { ::grpc::Service::MarkMethodStreamed(1, - new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictTaskExecutionCache::StreamedEvictTaskExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictTaskExecutionCache::StreamedEvictTaskExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_EvictTaskExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable regular version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } // replace default version of method with streamed unary - virtual ::grpc::Status StreamedEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictTaskExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; + virtual ::grpc::Status StreamedEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; }; typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedUnaryService; typedef Service SplitStreamedService; diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc index 467d81aa1c..21c8dfc401 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc @@ -21,48 +21,32 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::p extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; namespace flyteidl { namespace service { -class EvictExecutionCacheRequestDefaultTypeInternal { +class EvictCacheRequestDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _EvictExecutionCacheRequest_default_instance_; -class EvictTaskExecutionCacheRequestDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _EvictTaskExecutionCacheRequest_default_instance_; + ::google::protobuf::internal::ExplicitlyConstructed _instance; + const ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_; + const ::flyteidl::core::TaskExecutionIdentifier* task_execution_id_; +} _EvictCacheRequest_default_instance_; class EvictCacheResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _EvictCacheResponse_default_instance_; } // namespace service } // namespace flyteidl -static void InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::flyteidl::service::_EvictExecutionCacheRequest_default_instance_; - new (ptr) ::flyteidl::service::EvictExecutionCacheRequest(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); - } - ::flyteidl::service::EvictExecutionCacheRequest::InitAsDefaultInstance(); -} - -::google::protobuf::internal::SCCInfo<1> scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { - &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; - -static void InitDefaultsEvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() { +static void InitDefaultsEvictCacheRequest_flyteidl_2fservice_2fcache_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_; - new (ptr) ::flyteidl::service::EvictTaskExecutionCacheRequest(); + void* ptr = &::flyteidl::service::_EvictCacheRequest_default_instance_; + new (ptr) ::flyteidl::service::EvictCacheRequest(); ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } - ::flyteidl::service::EvictTaskExecutionCacheRequest::InitAsDefaultInstance(); + ::flyteidl::service::EvictCacheRequest::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<1> scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { +::google::protobuf::internal::SCCInfo<2> scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsEvictCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { + &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base, &scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; static void InitDefaultsEvictCacheResponse_flyteidl_2fservice_2fcache_2eproto() { @@ -81,28 +65,23 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_EvictCacheResponse_flyteidl_2f &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}}; void InitDefaults_flyteidl_2fservice_2fcache_2eproto() { - ::google::protobuf::internal::InitSCC(&scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_EvictCacheResponse_flyteidl_2fservice_2fcache_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fservice_2fcache_2eproto[3]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fservice_2fcache_2eproto[2]; constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr; const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheRequest, _internal_metadata_), ~0u, // no _extensions_ - ~0u, // no _oneof_case_ - ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, id_), - ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictTaskExecutionCacheRequest, _internal_metadata_), - ~0u, // no _extensions_ - ~0u, // no _oneof_case_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheRequest, _oneof_case_[0]), ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictTaskExecutionCacheRequest, id_), + offsetof(::flyteidl::service::EvictCacheRequestDefaultTypeInternal, workflow_execution_id_), + offsetof(::flyteidl::service::EvictCacheRequestDefaultTypeInternal, task_execution_id_), + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheRequest, id_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheResponse, _internal_metadata_), ~0u, // no _extensions_ @@ -111,56 +90,59 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fcache_2eproto: PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheResponse, errors_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, sizeof(::flyteidl::service::EvictExecutionCacheRequest)}, - { 6, -1, sizeof(::flyteidl::service::EvictTaskExecutionCacheRequest)}, - { 12, -1, sizeof(::flyteidl::service::EvictCacheResponse)}, + { 0, -1, sizeof(::flyteidl::service::EvictCacheRequest)}, + { 8, -1, sizeof(::flyteidl::service::EvictCacheResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { - reinterpret_cast(&::flyteidl::service::_EvictExecutionCacheRequest_default_instance_), - reinterpret_cast(&::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_), + reinterpret_cast(&::flyteidl::service::_EvictCacheRequest_default_instance_), reinterpret_cast(&::flyteidl::service::_EvictCacheResponse_default_instance_), }; ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto = { {}, AddDescriptors_flyteidl_2fservice_2fcache_2eproto, "flyteidl/service/cache.proto", schemas, file_default_instances, TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets, - file_level_metadata_flyteidl_2fservice_2fcache_2eproto, 3, file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto, file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto, + file_level_metadata_flyteidl_2fservice_2fcache_2eproto, 2, file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto, file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto, }; const char descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto[] = "\n\034flyteidl/service/cache.proto\022\020flyteidl" ".service\032\034google/api/annotations.proto\032\032" "flyteidl/core/errors.proto\032\036flyteidl/cor" - "e/identifier.proto\"T\n\032EvictExecutionCach" - "eRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" - "kflowExecutionIdentifier\"T\n\036EvictTaskExe" - "cutionCacheRequest\0222\n\002id\030\001 \001(\0132&.flyteid" - "l.core.TaskExecutionIdentifier\"K\n\022EvictC" - "acheResponse\0225\n\006errors\030\001 \001(\0132%.flyteidl." - "core.CacheEvictionErrorList2\345\004\n\014CacheSer" - "vice\022\261\001\n\023EvictExecutionCache\022,.flyteidl." - "service.EvictExecutionCacheRequest\032$.fly" - "teidl.service.EvictCacheResponse\"F\202\323\344\223\002@" - "*;/api/v1/cache/executions/{id.project}/" - "{id.domain}/{id.name}:\001*\022\240\003\n\027EvictTaskEx" - "ecutionCache\0220.flyteidl.service.EvictTas" - "kExecutionCacheRequest\032$.flyteidl.servic" - "e.EvictCacheResponse\"\254\002\202\323\344\223\002\245\002*\237\002/api/v1" - "/cache/task_executions/{id.node_executio" - "n_id.execution_id.project}/{id.node_exec" - "ution_id.execution_id.domain}/{id.node_e" - "xecution_id.execution_id.name}/{id.node_" - "execution_id.node_id}/{id.task_id.projec" - "t}/{id.task_id.domain}/{id.task_id.name}" - "/{id.task_id.version}/{id.retry_attempt}" - ":\001*B9Z7github.com/flyteorg/flyteidl/gen/" - "pb-go/flyteidl/serviceb\006proto3" + "e/identifier.proto\"\253\001\n\021EvictCacheRequest" + "\022K\n\025workflow_execution_id\030\001 \001(\0132*.flytei" + "dl.core.WorkflowExecutionIdentifierH\000\022C\n" + "\021task_execution_id\030\002 \001(\0132&.flyteidl.core" + ".TaskExecutionIdentifierH\000B\004\n\002id\"K\n\022Evic" + "tCacheResponse\0225\n\006errors\030\001 \001(\0132%.flyteid" + "l.core.CacheEvictionErrorList2\217\006\n\014CacheS" + "ervice\022\341\001\n\023EvictExecutionCache\022#.flyteid" + "l.service.EvictCacheRequest\032$.flyteidl.s" + "ervice.EvictCacheResponse\"\177\202\323\344\223\002y*t/api/" + "v1/cache/executions/{workflow_execution_" + "id.project}/{workflow_execution_id.domai" + "n}/{workflow_execution_id.name}:\001*\022\232\004\n\027E" + "victTaskExecutionCache\022#.flyteidl.servic" + "e.EvictCacheRequest\032$.flyteidl.service.E" + "victCacheResponse\"\263\003\202\323\344\223\002\254\003*\246\003/api/v1/ca" + "che/task_executions/{task_execution_id.n" + "ode_execution_id.execution_id.project}/{" + "task_execution_id.node_execution_id.exec" + "ution_id.domain}/{task_execution_id.node" + "_execution_id.execution_id.name}/{task_e" + "xecution_id.node_execution_id.node_id}/{" + "task_execution_id.task_id.project}/{task" + "_execution_id.task_id.domain}/{task_exec" + "ution_id.task_id.name}/{task_execution_i" + "d.task_id.version}/{task_execution_id.re" + "try_attempt}:\001*B9Z7github.com/flyteorg/f" + "lyteidl/gen/pb-go/flyteidl/serviceb\006prot" + "o3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fcache_2eproto = { false, InitDefaults_flyteidl_2fservice_2fcache_2eproto, descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto, - "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1070, + "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1242, }; void AddDescriptors_flyteidl_2fservice_2fcache_2eproto() { @@ -180,87 +162,156 @@ namespace service { // =================================================================== -void EvictExecutionCacheRequest::InitAsDefaultInstance() { - ::flyteidl::service::_EvictExecutionCacheRequest_default_instance_._instance.get_mutable()->id_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>( +void EvictCacheRequest::InitAsDefaultInstance() { + ::flyteidl::service::_EvictCacheRequest_default_instance_.workflow_execution_id_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>( ::flyteidl::core::WorkflowExecutionIdentifier::internal_default_instance()); + ::flyteidl::service::_EvictCacheRequest_default_instance_.task_execution_id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( + ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); } -class EvictExecutionCacheRequest::HasBitSetters { +class EvictCacheRequest::HasBitSetters { public: - static const ::flyteidl::core::WorkflowExecutionIdentifier& id(const EvictExecutionCacheRequest* msg); + static const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id(const EvictCacheRequest* msg); + static const ::flyteidl::core::TaskExecutionIdentifier& task_execution_id(const EvictCacheRequest* msg); }; const ::flyteidl::core::WorkflowExecutionIdentifier& -EvictExecutionCacheRequest::HasBitSetters::id(const EvictExecutionCacheRequest* msg) { - return *msg->id_; +EvictCacheRequest::HasBitSetters::workflow_execution_id(const EvictCacheRequest* msg) { + return *msg->id_.workflow_execution_id_; +} +const ::flyteidl::core::TaskExecutionIdentifier& +EvictCacheRequest::HasBitSetters::task_execution_id(const EvictCacheRequest* msg) { + return *msg->id_.task_execution_id_; +} +void EvictCacheRequest::set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + clear_id(); + if (workflow_execution_id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + workflow_execution_id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, workflow_execution_id, submessage_arena); + } + set_has_workflow_execution_id(); + id_.workflow_execution_id_ = workflow_execution_id; + } + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictCacheRequest.workflow_execution_id) } -void EvictExecutionCacheRequest::clear_id() { - if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { - delete id_; +void EvictCacheRequest::clear_workflow_execution_id() { + if (has_workflow_execution_id()) { + delete id_.workflow_execution_id_; + clear_has_id(); + } +} +void EvictCacheRequest::set_allocated_task_execution_id(::flyteidl::core::TaskExecutionIdentifier* task_execution_id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + clear_id(); + if (task_execution_id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + task_execution_id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, task_execution_id, submessage_arena); + } + set_has_task_execution_id(); + id_.task_execution_id_ = task_execution_id; + } + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictCacheRequest.task_execution_id) +} +void EvictCacheRequest::clear_task_execution_id() { + if (has_task_execution_id()) { + delete id_.task_execution_id_; + clear_has_id(); } - id_ = nullptr; } #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int EvictExecutionCacheRequest::kIdFieldNumber; +const int EvictCacheRequest::kWorkflowExecutionIdFieldNumber; +const int EvictCacheRequest::kTaskExecutionIdFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -EvictExecutionCacheRequest::EvictExecutionCacheRequest() +EvictCacheRequest::EvictCacheRequest() : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); - // @@protoc_insertion_point(constructor:flyteidl.service.EvictExecutionCacheRequest) + // @@protoc_insertion_point(constructor:flyteidl.service.EvictCacheRequest) } -EvictExecutionCacheRequest::EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from) +EvictCacheRequest::EvictCacheRequest(const EvictCacheRequest& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_id()) { - id_ = new ::flyteidl::core::WorkflowExecutionIdentifier(*from.id_); - } else { - id_ = nullptr; + clear_has_id(); + switch (from.id_case()) { + case kWorkflowExecutionId: { + mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id()); + break; + } + case kTaskExecutionId: { + mutable_task_execution_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_execution_id()); + break; + } + case ID_NOT_SET: { + break; + } } - // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictExecutionCacheRequest) + // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictCacheRequest) } -void EvictExecutionCacheRequest::SharedCtor() { +void EvictCacheRequest::SharedCtor() { ::google::protobuf::internal::InitSCC( - &scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); - id_ = nullptr; + &scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + clear_has_id(); } -EvictExecutionCacheRequest::~EvictExecutionCacheRequest() { - // @@protoc_insertion_point(destructor:flyteidl.service.EvictExecutionCacheRequest) +EvictCacheRequest::~EvictCacheRequest() { + // @@protoc_insertion_point(destructor:flyteidl.service.EvictCacheRequest) SharedDtor(); } -void EvictExecutionCacheRequest::SharedDtor() { - if (this != internal_default_instance()) delete id_; +void EvictCacheRequest::SharedDtor() { + if (has_id()) { + clear_id(); + } } -void EvictExecutionCacheRequest::SetCachedSize(int size) const { +void EvictCacheRequest::SetCachedSize(int size) const { _cached_size_.Set(size); } -const EvictExecutionCacheRequest& EvictExecutionCacheRequest::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); +const EvictCacheRequest& EvictCacheRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); return *internal_default_instance(); } -void EvictExecutionCacheRequest::Clear() { -// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictExecutionCacheRequest) +void EvictCacheRequest::clear_id() { +// @@protoc_insertion_point(one_of_clear_start:flyteidl.service.EvictCacheRequest) + switch (id_case()) { + case kWorkflowExecutionId: { + delete id_.workflow_execution_id_; + break; + } + case kTaskExecutionId: { + delete id_.task_execution_id_; + break; + } + case ID_NOT_SET: { + break; + } + } + _oneof_case_[0] = ID_NOT_SET; +} + + +void EvictCacheRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictCacheRequest) ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { - delete id_; - } - id_ = nullptr; + clear_id(); _internal_metadata_.Clear(); } #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* EvictExecutionCacheRequest::_InternalParse(const char* begin, const char* end, void* object, +const char* EvictCacheRequest::_InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); + auto msg = static_cast(object); ::google::protobuf::int32 size; (void)size; int depth; (void)depth; ::google::protobuf::uint32 tag; @@ -270,306 +321,26 @@ const char* EvictExecutionCacheRequest::_InternalParse(const char* begin, const ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { - // .flyteidl.core.WorkflowExecutionIdentifier id = 1; + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; case 1: { if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::WorkflowExecutionIdentifier::_InternalParse; - object = msg->mutable_id(); + object = msg->mutable_workflow_execution_id(); if (size > end - ptr) goto len_delim_till_end; ptr += size; GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( {parser_till_end, object}, ptr - size, ptr)); break; } - default: { - handle_unusual: - if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; - } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; - } - } // switch - } // while - return ptr; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool EvictExecutionCacheRequest::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:flyteidl.service.EvictExecutionCacheRequest) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.core.WorkflowExecutionIdentifier id = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_id())); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:flyteidl.service.EvictExecutionCacheRequest) - return true; -failure: - // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictExecutionCacheRequest) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void EvictExecutionCacheRequest::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictExecutionCacheRequest) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .flyteidl.core.WorkflowExecutionIdentifier id = 1; - if (this->has_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::id(this), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictExecutionCacheRequest) -} - -::google::protobuf::uint8* EvictExecutionCacheRequest::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictExecutionCacheRequest) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .flyteidl.core.WorkflowExecutionIdentifier id = 1; - if (this->has_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 1, HasBitSetters::id(this), target); - } - - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); - } - // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictExecutionCacheRequest) - return target; -} - -size_t EvictExecutionCacheRequest::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictExecutionCacheRequest) - size_t total_size = 0; - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - // .flyteidl.core.WorkflowExecutionIdentifier id = 1; - if (this->has_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *id_); - } - - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; -} - -void EvictExecutionCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictExecutionCacheRequest) - GOOGLE_DCHECK_NE(&from, this); - const EvictExecutionCacheRequest* source = - ::google::protobuf::DynamicCastToGenerated( - &from); - if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictExecutionCacheRequest) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictExecutionCacheRequest) - MergeFrom(*source); - } -} - -void EvictExecutionCacheRequest::MergeFrom(const EvictExecutionCacheRequest& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictExecutionCacheRequest) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - if (from.has_id()) { - mutable_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.id()); - } -} - -void EvictExecutionCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictExecutionCacheRequest) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -void EvictExecutionCacheRequest::CopyFrom(const EvictExecutionCacheRequest& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictExecutionCacheRequest) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool EvictExecutionCacheRequest::IsInitialized() const { - return true; -} - -void EvictExecutionCacheRequest::Swap(EvictExecutionCacheRequest* other) { - if (other == this) return; - InternalSwap(other); -} -void EvictExecutionCacheRequest::InternalSwap(EvictExecutionCacheRequest* other) { - using std::swap; - _internal_metadata_.Swap(&other->_internal_metadata_); - swap(id_, other->id_); -} - -::google::protobuf::Metadata EvictExecutionCacheRequest::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto); - return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages]; -} - - -// =================================================================== - -void EvictTaskExecutionCacheRequest::InitAsDefaultInstance() { - ::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_._instance.get_mutable()->id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( - ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); -} -class EvictTaskExecutionCacheRequest::HasBitSetters { - public: - static const ::flyteidl::core::TaskExecutionIdentifier& id(const EvictTaskExecutionCacheRequest* msg); -}; - -const ::flyteidl::core::TaskExecutionIdentifier& -EvictTaskExecutionCacheRequest::HasBitSetters::id(const EvictTaskExecutionCacheRequest* msg) { - return *msg->id_; -} -void EvictTaskExecutionCacheRequest::clear_id() { - if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { - delete id_; - } - id_ = nullptr; -} -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int EvictTaskExecutionCacheRequest::kIdFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - -EvictTaskExecutionCacheRequest::EvictTaskExecutionCacheRequest() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { - SharedCtor(); - // @@protoc_insertion_point(constructor:flyteidl.service.EvictTaskExecutionCacheRequest) -} -EvictTaskExecutionCacheRequest::EvictTaskExecutionCacheRequest(const EvictTaskExecutionCacheRequest& from) - : ::google::protobuf::Message(), - _internal_metadata_(nullptr) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_id()) { - id_ = new ::flyteidl::core::TaskExecutionIdentifier(*from.id_); - } else { - id_ = nullptr; - } - // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictTaskExecutionCacheRequest) -} - -void EvictTaskExecutionCacheRequest::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); - id_ = nullptr; -} - -EvictTaskExecutionCacheRequest::~EvictTaskExecutionCacheRequest() { - // @@protoc_insertion_point(destructor:flyteidl.service.EvictTaskExecutionCacheRequest) - SharedDtor(); -} - -void EvictTaskExecutionCacheRequest::SharedDtor() { - if (this != internal_default_instance()) delete id_; -} - -void EvictTaskExecutionCacheRequest::SetCachedSize(int size) const { - _cached_size_.Set(size); -} -const EvictTaskExecutionCacheRequest& EvictTaskExecutionCacheRequest::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); - return *internal_default_instance(); -} - - -void EvictTaskExecutionCacheRequest::Clear() { -// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictTaskExecutionCacheRequest) - ::google::protobuf::uint32 cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - if (GetArenaNoVirtual() == nullptr && id_ != nullptr) { - delete id_; - } - id_ = nullptr; - _internal_metadata_.Clear(); -} - -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* EvictTaskExecutionCacheRequest::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - switch (tag >> 3) { - // .flyteidl.core.TaskExecutionIdentifier id = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::TaskExecutionIdentifier::_InternalParse; - object = msg->mutable_id(); + object = msg->mutable_task_execution_id(); if (size > end - ptr) goto len_delim_till_end; ptr += size; GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( @@ -596,21 +367,32 @@ const char* EvictTaskExecutionCacheRequest::_InternalParse(const char* begin, co {parser_till_end, object}, size); } #else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool EvictTaskExecutionCacheRequest::MergePartialFromCodedStream( +bool EvictCacheRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(parse_start:flyteidl.service.EvictCacheRequest) for (;;) { ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.core.TaskExecutionIdentifier id = 1; + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; case 1: { if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_id())); + input, mutable_workflow_execution_id())); + } else { + goto handle_unusual; + } + break; + } + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_task_execution_id())); } else { goto handle_unusual; } @@ -629,57 +411,70 @@ bool EvictTaskExecutionCacheRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(parse_success:flyteidl.service.EvictCacheRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictCacheRequest) return false; #undef DO_ } #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -void EvictTaskExecutionCacheRequest::SerializeWithCachedSizes( +void EvictCacheRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictCacheRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.TaskExecutionIdentifier id = 1; - if (this->has_id()) { + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + if (has_workflow_execution_id()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::id(this), output); + 1, HasBitSetters::workflow_execution_id(this), output); + } + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + if (has_task_execution_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, HasBitSetters::task_execution_id(this), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictCacheRequest) } -::google::protobuf::uint8* EvictTaskExecutionCacheRequest::InternalSerializeWithCachedSizesToArray( +::google::protobuf::uint8* EvictCacheRequest::InternalSerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictCacheRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.TaskExecutionIdentifier id = 1; - if (this->has_id()) { + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + if (has_workflow_execution_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::workflow_execution_id(this), target); + } + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + if (has_task_execution_id()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, HasBitSetters::id(this), target); + 2, HasBitSetters::task_execution_id(this), target); } if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictCacheRequest) return target; } -size_t EvictTaskExecutionCacheRequest::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictTaskExecutionCacheRequest) +size_t EvictCacheRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictCacheRequest) size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { @@ -691,74 +486,97 @@ size_t EvictTaskExecutionCacheRequest::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // .flyteidl.core.TaskExecutionIdentifier id = 1; - if (this->has_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *id_); + switch (id_case()) { + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + case kWorkflowExecutionId: { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *id_.workflow_execution_id_); + break; + } + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + case kTaskExecutionId: { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *id_.task_execution_id_); + break; + } + case ID_NOT_SET: { + break; + } } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void EvictTaskExecutionCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) +void EvictCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictCacheRequest) GOOGLE_DCHECK_NE(&from, this); - const EvictTaskExecutionCacheRequest* source = - ::google::protobuf::DynamicCastToGenerated( + const EvictCacheRequest* source = + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictCacheRequest) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictCacheRequest) MergeFrom(*source); } } -void EvictTaskExecutionCacheRequest::MergeFrom(const EvictTaskExecutionCacheRequest& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) +void EvictCacheRequest::MergeFrom(const EvictCacheRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictCacheRequest) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - if (from.has_id()) { - mutable_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.id()); + switch (from.id_case()) { + case kWorkflowExecutionId: { + mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id()); + break; + } + case kTaskExecutionId: { + mutable_task_execution_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_execution_id()); + break; + } + case ID_NOT_SET: { + break; + } } } -void EvictTaskExecutionCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) +void EvictCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictCacheRequest) if (&from == this) return; Clear(); MergeFrom(from); } -void EvictTaskExecutionCacheRequest::CopyFrom(const EvictTaskExecutionCacheRequest& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) +void EvictCacheRequest::CopyFrom(const EvictCacheRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictCacheRequest) if (&from == this) return; Clear(); MergeFrom(from); } -bool EvictTaskExecutionCacheRequest::IsInitialized() const { +bool EvictCacheRequest::IsInitialized() const { return true; } -void EvictTaskExecutionCacheRequest::Swap(EvictTaskExecutionCacheRequest* other) { +void EvictCacheRequest::Swap(EvictCacheRequest* other) { if (other == this) return; InternalSwap(other); } -void EvictTaskExecutionCacheRequest::InternalSwap(EvictTaskExecutionCacheRequest* other) { +void EvictCacheRequest::InternalSwap(EvictCacheRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); swap(id_, other->id_); + swap(_oneof_case_[0], other->_oneof_case_[0]); } -::google::protobuf::Metadata EvictTaskExecutionCacheRequest::GetMetadata() const { +::google::protobuf::Metadata EvictCacheRequest::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto); return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages]; } @@ -1062,11 +880,8 @@ ::google::protobuf::Metadata EvictCacheResponse::GetMetadata() const { } // namespace flyteidl namespace google { namespace protobuf { -template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictExecutionCacheRequest >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::service::EvictExecutionCacheRequest >(arena); -} -template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictTaskExecutionCacheRequest >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::service::EvictTaskExecutionCacheRequest >(arena); +template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictCacheRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::service::EvictCacheRequest >(arena); } template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictCacheResponse* Arena::CreateMaybeMessage< ::flyteidl::service::EvictCacheResponse >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::service::EvictCacheResponse >(arena); diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h index 49169c4a63..61100b3b4d 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h @@ -44,7 +44,7 @@ struct TableStruct_flyteidl_2fservice_2fcache_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[3] + static const ::google::protobuf::internal::ParseTable schema[2] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -53,22 +53,18 @@ struct TableStruct_flyteidl_2fservice_2fcache_2eproto { void AddDescriptors_flyteidl_2fservice_2fcache_2eproto(); namespace flyteidl { namespace service { +class EvictCacheRequest; +class EvictCacheRequestDefaultTypeInternal; +extern EvictCacheRequestDefaultTypeInternal _EvictCacheRequest_default_instance_; class EvictCacheResponse; class EvictCacheResponseDefaultTypeInternal; extern EvictCacheResponseDefaultTypeInternal _EvictCacheResponse_default_instance_; -class EvictExecutionCacheRequest; -class EvictExecutionCacheRequestDefaultTypeInternal; -extern EvictExecutionCacheRequestDefaultTypeInternal _EvictExecutionCacheRequest_default_instance_; -class EvictTaskExecutionCacheRequest; -class EvictTaskExecutionCacheRequestDefaultTypeInternal; -extern EvictTaskExecutionCacheRequestDefaultTypeInternal _EvictTaskExecutionCacheRequest_default_instance_; } // namespace service } // namespace flyteidl namespace google { namespace protobuf { +template<> ::flyteidl::service::EvictCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictCacheRequest>(Arena*); template<> ::flyteidl::service::EvictCacheResponse* Arena::CreateMaybeMessage<::flyteidl::service::EvictCacheResponse>(Arena*); -template<> ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictExecutionCacheRequest>(Arena*); -template<> ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictTaskExecutionCacheRequest>(Arena*); } // namespace protobuf } // namespace google namespace flyteidl { @@ -76,25 +72,25 @@ namespace service { // =================================================================== -class EvictExecutionCacheRequest final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictExecutionCacheRequest) */ { +class EvictCacheRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictCacheRequest) */ { public: - EvictExecutionCacheRequest(); - virtual ~EvictExecutionCacheRequest(); + EvictCacheRequest(); + virtual ~EvictCacheRequest(); - EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from); + EvictCacheRequest(const EvictCacheRequest& from); - inline EvictExecutionCacheRequest& operator=(const EvictExecutionCacheRequest& from) { + inline EvictCacheRequest& operator=(const EvictCacheRequest& from) { CopyFrom(from); return *this; } #if LANG_CXX11 - EvictExecutionCacheRequest(EvictExecutionCacheRequest&& from) noexcept - : EvictExecutionCacheRequest() { + EvictCacheRequest(EvictCacheRequest&& from) noexcept + : EvictCacheRequest() { *this = ::std::move(from); } - inline EvictExecutionCacheRequest& operator=(EvictExecutionCacheRequest&& from) noexcept { + inline EvictCacheRequest& operator=(EvictCacheRequest&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); } else { @@ -106,34 +102,40 @@ class EvictExecutionCacheRequest final : static const ::google::protobuf::Descriptor* descriptor() { return default_instance().GetDescriptor(); } - static const EvictExecutionCacheRequest& default_instance(); + static const EvictCacheRequest& default_instance(); + + enum IdCase { + kWorkflowExecutionId = 1, + kTaskExecutionId = 2, + ID_NOT_SET = 0, + }; static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY - static inline const EvictExecutionCacheRequest* internal_default_instance() { - return reinterpret_cast( - &_EvictExecutionCacheRequest_default_instance_); + static inline const EvictCacheRequest* internal_default_instance() { + return reinterpret_cast( + &_EvictCacheRequest_default_instance_); } static constexpr int kIndexInFileMessages = 0; - void Swap(EvictExecutionCacheRequest* other); - friend void swap(EvictExecutionCacheRequest& a, EvictExecutionCacheRequest& b) { + void Swap(EvictCacheRequest* other); + friend void swap(EvictCacheRequest& a, EvictCacheRequest& b) { a.Swap(&b); } // implements Message ---------------------------------------------- - inline EvictExecutionCacheRequest* New() const final { - return CreateMaybeMessage(nullptr); + inline EvictCacheRequest* New() const final { + return CreateMaybeMessage(nullptr); } - EvictExecutionCacheRequest* New(::google::protobuf::Arena* arena) const final { - return CreateMaybeMessage(arena); + EvictCacheRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); } void CopyFrom(const ::google::protobuf::Message& from) final; void MergeFrom(const ::google::protobuf::Message& from) final; - void CopyFrom(const EvictExecutionCacheRequest& from); - void MergeFrom(const EvictExecutionCacheRequest& from); + void CopyFrom(const EvictCacheRequest& from); + void MergeFrom(const EvictCacheRequest& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -155,7 +157,7 @@ class EvictExecutionCacheRequest final : void SharedCtor(); void SharedDtor(); void SetCachedSize(int size) const final; - void InternalSwap(EvictExecutionCacheRequest* other); + void InternalSwap(EvictCacheRequest* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; @@ -171,137 +173,44 @@ class EvictExecutionCacheRequest final : // accessors ------------------------------------------------------- - // .flyteidl.core.WorkflowExecutionIdentifier id = 1; - bool has_id() const; - void clear_id(); - static const int kIdFieldNumber = 1; - const ::flyteidl::core::WorkflowExecutionIdentifier& id() const; - ::flyteidl::core::WorkflowExecutionIdentifier* release_id(); - ::flyteidl::core::WorkflowExecutionIdentifier* mutable_id(); - void set_allocated_id(::flyteidl::core::WorkflowExecutionIdentifier* id); - - // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest) - private: - class HasBitSetters; - - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::flyteidl::core::WorkflowExecutionIdentifier* id_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto; -}; -// ------------------------------------------------------------------- - -class EvictTaskExecutionCacheRequest final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictTaskExecutionCacheRequest) */ { - public: - EvictTaskExecutionCacheRequest(); - virtual ~EvictTaskExecutionCacheRequest(); - - EvictTaskExecutionCacheRequest(const EvictTaskExecutionCacheRequest& from); - - inline EvictTaskExecutionCacheRequest& operator=(const EvictTaskExecutionCacheRequest& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 - EvictTaskExecutionCacheRequest(EvictTaskExecutionCacheRequest&& from) noexcept - : EvictTaskExecutionCacheRequest() { - *this = ::std::move(from); - } - - inline EvictTaskExecutionCacheRequest& operator=(EvictTaskExecutionCacheRequest&& from) noexcept { - if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { - if (this != &from) InternalSwap(&from); - } else { - CopyFrom(from); - } - return *this; - } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); - } - static const EvictTaskExecutionCacheRequest& default_instance(); - - static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY - static inline const EvictTaskExecutionCacheRequest* internal_default_instance() { - return reinterpret_cast( - &_EvictTaskExecutionCacheRequest_default_instance_); - } - static constexpr int kIndexInFileMessages = - 1; - - void Swap(EvictTaskExecutionCacheRequest* other); - friend void swap(EvictTaskExecutionCacheRequest& a, EvictTaskExecutionCacheRequest& b) { - a.Swap(&b); - } - - // implements Message ---------------------------------------------- - - inline EvictTaskExecutionCacheRequest* New() const final { - return CreateMaybeMessage(nullptr); - } - - EvictTaskExecutionCacheRequest* New(::google::protobuf::Arena* arena) const final { - return CreateMaybeMessage(arena); - } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; - void CopyFrom(const EvictTaskExecutionCacheRequest& from); - void MergeFrom(const EvictTaskExecutionCacheRequest& from); - PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; - bool IsInitialized() const final; - - size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; - int GetCachedSize() const final { return _cached_size_.Get(); } - - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const final; - void InternalSwap(EvictTaskExecutionCacheRequest* other); - private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return nullptr; - } - inline void* MaybeArenaPtr() const { - return nullptr; - } - public: - - ::google::protobuf::Metadata GetMetadata() const final; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + bool has_workflow_execution_id() const; + void clear_workflow_execution_id(); + static const int kWorkflowExecutionIdFieldNumber = 1; + const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id() const; + ::flyteidl::core::WorkflowExecutionIdentifier* release_workflow_execution_id(); + ::flyteidl::core::WorkflowExecutionIdentifier* mutable_workflow_execution_id(); + void set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id); + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + bool has_task_execution_id() const; + void clear_task_execution_id(); + static const int kTaskExecutionIdFieldNumber = 2; + const ::flyteidl::core::TaskExecutionIdentifier& task_execution_id() const; + ::flyteidl::core::TaskExecutionIdentifier* release_task_execution_id(); + ::flyteidl::core::TaskExecutionIdentifier* mutable_task_execution_id(); + void set_allocated_task_execution_id(::flyteidl::core::TaskExecutionIdentifier* task_execution_id); - // .flyteidl.core.TaskExecutionIdentifier id = 1; - bool has_id() const; void clear_id(); - static const int kIdFieldNumber = 1; - const ::flyteidl::core::TaskExecutionIdentifier& id() const; - ::flyteidl::core::TaskExecutionIdentifier* release_id(); - ::flyteidl::core::TaskExecutionIdentifier* mutable_id(); - void set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id); - - // @@protoc_insertion_point(class_scope:flyteidl.service.EvictTaskExecutionCacheRequest) + IdCase id_case() const; + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictCacheRequest) private: class HasBitSetters; + void set_has_workflow_execution_id(); + void set_has_task_execution_id(); + + inline bool has_id() const; + inline void clear_has_id(); ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::flyteidl::core::TaskExecutionIdentifier* id_; + union IdUnion { + IdUnion() {} + ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_; + ::flyteidl::core::TaskExecutionIdentifier* task_execution_id_; + } id_; mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::google::protobuf::uint32 _oneof_case_[1]; + friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto; }; // ------------------------------------------------------------------- @@ -344,7 +253,7 @@ class EvictCacheResponse final : &_EvictCacheResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 2; + 1; void Swap(EvictCacheResponse* other); friend void swap(EvictCacheResponse& a, EvictCacheResponse& b) { @@ -428,102 +337,87 @@ class EvictCacheResponse final : #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif // __GNUC__ -// EvictExecutionCacheRequest +// EvictCacheRequest -// .flyteidl.core.WorkflowExecutionIdentifier id = 1; -inline bool EvictExecutionCacheRequest::has_id() const { - return this != internal_default_instance() && id_ != nullptr; +// .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; +inline bool EvictCacheRequest::has_workflow_execution_id() const { + return id_case() == kWorkflowExecutionId; } -inline const ::flyteidl::core::WorkflowExecutionIdentifier& EvictExecutionCacheRequest::id() const { - const ::flyteidl::core::WorkflowExecutionIdentifier* p = id_; - // @@protoc_insertion_point(field_get:flyteidl.service.EvictExecutionCacheRequest.id) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_WorkflowExecutionIdentifier_default_instance_); +inline void EvictCacheRequest::set_has_workflow_execution_id() { + _oneof_case_[0] = kWorkflowExecutionId; } -inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::release_id() { - // @@protoc_insertion_point(field_release:flyteidl.service.EvictExecutionCacheRequest.id) - - ::flyteidl::core::WorkflowExecutionIdentifier* temp = id_; - id_ = nullptr; - return temp; -} -inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::mutable_id() { - - if (id_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::WorkflowExecutionIdentifier>(GetArenaNoVirtual()); - id_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictExecutionCacheRequest.id) - return id_; -} -inline void EvictExecutionCacheRequest::set_allocated_id(::flyteidl::core::WorkflowExecutionIdentifier* id) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(id_); - } - if (id) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - id = ::google::protobuf::internal::GetOwnedMessage( - message_arena, id, submessage_arena); - } - +inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictCacheRequest::release_workflow_execution_id() { + // @@protoc_insertion_point(field_release:flyteidl.service.EvictCacheRequest.workflow_execution_id) + if (has_workflow_execution_id()) { + clear_has_id(); + ::flyteidl::core::WorkflowExecutionIdentifier* temp = id_.workflow_execution_id_; + id_.workflow_execution_id_ = nullptr; + return temp; } else { - + return nullptr; } - id_ = id; - // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictExecutionCacheRequest.id) } - -// ------------------------------------------------------------------- - -// EvictTaskExecutionCacheRequest - -// .flyteidl.core.TaskExecutionIdentifier id = 1; -inline bool EvictTaskExecutionCacheRequest::has_id() const { - return this != internal_default_instance() && id_ != nullptr; +inline const ::flyteidl::core::WorkflowExecutionIdentifier& EvictCacheRequest::workflow_execution_id() const { + // @@protoc_insertion_point(field_get:flyteidl.service.EvictCacheRequest.workflow_execution_id) + return has_workflow_execution_id() + ? *id_.workflow_execution_id_ + : *reinterpret_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>(&::flyteidl::core::_WorkflowExecutionIdentifier_default_instance_); } -inline const ::flyteidl::core::TaskExecutionIdentifier& EvictTaskExecutionCacheRequest::id() const { - const ::flyteidl::core::TaskExecutionIdentifier* p = id_; - // @@protoc_insertion_point(field_get:flyteidl.service.EvictTaskExecutionCacheRequest.id) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_TaskExecutionIdentifier_default_instance_); +inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictCacheRequest::mutable_workflow_execution_id() { + if (!has_workflow_execution_id()) { + clear_id(); + set_has_workflow_execution_id(); + id_.workflow_execution_id_ = CreateMaybeMessage< ::flyteidl::core::WorkflowExecutionIdentifier >( + GetArenaNoVirtual()); + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictCacheRequest.workflow_execution_id) + return id_.workflow_execution_id_; } -inline ::flyteidl::core::TaskExecutionIdentifier* EvictTaskExecutionCacheRequest::release_id() { - // @@protoc_insertion_point(field_release:flyteidl.service.EvictTaskExecutionCacheRequest.id) - - ::flyteidl::core::TaskExecutionIdentifier* temp = id_; - id_ = nullptr; - return temp; + +// .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; +inline bool EvictCacheRequest::has_task_execution_id() const { + return id_case() == kTaskExecutionId; } -inline ::flyteidl::core::TaskExecutionIdentifier* EvictTaskExecutionCacheRequest::mutable_id() { - - if (id_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::TaskExecutionIdentifier>(GetArenaNoVirtual()); - id_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictTaskExecutionCacheRequest.id) - return id_; +inline void EvictCacheRequest::set_has_task_execution_id() { + _oneof_case_[0] = kTaskExecutionId; } -inline void EvictTaskExecutionCacheRequest::set_allocated_id(::flyteidl::core::TaskExecutionIdentifier* id) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(id_); - } - if (id) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - id = ::google::protobuf::internal::GetOwnedMessage( - message_arena, id, submessage_arena); - } - +inline ::flyteidl::core::TaskExecutionIdentifier* EvictCacheRequest::release_task_execution_id() { + // @@protoc_insertion_point(field_release:flyteidl.service.EvictCacheRequest.task_execution_id) + if (has_task_execution_id()) { + clear_has_id(); + ::flyteidl::core::TaskExecutionIdentifier* temp = id_.task_execution_id_; + id_.task_execution_id_ = nullptr; + return temp; } else { - + return nullptr; } - id_ = id; - // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictTaskExecutionCacheRequest.id) +} +inline const ::flyteidl::core::TaskExecutionIdentifier& EvictCacheRequest::task_execution_id() const { + // @@protoc_insertion_point(field_get:flyteidl.service.EvictCacheRequest.task_execution_id) + return has_task_execution_id() + ? *id_.task_execution_id_ + : *reinterpret_cast< ::flyteidl::core::TaskExecutionIdentifier*>(&::flyteidl::core::_TaskExecutionIdentifier_default_instance_); +} +inline ::flyteidl::core::TaskExecutionIdentifier* EvictCacheRequest::mutable_task_execution_id() { + if (!has_task_execution_id()) { + clear_id(); + set_has_task_execution_id(); + id_.task_execution_id_ = CreateMaybeMessage< ::flyteidl::core::TaskExecutionIdentifier >( + GetArenaNoVirtual()); + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictCacheRequest.task_execution_id) + return id_.task_execution_id_; } +inline bool EvictCacheRequest::has_id() const { + return id_case() != ID_NOT_SET; +} +inline void EvictCacheRequest::clear_has_id() { + _oneof_case_[0] = ID_NOT_SET; +} +inline EvictCacheRequest::IdCase EvictCacheRequest::id_case() const { + return EvictCacheRequest::IdCase(_oneof_case_[0]); +} // ------------------------------------------------------------------- // EvictCacheResponse @@ -578,8 +472,6 @@ inline void EvictCacheResponse::set_allocated_errors(::flyteidl::core::CacheEvic #endif // __GNUC__ // ------------------------------------------------------------------- -// ------------------------------------------------------------------- - // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go index d458db4407..4cf6347dbe 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go @@ -26,86 +26,88 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type EvictExecutionCacheRequest struct { - // Identifier of execution to evict cache for. - Id *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *EvictExecutionCacheRequest) Reset() { *m = EvictExecutionCacheRequest{} } -func (m *EvictExecutionCacheRequest) String() string { return proto.CompactTextString(m) } -func (*EvictExecutionCacheRequest) ProtoMessage() {} -func (*EvictExecutionCacheRequest) Descriptor() ([]byte, []int) { +type EvictCacheRequest struct { + // Identifier of resource cached data should be evicted for. + // + // Types that are valid to be assigned to Id: + // *EvictCacheRequest_WorkflowExecutionId + // *EvictCacheRequest_TaskExecutionId + Id isEvictCacheRequest_Id `protobuf_oneof:"id"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *EvictCacheRequest) Reset() { *m = EvictCacheRequest{} } +func (m *EvictCacheRequest) String() string { return proto.CompactTextString(m) } +func (*EvictCacheRequest) ProtoMessage() {} +func (*EvictCacheRequest) Descriptor() ([]byte, []int) { return fileDescriptor_c5ff5da69b96fa44, []int{0} } -func (m *EvictExecutionCacheRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EvictExecutionCacheRequest.Unmarshal(m, b) +func (m *EvictCacheRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EvictCacheRequest.Unmarshal(m, b) } -func (m *EvictExecutionCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EvictExecutionCacheRequest.Marshal(b, m, deterministic) +func (m *EvictCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EvictCacheRequest.Marshal(b, m, deterministic) } -func (m *EvictExecutionCacheRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvictExecutionCacheRequest.Merge(m, src) +func (m *EvictCacheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvictCacheRequest.Merge(m, src) } -func (m *EvictExecutionCacheRequest) XXX_Size() int { - return xxx_messageInfo_EvictExecutionCacheRequest.Size(m) +func (m *EvictCacheRequest) XXX_Size() int { + return xxx_messageInfo_EvictCacheRequest.Size(m) } -func (m *EvictExecutionCacheRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EvictExecutionCacheRequest.DiscardUnknown(m) +func (m *EvictCacheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_EvictCacheRequest.DiscardUnknown(m) } -var xxx_messageInfo_EvictExecutionCacheRequest proto.InternalMessageInfo +var xxx_messageInfo_EvictCacheRequest proto.InternalMessageInfo -func (m *EvictExecutionCacheRequest) GetId() *core.WorkflowExecutionIdentifier { - if m != nil { - return m.Id - } - return nil +type isEvictCacheRequest_Id interface { + isEvictCacheRequest_Id() } -type EvictTaskExecutionCacheRequest struct { - // Identifier of task execution to evict cache for. - Id *core.TaskExecutionIdentifier `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type EvictCacheRequest_WorkflowExecutionId struct { + WorkflowExecutionId *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=workflow_execution_id,json=workflowExecutionId,proto3,oneof"` } -func (m *EvictTaskExecutionCacheRequest) Reset() { *m = EvictTaskExecutionCacheRequest{} } -func (m *EvictTaskExecutionCacheRequest) String() string { return proto.CompactTextString(m) } -func (*EvictTaskExecutionCacheRequest) ProtoMessage() {} -func (*EvictTaskExecutionCacheRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c5ff5da69b96fa44, []int{1} +type EvictCacheRequest_TaskExecutionId struct { + TaskExecutionId *core.TaskExecutionIdentifier `protobuf:"bytes,2,opt,name=task_execution_id,json=taskExecutionId,proto3,oneof"` } -func (m *EvictTaskExecutionCacheRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EvictTaskExecutionCacheRequest.Unmarshal(m, b) -} -func (m *EvictTaskExecutionCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EvictTaskExecutionCacheRequest.Marshal(b, m, deterministic) -} -func (m *EvictTaskExecutionCacheRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvictTaskExecutionCacheRequest.Merge(m, src) -} -func (m *EvictTaskExecutionCacheRequest) XXX_Size() int { - return xxx_messageInfo_EvictTaskExecutionCacheRequest.Size(m) -} -func (m *EvictTaskExecutionCacheRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EvictTaskExecutionCacheRequest.DiscardUnknown(m) -} +func (*EvictCacheRequest_WorkflowExecutionId) isEvictCacheRequest_Id() {} -var xxx_messageInfo_EvictTaskExecutionCacheRequest proto.InternalMessageInfo +func (*EvictCacheRequest_TaskExecutionId) isEvictCacheRequest_Id() {} -func (m *EvictTaskExecutionCacheRequest) GetId() *core.TaskExecutionIdentifier { +func (m *EvictCacheRequest) GetId() isEvictCacheRequest_Id { if m != nil { return m.Id } return nil } +func (m *EvictCacheRequest) GetWorkflowExecutionId() *core.WorkflowExecutionIdentifier { + if x, ok := m.GetId().(*EvictCacheRequest_WorkflowExecutionId); ok { + return x.WorkflowExecutionId + } + return nil +} + +func (m *EvictCacheRequest) GetTaskExecutionId() *core.TaskExecutionIdentifier { + if x, ok := m.GetId().(*EvictCacheRequest_TaskExecutionId); ok { + return x.TaskExecutionId + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*EvictCacheRequest) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*EvictCacheRequest_WorkflowExecutionId)(nil), + (*EvictCacheRequest_TaskExecutionId)(nil), + } +} + type EvictCacheResponse struct { // List of errors encountered during cache eviction (if any). Errors *core.CacheEvictionErrorList `protobuf:"bytes,1,opt,name=errors,proto3" json:"errors,omitempty"` @@ -118,7 +120,7 @@ func (m *EvictCacheResponse) Reset() { *m = EvictCacheResponse{} } func (m *EvictCacheResponse) String() string { return proto.CompactTextString(m) } func (*EvictCacheResponse) ProtoMessage() {} func (*EvictCacheResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c5ff5da69b96fa44, []int{2} + return fileDescriptor_c5ff5da69b96fa44, []int{1} } func (m *EvictCacheResponse) XXX_Unmarshal(b []byte) error { @@ -147,44 +149,45 @@ func (m *EvictCacheResponse) GetErrors() *core.CacheEvictionErrorList { } func init() { - proto.RegisterType((*EvictExecutionCacheRequest)(nil), "flyteidl.service.EvictExecutionCacheRequest") - proto.RegisterType((*EvictTaskExecutionCacheRequest)(nil), "flyteidl.service.EvictTaskExecutionCacheRequest") + proto.RegisterType((*EvictCacheRequest)(nil), "flyteidl.service.EvictCacheRequest") proto.RegisterType((*EvictCacheResponse)(nil), "flyteidl.service.EvictCacheResponse") } func init() { proto.RegisterFile("flyteidl/service/cache.proto", fileDescriptor_c5ff5da69b96fa44) } var fileDescriptor_c5ff5da69b96fa44 = []byte{ - // 462 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcf, 0x8a, 0x13, 0x41, - 0x10, 0xc6, 0xc9, 0x28, 0x7b, 0x68, 0x3d, 0xc8, 0x78, 0x50, 0x86, 0x65, 0x91, 0xa0, 0x22, 0x41, - 0xbb, 0x75, 0x05, 0xc5, 0x15, 0x41, 0x94, 0x08, 0x82, 0xa7, 0xac, 0xe0, 0xe2, 0x25, 0x74, 0xba, - 0x2b, 0xb3, 0x65, 0x92, 0xae, 0xb1, 0xbb, 0x33, 0xba, 0xc8, 0x5e, 0x7c, 0x05, 0x1f, 0x40, 0x2f, - 0xde, 0xbc, 0xf8, 0x2c, 0xbe, 0x82, 0xbe, 0x87, 0x4c, 0xcf, 0x9f, 0xdd, 0x19, 0x32, 0xba, 0xb7, - 0x74, 0xd5, 0x57, 0xbf, 0x7c, 0xfd, 0x55, 0x3a, 0x6c, 0x7b, 0xbe, 0x3c, 0xf2, 0x80, 0x7a, 0x29, - 0x1c, 0xd8, 0x1c, 0x15, 0x08, 0x25, 0xd5, 0x21, 0xf0, 0xcc, 0x92, 0xa7, 0xf8, 0x52, 0xdd, 0xe5, - 0x55, 0x37, 0xd9, 0x4e, 0x89, 0xd2, 0x25, 0x08, 0x99, 0xa1, 0x90, 0xc6, 0x90, 0x97, 0x1e, 0xc9, - 0xb8, 0x52, 0x9f, 0x24, 0x0d, 0x4d, 0x91, 0x05, 0x01, 0xd6, 0x92, 0xad, 0x7b, 0x3b, 0xed, 0x1e, - 0x6a, 0x30, 0x1e, 0xe7, 0x08, 0xb6, 0xec, 0x0f, 0x0f, 0x58, 0x32, 0xce, 0x51, 0xf9, 0xf1, 0x47, - 0x50, 0xeb, 0x02, 0xfa, 0xbc, 0x30, 0x32, 0x81, 0xf7, 0x6b, 0x70, 0x3e, 0xde, 0x63, 0x11, 0xea, - 0xab, 0x83, 0x6b, 0x83, 0x5b, 0x17, 0x76, 0x47, 0xbc, 0xb1, 0x55, 0xa0, 0xf8, 0x1b, 0xb2, 0x8b, - 0xf9, 0x92, 0x3e, 0x34, 0x93, 0x2f, 0x1b, 0xf6, 0x24, 0x42, 0x3d, 0x3c, 0x60, 0x3b, 0x81, 0xfc, - 0x5a, 0xba, 0xc5, 0x66, 0xfa, 0x83, 0x53, 0xf4, 0x9b, 0x1d, 0x7a, 0x6b, 0xaa, 0x43, 0xde, 0x67, - 0x71, 0x20, 0x57, 0x30, 0x97, 0x91, 0x71, 0x10, 0x3f, 0x61, 0x5b, 0xe5, 0xcd, 0x2b, 0xe2, 0x8d, - 0x0e, 0x31, 0xa8, 0xc3, 0x1c, 0x92, 0x19, 0x17, 0xca, 0x57, 0xe8, 0xfc, 0xa4, 0x1a, 0xda, 0xfd, - 0x73, 0x9e, 0x5d, 0x0c, 0x92, 0xfd, 0x32, 0xf3, 0xf8, 0xe7, 0x80, 0x5d, 0xde, 0x10, 0x4d, 0x7c, - 0x9b, 0x77, 0xd7, 0xc3, 0xfb, 0x13, 0x4c, 0xae, 0xf7, 0xa8, 0x5b, 0xde, 0x87, 0x2f, 0x3e, 0xff, - 0xfa, 0xfd, 0x25, 0x7a, 0x3a, 0x7a, 0x1c, 0x36, 0x9c, 0xdf, 0x2b, 0x7f, 0x0e, 0x02, 0x6a, 0xa4, - 0x13, 0x9f, 0x50, 0x17, 0x1b, 0x7b, 0x07, 0xca, 0x1f, 0x87, 0x83, 0xa6, 0x95, 0x44, 0x53, 0x7e, - 0x36, 0x72, 0x05, 0xc7, 0x7b, 0x83, 0x51, 0xfc, 0xed, 0x1c, 0xbb, 0xd2, 0x13, 0x7a, 0x7c, 0xb7, - 0xc7, 0x49, 0xef, 0x7e, 0xce, 0xe8, 0xfd, 0x47, 0x14, 0xcc, 0x7f, 0x8f, 0x46, 0x5f, 0xa3, 0xb6, - 0x7d, 0x2f, 0xdd, 0x62, 0xda, 0xb9, 0x83, 0x21, 0x0d, 0x27, 0xb5, 0x29, 0x6a, 0xde, 0x3a, 0xb4, - 0xae, 0xf8, 0x1f, 0x6d, 0x2b, 0x81, 0x7f, 0x4b, 0x43, 0x40, 0x3d, 0xc2, 0x50, 0x41, 0x5d, 0xb6, - 0x83, 0xe5, 0xae, 0x8f, 0xba, 0x78, 0xfa, 0x0b, 0xeb, 0xda, 0x09, 0xb9, 0xae, 0xe4, 0x60, 0x1d, - 0x52, 0x25, 0xb3, 0xe0, 0xed, 0xd1, 0x54, 0x7a, 0x0f, 0xab, 0xcc, 0x17, 0x2b, 0x7a, 0xf6, 0xe8, - 0xed, 0xc3, 0x14, 0xfd, 0xe1, 0x7a, 0xc6, 0x15, 0xad, 0x44, 0x08, 0x98, 0x6c, 0x2a, 0x9a, 0x67, - 0x9a, 0x82, 0x11, 0xd9, 0xec, 0x4e, 0x4a, 0xa2, 0xfb, 0x1f, 0x31, 0xdb, 0x0a, 0x4f, 0xf6, 0xfe, - 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0x10, 0x51, 0x12, 0x3e, 0x04, 0x00, 0x00, + // 481 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x8a, 0x13, 0x41, + 0x10, 0x76, 0x92, 0x25, 0x87, 0x56, 0xd0, 0x9d, 0x45, 0x94, 0xb0, 0x88, 0xc4, 0x1f, 0x24, 0xe0, + 0x34, 0xae, 0x07, 0x51, 0xf0, 0xb2, 0x12, 0x50, 0xf0, 0x94, 0x5d, 0x10, 0xbc, 0xc4, 0x4e, 0x4f, + 0x65, 0xb6, 0x4c, 0xd2, 0x35, 0x76, 0x57, 0x12, 0xc3, 0xb2, 0x08, 0xbe, 0x80, 0x07, 0x6f, 0x3e, + 0x80, 0x27, 0x6f, 0x3e, 0x89, 0xf8, 0x04, 0x82, 0x0f, 0x22, 0xd3, 0x93, 0x19, 0x9c, 0xfc, 0xac, + 0x2e, 0xec, 0xb5, 0xbf, 0xaf, 0xbe, 0xfe, 0xaa, 0xbe, 0xa2, 0xc4, 0xee, 0x60, 0x34, 0x67, 0xc0, + 0x78, 0x24, 0x1d, 0xd8, 0x29, 0x6a, 0x90, 0x5a, 0xe9, 0x23, 0x88, 0x52, 0x4b, 0x4c, 0xe1, 0x95, + 0x02, 0x8d, 0x16, 0x68, 0x73, 0x37, 0x21, 0x4a, 0x46, 0x20, 0x55, 0x8a, 0x52, 0x19, 0x43, 0xac, + 0x18, 0xc9, 0xb8, 0x9c, 0xdf, 0x6c, 0x96, 0x6a, 0x9a, 0x2c, 0x48, 0xb0, 0x96, 0x6c, 0x81, 0xdd, + 0xa8, 0x62, 0x18, 0x83, 0x61, 0x1c, 0x20, 0xd8, 0x1c, 0x6f, 0xfd, 0x08, 0xc4, 0x76, 0x67, 0x8a, + 0x9a, 0x9f, 0x65, 0x06, 0xba, 0xf0, 0x6e, 0x02, 0x8e, 0xc3, 0x37, 0xe2, 0xea, 0x8c, 0xec, 0x70, + 0x30, 0xa2, 0x59, 0x0f, 0xde, 0x83, 0x9e, 0x64, 0xdf, 0xf5, 0x30, 0xbe, 0x1e, 0xdc, 0x0c, 0xee, + 0x5d, 0xdc, 0x6b, 0x47, 0xa5, 0xc3, 0x4c, 0x35, 0x7a, 0xb5, 0xe0, 0x76, 0x0a, 0xea, 0x8b, 0xf2, + 0x9b, 0xe7, 0x17, 0xba, 0x3b, 0xb3, 0x55, 0x38, 0x3c, 0x14, 0xdb, 0xac, 0xdc, 0xb0, 0xaa, 0x5e, + 0xf3, 0xea, 0x77, 0x97, 0xd4, 0x0f, 0x95, 0x1b, 0xae, 0x57, 0xbe, 0xcc, 0x55, 0x68, 0x7f, 0x4b, + 0xd4, 0x30, 0x6e, 0x1d, 0x88, 0xf0, 0xef, 0x96, 0x5c, 0x4a, 0xc6, 0x41, 0xf8, 0x54, 0x34, 0xf2, + 0xc9, 0x2c, 0x9a, 0xb8, 0xb3, 0xf4, 0x8d, 0x67, 0xfb, 0x3a, 0x24, 0xd3, 0xc9, 0x98, 0x2f, 0xd1, + 0x71, 0x77, 0x51, 0xb4, 0xf7, 0xa9, 0x21, 0x2e, 0x79, 0xca, 0x41, 0x9e, 0x49, 0xf8, 0x2b, 0x10, + 0x3b, 0x9e, 0x5e, 0x1a, 0xf0, 0x70, 0x78, 0x2b, 0x5a, 0x8e, 0x2f, 0x5a, 0x19, 0x70, 0xf3, 0xf6, + 0xe9, 0xa4, 0xdc, 0x72, 0xeb, 0xc3, 0xc7, 0x9f, 0xbf, 0x3f, 0xd7, 0xe6, 0x6d, 0xf6, 0xc1, 0x4f, + 0x1f, 0xe4, 0x5b, 0x22, 0xcb, 0x99, 0x39, 0x79, 0xbc, 0x36, 0xa6, 0x2c, 0xdb, 0xb7, 0xa0, 0xf9, + 0x64, 0x13, 0x1e, 0xd3, 0x58, 0xa1, 0xd9, 0x08, 0x1b, 0x35, 0x86, 0x93, 0x27, 0x41, 0x3b, 0xfc, + 0xb2, 0x25, 0xae, 0x79, 0x5f, 0x95, 0x0c, 0xce, 0xbd, 0xcf, 0xef, 0x75, 0xdf, 0xe8, 0xb7, 0x7a, + 0xfb, 0x6b, 0xbd, 0xda, 0x6a, 0x75, 0x47, 0x9c, 0x3c, 0x5e, 0x59, 0x9a, 0xc8, 0x50, 0x0c, 0xd5, + 0x97, 0x0d, 0xa3, 0x38, 0x73, 0x69, 0x39, 0xa5, 0x33, 0x57, 0xfa, 0x01, 0xfe, 0x5f, 0x9d, 0x7f, + 0xc1, 0x78, 0x2d, 0xdb, 0xbf, 0xfc, 0xa3, 0x87, 0x82, 0x73, 0x8a, 0xd9, 0x82, 0xb2, 0xd1, 0x55, + 0x41, 0x98, 0x82, 0x75, 0x48, 0xeb, 0x45, 0x2c, 0xb0, 0x9d, 0xf7, 0x14, 0x33, 0x8c, 0x53, 0xce, + 0x96, 0x63, 0xff, 0xf1, 0xeb, 0x47, 0x09, 0xf2, 0xd1, 0xa4, 0x1f, 0x69, 0x1a, 0x4b, 0x9f, 0x33, + 0xd9, 0x44, 0x96, 0x07, 0x27, 0x01, 0x23, 0xd3, 0xfe, 0xfd, 0x84, 0xe4, 0xf2, 0xb5, 0xeb, 0x37, + 0xfc, 0xf1, 0x79, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b, 0x44, 0x17, 0x08, 0x05, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -200,9 +203,9 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type CacheServiceClient interface { // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) + EvictExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) + EvictTaskExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) } type cacheServiceClient struct { @@ -213,7 +216,7 @@ func NewCacheServiceClient(cc *grpc.ClientConn) CacheServiceClient { return &cacheServiceClient{cc} } -func (c *cacheServiceClient) EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { +func (c *cacheServiceClient) EvictExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { out := new(EvictCacheResponse) err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictExecutionCache", in, out, opts...) if err != nil { @@ -222,7 +225,7 @@ func (c *cacheServiceClient) EvictExecutionCache(ctx context.Context, in *EvictE return out, nil } -func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { +func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { out := new(EvictCacheResponse) err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictTaskExecutionCache", in, out, opts...) if err != nil { @@ -234,19 +237,19 @@ func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *Ev // CacheServiceServer is the server API for CacheService service. type CacheServiceServer interface { // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - EvictExecutionCache(context.Context, *EvictExecutionCacheRequest) (*EvictCacheResponse, error) + EvictExecutionCache(context.Context, *EvictCacheRequest) (*EvictCacheResponse, error) // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - EvictTaskExecutionCache(context.Context, *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error) + EvictTaskExecutionCache(context.Context, *EvictCacheRequest) (*EvictCacheResponse, error) } // UnimplementedCacheServiceServer can be embedded to have forward compatible implementations. type UnimplementedCacheServiceServer struct { } -func (*UnimplementedCacheServiceServer) EvictExecutionCache(ctx context.Context, req *EvictExecutionCacheRequest) (*EvictCacheResponse, error) { +func (*UnimplementedCacheServiceServer) EvictExecutionCache(ctx context.Context, req *EvictCacheRequest) (*EvictCacheResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method EvictExecutionCache not implemented") } -func (*UnimplementedCacheServiceServer) EvictTaskExecutionCache(ctx context.Context, req *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error) { +func (*UnimplementedCacheServiceServer) EvictTaskExecutionCache(ctx context.Context, req *EvictCacheRequest) (*EvictCacheResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method EvictTaskExecutionCache not implemented") } @@ -255,7 +258,7 @@ func RegisterCacheServiceServer(s *grpc.Server, srv CacheServiceServer) { } func _CacheService_EvictExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(EvictExecutionCacheRequest) + in := new(EvictCacheRequest) if err := dec(in); err != nil { return nil, err } @@ -267,13 +270,13 @@ func _CacheService_EvictExecutionCache_Handler(srv interface{}, ctx context.Cont FullMethod: "/flyteidl.service.CacheService/EvictExecutionCache", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CacheServiceServer).EvictExecutionCache(ctx, req.(*EvictExecutionCacheRequest)) + return srv.(CacheServiceServer).EvictExecutionCache(ctx, req.(*EvictCacheRequest)) } return interceptor(ctx, in, info, handler) } func _CacheService_EvictTaskExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(EvictTaskExecutionCacheRequest) + in := new(EvictCacheRequest) if err := dec(in); err != nil { return nil, err } @@ -285,7 +288,7 @@ func _CacheService_EvictTaskExecutionCache_Handler(srv interface{}, ctx context. FullMethod: "/flyteidl.service.CacheService/EvictTaskExecutionCache", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, req.(*EvictTaskExecutionCacheRequest)) + return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, req.(*EvictCacheRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go index 4ec5ff90b9..1e2c77fe8a 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go @@ -29,7 +29,7 @@ var _ = runtime.String var _ = utilities.NewDoubleArray func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq EvictExecutionCacheRequest + var protoReq EvictCacheRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -47,37 +47,37 @@ func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler r _ = err ) - val, ok = pathParams["id.project"] + val, ok = pathParams["workflow_execution_id.project"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.project") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "workflow_execution_id.project") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.project", val) + err = runtime.PopulateFieldFromPath(&protoReq, "workflow_execution_id.project", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.project", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.project", err) } - val, ok = pathParams["id.domain"] + val, ok = pathParams["workflow_execution_id.domain"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.domain") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "workflow_execution_id.domain") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.domain", val) + err = runtime.PopulateFieldFromPath(&protoReq, "workflow_execution_id.domain", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.domain", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.domain", err) } - val, ok = pathParams["id.name"] + val, ok = pathParams["workflow_execution_id.name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.name") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "workflow_execution_id.name") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.name", val) + err = runtime.PopulateFieldFromPath(&protoReq, "workflow_execution_id.name", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.name", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.name", err) } msg, err := client.EvictExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -86,7 +86,7 @@ func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler r } func request_CacheService_EvictTaskExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq EvictTaskExecutionCacheRequest + var protoReq EvictCacheRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -104,103 +104,103 @@ func request_CacheService_EvictTaskExecutionCache_0(ctx context.Context, marshal _ = err ) - val, ok = pathParams["id.node_execution_id.execution_id.project"] + val, ok = pathParams["task_execution_id.node_execution_id.execution_id.project"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.project") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.node_execution_id.execution_id.project") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.project", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.node_execution_id.execution_id.project", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.project", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.node_execution_id.execution_id.project", err) } - val, ok = pathParams["id.node_execution_id.execution_id.domain"] + val, ok = pathParams["task_execution_id.node_execution_id.execution_id.domain"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.domain") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.node_execution_id.execution_id.domain") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.domain", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.node_execution_id.execution_id.domain", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.domain", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.node_execution_id.execution_id.domain", err) } - val, ok = pathParams["id.node_execution_id.execution_id.name"] + val, ok = pathParams["task_execution_id.node_execution_id.execution_id.name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.execution_id.name") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.node_execution_id.execution_id.name") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.execution_id.name", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.node_execution_id.execution_id.name", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.execution_id.name", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.node_execution_id.execution_id.name", err) } - val, ok = pathParams["id.node_execution_id.node_id"] + val, ok = pathParams["task_execution_id.node_execution_id.node_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.node_execution_id.node_id") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.node_execution_id.node_id") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.node_execution_id.node_id", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.node_execution_id.node_id", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.node_execution_id.node_id", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.node_execution_id.node_id", err) } - val, ok = pathParams["id.task_id.project"] + val, ok = pathParams["task_execution_id.task_id.project"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.project") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.task_id.project") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.project", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.task_id.project", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.project", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.task_id.project", err) } - val, ok = pathParams["id.task_id.domain"] + val, ok = pathParams["task_execution_id.task_id.domain"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.domain") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.task_id.domain") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.domain", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.task_id.domain", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.domain", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.task_id.domain", err) } - val, ok = pathParams["id.task_id.name"] + val, ok = pathParams["task_execution_id.task_id.name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.name") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.task_id.name") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.name", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.task_id.name", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.name", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.task_id.name", err) } - val, ok = pathParams["id.task_id.version"] + val, ok = pathParams["task_execution_id.task_id.version"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.task_id.version") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.task_id.version") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.task_id.version", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.task_id.version", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.task_id.version", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.task_id.version", err) } - val, ok = pathParams["id.retry_attempt"] + val, ok = pathParams["task_execution_id.retry_attempt"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id.retry_attempt") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "task_execution_id.retry_attempt") } - err = runtime.PopulateFieldFromPath(&protoReq, "id.retry_attempt", val) + err = runtime.PopulateFieldFromPath(&protoReq, "task_execution_id.retry_attempt", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id.retry_attempt", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.retry_attempt", err) } msg, err := client.EvictTaskExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -290,9 +290,9 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu } var ( - pattern_CacheService_EvictExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "id.project", "id.domain", "id.name"}, "")) + pattern_CacheService_EvictExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "workflow_execution_id.project", "workflow_execution_id.domain", "workflow_execution_id.name"}, "")) - pattern_CacheService_EvictTaskExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "id.node_execution_id.execution_id.project", "id.node_execution_id.execution_id.domain", "id.node_execution_id.execution_id.name", "id.node_execution_id.node_id", "id.task_id.project", "id.task_id.domain", "id.task_id.name", "id.task_id.version", "id.retry_attempt"}, "")) + pattern_CacheService_EvictTaskExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "task_execution_id.node_execution_id.execution_id.project", "task_execution_id.node_execution_id.execution_id.domain", "task_execution_id.node_execution_id.execution_id.name", "task_execution_id.node_execution_id.node_id", "task_execution_id.task_id.project", "task_execution_id.task_id.domain", "task_execution_id.task_id.name", "task_execution_id.task_id.version", "task_execution_id.retry_attempt"}, "")) ) var ( diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json index acd2849a20..684d2daef7 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json @@ -15,7 +15,7 @@ "application/json" ], "paths": { - "/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}": { + "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}": { "delete": { "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.", "operationId": "EvictExecutionCache", @@ -29,21 +29,21 @@ }, "parameters": [ { - "name": "id.project", + "name": "workflow_execution_id.project", "description": "Name of the project the resource belongs to.", "in": "path", "required": true, "type": "string" }, { - "name": "id.domain", + "name": "workflow_execution_id.domain", "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project.", "in": "path", "required": true, "type": "string" }, { - "name": "id.name", + "name": "workflow_execution_id.name", "description": "User or system provided value for the resource.", "in": "path", "required": true, @@ -54,7 +54,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/serviceEvictExecutionCacheRequest" + "$ref": "#/definitions/serviceEvictCacheRequest" } } ], @@ -63,7 +63,7 @@ ] } }, - "/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}": { + "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}": { "delete": { "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.", "operationId": "EvictTaskExecutionCache", @@ -77,62 +77,62 @@ }, "parameters": [ { - "name": "id.node_execution_id.execution_id.project", + "name": "task_execution_id.node_execution_id.execution_id.project", "description": "Name of the project the resource belongs to.", "in": "path", "required": true, "type": "string" }, { - "name": "id.node_execution_id.execution_id.domain", + "name": "task_execution_id.node_execution_id.execution_id.domain", "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project.", "in": "path", "required": true, "type": "string" }, { - "name": "id.node_execution_id.execution_id.name", + "name": "task_execution_id.node_execution_id.execution_id.name", "description": "User or system provided value for the resource.", "in": "path", "required": true, "type": "string" }, { - "name": "id.node_execution_id.node_id", + "name": "task_execution_id.node_execution_id.node_id", "in": "path", "required": true, "type": "string" }, { - "name": "id.task_id.project", + "name": "task_execution_id.task_id.project", "description": "Name of the project the resource belongs to.", "in": "path", "required": true, "type": "string" }, { - "name": "id.task_id.domain", + "name": "task_execution_id.task_id.domain", "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project.", "in": "path", "required": true, "type": "string" }, { - "name": "id.task_id.name", + "name": "task_execution_id.task_id.name", "description": "User provided value for the resource.", "in": "path", "required": true, "type": "string" }, { - "name": "id.task_id.version", + "name": "task_execution_id.task_id.version", "description": "Specific version of the resource.", "in": "path", "required": true, "type": "string" }, { - "name": "id.retry_attempt", + "name": "task_execution_id.retry_attempt", "in": "path", "required": true, "type": "integer", @@ -143,7 +143,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/serviceEvictTaskExecutionCacheRequest" + "$ref": "#/definitions/serviceEvictCacheRequest" } } ], @@ -283,30 +283,25 @@ }, "title": "Encapsulation of fields that uniquely identifies a Flyte workflow execution" }, - "serviceEvictCacheResponse": { - "type": "object", - "properties": { - "errors": { - "$ref": "#/definitions/coreCacheEvictionErrorList", - "description": "List of errors encountered during cache eviction (if any)." - } - } - }, - "serviceEvictExecutionCacheRequest": { + "serviceEvictCacheRequest": { "type": "object", "properties": { - "id": { + "workflow_execution_id": { "$ref": "#/definitions/coreWorkflowExecutionIdentifier", - "description": "Identifier of execution to evict cache for." + "description": "Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for." + }, + "task_execution_id": { + "$ref": "#/definitions/coreTaskExecutionIdentifier", + "description": "Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for." } } }, - "serviceEvictTaskExecutionCacheRequest": { + "serviceEvictCacheResponse": { "type": "object", "properties": { - "id": { - "$ref": "#/definitions/coreTaskExecutionIdentifier", - "description": "Identifier of task execution to evict cache for." + "errors": { + "$ref": "#/definitions/coreCacheEvictionErrorList", + "description": "List of errors encountered during cache eviction (if any)." } } } diff --git a/flyteidl/gen/pb-java/flyteidl/service/Cache.java b/flyteidl/gen/pb-java/flyteidl/service/Cache.java index a285e6a05a..b175ee20a3 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Cache.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Cache.java @@ -14,714 +14,75 @@ public static void registerAllExtensions( registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } - public interface EvictExecutionCacheRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictExecutionCacheRequest) + public interface EvictCacheRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictCacheRequest) com.google.protobuf.MessageOrBuilder { /** * 
-     * Identifier of execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
      *
* - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - boolean hasId(); + boolean hasWorkflowExecutionId(); /** * 
-     * Identifier of execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
      *
* - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getId(); + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId(); /** * 
-     * Identifier of execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
      *
* - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getIdOrBuilder(); - } - /** - * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest} - */ - public static final class EvictExecutionCacheRequest extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:flyteidl.service.EvictExecutionCacheRequest) - EvictExecutionCacheRequestOrBuilder { - private static final long serialVersionUID = 0L; - // Use EvictExecutionCacheRequest.newBuilder() to construct. - private EvictExecutionCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private EvictExecutionCacheRequest() { - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private EvictExecutionCacheRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null; - if (id_ != null) { - subBuilder = id_.toBuilder(); - } - id_ = input.readMessage(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(id_); - id_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class); - } - - public static final int ID_FIELD_NUMBER = 1; - private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier id_; - /** - * 
-     * Identifier of execution to evict cache for.
-     *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public boolean hasId() { - return id_ != null; - } - /** - * 
-     * Identifier of execution to evict cache for.
-     *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getId() { - return id_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : id_; - } - /** - * 
-     * Identifier of execution to evict cache for.
-     *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getIdOrBuilder() { - return getId(); - } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (id_ != null) { - output.writeMessage(1, getId()); - } - unknownFields.writeTo(output); - } - - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (id_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getId()); - } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof flyteidl.service.Cache.EvictExecutionCacheRequest)) { - return super.equals(obj); - } - flyteidl.service.Cache.EvictExecutionCacheRequest other = (flyteidl.service.Cache.EvictExecutionCacheRequest) obj; - - if (hasId() != other.hasId()) return false; - if (hasId()) { - if (!getId() - .equals(other.getId())) return false; - } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasId()) { - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId().hashCode(); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(flyteidl.service.Cache.EvictExecutionCacheRequest prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictExecutionCacheRequest) - flyteidl.service.Cache.EvictExecutionCacheRequestOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class); - } - - // Construct using flyteidl.service.Cache.EvictExecutionCacheRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (idBuilder_ == null) { - id_ = null; - } else { - id_ = null; - idBuilder_ = null; - } - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; - } - - @java.lang.Override - public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() { - return flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance(); - } - - @java.lang.Override - public flyteidl.service.Cache.EvictExecutionCacheRequest build() { - flyteidl.service.Cache.EvictExecutionCacheRequest result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public flyteidl.service.Cache.EvictExecutionCacheRequest buildPartial() { - flyteidl.service.Cache.EvictExecutionCacheRequest result = new flyteidl.service.Cache.EvictExecutionCacheRequest(this); - if (idBuilder_ == null) { - result.id_ = id_; - } else { - result.id_ = idBuilder_.build(); - } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.service.Cache.EvictExecutionCacheRequest) { - return mergeFrom((flyteidl.service.Cache.EvictExecutionCacheRequest)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(flyteidl.service.Cache.EvictExecutionCacheRequest other) { - if (other == flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance()) return this; - if (other.hasId()) { - mergeId(other.getId()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - flyteidl.service.Cache.EvictExecutionCacheRequest parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.service.Cache.EvictExecutionCacheRequest) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier id_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> idBuilder_; - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public boolean hasId() { - return idBuilder_ != null || id_ != null; - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getId() { - if (idBuilder_ == null) { - return id_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : id_; - } else { - return idBuilder_.getMessage(); - } - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public Builder setId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { - if (idBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - id_ = value; - onChanged(); - } else { - idBuilder_.setMessage(value); - } - - return this; - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public Builder setId( - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) { - if (idBuilder_ == null) { - id_ = builderForValue.build(); - onChanged(); - } else { - idBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public Builder mergeId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { - if (idBuilder_ == null) { - if (id_ != null) { - id_ = - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.newBuilder(id_).mergeFrom(value).buildPartial(); - } else { - id_ = value; - } - onChanged(); - } else { - idBuilder_.mergeFrom(value); - } - - return this; - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public Builder clearId() { - if (idBuilder_ == null) { - id_ = null; - onChanged(); - } else { - id_ = null; - idBuilder_ = null; - } - - return this; - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getIdBuilder() { - - onChanged(); - return getIdFieldBuilder().getBuilder(); - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getIdOrBuilder() { - if (idBuilder_ != null) { - return idBuilder_.getMessageOrBuilder(); - } else { - return id_ == null ? - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : id_; - } - } - /** - * 
-       * Identifier of execution to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier id = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> - getIdFieldBuilder() { - if (idBuilder_ == null) { - idBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder>( - getId(), - getParentForChildren(), - isClean()); - id_ = null; - } - return idBuilder_; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictExecutionCacheRequest) - } - - // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest) - private static final flyteidl.service.Cache.EvictExecutionCacheRequest DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictExecutionCacheRequest(); - } - - public static flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public EvictExecutionCacheRequest parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new EvictExecutionCacheRequest(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - - public interface EvictTaskExecutionCacheRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictTaskExecutionCacheRequest) - com.google.protobuf.MessageOrBuilder { + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder(); /** * 
-     * Identifier of task execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - boolean hasId(); + boolean hasTaskExecutionId(); /** * 
-     * Identifier of task execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId(); + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId(); /** * 
-     * Identifier of task execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder(); + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder(); + + public flyteidl.service.Cache.EvictCacheRequest.IdCase getIdCase(); } /** - * Protobuf type {@code flyteidl.service.EvictTaskExecutionCacheRequest} + * Protobuf type {@code flyteidl.service.EvictCacheRequest} */ - public static final class EvictTaskExecutionCacheRequest extends + public static final class EvictCacheRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:flyteidl.service.EvictTaskExecutionCacheRequest) - EvictTaskExecutionCacheRequestOrBuilder { + // @@protoc_insertion_point(message_implements:flyteidl.service.EvictCacheRequest) + EvictCacheRequestOrBuilder { private static final long serialVersionUID = 0L; - // Use EvictTaskExecutionCacheRequest.newBuilder() to construct. - private EvictTaskExecutionCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use EvictCacheRequest.newBuilder() to construct. + private EvictCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private EvictTaskExecutionCacheRequest() { + private EvictCacheRequest() { } @java.lang.Override @@ -729,7 +90,7 @@ private EvictTaskExecutionCacheRequest() { getUnknownFields() { return this.unknownFields; } - private EvictTaskExecutionCacheRequest( + private EvictCacheRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -749,16 +110,31 @@ private EvictTaskExecutionCacheRequest( done = true; break; case 10: { + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null; + if (idCase_ == 1) { + subBuilder = ((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_).toBuilder(); + } + id_ = + input.readMessage(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_); + id_ = subBuilder.buildPartial(); + } + idCase_ = 1; + break; + } + case 18: { flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder subBuilder = null; - if (id_ != null) { - subBuilder = id_.toBuilder(); + if (idCase_ == 2) { + subBuilder = ((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_).toBuilder(); } - id_ = input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); + id_ = + input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(id_); + subBuilder.mergeFrom((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_); id_ = subBuilder.buildPartial(); } - + idCase_ = 2; break; } default: { @@ -782,48 +158,129 @@ private EvictTaskExecutionCacheRequest( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.service.Cache.EvictTaskExecutionCacheRequest.class, flyteidl.service.Cache.EvictTaskExecutionCacheRequest.Builder.class); + flyteidl.service.Cache.EvictCacheRequest.class, flyteidl.service.Cache.EvictCacheRequest.Builder.class); + } + + private int idCase_ = 0; + private java.lang.Object id_; + public enum IdCase + implements com.google.protobuf.Internal.EnumLite { + WORKFLOW_EXECUTION_ID(1), + TASK_EXECUTION_ID(2), + ID_NOT_SET(0); + private final int value; + private IdCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static IdCase valueOf(int value) { + return forNumber(value); + } + + public static IdCase forNumber(int value) { + switch (value) { + case 1: return WORKFLOW_EXECUTION_ID; + case 2: return TASK_EXECUTION_ID; + case 0: return ID_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public IdCase + getIdCase() { + return IdCase.forNumber( + idCase_); + } + + public static final int WORKFLOW_EXECUTION_ID_FIELD_NUMBER = 1; + /** + * 
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public boolean hasWorkflowExecutionId() { + return idCase_ == 1; + } + /** + * 
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { + if (idCase_ == 1) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + /** + * 
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { + if (idCase_ == 1) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); } - public static final int ID_FIELD_NUMBER = 1; - private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; + public static final int TASK_EXECUTION_ID_FIELD_NUMBER = 2; /** * 
-     * Identifier of task execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - public boolean hasId() { - return id_ != null; + public boolean hasTaskExecutionId() { + return idCase_ == 2; } /** * 
-     * Identifier of task execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { - return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId() { + if (idCase_ == 2) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); } /** * 
-     * Identifier of task execution to evict cache for.
+     * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { - return getId(); + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder() { + if (idCase_ == 2) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -840,8 +297,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (id_ != null) { - output.writeMessage(1, getId()); + if (idCase_ == 1) { + output.writeMessage(1, (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_); + } + if (idCase_ == 2) { + output.writeMessage(2, (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_); } unknownFields.writeTo(output); } @@ -852,9 +312,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (id_ != null) { + if (idCase_ == 1) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_); + } + if (idCase_ == 2) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getId()); + .computeMessageSize(2, (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -866,15 +330,23 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof flyteidl.service.Cache.EvictTaskExecutionCacheRequest)) { + if (!(obj instanceof flyteidl.service.Cache.EvictCacheRequest)) { return super.equals(obj); } - flyteidl.service.Cache.EvictTaskExecutionCacheRequest other = (flyteidl.service.Cache.EvictTaskExecutionCacheRequest) obj; - - if (hasId() != other.hasId()) return false; - if (hasId()) { - if (!getId() - .equals(other.getId())) return false; + flyteidl.service.Cache.EvictCacheRequest other = (flyteidl.service.Cache.EvictCacheRequest) obj; + + if (!getIdCase().equals(other.getIdCase())) return false; + switch (idCase_) { + case 1: + if (!getWorkflowExecutionId() + .equals(other.getWorkflowExecutionId())) return false; + break; + case 2: + if (!getTaskExecutionId() + .equals(other.getTaskExecutionId())) return false; + break; + case 0: + default: } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -887,78 +359,86 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasId()) { - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId().hashCode(); + switch (idCase_) { + case 1: + hash = (37 * hash) + WORKFLOW_EXECUTION_ID_FIELD_NUMBER; + hash = (53 * hash) + getWorkflowExecutionId().hashCode(); + break; + case 2: + hash = (37 * hash) + TASK_EXECUTION_ID_FIELD_NUMBER; + hash = (53 * hash) + getTaskExecutionId().hashCode(); + break; + case 0: + default: } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom(byte[] data) + public static flyteidl.service.Cache.EvictCacheRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom(java.io.InputStream input) + public static flyteidl.service.Cache.EvictCacheRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseDelimitedFrom(java.io.InputStream input) + public static flyteidl.service.Cache.EvictCacheRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseDelimitedFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictCacheRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -971,7 +451,7 @@ public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(flyteidl.service.Cache.EvictTaskExecutionCacheRequest prototype) { + public static Builder newBuilder(flyteidl.service.Cache.EvictCacheRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -987,26 +467,26 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code flyteidl.service.EvictTaskExecutionCacheRequest} + * Protobuf type {@code flyteidl.service.EvictCacheRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictTaskExecutionCacheRequest) - flyteidl.service.Cache.EvictTaskExecutionCacheRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictCacheRequest) + flyteidl.service.Cache.EvictCacheRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.service.Cache.EvictTaskExecutionCacheRequest.class, flyteidl.service.Cache.EvictTaskExecutionCacheRequest.Builder.class); + flyteidl.service.Cache.EvictCacheRequest.class, flyteidl.service.Cache.EvictCacheRequest.Builder.class); } - // Construct using flyteidl.service.Cache.EvictTaskExecutionCacheRequest.newBuilder() + // Construct using flyteidl.service.Cache.EvictCacheRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1024,29 +504,25 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (idBuilder_ == null) { - id_ = null; - } else { - id_ = null; - idBuilder_ = null; - } + idCase_ = 0; + id_ = null; return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_descriptor; } @java.lang.Override - public flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstanceForType() { - return flyteidl.service.Cache.EvictTaskExecutionCacheRequest.getDefaultInstance(); + public flyteidl.service.Cache.EvictCacheRequest getDefaultInstanceForType() { + return flyteidl.service.Cache.EvictCacheRequest.getDefaultInstance(); } @java.lang.Override - public flyteidl.service.Cache.EvictTaskExecutionCacheRequest build() { - flyteidl.service.Cache.EvictTaskExecutionCacheRequest result = buildPartial(); + public flyteidl.service.Cache.EvictCacheRequest build() { + flyteidl.service.Cache.EvictCacheRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -1054,13 +530,23 @@ public flyteidl.service.Cache.EvictTaskExecutionCacheRequest build() { } @java.lang.Override - public flyteidl.service.Cache.EvictTaskExecutionCacheRequest buildPartial() { - flyteidl.service.Cache.EvictTaskExecutionCacheRequest result = new flyteidl.service.Cache.EvictTaskExecutionCacheRequest(this); - if (idBuilder_ == null) { - result.id_ = id_; - } else { - result.id_ = idBuilder_.build(); + public flyteidl.service.Cache.EvictCacheRequest buildPartial() { + flyteidl.service.Cache.EvictCacheRequest result = new flyteidl.service.Cache.EvictCacheRequest(this); + if (idCase_ == 1) { + if (workflowExecutionIdBuilder_ == null) { + result.id_ = id_; + } else { + result.id_ = workflowExecutionIdBuilder_.build(); + } } + if (idCase_ == 2) { + if (taskExecutionIdBuilder_ == null) { + result.id_ = id_; + } else { + result.id_ = taskExecutionIdBuilder_.build(); + } + } + result.idCase_ = idCase_; onBuilt(); return result; } @@ -1099,18 +585,28 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.service.Cache.EvictTaskExecutionCacheRequest) { - return mergeFrom((flyteidl.service.Cache.EvictTaskExecutionCacheRequest)other); + if (other instanceof flyteidl.service.Cache.EvictCacheRequest) { + return mergeFrom((flyteidl.service.Cache.EvictCacheRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(flyteidl.service.Cache.EvictTaskExecutionCacheRequest other) { - if (other == flyteidl.service.Cache.EvictTaskExecutionCacheRequest.getDefaultInstance()) return this; - if (other.hasId()) { - mergeId(other.getId()); + public Builder mergeFrom(flyteidl.service.Cache.EvictCacheRequest other) { + if (other == flyteidl.service.Cache.EvictCacheRequest.getDefaultInstance()) return this; + switch (other.getIdCase()) { + case WORKFLOW_EXECUTION_ID: { + mergeWorkflowExecutionId(other.getWorkflowExecutionId()); + break; + } + case TASK_EXECUTION_ID: { + mergeTaskExecutionId(other.getTaskExecutionId()); + break; + } + case ID_NOT_SET: { + break; + } } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1127,11 +623,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - flyteidl.service.Cache.EvictTaskExecutionCacheRequest parsedMessage = null; + flyteidl.service.Cache.EvictCacheRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.service.Cache.EvictTaskExecutionCacheRequest) e.getUnfinishedMessage(); + parsedMessage = (flyteidl.service.Cache.EvictCacheRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -1140,158 +636,364 @@ public Builder mergeFrom( } return this; } + private int idCase_ = 0; + private java.lang.Object id_; + public IdCase + getIdCase() { + return IdCase.forNumber( + idCase_); + } + + public Builder clearId() { + idCase_ = 0; + id_ = null; + onChanged(); + return this; + } + - private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier id_; private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> idBuilder_; + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> workflowExecutionIdBuilder_; /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - public boolean hasId() { - return idBuilder_ != null || id_ != null; + public boolean hasWorkflowExecutionId() { + return idCase_ == 1; } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getId() { - if (idBuilder_ == null) { - return id_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { + if (workflowExecutionIdBuilder_ == null) { + if (idCase_ == 1) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); } else { - return idBuilder_.getMessage(); + if (idCase_ == 1) { + return workflowExecutionIdBuilder_.getMessage(); + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); } } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - public Builder setId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { - if (idBuilder_ == null) { + public Builder setWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (workflowExecutionIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } id_ = value; onChanged(); } else { - idBuilder_.setMessage(value); + workflowExecutionIdBuilder_.setMessage(value); } - + idCase_ = 1; return this; } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - public Builder setId( - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder builderForValue) { - if (idBuilder_ == null) { + public Builder setWorkflowExecutionId( + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) { + if (workflowExecutionIdBuilder_ == null) { id_ = builderForValue.build(); onChanged(); } else { - idBuilder_.setMessage(builderForValue.build()); + workflowExecutionIdBuilder_.setMessage(builderForValue.build()); } - + idCase_ = 1; return this; } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - public Builder mergeId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { - if (idBuilder_ == null) { - if (id_ != null) { - id_ = - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder(id_).mergeFrom(value).buildPartial(); + public Builder mergeWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (workflowExecutionIdBuilder_ == null) { + if (idCase_ == 1 && + id_ != flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance()) { + id_ = flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.newBuilder((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_) + .mergeFrom(value).buildPartial(); } else { id_ = value; } onChanged(); } else { - idBuilder_.mergeFrom(value); + if (idCase_ == 1) { + workflowExecutionIdBuilder_.mergeFrom(value); + } + workflowExecutionIdBuilder_.setMessage(value); + } + idCase_ = 1; + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public Builder clearWorkflowExecutionId() { + if (workflowExecutionIdBuilder_ == null) { + if (idCase_ == 1) { + idCase_ = 0; + id_ = null; + onChanged(); + } + } else { + if (idCase_ == 1) { + idCase_ = 0; + id_ = null; + } + workflowExecutionIdBuilder_.clear(); } - return this; } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ - public Builder clearId() { - if (idBuilder_ == null) { - id_ = null; - onChanged(); + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getWorkflowExecutionIdBuilder() { + return getWorkflowExecutionIdFieldBuilder().getBuilder(); + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { + if ((idCase_ == 1) && (workflowExecutionIdBuilder_ != null)) { + return workflowExecutionIdBuilder_.getMessageOrBuilder(); } else { + if (idCase_ == 1) { + return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> + getWorkflowExecutionIdFieldBuilder() { + if (workflowExecutionIdBuilder_ == null) { + if (!(idCase_ == 1)) { + id_ = flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + } + workflowExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder>( + (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_, + getParentForChildren(), + isClean()); id_ = null; - idBuilder_ = null; } + idCase_ = 1; + onChanged();; + return workflowExecutionIdBuilder_; + } + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> taskExecutionIdBuilder_; + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + */ + public boolean hasTaskExecutionId() { + return idCase_ == 2; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId() { + if (taskExecutionIdBuilder_ == null) { + if (idCase_ == 2) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } else { + if (idCase_ == 2) { + return taskExecutionIdBuilder_.getMessage(); + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + */ + public Builder setTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (taskExecutionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + id_ = value; + onChanged(); + } else { + taskExecutionIdBuilder_.setMessage(value); + } + idCase_ = 2; return this; } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getIdBuilder() { - - onChanged(); - return getIdFieldBuilder().getBuilder(); + public Builder setTaskExecutionId( + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder builderForValue) { + if (taskExecutionIdBuilder_ == null) { + id_ = builderForValue.build(); + onChanged(); + } else { + taskExecutionIdBuilder_.setMessage(builderForValue.build()); + } + idCase_ = 2; + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + */ + public Builder mergeTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { + if (taskExecutionIdBuilder_ == null) { + if (idCase_ == 2 && + id_ != flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance()) { + id_ = flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_) + .mergeFrom(value).buildPartial(); + } else { + id_ = value; + } + onChanged(); + } else { + if (idCase_ == 2) { + taskExecutionIdBuilder_.mergeFrom(value); + } + taskExecutionIdBuilder_.setMessage(value); + } + idCase_ = 2; + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + */ + public Builder clearTaskExecutionId() { + if (taskExecutionIdBuilder_ == null) { + if (idCase_ == 2) { + idCase_ = 0; + id_ = null; + onChanged(); + } + } else { + if (idCase_ == 2) { + idCase_ = 0; + id_ = null; + } + taskExecutionIdBuilder_.clear(); + } + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
+       *
+ * + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + */ + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getTaskExecutionIdBuilder() { + return getTaskExecutionIdFieldBuilder().getBuilder(); } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ - public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getIdOrBuilder() { - if (idBuilder_ != null) { - return idBuilder_.getMessageOrBuilder(); + public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder() { + if ((idCase_ == 2) && (taskExecutionIdBuilder_ != null)) { + return taskExecutionIdBuilder_.getMessageOrBuilder(); } else { - return id_ == null ? - flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : id_; + if (idCase_ == 2) { + return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; + } + return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); } } /** * 
-       * Identifier of task execution to evict cache for.
+       * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier id = 1; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> - getIdFieldBuilder() { - if (idBuilder_ == null) { - idBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getTaskExecutionIdFieldBuilder() { + if (taskExecutionIdBuilder_ == null) { + if (!(idCase_ == 2)) { + id_ = flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + } + taskExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder>( - getId(), + (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_, getParentForChildren(), isClean()); id_ = null; } - return idBuilder_; + idCase_ = 2; + onChanged();; + return taskExecutionIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -1306,41 +1008,41 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictTaskExecutionCacheRequest) + // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictCacheRequest) } - // @@protoc_insertion_point(class_scope:flyteidl.service.EvictTaskExecutionCacheRequest) - private static final flyteidl.service.Cache.EvictTaskExecutionCacheRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictCacheRequest) + private static final flyteidl.service.Cache.EvictCacheRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictTaskExecutionCacheRequest(); + DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictCacheRequest(); } - public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstance() { + public static flyteidl.service.Cache.EvictCacheRequest getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public EvictTaskExecutionCacheRequest parsePartialFrom( + public EvictCacheRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EvictTaskExecutionCacheRequest(input, extensionRegistry); + return new EvictCacheRequest(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstanceForType() { + public flyteidl.service.Cache.EvictCacheRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2013,15 +1715,10 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() { } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; + internal_static_flyteidl_service_EvictCacheRequest_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable; + internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_service_EvictCacheResponse_descriptor; private static final @@ -2039,30 +1736,35 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() { "\n\034flyteidl/service/cache.proto\022\020flyteidl" + ".service\032\034google/api/annotations.proto\032\032" + "flyteidl/core/errors.proto\032\036flyteidl/cor" + - "e/identifier.proto\"T\n\032EvictExecutionCach" + - "eRequest\0226\n\002id\030\001 \001(\0132*.flyteidl.core.Wor" + - "kflowExecutionIdentifier\"T\n\036EvictTaskExe" + - "cutionCacheRequest\0222\n\002id\030\001 \001(\0132&.flyteid" + - "l.core.TaskExecutionIdentifier\"K\n\022EvictC" + - "acheResponse\0225\n\006errors\030\001 \001(\0132%.flyteidl." + - "core.CacheEvictionErrorList2\345\004\n\014CacheSer" + - "vice\022\261\001\n\023EvictExecutionCache\022,.flyteidl." + - "service.EvictExecutionCacheRequest\032$.fly" + - "teidl.service.EvictCacheResponse\"F\202\323\344\223\002@" + - "*;/api/v1/cache/executions/{id.project}/" + - "{id.domain}/{id.name}:\001*\022\240\003\n\027EvictTaskEx" + - "ecutionCache\0220.flyteidl.service.EvictTas" + - "kExecutionCacheRequest\032$.flyteidl.servic" + - "e.EvictCacheResponse\"\254\002\202\323\344\223\002\245\002*\237\002/api/v1" + - "/cache/task_executions/{id.node_executio" + - "n_id.execution_id.project}/{id.node_exec" + - "ution_id.execution_id.domain}/{id.node_e" + - "xecution_id.execution_id.name}/{id.node_" + - "execution_id.node_id}/{id.task_id.projec" + - "t}/{id.task_id.domain}/{id.task_id.name}" + - "/{id.task_id.version}/{id.retry_attempt}" + - ":\001*B9Z7github.com/flyteorg/flyteidl/gen/" + - "pb-go/flyteidl/serviceb\006proto3" + "e/identifier.proto\"\253\001\n\021EvictCacheRequest" + + "\022K\n\025workflow_execution_id\030\001 \001(\0132*.flytei" + + "dl.core.WorkflowExecutionIdentifierH\000\022C\n" + + "\021task_execution_id\030\002 \001(\0132&.flyteidl.core" + + ".TaskExecutionIdentifierH\000B\004\n\002id\"K\n\022Evic" + + "tCacheResponse\0225\n\006errors\030\001 \001(\0132%.flyteid" + + "l.core.CacheEvictionErrorList2\217\006\n\014CacheS" + + "ervice\022\341\001\n\023EvictExecutionCache\022#.flyteid" + + "l.service.EvictCacheRequest\032$.flyteidl.s" + + "ervice.EvictCacheResponse\"\177\202\323\344\223\002y*t/api/" + + "v1/cache/executions/{workflow_execution_" + + "id.project}/{workflow_execution_id.domai" + + "n}/{workflow_execution_id.name}:\001*\022\232\004\n\027E" + + "victTaskExecutionCache\022#.flyteidl.servic" + + "e.EvictCacheRequest\032$.flyteidl.service.E" + + "victCacheResponse\"\263\003\202\323\344\223\002\254\003*\246\003/api/v1/ca" + + "che/task_executions/{task_execution_id.n" + + "ode_execution_id.execution_id.project}/{" + + "task_execution_id.node_execution_id.exec" + + "ution_id.domain}/{task_execution_id.node" + + "_execution_id.execution_id.name}/{task_e" + + "xecution_id.node_execution_id.node_id}/{" + + "task_execution_id.task_id.project}/{task" + + "_execution_id.task_id.domain}/{task_exec" + + "ution_id.task_id.name}/{task_execution_i" + + "d.task_id.version}/{task_execution_id.re" + + "try_attempt}:\001*B9Z7github.com/flyteorg/f" + + "lyteidl/gen/pb-go/flyteidl/serviceb\006prot" + + "o3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -2079,20 +1781,14 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( flyteidl.core.Errors.getDescriptor(), flyteidl.core.IdentifierOuterClass.getDescriptor(), }, assigner); - internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor = + internal_static_flyteidl_service_EvictCacheRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor, - new java.lang.String[] { "Id", }); - internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable = new + internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor, - new java.lang.String[] { "Id", }); + internal_static_flyteidl_service_EvictCacheRequest_descriptor, + new java.lang.String[] { "WorkflowExecutionId", "TaskExecutionId", "Id", }); internal_static_flyteidl_service_EvictCacheResponse_descriptor = - getDescriptor().getMessageTypes().get(2); + getDescriptor().getMessageTypes().get(1); internal_static_flyteidl_service_EvictCacheResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_service_EvictCacheResponse_descriptor, diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 47b860efcf..618d08ae3f 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -18756,104 +18756,61 @@ export namespace flyteidl { type GetPublicClientConfigCallback = (error: (Error|null), response?: flyteidl.service.PublicClientAuthConfigResponse) => void; } - /** Properties of an EvictExecutionCacheRequest. */ - interface IEvictExecutionCacheRequest { + /** Properties of an EvictCacheRequest. */ + interface IEvictCacheRequest { - /** EvictExecutionCacheRequest id */ - id?: (flyteidl.core.IWorkflowExecutionIdentifier|null); - } - - /** Represents an EvictExecutionCacheRequest. */ - class EvictExecutionCacheRequest implements IEvictExecutionCacheRequest { + /** EvictCacheRequest workflowExecutionId */ + workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null); - /** - * Constructs a new EvictExecutionCacheRequest. - * @param [properties] Properties to set - */ - constructor(properties?: flyteidl.service.IEvictExecutionCacheRequest); + /** EvictCacheRequest taskExecutionId */ + taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); + } - /** EvictExecutionCacheRequest id. */ - public id?: (flyteidl.core.IWorkflowExecutionIdentifier|null); + /** Represents an EvictCacheRequest. */ + class EvictCacheRequest implements IEvictCacheRequest { /** - * Creates a new EvictExecutionCacheRequest instance using the specified properties. + * Constructs a new EvictCacheRequest. * @param [properties] Properties to set - * @returns EvictExecutionCacheRequest instance */ - public static create(properties?: flyteidl.service.IEvictExecutionCacheRequest): flyteidl.service.EvictExecutionCacheRequest; + constructor(properties?: flyteidl.service.IEvictCacheRequest); - /** - * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages. - * @param message EvictExecutionCacheRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: flyteidl.service.IEvictExecutionCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EvictExecutionCacheRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictExecutionCacheRequest; - - /** - * Verifies an EvictExecutionCacheRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - } - - /** Properties of an EvictTaskExecutionCacheRequest. */ - interface IEvictTaskExecutionCacheRequest { - - /** EvictTaskExecutionCacheRequest id */ - id?: (flyteidl.core.ITaskExecutionIdentifier|null); - } - - /** Represents an EvictTaskExecutionCacheRequest. */ - class EvictTaskExecutionCacheRequest implements IEvictTaskExecutionCacheRequest { + /** EvictCacheRequest workflowExecutionId. */ + public workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null); - /** - * Constructs a new EvictTaskExecutionCacheRequest. - * @param [properties] Properties to set - */ - constructor(properties?: flyteidl.service.IEvictTaskExecutionCacheRequest); + /** EvictCacheRequest taskExecutionId. */ + public taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); - /** EvictTaskExecutionCacheRequest id. */ - public id?: (flyteidl.core.ITaskExecutionIdentifier|null); + /** EvictCacheRequest id. */ + public id?: ("workflowExecutionId"|"taskExecutionId"); /** - * Creates a new EvictTaskExecutionCacheRequest instance using the specified properties. + * Creates a new EvictCacheRequest instance using the specified properties. * @param [properties] Properties to set - * @returns EvictTaskExecutionCacheRequest instance + * @returns EvictCacheRequest instance */ - public static create(properties?: flyteidl.service.IEvictTaskExecutionCacheRequest): flyteidl.service.EvictTaskExecutionCacheRequest; + public static create(properties?: flyteidl.service.IEvictCacheRequest): flyteidl.service.EvictCacheRequest; /** - * Encodes the specified EvictTaskExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictTaskExecutionCacheRequest.verify|verify} messages. - * @param message EvictTaskExecutionCacheRequest message or plain object to encode + * Encodes the specified EvictCacheRequest message. Does not implicitly {@link flyteidl.service.EvictCacheRequest.verify|verify} messages. + * @param message EvictCacheRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: flyteidl.service.IEvictTaskExecutionCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: flyteidl.service.IEvictCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an EvictTaskExecutionCacheRequest message from the specified reader or buffer. + * Decodes an EvictCacheRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns EvictTaskExecutionCacheRequest + * @returns EvictCacheRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictTaskExecutionCacheRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictCacheRequest; /** - * Verifies an EvictTaskExecutionCacheRequest message. + * Verifies an EvictCacheRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ @@ -18934,31 +18891,31 @@ export namespace flyteidl { /** * Calls EvictExecutionCache. - * @param request EvictExecutionCacheRequest message or plain object + * @param request EvictCacheRequest message or plain object * @param callback Node-style callback called with the error, if any, and EvictCacheResponse */ - public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest, callback: flyteidl.service.CacheService.EvictExecutionCacheCallback): void; + public evictExecutionCache(request: flyteidl.service.IEvictCacheRequest, callback: flyteidl.service.CacheService.EvictExecutionCacheCallback): void; /** * Calls EvictExecutionCache. - * @param request EvictExecutionCacheRequest message or plain object + * @param request EvictCacheRequest message or plain object * @returns Promise */ - public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest): Promise; + public evictExecutionCache(request: flyteidl.service.IEvictCacheRequest): Promise; /** * Calls EvictTaskExecutionCache. - * @param request EvictTaskExecutionCacheRequest message or plain object + * @param request EvictCacheRequest message or plain object * @param callback Node-style callback called with the error, if any, and EvictCacheResponse */ - public evictTaskExecutionCache(request: flyteidl.service.IEvictTaskExecutionCacheRequest, callback: flyteidl.service.CacheService.EvictTaskExecutionCacheCallback): void; + public evictTaskExecutionCache(request: flyteidl.service.IEvictCacheRequest, callback: flyteidl.service.CacheService.EvictTaskExecutionCacheCallback): void; /** * Calls EvictTaskExecutionCache. - * @param request EvictTaskExecutionCacheRequest message or plain object + * @param request EvictCacheRequest message or plain object * @returns Promise */ - public evictTaskExecutionCache(request: flyteidl.service.IEvictTaskExecutionCacheRequest): Promise; + public evictTaskExecutionCache(request: flyteidl.service.IEvictCacheRequest): Promise; } namespace CacheService { diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 9b2f28629b..a0e52b18ca 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -43725,24 +43725,25 @@ return AuthMetadataService; })(); - service.EvictExecutionCacheRequest = (function() { + service.EvictCacheRequest = (function() { /** - * Properties of an EvictExecutionCacheRequest. + * Properties of an EvictCacheRequest. * @memberof flyteidl.service - * @interface IEvictExecutionCacheRequest - * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [id] EvictExecutionCacheRequest id + * @interface IEvictCacheRequest + * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [workflowExecutionId] EvictCacheRequest workflowExecutionId + * @property {flyteidl.core.ITaskExecutionIdentifier|null} [taskExecutionId] EvictCacheRequest taskExecutionId */ /** - * Constructs a new EvictExecutionCacheRequest. + * Constructs a new EvictCacheRequest. * @memberof flyteidl.service - * @classdesc Represents an EvictExecutionCacheRequest. - * @implements IEvictExecutionCacheRequest + * @classdesc Represents an EvictCacheRequest. + * @implements IEvictCacheRequest * @constructor - * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set + * @param {flyteidl.service.IEvictCacheRequest=} [properties] Properties to set */ - function EvictExecutionCacheRequest(properties) { + function EvictCacheRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -43750,174 +43751,89 @@ } /** - * EvictExecutionCacheRequest id. - * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} id - * @memberof flyteidl.service.EvictExecutionCacheRequest + * EvictCacheRequest workflowExecutionId. + * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} workflowExecutionId + * @memberof flyteidl.service.EvictCacheRequest * @instance */ - EvictExecutionCacheRequest.prototype.id = null; - - /** - * Creates a new EvictExecutionCacheRequest instance using the specified properties. - * @function create - * @memberof flyteidl.service.EvictExecutionCacheRequest - * @static - * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set - * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest instance - */ - EvictExecutionCacheRequest.create = function create(properties) { - return new EvictExecutionCacheRequest(properties); - }; - - /** - * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages. - * @function encode - * @memberof flyteidl.service.EvictExecutionCacheRequest - * @static - * @param {flyteidl.service.IEvictExecutionCacheRequest} message EvictExecutionCacheRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EvictExecutionCacheRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.id != null && message.hasOwnProperty("id")) - $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + EvictCacheRequest.prototype.workflowExecutionId = null; /** - * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer. - * @function decode - * @memberof flyteidl.service.EvictExecutionCacheRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EvictExecutionCacheRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictExecutionCacheRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.id = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Verifies an EvictExecutionCacheRequest message. - * @function verify - * @memberof flyteidl.service.EvictExecutionCacheRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EvictExecutionCacheRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.id != null && message.hasOwnProperty("id")) { - var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.id); - if (error) - return "id." + error; - } - return null; - }; - - return EvictExecutionCacheRequest; - })(); - - service.EvictTaskExecutionCacheRequest = (function() { - - /** - * Properties of an EvictTaskExecutionCacheRequest. - * @memberof flyteidl.service - * @interface IEvictTaskExecutionCacheRequest - * @property {flyteidl.core.ITaskExecutionIdentifier|null} [id] EvictTaskExecutionCacheRequest id + * EvictCacheRequest taskExecutionId. + * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} taskExecutionId + * @memberof flyteidl.service.EvictCacheRequest + * @instance */ + EvictCacheRequest.prototype.taskExecutionId = null; - /** - * Constructs a new EvictTaskExecutionCacheRequest. - * @memberof flyteidl.service - * @classdesc Represents an EvictTaskExecutionCacheRequest. - * @implements IEvictTaskExecutionCacheRequest - * @constructor - * @param {flyteidl.service.IEvictTaskExecutionCacheRequest=} [properties] Properties to set - */ - function EvictTaskExecutionCacheRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + // OneOf field names bound to virtual getters and setters + var $oneOfFields; /** - * EvictTaskExecutionCacheRequest id. - * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} id - * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * EvictCacheRequest id. + * @member {"workflowExecutionId"|"taskExecutionId"|undefined} id + * @memberof flyteidl.service.EvictCacheRequest * @instance */ - EvictTaskExecutionCacheRequest.prototype.id = null; + Object.defineProperty(EvictCacheRequest.prototype, "id", { + get: $util.oneOfGetter($oneOfFields = ["workflowExecutionId", "taskExecutionId"]), + set: $util.oneOfSetter($oneOfFields) + }); /** - * Creates a new EvictTaskExecutionCacheRequest instance using the specified properties. + * Creates a new EvictCacheRequest instance using the specified properties. * @function create - * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @memberof flyteidl.service.EvictCacheRequest * @static - * @param {flyteidl.service.IEvictTaskExecutionCacheRequest=} [properties] Properties to set - * @returns {flyteidl.service.EvictTaskExecutionCacheRequest} EvictTaskExecutionCacheRequest instance + * @param {flyteidl.service.IEvictCacheRequest=} [properties] Properties to set + * @returns {flyteidl.service.EvictCacheRequest} EvictCacheRequest instance */ - EvictTaskExecutionCacheRequest.create = function create(properties) { - return new EvictTaskExecutionCacheRequest(properties); + EvictCacheRequest.create = function create(properties) { + return new EvictCacheRequest(properties); }; /** - * Encodes the specified EvictTaskExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictTaskExecutionCacheRequest.verify|verify} messages. + * Encodes the specified EvictCacheRequest message. Does not implicitly {@link flyteidl.service.EvictCacheRequest.verify|verify} messages. * @function encode - * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @memberof flyteidl.service.EvictCacheRequest * @static - * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} message EvictTaskExecutionCacheRequest message or plain object to encode + * @param {flyteidl.service.IEvictCacheRequest} message EvictCacheRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - EvictTaskExecutionCacheRequest.encode = function encode(message, writer) { + EvictCacheRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.id != null && message.hasOwnProperty("id")) - $root.flyteidl.core.TaskExecutionIdentifier.encode(message.id, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) + $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowExecutionId, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.taskExecutionId != null && message.hasOwnProperty("taskExecutionId")) + $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskExecutionId, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Decodes an EvictTaskExecutionCacheRequest message from the specified reader or buffer. + * Decodes an EvictCacheRequest message from the specified reader or buffer. * @function decode - * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @memberof flyteidl.service.EvictCacheRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {flyteidl.service.EvictTaskExecutionCacheRequest} EvictTaskExecutionCacheRequest + * @returns {flyteidl.service.EvictCacheRequest} EvictCacheRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EvictTaskExecutionCacheRequest.decode = function decode(reader, length) { + EvictCacheRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictTaskExecutionCacheRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictCacheRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.id = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); + message.workflowExecutionId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32()); + break; + case 2: + message.taskExecutionId = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -43928,25 +43844,39 @@ }; /** - * Verifies an EvictTaskExecutionCacheRequest message. + * Verifies an EvictCacheRequest message. * @function verify - * @memberof flyteidl.service.EvictTaskExecutionCacheRequest + * @memberof flyteidl.service.EvictCacheRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - EvictTaskExecutionCacheRequest.verify = function verify(message) { + EvictCacheRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.id != null && message.hasOwnProperty("id")) { - var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.id); - if (error) - return "id." + error; + var properties = {}; + if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) { + properties.id = 1; + { + var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowExecutionId); + if (error) + return "workflowExecutionId." + error; + } + } + if (message.taskExecutionId != null && message.hasOwnProperty("taskExecutionId")) { + if (properties.id === 1) + return "id: multiple values"; + properties.id = 1; + { + var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.taskExecutionId); + if (error) + return "taskExecutionId." + error; + } } return null; }; - return EvictTaskExecutionCacheRequest; + return EvictCacheRequest; })(); service.EvictCacheResponse = (function() { @@ -44107,13 +44037,13 @@ * @function evictExecutionCache * @memberof flyteidl.service.CacheService * @instance - * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object + * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object * @param {flyteidl.service.CacheService.EvictExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse * @returns {undefined} * @variation 1 */ Object.defineProperty(CacheService.prototype.evictExecutionCache = function evictExecutionCache(request, callback) { - return this.rpcCall(evictExecutionCache, $root.flyteidl.service.EvictExecutionCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); + return this.rpcCall(evictExecutionCache, $root.flyteidl.service.EvictCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); }, "name", { value: "EvictExecutionCache" }); /** @@ -44121,7 +44051,7 @@ * @function evictExecutionCache * @memberof flyteidl.service.CacheService * @instance - * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object + * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object * @returns {Promise} Promise * @variation 2 */ @@ -44140,13 +44070,13 @@ * @function evictTaskExecutionCache * @memberof flyteidl.service.CacheService * @instance - * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} request EvictTaskExecutionCacheRequest message or plain object + * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object * @param {flyteidl.service.CacheService.EvictTaskExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse * @returns {undefined} * @variation 1 */ Object.defineProperty(CacheService.prototype.evictTaskExecutionCache = function evictTaskExecutionCache(request, callback) { - return this.rpcCall(evictTaskExecutionCache, $root.flyteidl.service.EvictTaskExecutionCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); + return this.rpcCall(evictTaskExecutionCache, $root.flyteidl.service.EvictCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); }, "name", { value: "EvictTaskExecutionCache" }); /** @@ -44154,7 +44084,7 @@ * @function evictTaskExecutionCache * @memberof flyteidl.service.CacheService * @instance - * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} request EvictTaskExecutionCacheRequest message or plain object + * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object * @returns {Promise} Promise * @variation 2 */ diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py index a6cd025b91..37ba5ebd5f 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py @@ -16,7 +16,7 @@ from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"X\n\x1a\x45victExecutionCacheRequest\x12:\n\x02id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x02id\"X\n\x1e\x45victTaskExecutionCacheRequest\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x02id\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\xe5\x04\n\x0c\x43\x61\x63heService\x12\xb1\x01\n\x13\x45victExecutionCache\x12,.flyteidl.service.EvictExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"F\x82\xd3\xe4\x93\x02@:\x01**;/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}\x12\xa0\x03\n\x17\x45victTaskExecutionCache\x12\x30.flyteidl.service.EvictTaskExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xac\x02\x82\xd3\xe4\x93\x02\xa5\x02:\x01**\x9f\x02/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xd1\x01\n\x11\x45victCacheRequest\x12`\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\x12T\n\x11task_execution_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionIdB\x04\n\x02id\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x8f\x06\n\x0c\x43\x61\x63heService\x12\xe1\x01\n\x13\x45victExecutionCache\x12#.flyteidl.service.EvictCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\x7f\x82\xd3\xe4\x93\x02y:\x01**t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\x9a\x04\n\x17\x45victTaskExecutionCache\x12#.flyteidl.service.EvictCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03:\x01**\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.cache_pb2', globals()) @@ -25,15 +25,13 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nCacheProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service' _CACHESERVICE.methods_by_name['EvictExecutionCache']._options = None - _CACHESERVICE.methods_by_name['EvictExecutionCache']._serialized_options = b'\202\323\344\223\002@:\001**;/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}' + _CACHESERVICE.methods_by_name['EvictExecutionCache']._serialized_options = b'\202\323\344\223\002y:\001**t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}' _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._options = None - _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._serialized_options = b'\202\323\344\223\002\245\002:\001**\237\002/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}' - _EVICTEXECUTIONCACHEREQUEST._serialized_start=140 - _EVICTEXECUTIONCACHEREQUEST._serialized_end=228 - _EVICTTASKEXECUTIONCACHEREQUEST._serialized_start=230 - _EVICTTASKEXECUTIONCACHEREQUEST._serialized_end=318 - _EVICTCACHERESPONSE._serialized_start=320 - _EVICTCACHERESPONSE._serialized_end=403 - _CACHESERVICE._serialized_start=406 - _CACHESERVICE._serialized_end=1019 + _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._serialized_options = b'\202\323\344\223\002\254\003:\001**\246\003/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}' + _EVICTCACHEREQUEST._serialized_start=141 + _EVICTCACHEREQUEST._serialized_end=350 + _EVICTCACHERESPONSE._serialized_start=352 + _EVICTCACHERESPONSE._serialized_end=435 + _CACHESERVICE._serialized_start=438 + _CACHESERVICE._serialized_end=1221 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi index 52aa9c54c0..87a7c63076 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi @@ -7,20 +7,16 @@ from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Opti DESCRIPTOR: _descriptor.FileDescriptor +class EvictCacheRequest(_message.Message): + __slots__ = ["task_execution_id", "workflow_execution_id"] + TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + task_execution_id: _identifier_pb2.TaskExecutionIdentifier + workflow_execution_id: _identifier_pb2.WorkflowExecutionIdentifier + def __init__(self, workflow_execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ...) -> None: ... + class EvictCacheResponse(_message.Message): __slots__ = ["errors"] ERRORS_FIELD_NUMBER: _ClassVar[int] errors: _errors_pb2.CacheEvictionErrorList def __init__(self, errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ... - -class EvictExecutionCacheRequest(_message.Message): - __slots__ = ["id"] - ID_FIELD_NUMBER: _ClassVar[int] - id: _identifier_pb2.WorkflowExecutionIdentifier - def __init__(self, id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ...) -> None: ... - -class EvictTaskExecutionCacheRequest(_message.Message): - __slots__ = ["id"] - ID_FIELD_NUMBER: _ClassVar[int] - id: _identifier_pb2.TaskExecutionIdentifier - def __init__(self, id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ...) -> None: ... diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py index 80b802f242..d80cf23afd 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py @@ -17,12 +17,12 @@ def __init__(self, channel): """ self.EvictExecutionCache = channel.unary_unary( '/flyteidl.service.CacheService/EvictExecutionCache', - request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString, + request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, ) self.EvictTaskExecutionCache = channel.unary_unary( '/flyteidl.service.CacheService/EvictTaskExecutionCache', - request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.SerializeToString, + request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, ) @@ -50,12 +50,12 @@ def add_CacheServiceServicer_to_server(servicer, server): rpc_method_handlers = { 'EvictExecutionCache': grpc.unary_unary_rpc_method_handler( servicer.EvictExecutionCache, - request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.FromString, + request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.FromString, response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, ), 'EvictTaskExecutionCache': grpc.unary_unary_rpc_method_handler( servicer.EvictTaskExecutionCache, - request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.FromString, + request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.FromString, response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, ), } @@ -81,7 +81,7 @@ def EvictExecutionCache(request, timeout=None, metadata=None): return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictExecutionCache', - flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString, + flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @@ -98,7 +98,7 @@ def EvictTaskExecutionCache(request, timeout=None, metadata=None): return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictTaskExecutionCache', - flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.SerializeToString, + flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst index e371bdd1e9..764d30d6f4 100644 --- a/flyteidl/protos/docs/service/service.rst +++ b/flyteidl/protos/docs/service/service.rst @@ -234,20 +234,21 @@ flyteidl/service/cache.proto -.. _ref_flyteidl.service.EvictCacheResponse: +.. _ref_flyteidl.service.EvictCacheRequest: -EvictCacheResponse +EvictCacheRequest ------------------------------------------------------------------ -.. csv-table:: EvictCacheResponse type fields +.. csv-table:: EvictCacheRequest type fields :header: "Field", "Type", "Label", "Description" :widths: auto - "errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "List of errors encountered during cache eviction (if any)." + "workflow_execution_id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for." + "task_execution_id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for." @@ -255,41 +256,20 @@ EvictCacheResponse -.. _ref_flyteidl.service.EvictExecutionCacheRequest: - -EvictExecutionCacheRequest ------------------------------------------------------------------- - - - - - -.. csv-table:: EvictExecutionCacheRequest type fields - :header: "Field", "Type", "Label", "Description" - :widths: auto - - "id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of execution to evict cache for." - - - - - - - -.. _ref_flyteidl.service.EvictTaskExecutionCacheRequest: +.. _ref_flyteidl.service.EvictCacheResponse: -EvictTaskExecutionCacheRequest +EvictCacheResponse ------------------------------------------------------------------ -.. csv-table:: EvictTaskExecutionCacheRequest type fields +.. csv-table:: EvictCacheResponse type fields :header: "Field", "Type", "Label", "Description" :widths: auto - "id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "Identifier of task execution to evict cache for." + "errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "List of errors encountered during cache eviction (if any)." @@ -320,8 +300,8 @@ CacheService defines an RPC Service for interacting with cached data in Flyte on :header: "Method Name", "Request Type", "Response Type", "Description" :widths: auto - "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`." - "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictTaskExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`." + "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`." + "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`." .. end services diff --git a/flyteidl/protos/flyteidl/service/cache.proto b/flyteidl/protos/flyteidl/service/cache.proto index 33a5bcbd35..5b69e0fe02 100644 --- a/flyteidl/protos/flyteidl/service/cache.proto +++ b/flyteidl/protos/flyteidl/service/cache.proto @@ -9,14 +9,14 @@ import "google/api/annotations.proto"; import "flyteidl/core/errors.proto"; import "flyteidl/core/identifier.proto"; -message EvictExecutionCacheRequest { - // Identifier of execution to evict cache for. - core.WorkflowExecutionIdentifier id = 1; -} - -message EvictTaskExecutionCacheRequest { - // Identifier of task execution to evict cache for. - core.TaskExecutionIdentifier id = 1; +message EvictCacheRequest { + // Identifier of resource cached data should be evicted for. + oneof id { + // Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for. + core.WorkflowExecutionIdentifier workflow_execution_id = 1; + // Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. + core.TaskExecutionIdentifier task_execution_id = 2; + } } message EvictCacheResponse { @@ -27,9 +27,9 @@ message EvictCacheResponse { // CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. service CacheService { // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - rpc EvictExecutionCache (EvictExecutionCacheRequest) returns (EvictCacheResponse) { + rpc EvictExecutionCache (EvictCacheRequest) returns (EvictCacheResponse) { option (google.api.http) = { - delete: "/api/v1/cache/executions/{id.project}/{id.domain}/{id.name}" + delete: "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}" body: "*" }; // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { @@ -38,9 +38,9 @@ service CacheService { } // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - rpc EvictTaskExecutionCache (EvictTaskExecutionCacheRequest) returns (EvictCacheResponse) { + rpc EvictTaskExecutionCache (EvictCacheRequest) returns (EvictCacheResponse) { option (google.api.http) = { - delete: "/api/v1/cache/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}" + delete: "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}" body: "*" }; // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { From ea6df4e8830c94b84127fdbf3c572ea4c6742896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Fri, 11 Nov 2022 11:48:58 +0100 Subject: [PATCH 15/57] Merged cache eviction endpoints into single RPC call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../go/admin/mocks/CacheServiceClient.go | 70 +---- .../go/admin/mocks/CacheServiceServer.go | 63 +--- .../pb-cpp/flyteidl/service/cache.grpc.pb.cc | 78 ++--- .../pb-cpp/flyteidl/service/cache.grpc.pb.h | 292 ++++-------------- .../gen/pb-cpp/flyteidl/service/cache.pb.cc | 41 ++- .../gen/pb-go/flyteidl/service/cache.pb.go | 128 +++----- .../gen/pb-go/flyteidl/service/cache.pb.gw.go | 47 +-- .../pb-go/flyteidl/service/cache.swagger.json | 27 +- .../gen/pb-java/flyteidl/service/Cache.java | 39 ++- flyteidl/gen/pb-js/flyteidl.d.ts | 33 +- flyteidl/gen/pb-js/flyteidl.js | 53 +--- .../pb_python/flyteidl/service/cache_pb2.py | 10 +- .../flyteidl/service/cache_pb2_grpc.py | 50 +-- flyteidl/protos/docs/service/service.rst | 3 +- flyteidl/protos/flyteidl/service/cache.proto | 18 +- 15 files changed, 261 insertions(+), 691 deletions(-) diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go index adc22ff3e8..ce654963c3 100644 --- a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go +++ b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go @@ -17,74 +17,26 @@ type CacheServiceClient struct { mock.Mock } -type CacheServiceClient_EvictExecutionCache struct { +type CacheServiceClient_EvictCache struct { *mock.Call } -func (_m CacheServiceClient_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictExecutionCache { - return &CacheServiceClient_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} +func (_m CacheServiceClient_EvictCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictCache { + return &CacheServiceClient_EvictCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", ctx, in, opts) - return &CacheServiceClient_EvictExecutionCache{Call: c_call} +func (_m *CacheServiceClient) OnEvictCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictCache { + c_call := _m.On("EvictCache", ctx, in, opts) + return &CacheServiceClient_EvictCache{Call: c_call} } -func (_m *CacheServiceClient) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", matchers...) - return &CacheServiceClient_EvictExecutionCache{Call: c_call} +func (_m *CacheServiceClient) OnEvictCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictCache { + c_call := _m.On("EvictCache", matchers...) + return &CacheServiceClient_EvictCache{Call: c_call} } -// EvictExecutionCache provides a mock function with given fields: ctx, in, opts -func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { - _va := make([]interface{}, len(opts)) - for _i := range opts { - _va[_i] = opts[_i] - } - var _ca []interface{} - _ca = append(_ca, ctx, in) - _ca = append(_ca, _va...) - ret := _m.Called(_ca...) - - var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { - r0 = rf(ctx, in, opts...) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*service.EvictCacheResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) error); ok { - r1 = rf(ctx, in, opts...) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -type CacheServiceClient_EvictTaskExecutionCache struct { - *mock.Call -} - -func (_m CacheServiceClient_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictTaskExecutionCache { - return &CacheServiceClient_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *CacheServiceClient) OnEvictTaskExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", ctx, in, opts) - return &CacheServiceClient_EvictTaskExecutionCache{Call: c_call} -} - -func (_m *CacheServiceClient) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", matchers...) - return &CacheServiceClient_EvictTaskExecutionCache{Call: c_call} -} - -// EvictTaskExecutionCache provides a mock function with given fields: ctx, in, opts -func (_m *CacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { +// EvictCache provides a mock function with given fields: ctx, in, opts +func (_m *CacheServiceClient) EvictCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go index 82cb91fb7f..85059868c5 100644 --- a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go +++ b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go @@ -14,67 +14,26 @@ type CacheServiceServer struct { mock.Mock } -type CacheServiceServer_EvictExecutionCache struct { +type CacheServiceServer_EvictCache struct { *mock.Call } -func (_m CacheServiceServer_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictExecutionCache { - return &CacheServiceServer_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} +func (_m CacheServiceServer_EvictCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictCache { + return &CacheServiceServer_EvictCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) *CacheServiceServer_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", _a0, _a1) - return &CacheServiceServer_EvictExecutionCache{Call: c_call} +func (_m *CacheServiceServer) OnEvictCache(_a0 context.Context, _a1 *service.EvictCacheRequest) *CacheServiceServer_EvictCache { + c_call := _m.On("EvictCache", _a0, _a1) + return &CacheServiceServer_EvictCache{Call: c_call} } -func (_m *CacheServiceServer) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", matchers...) - return &CacheServiceServer_EvictExecutionCache{Call: c_call} +func (_m *CacheServiceServer) OnEvictCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictCache { + c_call := _m.On("EvictCache", matchers...) + return &CacheServiceServer_EvictCache{Call: c_call} } -// EvictExecutionCache provides a mock function with given fields: _a0, _a1 -func (_m *CacheServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) (*service.EvictCacheResponse, error) { - ret := _m.Called(_a0, _a1) - - var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest) *service.EvictCacheResponse); ok { - r0 = rf(_a0, _a1) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*service.EvictCacheResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest) error); ok { - r1 = rf(_a0, _a1) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -type CacheServiceServer_EvictTaskExecutionCache struct { - *mock.Call -} - -func (_m CacheServiceServer_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictTaskExecutionCache { - return &CacheServiceServer_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *CacheServiceServer) OnEvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) *CacheServiceServer_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", _a0, _a1) - return &CacheServiceServer_EvictTaskExecutionCache{Call: c_call} -} - -func (_m *CacheServiceServer) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", matchers...) - return &CacheServiceServer_EvictTaskExecutionCache{Call: c_call} -} - -// EvictTaskExecutionCache provides a mock function with given fields: _a0, _a1 -func (_m *CacheServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictCacheRequest) (*service.EvictCacheResponse, error) { +// EvictCache provides a mock function with given fields: _a0, _a1 +func (_m *CacheServiceServer) EvictCache(_a0 context.Context, _a1 *service.EvictCacheRequest) (*service.EvictCacheResponse, error) { ret := _m.Called(_a0, _a1) var r0 *service.EvictCacheResponse diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc index 692729e9d4..587fe1f250 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc @@ -20,8 +20,7 @@ namespace flyteidl { namespace service { static const char* CacheService_method_names[] = { - "/flyteidl.service.CacheService/EvictExecutionCache", - "/flyteidl.service.CacheService/EvictTaskExecutionCache", + "/flyteidl.service.CacheService/EvictCache", }; std::unique_ptr< CacheService::Stub> CacheService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) { @@ -31,64 +30,35 @@ std::unique_ptr< CacheService::Stub> CacheService::NewStub(const std::shared_ptr } CacheService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel) - : channel_(channel), rpcmethod_EvictExecutionCache_(CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_EvictTaskExecutionCache_(CacheService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + : channel_(channel), rpcmethod_EvictCache_(CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} -::grpc::Status CacheService::Stub::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { - return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictExecutionCache_, context, request, response); +::grpc::Status CacheService::Stub::EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictCache_, context, request, response); } -void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); +void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, std::move(f)); } -void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); +void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, std::move(f)); } -void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); +void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, reactor); } -void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); +void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, reactor); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, true); +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictCache_, context, request, true); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, false); -} - -::grpc::Status CacheService::Stub::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { - return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictTaskExecutionCache_, context, request, response); -} - -void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); -} - -void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); -} - -void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); -} - -void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); -} - -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, true); -} - -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, false); +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictCache_, context, request, false); } CacheService::Service::Service() { @@ -96,25 +66,13 @@ CacheService::Service::Service() { CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( - std::mem_fn(&CacheService::Service::EvictExecutionCache), this))); - AddMethod(new ::grpc::internal::RpcServiceMethod( - CacheService_method_names[1], - ::grpc::internal::RpcMethod::NORMAL_RPC, - new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( - std::mem_fn(&CacheService::Service::EvictTaskExecutionCache), this))); + std::mem_fn(&CacheService::Service::EvictCache), this))); } CacheService::Service::~Service() { } -::grpc::Status CacheService::Service::EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { - (void) context; - (void) request; - (void) response; - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); -} - -::grpc::Status CacheService::Service::EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { +::grpc::Status CacheService::Service::EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { (void) context; (void) request; (void) response; diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h index cdceb4c687..7ecf659683 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h @@ -49,71 +49,45 @@ class CacheService final { class StubInterface { public: virtual ~StubInterface() {} - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - virtual ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictCacheRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); - } - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); - } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictCacheRaw(context, request, cq)); } class experimental_async_interface { public: virtual ~experimental_async_interface() {} - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; - virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; - virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. + virtual void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; }; virtual class experimental_async_interface* experimental_async() { return nullptr; } private: - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; }; class Stub final : public StubInterface { public: Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel); - ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); - } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); + ::grpc::Status EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictCacheRaw(context, request, cq)); } - ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); - } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictCacheRaw(context, request, cq)); } class experimental_async final : public StubInterface::experimental_async_interface { public: - void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; private: friend class Stub; explicit experimental_async(Stub* stub): stub_(stub) { } @@ -125,12 +99,9 @@ class CacheService final { private: std::shared_ptr< ::grpc::ChannelInterface> channel_; class experimental_async async_stub_{this}; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; - const ::grpc::internal::RpcMethod rpcmethod_EvictExecutionCache_; - const ::grpc::internal::RpcMethod rpcmethod_EvictTaskExecutionCache_; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; + const ::grpc::internal::RpcMethod rpcmethod_EvictCache_; }; static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions()); @@ -138,282 +109,147 @@ class CacheService final { public: Service(); virtual ~Service(); - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - virtual ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); }; template - class WithAsyncMethod_EvictExecutionCache : public BaseClass { + class WithAsyncMethod_EvictCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithAsyncMethod_EvictExecutionCache() { + WithAsyncMethod_EvictCache() { ::grpc::Service::MarkMethodAsync(0); } - ~WithAsyncMethod_EvictExecutionCache() override { + ~WithAsyncMethod_EvictCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEvictExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEvictCache(::grpc::ServerContext* context, ::flyteidl::service::EvictCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); } }; + typedef WithAsyncMethod_EvictCache AsyncService; template - class WithAsyncMethod_EvictTaskExecutionCache : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithAsyncMethod_EvictTaskExecutionCache() { - ::grpc::Service::MarkMethodAsync(1); - } - ~WithAsyncMethod_EvictTaskExecutionCache() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); - } - }; - typedef WithAsyncMethod_EvictExecutionCache > AsyncService; - template - class ExperimentalWithCallbackMethod_EvictExecutionCache : public BaseClass { + class ExperimentalWithCallbackMethod_EvictCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - ExperimentalWithCallbackMethod_EvictExecutionCache() { + ExperimentalWithCallbackMethod_EvictCache() { ::grpc::Service::experimental().MarkMethodCallback(0, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { - return this->EvictExecutionCache(context, request, response, controller); + return this->EvictCache(context, request, response, controller); })); } - void SetMessageAllocatorFor_EvictExecutionCache( + void SetMessageAllocatorFor_EvictCache( ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( ::grpc::Service::experimental().GetHandler(0)) ->SetMessageAllocator(allocator); } - ~ExperimentalWithCallbackMethod_EvictExecutionCache() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } - }; - template - class ExperimentalWithCallbackMethod_EvictTaskExecutionCache : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - ExperimentalWithCallbackMethod_EvictTaskExecutionCache() { - ::grpc::Service::experimental().MarkMethodCallback(1, - new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( - [this](::grpc::ServerContext* context, - const ::flyteidl::service::EvictCacheRequest* request, - ::flyteidl::service::EvictCacheResponse* response, - ::grpc::experimental::ServerCallbackRpcController* controller) { - return this->EvictTaskExecutionCache(context, request, response, controller); - })); - } - void SetMessageAllocatorFor_EvictTaskExecutionCache( - ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { - static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( - ::grpc::Service::experimental().GetHandler(1)) - ->SetMessageAllocator(allocator); - } - ~ExperimentalWithCallbackMethod_EvictTaskExecutionCache() override { + ~ExperimentalWithCallbackMethod_EvictCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; - typedef ExperimentalWithCallbackMethod_EvictExecutionCache > ExperimentalCallbackService; + typedef ExperimentalWithCallbackMethod_EvictCache ExperimentalCallbackService; template - class WithGenericMethod_EvictExecutionCache : public BaseClass { + class WithGenericMethod_EvictCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithGenericMethod_EvictExecutionCache() { + WithGenericMethod_EvictCache() { ::grpc::Service::MarkMethodGeneric(0); } - ~WithGenericMethod_EvictExecutionCache() override { + ~WithGenericMethod_EvictCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } }; template - class WithGenericMethod_EvictTaskExecutionCache : public BaseClass { + class WithRawMethod_EvictCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithGenericMethod_EvictTaskExecutionCache() { - ::grpc::Service::MarkMethodGeneric(1); - } - ~WithGenericMethod_EvictTaskExecutionCache() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - }; - template - class WithRawMethod_EvictExecutionCache : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithRawMethod_EvictExecutionCache() { + WithRawMethod_EvictCache() { ::grpc::Service::MarkMethodRaw(0); } - ~WithRawMethod_EvictExecutionCache() override { + ~WithRawMethod_EvictCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEvictCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); } }; template - class WithRawMethod_EvictTaskExecutionCache : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithRawMethod_EvictTaskExecutionCache() { - ::grpc::Service::MarkMethodRaw(1); - } - ~WithRawMethod_EvictTaskExecutionCache() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); - } - }; - template - class ExperimentalWithRawCallbackMethod_EvictExecutionCache : public BaseClass { + class ExperimentalWithRawCallbackMethod_EvictCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - ExperimentalWithRawCallbackMethod_EvictExecutionCache() { + ExperimentalWithRawCallbackMethod_EvictCache() { ::grpc::Service::experimental().MarkMethodRawCallback(0, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { - this->EvictExecutionCache(context, request, response, controller); + this->EvictCache(context, request, response, controller); })); } - ~ExperimentalWithRawCallbackMethod_EvictExecutionCache() override { + ~ExperimentalWithRawCallbackMethod_EvictCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void EvictCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template - class ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache : public BaseClass { + class WithStreamedUnaryMethod_EvictCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache() { - ::grpc::Service::experimental().MarkMethodRawCallback(1, - new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( - [this](::grpc::ServerContext* context, - const ::grpc::ByteBuffer* request, - ::grpc::ByteBuffer* response, - ::grpc::experimental::ServerCallbackRpcController* controller) { - this->EvictTaskExecutionCache(context, request, response, controller); - })); - } - ~ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } - }; - template - class WithStreamedUnaryMethod_EvictExecutionCache : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithStreamedUnaryMethod_EvictExecutionCache() { + WithStreamedUnaryMethod_EvictCache() { ::grpc::Service::MarkMethodStreamed(0, - new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictExecutionCache::StreamedEvictExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); - } - ~WithStreamedUnaryMethod_EvictExecutionCache() override { - BaseClassMustBeDerivedFromService(this); - } - // disable regular version of this method - ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - // replace default version of method with streamed unary - virtual ::grpc::Status StreamedEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; - }; - template - class WithStreamedUnaryMethod_EvictTaskExecutionCache : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service *service) {} - public: - WithStreamedUnaryMethod_EvictTaskExecutionCache() { - ::grpc::Service::MarkMethodStreamed(1, - new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictTaskExecutionCache::StreamedEvictTaskExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictCache::StreamedEvictCache, this, std::placeholders::_1, std::placeholders::_2))); } - ~WithStreamedUnaryMethod_EvictTaskExecutionCache() override { + ~WithStreamedUnaryMethod_EvictCache() override { BaseClassMustBeDerivedFromService(this); } // disable regular version of this method - ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } // replace default version of method with streamed unary - virtual ::grpc::Status StreamedEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; + virtual ::grpc::Status StreamedEvictCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedUnaryService; + typedef WithStreamedUnaryMethod_EvictCache StreamedUnaryService; typedef Service SplitStreamedService; - typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedService; + typedef WithStreamedUnaryMethod_EvictCache StreamedService; }; } // namespace service diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc index 21c8dfc401..c6adf4360f 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc @@ -115,34 +115,31 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto[] = "\021task_execution_id\030\002 \001(\0132&.flyteidl.core" ".TaskExecutionIdentifierH\000B\004\n\002id\"K\n\022Evic" "tCacheResponse\0225\n\006errors\030\001 \001(\0132%.flyteid" - "l.core.CacheEvictionErrorList2\217\006\n\014CacheS" - "ervice\022\341\001\n\023EvictExecutionCache\022#.flyteid" - "l.service.EvictCacheRequest\032$.flyteidl.s" - "ervice.EvictCacheResponse\"\177\202\323\344\223\002y*t/api/" - "v1/cache/executions/{workflow_execution_" - "id.project}/{workflow_execution_id.domai" - "n}/{workflow_execution_id.name}:\001*\022\232\004\n\027E" - "victTaskExecutionCache\022#.flyteidl.servic" - "e.EvictCacheRequest\032$.flyteidl.service.E" - "victCacheResponse\"\263\003\202\323\344\223\002\254\003*\246\003/api/v1/ca" - "che/task_executions/{task_execution_id.n" - "ode_execution_id.execution_id.project}/{" - "task_execution_id.node_execution_id.exec" - "ution_id.domain}/{task_execution_id.node" - "_execution_id.execution_id.name}/{task_e" - "xecution_id.node_execution_id.node_id}/{" - "task_execution_id.task_id.project}/{task" - "_execution_id.task_id.domain}/{task_exec" - "ution_id.task_id.name}/{task_execution_i" - "d.task_id.version}/{task_execution_id.re" - "try_attempt}:\001*B9Z7github.com/flyteorg/f" + "l.core.CacheEvictionErrorList2\227\005\n\014CacheS" + "ervice\022\206\005\n\nEvictCache\022#.flyteidl.service" + ".EvictCacheRequest\032$.flyteidl.service.Ev" + "ictCacheResponse\"\254\004\202\323\344\223\002\245\004*t/api/v1/cach" + "e/executions/{workflow_execution_id.proj" + "ect}/{workflow_execution_id.domain}/{wor" + "kflow_execution_id.name}:\001*Z\251\003*\246\003/api/v1" + "/cache/task_executions/{task_execution_i" + "d.node_execution_id.execution_id.project" + "}/{task_execution_id.node_execution_id.e" + "xecution_id.domain}/{task_execution_id.n" + "ode_execution_id.execution_id.name}/{tas" + "k_execution_id.node_execution_id.node_id" + "}/{task_execution_id.task_id.project}/{t" + "ask_execution_id.task_id.domain}/{task_e" + "xecution_id.task_id.name}/{task_executio" + "n_id.task_id.version}/{task_execution_id" + ".retry_attempt}B9Z7github.com/flyteorg/f" "lyteidl/gen/pb-go/flyteidl/serviceb\006prot" "o3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fcache_2eproto = { false, InitDefaults_flyteidl_2fservice_2fcache_2eproto, descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto, - "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1242, + "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1122, }; void AddDescriptors_flyteidl_2fservice_2fcache_2eproto() { diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go index 4cf6347dbe..aeef737417 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go @@ -156,38 +156,36 @@ func init() { func init() { proto.RegisterFile("flyteidl/service/cache.proto", fileDescriptor_c5ff5da69b96fa44) } var fileDescriptor_c5ff5da69b96fa44 = []byte{ - // 481 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x8a, 0x13, 0x41, - 0x10, 0x76, 0x92, 0x25, 0x87, 0x56, 0xd0, 0x9d, 0x45, 0x94, 0xb0, 0x88, 0xc4, 0x1f, 0x24, 0xe0, - 0x34, 0xae, 0x07, 0x51, 0xf0, 0xb2, 0x12, 0x50, 0xf0, 0x94, 0x5d, 0x10, 0xbc, 0xc4, 0x4e, 0x4f, - 0x65, 0xb6, 0x4c, 0xd2, 0x35, 0x76, 0x57, 0x12, 0xc3, 0xb2, 0x08, 0xbe, 0x80, 0x07, 0x6f, 0x3e, - 0x80, 0x27, 0x6f, 0x3e, 0x89, 0xf8, 0x04, 0x82, 0x0f, 0x22, 0xd3, 0x93, 0x19, 0x9c, 0xfc, 0xac, - 0x2e, 0xec, 0xb5, 0xbf, 0xaf, 0xbe, 0xfe, 0xaa, 0xbe, 0xa2, 0xc4, 0xee, 0x60, 0x34, 0x67, 0xc0, - 0x78, 0x24, 0x1d, 0xd8, 0x29, 0x6a, 0x90, 0x5a, 0xe9, 0x23, 0x88, 0x52, 0x4b, 0x4c, 0xe1, 0x95, - 0x02, 0x8d, 0x16, 0x68, 0x73, 0x37, 0x21, 0x4a, 0x46, 0x20, 0x55, 0x8a, 0x52, 0x19, 0x43, 0xac, - 0x18, 0xc9, 0xb8, 0x9c, 0xdf, 0x6c, 0x96, 0x6a, 0x9a, 0x2c, 0x48, 0xb0, 0x96, 0x6c, 0x81, 0xdd, - 0xa8, 0x62, 0x18, 0x83, 0x61, 0x1c, 0x20, 0xd8, 0x1c, 0x6f, 0xfd, 0x08, 0xc4, 0x76, 0x67, 0x8a, - 0x9a, 0x9f, 0x65, 0x06, 0xba, 0xf0, 0x6e, 0x02, 0x8e, 0xc3, 0x37, 0xe2, 0xea, 0x8c, 0xec, 0x70, - 0x30, 0xa2, 0x59, 0x0f, 0xde, 0x83, 0x9e, 0x64, 0xdf, 0xf5, 0x30, 0xbe, 0x1e, 0xdc, 0x0c, 0xee, - 0x5d, 0xdc, 0x6b, 0x47, 0xa5, 0xc3, 0x4c, 0x35, 0x7a, 0xb5, 0xe0, 0x76, 0x0a, 0xea, 0x8b, 0xf2, - 0x9b, 0xe7, 0x17, 0xba, 0x3b, 0xb3, 0x55, 0x38, 0x3c, 0x14, 0xdb, 0xac, 0xdc, 0xb0, 0xaa, 0x5e, - 0xf3, 0xea, 0x77, 0x97, 0xd4, 0x0f, 0x95, 0x1b, 0xae, 0x57, 0xbe, 0xcc, 0x55, 0x68, 0x7f, 0x4b, - 0xd4, 0x30, 0x6e, 0x1d, 0x88, 0xf0, 0xef, 0x96, 0x5c, 0x4a, 0xc6, 0x41, 0xf8, 0x54, 0x34, 0xf2, - 0xc9, 0x2c, 0x9a, 0xb8, 0xb3, 0xf4, 0x8d, 0x67, 0xfb, 0x3a, 0x24, 0xd3, 0xc9, 0x98, 0x2f, 0xd1, - 0x71, 0x77, 0x51, 0xb4, 0xf7, 0xa9, 0x21, 0x2e, 0x79, 0xca, 0x41, 0x9e, 0x49, 0xf8, 0x2b, 0x10, - 0x3b, 0x9e, 0x5e, 0x1a, 0xf0, 0x70, 0x78, 0x2b, 0x5a, 0x8e, 0x2f, 0x5a, 0x19, 0x70, 0xf3, 0xf6, - 0xe9, 0xa4, 0xdc, 0x72, 0xeb, 0xc3, 0xc7, 0x9f, 0xbf, 0x3f, 0xd7, 0xe6, 0x6d, 0xf6, 0xc1, 0x4f, - 0x1f, 0xe4, 0x5b, 0x22, 0xcb, 0x99, 0x39, 0x79, 0xbc, 0x36, 0xa6, 0x2c, 0xdb, 0xb7, 0xa0, 0xf9, - 0x64, 0x13, 0x1e, 0xd3, 0x58, 0xa1, 0xd9, 0x08, 0x1b, 0x35, 0x86, 0x93, 0x27, 0x41, 0x3b, 0xfc, - 0xb2, 0x25, 0xae, 0x79, 0x5f, 0x95, 0x0c, 0xce, 0xbd, 0xcf, 0xef, 0x75, 0xdf, 0xe8, 0xb7, 0x7a, - 0xfb, 0x6b, 0xbd, 0xda, 0x6a, 0x75, 0x47, 0x9c, 0x3c, 0x5e, 0x59, 0x9a, 0xc8, 0x50, 0x0c, 0xd5, - 0x97, 0x0d, 0xa3, 0x38, 0x73, 0x69, 0x39, 0xa5, 0x33, 0x57, 0xfa, 0x01, 0xfe, 0x5f, 0x9d, 0x7f, - 0xc1, 0x78, 0x2d, 0xdb, 0xbf, 0xfc, 0xa3, 0x87, 0x82, 0x73, 0x8a, 0xd9, 0x82, 0xb2, 0xd1, 0x55, - 0x41, 0x98, 0x82, 0x75, 0x48, 0xeb, 0x45, 0x2c, 0xb0, 0x9d, 0xf7, 0x14, 0x33, 0x8c, 0x53, 0xce, - 0x96, 0x63, 0xff, 0xf1, 0xeb, 0x47, 0x09, 0xf2, 0xd1, 0xa4, 0x1f, 0x69, 0x1a, 0x4b, 0x9f, 0x33, - 0xd9, 0x44, 0x96, 0x07, 0x27, 0x01, 0x23, 0xd3, 0xfe, 0xfd, 0x84, 0xe4, 0xf2, 0xb5, 0xeb, 0x37, - 0xfc, 0xf1, 0x79, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b, 0x44, 0x17, 0x08, 0x05, 0x00, - 0x00, + // 463 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x8a, 0x13, 0x41, + 0x10, 0x36, 0xd9, 0xec, 0x1e, 0x5a, 0x41, 0x77, 0x44, 0x90, 0xb0, 0x88, 0xc4, 0x1f, 0x24, 0xe0, + 0x34, 0xae, 0x07, 0x51, 0xf0, 0xb2, 0x12, 0x50, 0xf0, 0x94, 0x5d, 0x10, 0xf6, 0x12, 0x3b, 0x3d, + 0x95, 0xd9, 0x32, 0x49, 0xd7, 0xd8, 0x5d, 0x49, 0x5c, 0x96, 0x5c, 0x3c, 0xf8, 0x02, 0x1e, 0x7c, + 0x02, 0x05, 0xc1, 0x97, 0x11, 0x5f, 0xc1, 0x07, 0x91, 0xe9, 0xc9, 0x8c, 0x4e, 0x92, 0x59, 0x37, + 0xd7, 0xfa, 0xbe, 0xfa, 0xea, 0xab, 0xfa, 0x66, 0x5a, 0xec, 0x0d, 0x46, 0xa7, 0x0c, 0x18, 0x8d, + 0xa4, 0x03, 0x3b, 0x45, 0x0d, 0x52, 0x2b, 0x7d, 0x02, 0x61, 0x62, 0x89, 0x29, 0xb8, 0x96, 0xa3, + 0xe1, 0x02, 0x6d, 0xee, 0xc5, 0x44, 0xf1, 0x08, 0xa4, 0x4a, 0x50, 0x2a, 0x63, 0x88, 0x15, 0x23, + 0x19, 0x97, 0xf1, 0x9b, 0xcd, 0x42, 0x4d, 0x93, 0x05, 0x09, 0xd6, 0x92, 0xcd, 0xb1, 0x5b, 0x65, + 0x0c, 0x23, 0x30, 0x8c, 0x03, 0x04, 0x9b, 0xe1, 0xad, 0x9f, 0x35, 0xb1, 0xdb, 0x99, 0xa2, 0xe6, + 0x17, 0xa9, 0x81, 0x2e, 0xbc, 0x9f, 0x80, 0xe3, 0xe0, 0xad, 0xb8, 0x31, 0x23, 0x3b, 0x1c, 0x8c, + 0x68, 0xd6, 0x83, 0x0f, 0xa0, 0x27, 0xe9, 0xb8, 0x1e, 0x46, 0x37, 0x6b, 0xb7, 0x6b, 0x0f, 0x2e, + 0xef, 0xb7, 0xc3, 0xc2, 0x61, 0xaa, 0x1a, 0xbe, 0x59, 0x70, 0x3b, 0x39, 0xf5, 0x55, 0x31, 0xe6, + 0xe5, 0xa5, 0xee, 0xf5, 0xd9, 0x2a, 0x1c, 0x1c, 0x89, 0x5d, 0x56, 0x6e, 0x58, 0x56, 0xaf, 0x7b, + 0xf5, 0xfb, 0x4b, 0xea, 0x47, 0xca, 0x0d, 0xd7, 0x2b, 0x5f, 0xe5, 0x32, 0x74, 0xd0, 0x10, 0x75, + 0x8c, 0x5a, 0x87, 0x22, 0xf8, 0x77, 0x25, 0x97, 0x90, 0x71, 0x10, 0x3c, 0x17, 0x3b, 0xd9, 0x65, + 0x16, 0x4b, 0xdc, 0x5b, 0x1a, 0xe3, 0xd9, 0xbe, 0x0f, 0xc9, 0x74, 0x52, 0xe6, 0x6b, 0x74, 0xdc, + 0x5d, 0x34, 0xed, 0x7f, 0xd9, 0x16, 0x57, 0x3c, 0xe5, 0x30, 0xcb, 0x24, 0xf8, 0xb4, 0x2d, 0xc4, + 0xdf, 0x31, 0xc1, 0x9d, 0x70, 0x39, 0xb5, 0x70, 0xe5, 0xae, 0xcd, 0xbb, 0xe7, 0x93, 0x32, 0xa7, + 0xad, 0x1f, 0x8d, 0x8f, 0xbf, 0x7e, 0x7f, 0xae, 0x7f, 0x6d, 0xb4, 0xd9, 0x27, 0x3e, 0x7d, 0x94, + 0x7d, 0x1e, 0xb2, 0x38, 0x96, 0x93, 0x67, 0x6b, 0xf3, 0x49, 0x43, 0x7d, 0x07, 0x9a, 0xe7, 0x55, + 0x78, 0x44, 0x63, 0x85, 0xa6, 0x12, 0x36, 0x6a, 0x0c, 0xf3, 0x67, 0xb5, 0xf6, 0xf1, 0xf7, 0xad, + 0xf6, 0xb7, 0xad, 0xf2, 0xf0, 0x72, 0x5c, 0x4e, 0x9e, 0xad, 0xe4, 0x17, 0x1a, 0x8a, 0xa0, 0x5c, + 0xa9, 0x30, 0xb7, 0x71, 0x6b, 0xe1, 0x7b, 0xe3, 0x4e, 0xbf, 0xd2, 0xc5, 0xfa, 0x7c, 0x05, 0xa3, + 0xb5, 0x6c, 0x5f, 0xf9, 0xcf, 0x0e, 0x39, 0xe7, 0x1c, 0xb3, 0x39, 0xa5, 0xd2, 0x55, 0x4e, 0x98, + 0x82, 0x75, 0x48, 0xeb, 0x45, 0x2c, 0xb0, 0x3d, 0xed, 0x29, 0x66, 0x18, 0x27, 0x3c, 0x3f, 0x78, + 0x7a, 0xfc, 0x24, 0x46, 0x3e, 0x99, 0xf4, 0x43, 0x4d, 0x63, 0xe9, 0x3f, 0x30, 0xb2, 0xb1, 0x2c, + 0x7e, 0xfc, 0x18, 0x8c, 0x4c, 0xfa, 0x0f, 0x63, 0x92, 0xcb, 0xaf, 0x4e, 0x7f, 0xc7, 0x3f, 0x02, + 0x8f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x73, 0x21, 0xfd, 0x90, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -202,10 +200,8 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type CacheServiceClient interface { - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - EvictExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - EvictTaskExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. + EvictCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) } type cacheServiceClient struct { @@ -216,18 +212,9 @@ func NewCacheServiceClient(cc *grpc.ClientConn) CacheServiceClient { return &cacheServiceClient{cc} } -func (c *cacheServiceClient) EvictExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { +func (c *cacheServiceClient) EvictCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { out := new(EvictCacheResponse) - err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictExecutionCache", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { - out := new(EvictCacheResponse) - err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictTaskExecutionCache", in, out, opts...) + err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictCache", in, out, opts...) if err != nil { return nil, err } @@ -236,59 +223,36 @@ func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *Ev // CacheServiceServer is the server API for CacheService service. type CacheServiceServer interface { - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - EvictExecutionCache(context.Context, *EvictCacheRequest) (*EvictCacheResponse, error) - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - EvictTaskExecutionCache(context.Context, *EvictCacheRequest) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. + EvictCache(context.Context, *EvictCacheRequest) (*EvictCacheResponse, error) } // UnimplementedCacheServiceServer can be embedded to have forward compatible implementations. type UnimplementedCacheServiceServer struct { } -func (*UnimplementedCacheServiceServer) EvictExecutionCache(ctx context.Context, req *EvictCacheRequest) (*EvictCacheResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method EvictExecutionCache not implemented") -} -func (*UnimplementedCacheServiceServer) EvictTaskExecutionCache(ctx context.Context, req *EvictCacheRequest) (*EvictCacheResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method EvictTaskExecutionCache not implemented") +func (*UnimplementedCacheServiceServer) EvictCache(ctx context.Context, req *EvictCacheRequest) (*EvictCacheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EvictCache not implemented") } func RegisterCacheServiceServer(s *grpc.Server, srv CacheServiceServer) { s.RegisterService(&_CacheService_serviceDesc, srv) } -func _CacheService_EvictExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(EvictCacheRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(CacheServiceServer).EvictExecutionCache(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/flyteidl.service.CacheService/EvictExecutionCache", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CacheServiceServer).EvictExecutionCache(ctx, req.(*EvictCacheRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _CacheService_EvictTaskExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _CacheService_EvictCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(EvictCacheRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, in) + return srv.(CacheServiceServer).EvictCache(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/flyteidl.service.CacheService/EvictTaskExecutionCache", + FullMethod: "/flyteidl.service.CacheService/EvictCache", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, req.(*EvictCacheRequest)) + return srv.(CacheServiceServer).EvictCache(ctx, req.(*EvictCacheRequest)) } return interceptor(ctx, in, info, handler) } @@ -298,12 +262,8 @@ var _CacheService_serviceDesc = grpc.ServiceDesc{ HandlerType: (*CacheServiceServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "EvictExecutionCache", - Handler: _CacheService_EvictExecutionCache_Handler, - }, - { - MethodName: "EvictTaskExecutionCache", - Handler: _CacheService_EvictTaskExecutionCache_Handler, + MethodName: "EvictCache", + Handler: _CacheService_EvictCache_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go index 1e2c77fe8a..c5cf17516f 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go @@ -28,7 +28,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray -func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_CacheService_EvictCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq EvictCacheRequest var metadata runtime.ServerMetadata @@ -80,23 +80,19 @@ func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler r return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.name", err) } - msg, err := client.EvictExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.EvictCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func request_CacheService_EvictTaskExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +var ( + filter_CacheService_EvictCache_1 = &utilities.DoubleArray{Encoding: map[string]int{"task_execution_id": 0, "node_execution_id": 1, "execution_id": 2, "project": 3, "domain": 4, "name": 5, "node_id": 6, "task_id": 7, "version": 8, "retry_attempt": 9}, Base: []int{1, 20, 1, 1, 1, 4, 3, 2, 7, 5, 3, 0, 0, 0, 9, 6, 0, 15, 9, 0, 17, 12, 0, 19, 15, 0, 19, 18, 0, 20, 0}, Check: []int{0, 1, 2, 3, 4, 2, 6, 7, 2, 9, 10, 5, 8, 11, 2, 15, 16, 2, 18, 19, 2, 21, 22, 2, 24, 25, 2, 27, 28, 2, 30}} +) + +func request_CacheService_EvictCache_1(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq EvictCacheRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( val string ok bool @@ -203,7 +199,14 @@ func request_CacheService_EvictTaskExecutionCache_0(ctx context.Context, marshal return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "task_execution_id.retry_attempt", err) } - msg, err := client.EvictTaskExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CacheService_EvictCache_1); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.EvictCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -246,7 +249,7 @@ func RegisterCacheServiceHandler(ctx context.Context, mux *runtime.ServeMux, con // "CacheServiceClient" to call the correct interceptors. func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client CacheServiceClient) error { - mux.Handle("DELETE", pattern_CacheService_EvictExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("DELETE", pattern_CacheService_EvictCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -255,18 +258,18 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_CacheService_EvictExecutionCache_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_CacheService_EvictCache_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_CacheService_EvictExecutionCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_CacheService_EvictCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("DELETE", pattern_CacheService_EvictTaskExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("DELETE", pattern_CacheService_EvictCache_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -275,14 +278,14 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_CacheService_EvictTaskExecutionCache_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_CacheService_EvictCache_1(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_CacheService_EvictTaskExecutionCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_CacheService_EvictCache_1(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -290,13 +293,13 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu } var ( - pattern_CacheService_EvictExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "workflow_execution_id.project", "workflow_execution_id.domain", "workflow_execution_id.name"}, "")) + pattern_CacheService_EvictCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "workflow_execution_id.project", "workflow_execution_id.domain", "workflow_execution_id.name"}, "")) - pattern_CacheService_EvictTaskExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "task_execution_id.node_execution_id.execution_id.project", "task_execution_id.node_execution_id.execution_id.domain", "task_execution_id.node_execution_id.execution_id.name", "task_execution_id.node_execution_id.node_id", "task_execution_id.task_id.project", "task_execution_id.task_id.domain", "task_execution_id.task_id.name", "task_execution_id.task_id.version", "task_execution_id.retry_attempt"}, "")) + pattern_CacheService_EvictCache_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "task_execution_id.node_execution_id.execution_id.project", "task_execution_id.node_execution_id.execution_id.domain", "task_execution_id.node_execution_id.execution_id.name", "task_execution_id.node_execution_id.node_id", "task_execution_id.task_id.project", "task_execution_id.task_id.domain", "task_execution_id.task_id.name", "task_execution_id.task_id.version", "task_execution_id.retry_attempt"}, "")) ) var ( - forward_CacheService_EvictExecutionCache_0 = runtime.ForwardResponseMessage + forward_CacheService_EvictCache_0 = runtime.ForwardResponseMessage - forward_CacheService_EvictTaskExecutionCache_0 = runtime.ForwardResponseMessage + forward_CacheService_EvictCache_1 = runtime.ForwardResponseMessage ) diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json index 684d2daef7..764d1d3828 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json @@ -17,8 +17,8 @@ "paths": { "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}": { "delete": { - "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.", - "operationId": "EvictExecutionCache", + "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`.", + "operationId": "EvictCache", "responses": { "200": { "description": "A successful response.", @@ -65,8 +65,8 @@ }, "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}": { "delete": { - "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.", - "operationId": "EvictTaskExecutionCache", + "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`.", + "operationId": "EvictCache2", "responses": { "200": { "description": "A successful response.", @@ -139,12 +139,19 @@ "format": "int64" }, { - "name": "body", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/serviceEvictCacheRequest" - } + "name": "task_execution_id.task_id.resource_type", + "description": "Identifies the specific type of resource that this identifier corresponds to.\n\n - DATASET: A dataset represents an entity modeled in Flyte DataCatalog. A Dataset is also a versioned entity and can be a compilation of multiple individual objects.\nEventually all Catalog objects should be modeled similar to Flyte Objects. The Dataset entities makes it possible for the UI and CLI to act on the objects \nin a similar manner to other Flyte objects", + "in": "query", + "required": false, + "type": "string", + "enum": [ + "UNSPECIFIED", + "TASK", + "WORKFLOW", + "LAUNCH_PLAN", + "DATASET" + ], + "default": "UNSPECIFIED" } ], "tags": [ diff --git a/flyteidl/gen/pb-java/flyteidl/service/Cache.java b/flyteidl/gen/pb-java/flyteidl/service/Cache.java index b175ee20a3..17810fb4a8 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Cache.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Cache.java @@ -1742,27 +1742,24 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() { "\021task_execution_id\030\002 \001(\0132&.flyteidl.core" + ".TaskExecutionIdentifierH\000B\004\n\002id\"K\n\022Evic" + "tCacheResponse\0225\n\006errors\030\001 \001(\0132%.flyteid" + - "l.core.CacheEvictionErrorList2\217\006\n\014CacheS" + - "ervice\022\341\001\n\023EvictExecutionCache\022#.flyteid" + - "l.service.EvictCacheRequest\032$.flyteidl.s" + - "ervice.EvictCacheResponse\"\177\202\323\344\223\002y*t/api/" + - "v1/cache/executions/{workflow_execution_" + - "id.project}/{workflow_execution_id.domai" + - "n}/{workflow_execution_id.name}:\001*\022\232\004\n\027E" + - "victTaskExecutionCache\022#.flyteidl.servic" + - "e.EvictCacheRequest\032$.flyteidl.service.E" + - "victCacheResponse\"\263\003\202\323\344\223\002\254\003*\246\003/api/v1/ca" + - "che/task_executions/{task_execution_id.n" + - "ode_execution_id.execution_id.project}/{" + - "task_execution_id.node_execution_id.exec" + - "ution_id.domain}/{task_execution_id.node" + - "_execution_id.execution_id.name}/{task_e" + - "xecution_id.node_execution_id.node_id}/{" + - "task_execution_id.task_id.project}/{task" + - "_execution_id.task_id.domain}/{task_exec" + - "ution_id.task_id.name}/{task_execution_i" + - "d.task_id.version}/{task_execution_id.re" + - "try_attempt}:\001*B9Z7github.com/flyteorg/f" + + "l.core.CacheEvictionErrorList2\227\005\n\014CacheS" + + "ervice\022\206\005\n\nEvictCache\022#.flyteidl.service" + + ".EvictCacheRequest\032$.flyteidl.service.Ev" + + "ictCacheResponse\"\254\004\202\323\344\223\002\245\004*t/api/v1/cach" + + "e/executions/{workflow_execution_id.proj" + + "ect}/{workflow_execution_id.domain}/{wor" + + "kflow_execution_id.name}:\001*Z\251\003*\246\003/api/v1" + + "/cache/task_executions/{task_execution_i" + + "d.node_execution_id.execution_id.project" + + "}/{task_execution_id.node_execution_id.e" + + "xecution_id.domain}/{task_execution_id.n" + + "ode_execution_id.execution_id.name}/{tas" + + "k_execution_id.node_execution_id.node_id" + + "}/{task_execution_id.task_id.project}/{t" + + "ask_execution_id.task_id.domain}/{task_e" + + "xecution_id.task_id.name}/{task_executio" + + "n_id.task_id.version}/{task_execution_id" + + ".retry_attempt}B9Z7github.com/flyteorg/f" + "lyteidl/gen/pb-go/flyteidl/serviceb\006prot" + "o3" }; diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 618d08ae3f..0b3e8ebb24 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -18890,49 +18890,28 @@ export namespace flyteidl { public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): CacheService; /** - * Calls EvictExecutionCache. + * Calls EvictCache. * @param request EvictCacheRequest message or plain object * @param callback Node-style callback called with the error, if any, and EvictCacheResponse */ - public evictExecutionCache(request: flyteidl.service.IEvictCacheRequest, callback: flyteidl.service.CacheService.EvictExecutionCacheCallback): void; + public evictCache(request: flyteidl.service.IEvictCacheRequest, callback: flyteidl.service.CacheService.EvictCacheCallback): void; /** - * Calls EvictExecutionCache. + * Calls EvictCache. * @param request EvictCacheRequest message or plain object * @returns Promise */ - public evictExecutionCache(request: flyteidl.service.IEvictCacheRequest): Promise; - - /** - * Calls EvictTaskExecutionCache. - * @param request EvictCacheRequest message or plain object - * @param callback Node-style callback called with the error, if any, and EvictCacheResponse - */ - public evictTaskExecutionCache(request: flyteidl.service.IEvictCacheRequest, callback: flyteidl.service.CacheService.EvictTaskExecutionCacheCallback): void; - - /** - * Calls EvictTaskExecutionCache. - * @param request EvictCacheRequest message or plain object - * @returns Promise - */ - public evictTaskExecutionCache(request: flyteidl.service.IEvictCacheRequest): Promise; + public evictCache(request: flyteidl.service.IEvictCacheRequest): Promise; } namespace CacheService { /** - * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}. - * @param error Error, if any - * @param [response] EvictCacheResponse - */ - type EvictExecutionCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; - - /** - * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}. + * Callback as used by {@link flyteidl.service.CacheService#evictCache}. * @param error Error, if any * @param [response] EvictCacheResponse */ - type EvictTaskExecutionCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; + type EvictCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; } /** Properties of a CreateUploadLocationResponse. */ diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index a0e52b18ca..99d707034d 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -44024,64 +44024,31 @@ }; /** - * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}. + * Callback as used by {@link flyteidl.service.CacheService#evictCache}. * @memberof flyteidl.service.CacheService - * @typedef EvictExecutionCacheCallback + * @typedef EvictCacheCallback * @type {function} * @param {Error|null} error Error, if any * @param {flyteidl.service.EvictCacheResponse} [response] EvictCacheResponse */ /** - * Calls EvictExecutionCache. - * @function evictExecutionCache + * Calls EvictCache. + * @function evictCache * @memberof flyteidl.service.CacheService * @instance * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object - * @param {flyteidl.service.CacheService.EvictExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse + * @param {flyteidl.service.CacheService.EvictCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse * @returns {undefined} * @variation 1 */ - Object.defineProperty(CacheService.prototype.evictExecutionCache = function evictExecutionCache(request, callback) { - return this.rpcCall(evictExecutionCache, $root.flyteidl.service.EvictCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); - }, "name", { value: "EvictExecutionCache" }); + Object.defineProperty(CacheService.prototype.evictCache = function evictCache(request, callback) { + return this.rpcCall(evictCache, $root.flyteidl.service.EvictCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); + }, "name", { value: "EvictCache" }); /** - * Calls EvictExecutionCache. - * @function evictExecutionCache - * @memberof flyteidl.service.CacheService - * @instance - * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ - - /** - * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}. - * @memberof flyteidl.service.CacheService - * @typedef EvictTaskExecutionCacheCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {flyteidl.service.EvictCacheResponse} [response] EvictCacheResponse - */ - - /** - * Calls EvictTaskExecutionCache. - * @function evictTaskExecutionCache - * @memberof flyteidl.service.CacheService - * @instance - * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object - * @param {flyteidl.service.CacheService.EvictTaskExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(CacheService.prototype.evictTaskExecutionCache = function evictTaskExecutionCache(request, callback) { - return this.rpcCall(evictTaskExecutionCache, $root.flyteidl.service.EvictCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); - }, "name", { value: "EvictTaskExecutionCache" }); - - /** - * Calls EvictTaskExecutionCache. - * @function evictTaskExecutionCache + * Calls EvictCache. + * @function evictCache * @memberof flyteidl.service.CacheService * @instance * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py index 37ba5ebd5f..0fb6c9da16 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py @@ -16,7 +16,7 @@ from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xd1\x01\n\x11\x45victCacheRequest\x12`\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\x12T\n\x11task_execution_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionIdB\x04\n\x02id\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x8f\x06\n\x0c\x43\x61\x63heService\x12\xe1\x01\n\x13\x45victExecutionCache\x12#.flyteidl.service.EvictCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\x7f\x82\xd3\xe4\x93\x02y:\x01**t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\x9a\x04\n\x17\x45victTaskExecutionCache\x12#.flyteidl.service.EvictCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03:\x01**\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xd1\x01\n\x11\x45victCacheRequest\x12`\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\x12T\n\x11task_execution_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionIdB\x04\n\x02id\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x97\x05\n\x0c\x43\x61\x63heService\x12\x86\x05\n\nEvictCache\x12#.flyteidl.service.EvictCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xac\x04\x82\xd3\xe4\x93\x02\xa5\x04:\x01*Z\xa9\x03*\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.cache_pb2', globals()) @@ -24,14 +24,12 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nCacheProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service' - _CACHESERVICE.methods_by_name['EvictExecutionCache']._options = None - _CACHESERVICE.methods_by_name['EvictExecutionCache']._serialized_options = b'\202\323\344\223\002y:\001**t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}' - _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._options = None - _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._serialized_options = b'\202\323\344\223\002\254\003:\001**\246\003/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}' + _CACHESERVICE.methods_by_name['EvictCache']._options = None + _CACHESERVICE.methods_by_name['EvictCache']._serialized_options = b'\202\323\344\223\002\245\004:\001*Z\251\003*\246\003/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}' _EVICTCACHEREQUEST._serialized_start=141 _EVICTCACHEREQUEST._serialized_end=350 _EVICTCACHERESPONSE._serialized_start=352 _EVICTCACHERESPONSE._serialized_end=435 _CACHESERVICE._serialized_start=438 - _CACHESERVICE._serialized_end=1221 + _CACHESERVICE._serialized_end=1101 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py index d80cf23afd..a1a075c1dd 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py @@ -15,13 +15,8 @@ def __init__(self, channel): Args: channel: A grpc.Channel. """ - self.EvictExecutionCache = channel.unary_unary( - '/flyteidl.service.CacheService/EvictExecutionCache', - request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, - response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, - ) - self.EvictTaskExecutionCache = channel.unary_unary( - '/flyteidl.service.CacheService/EvictTaskExecutionCache', + self.EvictCache = channel.unary_unary( + '/flyteidl.service.CacheService/EvictCache', request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, ) @@ -31,15 +26,8 @@ class CacheServiceServicer(object): """CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. """ - def EvictExecutionCache(self, request, context): - """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - """ - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - def EvictTaskExecutionCache(self, request, context): - """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + def EvictCache(self, request, context): + """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. """ context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') @@ -48,13 +36,8 @@ def EvictTaskExecutionCache(self, request, context): def add_CacheServiceServicer_to_server(servicer, server): rpc_method_handlers = { - 'EvictExecutionCache': grpc.unary_unary_rpc_method_handler( - servicer.EvictExecutionCache, - request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.FromString, - response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, - ), - 'EvictTaskExecutionCache': grpc.unary_unary_rpc_method_handler( - servicer.EvictTaskExecutionCache, + 'EvictCache': grpc.unary_unary_rpc_method_handler( + servicer.EvictCache, request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.FromString, response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, ), @@ -70,24 +53,7 @@ class CacheService(object): """ @staticmethod - def EvictExecutionCache(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictExecutionCache', - flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, - flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - - @staticmethod - def EvictTaskExecutionCache(request, + def EvictCache(request, target, options=(), channel_credentials=None, @@ -97,7 +63,7 @@ def EvictTaskExecutionCache(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictTaskExecutionCache', + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictCache', flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, options, channel_credentials, diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst index 764d30d6f4..d486a36004 100644 --- a/flyteidl/protos/docs/service/service.rst +++ b/flyteidl/protos/docs/service/service.rst @@ -300,8 +300,7 @@ CacheService defines an RPC Service for interacting with cached data in Flyte on :header: "Method Name", "Request Type", "Response Type", "Description" :widths: auto - "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`." - "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`." + "EvictCache", ":ref:`ref_flyteidl.service.EvictCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`." .. end services diff --git a/flyteidl/protos/flyteidl/service/cache.proto b/flyteidl/protos/flyteidl/service/cache.proto index 5b69e0fe02..871e87b2bf 100644 --- a/flyteidl/protos/flyteidl/service/cache.proto +++ b/flyteidl/protos/flyteidl/service/cache.proto @@ -26,25 +26,17 @@ message EvictCacheResponse { // CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. service CacheService { - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. - rpc EvictExecutionCache (EvictCacheRequest) returns (EvictCacheResponse) { + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. + rpc EvictCache (EvictCacheRequest) returns (EvictCacheResponse) { option (google.api.http) = { delete: "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}" + additional_bindings: { + delete: "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}" + } body: "*" }; // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { // description: "Evicts all cached data for the referenced (workflow) execution." // }; } - - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. - rpc EvictTaskExecutionCache (EvictCacheRequest) returns (EvictCacheResponse) { - option (google.api.http) = { - delete: "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}" - body: "*" - }; - // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { - // description: "Evicts all cached data for the referenced task execution." - // }; - } } From da32ef0b734235889c4a9f33f95a2ef05c3da6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Fri, 11 Nov 2022 13:11:24 +0100 Subject: [PATCH 16/57] Removed no longer relevant generated mocks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../mocks/CacheManagementServiceClient.go | 114 ------------------ .../mocks/CacheManagementServiceServer.go | 97 --------------- 2 files changed, 211 deletions(-) delete mode 100644 flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go delete mode 100644 flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go diff --git a/flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go deleted file mode 100644 index 4925e4eb56..0000000000 --- a/flyteidl/clients/go/admin/mocks/CacheManagementServiceClient.go +++ /dev/null @@ -1,114 +0,0 @@ -// Code generated by mockery v1.0.1. DO NOT EDIT. - -package mocks - -import ( - context "context" - - grpc "google.golang.org/grpc" - - mock "github.com/stretchr/testify/mock" - - service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" -) - -// CacheManagementServiceClient is an autogenerated mock type for the CacheManagementServiceClient type -type CacheManagementServiceClient struct { - mock.Mock -} - -type CacheManagementServiceClient_EvictExecutionCache struct { - *mock.Call -} - -func (_m CacheManagementServiceClient_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceClient_EvictExecutionCache { - return &CacheManagementServiceClient_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *CacheManagementServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) *CacheManagementServiceClient_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", ctx, in, opts) - return &CacheManagementServiceClient_EvictExecutionCache{Call: c_call} -} - -func (_m *CacheManagementServiceClient) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceClient_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", matchers...) - return &CacheManagementServiceClient_EvictExecutionCache{Call: c_call} -} - -// EvictExecutionCache provides a mock function with given fields: ctx, in, opts -func (_m *CacheManagementServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { - _va := make([]interface{}, len(opts)) - for _i := range opts { - _va[_i] = opts[_i] - } - var _ca []interface{} - _ca = append(_ca, ctx, in) - _ca = append(_ca, _va...) - ret := _m.Called(_ca...) - - var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { - r0 = rf(ctx, in, opts...) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*service.EvictCacheResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) error); ok { - r1 = rf(ctx, in, opts...) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -type CacheManagementServiceClient_EvictTaskExecutionCache struct { - *mock.Call -} - -func (_m CacheManagementServiceClient_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceClient_EvictTaskExecutionCache { - return &CacheManagementServiceClient_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *CacheManagementServiceClient) OnEvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) *CacheManagementServiceClient_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", ctx, in, opts) - return &CacheManagementServiceClient_EvictTaskExecutionCache{Call: c_call} -} - -func (_m *CacheManagementServiceClient) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceClient_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", matchers...) - return &CacheManagementServiceClient_EvictTaskExecutionCache{Call: c_call} -} - -// EvictTaskExecutionCache provides a mock function with given fields: ctx, in, opts -func (_m *CacheManagementServiceClient) EvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { - _va := make([]interface{}, len(opts)) - for _i := range opts { - _va[_i] = opts[_i] - } - var _ca []interface{} - _ca = append(_ca, ctx, in) - _ca = append(_ca, _va...) - ret := _m.Called(_ca...) - - var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { - r0 = rf(ctx, in, opts...) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*service.EvictCacheResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) error); ok { - r1 = rf(ctx, in, opts...) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} diff --git a/flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go deleted file mode 100644 index de739a2ee2..0000000000 --- a/flyteidl/clients/go/admin/mocks/CacheManagementServiceServer.go +++ /dev/null @@ -1,97 +0,0 @@ -// Code generated by mockery v1.0.1. DO NOT EDIT. - -package mocks - -import ( - context "context" - - service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" - mock "github.com/stretchr/testify/mock" -) - -// CacheManagementServiceServer is an autogenerated mock type for the CacheManagementServiceServer type -type CacheManagementServiceServer struct { - mock.Mock -} - -type CacheManagementServiceServer_EvictExecutionCache struct { - *mock.Call -} - -func (_m CacheManagementServiceServer_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceServer_EvictExecutionCache { - return &CacheManagementServiceServer_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *CacheManagementServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) *CacheManagementServiceServer_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", _a0, _a1) - return &CacheManagementServiceServer_EvictExecutionCache{Call: c_call} -} - -func (_m *CacheManagementServiceServer) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceServer_EvictExecutionCache { - c_call := _m.On("EvictExecutionCache", matchers...) - return &CacheManagementServiceServer_EvictExecutionCache{Call: c_call} -} - -// EvictExecutionCache provides a mock function with given fields: _a0, _a1 -func (_m *CacheManagementServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { - ret := _m.Called(_a0, _a1) - - var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest) *service.EvictCacheResponse); ok { - r0 = rf(_a0, _a1) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*service.EvictCacheResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest) error); ok { - r1 = rf(_a0, _a1) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -type CacheManagementServiceServer_EvictTaskExecutionCache struct { - *mock.Call -} - -func (_m CacheManagementServiceServer_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheManagementServiceServer_EvictTaskExecutionCache { - return &CacheManagementServiceServer_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *CacheManagementServiceServer) OnEvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) *CacheManagementServiceServer_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", _a0, _a1) - return &CacheManagementServiceServer_EvictTaskExecutionCache{Call: c_call} -} - -func (_m *CacheManagementServiceServer) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheManagementServiceServer_EvictTaskExecutionCache { - c_call := _m.On("EvictTaskExecutionCache", matchers...) - return &CacheManagementServiceServer_EvictTaskExecutionCache{Call: c_call} -} - -// EvictTaskExecutionCache provides a mock function with given fields: _a0, _a1 -func (_m *CacheManagementServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { - ret := _m.Called(_a0, _a1) - - var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest) *service.EvictCacheResponse); ok { - r0 = rf(_a0, _a1) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*service.EvictCacheResponse) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest) error); ok { - r1 = rf(_a0, _a1) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} From 80e8e722aa57ee5e131613610fa357f5a9977c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 15 Dec 2022 13:44:14 +0100 Subject: [PATCH 17/57] Split CacheService.EvictCache into two separate endpoints grpc-gateway parsing of URL params does not work for joined endpoint at the moment - fixed in major version upgrade Added extra CacheEvictionErrorCode enum entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../go/admin/mocks/CacheServiceClient.go | 74 +- .../go/admin/mocks/CacheServiceServer.go | 67 +- .../gen/pb-cpp/flyteidl/core/errors.pb.cc | 27 +- flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h | 22 +- .../pb-cpp/flyteidl/service/cache.grpc.pb.cc | 80 +- .../pb-cpp/flyteidl/service/cache.grpc.pb.h | 300 +++- .../gen/pb-cpp/flyteidl/service/cache.pb.cc | 698 +++++---- .../gen/pb-cpp/flyteidl/service/cache.pb.h | 342 +++-- flyteidl/gen/pb-go/flyteidl/core/errors.pb.go | 92 +- .../gen/pb-go/flyteidl/service/cache.pb.go | 248 +-- .../gen/pb-go/flyteidl/service/cache.pb.gw.go | 55 +- .../pb-go/flyteidl/service/cache.swagger.json | 38 +- .../gen/pb-java/flyteidl/core/Errors.java | 109 +- .../gen/pb-java/flyteidl/service/Cache.java | 1337 ++++++++++------- flyteidl/gen/pb-js/flyteidl.d.ts | 136 +- flyteidl/gen/pb-js/flyteidl.js | 281 +++- .../gen/pb_python/flyteidl/core/errors_pb2.py | 12 +- .../pb_python/flyteidl/core/errors_pb2.pyi | 6 +- .../pb_python/flyteidl/service/cache_pb2.py | 22 +- .../pb_python/flyteidl/service/cache_pb2.pyi | 20 +- .../flyteidl/service/cache_pb2_grpc.py | 56 +- flyteidl/protos/docs/core/core.rst | 8 +- flyteidl/protos/docs/service/service.rst | 39 +- flyteidl/protos/flyteidl/core/errors.proto | 13 +- flyteidl/protos/flyteidl/service/cache.proto | 34 +- 25 files changed, 2725 insertions(+), 1391 deletions(-) diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go index ce654963c3..0d8e354d98 100644 --- a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go +++ b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go @@ -17,26 +17,26 @@ type CacheServiceClient struct { mock.Mock } -type CacheServiceClient_EvictCache struct { +type CacheServiceClient_EvictExecutionCache struct { *mock.Call } -func (_m CacheServiceClient_EvictCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictCache { - return &CacheServiceClient_EvictCache{Call: _m.Call.Return(_a0, _a1)} +func (_m CacheServiceClient_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictExecutionCache { + return &CacheServiceClient_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceClient) OnEvictCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictCache { - c_call := _m.On("EvictCache", ctx, in, opts) - return &CacheServiceClient_EvictCache{Call: c_call} +func (_m *CacheServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", ctx, in, opts) + return &CacheServiceClient_EvictExecutionCache{Call: c_call} } -func (_m *CacheServiceClient) OnEvictCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictCache { - c_call := _m.On("EvictCache", matchers...) - return &CacheServiceClient_EvictCache{Call: c_call} +func (_m *CacheServiceClient) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", matchers...) + return &CacheServiceClient_EvictExecutionCache{Call: c_call} } -// EvictCache provides a mock function with given fields: ctx, in, opts -func (_m *CacheServiceClient) EvictCache(ctx context.Context, in *service.EvictCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { +// EvictExecutionCache provides a mock function with given fields: ctx, in, opts +func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -47,7 +47,7 @@ func (_m *CacheServiceClient) EvictCache(ctx context.Context, in *service.EvictC ret := _m.Called(_ca...) var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { r0 = rf(ctx, in, opts...) } else { if ret.Get(0) != nil { @@ -56,7 +56,55 @@ func (_m *CacheServiceClient) EvictCache(ctx context.Context, in *service.EvictC } var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest, ...grpc.CallOption) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type CacheServiceClient_EvictTaskExecutionCache struct { + *mock.Call +} + +func (_m CacheServiceClient_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictTaskExecutionCache { + return &CacheServiceClient_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheServiceClient) OnEvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", ctx, in, opts) + return &CacheServiceClient_EvictTaskExecutionCache{Call: c_call} +} + +func (_m *CacheServiceClient) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", matchers...) + return &CacheServiceClient_EvictTaskExecutionCache{Call: c_call} +} + +// EvictTaskExecutionCache provides a mock function with given fields: ctx, in, opts +func (_m *CacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *service.EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { r1 = ret.Error(1) diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go index 85059868c5..d30d216737 100644 --- a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go +++ b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go @@ -14,30 +14,30 @@ type CacheServiceServer struct { mock.Mock } -type CacheServiceServer_EvictCache struct { +type CacheServiceServer_EvictExecutionCache struct { *mock.Call } -func (_m CacheServiceServer_EvictCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictCache { - return &CacheServiceServer_EvictCache{Call: _m.Call.Return(_a0, _a1)} +func (_m CacheServiceServer_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictExecutionCache { + return &CacheServiceServer_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)} } -func (_m *CacheServiceServer) OnEvictCache(_a0 context.Context, _a1 *service.EvictCacheRequest) *CacheServiceServer_EvictCache { - c_call := _m.On("EvictCache", _a0, _a1) - return &CacheServiceServer_EvictCache{Call: c_call} +func (_m *CacheServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) *CacheServiceServer_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", _a0, _a1) + return &CacheServiceServer_EvictExecutionCache{Call: c_call} } -func (_m *CacheServiceServer) OnEvictCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictCache { - c_call := _m.On("EvictCache", matchers...) - return &CacheServiceServer_EvictCache{Call: c_call} +func (_m *CacheServiceServer) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictExecutionCache { + c_call := _m.On("EvictExecutionCache", matchers...) + return &CacheServiceServer_EvictExecutionCache{Call: c_call} } -// EvictCache provides a mock function with given fields: _a0, _a1 -func (_m *CacheServiceServer) EvictCache(_a0 context.Context, _a1 *service.EvictCacheRequest) (*service.EvictCacheResponse, error) { +// EvictExecutionCache provides a mock function with given fields: _a0, _a1 +func (_m *CacheServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) { ret := _m.Called(_a0, _a1) var r0 *service.EvictCacheResponse - if rf, ok := ret.Get(0).(func(context.Context, *service.EvictCacheRequest) *service.EvictCacheResponse); ok { + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest) *service.EvictCacheResponse); ok { r0 = rf(_a0, _a1) } else { if ret.Get(0) != nil { @@ -46,7 +46,48 @@ func (_m *CacheServiceServer) EvictCache(_a0 context.Context, _a1 *service.Evict } var r1 error - if rf, ok := ret.Get(1).(func(context.Context, *service.EvictCacheRequest) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type CacheServiceServer_EvictTaskExecutionCache struct { + *mock.Call +} + +func (_m CacheServiceServer_EvictTaskExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictTaskExecutionCache { + return &CacheServiceServer_EvictTaskExecutionCache{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *CacheServiceServer) OnEvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) *CacheServiceServer_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", _a0, _a1) + return &CacheServiceServer_EvictTaskExecutionCache{Call: c_call} +} + +func (_m *CacheServiceServer) OnEvictTaskExecutionCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictTaskExecutionCache { + c_call := _m.On("EvictTaskExecutionCache", matchers...) + return &CacheServiceServer_EvictTaskExecutionCache{Call: c_call} +} + +// EvictTaskExecutionCache provides a mock function with given fields: _a0, _a1 +func (_m *CacheServiceServer) EvictTaskExecutionCache(_a0 context.Context, _a1 *service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *service.EvictCacheResponse + if rf, ok := ret.Get(0).(func(context.Context, *service.EvictTaskExecutionCacheRequest) *service.EvictCacheResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*service.EvictCacheResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *service.EvictTaskExecutionCacheRequest) error); ok { r1 = rf(_a0, _a1) } else { r1 = ret.Error(1) diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc index 2aac06b2d1..48255b01f1 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc @@ -179,7 +179,7 @@ const char descriptor_table_protodef_flyteidl_2fcore_2ferrors_2eproto[] = "xecutionError.ErrorKind\",\n\004Kind\022\023\n\017NON_R" "ECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n\rErrorDo" "cument\022,\n\005error\030\001 \001(\0132\035.flyteidl.core.Co" - "ntainerError\"\317\002\n\022CacheEvictionError\0224\n\004c" + "ntainerError\"\305\003\n\022CacheEvictionError\0224\n\004c" "ode\030\001 \001(\0162&.flyteidl.core.CacheEvictionE" "rror.Code\022\017\n\007message\030\002 \001(\t\022A\n\021node_execu" "tion_id\030\003 \001(\0132&.flyteidl.core.NodeExecut" @@ -187,16 +187,19 @@ const char descriptor_table_protodef_flyteidl_2fcore_2ferrors_2eproto[] = "2&.flyteidl.core.TaskExecutionIdentifier" "H\000\022K\n\025workflow_execution_id\030\005 \001(\0132*.flyt" "eidl.core.WorkflowExecutionIdentifierH\000\"" - "\023\n\004Code\022\013\n\007UNKNOWN\020\000B\010\n\006source\"K\n\026CacheE" - "victionErrorList\0221\n\006errors\030\001 \003(\0132!.flyte" - "idl.core.CacheEvictionErrorB6Z4github.co" - "m/flyteorg/flyteidl/gen/pb-go/flyteidl/c" - "oreb\006proto3" + "\210\001\n\004Code\022\014\n\010INTERNAL\020\000\022\034\n\030RESERVATION_NO" + "T_ACQUIRED\020\001\022\032\n\026DATABASE_UPDATE_FAILED\020\002" + "\022\032\n\026ARTIFACT_DELETE_FAILED\020\003\022\034\n\030RESERVAT" + "ION_NOT_RELEASED\020\004B\010\n\006source\"K\n\026CacheEvi" + "ctionErrorList\0221\n\006errors\030\001 \003(\0132!.flyteid" + "l.core.CacheEvictionErrorB6Z4github.com/" + "flyteorg/flyteidl/gen/pb-go/flyteidl/cor" + "eb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fcore_2ferrors_2eproto = { false, InitDefaults_flyteidl_2fcore_2ferrors_2eproto, descriptor_table_protodef_flyteidl_2fcore_2ferrors_2eproto, - "flyteidl/core/errors.proto", &assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto, 851, + "flyteidl/core/errors.proto", &assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto, 969, }; void AddDescriptors_flyteidl_2fcore_2ferrors_2eproto() { @@ -240,6 +243,10 @@ const ::google::protobuf::EnumDescriptor* CacheEvictionError_Code_descriptor() { bool CacheEvictionError_Code_IsValid(int value) { switch (value) { case 0: + case 1: + case 2: + case 3: + case 4: return true; default: return false; @@ -247,7 +254,11 @@ bool CacheEvictionError_Code_IsValid(int value) { } #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const CacheEvictionError_Code CacheEvictionError::UNKNOWN; +const CacheEvictionError_Code CacheEvictionError::INTERNAL; +const CacheEvictionError_Code CacheEvictionError::RESERVATION_NOT_ACQUIRED; +const CacheEvictionError_Code CacheEvictionError::DATABASE_UPDATE_FAILED; +const CacheEvictionError_Code CacheEvictionError::ARTIFACT_DELETE_FAILED; +const CacheEvictionError_Code CacheEvictionError::RESERVATION_NOT_RELEASED; const CacheEvictionError_Code CacheEvictionError::Code_MIN; const CacheEvictionError_Code CacheEvictionError::Code_MAX; const int CacheEvictionError::Code_ARRAYSIZE; diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h index d3a0ebc902..dd3456a9f0 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.h @@ -100,13 +100,17 @@ inline bool ContainerError_Kind_Parse( ContainerError_Kind_descriptor(), name, value); } enum CacheEvictionError_Code { - CacheEvictionError_Code_UNKNOWN = 0, + CacheEvictionError_Code_INTERNAL = 0, + CacheEvictionError_Code_RESERVATION_NOT_ACQUIRED = 1, + CacheEvictionError_Code_DATABASE_UPDATE_FAILED = 2, + CacheEvictionError_Code_ARTIFACT_DELETE_FAILED = 3, + CacheEvictionError_Code_RESERVATION_NOT_RELEASED = 4, CacheEvictionError_Code_CacheEvictionError_Code_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::min(), CacheEvictionError_Code_CacheEvictionError_Code_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::max() }; bool CacheEvictionError_Code_IsValid(int value); -const CacheEvictionError_Code CacheEvictionError_Code_Code_MIN = CacheEvictionError_Code_UNKNOWN; -const CacheEvictionError_Code CacheEvictionError_Code_Code_MAX = CacheEvictionError_Code_UNKNOWN; +const CacheEvictionError_Code CacheEvictionError_Code_Code_MIN = CacheEvictionError_Code_INTERNAL; +const CacheEvictionError_Code CacheEvictionError_Code_Code_MAX = CacheEvictionError_Code_RESERVATION_NOT_RELEASED; const int CacheEvictionError_Code_Code_ARRAYSIZE = CacheEvictionError_Code_Code_MAX + 1; const ::google::protobuf::EnumDescriptor* CacheEvictionError_Code_descriptor(); @@ -511,8 +515,16 @@ class CacheEvictionError final : // nested types ---------------------------------------------------- typedef CacheEvictionError_Code Code; - static const Code UNKNOWN = - CacheEvictionError_Code_UNKNOWN; + static const Code INTERNAL = + CacheEvictionError_Code_INTERNAL; + static const Code RESERVATION_NOT_ACQUIRED = + CacheEvictionError_Code_RESERVATION_NOT_ACQUIRED; + static const Code DATABASE_UPDATE_FAILED = + CacheEvictionError_Code_DATABASE_UPDATE_FAILED; + static const Code ARTIFACT_DELETE_FAILED = + CacheEvictionError_Code_ARTIFACT_DELETE_FAILED; + static const Code RESERVATION_NOT_RELEASED = + CacheEvictionError_Code_RESERVATION_NOT_RELEASED; static inline bool Code_IsValid(int value) { return CacheEvictionError_Code_IsValid(value); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc index 587fe1f250..90e90e8e59 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc @@ -20,7 +20,8 @@ namespace flyteidl { namespace service { static const char* CacheService_method_names[] = { - "/flyteidl.service.CacheService/EvictCache", + "/flyteidl.service.CacheService/EvictExecutionCache", + "/flyteidl.service.CacheService/EvictTaskExecutionCache", }; std::unique_ptr< CacheService::Stub> CacheService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) { @@ -30,49 +31,90 @@ std::unique_ptr< CacheService::Stub> CacheService::NewStub(const std::shared_ptr } CacheService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel) - : channel_(channel), rpcmethod_EvictCache_(CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + : channel_(channel), rpcmethod_EvictExecutionCache_(CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_EvictTaskExecutionCache_(CacheService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} -::grpc::Status CacheService::Stub::EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { - return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictCache_, context, request, response); +::grpc::Status CacheService::Stub::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictExecutionCache_, context, request, response); } -void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, std::move(f)); +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); } -void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, std::move(f)); +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f)); } -void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, reactor); +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); } -void CacheService::Stub::experimental_async::EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictCache_, context, request, response, reactor); +void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictCache_, context, request, true); +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, true); } -::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictCache_, context, request, false); +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, false); +} + +::grpc::Status CacheService::Stub::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictTaskExecutionCache_, context, request, response); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, std::move(f)); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); +} + +void CacheService::Stub::experimental_async::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictTaskExecutionCache_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictTaskExecutionCache_, context, request, false); } CacheService::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, - new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( - std::mem_fn(&CacheService::Service::EvictCache), this))); + new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + std::mem_fn(&CacheService::Service::EvictExecutionCache), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + CacheService_method_names[1], + ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + std::mem_fn(&CacheService::Service::EvictTaskExecutionCache), this))); } CacheService::Service::~Service() { } -::grpc::Status CacheService::Service::EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { +::grpc::Status CacheService::Service::EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + +::grpc::Status CacheService::Service::EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) { (void) context; (void) request; (void) response; diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h index 7ecf659683..8632f26b5a 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h @@ -49,45 +49,71 @@ class CacheService final { class StubInterface { public: virtual ~StubInterface() {} - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictCacheRaw(context, request, cq)); + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + virtual ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictCacheRaw(context, request, cq)); + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); + } + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); } class experimental_async_interface { public: virtual ~experimental_async_interface() {} - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. - virtual void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; - virtual void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; - virtual void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; }; virtual class experimental_async_interface* experimental_async() { return nullptr; } private: - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0; }; class Stub final : public StubInterface { public: Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel); - ::grpc::Status EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictCacheRaw(context, request, cq)); + ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictCacheRaw(context, request, cq)); + ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictTaskExecutionCacheRaw(context, request, cq)); } class experimental_async final : public StubInterface::experimental_async_interface { public: - void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; - void EvictCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void EvictCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; private: friend class Stub; explicit experimental_async(Stub* stub): stub_(stub) { } @@ -99,9 +125,12 @@ class CacheService final { private: std::shared_ptr< ::grpc::ChannelInterface> channel_; class experimental_async async_stub_{this}; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictCacheRequest& request, ::grpc::CompletionQueue* cq) override; - const ::grpc::internal::RpcMethod rpcmethod_EvictCache_; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override; + const ::grpc::internal::RpcMethod rpcmethod_EvictExecutionCache_; + const ::grpc::internal::RpcMethod rpcmethod_EvictTaskExecutionCache_; }; static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions()); @@ -109,147 +138,282 @@ class CacheService final { public: Service(); virtual ~Service(); - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. - virtual ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + virtual ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response); }; template - class WithAsyncMethod_EvictCache : public BaseClass { + class WithAsyncMethod_EvictExecutionCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithAsyncMethod_EvictCache() { + WithAsyncMethod_EvictExecutionCache() { ::grpc::Service::MarkMethodAsync(0); } - ~WithAsyncMethod_EvictCache() override { + ~WithAsyncMethod_EvictExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEvictCache(::grpc::ServerContext* context, ::flyteidl::service::EvictCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEvictExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_EvictCache AsyncService; template - class ExperimentalWithCallbackMethod_EvictCache : public BaseClass { + class WithAsyncMethod_EvictTaskExecutionCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - ExperimentalWithCallbackMethod_EvictCache() { + WithAsyncMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodAsync(1); + } + ~WithAsyncMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); + } + }; + typedef WithAsyncMethod_EvictExecutionCache > AsyncService; + template + class ExperimentalWithCallbackMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_EvictExecutionCache() { ::grpc::Service::experimental().MarkMethodCallback(0, - new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>( + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( [this](::grpc::ServerContext* context, - const ::flyteidl::service::EvictCacheRequest* request, + const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { - return this->EvictCache(context, request, response, controller); + return this->EvictExecutionCache(context, request, response, controller); })); } - void SetMessageAllocatorFor_EvictCache( - ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { - static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( + void SetMessageAllocatorFor_EvictExecutionCache( + ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( ::grpc::Service::experimental().GetHandler(0)) ->SetMessageAllocator(allocator); } - ~ExperimentalWithCallbackMethod_EvictCache() override { + ~ExperimentalWithCallbackMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_EvictTaskExecutionCache() { + ::grpc::Service::experimental().MarkMethodCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>( + [this](::grpc::ServerContext* context, + const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, + ::flyteidl::service::EvictCacheResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->EvictTaskExecutionCache(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_EvictTaskExecutionCache( + ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>( + ::grpc::Service::experimental().GetHandler(1)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_EvictTaskExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; - typedef ExperimentalWithCallbackMethod_EvictCache ExperimentalCallbackService; + typedef ExperimentalWithCallbackMethod_EvictExecutionCache > ExperimentalCallbackService; template - class WithGenericMethod_EvictCache : public BaseClass { + class WithGenericMethod_EvictExecutionCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithGenericMethod_EvictCache() { + WithGenericMethod_EvictExecutionCache() { ::grpc::Service::MarkMethodGeneric(0); } - ~WithGenericMethod_EvictCache() override { + ~WithGenericMethod_EvictExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } }; template - class WithRawMethod_EvictCache : public BaseClass { + class WithGenericMethod_EvictTaskExecutionCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithRawMethod_EvictCache() { + WithGenericMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodGeneric(1); + } + ~WithGenericMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template + class WithRawMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_EvictExecutionCache() { ::grpc::Service::MarkMethodRaw(0); } - ~WithRawMethod_EvictCache() override { + ~WithRawMethod_EvictExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEvictCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); } }; template - class ExperimentalWithRawCallbackMethod_EvictCache : public BaseClass { + class WithRawMethod_EvictTaskExecutionCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - ExperimentalWithRawCallbackMethod_EvictCache() { + WithRawMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodRaw(1); + } + ~WithRawMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class ExperimentalWithRawCallbackMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_EvictExecutionCache() { ::grpc::Service::experimental().MarkMethodRawCallback(0, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { - this->EvictCache(context, request, response, controller); + this->EvictExecutionCache(context, request, response, controller); })); } - ~ExperimentalWithRawCallbackMethod_EvictCache() override { + ~ExperimentalWithRawCallbackMethod_EvictExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void EvictCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template - class WithStreamedUnaryMethod_EvictCache : public BaseClass { + class ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithStreamedUnaryMethod_EvictCache() { + ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache() { + ::grpc::Service::experimental().MarkMethodRawCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->EvictTaskExecutionCache(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class WithStreamedUnaryMethod_EvictExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_EvictExecutionCache() { ::grpc::Service::MarkMethodStreamed(0, - new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictCache::StreamedEvictCache, this, std::placeholders::_1, std::placeholders::_2))); + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictExecutionCache::StreamedEvictExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_EvictExecutionCache() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; + }; + template + class WithStreamedUnaryMethod_EvictTaskExecutionCache : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_EvictTaskExecutionCache() { + ::grpc::Service::MarkMethodStreamed(1, + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictTaskExecutionCache::StreamedEvictTaskExecutionCache, this, std::placeholders::_1, std::placeholders::_2))); } - ~WithStreamedUnaryMethod_EvictCache() override { + ~WithStreamedUnaryMethod_EvictTaskExecutionCache() override { BaseClassMustBeDerivedFromService(this); } // disable regular version of this method - ::grpc::Status EvictCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { + ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } // replace default version of method with streamed unary - virtual ::grpc::Status StreamedEvictCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; + virtual ::grpc::Status StreamedEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictTaskExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_EvictCache StreamedUnaryService; + typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedUnaryService; typedef Service SplitStreamedService; - typedef WithStreamedUnaryMethod_EvictCache StreamedService; + typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedService; }; } // namespace service diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc index c6adf4360f..a063929c01 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc @@ -21,32 +21,48 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::p extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; namespace flyteidl { namespace service { -class EvictCacheRequestDefaultTypeInternal { +class EvictExecutionCacheRequestDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; - const ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_; - const ::flyteidl::core::TaskExecutionIdentifier* task_execution_id_; -} _EvictCacheRequest_default_instance_; + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _EvictExecutionCacheRequest_default_instance_; +class EvictTaskExecutionCacheRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _EvictTaskExecutionCacheRequest_default_instance_; class EvictCacheResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _EvictCacheResponse_default_instance_; } // namespace service } // namespace flyteidl -static void InitDefaultsEvictCacheRequest_flyteidl_2fservice_2fcache_2eproto() { +static void InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::service::_EvictExecutionCacheRequest_default_instance_; + new (ptr) ::flyteidl::service::EvictExecutionCacheRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::service::EvictExecutionCacheRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { + &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; + +static void InitDefaultsEvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::flyteidl::service::_EvictCacheRequest_default_instance_; - new (ptr) ::flyteidl::service::EvictCacheRequest(); + void* ptr = &::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_; + new (ptr) ::flyteidl::service::EvictTaskExecutionCacheRequest(); ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } - ::flyteidl::service::EvictCacheRequest::InitAsDefaultInstance(); + ::flyteidl::service::EvictTaskExecutionCacheRequest::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<2> scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsEvictCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { - &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base, +::google::protobuf::internal::SCCInfo<1> scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto}, { &scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; static void InitDefaultsEvictCacheResponse_flyteidl_2fservice_2fcache_2eproto() { @@ -65,23 +81,28 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_EvictCacheResponse_flyteidl_2f &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}}; void InitDefaults_flyteidl_2fservice_2fcache_2eproto() { - ::google::protobuf::internal::InitSCC(&scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_EvictCacheResponse_flyteidl_2fservice_2fcache_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fservice_2fcache_2eproto[2]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fservice_2fcache_2eproto[3]; constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr; const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheRequest, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, _internal_metadata_), ~0u, // no _extensions_ - PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheRequest, _oneof_case_[0]), + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, workflow_execution_id_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictTaskExecutionCacheRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - offsetof(::flyteidl::service::EvictCacheRequestDefaultTypeInternal, workflow_execution_id_), - offsetof(::flyteidl::service::EvictCacheRequestDefaultTypeInternal, task_execution_id_), - PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheRequest, id_), + PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictTaskExecutionCacheRequest, task_execution_id_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheResponse, _internal_metadata_), ~0u, // no _extensions_ @@ -90,56 +111,62 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fcache_2eproto: PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheResponse, errors_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, sizeof(::flyteidl::service::EvictCacheRequest)}, - { 8, -1, sizeof(::flyteidl::service::EvictCacheResponse)}, + { 0, -1, sizeof(::flyteidl::service::EvictExecutionCacheRequest)}, + { 6, -1, sizeof(::flyteidl::service::EvictTaskExecutionCacheRequest)}, + { 12, -1, sizeof(::flyteidl::service::EvictCacheResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { - reinterpret_cast(&::flyteidl::service::_EvictCacheRequest_default_instance_), + reinterpret_cast(&::flyteidl::service::_EvictExecutionCacheRequest_default_instance_), + reinterpret_cast(&::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_), reinterpret_cast(&::flyteidl::service::_EvictCacheResponse_default_instance_), }; ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto = { {}, AddDescriptors_flyteidl_2fservice_2fcache_2eproto, "flyteidl/service/cache.proto", schemas, file_default_instances, TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets, - file_level_metadata_flyteidl_2fservice_2fcache_2eproto, 2, file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto, file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto, + file_level_metadata_flyteidl_2fservice_2fcache_2eproto, 3, file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto, file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto, }; const char descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto[] = "\n\034flyteidl/service/cache.proto\022\020flyteidl" ".service\032\034google/api/annotations.proto\032\032" "flyteidl/core/errors.proto\032\036flyteidl/cor" - "e/identifier.proto\"\253\001\n\021EvictCacheRequest" - "\022K\n\025workflow_execution_id\030\001 \001(\0132*.flytei" - "dl.core.WorkflowExecutionIdentifierH\000\022C\n" - "\021task_execution_id\030\002 \001(\0132&.flyteidl.core" - ".TaskExecutionIdentifierH\000B\004\n\002id\"K\n\022Evic" - "tCacheResponse\0225\n\006errors\030\001 \001(\0132%.flyteid" - "l.core.CacheEvictionErrorList2\227\005\n\014CacheS" - "ervice\022\206\005\n\nEvictCache\022#.flyteidl.service" - ".EvictCacheRequest\032$.flyteidl.service.Ev" - "ictCacheResponse\"\254\004\202\323\344\223\002\245\004*t/api/v1/cach" - "e/executions/{workflow_execution_id.proj" - "ect}/{workflow_execution_id.domain}/{wor" - "kflow_execution_id.name}:\001*Z\251\003*\246\003/api/v1" - "/cache/task_executions/{task_execution_i" - "d.node_execution_id.execution_id.project" - "}/{task_execution_id.node_execution_id.e" - "xecution_id.domain}/{task_execution_id.n" - "ode_execution_id.execution_id.name}/{tas" - "k_execution_id.node_execution_id.node_id" - "}/{task_execution_id.task_id.project}/{t" - "ask_execution_id.task_id.domain}/{task_e" - "xecution_id.task_id.name}/{task_executio" - "n_id.task_id.version}/{task_execution_id" - ".retry_attempt}B9Z7github.com/flyteorg/f" - "lyteidl/gen/pb-go/flyteidl/serviceb\006prot" - "o3" + "e/identifier.proto\"g\n\032EvictExecutionCach" + "eRequest\022I\n\025workflow_execution_id\030\001 \001(\0132" + "*.flyteidl.core.WorkflowExecutionIdentif" + "ier\"c\n\036EvictTaskExecutionCacheRequest\022A\n" + "\021task_execution_id\030\001 \001(\0132&.flyteidl.core" + ".TaskExecutionIdentifier\"K\n\022EvictCacheRe" + "sponse\0225\n\006errors\030\001 \001(\0132%.flyteidl.core.C" + "acheEvictionErrorList2\237\006\n\014CacheService\022\347" + "\001\n\023EvictExecutionCache\022,.flyteidl.servic" + "e.EvictExecutionCacheRequest\032$.flyteidl." + "service.EvictCacheResponse\"|\202\323\344\223\002v*t/api" + "/v1/cache/executions/{workflow_execution" + "_id.project}/{workflow_execution_id.doma" + "in}/{workflow_execution_id.name}\022\244\004\n\027Evi" + "ctTaskExecutionCache\0220.flyteidl.service." + "EvictTaskExecutionCacheRequest\032$.flyteid" + "l.service.EvictCacheResponse\"\260\003\202\323\344\223\002\251\003*\246" + "\003/api/v1/cache/task_executions/{task_exe" + "cution_id.node_execution_id.execution_id" + ".project}/{task_execution_id.node_execut" + "ion_id.execution_id.domain}/{task_execut" + "ion_id.node_execution_id.execution_id.na" + "me}/{task_execution_id.node_execution_id" + ".node_id}/{task_execution_id.task_id.pro" + "ject}/{task_execution_id.task_id.domain}" + "/{task_execution_id.task_id.name}/{task_" + "execution_id.task_id.version}/{task_exec" + "ution_id.retry_attempt}B9Z7github.com/fl" + "yteorg/flyteidl/gen/pb-go/flyteidl/servi" + "ceb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fcache_2eproto = { false, InitDefaults_flyteidl_2fservice_2fcache_2eproto, descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto, - "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1122, + "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1290, }; void AddDescriptors_flyteidl_2fservice_2fcache_2eproto() { @@ -159,156 +186,87 @@ namespace service { // =================================================================== -void EvictCacheRequest::InitAsDefaultInstance() { - ::flyteidl::service::_EvictCacheRequest_default_instance_.workflow_execution_id_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>( +void EvictExecutionCacheRequest::InitAsDefaultInstance() { + ::flyteidl::service::_EvictExecutionCacheRequest_default_instance_._instance.get_mutable()->workflow_execution_id_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>( ::flyteidl::core::WorkflowExecutionIdentifier::internal_default_instance()); - ::flyteidl::service::_EvictCacheRequest_default_instance_.task_execution_id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( - ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); } -class EvictCacheRequest::HasBitSetters { +class EvictExecutionCacheRequest::HasBitSetters { public: - static const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id(const EvictCacheRequest* msg); - static const ::flyteidl::core::TaskExecutionIdentifier& task_execution_id(const EvictCacheRequest* msg); + static const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id(const EvictExecutionCacheRequest* msg); }; const ::flyteidl::core::WorkflowExecutionIdentifier& -EvictCacheRequest::HasBitSetters::workflow_execution_id(const EvictCacheRequest* msg) { - return *msg->id_.workflow_execution_id_; +EvictExecutionCacheRequest::HasBitSetters::workflow_execution_id(const EvictExecutionCacheRequest* msg) { + return *msg->workflow_execution_id_; } -const ::flyteidl::core::TaskExecutionIdentifier& -EvictCacheRequest::HasBitSetters::task_execution_id(const EvictCacheRequest* msg) { - return *msg->id_.task_execution_id_; -} -void EvictCacheRequest::set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - clear_id(); - if (workflow_execution_id) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - workflow_execution_id = ::google::protobuf::internal::GetOwnedMessage( - message_arena, workflow_execution_id, submessage_arena); - } - set_has_workflow_execution_id(); - id_.workflow_execution_id_ = workflow_execution_id; - } - // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictCacheRequest.workflow_execution_id) -} -void EvictCacheRequest::clear_workflow_execution_id() { - if (has_workflow_execution_id()) { - delete id_.workflow_execution_id_; - clear_has_id(); - } -} -void EvictCacheRequest::set_allocated_task_execution_id(::flyteidl::core::TaskExecutionIdentifier* task_execution_id) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - clear_id(); - if (task_execution_id) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - task_execution_id = ::google::protobuf::internal::GetOwnedMessage( - message_arena, task_execution_id, submessage_arena); - } - set_has_task_execution_id(); - id_.task_execution_id_ = task_execution_id; - } - // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictCacheRequest.task_execution_id) -} -void EvictCacheRequest::clear_task_execution_id() { - if (has_task_execution_id()) { - delete id_.task_execution_id_; - clear_has_id(); +void EvictExecutionCacheRequest::clear_workflow_execution_id() { + if (GetArenaNoVirtual() == nullptr && workflow_execution_id_ != nullptr) { + delete workflow_execution_id_; } + workflow_execution_id_ = nullptr; } #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int EvictCacheRequest::kWorkflowExecutionIdFieldNumber; -const int EvictCacheRequest::kTaskExecutionIdFieldNumber; +const int EvictExecutionCacheRequest::kWorkflowExecutionIdFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -EvictCacheRequest::EvictCacheRequest() +EvictExecutionCacheRequest::EvictExecutionCacheRequest() : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); - // @@protoc_insertion_point(constructor:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(constructor:flyteidl.service.EvictExecutionCacheRequest) } -EvictCacheRequest::EvictCacheRequest(const EvictCacheRequest& from) +EvictExecutionCacheRequest::EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - clear_has_id(); - switch (from.id_case()) { - case kWorkflowExecutionId: { - mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id()); - break; - } - case kTaskExecutionId: { - mutable_task_execution_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_execution_id()); - break; - } - case ID_NOT_SET: { - break; - } + if (from.has_workflow_execution_id()) { + workflow_execution_id_ = new ::flyteidl::core::WorkflowExecutionIdentifier(*from.workflow_execution_id_); + } else { + workflow_execution_id_ = nullptr; } - // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictExecutionCacheRequest) } -void EvictCacheRequest::SharedCtor() { +void EvictExecutionCacheRequest::SharedCtor() { ::google::protobuf::internal::InitSCC( - &scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); - clear_has_id(); + &scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + workflow_execution_id_ = nullptr; } -EvictCacheRequest::~EvictCacheRequest() { - // @@protoc_insertion_point(destructor:flyteidl.service.EvictCacheRequest) +EvictExecutionCacheRequest::~EvictExecutionCacheRequest() { + // @@protoc_insertion_point(destructor:flyteidl.service.EvictExecutionCacheRequest) SharedDtor(); } -void EvictCacheRequest::SharedDtor() { - if (has_id()) { - clear_id(); - } +void EvictExecutionCacheRequest::SharedDtor() { + if (this != internal_default_instance()) delete workflow_execution_id_; } -void EvictCacheRequest::SetCachedSize(int size) const { +void EvictExecutionCacheRequest::SetCachedSize(int size) const { _cached_size_.Set(size); } -const EvictCacheRequest& EvictCacheRequest::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_EvictCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); +const EvictExecutionCacheRequest& EvictExecutionCacheRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); return *internal_default_instance(); } -void EvictCacheRequest::clear_id() { -// @@protoc_insertion_point(one_of_clear_start:flyteidl.service.EvictCacheRequest) - switch (id_case()) { - case kWorkflowExecutionId: { - delete id_.workflow_execution_id_; - break; - } - case kTaskExecutionId: { - delete id_.task_execution_id_; - break; - } - case ID_NOT_SET: { - break; - } - } - _oneof_case_[0] = ID_NOT_SET; -} - - -void EvictCacheRequest::Clear() { -// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictCacheRequest) +void EvictExecutionCacheRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictExecutionCacheRequest) ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - clear_id(); + if (GetArenaNoVirtual() == nullptr && workflow_execution_id_ != nullptr) { + delete workflow_execution_id_; + } + workflow_execution_id_ = nullptr; _internal_metadata_.Clear(); } #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* EvictCacheRequest::_InternalParse(const char* begin, const char* end, void* object, +const char* EvictExecutionCacheRequest::_InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); + auto msg = static_cast(object); ::google::protobuf::int32 size; (void)size; int depth; (void)depth; ::google::protobuf::uint32 tag; @@ -331,9 +289,289 @@ const char* EvictCacheRequest::_InternalParse(const char* begin, const char* end {parser_till_end, object}, ptr - size, ptr)); break; } - // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool EvictExecutionCacheRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.service.EvictExecutionCacheRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_workflow_execution_id())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.service.EvictExecutionCacheRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictExecutionCacheRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void EvictExecutionCacheRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + if (this->has_workflow_execution_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::workflow_execution_id(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictExecutionCacheRequest) +} + +::google::protobuf::uint8* EvictExecutionCacheRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + if (this->has_workflow_execution_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::workflow_execution_id(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictExecutionCacheRequest) + return target; +} + +size_t EvictExecutionCacheRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictExecutionCacheRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + if (this->has_workflow_execution_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *workflow_execution_id_); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void EvictExecutionCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictExecutionCacheRequest) + GOOGLE_DCHECK_NE(&from, this); + const EvictExecutionCacheRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictExecutionCacheRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictExecutionCacheRequest) + MergeFrom(*source); + } +} + +void EvictExecutionCacheRequest::MergeFrom(const EvictExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictExecutionCacheRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_workflow_execution_id()) { + mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id()); + } +} + +void EvictExecutionCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictExecutionCacheRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void EvictExecutionCacheRequest::CopyFrom(const EvictExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictExecutionCacheRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool EvictExecutionCacheRequest::IsInitialized() const { + return true; +} + +void EvictExecutionCacheRequest::Swap(EvictExecutionCacheRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void EvictExecutionCacheRequest::InternalSwap(EvictExecutionCacheRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(workflow_execution_id_, other->workflow_execution_id_); +} + +::google::protobuf::Metadata EvictExecutionCacheRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto); + return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void EvictTaskExecutionCacheRequest::InitAsDefaultInstance() { + ::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_._instance.get_mutable()->task_execution_id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( + ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); +} +class EvictTaskExecutionCacheRequest::HasBitSetters { + public: + static const ::flyteidl::core::TaskExecutionIdentifier& task_execution_id(const EvictTaskExecutionCacheRequest* msg); +}; + +const ::flyteidl::core::TaskExecutionIdentifier& +EvictTaskExecutionCacheRequest::HasBitSetters::task_execution_id(const EvictTaskExecutionCacheRequest* msg) { + return *msg->task_execution_id_; +} +void EvictTaskExecutionCacheRequest::clear_task_execution_id() { + if (GetArenaNoVirtual() == nullptr && task_execution_id_ != nullptr) { + delete task_execution_id_; + } + task_execution_id_ = nullptr; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int EvictTaskExecutionCacheRequest::kTaskExecutionIdFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +EvictTaskExecutionCacheRequest::EvictTaskExecutionCacheRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.service.EvictTaskExecutionCacheRequest) +} +EvictTaskExecutionCacheRequest::EvictTaskExecutionCacheRequest(const EvictTaskExecutionCacheRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_task_execution_id()) { + task_execution_id_ = new ::flyteidl::core::TaskExecutionIdentifier(*from.task_execution_id_); + } else { + task_execution_id_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictTaskExecutionCacheRequest) +} + +void EvictTaskExecutionCacheRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + task_execution_id_ = nullptr; +} + +EvictTaskExecutionCacheRequest::~EvictTaskExecutionCacheRequest() { + // @@protoc_insertion_point(destructor:flyteidl.service.EvictTaskExecutionCacheRequest) + SharedDtor(); +} + +void EvictTaskExecutionCacheRequest::SharedDtor() { + if (this != internal_default_instance()) delete task_execution_id_; +} + +void EvictTaskExecutionCacheRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const EvictTaskExecutionCacheRequest& EvictTaskExecutionCacheRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base); + return *internal_default_instance(); +} + + +void EvictTaskExecutionCacheRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictTaskExecutionCacheRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaNoVirtual() == nullptr && task_execution_id_ != nullptr) { + delete task_execution_id_; + } + task_execution_id_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* EvictTaskExecutionCacheRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::TaskExecutionIdentifier::_InternalParse; @@ -364,30 +602,19 @@ const char* EvictCacheRequest::_InternalParse(const char* begin, const char* end {parser_till_end, object}, size); } #else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool EvictCacheRequest::MergePartialFromCodedStream( +bool EvictTaskExecutionCacheRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(parse_start:flyteidl.service.EvictTaskExecutionCacheRequest) for (;;) { ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; case 1: { if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_workflow_execution_id())); - } else { - goto handle_unusual; - } - break; - } - - // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_task_execution_id())); } else { @@ -408,70 +635,57 @@ bool EvictCacheRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(parse_success:flyteidl.service.EvictTaskExecutionCacheRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictTaskExecutionCacheRequest) return false; #undef DO_ } #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -void EvictCacheRequest::SerializeWithCachedSizes( +void EvictTaskExecutionCacheRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictTaskExecutionCacheRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - if (has_workflow_execution_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::workflow_execution_id(this), output); - } - - // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; - if (has_task_execution_id()) { + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; + if (this->has_task_execution_id()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, HasBitSetters::task_execution_id(this), output); + 1, HasBitSetters::task_execution_id(this), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictTaskExecutionCacheRequest) } -::google::protobuf::uint8* EvictCacheRequest::InternalSerializeWithCachedSizesToArray( +::google::protobuf::uint8* EvictTaskExecutionCacheRequest::InternalSerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictTaskExecutionCacheRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - if (has_workflow_execution_id()) { + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; + if (this->has_task_execution_id()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, HasBitSetters::workflow_execution_id(this), target); - } - - // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; - if (has_task_execution_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 2, HasBitSetters::task_execution_id(this), target); + 1, HasBitSetters::task_execution_id(this), target); } if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictTaskExecutionCacheRequest) return target; } -size_t EvictCacheRequest::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictCacheRequest) +size_t EvictTaskExecutionCacheRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictTaskExecutionCacheRequest) size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { @@ -483,97 +697,74 @@ size_t EvictCacheRequest::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - switch (id_case()) { - // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - case kWorkflowExecutionId: { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *id_.workflow_execution_id_); - break; - } - // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; - case kTaskExecutionId: { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *id_.task_execution_id_); - break; - } - case ID_NOT_SET: { - break; - } + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; + if (this->has_task_execution_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *task_execution_id_); } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void EvictCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictCacheRequest) +void EvictTaskExecutionCacheRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) GOOGLE_DCHECK_NE(&from, this); - const EvictCacheRequest* source = - ::google::protobuf::DynamicCastToGenerated( + const EvictTaskExecutionCacheRequest* source = + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictTaskExecutionCacheRequest) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictTaskExecutionCacheRequest) MergeFrom(*source); } } -void EvictCacheRequest::MergeFrom(const EvictCacheRequest& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictCacheRequest) +void EvictTaskExecutionCacheRequest::MergeFrom(const EvictTaskExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - switch (from.id_case()) { - case kWorkflowExecutionId: { - mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id()); - break; - } - case kTaskExecutionId: { - mutable_task_execution_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_execution_id()); - break; - } - case ID_NOT_SET: { - break; - } + if (from.has_task_execution_id()) { + mutable_task_execution_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_execution_id()); } } -void EvictCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictCacheRequest) +void EvictTaskExecutionCacheRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) if (&from == this) return; Clear(); MergeFrom(from); } -void EvictCacheRequest::CopyFrom(const EvictCacheRequest& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictCacheRequest) +void EvictTaskExecutionCacheRequest::CopyFrom(const EvictTaskExecutionCacheRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictTaskExecutionCacheRequest) if (&from == this) return; Clear(); MergeFrom(from); } -bool EvictCacheRequest::IsInitialized() const { +bool EvictTaskExecutionCacheRequest::IsInitialized() const { return true; } -void EvictCacheRequest::Swap(EvictCacheRequest* other) { +void EvictTaskExecutionCacheRequest::Swap(EvictTaskExecutionCacheRequest* other) { if (other == this) return; InternalSwap(other); } -void EvictCacheRequest::InternalSwap(EvictCacheRequest* other) { +void EvictTaskExecutionCacheRequest::InternalSwap(EvictTaskExecutionCacheRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - swap(id_, other->id_); - swap(_oneof_case_[0], other->_oneof_case_[0]); + swap(task_execution_id_, other->task_execution_id_); } -::google::protobuf::Metadata EvictCacheRequest::GetMetadata() const { +::google::protobuf::Metadata EvictTaskExecutionCacheRequest::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto); return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages]; } @@ -877,8 +1068,11 @@ ::google::protobuf::Metadata EvictCacheResponse::GetMetadata() const { } // namespace flyteidl namespace google { namespace protobuf { -template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictCacheRequest >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::service::EvictCacheRequest >(arena); +template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictExecutionCacheRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::service::EvictExecutionCacheRequest >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictTaskExecutionCacheRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::service::EvictTaskExecutionCacheRequest >(arena); } template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictCacheResponse* Arena::CreateMaybeMessage< ::flyteidl::service::EvictCacheResponse >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::service::EvictCacheResponse >(arena); diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h index 61100b3b4d..81ae8167ca 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h @@ -44,7 +44,7 @@ struct TableStruct_flyteidl_2fservice_2fcache_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[2] + static const ::google::protobuf::internal::ParseTable schema[3] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -53,18 +53,22 @@ struct TableStruct_flyteidl_2fservice_2fcache_2eproto { void AddDescriptors_flyteidl_2fservice_2fcache_2eproto(); namespace flyteidl { namespace service { -class EvictCacheRequest; -class EvictCacheRequestDefaultTypeInternal; -extern EvictCacheRequestDefaultTypeInternal _EvictCacheRequest_default_instance_; class EvictCacheResponse; class EvictCacheResponseDefaultTypeInternal; extern EvictCacheResponseDefaultTypeInternal _EvictCacheResponse_default_instance_; +class EvictExecutionCacheRequest; +class EvictExecutionCacheRequestDefaultTypeInternal; +extern EvictExecutionCacheRequestDefaultTypeInternal _EvictExecutionCacheRequest_default_instance_; +class EvictTaskExecutionCacheRequest; +class EvictTaskExecutionCacheRequestDefaultTypeInternal; +extern EvictTaskExecutionCacheRequestDefaultTypeInternal _EvictTaskExecutionCacheRequest_default_instance_; } // namespace service } // namespace flyteidl namespace google { namespace protobuf { -template<> ::flyteidl::service::EvictCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictCacheRequest>(Arena*); template<> ::flyteidl::service::EvictCacheResponse* Arena::CreateMaybeMessage<::flyteidl::service::EvictCacheResponse>(Arena*); +template<> ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictExecutionCacheRequest>(Arena*); +template<> ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictTaskExecutionCacheRequest>(Arena*); } // namespace protobuf } // namespace google namespace flyteidl { @@ -72,25 +76,25 @@ namespace service { // =================================================================== -class EvictCacheRequest final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictCacheRequest) */ { +class EvictExecutionCacheRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictExecutionCacheRequest) */ { public: - EvictCacheRequest(); - virtual ~EvictCacheRequest(); + EvictExecutionCacheRequest(); + virtual ~EvictExecutionCacheRequest(); - EvictCacheRequest(const EvictCacheRequest& from); + EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from); - inline EvictCacheRequest& operator=(const EvictCacheRequest& from) { + inline EvictExecutionCacheRequest& operator=(const EvictExecutionCacheRequest& from) { CopyFrom(from); return *this; } #if LANG_CXX11 - EvictCacheRequest(EvictCacheRequest&& from) noexcept - : EvictCacheRequest() { + EvictExecutionCacheRequest(EvictExecutionCacheRequest&& from) noexcept + : EvictExecutionCacheRequest() { *this = ::std::move(from); } - inline EvictCacheRequest& operator=(EvictCacheRequest&& from) noexcept { + inline EvictExecutionCacheRequest& operator=(EvictExecutionCacheRequest&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); } else { @@ -102,40 +106,34 @@ class EvictCacheRequest final : static const ::google::protobuf::Descriptor* descriptor() { return default_instance().GetDescriptor(); } - static const EvictCacheRequest& default_instance(); - - enum IdCase { - kWorkflowExecutionId = 1, - kTaskExecutionId = 2, - ID_NOT_SET = 0, - }; + static const EvictExecutionCacheRequest& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY - static inline const EvictCacheRequest* internal_default_instance() { - return reinterpret_cast( - &_EvictCacheRequest_default_instance_); + static inline const EvictExecutionCacheRequest* internal_default_instance() { + return reinterpret_cast( + &_EvictExecutionCacheRequest_default_instance_); } static constexpr int kIndexInFileMessages = 0; - void Swap(EvictCacheRequest* other); - friend void swap(EvictCacheRequest& a, EvictCacheRequest& b) { + void Swap(EvictExecutionCacheRequest* other); + friend void swap(EvictExecutionCacheRequest& a, EvictExecutionCacheRequest& b) { a.Swap(&b); } // implements Message ---------------------------------------------- - inline EvictCacheRequest* New() const final { - return CreateMaybeMessage(nullptr); + inline EvictExecutionCacheRequest* New() const final { + return CreateMaybeMessage(nullptr); } - EvictCacheRequest* New(::google::protobuf::Arena* arena) const final { - return CreateMaybeMessage(arena); + EvictExecutionCacheRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); } void CopyFrom(const ::google::protobuf::Message& from) final; void MergeFrom(const ::google::protobuf::Message& from) final; - void CopyFrom(const EvictCacheRequest& from); - void MergeFrom(const EvictCacheRequest& from); + void CopyFrom(const EvictExecutionCacheRequest& from); + void MergeFrom(const EvictExecutionCacheRequest& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -157,7 +155,7 @@ class EvictCacheRequest final : void SharedCtor(); void SharedDtor(); void SetCachedSize(int size) const final; - void InternalSwap(EvictCacheRequest* other); + void InternalSwap(EvictExecutionCacheRequest* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; @@ -182,35 +180,128 @@ class EvictCacheRequest final : ::flyteidl::core::WorkflowExecutionIdentifier* mutable_workflow_execution_id(); void set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id); - // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto; +}; +// ------------------------------------------------------------------- + +class EvictTaskExecutionCacheRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictTaskExecutionCacheRequest) */ { + public: + EvictTaskExecutionCacheRequest(); + virtual ~EvictTaskExecutionCacheRequest(); + + EvictTaskExecutionCacheRequest(const EvictTaskExecutionCacheRequest& from); + + inline EvictTaskExecutionCacheRequest& operator=(const EvictTaskExecutionCacheRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + EvictTaskExecutionCacheRequest(EvictTaskExecutionCacheRequest&& from) noexcept + : EvictTaskExecutionCacheRequest() { + *this = ::std::move(from); + } + + inline EvictTaskExecutionCacheRequest& operator=(EvictTaskExecutionCacheRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const EvictTaskExecutionCacheRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const EvictTaskExecutionCacheRequest* internal_default_instance() { + return reinterpret_cast( + &_EvictTaskExecutionCacheRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 1; + + void Swap(EvictTaskExecutionCacheRequest* other); + friend void swap(EvictTaskExecutionCacheRequest& a, EvictTaskExecutionCacheRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline EvictTaskExecutionCacheRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + EvictTaskExecutionCacheRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const EvictTaskExecutionCacheRequest& from); + void MergeFrom(const EvictTaskExecutionCacheRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(EvictTaskExecutionCacheRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; bool has_task_execution_id() const; void clear_task_execution_id(); - static const int kTaskExecutionIdFieldNumber = 2; + static const int kTaskExecutionIdFieldNumber = 1; const ::flyteidl::core::TaskExecutionIdentifier& task_execution_id() const; ::flyteidl::core::TaskExecutionIdentifier* release_task_execution_id(); ::flyteidl::core::TaskExecutionIdentifier* mutable_task_execution_id(); void set_allocated_task_execution_id(::flyteidl::core::TaskExecutionIdentifier* task_execution_id); - void clear_id(); - IdCase id_case() const; - // @@protoc_insertion_point(class_scope:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictTaskExecutionCacheRequest) private: class HasBitSetters; - void set_has_workflow_execution_id(); - void set_has_task_execution_id(); - - inline bool has_id() const; - inline void clear_has_id(); ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - union IdUnion { - IdUnion() {} - ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_; - ::flyteidl::core::TaskExecutionIdentifier* task_execution_id_; - } id_; + ::flyteidl::core::TaskExecutionIdentifier* task_execution_id_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - ::google::protobuf::uint32 _oneof_case_[1]; - friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto; }; // ------------------------------------------------------------------- @@ -253,7 +344,7 @@ class EvictCacheResponse final : &_EvictCacheResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 1; + 2; void Swap(EvictCacheResponse* other); friend void swap(EvictCacheResponse& a, EvictCacheResponse& b) { @@ -337,87 +428,102 @@ class EvictCacheResponse final : #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif // __GNUC__ -// EvictCacheRequest +// EvictExecutionCacheRequest // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; -inline bool EvictCacheRequest::has_workflow_execution_id() const { - return id_case() == kWorkflowExecutionId; +inline bool EvictExecutionCacheRequest::has_workflow_execution_id() const { + return this != internal_default_instance() && workflow_execution_id_ != nullptr; +} +inline const ::flyteidl::core::WorkflowExecutionIdentifier& EvictExecutionCacheRequest::workflow_execution_id() const { + const ::flyteidl::core::WorkflowExecutionIdentifier* p = workflow_execution_id_; + // @@protoc_insertion_point(field_get:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_WorkflowExecutionIdentifier_default_instance_); } -inline void EvictCacheRequest::set_has_workflow_execution_id() { - _oneof_case_[0] = kWorkflowExecutionId; +inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::release_workflow_execution_id() { + // @@protoc_insertion_point(field_release:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id) + + ::flyteidl::core::WorkflowExecutionIdentifier* temp = workflow_execution_id_; + workflow_execution_id_ = nullptr; + return temp; +} +inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::mutable_workflow_execution_id() { + + if (workflow_execution_id_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::WorkflowExecutionIdentifier>(GetArenaNoVirtual()); + workflow_execution_id_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id) + return workflow_execution_id_; } -inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictCacheRequest::release_workflow_execution_id() { - // @@protoc_insertion_point(field_release:flyteidl.service.EvictCacheRequest.workflow_execution_id) - if (has_workflow_execution_id()) { - clear_has_id(); - ::flyteidl::core::WorkflowExecutionIdentifier* temp = id_.workflow_execution_id_; - id_.workflow_execution_id_ = nullptr; - return temp; +inline void EvictExecutionCacheRequest::set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(workflow_execution_id_); + } + if (workflow_execution_id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + workflow_execution_id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, workflow_execution_id, submessage_arena); + } + } else { - return nullptr; + } + workflow_execution_id_ = workflow_execution_id; + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id) } -inline const ::flyteidl::core::WorkflowExecutionIdentifier& EvictCacheRequest::workflow_execution_id() const { - // @@protoc_insertion_point(field_get:flyteidl.service.EvictCacheRequest.workflow_execution_id) - return has_workflow_execution_id() - ? *id_.workflow_execution_id_ - : *reinterpret_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>(&::flyteidl::core::_WorkflowExecutionIdentifier_default_instance_); + +// ------------------------------------------------------------------- + +// EvictTaskExecutionCacheRequest + +// .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; +inline bool EvictTaskExecutionCacheRequest::has_task_execution_id() const { + return this != internal_default_instance() && task_execution_id_ != nullptr; } -inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictCacheRequest::mutable_workflow_execution_id() { - if (!has_workflow_execution_id()) { - clear_id(); - set_has_workflow_execution_id(); - id_.workflow_execution_id_ = CreateMaybeMessage< ::flyteidl::core::WorkflowExecutionIdentifier >( - GetArenaNoVirtual()); - } - // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictCacheRequest.workflow_execution_id) - return id_.workflow_execution_id_; +inline const ::flyteidl::core::TaskExecutionIdentifier& EvictTaskExecutionCacheRequest::task_execution_id() const { + const ::flyteidl::core::TaskExecutionIdentifier* p = task_execution_id_; + // @@protoc_insertion_point(field_get:flyteidl.service.EvictTaskExecutionCacheRequest.task_execution_id) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_TaskExecutionIdentifier_default_instance_); } - -// .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; -inline bool EvictCacheRequest::has_task_execution_id() const { - return id_case() == kTaskExecutionId; +inline ::flyteidl::core::TaskExecutionIdentifier* EvictTaskExecutionCacheRequest::release_task_execution_id() { + // @@protoc_insertion_point(field_release:flyteidl.service.EvictTaskExecutionCacheRequest.task_execution_id) + + ::flyteidl::core::TaskExecutionIdentifier* temp = task_execution_id_; + task_execution_id_ = nullptr; + return temp; } -inline void EvictCacheRequest::set_has_task_execution_id() { - _oneof_case_[0] = kTaskExecutionId; +inline ::flyteidl::core::TaskExecutionIdentifier* EvictTaskExecutionCacheRequest::mutable_task_execution_id() { + + if (task_execution_id_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::TaskExecutionIdentifier>(GetArenaNoVirtual()); + task_execution_id_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictTaskExecutionCacheRequest.task_execution_id) + return task_execution_id_; } -inline ::flyteidl::core::TaskExecutionIdentifier* EvictCacheRequest::release_task_execution_id() { - // @@protoc_insertion_point(field_release:flyteidl.service.EvictCacheRequest.task_execution_id) - if (has_task_execution_id()) { - clear_has_id(); - ::flyteidl::core::TaskExecutionIdentifier* temp = id_.task_execution_id_; - id_.task_execution_id_ = nullptr; - return temp; +inline void EvictTaskExecutionCacheRequest::set_allocated_task_execution_id(::flyteidl::core::TaskExecutionIdentifier* task_execution_id) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(task_execution_id_); + } + if (task_execution_id) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + task_execution_id = ::google::protobuf::internal::GetOwnedMessage( + message_arena, task_execution_id, submessage_arena); + } + } else { - return nullptr; + } -} -inline const ::flyteidl::core::TaskExecutionIdentifier& EvictCacheRequest::task_execution_id() const { - // @@protoc_insertion_point(field_get:flyteidl.service.EvictCacheRequest.task_execution_id) - return has_task_execution_id() - ? *id_.task_execution_id_ - : *reinterpret_cast< ::flyteidl::core::TaskExecutionIdentifier*>(&::flyteidl::core::_TaskExecutionIdentifier_default_instance_); -} -inline ::flyteidl::core::TaskExecutionIdentifier* EvictCacheRequest::mutable_task_execution_id() { - if (!has_task_execution_id()) { - clear_id(); - set_has_task_execution_id(); - id_.task_execution_id_ = CreateMaybeMessage< ::flyteidl::core::TaskExecutionIdentifier >( - GetArenaNoVirtual()); - } - // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictCacheRequest.task_execution_id) - return id_.task_execution_id_; + task_execution_id_ = task_execution_id; + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictTaskExecutionCacheRequest.task_execution_id) } -inline bool EvictCacheRequest::has_id() const { - return id_case() != ID_NOT_SET; -} -inline void EvictCacheRequest::clear_has_id() { - _oneof_case_[0] = ID_NOT_SET; -} -inline EvictCacheRequest::IdCase EvictCacheRequest::id_case() const { - return EvictCacheRequest::IdCase(_oneof_case_[0]); -} // ------------------------------------------------------------------- // EvictCacheResponse @@ -472,6 +578,8 @@ inline void EvictCacheResponse::set_allocated_errors(::flyteidl::core::CacheEvic #endif // __GNUC__ // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go index f5f9ae5edd..b28dcfe931 100644 --- a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go @@ -46,18 +46,36 @@ func (ContainerError_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor_c2a49b99f342b879, []int{0, 0} } +// Defines codes for distinguishing between errors encountered during cache eviction. type CacheEvictionError_Code int32 const ( - CacheEvictionError_UNKNOWN CacheEvictionError_Code = 0 + // Indicates a generic internal error occurred. + CacheEvictionError_INTERNAL CacheEvictionError_Code = 0 + // Indicates no reservation could be acquired before deleting an artifact. + CacheEvictionError_RESERVATION_NOT_ACQUIRED CacheEvictionError_Code = 1 + // Indicates updating the database entry related to the node execution failed. + CacheEvictionError_DATABASE_UPDATE_FAILED CacheEvictionError_Code = 2 + // Indicates deleting the artifact from datacatalog failed. + CacheEvictionError_ARTIFACT_DELETE_FAILED CacheEvictionError_Code = 3 + // Indicates the reservation previously acquired could not be released for an artifact. + CacheEvictionError_RESERVATION_NOT_RELEASED CacheEvictionError_Code = 4 ) var CacheEvictionError_Code_name = map[int32]string{ - 0: "UNKNOWN", + 0: "INTERNAL", + 1: "RESERVATION_NOT_ACQUIRED", + 2: "DATABASE_UPDATE_FAILED", + 3: "ARTIFACT_DELETE_FAILED", + 4: "RESERVATION_NOT_RELEASED", } var CacheEvictionError_Code_value = map[string]int32{ - "UNKNOWN": 0, + "INTERNAL": 0, + "RESERVATION_NOT_ACQUIRED": 1, + "DATABASE_UPDATE_FAILED": 2, + "ARTIFACT_DELETE_FAILED": 3, + "RESERVATION_NOT_RELEASED": 4, } func (x CacheEvictionError_Code) String() string { @@ -227,7 +245,7 @@ func (m *CacheEvictionError) GetCode() CacheEvictionError_Code { if m != nil { return m.Code } - return CacheEvictionError_UNKNOWN + return CacheEvictionError_INTERNAL } func (m *CacheEvictionError) GetMessage() string { @@ -341,35 +359,39 @@ func init() { func init() { proto.RegisterFile("flyteidl/core/errors.proto", fileDescriptor_c2a49b99f342b879) } var fileDescriptor_c2a49b99f342b879 = []byte{ - // 465 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x61, 0x6b, 0xd3, 0x40, - 0x18, 0xc7, 0x1b, 0x9b, 0x75, 0xfa, 0x84, 0xb5, 0xdb, 0x15, 0x25, 0x14, 0x26, 0x35, 0x2f, 0xb4, - 0x88, 0x26, 0xd0, 0xc9, 0x40, 0xdf, 0x88, 0xed, 0x02, 0xca, 0x46, 0x0a, 0x71, 0x3a, 0xf0, 0x4d, - 0x4d, 0x93, 0xa7, 0xd9, 0xd1, 0xf6, 0x9e, 0x71, 0xb9, 0x5a, 0xfd, 0x20, 0x7e, 0x44, 0xbf, 0x87, - 0xf4, 0xd2, 0x86, 0xa5, 0x2d, 0xeb, 0x9b, 0x90, 0xbb, 0xff, 0xf3, 0xff, 0xdd, 0xdd, 0xff, 0xe1, - 0x81, 0xd6, 0x78, 0xfa, 0x47, 0x21, 0x4f, 0xa6, 0x5e, 0x4c, 0x12, 0x3d, 0x94, 0x92, 0x64, 0xe6, - 0xde, 0x49, 0x52, 0xc4, 0x8e, 0xd6, 0x9a, 0xbb, 0xd4, 0x5a, 0xa7, 0x1b, 0xa5, 0xbf, 0x31, 0x9e, - 0x2b, 0x4e, 0x22, 0xaf, 0x6e, 0x3d, 0x2f, 0xcb, 0x3c, 0x41, 0xa1, 0xf8, 0x98, 0xa3, 0xcc, 0x75, - 0xe7, 0x9f, 0x01, 0xf5, 0x3e, 0x09, 0x15, 0x71, 0x81, 0xd2, 0x5f, 0x9e, 0xc3, 0x18, 0x98, 0x31, - 0x25, 0x68, 0x1b, 0x6d, 0xa3, 0xf3, 0x24, 0xd4, 0xff, 0xcc, 0x86, 0xc3, 0x19, 0x66, 0x59, 0x94, - 0xa2, 0xfd, 0x48, 0x6f, 0xaf, 0x97, 0xec, 0x1c, 0xcc, 0x09, 0x17, 0x89, 0x5d, 0x6d, 0x1b, 0x9d, - 0x7a, 0xd7, 0x71, 0x4b, 0xb7, 0x73, 0xcb, 0x68, 0xf7, 0x92, 0x8b, 0x24, 0xd4, 0xf5, 0xec, 0x23, - 0xd4, 0x48, 0xf2, 0x94, 0x0b, 0xdb, 0xd4, 0xce, 0x57, 0x1b, 0x4e, 0x7f, 0xfd, 0x90, 0xdc, 0xa9, - 0xbf, 0xda, 0xbe, 0xb2, 0x39, 0x6f, 0xc0, 0x5c, 0xae, 0x59, 0x13, 0x1a, 0xc1, 0x20, 0x18, 0x86, - 0x7e, 0x7f, 0xf0, 0xdd, 0x0f, 0x3f, 0xf5, 0xae, 0xfc, 0xe3, 0x0a, 0x6b, 0x80, 0x75, 0x7f, 0xc3, - 0x70, 0x2e, 0xe0, 0x48, 0x23, 0x2e, 0x28, 0x9e, 0xcf, 0x50, 0x28, 0x76, 0x06, 0x07, 0x3a, 0x56, - 0xfd, 0x4c, 0xab, 0x7b, 0xfa, 0xe0, 0xc5, 0xc3, 0xbc, 0xd6, 0xf9, 0x5b, 0x05, 0xd6, 0x8f, 0xe2, - 0x5b, 0xf4, 0x7f, 0xf1, 0xb8, 0xb8, 0x1c, 0xfb, 0x70, 0x2f, 0xb1, 0x7a, 0xf7, 0xe5, 0x26, 0x6a, - 0xcb, 0xe0, 0xf6, 0x29, 0xc1, 0xbd, 0xc9, 0x86, 0x70, 0x22, 0x28, 0xc1, 0x61, 0xd1, 0xd2, 0x21, - 0xcf, 0x63, 0xb6, 0xb6, 0x8e, 0x08, 0x28, 0xc1, 0x22, 0xb0, 0x2f, 0x45, 0x8f, 0xc3, 0x86, 0x28, - 0x0b, 0xec, 0x1a, 0x4e, 0x54, 0x94, 0x4d, 0xca, 0x4c, 0x73, 0x27, 0xf3, 0x3a, 0xca, 0x26, 0x3b, - 0x98, 0x9f, 0x2b, 0x61, 0x43, 0x95, 0x25, 0xf6, 0x13, 0x9e, 0x2e, 0x48, 0x4e, 0xc6, 0x53, 0x5a, - 0x94, 0xc9, 0x07, 0x9a, 0xfc, 0x7a, 0x83, 0x7c, 0xb3, 0xaa, 0xdd, 0x4d, 0x6f, 0x2e, 0xb6, 0x65, - 0xa7, 0x09, 0xe6, 0x32, 0x33, 0x66, 0xc1, 0xe1, 0xb7, 0xe0, 0x32, 0x18, 0xdc, 0x04, 0xc7, 0x95, - 0xde, 0x63, 0xa8, 0x65, 0x34, 0x97, 0x31, 0x3a, 0x5f, 0xe1, 0xd9, 0x76, 0xca, 0x57, 0x3c, 0x53, - 0xec, 0x3d, 0xd4, 0xf2, 0xe9, 0xb1, 0x8d, 0x76, 0xb5, 0x63, 0x75, 0x5f, 0xec, 0x6d, 0x4e, 0xb8, - 0x32, 0xf4, 0xce, 0x7f, 0xbc, 0x4b, 0xb9, 0xba, 0x9d, 0x8f, 0xdc, 0x98, 0x66, 0x9e, 0xb6, 0x91, - 0x4c, 0xbd, 0x62, 0xa0, 0x52, 0x14, 0xde, 0xdd, 0xe8, 0x6d, 0x4a, 0x5e, 0x69, 0xc6, 0x46, 0x35, - 0x3d, 0x59, 0x67, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xba, 0xc5, 0x03, 0xc5, 0x03, 0x00, - 0x00, + // 540 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x61, 0x6f, 0xd2, 0x40, + 0x18, 0xc7, 0xd7, 0xad, 0xc3, 0xf9, 0xe0, 0x06, 0xbb, 0xc5, 0xa5, 0x21, 0xce, 0x60, 0x5f, 0x28, + 0x31, 0xda, 0x26, 0xcc, 0x2c, 0xd1, 0x37, 0xe6, 0x68, 0x6f, 0xb1, 0xb1, 0x29, 0x7a, 0x74, 0x33, + 0xf1, 0x4d, 0x85, 0xf6, 0xe8, 0x2e, 0x40, 0x6f, 0x69, 0x8b, 0xe8, 0x37, 0x30, 0xf1, 0x73, 0xfa, + 0x3d, 0x0c, 0x57, 0xc0, 0x15, 0x88, 0x7b, 0x43, 0xb8, 0xfb, 0x3f, 0xff, 0xdf, 0xdd, 0xfd, 0x9f, + 0x3e, 0xd0, 0x18, 0x8e, 0x7f, 0xe6, 0x8c, 0x47, 0x63, 0x33, 0x14, 0x29, 0x33, 0x59, 0x9a, 0x8a, + 0x34, 0x33, 0x6e, 0x53, 0x91, 0x0b, 0x74, 0xb8, 0xd4, 0x8c, 0xb9, 0xd6, 0x38, 0x5b, 0x2b, 0xfd, + 0xc1, 0xc2, 0x69, 0xce, 0x45, 0x52, 0x54, 0x37, 0x9e, 0x96, 0x65, 0x1e, 0xb1, 0x24, 0xe7, 0x43, + 0xce, 0xd2, 0x42, 0xd7, 0xff, 0x28, 0x70, 0x64, 0x89, 0x24, 0xef, 0xf3, 0x84, 0xa5, 0x64, 0x7e, + 0x0e, 0x42, 0xa0, 0x86, 0x22, 0x62, 0x9a, 0xd2, 0x54, 0x5a, 0x0f, 0xa9, 0xfc, 0x8f, 0x34, 0x78, + 0x30, 0x61, 0x59, 0xd6, 0x8f, 0x99, 0xb6, 0x2b, 0xb7, 0x97, 0x4b, 0x74, 0x01, 0xea, 0x88, 0x27, + 0x91, 0xb6, 0xd7, 0x54, 0x5a, 0x47, 0x6d, 0xdd, 0x28, 0xdd, 0xce, 0x28, 0xa3, 0x8d, 0x8f, 0x3c, + 0x89, 0xa8, 0xac, 0x47, 0xef, 0xa1, 0x22, 0x52, 0x1e, 0xf3, 0x44, 0x53, 0xa5, 0xf3, 0xc5, 0x9a, + 0x93, 0x2c, 0x1f, 0x52, 0x38, 0xe5, 0xaf, 0xb4, 0x2f, 0x6c, 0xfa, 0x2b, 0x50, 0xe7, 0x6b, 0x74, + 0x02, 0x35, 0xaf, 0xeb, 0x05, 0x94, 0x58, 0xdd, 0x6b, 0x42, 0x71, 0xc7, 0x25, 0xf5, 0x1d, 0x54, + 0x83, 0xea, 0xdd, 0x0d, 0x45, 0xb7, 0xe1, 0x50, 0x22, 0x6c, 0x11, 0x4e, 0x27, 0x2c, 0xc9, 0xd1, + 0x39, 0xec, 0xcb, 0x58, 0xe5, 0x33, 0xab, 0xed, 0xb3, 0xff, 0x5e, 0x9c, 0x16, 0xb5, 0xfa, 0x6f, + 0x15, 0x90, 0xd5, 0x0f, 0x6f, 0x18, 0xf9, 0xce, 0xc3, 0xd5, 0xe5, 0xd0, 0xbb, 0x3b, 0x89, 0x1d, + 0xb5, 0x9f, 0xaf, 0xa3, 0x36, 0x0c, 0x86, 0x25, 0x22, 0x76, 0x6f, 0xb2, 0x14, 0x8e, 0x13, 0x11, + 0xb1, 0x60, 0xd5, 0xd2, 0x80, 0x17, 0x31, 0x57, 0x37, 0x8e, 0xf0, 0x44, 0xc4, 0x56, 0x81, 0x39, + 0xab, 0x1e, 0xd3, 0x5a, 0x52, 0x16, 0x90, 0x0f, 0xc7, 0x79, 0x3f, 0x1b, 0x95, 0x99, 0xea, 0x56, + 0xa6, 0xdf, 0xcf, 0x46, 0x5b, 0x98, 0x1f, 0x76, 0x68, 0x2d, 0x2f, 0x4b, 0xe8, 0x1b, 0x3c, 0x9e, + 0x89, 0x74, 0x34, 0x1c, 0x8b, 0x59, 0x99, 0xbc, 0x2f, 0xc9, 0x2f, 0xd7, 0xc8, 0x5f, 0x16, 0xb5, + 0xdb, 0xe9, 0x27, 0xb3, 0x4d, 0x59, 0xff, 0xa5, 0x80, 0x3a, 0x0f, 0x0d, 0x3d, 0x82, 0x03, 0xc7, + 0xf3, 0x09, 0xf5, 0xb0, 0x5b, 0xdf, 0x41, 0x4f, 0x40, 0xa3, 0xa4, 0x47, 0xe8, 0x35, 0xf6, 0x9d, + 0xae, 0x17, 0x78, 0x5d, 0x3f, 0xc0, 0xd6, 0xe7, 0x2b, 0x87, 0x12, 0xbb, 0xae, 0xa0, 0x06, 0x9c, + 0xda, 0xd8, 0xc7, 0x1d, 0xdc, 0x23, 0xc1, 0xd5, 0x27, 0x1b, 0xfb, 0x24, 0xb8, 0xc4, 0x8e, 0x4b, + 0xec, 0xfa, 0xee, 0x5c, 0xc3, 0xd4, 0x77, 0x2e, 0xb1, 0xe5, 0x07, 0x36, 0x71, 0xc9, 0x3f, 0x6d, + 0x6f, 0x1b, 0x95, 0x12, 0x97, 0xe0, 0x1e, 0xb1, 0xeb, 0x6a, 0xe7, 0x00, 0x2a, 0x99, 0x98, 0xa6, + 0x21, 0xd3, 0x7b, 0x70, 0xba, 0xd9, 0x5b, 0x97, 0x67, 0x39, 0x7a, 0x0b, 0x95, 0x62, 0x66, 0x35, + 0xa5, 0xb9, 0xd7, 0xaa, 0xb6, 0x9f, 0xdd, 0xfb, 0x49, 0xd0, 0x85, 0xa1, 0x73, 0xf1, 0xf5, 0x4d, + 0xcc, 0xf3, 0x9b, 0xe9, 0xc0, 0x08, 0xc5, 0xc4, 0x94, 0x36, 0x91, 0xc6, 0xe6, 0x6a, 0x8c, 0x63, + 0x96, 0x98, 0xb7, 0x83, 0xd7, 0xb1, 0x30, 0x4b, 0x93, 0x3d, 0xa8, 0xc8, 0x79, 0x3e, 0xff, 0x1b, + 0x00, 0x00, 0xff, 0xff, 0x2c, 0xe9, 0x29, 0x58, 0x3b, 0x04, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go index aeef737417..b548e280db 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go @@ -26,86 +26,84 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type EvictCacheRequest struct { - // Identifier of resource cached data should be evicted for. - // - // Types that are valid to be assigned to Id: - // *EvictCacheRequest_WorkflowExecutionId - // *EvictCacheRequest_TaskExecutionId - Id isEvictCacheRequest_Id `protobuf_oneof:"id"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *EvictCacheRequest) Reset() { *m = EvictCacheRequest{} } -func (m *EvictCacheRequest) String() string { return proto.CompactTextString(m) } -func (*EvictCacheRequest) ProtoMessage() {} -func (*EvictCacheRequest) Descriptor() ([]byte, []int) { +type EvictExecutionCacheRequest struct { + // Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for. + WorkflowExecutionId *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=workflow_execution_id,json=workflowExecutionId,proto3" json:"workflow_execution_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *EvictExecutionCacheRequest) Reset() { *m = EvictExecutionCacheRequest{} } +func (m *EvictExecutionCacheRequest) String() string { return proto.CompactTextString(m) } +func (*EvictExecutionCacheRequest) ProtoMessage() {} +func (*EvictExecutionCacheRequest) Descriptor() ([]byte, []int) { return fileDescriptor_c5ff5da69b96fa44, []int{0} } -func (m *EvictCacheRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EvictCacheRequest.Unmarshal(m, b) +func (m *EvictExecutionCacheRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EvictExecutionCacheRequest.Unmarshal(m, b) } -func (m *EvictCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EvictCacheRequest.Marshal(b, m, deterministic) +func (m *EvictExecutionCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EvictExecutionCacheRequest.Marshal(b, m, deterministic) } -func (m *EvictCacheRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvictCacheRequest.Merge(m, src) +func (m *EvictExecutionCacheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvictExecutionCacheRequest.Merge(m, src) } -func (m *EvictCacheRequest) XXX_Size() int { - return xxx_messageInfo_EvictCacheRequest.Size(m) +func (m *EvictExecutionCacheRequest) XXX_Size() int { + return xxx_messageInfo_EvictExecutionCacheRequest.Size(m) } -func (m *EvictCacheRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EvictCacheRequest.DiscardUnknown(m) +func (m *EvictExecutionCacheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_EvictExecutionCacheRequest.DiscardUnknown(m) } -var xxx_messageInfo_EvictCacheRequest proto.InternalMessageInfo +var xxx_messageInfo_EvictExecutionCacheRequest proto.InternalMessageInfo -type isEvictCacheRequest_Id interface { - isEvictCacheRequest_Id() +func (m *EvictExecutionCacheRequest) GetWorkflowExecutionId() *core.WorkflowExecutionIdentifier { + if m != nil { + return m.WorkflowExecutionId + } + return nil } -type EvictCacheRequest_WorkflowExecutionId struct { - WorkflowExecutionId *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=workflow_execution_id,json=workflowExecutionId,proto3,oneof"` +type EvictTaskExecutionCacheRequest struct { + // Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. + TaskExecutionId *core.TaskExecutionIdentifier `protobuf:"bytes,1,opt,name=task_execution_id,json=taskExecutionId,proto3" json:"task_execution_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -type EvictCacheRequest_TaskExecutionId struct { - TaskExecutionId *core.TaskExecutionIdentifier `protobuf:"bytes,2,opt,name=task_execution_id,json=taskExecutionId,proto3,oneof"` +func (m *EvictTaskExecutionCacheRequest) Reset() { *m = EvictTaskExecutionCacheRequest{} } +func (m *EvictTaskExecutionCacheRequest) String() string { return proto.CompactTextString(m) } +func (*EvictTaskExecutionCacheRequest) ProtoMessage() {} +func (*EvictTaskExecutionCacheRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_c5ff5da69b96fa44, []int{1} } -func (*EvictCacheRequest_WorkflowExecutionId) isEvictCacheRequest_Id() {} - -func (*EvictCacheRequest_TaskExecutionId) isEvictCacheRequest_Id() {} - -func (m *EvictCacheRequest) GetId() isEvictCacheRequest_Id { - if m != nil { - return m.Id - } - return nil +func (m *EvictTaskExecutionCacheRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EvictTaskExecutionCacheRequest.Unmarshal(m, b) } - -func (m *EvictCacheRequest) GetWorkflowExecutionId() *core.WorkflowExecutionIdentifier { - if x, ok := m.GetId().(*EvictCacheRequest_WorkflowExecutionId); ok { - return x.WorkflowExecutionId - } - return nil +func (m *EvictTaskExecutionCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EvictTaskExecutionCacheRequest.Marshal(b, m, deterministic) } - -func (m *EvictCacheRequest) GetTaskExecutionId() *core.TaskExecutionIdentifier { - if x, ok := m.GetId().(*EvictCacheRequest_TaskExecutionId); ok { - return x.TaskExecutionId - } - return nil +func (m *EvictTaskExecutionCacheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvictTaskExecutionCacheRequest.Merge(m, src) +} +func (m *EvictTaskExecutionCacheRequest) XXX_Size() int { + return xxx_messageInfo_EvictTaskExecutionCacheRequest.Size(m) +} +func (m *EvictTaskExecutionCacheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_EvictTaskExecutionCacheRequest.DiscardUnknown(m) } -// XXX_OneofWrappers is for the internal use of the proto package. -func (*EvictCacheRequest) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*EvictCacheRequest_WorkflowExecutionId)(nil), - (*EvictCacheRequest_TaskExecutionId)(nil), +var xxx_messageInfo_EvictTaskExecutionCacheRequest proto.InternalMessageInfo + +func (m *EvictTaskExecutionCacheRequest) GetTaskExecutionId() *core.TaskExecutionIdentifier { + if m != nil { + return m.TaskExecutionId } + return nil } type EvictCacheResponse struct { @@ -120,7 +118,7 @@ func (m *EvictCacheResponse) Reset() { *m = EvictCacheResponse{} } func (m *EvictCacheResponse) String() string { return proto.CompactTextString(m) } func (*EvictCacheResponse) ProtoMessage() {} func (*EvictCacheResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c5ff5da69b96fa44, []int{1} + return fileDescriptor_c5ff5da69b96fa44, []int{2} } func (m *EvictCacheResponse) XXX_Unmarshal(b []byte) error { @@ -149,43 +147,45 @@ func (m *EvictCacheResponse) GetErrors() *core.CacheEvictionErrorList { } func init() { - proto.RegisterType((*EvictCacheRequest)(nil), "flyteidl.service.EvictCacheRequest") + proto.RegisterType((*EvictExecutionCacheRequest)(nil), "flyteidl.service.EvictExecutionCacheRequest") + proto.RegisterType((*EvictTaskExecutionCacheRequest)(nil), "flyteidl.service.EvictTaskExecutionCacheRequest") proto.RegisterType((*EvictCacheResponse)(nil), "flyteidl.service.EvictCacheResponse") } func init() { proto.RegisterFile("flyteidl/service/cache.proto", fileDescriptor_c5ff5da69b96fa44) } var fileDescriptor_c5ff5da69b96fa44 = []byte{ - // 463 bytes of a gzipped FileDescriptorProto + // 476 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x8a, 0x13, 0x41, - 0x10, 0x36, 0xd9, 0xec, 0x1e, 0x5a, 0x41, 0x77, 0x44, 0x90, 0xb0, 0x88, 0xc4, 0x1f, 0x24, 0xe0, - 0x34, 0xae, 0x07, 0x51, 0xf0, 0xb2, 0x12, 0x50, 0xf0, 0x94, 0x5d, 0x10, 0xf6, 0x12, 0x3b, 0x3d, - 0x95, 0xd9, 0x32, 0x49, 0xd7, 0xd8, 0x5d, 0x49, 0x5c, 0x96, 0x5c, 0x3c, 0xf8, 0x02, 0x1e, 0x7c, - 0x02, 0x05, 0xc1, 0x97, 0x11, 0x5f, 0xc1, 0x07, 0x91, 0xe9, 0xc9, 0x8c, 0x4e, 0x92, 0x59, 0x37, - 0xd7, 0xfa, 0xbe, 0xfa, 0xea, 0xab, 0xfa, 0x66, 0x5a, 0xec, 0x0d, 0x46, 0xa7, 0x0c, 0x18, 0x8d, - 0xa4, 0x03, 0x3b, 0x45, 0x0d, 0x52, 0x2b, 0x7d, 0x02, 0x61, 0x62, 0x89, 0x29, 0xb8, 0x96, 0xa3, - 0xe1, 0x02, 0x6d, 0xee, 0xc5, 0x44, 0xf1, 0x08, 0xa4, 0x4a, 0x50, 0x2a, 0x63, 0x88, 0x15, 0x23, - 0x19, 0x97, 0xf1, 0x9b, 0xcd, 0x42, 0x4d, 0x93, 0x05, 0x09, 0xd6, 0x92, 0xcd, 0xb1, 0x5b, 0x65, - 0x0c, 0x23, 0x30, 0x8c, 0x03, 0x04, 0x9b, 0xe1, 0xad, 0x9f, 0x35, 0xb1, 0xdb, 0x99, 0xa2, 0xe6, - 0x17, 0xa9, 0x81, 0x2e, 0xbc, 0x9f, 0x80, 0xe3, 0xe0, 0xad, 0xb8, 0x31, 0x23, 0x3b, 0x1c, 0x8c, - 0x68, 0xd6, 0x83, 0x0f, 0xa0, 0x27, 0xe9, 0xb8, 0x1e, 0x46, 0x37, 0x6b, 0xb7, 0x6b, 0x0f, 0x2e, - 0xef, 0xb7, 0xc3, 0xc2, 0x61, 0xaa, 0x1a, 0xbe, 0x59, 0x70, 0x3b, 0x39, 0xf5, 0x55, 0x31, 0xe6, - 0xe5, 0xa5, 0xee, 0xf5, 0xd9, 0x2a, 0x1c, 0x1c, 0x89, 0x5d, 0x56, 0x6e, 0x58, 0x56, 0xaf, 0x7b, - 0xf5, 0xfb, 0x4b, 0xea, 0x47, 0xca, 0x0d, 0xd7, 0x2b, 0x5f, 0xe5, 0x32, 0x74, 0xd0, 0x10, 0x75, - 0x8c, 0x5a, 0x87, 0x22, 0xf8, 0x77, 0x25, 0x97, 0x90, 0x71, 0x10, 0x3c, 0x17, 0x3b, 0xd9, 0x65, - 0x16, 0x4b, 0xdc, 0x5b, 0x1a, 0xe3, 0xd9, 0xbe, 0x0f, 0xc9, 0x74, 0x52, 0xe6, 0x6b, 0x74, 0xdc, - 0x5d, 0x34, 0xed, 0x7f, 0xd9, 0x16, 0x57, 0x3c, 0xe5, 0x30, 0xcb, 0x24, 0xf8, 0xb4, 0x2d, 0xc4, - 0xdf, 0x31, 0xc1, 0x9d, 0x70, 0x39, 0xb5, 0x70, 0xe5, 0xae, 0xcd, 0xbb, 0xe7, 0x93, 0x32, 0xa7, - 0xad, 0x1f, 0x8d, 0x8f, 0xbf, 0x7e, 0x7f, 0xae, 0x7f, 0x6d, 0xb4, 0xd9, 0x27, 0x3e, 0x7d, 0x94, - 0x7d, 0x1e, 0xb2, 0x38, 0x96, 0x93, 0x67, 0x6b, 0xf3, 0x49, 0x43, 0x7d, 0x07, 0x9a, 0xe7, 0x55, - 0x78, 0x44, 0x63, 0x85, 0xa6, 0x12, 0x36, 0x6a, 0x0c, 0xf3, 0x67, 0xb5, 0xf6, 0xf1, 0xf7, 0xad, - 0xf6, 0xb7, 0xad, 0xf2, 0xf0, 0x72, 0x5c, 0x4e, 0x9e, 0xad, 0xe4, 0x17, 0x1a, 0x8a, 0xa0, 0x5c, - 0xa9, 0x30, 0xb7, 0x71, 0x6b, 0xe1, 0x7b, 0xe3, 0x4e, 0xbf, 0xd2, 0xc5, 0xfa, 0x7c, 0x05, 0xa3, - 0xb5, 0x6c, 0x5f, 0xf9, 0xcf, 0x0e, 0x39, 0xe7, 0x1c, 0xb3, 0x39, 0xa5, 0xd2, 0x55, 0x4e, 0x98, - 0x82, 0x75, 0x48, 0xeb, 0x45, 0x2c, 0xb0, 0x3d, 0xed, 0x29, 0x66, 0x18, 0x27, 0x3c, 0x3f, 0x78, - 0x7a, 0xfc, 0x24, 0x46, 0x3e, 0x99, 0xf4, 0x43, 0x4d, 0x63, 0xe9, 0x3f, 0x30, 0xb2, 0xb1, 0x2c, - 0x7e, 0xfc, 0x18, 0x8c, 0x4c, 0xfa, 0x0f, 0x63, 0x92, 0xcb, 0xaf, 0x4e, 0x7f, 0xc7, 0x3f, 0x02, - 0x8f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x73, 0x21, 0xfd, 0x90, 0x04, 0x00, 0x00, + 0x10, 0x26, 0x46, 0x72, 0x68, 0x05, 0x75, 0x16, 0x51, 0x86, 0x65, 0x91, 0xa0, 0x22, 0x41, 0xa7, + 0x75, 0x3d, 0x88, 0x07, 0x2f, 0x4a, 0x0e, 0x82, 0xa7, 0xac, 0x20, 0x78, 0x30, 0x74, 0x7a, 0x2a, + 0xb3, 0x6d, 0x92, 0xae, 0xb1, 0xbb, 0x32, 0x71, 0xd9, 0xcd, 0xc5, 0x57, 0xf0, 0x01, 0xbc, 0x88, + 0xe0, 0xcd, 0x77, 0xf1, 0x15, 0x04, 0x5f, 0x43, 0xa6, 0xe7, 0x07, 0x67, 0x76, 0x5a, 0x77, 0xaf, + 0xfd, 0x7d, 0xf5, 0xd5, 0x57, 0xf5, 0x15, 0xcd, 0x76, 0xe7, 0xcb, 0x23, 0x02, 0x15, 0x2f, 0xb9, + 0x05, 0x93, 0x29, 0x09, 0x5c, 0x0a, 0x79, 0x08, 0x51, 0x6a, 0x90, 0x30, 0xb8, 0x5a, 0xa1, 0x51, + 0x89, 0x86, 0xbb, 0x09, 0x62, 0xb2, 0x04, 0x2e, 0x52, 0xc5, 0x85, 0xd6, 0x48, 0x82, 0x14, 0x6a, + 0x5b, 0xf0, 0xc3, 0xb0, 0x56, 0x93, 0x68, 0x80, 0x83, 0x31, 0x68, 0x2a, 0x6c, 0xaf, 0x89, 0xa9, + 0x18, 0x34, 0xa9, 0xb9, 0x02, 0x53, 0xe0, 0xc3, 0x13, 0x16, 0x8e, 0x33, 0x25, 0x69, 0xfc, 0x11, + 0xe4, 0x3a, 0x17, 0x7d, 0x91, 0x1b, 0x99, 0xc0, 0x87, 0x35, 0x58, 0x0a, 0xde, 0xb1, 0xeb, 0x1b, + 0x34, 0x8b, 0xf9, 0x12, 0x37, 0x53, 0xa8, 0x18, 0x53, 0x15, 0xdf, 0xec, 0xdd, 0xea, 0xdd, 0xbb, + 0xb4, 0x3f, 0x8a, 0x6a, 0xa7, 0xb9, 0x7a, 0xf4, 0xa6, 0xe4, 0xd6, 0x62, 0x2f, 0xeb, 0x76, 0x93, + 0x9d, 0xcd, 0x69, 0x70, 0x48, 0x6c, 0xcf, 0x75, 0x7f, 0x2d, 0xec, 0xa2, 0xdb, 0xc1, 0x84, 0x5d, + 0x23, 0x61, 0x17, 0x5d, 0xdd, 0xef, 0xb6, 0xba, 0x37, 0x44, 0xfe, 0xea, 0x7c, 0x85, 0x9a, 0xc0, + 0xf0, 0x80, 0x05, 0xae, 0x6b, 0xd9, 0xc8, 0xa6, 0xa8, 0x2d, 0x04, 0xcf, 0xd8, 0xa0, 0xd8, 0x5c, + 0x29, 0x7f, 0xa7, 0x25, 0xef, 0xd8, 0xae, 0x4e, 0xa1, 0x1e, 0xe7, 0xcc, 0x57, 0xca, 0xd2, 0xa4, + 0x2c, 0xda, 0xff, 0x32, 0x60, 0x97, 0x1d, 0xe5, 0xa0, 0xc8, 0x2c, 0xf8, 0xdd, 0x63, 0x3b, 0x1d, + 0xab, 0x0d, 0xee, 0x47, 0xed, 0x78, 0x23, 0x7f, 0x02, 0xe1, 0x6d, 0x0f, 0xbb, 0xe1, 0x7d, 0x78, + 0xf2, 0xe9, 0xe7, 0xaf, 0xcf, 0x17, 0xb2, 0x11, 0xb9, 0x0b, 0xc9, 0x1e, 0x15, 0xe7, 0xc4, 0xeb, + 0xa5, 0x59, 0x7e, 0xdc, 0x99, 0x63, 0x7e, 0x04, 0xef, 0x41, 0xd2, 0xd6, 0x87, 0xc7, 0xb8, 0x12, + 0x4a, 0x7b, 0x61, 0x2d, 0x56, 0xb0, 0x0d, 0xbe, 0x5e, 0x64, 0x37, 0x3c, 0x31, 0x06, 0x0f, 0x3d, + 0xfe, 0xbd, 0x89, 0x9f, 0x71, 0xe2, 0x1f, 0x7d, 0x37, 0xf2, 0xf7, 0xfe, 0xe8, 0x5b, 0xbf, 0x39, + 0x74, 0xf3, 0x5c, 0x2c, 0x3f, 0x3e, 0x75, 0x3f, 0x91, 0xc6, 0x18, 0x9a, 0x2f, 0x9e, 0xa5, 0x9c, + 0xbb, 0xb4, 0xde, 0xd7, 0xb9, 0x2b, 0xdd, 0x2a, 0xcf, 0x56, 0xe7, 0x5e, 0x54, 0xdc, 0xc9, 0x76, + 0x2f, 0xff, 0x99, 0xa1, 0xe2, 0xfc, 0xc3, 0x6c, 0x45, 0xf1, 0xba, 0xaa, 0x08, 0x19, 0x18, 0xab, + 0xb0, 0x5b, 0xc4, 0x00, 0x99, 0xa3, 0xa9, 0x20, 0x82, 0x55, 0x4a, 0xdb, 0xe7, 0x4f, 0xdf, 0x3e, + 0x49, 0x14, 0x1d, 0xae, 0x67, 0x91, 0xc4, 0x15, 0x77, 0x21, 0xa3, 0x49, 0x78, 0xfd, 0x41, 0x25, + 0xa0, 0x79, 0x3a, 0x7b, 0x90, 0x20, 0x6f, 0xff, 0x8e, 0xb3, 0x81, 0xfb, 0xac, 0x1e, 0xff, 0x09, + 0x00, 0x00, 0xff, 0xff, 0xf4, 0x3a, 0xd2, 0x67, 0x38, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -200,8 +200,10 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type CacheServiceClient interface { - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. - EvictCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) } type cacheServiceClient struct { @@ -212,9 +214,18 @@ func NewCacheServiceClient(cc *grpc.ClientConn) CacheServiceClient { return &cacheServiceClient{cc} } -func (c *cacheServiceClient) EvictCache(ctx context.Context, in *EvictCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { +func (c *cacheServiceClient) EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { + out := new(EvictCacheResponse) + err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictExecutionCache", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) { out := new(EvictCacheResponse) - err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictCache", in, out, opts...) + err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictTaskExecutionCache", in, out, opts...) if err != nil { return nil, err } @@ -223,36 +234,59 @@ func (c *cacheServiceClient) EvictCache(ctx context.Context, in *EvictCacheReque // CacheServiceServer is the server API for CacheService service. type CacheServiceServer interface { - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. - EvictCache(context.Context, *EvictCacheRequest) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + EvictExecutionCache(context.Context, *EvictExecutionCacheRequest) (*EvictCacheResponse, error) + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + EvictTaskExecutionCache(context.Context, *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error) } // UnimplementedCacheServiceServer can be embedded to have forward compatible implementations. type UnimplementedCacheServiceServer struct { } -func (*UnimplementedCacheServiceServer) EvictCache(ctx context.Context, req *EvictCacheRequest) (*EvictCacheResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method EvictCache not implemented") +func (*UnimplementedCacheServiceServer) EvictExecutionCache(ctx context.Context, req *EvictExecutionCacheRequest) (*EvictCacheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EvictExecutionCache not implemented") +} +func (*UnimplementedCacheServiceServer) EvictTaskExecutionCache(ctx context.Context, req *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EvictTaskExecutionCache not implemented") } func RegisterCacheServiceServer(s *grpc.Server, srv CacheServiceServer) { s.RegisterService(&_CacheService_serviceDesc, srv) } -func _CacheService_EvictCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(EvictCacheRequest) +func _CacheService_EvictExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EvictExecutionCacheRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CacheServiceServer).EvictExecutionCache(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/flyteidl.service.CacheService/EvictExecutionCache", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CacheServiceServer).EvictExecutionCache(ctx, req.(*EvictExecutionCacheRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _CacheService_EvictTaskExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EvictTaskExecutionCacheRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(CacheServiceServer).EvictCache(ctx, in) + return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/flyteidl.service.CacheService/EvictCache", + FullMethod: "/flyteidl.service.CacheService/EvictTaskExecutionCache", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CacheServiceServer).EvictCache(ctx, req.(*EvictCacheRequest)) + return srv.(CacheServiceServer).EvictTaskExecutionCache(ctx, req.(*EvictTaskExecutionCacheRequest)) } return interceptor(ctx, in, info, handler) } @@ -262,8 +296,12 @@ var _CacheService_serviceDesc = grpc.ServiceDesc{ HandlerType: (*CacheServiceServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "EvictCache", - Handler: _CacheService_EvictCache_Handler, + MethodName: "EvictExecutionCache", + Handler: _CacheService_EvictExecutionCache_Handler, + }, + { + MethodName: "EvictTaskExecutionCache", + Handler: _CacheService_EvictTaskExecutionCache_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go index c5cf17516f..fdf0495d8d 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go @@ -28,17 +28,13 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray -func request_CacheService_EvictCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq EvictCacheRequest - var metadata runtime.ServerMetadata +var ( + filter_CacheService_EvictExecutionCache_0 = &utilities.DoubleArray{Encoding: map[string]int{"workflow_execution_id": 0, "project": 1, "domain": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}} +) - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } +func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq EvictExecutionCacheRequest + var metadata runtime.ServerMetadata var ( val string @@ -80,17 +76,24 @@ func request_CacheService_EvictCache_0(ctx context.Context, marshaler runtime.Ma return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.name", err) } - msg, err := client.EvictCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CacheService_EvictExecutionCache_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.EvictExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } var ( - filter_CacheService_EvictCache_1 = &utilities.DoubleArray{Encoding: map[string]int{"task_execution_id": 0, "node_execution_id": 1, "execution_id": 2, "project": 3, "domain": 4, "name": 5, "node_id": 6, "task_id": 7, "version": 8, "retry_attempt": 9}, Base: []int{1, 20, 1, 1, 1, 4, 3, 2, 7, 5, 3, 0, 0, 0, 9, 6, 0, 15, 9, 0, 17, 12, 0, 19, 15, 0, 19, 18, 0, 20, 0}, Check: []int{0, 1, 2, 3, 4, 2, 6, 7, 2, 9, 10, 5, 8, 11, 2, 15, 16, 2, 18, 19, 2, 21, 22, 2, 24, 25, 2, 27, 28, 2, 30}} + filter_CacheService_EvictTaskExecutionCache_0 = &utilities.DoubleArray{Encoding: map[string]int{"task_execution_id": 0, "node_execution_id": 1, "execution_id": 2, "project": 3, "domain": 4, "name": 5, "node_id": 6, "task_id": 7, "version": 8, "retry_attempt": 9}, Base: []int{1, 20, 1, 1, 1, 4, 3, 2, 7, 5, 3, 0, 0, 0, 9, 6, 0, 15, 9, 0, 17, 12, 0, 19, 15, 0, 19, 18, 0, 20, 0}, Check: []int{0, 1, 2, 3, 4, 2, 6, 7, 2, 9, 10, 5, 8, 11, 2, 15, 16, 2, 18, 19, 2, 21, 22, 2, 24, 25, 2, 27, 28, 2, 30}} ) -func request_CacheService_EvictCache_1(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq EvictCacheRequest +func request_CacheService_EvictTaskExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq EvictTaskExecutionCacheRequest var metadata runtime.ServerMetadata var ( @@ -202,11 +205,11 @@ func request_CacheService_EvictCache_1(ctx context.Context, marshaler runtime.Ma if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CacheService_EvictCache_1); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CacheService_EvictTaskExecutionCache_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.EvictCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.EvictTaskExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -249,7 +252,7 @@ func RegisterCacheServiceHandler(ctx context.Context, mux *runtime.ServeMux, con // "CacheServiceClient" to call the correct interceptors. func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client CacheServiceClient) error { - mux.Handle("DELETE", pattern_CacheService_EvictCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("DELETE", pattern_CacheService_EvictExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -258,18 +261,18 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_CacheService_EvictCache_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_CacheService_EvictExecutionCache_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_CacheService_EvictCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_CacheService_EvictExecutionCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("DELETE", pattern_CacheService_EvictCache_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("DELETE", pattern_CacheService_EvictTaskExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -278,14 +281,14 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_CacheService_EvictCache_1(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_CacheService_EvictTaskExecutionCache_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_CacheService_EvictCache_1(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_CacheService_EvictTaskExecutionCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -293,13 +296,13 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu } var ( - pattern_CacheService_EvictCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "workflow_execution_id.project", "workflow_execution_id.domain", "workflow_execution_id.name"}, "")) + pattern_CacheService_EvictExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "workflow_execution_id.project", "workflow_execution_id.domain", "workflow_execution_id.name"}, "")) - pattern_CacheService_EvictCache_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "task_execution_id.node_execution_id.execution_id.project", "task_execution_id.node_execution_id.execution_id.domain", "task_execution_id.node_execution_id.execution_id.name", "task_execution_id.node_execution_id.node_id", "task_execution_id.task_id.project", "task_execution_id.task_id.domain", "task_execution_id.task_id.name", "task_execution_id.task_id.version", "task_execution_id.retry_attempt"}, "")) + pattern_CacheService_EvictTaskExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "task_execution_id.node_execution_id.execution_id.project", "task_execution_id.node_execution_id.execution_id.domain", "task_execution_id.node_execution_id.execution_id.name", "task_execution_id.node_execution_id.node_id", "task_execution_id.task_id.project", "task_execution_id.task_id.domain", "task_execution_id.task_id.name", "task_execution_id.task_id.version", "task_execution_id.retry_attempt"}, "")) ) var ( - forward_CacheService_EvictCache_0 = runtime.ForwardResponseMessage + forward_CacheService_EvictExecutionCache_0 = runtime.ForwardResponseMessage - forward_CacheService_EvictCache_1 = runtime.ForwardResponseMessage + forward_CacheService_EvictTaskExecutionCache_0 = runtime.ForwardResponseMessage ) diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json index 764d1d3828..b2aa09e733 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json @@ -17,8 +17,8 @@ "paths": { "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}": { "delete": { - "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`.", - "operationId": "EvictCache", + "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.", + "operationId": "EvictExecutionCache", "responses": { "200": { "description": "A successful response.", @@ -48,14 +48,6 @@ "in": "path", "required": true, "type": "string" - }, - { - "name": "body", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/serviceEvictCacheRequest" - } } ], "tags": [ @@ -65,8 +57,8 @@ }, "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}": { "delete": { - "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`.", - "operationId": "EvictCache2", + "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.", + "operationId": "EvictTaskExecutionCache", "responses": { "200": { "description": "A successful response.", @@ -164,9 +156,14 @@ "CacheEvictionErrorCode": { "type": "string", "enum": [ - "UNKNOWN" + "INTERNAL", + "RESERVATION_NOT_ACQUIRED", + "DATABASE_UPDATE_FAILED", + "ARTIFACT_DELETE_FAILED", + "RESERVATION_NOT_RELEASED" ], - "default": "UNKNOWN" + "default": "INTERNAL", + "description": "Defines codes for distinguishing between errors encountered during cache eviction.\n\n - INTERNAL: Indicates a generic internal error occurred.\n - RESERVATION_NOT_ACQUIRED: Indicates no reservation could be acquired before deleting an artifact.\n - DATABASE_UPDATE_FAILED: Indicates updating the database entry related to the node execution failed.\n - ARTIFACT_DELETE_FAILED: Indicates deleting the artifact from datacatalog failed.\n - RESERVATION_NOT_RELEASED: Indicates the reservation previously acquired could not be released for an artifact." }, "coreCacheEvictionError": { "type": "object", @@ -290,19 +287,6 @@ }, "title": "Encapsulation of fields that uniquely identifies a Flyte workflow execution" }, - "serviceEvictCacheRequest": { - "type": "object", - "properties": { - "workflow_execution_id": { - "$ref": "#/definitions/coreWorkflowExecutionIdentifier", - "description": "Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for." - }, - "task_execution_id": { - "$ref": "#/definitions/coreTaskExecutionIdentifier", - "description": "Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for." - } - } - }, "serviceEvictCacheResponse": { "type": "object", "properties": { diff --git a/flyteidl/gen/pb-java/flyteidl/core/Errors.java b/flyteidl/gen/pb-java/flyteidl/core/Errors.java index 54d6aa45dd..a4a60b03e5 100644 --- a/flyteidl/gen/pb-java/flyteidl/core/Errors.java +++ b/flyteidl/gen/pb-java/flyteidl/core/Errors.java @@ -2067,21 +2067,97 @@ private CacheEvictionError( } /** + * 
+     * Defines codes for distinguishing between errors encountered during cache eviction.
+     *
+ * * Protobuf enum {@code flyteidl.core.CacheEvictionError.Code} */ public enum Code implements com.google.protobuf.ProtocolMessageEnum { /** - * UNKNOWN = 0; + * 
+       * Indicates a generic internal error occurred.
+       *
+ * + * INTERNAL = 0; */ - UNKNOWN(0), + INTERNAL(0), + /** + * 
+       * Indicates no reservation could be acquired before deleting an artifact.
+       *
+ * + * RESERVATION_NOT_ACQUIRED = 1; + */ + RESERVATION_NOT_ACQUIRED(1), + /** + * 
+       * Indicates updating the database entry related to the node execution failed.
+       *
+ * + * DATABASE_UPDATE_FAILED = 2; + */ + DATABASE_UPDATE_FAILED(2), + /** + * 
+       * Indicates deleting the artifact from datacatalog failed.
+       *
+ * + * ARTIFACT_DELETE_FAILED = 3; + */ + ARTIFACT_DELETE_FAILED(3), + /** + * 
+       * Indicates the reservation previously acquired could not be released for an artifact.
+       *
+ * + * RESERVATION_NOT_RELEASED = 4; + */ + RESERVATION_NOT_RELEASED(4), UNRECOGNIZED(-1), ; /** - * UNKNOWN = 0; + * 
+       * Indicates a generic internal error occurred.
+       *
+ * + * INTERNAL = 0; + */ + public static final int INTERNAL_VALUE = 0; + /** + * 
+       * Indicates no reservation could be acquired before deleting an artifact.
+       *
+ * + * RESERVATION_NOT_ACQUIRED = 1; + */ + public static final int RESERVATION_NOT_ACQUIRED_VALUE = 1; + /** + * 
+       * Indicates updating the database entry related to the node execution failed.
+       *
+ * + * DATABASE_UPDATE_FAILED = 2; + */ + public static final int DATABASE_UPDATE_FAILED_VALUE = 2; + /** + * 
+       * Indicates deleting the artifact from datacatalog failed.
+       *
+ * + * ARTIFACT_DELETE_FAILED = 3; + */ + public static final int ARTIFACT_DELETE_FAILED_VALUE = 3; + /** + * 
+       * Indicates the reservation previously acquired could not be released for an artifact.
+       *
+ * + * RESERVATION_NOT_RELEASED = 4; */ - public static final int UNKNOWN_VALUE = 0; + public static final int RESERVATION_NOT_RELEASED_VALUE = 4; public final int getNumber() { @@ -2102,7 +2178,11 @@ public static Code valueOf(int value) { public static Code forNumber(int value) { switch (value) { - case 0: return UNKNOWN; + case 0: return INTERNAL; + case 1: return RESERVATION_NOT_ACQUIRED; + case 2: return DATABASE_UPDATE_FAILED; + case 3: return ARTIFACT_DELETE_FAILED; + case 4: return RESERVATION_NOT_RELEASED; default: return null; } } @@ -2383,7 +2463,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (code_ != flyteidl.core.Errors.CacheEvictionError.Code.UNKNOWN.getNumber()) { + if (code_ != flyteidl.core.Errors.CacheEvictionError.Code.INTERNAL.getNumber()) { output.writeEnum(1, code_); } if (!getMessageBytes().isEmpty()) { @@ -2407,7 +2487,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (code_ != flyteidl.core.Errors.CacheEvictionError.Code.UNKNOWN.getNumber()) { + if (code_ != flyteidl.core.Errors.CacheEvictionError.Code.INTERNAL.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(1, code_); } @@ -4335,7 +4415,7 @@ public flyteidl.core.Errors.CacheEvictionErrorList getDefaultInstanceForType() { "xecutionError.ErrorKind\",\n\004Kind\022\023\n\017NON_R" + "ECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n\rErrorDo" + "cument\022,\n\005error\030\001 \001(\0132\035.flyteidl.core.Co" + - "ntainerError\"\317\002\n\022CacheEvictionError\0224\n\004c" + + "ntainerError\"\305\003\n\022CacheEvictionError\0224\n\004c" + "ode\030\001 \001(\0162&.flyteidl.core.CacheEvictionE" + "rror.Code\022\017\n\007message\030\002 \001(\t\022A\n\021node_execu" + "tion_id\030\003 \001(\0132&.flyteidl.core.NodeExecut" + @@ -4343,11 +4423,14 @@ public flyteidl.core.Errors.CacheEvictionErrorList getDefaultInstanceForType() { "2&.flyteidl.core.TaskExecutionIdentifier" + "H\000\022K\n\025workflow_execution_id\030\005 \001(\0132*.flyt" + "eidl.core.WorkflowExecutionIdentifierH\000\"" + - "\023\n\004Code\022\013\n\007UNKNOWN\020\000B\010\n\006source\"K\n\026CacheE" + - "victionErrorList\0221\n\006errors\030\001 \003(\0132!.flyte" + - "idl.core.CacheEvictionErrorB6Z4github.co" + - "m/flyteorg/flyteidl/gen/pb-go/flyteidl/c" + - "oreb\006proto3" + "\210\001\n\004Code\022\014\n\010INTERNAL\020\000\022\034\n\030RESERVATION_NO" + + "T_ACQUIRED\020\001\022\032\n\026DATABASE_UPDATE_FAILED\020\002" + + "\022\032\n\026ARTIFACT_DELETE_FAILED\020\003\022\034\n\030RESERVAT" + + "ION_NOT_RELEASED\020\004B\010\n\006source\"K\n\026CacheEvi" + + "ctionErrorList\0221\n\006errors\030\001 \003(\0132!.flyteid" + + "l.core.CacheEvictionErrorB6Z4github.com/" + + "flyteorg/flyteidl/gen/pb-go/flyteidl/cor" + + "eb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/flyteidl/gen/pb-java/flyteidl/service/Cache.java b/flyteidl/gen/pb-java/flyteidl/service/Cache.java index 17810fb4a8..1d4012eba2 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Cache.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Cache.java @@ -14,8 +14,8 @@ public static void registerAllExtensions( registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } - public interface EvictCacheRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictCacheRequest) + public interface EvictExecutionCacheRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictExecutionCacheRequest) com.google.protobuf.MessageOrBuilder { /** @@ -42,13 +42,654 @@ public interface EvictCacheRequestOrBuilder extends * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; */ flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder(); + } + /** + * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest} + */ + public static final class EvictExecutionCacheRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.service.EvictExecutionCacheRequest) + EvictExecutionCacheRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use EvictExecutionCacheRequest.newBuilder() to construct. + private EvictExecutionCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private EvictExecutionCacheRequest() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private EvictExecutionCacheRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null; + if (workflowExecutionId_ != null) { + subBuilder = workflowExecutionId_.toBuilder(); + } + workflowExecutionId_ = input.readMessage(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(workflowExecutionId_); + workflowExecutionId_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class); + } + + public static final int WORKFLOW_EXECUTION_ID_FIELD_NUMBER = 1; + private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier workflowExecutionId_; + /** + * 
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public boolean hasWorkflowExecutionId() { + return workflowExecutionId_ != null; + } + /** + * 
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { + return workflowExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : workflowExecutionId_; + } + /** + * 
+     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+     *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { + return getWorkflowExecutionId(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (workflowExecutionId_ != null) { + output.writeMessage(1, getWorkflowExecutionId()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (workflowExecutionId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getWorkflowExecutionId()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.service.Cache.EvictExecutionCacheRequest)) { + return super.equals(obj); + } + flyteidl.service.Cache.EvictExecutionCacheRequest other = (flyteidl.service.Cache.EvictExecutionCacheRequest) obj; + + if (hasWorkflowExecutionId() != other.hasWorkflowExecutionId()) return false; + if (hasWorkflowExecutionId()) { + if (!getWorkflowExecutionId() + .equals(other.getWorkflowExecutionId())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasWorkflowExecutionId()) { + hash = (37 * hash) + WORKFLOW_EXECUTION_ID_FIELD_NUMBER; + hash = (53 * hash) + getWorkflowExecutionId().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.service.Cache.EvictExecutionCacheRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictExecutionCacheRequest) + flyteidl.service.Cache.EvictExecutionCacheRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class); + } + + // Construct using flyteidl.service.Cache.EvictExecutionCacheRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (workflowExecutionIdBuilder_ == null) { + workflowExecutionId_ = null; + } else { + workflowExecutionId_ = null; + workflowExecutionIdBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() { + return flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest build() { + flyteidl.service.Cache.EvictExecutionCacheRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest buildPartial() { + flyteidl.service.Cache.EvictExecutionCacheRequest result = new flyteidl.service.Cache.EvictExecutionCacheRequest(this); + if (workflowExecutionIdBuilder_ == null) { + result.workflowExecutionId_ = workflowExecutionId_; + } else { + result.workflowExecutionId_ = workflowExecutionIdBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.service.Cache.EvictExecutionCacheRequest) { + return mergeFrom((flyteidl.service.Cache.EvictExecutionCacheRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.service.Cache.EvictExecutionCacheRequest other) { + if (other == flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance()) return this; + if (other.hasWorkflowExecutionId()) { + mergeWorkflowExecutionId(other.getWorkflowExecutionId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.service.Cache.EvictExecutionCacheRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.service.Cache.EvictExecutionCacheRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier workflowExecutionId_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> workflowExecutionIdBuilder_; + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public boolean hasWorkflowExecutionId() { + return workflowExecutionIdBuilder_ != null || workflowExecutionId_ != null; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { + if (workflowExecutionIdBuilder_ == null) { + return workflowExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : workflowExecutionId_; + } else { + return workflowExecutionIdBuilder_.getMessage(); + } + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public Builder setWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (workflowExecutionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + workflowExecutionId_ = value; + onChanged(); + } else { + workflowExecutionIdBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public Builder setWorkflowExecutionId( + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) { + if (workflowExecutionIdBuilder_ == null) { + workflowExecutionId_ = builderForValue.build(); + onChanged(); + } else { + workflowExecutionIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public Builder mergeWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { + if (workflowExecutionIdBuilder_ == null) { + if (workflowExecutionId_ != null) { + workflowExecutionId_ = + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.newBuilder(workflowExecutionId_).mergeFrom(value).buildPartial(); + } else { + workflowExecutionId_ = value; + } + onChanged(); + } else { + workflowExecutionIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public Builder clearWorkflowExecutionId() { + if (workflowExecutionIdBuilder_ == null) { + workflowExecutionId_ = null; + onChanged(); + } else { + workflowExecutionId_ = null; + workflowExecutionIdBuilder_ = null; + } + + return this; + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getWorkflowExecutionIdBuilder() { + + onChanged(); + return getWorkflowExecutionIdFieldBuilder().getBuilder(); + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { + if (workflowExecutionIdBuilder_ != null) { + return workflowExecutionIdBuilder_.getMessageOrBuilder(); + } else { + return workflowExecutionId_ == null ? + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : workflowExecutionId_; + } + } + /** + * 
+       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+       *
+ * + * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> + getWorkflowExecutionIdFieldBuilder() { + if (workflowExecutionIdBuilder_ == null) { + workflowExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder>( + getWorkflowExecutionId(), + getParentForChildren(), + isClean()); + workflowExecutionId_ = null; + } + return workflowExecutionIdBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictExecutionCacheRequest) + } + + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest) + private static final flyteidl.service.Cache.EvictExecutionCacheRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictExecutionCacheRequest(); + } + + public static flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public EvictExecutionCacheRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new EvictExecutionCacheRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface EvictTaskExecutionCacheRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictTaskExecutionCacheRequest) + com.google.protobuf.MessageOrBuilder { /** * 
      * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ boolean hasTaskExecutionId(); /** @@ -56,7 +697,7 @@ public interface EvictCacheRequestOrBuilder extends * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId(); /** @@ -64,25 +705,23 @@ public interface EvictCacheRequestOrBuilder extends * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder(); - - public flyteidl.service.Cache.EvictCacheRequest.IdCase getIdCase(); } /** - * Protobuf type {@code flyteidl.service.EvictCacheRequest} + * Protobuf type {@code flyteidl.service.EvictTaskExecutionCacheRequest} */ - public static final class EvictCacheRequest extends + public static final class EvictTaskExecutionCacheRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:flyteidl.service.EvictCacheRequest) - EvictCacheRequestOrBuilder { + // @@protoc_insertion_point(message_implements:flyteidl.service.EvictTaskExecutionCacheRequest) + EvictTaskExecutionCacheRequestOrBuilder { private static final long serialVersionUID = 0L; - // Use EvictCacheRequest.newBuilder() to construct. - private EvictCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use EvictTaskExecutionCacheRequest.newBuilder() to construct. + private EvictTaskExecutionCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private EvictCacheRequest() { + private EvictTaskExecutionCacheRequest() { } @java.lang.Override @@ -90,7 +729,7 @@ private EvictCacheRequest() { getUnknownFields() { return this.unknownFields; } - private EvictCacheRequest( + private EvictTaskExecutionCacheRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -110,31 +749,16 @@ private EvictCacheRequest( done = true; break; case 10: { - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null; - if (idCase_ == 1) { - subBuilder = ((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_).toBuilder(); - } - id_ = - input.readMessage(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_); - id_ = subBuilder.buildPartial(); - } - idCase_ = 1; - break; - } - case 18: { flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder subBuilder = null; - if (idCase_ == 2) { - subBuilder = ((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_).toBuilder(); + if (taskExecutionId_ != null) { + subBuilder = taskExecutionId_.toBuilder(); } - id_ = - input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); + taskExecutionId_ = input.readMessage(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_); - id_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(taskExecutionId_); + taskExecutionId_ = subBuilder.buildPartial(); } - idCase_ = 2; + break; } default: { @@ -158,129 +782,48 @@ private EvictCacheRequest( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_descriptor; + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.service.Cache.EvictCacheRequest.class, flyteidl.service.Cache.EvictCacheRequest.Builder.class); - } - - private int idCase_ = 0; - private java.lang.Object id_; - public enum IdCase - implements com.google.protobuf.Internal.EnumLite { - WORKFLOW_EXECUTION_ID(1), - TASK_EXECUTION_ID(2), - ID_NOT_SET(0); - private final int value; - private IdCase(int value) { - this.value = value; - } - /** - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static IdCase valueOf(int value) { - return forNumber(value); - } - - public static IdCase forNumber(int value) { - switch (value) { - case 1: return WORKFLOW_EXECUTION_ID; - case 2: return TASK_EXECUTION_ID; - case 0: return ID_NOT_SET; - default: return null; - } - } - public int getNumber() { - return this.value; - } - }; - - public IdCase - getIdCase() { - return IdCase.forNumber( - idCase_); - } - - public static final int WORKFLOW_EXECUTION_ID_FIELD_NUMBER = 1; - /** - * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public boolean hasWorkflowExecutionId() { - return idCase_ == 1; - } - /** - * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { - if (idCase_ == 1) { - return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); - } - /** - * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { - if (idCase_ == 1) { - return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); + flyteidl.service.Cache.EvictTaskExecutionCacheRequest.class, flyteidl.service.Cache.EvictTaskExecutionCacheRequest.Builder.class); } - public static final int TASK_EXECUTION_ID_FIELD_NUMBER = 2; + public static final int TASK_EXECUTION_ID_FIELD_NUMBER = 1; + private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier taskExecutionId_; /** * 
      * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public boolean hasTaskExecutionId() { - return idCase_ == 2; + return taskExecutionId_ != null; } /** * 
      * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId() { - if (idCase_ == 2) { - return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + return taskExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : taskExecutionId_; } /** * 
      * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
      *
* - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder() { - if (idCase_ == 2) { - return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + return getTaskExecutionId(); } private byte memoizedIsInitialized = -1; @@ -297,11 +840,8 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (idCase_ == 1) { - output.writeMessage(1, (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_); - } - if (idCase_ == 2) { - output.writeMessage(2, (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_); + if (taskExecutionId_ != null) { + output.writeMessage(1, getTaskExecutionId()); } unknownFields.writeTo(output); } @@ -312,13 +852,9 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (idCase_ == 1) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_); - } - if (idCase_ == 2) { + if (taskExecutionId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_); + .computeMessageSize(1, getTaskExecutionId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -330,23 +866,15 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof flyteidl.service.Cache.EvictCacheRequest)) { + if (!(obj instanceof flyteidl.service.Cache.EvictTaskExecutionCacheRequest)) { return super.equals(obj); } - flyteidl.service.Cache.EvictCacheRequest other = (flyteidl.service.Cache.EvictCacheRequest) obj; - - if (!getIdCase().equals(other.getIdCase())) return false; - switch (idCase_) { - case 1: - if (!getWorkflowExecutionId() - .equals(other.getWorkflowExecutionId())) return false; - break; - case 2: - if (!getTaskExecutionId() - .equals(other.getTaskExecutionId())) return false; - break; - case 0: - default: + flyteidl.service.Cache.EvictTaskExecutionCacheRequest other = (flyteidl.service.Cache.EvictTaskExecutionCacheRequest) obj; + + if (hasTaskExecutionId() != other.hasTaskExecutionId()) return false; + if (hasTaskExecutionId()) { + if (!getTaskExecutionId() + .equals(other.getTaskExecutionId())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -359,86 +887,78 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - switch (idCase_) { - case 1: - hash = (37 * hash) + WORKFLOW_EXECUTION_ID_FIELD_NUMBER; - hash = (53 * hash) + getWorkflowExecutionId().hashCode(); - break; - case 2: - hash = (37 * hash) + TASK_EXECUTION_ID_FIELD_NUMBER; - hash = (53 * hash) + getTaskExecutionId().hashCode(); - break; - case 0: - default: + if (hasTaskExecutionId()) { + hash = (37 * hash) + TASK_EXECUTION_ID_FIELD_NUMBER; + hash = (53 * hash) + getTaskExecutionId().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom(byte[] data) + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom(java.io.InputStream input) + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.service.Cache.EvictCacheRequest parseDelimitedFrom(java.io.InputStream input) + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static flyteidl.service.Cache.EvictCacheRequest parseDelimitedFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.service.Cache.EvictCacheRequest parseFrom( + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -451,7 +971,7 @@ public static flyteidl.service.Cache.EvictCacheRequest parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(flyteidl.service.Cache.EvictCacheRequest prototype) { + public static Builder newBuilder(flyteidl.service.Cache.EvictTaskExecutionCacheRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -467,26 +987,26 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code flyteidl.service.EvictCacheRequest} + * Protobuf type {@code flyteidl.service.EvictTaskExecutionCacheRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictCacheRequest) - flyteidl.service.Cache.EvictCacheRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictTaskExecutionCacheRequest) + flyteidl.service.Cache.EvictTaskExecutionCacheRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_descriptor; + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.service.Cache.EvictCacheRequest.class, flyteidl.service.Cache.EvictCacheRequest.Builder.class); + flyteidl.service.Cache.EvictTaskExecutionCacheRequest.class, flyteidl.service.Cache.EvictTaskExecutionCacheRequest.Builder.class); } - // Construct using flyteidl.service.Cache.EvictCacheRequest.newBuilder() + // Construct using flyteidl.service.Cache.EvictTaskExecutionCacheRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -504,25 +1024,29 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - idCase_ = 0; - id_ = null; + if (taskExecutionIdBuilder_ == null) { + taskExecutionId_ = null; + } else { + taskExecutionId_ = null; + taskExecutionIdBuilder_ = null; + } return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return flyteidl.service.Cache.internal_static_flyteidl_service_EvictCacheRequest_descriptor; + return flyteidl.service.Cache.internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; } @java.lang.Override - public flyteidl.service.Cache.EvictCacheRequest getDefaultInstanceForType() { - return flyteidl.service.Cache.EvictCacheRequest.getDefaultInstance(); + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstanceForType() { + return flyteidl.service.Cache.EvictTaskExecutionCacheRequest.getDefaultInstance(); } @java.lang.Override - public flyteidl.service.Cache.EvictCacheRequest build() { - flyteidl.service.Cache.EvictCacheRequest result = buildPartial(); + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest build() { + flyteidl.service.Cache.EvictTaskExecutionCacheRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -530,23 +1054,13 @@ public flyteidl.service.Cache.EvictCacheRequest build() { } @java.lang.Override - public flyteidl.service.Cache.EvictCacheRequest buildPartial() { - flyteidl.service.Cache.EvictCacheRequest result = new flyteidl.service.Cache.EvictCacheRequest(this); - if (idCase_ == 1) { - if (workflowExecutionIdBuilder_ == null) { - result.id_ = id_; - } else { - result.id_ = workflowExecutionIdBuilder_.build(); - } - } - if (idCase_ == 2) { - if (taskExecutionIdBuilder_ == null) { - result.id_ = id_; - } else { - result.id_ = taskExecutionIdBuilder_.build(); - } + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest buildPartial() { + flyteidl.service.Cache.EvictTaskExecutionCacheRequest result = new flyteidl.service.Cache.EvictTaskExecutionCacheRequest(this); + if (taskExecutionIdBuilder_ == null) { + result.taskExecutionId_ = taskExecutionId_; + } else { + result.taskExecutionId_ = taskExecutionIdBuilder_.build(); } - result.idCase_ = idCase_; onBuilt(); return result; } @@ -585,28 +1099,18 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.service.Cache.EvictCacheRequest) { - return mergeFrom((flyteidl.service.Cache.EvictCacheRequest)other); + if (other instanceof flyteidl.service.Cache.EvictTaskExecutionCacheRequest) { + return mergeFrom((flyteidl.service.Cache.EvictTaskExecutionCacheRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(flyteidl.service.Cache.EvictCacheRequest other) { - if (other == flyteidl.service.Cache.EvictCacheRequest.getDefaultInstance()) return this; - switch (other.getIdCase()) { - case WORKFLOW_EXECUTION_ID: { - mergeWorkflowExecutionId(other.getWorkflowExecutionId()); - break; - } - case TASK_EXECUTION_ID: { - mergeTaskExecutionId(other.getTaskExecutionId()); - break; - } - case ID_NOT_SET: { - break; - } + public Builder mergeFrom(flyteidl.service.Cache.EvictTaskExecutionCacheRequest other) { + if (other == flyteidl.service.Cache.EvictTaskExecutionCacheRequest.getDefaultInstance()) return this; + if (other.hasTaskExecutionId()) { + mergeTaskExecutionId(other.getTaskExecutionId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -623,11 +1127,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - flyteidl.service.Cache.EvictCacheRequest parsedMessage = null; + flyteidl.service.Cache.EvictTaskExecutionCacheRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.service.Cache.EvictCacheRequest) e.getUnfinishedMessage(); + parsedMessage = (flyteidl.service.Cache.EvictTaskExecutionCacheRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -636,194 +1140,8 @@ public Builder mergeFrom( } return this; } - private int idCase_ = 0; - private java.lang.Object id_; - public IdCase - getIdCase() { - return IdCase.forNumber( - idCase_); - } - - public Builder clearId() { - idCase_ = 0; - id_ = null; - onChanged(); - return this; - } - - - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> workflowExecutionIdBuilder_; - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public boolean hasWorkflowExecutionId() { - return idCase_ == 1; - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() { - if (workflowExecutionIdBuilder_ == null) { - if (idCase_ == 1) { - return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); - } else { - if (idCase_ == 1) { - return workflowExecutionIdBuilder_.getMessage(); - } - return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); - } - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public Builder setWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { - if (workflowExecutionIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - id_ = value; - onChanged(); - } else { - workflowExecutionIdBuilder_.setMessage(value); - } - idCase_ = 1; - return this; - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public Builder setWorkflowExecutionId( - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) { - if (workflowExecutionIdBuilder_ == null) { - id_ = builderForValue.build(); - onChanged(); - } else { - workflowExecutionIdBuilder_.setMessage(builderForValue.build()); - } - idCase_ = 1; - return this; - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public Builder mergeWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { - if (workflowExecutionIdBuilder_ == null) { - if (idCase_ == 1 && - id_ != flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance()) { - id_ = flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.newBuilder((flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_) - .mergeFrom(value).buildPartial(); - } else { - id_ = value; - } - onChanged(); - } else { - if (idCase_ == 1) { - workflowExecutionIdBuilder_.mergeFrom(value); - } - workflowExecutionIdBuilder_.setMessage(value); - } - idCase_ = 1; - return this; - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public Builder clearWorkflowExecutionId() { - if (workflowExecutionIdBuilder_ == null) { - if (idCase_ == 1) { - idCase_ = 0; - id_ = null; - onChanged(); - } - } else { - if (idCase_ == 1) { - idCase_ = 0; - id_ = null; - } - workflowExecutionIdBuilder_.clear(); - } - return this; - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getWorkflowExecutionIdBuilder() { - return getWorkflowExecutionIdFieldBuilder().getBuilder(); - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() { - if ((idCase_ == 1) && (workflowExecutionIdBuilder_ != null)) { - return workflowExecutionIdBuilder_.getMessageOrBuilder(); - } else { - if (idCase_ == 1) { - return (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); - } - } - /** - * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       *
- * - * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> - getWorkflowExecutionIdFieldBuilder() { - if (workflowExecutionIdBuilder_ == null) { - if (!(idCase_ == 1)) { - id_ = flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance(); - } - workflowExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder>( - (flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier) id_, - getParentForChildren(), - isClean()); - id_ = null; - } - idCase_ = 1; - onChanged();; - return workflowExecutionIdBuilder_; - } + private flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier taskExecutionId_; private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> taskExecutionIdBuilder_; /** @@ -831,29 +1149,23 @@ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder g * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public boolean hasTaskExecutionId() { - return idCase_ == 2; + return taskExecutionIdBuilder_ != null || taskExecutionId_ != null; } /** * 
        * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
        *
* - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecutionId() { if (taskExecutionIdBuilder_ == null) { - if (idCase_ == 2) { - return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + return taskExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : taskExecutionId_; } else { - if (idCase_ == 2) { - return taskExecutionIdBuilder_.getMessage(); - } - return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + return taskExecutionIdBuilder_.getMessage(); } } /** @@ -861,19 +1173,19 @@ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier getTaskExecuti * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public Builder setTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { if (taskExecutionIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - id_ = value; + taskExecutionId_ = value; onChanged(); } else { taskExecutionIdBuilder_.setMessage(value); } - idCase_ = 2; + return this; } /** @@ -881,17 +1193,17 @@ public Builder setTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecuti * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public Builder setTaskExecutionId( flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder builderForValue) { if (taskExecutionIdBuilder_ == null) { - id_ = builderForValue.build(); + taskExecutionId_ = builderForValue.build(); onChanged(); } else { taskExecutionIdBuilder_.setMessage(builderForValue.build()); } - idCase_ = 2; + return this; } /** @@ -899,25 +1211,21 @@ public Builder setTaskExecutionId( * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public Builder mergeTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier value) { if (taskExecutionIdBuilder_ == null) { - if (idCase_ == 2 && - id_ != flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance()) { - id_ = flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder((flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_) - .mergeFrom(value).buildPartial(); + if (taskExecutionId_ != null) { + taskExecutionId_ = + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.newBuilder(taskExecutionId_).mergeFrom(value).buildPartial(); } else { - id_ = value; + taskExecutionId_ = value; } onChanged(); } else { - if (idCase_ == 2) { - taskExecutionIdBuilder_.mergeFrom(value); - } - taskExecutionIdBuilder_.setMessage(value); + taskExecutionIdBuilder_.mergeFrom(value); } - idCase_ = 2; + return this; } /** @@ -925,22 +1233,17 @@ public Builder mergeTaskExecutionId(flyteidl.core.IdentifierOuterClass.TaskExecu * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public Builder clearTaskExecutionId() { if (taskExecutionIdBuilder_ == null) { - if (idCase_ == 2) { - idCase_ = 0; - id_ = null; - onChanged(); - } + taskExecutionId_ = null; + onChanged(); } else { - if (idCase_ == 2) { - idCase_ = 0; - id_ = null; - } - taskExecutionIdBuilder_.clear(); + taskExecutionId_ = null; + taskExecutionIdBuilder_ = null; } + return this; } /** @@ -948,9 +1251,11 @@ public Builder clearTaskExecutionId() { * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getTaskExecutionIdBuilder() { + + onChanged(); return getTaskExecutionIdFieldBuilder().getBuilder(); } /** @@ -958,16 +1263,14 @@ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder getTas * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecutionIdOrBuilder() { - if ((idCase_ == 2) && (taskExecutionIdBuilder_ != null)) { + if (taskExecutionIdBuilder_ != null) { return taskExecutionIdBuilder_.getMessageOrBuilder(); } else { - if (idCase_ == 2) { - return (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_; - } - return flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); + return taskExecutionId_ == null ? + flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance() : taskExecutionId_; } } /** @@ -975,24 +1278,19 @@ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTa * Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. * * - * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 2; + * .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder> getTaskExecutionIdFieldBuilder() { if (taskExecutionIdBuilder_ == null) { - if (!(idCase_ == 2)) { - id_ = flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.getDefaultInstance(); - } taskExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder>( - (flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifier) id_, + getTaskExecutionId(), getParentForChildren(), isClean()); - id_ = null; + taskExecutionId_ = null; } - idCase_ = 2; - onChanged();; return taskExecutionIdBuilder_; } @java.lang.Override @@ -1008,41 +1306,41 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictCacheRequest) + // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictTaskExecutionCacheRequest) } - // @@protoc_insertion_point(class_scope:flyteidl.service.EvictCacheRequest) - private static final flyteidl.service.Cache.EvictCacheRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:flyteidl.service.EvictTaskExecutionCacheRequest) + private static final flyteidl.service.Cache.EvictTaskExecutionCacheRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictCacheRequest(); + DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictTaskExecutionCacheRequest(); } - public static flyteidl.service.Cache.EvictCacheRequest getDefaultInstance() { + public static flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public EvictCacheRequest parsePartialFrom( + public EvictTaskExecutionCacheRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EvictCacheRequest(input, extensionRegistry); + return new EvictTaskExecutionCacheRequest(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public flyteidl.service.Cache.EvictCacheRequest getDefaultInstanceForType() { + public flyteidl.service.Cache.EvictTaskExecutionCacheRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1715,10 +2013,15 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() { } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_service_EvictCacheRequest_descriptor; + internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable; + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_service_EvictCacheResponse_descriptor; private static final @@ -1736,32 +2039,36 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() { "\n\034flyteidl/service/cache.proto\022\020flyteidl" + ".service\032\034google/api/annotations.proto\032\032" + "flyteidl/core/errors.proto\032\036flyteidl/cor" + - "e/identifier.proto\"\253\001\n\021EvictCacheRequest" + - "\022K\n\025workflow_execution_id\030\001 \001(\0132*.flytei" + - "dl.core.WorkflowExecutionIdentifierH\000\022C\n" + - "\021task_execution_id\030\002 \001(\0132&.flyteidl.core" + - ".TaskExecutionIdentifierH\000B\004\n\002id\"K\n\022Evic" + - "tCacheResponse\0225\n\006errors\030\001 \001(\0132%.flyteid" + - "l.core.CacheEvictionErrorList2\227\005\n\014CacheS" + - "ervice\022\206\005\n\nEvictCache\022#.flyteidl.service" + - ".EvictCacheRequest\032$.flyteidl.service.Ev" + - "ictCacheResponse\"\254\004\202\323\344\223\002\245\004*t/api/v1/cach" + - "e/executions/{workflow_execution_id.proj" + - "ect}/{workflow_execution_id.domain}/{wor" + - "kflow_execution_id.name}:\001*Z\251\003*\246\003/api/v1" + - "/cache/task_executions/{task_execution_i" + - "d.node_execution_id.execution_id.project" + - "}/{task_execution_id.node_execution_id.e" + - "xecution_id.domain}/{task_execution_id.n" + - "ode_execution_id.execution_id.name}/{tas" + - "k_execution_id.node_execution_id.node_id" + - "}/{task_execution_id.task_id.project}/{t" + - "ask_execution_id.task_id.domain}/{task_e" + - "xecution_id.task_id.name}/{task_executio" + - "n_id.task_id.version}/{task_execution_id" + - ".retry_attempt}B9Z7github.com/flyteorg/f" + - "lyteidl/gen/pb-go/flyteidl/serviceb\006prot" + - "o3" + "e/identifier.proto\"g\n\032EvictExecutionCach" + + "eRequest\022I\n\025workflow_execution_id\030\001 \001(\0132" + + "*.flyteidl.core.WorkflowExecutionIdentif" + + "ier\"c\n\036EvictTaskExecutionCacheRequest\022A\n" + + "\021task_execution_id\030\001 \001(\0132&.flyteidl.core" + + ".TaskExecutionIdentifier\"K\n\022EvictCacheRe" + + "sponse\0225\n\006errors\030\001 \001(\0132%.flyteidl.core.C" + + "acheEvictionErrorList2\237\006\n\014CacheService\022\347" + + "\001\n\023EvictExecutionCache\022,.flyteidl.servic" + + "e.EvictExecutionCacheRequest\032$.flyteidl." + + "service.EvictCacheResponse\"|\202\323\344\223\002v*t/api" + + "/v1/cache/executions/{workflow_execution" + + "_id.project}/{workflow_execution_id.doma" + + "in}/{workflow_execution_id.name}\022\244\004\n\027Evi" + + "ctTaskExecutionCache\0220.flyteidl.service." + + "EvictTaskExecutionCacheRequest\032$.flyteid" + + "l.service.EvictCacheResponse\"\260\003\202\323\344\223\002\251\003*\246" + + "\003/api/v1/cache/task_executions/{task_exe" + + "cution_id.node_execution_id.execution_id" + + ".project}/{task_execution_id.node_execut" + + "ion_id.execution_id.domain}/{task_execut" + + "ion_id.node_execution_id.execution_id.na" + + "me}/{task_execution_id.node_execution_id" + + ".node_id}/{task_execution_id.task_id.pro" + + "ject}/{task_execution_id.task_id.domain}" + + "/{task_execution_id.task_id.name}/{task_" + + "execution_id.task_id.version}/{task_exec" + + "ution_id.retry_attempt}B9Z7github.com/fl" + + "yteorg/flyteidl/gen/pb-go/flyteidl/servi" + + "ceb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -1778,14 +2085,20 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( flyteidl.core.Errors.getDescriptor(), flyteidl.core.IdentifierOuterClass.getDescriptor(), }, assigner); - internal_static_flyteidl_service_EvictCacheRequest_descriptor = + internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_flyteidl_service_EvictCacheRequest_fieldAccessorTable = new + internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_service_EvictCacheRequest_descriptor, - new java.lang.String[] { "WorkflowExecutionId", "TaskExecutionId", "Id", }); - internal_static_flyteidl_service_EvictCacheResponse_descriptor = + internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor, + new java.lang.String[] { "WorkflowExecutionId", }); + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor = getDescriptor().getMessageTypes().get(1); + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor, + new java.lang.String[] { "TaskExecutionId", }); + internal_static_flyteidl_service_EvictCacheResponse_descriptor = + getDescriptor().getMessageTypes().get(2); internal_static_flyteidl_service_EvictCacheResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_service_EvictCacheResponse_descriptor, diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 0b3e8ebb24..b2af6d7a8c 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -6446,7 +6446,11 @@ export namespace flyteidl { /** Code enum. */ enum Code { - UNKNOWN = 0 + INTERNAL = 0, + RESERVATION_NOT_ACQUIRED = 1, + DATABASE_UPDATE_FAILED = 2, + ARTIFACT_DELETE_FAILED = 3, + RESERVATION_NOT_RELEASED = 4 } } @@ -18756,61 +18760,104 @@ export namespace flyteidl { type GetPublicClientConfigCallback = (error: (Error|null), response?: flyteidl.service.PublicClientAuthConfigResponse) => void; } - /** Properties of an EvictCacheRequest. */ - interface IEvictCacheRequest { + /** Properties of an EvictExecutionCacheRequest. */ + interface IEvictExecutionCacheRequest { - /** EvictCacheRequest workflowExecutionId */ + /** EvictExecutionCacheRequest workflowExecutionId */ workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null); - - /** EvictCacheRequest taskExecutionId */ - taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); } - /** Represents an EvictCacheRequest. */ - class EvictCacheRequest implements IEvictCacheRequest { + /** Represents an EvictExecutionCacheRequest. */ + class EvictExecutionCacheRequest implements IEvictExecutionCacheRequest { /** - * Constructs a new EvictCacheRequest. + * Constructs a new EvictExecutionCacheRequest. * @param [properties] Properties to set */ - constructor(properties?: flyteidl.service.IEvictCacheRequest); + constructor(properties?: flyteidl.service.IEvictExecutionCacheRequest); - /** EvictCacheRequest workflowExecutionId. */ + /** EvictExecutionCacheRequest workflowExecutionId. */ public workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null); - /** EvictCacheRequest taskExecutionId. */ - public taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); + /** + * Creates a new EvictExecutionCacheRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns EvictExecutionCacheRequest instance + */ + public static create(properties?: flyteidl.service.IEvictExecutionCacheRequest): flyteidl.service.EvictExecutionCacheRequest; + + /** + * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages. + * @param message EvictExecutionCacheRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.service.IEvictExecutionCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EvictExecutionCacheRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictExecutionCacheRequest; + + /** + * Verifies an EvictExecutionCacheRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of an EvictTaskExecutionCacheRequest. */ + interface IEvictTaskExecutionCacheRequest { + + /** EvictTaskExecutionCacheRequest taskExecutionId */ + taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); + } + + /** Represents an EvictTaskExecutionCacheRequest. */ + class EvictTaskExecutionCacheRequest implements IEvictTaskExecutionCacheRequest { - /** EvictCacheRequest id. */ - public id?: ("workflowExecutionId"|"taskExecutionId"); + /** + * Constructs a new EvictTaskExecutionCacheRequest. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.service.IEvictTaskExecutionCacheRequest); + + /** EvictTaskExecutionCacheRequest taskExecutionId. */ + public taskExecutionId?: (flyteidl.core.ITaskExecutionIdentifier|null); /** - * Creates a new EvictCacheRequest instance using the specified properties. + * Creates a new EvictTaskExecutionCacheRequest instance using the specified properties. * @param [properties] Properties to set - * @returns EvictCacheRequest instance + * @returns EvictTaskExecutionCacheRequest instance */ - public static create(properties?: flyteidl.service.IEvictCacheRequest): flyteidl.service.EvictCacheRequest; + public static create(properties?: flyteidl.service.IEvictTaskExecutionCacheRequest): flyteidl.service.EvictTaskExecutionCacheRequest; /** - * Encodes the specified EvictCacheRequest message. Does not implicitly {@link flyteidl.service.EvictCacheRequest.verify|verify} messages. - * @param message EvictCacheRequest message or plain object to encode + * Encodes the specified EvictTaskExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictTaskExecutionCacheRequest.verify|verify} messages. + * @param message EvictTaskExecutionCacheRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: flyteidl.service.IEvictCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: flyteidl.service.IEvictTaskExecutionCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an EvictCacheRequest message from the specified reader or buffer. + * Decodes an EvictTaskExecutionCacheRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns EvictCacheRequest + * @returns EvictTaskExecutionCacheRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictCacheRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictTaskExecutionCacheRequest; /** - * Verifies an EvictCacheRequest message. + * Verifies an EvictTaskExecutionCacheRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ @@ -18890,28 +18937,49 @@ export namespace flyteidl { public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): CacheService; /** - * Calls EvictCache. - * @param request EvictCacheRequest message or plain object + * Calls EvictExecutionCache. + * @param request EvictExecutionCacheRequest message or plain object + * @param callback Node-style callback called with the error, if any, and EvictCacheResponse + */ + public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest, callback: flyteidl.service.CacheService.EvictExecutionCacheCallback): void; + + /** + * Calls EvictExecutionCache. + * @param request EvictExecutionCacheRequest message or plain object + * @returns Promise + */ + public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest): Promise; + + /** + * Calls EvictTaskExecutionCache. + * @param request EvictTaskExecutionCacheRequest message or plain object * @param callback Node-style callback called with the error, if any, and EvictCacheResponse */ - public evictCache(request: flyteidl.service.IEvictCacheRequest, callback: flyteidl.service.CacheService.EvictCacheCallback): void; + public evictTaskExecutionCache(request: flyteidl.service.IEvictTaskExecutionCacheRequest, callback: flyteidl.service.CacheService.EvictTaskExecutionCacheCallback): void; /** - * Calls EvictCache. - * @param request EvictCacheRequest message or plain object + * Calls EvictTaskExecutionCache. + * @param request EvictTaskExecutionCacheRequest message or plain object * @returns Promise */ - public evictCache(request: flyteidl.service.IEvictCacheRequest): Promise; + public evictTaskExecutionCache(request: flyteidl.service.IEvictTaskExecutionCacheRequest): Promise; } namespace CacheService { /** - * Callback as used by {@link flyteidl.service.CacheService#evictCache}. + * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}. + * @param error Error, if any + * @param [response] EvictCacheResponse + */ + type EvictExecutionCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; + + /** + * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}. * @param error Error, if any * @param [response] EvictCacheResponse */ - type EvictCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; + type EvictTaskExecutionCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void; } /** Properties of a CreateUploadLocationResponse. */ diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 99d707034d..a741457fc3 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -15420,6 +15420,10 @@ default: return "code: enum value expected"; case 0: + case 1: + case 2: + case 3: + case 4: break; } if (message.message != null && message.hasOwnProperty("message")) @@ -15455,11 +15459,19 @@ * Code enum. * @name flyteidl.core.CacheEvictionError.Code * @enum {string} - * @property {number} UNKNOWN=0 UNKNOWN value + * @property {number} INTERNAL=0 INTERNAL value + * @property {number} RESERVATION_NOT_ACQUIRED=1 RESERVATION_NOT_ACQUIRED value + * @property {number} DATABASE_UPDATE_FAILED=2 DATABASE_UPDATE_FAILED value + * @property {number} ARTIFACT_DELETE_FAILED=3 ARTIFACT_DELETE_FAILED value + * @property {number} RESERVATION_NOT_RELEASED=4 RESERVATION_NOT_RELEASED value */ CacheEvictionError.Code = (function() { var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "UNKNOWN"] = 0; + values[valuesById[0] = "INTERNAL"] = 0; + values[valuesById[1] = "RESERVATION_NOT_ACQUIRED"] = 1; + values[valuesById[2] = "DATABASE_UPDATE_FAILED"] = 2; + values[valuesById[3] = "ARTIFACT_DELETE_FAILED"] = 3; + values[valuesById[4] = "RESERVATION_NOT_RELEASED"] = 4; return values; })(); @@ -43725,25 +43737,24 @@ return AuthMetadataService; })(); - service.EvictCacheRequest = (function() { + service.EvictExecutionCacheRequest = (function() { /** - * Properties of an EvictCacheRequest. + * Properties of an EvictExecutionCacheRequest. * @memberof flyteidl.service - * @interface IEvictCacheRequest - * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [workflowExecutionId] EvictCacheRequest workflowExecutionId - * @property {flyteidl.core.ITaskExecutionIdentifier|null} [taskExecutionId] EvictCacheRequest taskExecutionId + * @interface IEvictExecutionCacheRequest + * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [workflowExecutionId] EvictExecutionCacheRequest workflowExecutionId */ /** - * Constructs a new EvictCacheRequest. + * Constructs a new EvictExecutionCacheRequest. * @memberof flyteidl.service - * @classdesc Represents an EvictCacheRequest. - * @implements IEvictCacheRequest + * @classdesc Represents an EvictExecutionCacheRequest. + * @implements IEvictExecutionCacheRequest * @constructor - * @param {flyteidl.service.IEvictCacheRequest=} [properties] Properties to set + * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set */ - function EvictCacheRequest(properties) { + function EvictExecutionCacheRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -43751,88 +43762,173 @@ } /** - * EvictCacheRequest workflowExecutionId. + * EvictExecutionCacheRequest workflowExecutionId. * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} workflowExecutionId - * @memberof flyteidl.service.EvictCacheRequest + * @memberof flyteidl.service.EvictExecutionCacheRequest * @instance */ - EvictCacheRequest.prototype.workflowExecutionId = null; + EvictExecutionCacheRequest.prototype.workflowExecutionId = null; /** - * EvictCacheRequest taskExecutionId. - * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} taskExecutionId - * @memberof flyteidl.service.EvictCacheRequest - * @instance + * Creates a new EvictExecutionCacheRequest instance using the specified properties. + * @function create + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set + * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest instance */ - EvictCacheRequest.prototype.taskExecutionId = null; + EvictExecutionCacheRequest.create = function create(properties) { + return new EvictExecutionCacheRequest(properties); + }; - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + /** + * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages. + * @function encode + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {flyteidl.service.IEvictExecutionCacheRequest} message EvictExecutionCacheRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EvictExecutionCacheRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) + $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowExecutionId, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EvictExecutionCacheRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictExecutionCacheRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.workflowExecutionId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies an EvictExecutionCacheRequest message. + * @function verify + * @memberof flyteidl.service.EvictExecutionCacheRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EvictExecutionCacheRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) { + var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowExecutionId); + if (error) + return "workflowExecutionId." + error; + } + return null; + }; + + return EvictExecutionCacheRequest; + })(); + + service.EvictTaskExecutionCacheRequest = (function() { + + /** + * Properties of an EvictTaskExecutionCacheRequest. + * @memberof flyteidl.service + * @interface IEvictTaskExecutionCacheRequest + * @property {flyteidl.core.ITaskExecutionIdentifier|null} [taskExecutionId] EvictTaskExecutionCacheRequest taskExecutionId + */ + + /** + * Constructs a new EvictTaskExecutionCacheRequest. + * @memberof flyteidl.service + * @classdesc Represents an EvictTaskExecutionCacheRequest. + * @implements IEvictTaskExecutionCacheRequest + * @constructor + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest=} [properties] Properties to set + */ + function EvictTaskExecutionCacheRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * EvictCacheRequest id. - * @member {"workflowExecutionId"|"taskExecutionId"|undefined} id - * @memberof flyteidl.service.EvictCacheRequest + * EvictTaskExecutionCacheRequest taskExecutionId. + * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} taskExecutionId + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest * @instance */ - Object.defineProperty(EvictCacheRequest.prototype, "id", { - get: $util.oneOfGetter($oneOfFields = ["workflowExecutionId", "taskExecutionId"]), - set: $util.oneOfSetter($oneOfFields) - }); + EvictTaskExecutionCacheRequest.prototype.taskExecutionId = null; /** - * Creates a new EvictCacheRequest instance using the specified properties. + * Creates a new EvictTaskExecutionCacheRequest instance using the specified properties. * @function create - * @memberof flyteidl.service.EvictCacheRequest + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest * @static - * @param {flyteidl.service.IEvictCacheRequest=} [properties] Properties to set - * @returns {flyteidl.service.EvictCacheRequest} EvictCacheRequest instance + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest=} [properties] Properties to set + * @returns {flyteidl.service.EvictTaskExecutionCacheRequest} EvictTaskExecutionCacheRequest instance */ - EvictCacheRequest.create = function create(properties) { - return new EvictCacheRequest(properties); + EvictTaskExecutionCacheRequest.create = function create(properties) { + return new EvictTaskExecutionCacheRequest(properties); }; /** - * Encodes the specified EvictCacheRequest message. Does not implicitly {@link flyteidl.service.EvictCacheRequest.verify|verify} messages. + * Encodes the specified EvictTaskExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictTaskExecutionCacheRequest.verify|verify} messages. * @function encode - * @memberof flyteidl.service.EvictCacheRequest + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest * @static - * @param {flyteidl.service.IEvictCacheRequest} message EvictCacheRequest message or plain object to encode + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} message EvictTaskExecutionCacheRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - EvictCacheRequest.encode = function encode(message, writer) { + EvictTaskExecutionCacheRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) - $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowExecutionId, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.taskExecutionId != null && message.hasOwnProperty("taskExecutionId")) - $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskExecutionId, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskExecutionId, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; /** - * Decodes an EvictCacheRequest message from the specified reader or buffer. + * Decodes an EvictTaskExecutionCacheRequest message from the specified reader or buffer. * @function decode - * @memberof flyteidl.service.EvictCacheRequest + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {flyteidl.service.EvictCacheRequest} EvictCacheRequest + * @returns {flyteidl.service.EvictTaskExecutionCacheRequest} EvictTaskExecutionCacheRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EvictCacheRequest.decode = function decode(reader, length) { + EvictTaskExecutionCacheRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictCacheRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictTaskExecutionCacheRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.workflowExecutionId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32()); - break; - case 2: message.taskExecutionId = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); break; default: @@ -43844,39 +43940,25 @@ }; /** - * Verifies an EvictCacheRequest message. + * Verifies an EvictTaskExecutionCacheRequest message. * @function verify - * @memberof flyteidl.service.EvictCacheRequest + * @memberof flyteidl.service.EvictTaskExecutionCacheRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - EvictCacheRequest.verify = function verify(message) { + EvictTaskExecutionCacheRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - var properties = {}; - if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) { - properties.id = 1; - { - var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowExecutionId); - if (error) - return "workflowExecutionId." + error; - } - } if (message.taskExecutionId != null && message.hasOwnProperty("taskExecutionId")) { - if (properties.id === 1) - return "id: multiple values"; - properties.id = 1; - { - var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.taskExecutionId); - if (error) - return "taskExecutionId." + error; - } + var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.taskExecutionId); + if (error) + return "taskExecutionId." + error; } return null; }; - return EvictCacheRequest; + return EvictTaskExecutionCacheRequest; })(); service.EvictCacheResponse = (function() { @@ -44024,34 +44106,67 @@ }; /** - * Callback as used by {@link flyteidl.service.CacheService#evictCache}. + * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}. + * @memberof flyteidl.service.CacheService + * @typedef EvictExecutionCacheCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {flyteidl.service.EvictCacheResponse} [response] EvictCacheResponse + */ + + /** + * Calls EvictExecutionCache. + * @function evictExecutionCache + * @memberof flyteidl.service.CacheService + * @instance + * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object + * @param {flyteidl.service.CacheService.EvictExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(CacheService.prototype.evictExecutionCache = function evictExecutionCache(request, callback) { + return this.rpcCall(evictExecutionCache, $root.flyteidl.service.EvictExecutionCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); + }, "name", { value: "EvictExecutionCache" }); + + /** + * Calls EvictExecutionCache. + * @function evictExecutionCache + * @memberof flyteidl.service.CacheService + * @instance + * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}. * @memberof flyteidl.service.CacheService - * @typedef EvictCacheCallback + * @typedef EvictTaskExecutionCacheCallback * @type {function} * @param {Error|null} error Error, if any * @param {flyteidl.service.EvictCacheResponse} [response] EvictCacheResponse */ /** - * Calls EvictCache. - * @function evictCache + * Calls EvictTaskExecutionCache. + * @function evictTaskExecutionCache * @memberof flyteidl.service.CacheService * @instance - * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object - * @param {flyteidl.service.CacheService.EvictCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} request EvictTaskExecutionCacheRequest message or plain object + * @param {flyteidl.service.CacheService.EvictTaskExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse * @returns {undefined} * @variation 1 */ - Object.defineProperty(CacheService.prototype.evictCache = function evictCache(request, callback) { - return this.rpcCall(evictCache, $root.flyteidl.service.EvictCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); - }, "name", { value: "EvictCache" }); + Object.defineProperty(CacheService.prototype.evictTaskExecutionCache = function evictTaskExecutionCache(request, callback) { + return this.rpcCall(evictTaskExecutionCache, $root.flyteidl.service.EvictTaskExecutionCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback); + }, "name", { value: "EvictTaskExecutionCache" }); /** - * Calls EvictCache. - * @function evictCache + * Calls EvictTaskExecutionCache. + * @function evictTaskExecutionCache * @memberof flyteidl.service.CacheService * @instance - * @param {flyteidl.service.IEvictCacheRequest} request EvictCacheRequest message or plain object + * @param {flyteidl.service.IEvictTaskExecutionCacheRequest} request EvictTaskExecutionCacheRequest message or plain object * @returns {Promise} Promise * @variation 2 */ diff --git a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py index 80b627e1c4..9e4086e0ff 100644 --- a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py @@ -15,7 +15,7 @@ from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/core/errors.proto\x12\rflyteidl.core\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xe5\x01\n\x0e\x43ontainerError\x12\x12\n\x04\x63ode\x18\x01 \x01(\tR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12\x36\n\x04kind\x18\x03 \x01(\x0e\x32\".flyteidl.core.ContainerError.KindR\x04kind\x12?\n\x06origin\x18\x04 \x01(\x0e\x32\'.flyteidl.core.ExecutionError.ErrorKindR\x06origin\",\n\x04Kind\x12\x13\n\x0fNON_RECOVERABLE\x10\x00\x12\x0f\n\x0bRECOVERABLE\x10\x01\"D\n\rErrorDocument\x12\x33\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.ContainerErrorR\x05\x65rror\"\x95\x03\n\x12\x43\x61\x63heEvictionError\x12:\n\x04\x63ode\x18\x01 \x01(\x0e\x32&.flyteidl.core.CacheEvictionError.CodeR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12R\n\x11node_execution_id\x18\x03 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12T\n\x11task_execution_id\x18\x04 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionId\x12`\n\x15workflow_execution_id\x18\x05 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\"\x13\n\x04\x43ode\x12\x0b\n\x07UNKNOWN\x10\x00\x42\x08\n\x06source\"S\n\x16\x43\x61\x63heEvictionErrorList\x12\x39\n\x06\x65rrors\x18\x01 \x03(\x0b\x32!.flyteidl.core.CacheEvictionErrorR\x06\x65rrorsB\xab\x01\n\x11\x63om.flyteidl.coreB\x0b\x45rrorsProtoP\x01Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/core/errors.proto\x12\rflyteidl.core\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xe5\x01\n\x0e\x43ontainerError\x12\x12\n\x04\x63ode\x18\x01 \x01(\tR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12\x36\n\x04kind\x18\x03 \x01(\x0e\x32\".flyteidl.core.ContainerError.KindR\x04kind\x12?\n\x06origin\x18\x04 \x01(\x0e\x32\'.flyteidl.core.ExecutionError.ErrorKindR\x06origin\",\n\x04Kind\x12\x13\n\x0fNON_RECOVERABLE\x10\x00\x12\x0f\n\x0bRECOVERABLE\x10\x01\"D\n\rErrorDocument\x12\x33\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.ContainerErrorR\x05\x65rror\"\x8b\x04\n\x12\x43\x61\x63heEvictionError\x12:\n\x04\x63ode\x18\x01 \x01(\x0e\x32&.flyteidl.core.CacheEvictionError.CodeR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12R\n\x11node_execution_id\x18\x03 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12T\n\x11task_execution_id\x18\x04 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionId\x12`\n\x15workflow_execution_id\x18\x05 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\"\x88\x01\n\x04\x43ode\x12\x0c\n\x08INTERNAL\x10\x00\x12\x1c\n\x18RESERVATION_NOT_ACQUIRED\x10\x01\x12\x1a\n\x16\x44\x41TABASE_UPDATE_FAILED\x10\x02\x12\x1a\n\x16\x41RTIFACT_DELETE_FAILED\x10\x03\x12\x1c\n\x18RESERVATION_NOT_RELEASED\x10\x04\x42\x08\n\x06source\"S\n\x16\x43\x61\x63heEvictionErrorList\x12\x39\n\x06\x65rrors\x18\x01 \x03(\x0b\x32!.flyteidl.core.CacheEvictionErrorR\x06\x65rrorsB\xab\x01\n\x11\x63om.flyteidl.coreB\x0b\x45rrorsProtoP\x01Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.core.errors_pb2', globals()) @@ -30,9 +30,9 @@ _ERRORDOCUMENT._serialized_start=340 _ERRORDOCUMENT._serialized_end=408 _CACHEEVICTIONERROR._serialized_start=411 - _CACHEEVICTIONERROR._serialized_end=816 - _CACHEEVICTIONERROR_CODE._serialized_start=787 - _CACHEEVICTIONERROR_CODE._serialized_end=806 - _CACHEEVICTIONERRORLIST._serialized_start=818 - _CACHEEVICTIONERRORLIST._serialized_end=901 + _CACHEEVICTIONERROR._serialized_end=934 + _CACHEEVICTIONERROR_CODE._serialized_start=788 + _CACHEEVICTIONERROR_CODE._serialized_end=924 + _CACHEEVICTIONERRORLIST._serialized_start=936 + _CACHEEVICTIONERRORLIST._serialized_end=1019 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi index 8d7becbd3d..8e0eb97634 100644 --- a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi @@ -12,11 +12,15 @@ class CacheEvictionError(_message.Message): __slots__ = ["code", "message", "node_execution_id", "task_execution_id", "workflow_execution_id"] class Code(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = [] + ARTIFACT_DELETE_FAILED: CacheEvictionError.Code CODE_FIELD_NUMBER: _ClassVar[int] + DATABASE_UPDATE_FAILED: CacheEvictionError.Code + INTERNAL: CacheEvictionError.Code MESSAGE_FIELD_NUMBER: _ClassVar[int] NODE_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + RESERVATION_NOT_ACQUIRED: CacheEvictionError.Code + RESERVATION_NOT_RELEASED: CacheEvictionError.Code TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] - UNKNOWN: CacheEvictionError.Code WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] code: CacheEvictionError.Code message: str diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py index 0fb6c9da16..e06d06dca5 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py @@ -16,7 +16,7 @@ from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xd1\x01\n\x11\x45victCacheRequest\x12`\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\x12T\n\x11task_execution_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionIdB\x04\n\x02id\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x97\x05\n\x0c\x43\x61\x63heService\x12\x86\x05\n\nEvictCache\x12#.flyteidl.service.EvictCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xac\x04\x82\xd3\xe4\x93\x02\xa5\x04:\x01*Z\xa9\x03*\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"|\n\x1a\x45victExecutionCacheRequest\x12^\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x13workflowExecutionId\"t\n\x1e\x45victTaskExecutionCacheRequest\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x9f\x06\n\x0c\x43\x61\x63heService\x12\xe7\x01\n\x13\x45victExecutionCache\x12,.flyteidl.service.EvictExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"|\x82\xd3\xe4\x93\x02v*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa4\x04\n\x17\x45victTaskExecutionCache\x12\x30.flyteidl.service.EvictTaskExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xb0\x03\x82\xd3\xe4\x93\x02\xa9\x03*\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.cache_pb2', globals()) @@ -24,12 +24,16 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nCacheProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service' - _CACHESERVICE.methods_by_name['EvictCache']._options = None - _CACHESERVICE.methods_by_name['EvictCache']._serialized_options = b'\202\323\344\223\002\245\004:\001*Z\251\003*\246\003/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}' - _EVICTCACHEREQUEST._serialized_start=141 - _EVICTCACHEREQUEST._serialized_end=350 - _EVICTCACHERESPONSE._serialized_start=352 - _EVICTCACHERESPONSE._serialized_end=435 - _CACHESERVICE._serialized_start=438 - _CACHESERVICE._serialized_end=1101 + _CACHESERVICE.methods_by_name['EvictExecutionCache']._options = None + _CACHESERVICE.methods_by_name['EvictExecutionCache']._serialized_options = b'\202\323\344\223\002v*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}' + _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._options = None + _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._serialized_options = b'\202\323\344\223\002\251\003*\246\003/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}' + _EVICTEXECUTIONCACHEREQUEST._serialized_start=140 + _EVICTEXECUTIONCACHEREQUEST._serialized_end=264 + _EVICTTASKEXECUTIONCACHEREQUEST._serialized_start=266 + _EVICTTASKEXECUTIONCACHEREQUEST._serialized_end=382 + _EVICTCACHERESPONSE._serialized_start=384 + _EVICTCACHERESPONSE._serialized_end=467 + _CACHESERVICE._serialized_start=470 + _CACHESERVICE._serialized_end=1269 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi index 87a7c63076..0c4988e056 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi @@ -7,16 +7,20 @@ from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Opti DESCRIPTOR: _descriptor.FileDescriptor -class EvictCacheRequest(_message.Message): - __slots__ = ["task_execution_id", "workflow_execution_id"] - TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] - WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] - task_execution_id: _identifier_pb2.TaskExecutionIdentifier - workflow_execution_id: _identifier_pb2.WorkflowExecutionIdentifier - def __init__(self, workflow_execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ...) -> None: ... - class EvictCacheResponse(_message.Message): __slots__ = ["errors"] ERRORS_FIELD_NUMBER: _ClassVar[int] errors: _errors_pb2.CacheEvictionErrorList def __init__(self, errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ... + +class EvictExecutionCacheRequest(_message.Message): + __slots__ = ["workflow_execution_id"] + WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + workflow_execution_id: _identifier_pb2.WorkflowExecutionIdentifier + def __init__(self, workflow_execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ...) -> None: ... + +class EvictTaskExecutionCacheRequest(_message.Message): + __slots__ = ["task_execution_id"] + TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] + task_execution_id: _identifier_pb2.TaskExecutionIdentifier + def __init__(self, task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ...) -> None: ... diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py index a1a075c1dd..80b802f242 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py @@ -15,9 +15,14 @@ def __init__(self, channel): Args: channel: A grpc.Channel. """ - self.EvictCache = channel.unary_unary( - '/flyteidl.service.CacheService/EvictCache', - request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, + self.EvictExecutionCache = channel.unary_unary( + '/flyteidl.service.CacheService/EvictExecutionCache', + request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString, + response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, + ) + self.EvictTaskExecutionCache = channel.unary_unary( + '/flyteidl.service.CacheService/EvictTaskExecutionCache', + request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.SerializeToString, response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, ) @@ -26,8 +31,15 @@ class CacheServiceServicer(object): """CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. """ - def EvictCache(self, request, context): - """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. + def EvictExecutionCache(self, request, context): + """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + def EvictTaskExecutionCache(self, request, context): + """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. """ context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') @@ -36,9 +48,14 @@ def EvictCache(self, request, context): def add_CacheServiceServicer_to_server(servicer, server): rpc_method_handlers = { - 'EvictCache': grpc.unary_unary_rpc_method_handler( - servicer.EvictCache, - request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.FromString, + 'EvictExecutionCache': grpc.unary_unary_rpc_method_handler( + servicer.EvictExecutionCache, + request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.FromString, + response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, + ), + 'EvictTaskExecutionCache': grpc.unary_unary_rpc_method_handler( + servicer.EvictTaskExecutionCache, + request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.FromString, response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString, ), } @@ -53,7 +70,24 @@ class CacheService(object): """ @staticmethod - def EvictCache(request, + def EvictExecutionCache(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictExecutionCache', + flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString, + flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def EvictTaskExecutionCache(request, target, options=(), channel_credentials=None, @@ -63,8 +97,8 @@ def EvictCache(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictCache', - flyteidl_dot_service_dot_cache__pb2.EvictCacheRequest.SerializeToString, + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictTaskExecutionCache', + flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.SerializeToString, flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/flyteidl/protos/docs/core/core.rst b/flyteidl/protos/docs/core/core.rst index fc31243df0..8c7cad0106 100644 --- a/flyteidl/protos/docs/core/core.rst +++ b/flyteidl/protos/docs/core/core.rst @@ -630,13 +630,17 @@ failure reasons to the execution engine. CacheEvictionError.Code ------------------------------------------------------------------ - +Defines codes for distinguishing between errors encountered during cache eviction. .. csv-table:: Enum CacheEvictionError.Code values :header: "Name", "Number", "Description" :widths: auto - "UNKNOWN", "0", "" + "INTERNAL", "0", "Indicates a generic internal error occurred." + "RESERVATION_NOT_ACQUIRED", "1", "Indicates no reservation could be acquired before deleting an artifact." + "DATABASE_UPDATE_FAILED", "2", "Indicates updating the database entry related to the node execution failed." + "ARTIFACT_DELETE_FAILED", "3", "Indicates deleting the artifact from datacatalog failed." + "RESERVATION_NOT_RELEASED", "4", "Indicates the reservation previously acquired could not be released for an artifact." diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst index d486a36004..d512bf5815 100644 --- a/flyteidl/protos/docs/service/service.rst +++ b/flyteidl/protos/docs/service/service.rst @@ -234,21 +234,41 @@ flyteidl/service/cache.proto -.. _ref_flyteidl.service.EvictCacheRequest: +.. _ref_flyteidl.service.EvictCacheResponse: -EvictCacheRequest +EvictCacheResponse ------------------------------------------------------------------ -.. csv-table:: EvictCacheRequest type fields +.. csv-table:: EvictCacheResponse type fields + :header: "Field", "Type", "Label", "Description" + :widths: auto + + "errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "List of errors encountered during cache eviction (if any)." + + + + + + + +.. _ref_flyteidl.service.EvictExecutionCacheRequest: + +EvictExecutionCacheRequest +------------------------------------------------------------------ + + + + + +.. csv-table:: EvictExecutionCacheRequest type fields :header: "Field", "Type", "Label", "Description" :widths: auto "workflow_execution_id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for." - "task_execution_id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for." @@ -256,20 +276,20 @@ EvictCacheRequest -.. _ref_flyteidl.service.EvictCacheResponse: +.. _ref_flyteidl.service.EvictTaskExecutionCacheRequest: -EvictCacheResponse +EvictTaskExecutionCacheRequest ------------------------------------------------------------------ -.. csv-table:: EvictCacheResponse type fields +.. csv-table:: EvictTaskExecutionCacheRequest type fields :header: "Field", "Type", "Label", "Description" :widths: auto - "errors", ":ref:`ref_flyteidl.core.CacheEvictionErrorList`", "", "List of errors encountered during cache eviction (if any)." + "task_execution_id", ":ref:`ref_flyteidl.core.TaskExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for." @@ -300,7 +320,8 @@ CacheService defines an RPC Service for interacting with cached data in Flyte on :header: "Method Name", "Request Type", "Response Type", "Description" :widths: auto - "EvictCache", ":ref:`ref_flyteidl.service.EvictCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`." + "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`." + "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictTaskExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`." .. end services diff --git a/flyteidl/protos/flyteidl/core/errors.proto b/flyteidl/protos/flyteidl/core/errors.proto index 6e2f333f27..d694925064 100644 --- a/flyteidl/protos/flyteidl/core/errors.proto +++ b/flyteidl/protos/flyteidl/core/errors.proto @@ -37,8 +37,19 @@ message ErrorDocument { // Error returned if eviction of cached output fails and should be re-tried by the user. message CacheEvictionError { + // Defines codes for distinguishing between errors encountered during cache eviction. enum Code { - UNKNOWN = 0; + // Indicates a generic internal error occurred. + INTERNAL = 0; + // Indicates no reservation could be acquired before deleting an artifact. + RESERVATION_NOT_ACQUIRED = 1; + // Indicates updating the database entry related to the node execution failed. + DATABASE_UPDATE_FAILED = 2; + // Indicates deleting the artifact from datacatalog failed. + ARTIFACT_DELETE_FAILED = 3; + // Indicates the reservation previously acquired could not be released for an artifact. + RESERVATION_NOT_RELEASED = 4; + } // Error code to match type of cache eviction error encountered. diff --git a/flyteidl/protos/flyteidl/service/cache.proto b/flyteidl/protos/flyteidl/service/cache.proto index 871e87b2bf..f765374727 100644 --- a/flyteidl/protos/flyteidl/service/cache.proto +++ b/flyteidl/protos/flyteidl/service/cache.proto @@ -9,14 +9,14 @@ import "google/api/annotations.proto"; import "flyteidl/core/errors.proto"; import "flyteidl/core/identifier.proto"; -message EvictCacheRequest { - // Identifier of resource cached data should be evicted for. - oneof id { - // Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for. - core.WorkflowExecutionIdentifier workflow_execution_id = 1; - // Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. - core.TaskExecutionIdentifier task_execution_id = 2; - } +message EvictExecutionCacheRequest { + // Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for. + core.WorkflowExecutionIdentifier workflow_execution_id = 1; +} + +message EvictTaskExecutionCacheRequest { + // Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for. + core.TaskExecutionIdentifier task_execution_id = 1; } message EvictCacheResponse { @@ -26,17 +26,23 @@ message EvictCacheResponse { // CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis. service CacheService { - // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution` or :ref:`ref_flyteidl.admin.TaskExecution`. - rpc EvictCache (EvictCacheRequest) returns (EvictCacheResponse) { + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`. + rpc EvictExecutionCache (EvictExecutionCacheRequest) returns (EvictCacheResponse) { option (google.api.http) = { delete: "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}" - additional_bindings: { - delete: "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}" - } - body: "*" }; // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { // description: "Evicts all cached data for the referenced (workflow) execution." // }; } + + // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`. + rpc EvictTaskExecutionCache (EvictTaskExecutionCacheRequest) returns (EvictCacheResponse) { + option (google.api.http) = { + delete: "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}" + }; + // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { + // description: "Evicts all cached data for the referenced task execution." + // }; + } } From d7f5203be6febad561f0e98960ee39c7bb9bbebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20M=C3=BCller?= Date: Thu, 19 Jan 2023 11:48:28 +0100 Subject: [PATCH 18/57] Add bulk endpoints for acquiring/releasing reservations and deleting artifacts to datacatalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nick Müller --- .../go/datacatalog/mocks/DataCatalogClient.go | 144 + .../datacatalog/datacatalog.grpc.pb.cc | 132 +- .../datacatalog/datacatalog.grpc.pb.h | 572 +- .../flyteidl/datacatalog/datacatalog.pb.cc | 1816 ++- .../flyteidl/datacatalog/datacatalog.pb.h | 678 +- .../flyteidl/datacatalog/datacatalog.pb.go | 581 +- .../datacatalog/datacatalog.pb.validate.go | 330 + .../gen/pb-java/datacatalog/Datacatalog.java | 10005 +++++++++++----- .../flyteidl/datacatalog/datacatalog_pb2.py | 118 +- .../flyteidl/datacatalog/datacatalog_pb2.pyi | 24 + .../datacatalog/datacatalog_pb2_grpc.py | 114 + .../flyteidl/datacatalog/datacatalog.proto | 47 +- 12 files changed, 10877 insertions(+), 3684 deletions(-) diff --git a/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go b/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go index 8b53552898..65f617ae65 100644 --- a/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go +++ b/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go @@ -208,6 +208,54 @@ func (_m *DataCatalogClient) DeleteArtifact(ctx context.Context, in *datacatalog return r0, r1 } +type DataCatalogClient_DeleteArtifacts struct { + *mock.Call +} + +func (_m DataCatalogClient_DeleteArtifacts) Return(_a0 *datacatalog.DeleteArtifactResponse, _a1 error) *DataCatalogClient_DeleteArtifacts { + return &DataCatalogClient_DeleteArtifacts{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *DataCatalogClient) OnDeleteArtifacts(ctx context.Context, in *datacatalog.DeleteArtifactsRequest, opts ...grpc.CallOption) *DataCatalogClient_DeleteArtifacts { + c_call := _m.On("DeleteArtifacts", ctx, in, opts) + return &DataCatalogClient_DeleteArtifacts{Call: c_call} +} + +func (_m *DataCatalogClient) OnDeleteArtifactsMatch(matchers ...interface{}) *DataCatalogClient_DeleteArtifacts { + c_call := _m.On("DeleteArtifacts", matchers...) + return &DataCatalogClient_DeleteArtifacts{Call: c_call} +} + +// DeleteArtifacts provides a mock function with given fields: ctx, in, opts +func (_m *DataCatalogClient) DeleteArtifacts(ctx context.Context, in *datacatalog.DeleteArtifactsRequest, opts ...grpc.CallOption) (*datacatalog.DeleteArtifactResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *datacatalog.DeleteArtifactResponse + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DeleteArtifactsRequest, ...grpc.CallOption) *datacatalog.DeleteArtifactResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*datacatalog.DeleteArtifactResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.DeleteArtifactsRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + type DataCatalogClient_GetArtifact struct { *mock.Call } @@ -352,6 +400,54 @@ func (_m *DataCatalogClient) GetOrExtendReservation(ctx context.Context, in *dat return r0, r1 } +type DataCatalogClient_GetOrExtendReservations struct { + *mock.Call +} + +func (_m DataCatalogClient_GetOrExtendReservations) Return(_a0 *datacatalog.GetOrExtendReservationsResponse, _a1 error) *DataCatalogClient_GetOrExtendReservations { + return &DataCatalogClient_GetOrExtendReservations{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *DataCatalogClient) OnGetOrExtendReservations(ctx context.Context, in *datacatalog.GetOrExtendReservationsRequest, opts ...grpc.CallOption) *DataCatalogClient_GetOrExtendReservations { + c_call := _m.On("GetOrExtendReservations", ctx, in, opts) + return &DataCatalogClient_GetOrExtendReservations{Call: c_call} +} + +func (_m *DataCatalogClient) OnGetOrExtendReservationsMatch(matchers ...interface{}) *DataCatalogClient_GetOrExtendReservations { + c_call := _m.On("GetOrExtendReservations", matchers...) + return &DataCatalogClient_GetOrExtendReservations{Call: c_call} +} + +// GetOrExtendReservations provides a mock function with given fields: ctx, in, opts +func (_m *DataCatalogClient) GetOrExtendReservations(ctx context.Context, in *datacatalog.GetOrExtendReservationsRequest, opts ...grpc.CallOption) (*datacatalog.GetOrExtendReservationsResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *datacatalog.GetOrExtendReservationsResponse + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest, ...grpc.CallOption) *datacatalog.GetOrExtendReservationsResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*datacatalog.GetOrExtendReservationsResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + type DataCatalogClient_ListArtifacts struct { *mock.Call } @@ -496,6 +592,54 @@ func (_m *DataCatalogClient) ReleaseReservation(ctx context.Context, in *datacat return r0, r1 } +type DataCatalogClient_ReleaseReservations struct { + *mock.Call +} + +func (_m DataCatalogClient_ReleaseReservations) Return(_a0 *datacatalog.ReleaseReservationResponse, _a1 error) *DataCatalogClient_ReleaseReservations { + return &DataCatalogClient_ReleaseReservations{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *DataCatalogClient) OnReleaseReservations(ctx context.Context, in *datacatalog.ReleaseReservationsRequest, opts ...grpc.CallOption) *DataCatalogClient_ReleaseReservations { + c_call := _m.On("ReleaseReservations", ctx, in, opts) + return &DataCatalogClient_ReleaseReservations{Call: c_call} +} + +func (_m *DataCatalogClient) OnReleaseReservationsMatch(matchers ...interface{}) *DataCatalogClient_ReleaseReservations { + c_call := _m.On("ReleaseReservations", matchers...) + return &DataCatalogClient_ReleaseReservations{Call: c_call} +} + +// ReleaseReservations provides a mock function with given fields: ctx, in, opts +func (_m *DataCatalogClient) ReleaseReservations(ctx context.Context, in *datacatalog.ReleaseReservationsRequest, opts ...grpc.CallOption) (*datacatalog.ReleaseReservationResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *datacatalog.ReleaseReservationResponse + if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.ReleaseReservationsRequest, ...grpc.CallOption) *datacatalog.ReleaseReservationResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*datacatalog.ReleaseReservationResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.ReleaseReservationsRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + type DataCatalogClient_UpdateArtifact struct { *mock.Call } diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc index 3abf6da52c..b8ce82e486 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc @@ -28,8 +28,11 @@ static const char* DataCatalog_method_names[] = { "/datacatalog.DataCatalog/ListDatasets", "/datacatalog.DataCatalog/UpdateArtifact", "/datacatalog.DataCatalog/DeleteArtifact", + "/datacatalog.DataCatalog/DeleteArtifacts", "/datacatalog.DataCatalog/GetOrExtendReservation", + "/datacatalog.DataCatalog/GetOrExtendReservations", "/datacatalog.DataCatalog/ReleaseReservation", + "/datacatalog.DataCatalog/ReleaseReservations", }; std::unique_ptr< DataCatalog::Stub> DataCatalog::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) { @@ -48,8 +51,11 @@ DataCatalog::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channe , rpcmethod_ListDatasets_(DataCatalog_method_names[6], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_UpdateArtifact_(DataCatalog_method_names[7], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_DeleteArtifact_(DataCatalog_method_names[8], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_GetOrExtendReservation_(DataCatalog_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ReleaseReservation_(DataCatalog_method_names[10], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_DeleteArtifacts_(DataCatalog_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetOrExtendReservation_(DataCatalog_method_names[10], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_GetOrExtendReservations_(DataCatalog_method_names[11], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ReleaseReservation_(DataCatalog_method_names[12], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ReleaseReservations_(DataCatalog_method_names[13], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} ::grpc::Status DataCatalog::Stub::CreateDataset(::grpc::ClientContext* context, const ::datacatalog::CreateDatasetRequest& request, ::datacatalog::CreateDatasetResponse* response) { @@ -304,6 +310,34 @@ ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataC return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifact_, context, request, false); } +::grpc::Status DataCatalog::Stub::DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::datacatalog::DeleteArtifactResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_DeleteArtifacts_, context, request, response); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, reactor); +} + +void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataCatalog::Stub::AsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifacts_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataCatalog::Stub::PrepareAsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifacts_, context, request, false); +} + ::grpc::Status DataCatalog::Stub::GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::datacatalog::GetOrExtendReservationResponse* response) { return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_GetOrExtendReservation_, context, request, response); } @@ -332,6 +366,34 @@ ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::GetOrExtendReservationResponse>::Create(channel_.get(), cq, rpcmethod_GetOrExtendReservation_, context, request, false); } +::grpc::Status DataCatalog::Stub::GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::datacatalog::GetOrExtendReservationsResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_GetOrExtendReservations_, context, request, response); +} + +void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, reactor); +} + +void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* DataCatalog::Stub::AsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::GetOrExtendReservationsResponse>::Create(channel_.get(), cq, rpcmethod_GetOrExtendReservations_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* DataCatalog::Stub::PrepareAsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::GetOrExtendReservationsResponse>::Create(channel_.get(), cq, rpcmethod_GetOrExtendReservations_, context, request, false); +} + ::grpc::Status DataCatalog::Stub::ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::datacatalog::ReleaseReservationResponse* response) { return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_ReleaseReservation_, context, request, response); } @@ -360,6 +422,34 @@ ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* D return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::ReleaseReservationResponse>::Create(channel_.get(), cq, rpcmethod_ReleaseReservation_, context, request, false); } +::grpc::Status DataCatalog::Stub::ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::datacatalog::ReleaseReservationResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_ReleaseReservations_, context, request, response); +} + +void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, std::move(f)); +} + +void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, reactor); +} + +void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* DataCatalog::Stub::AsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::ReleaseReservationResponse>::Create(channel_.get(), cq, rpcmethod_ReleaseReservations_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* DataCatalog::Stub::PrepareAsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::ReleaseReservationResponse>::Create(channel_.get(), cq, rpcmethod_ReleaseReservations_, context, request, false); +} + DataCatalog::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( DataCatalog_method_names[0], @@ -409,13 +499,28 @@ DataCatalog::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( DataCatalog_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>( + std::mem_fn(&DataCatalog::Service::DeleteArtifacts), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + DataCatalog_method_names[10], + ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>( std::mem_fn(&DataCatalog::Service::GetOrExtendReservation), this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - DataCatalog_method_names[10], + DataCatalog_method_names[11], + ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>( + std::mem_fn(&DataCatalog::Service::GetOrExtendReservations), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + DataCatalog_method_names[12], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>( std::mem_fn(&DataCatalog::Service::ReleaseReservation), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + DataCatalog_method_names[13], + ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>( + std::mem_fn(&DataCatalog::Service::ReleaseReservations), this))); } DataCatalog::Service::~Service() { @@ -484,6 +589,13 @@ ::grpc::Status DataCatalog::Service::DeleteArtifact(::grpc::ServerContext* conte return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } +::grpc::Status DataCatalog::Service::DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + ::grpc::Status DataCatalog::Service::GetOrExtendReservation(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response) { (void) context; (void) request; @@ -491,6 +603,13 @@ ::grpc::Status DataCatalog::Service::GetOrExtendReservation(::grpc::ServerContex return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } +::grpc::Status DataCatalog::Service::GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + ::grpc::Status DataCatalog::Service::ReleaseReservation(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response) { (void) context; (void) request; @@ -498,6 +617,13 @@ ::grpc::Status DataCatalog::Service::ReleaseReservation(::grpc::ServerContext* c return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } +::grpc::Status DataCatalog::Service::ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + } // namespace datacatalog diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h index b4c3a41a3c..6a7c039a44 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h @@ -125,6 +125,18 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactRaw(context, request, cq)); } + // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage. + // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times + // will not result in an error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts deleted, however the operation can simply be retried to remove the remaining entries. + virtual ::grpc::Status DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::datacatalog::DeleteArtifactResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> AsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(AsyncDeleteArtifactsRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactsRaw(context, request, cq)); + } // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -143,6 +155,17 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>> PrepareAsyncGetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>>(PrepareAsyncGetOrExtendReservationRaw(context, request, cq)); } + // Attempts to get or extend reservations for multiple artifacts in a single operation. + // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a + // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release + // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error. + virtual ::grpc::Status GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::datacatalog::GetOrExtendReservationsResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>> AsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>>(AsyncGetOrExtendReservationsRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>> PrepareAsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>>(PrepareAsyncGetOrExtendReservationsRaw(context, request, cq)); + } // Release the reservation when the task holding the spot fails so that the other tasks // can grab the spot. virtual ::grpc::Status ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::datacatalog::ReleaseReservationResponse* response) = 0; @@ -152,6 +175,19 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationRaw(context, request, cq)); } + // Releases reservations for multiple artifacts in a single operation. + // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple + // times will not result in error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining + // reservations. + virtual ::grpc::Status ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::datacatalog::ReleaseReservationResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>> AsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>>(AsyncReleaseReservationsRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationsRaw(context, request, cq)); + } class experimental_async_interface { public: virtual ~experimental_async_interface() {} @@ -202,6 +238,15 @@ class DataCatalog final { virtual void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0; virtual void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage. + // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times + // will not result in an error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts deleted, however the operation can simply be retried to remove the remaining entries. + virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0; + virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0; + virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -217,12 +262,30 @@ class DataCatalog final { virtual void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) = 0; virtual void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Attempts to get or extend reservations for multiple artifacts in a single operation. + // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a + // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release + // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error. + virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) = 0; + virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) = 0; + virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; // Release the reservation when the task holding the spot fails so that the other tasks // can grab the spot. virtual void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0; virtual void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0; virtual void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Releases reservations for multiple artifacts in a single operation. + // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple + // times will not result in error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining + // reservations. + virtual void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0; + virtual void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0; + virtual void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; }; virtual class experimental_async_interface* experimental_async() { return nullptr; } private: @@ -244,10 +307,16 @@ class DataCatalog final { virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::UpdateArtifactResponse>* PrepareAsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>* AsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>* PrepareAsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>* AsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>* PrepareAsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0; }; class Stub final : public StubInterface { public: @@ -315,6 +384,13 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactRaw(context, request, cq)); } + ::grpc::Status DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::datacatalog::DeleteArtifactResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> AsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(AsyncDeleteArtifactsRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactsRaw(context, request, cq)); + } ::grpc::Status GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::datacatalog::GetOrExtendReservationResponse* response) override; std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>> AsyncGetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>>(AsyncGetOrExtendReservationRaw(context, request, cq)); @@ -322,6 +398,13 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>> PrepareAsyncGetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>>(PrepareAsyncGetOrExtendReservationRaw(context, request, cq)); } + ::grpc::Status GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::datacatalog::GetOrExtendReservationsResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>> AsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>>(AsyncGetOrExtendReservationsRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>> PrepareAsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>>(PrepareAsyncGetOrExtendReservationsRaw(context, request, cq)); + } ::grpc::Status ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::datacatalog::ReleaseReservationResponse* response) override; std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> AsyncReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(AsyncReleaseReservationRaw(context, request, cq)); @@ -329,6 +412,13 @@ class DataCatalog final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationRaw(context, request, cq)); } + ::grpc::Status ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::datacatalog::ReleaseReservationResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> AsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(AsyncReleaseReservationsRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationsRaw(context, request, cq)); + } class experimental_async final : public StubInterface::experimental_async_interface { public: @@ -368,14 +458,26 @@ class DataCatalog final { void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override; void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override; + void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override; + void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) override; void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) override; void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) override; + void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) override; + void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override; void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override; void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override; + void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override; + void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; private: friend class Stub; explicit experimental_async(Stub* stub): stub_(stub) { } @@ -405,10 +507,16 @@ class DataCatalog final { ::grpc::ClientAsyncResponseReader< ::datacatalog::UpdateArtifactResponse>* PrepareAsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>* AsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>* PrepareAsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* AsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* PrepareAsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) override; const ::grpc::internal::RpcMethod rpcmethod_CreateDataset_; const ::grpc::internal::RpcMethod rpcmethod_GetDataset_; const ::grpc::internal::RpcMethod rpcmethod_CreateArtifact_; @@ -418,8 +526,11 @@ class DataCatalog final { const ::grpc::internal::RpcMethod rpcmethod_ListDatasets_; const ::grpc::internal::RpcMethod rpcmethod_UpdateArtifact_; const ::grpc::internal::RpcMethod rpcmethod_DeleteArtifact_; + const ::grpc::internal::RpcMethod rpcmethod_DeleteArtifacts_; const ::grpc::internal::RpcMethod rpcmethod_GetOrExtendReservation_; + const ::grpc::internal::RpcMethod rpcmethod_GetOrExtendReservations_; const ::grpc::internal::RpcMethod rpcmethod_ReleaseReservation_; + const ::grpc::internal::RpcMethod rpcmethod_ReleaseReservations_; }; static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions()); @@ -447,6 +558,12 @@ class DataCatalog final { virtual ::grpc::Status UpdateArtifact(::grpc::ServerContext* context, const ::datacatalog::UpdateArtifactRequest* request, ::datacatalog::UpdateArtifactResponse* response); // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. virtual ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response); + // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage. + // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times + // will not result in an error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts deleted, however the operation can simply be retried to remove the remaining entries. + virtual ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response); // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -459,9 +576,21 @@ class DataCatalog final { // task B may take over the reservation, resulting in two tasks A and B running in parallel. So // a third task C may get the Artifact from A or B, whichever writes last. virtual ::grpc::Status GetOrExtendReservation(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response); + // Attempts to get or extend reservations for multiple artifacts in a single operation. + // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a + // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release + // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error. + virtual ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response); // Release the reservation when the task holding the spot fails so that the other tasks // can grab the spot. virtual ::grpc::Status ReleaseReservation(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response); + // Releases reservations for multiple artifacts in a single operation. + // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple + // times will not result in error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining + // reservations. + virtual ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response); }; template class WithAsyncMethod_CreateDataset : public BaseClass { @@ -644,12 +773,32 @@ class DataCatalog final { } }; template + class WithAsyncMethod_DeleteArtifacts : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_DeleteArtifacts() { + ::grpc::Service::MarkMethodAsync(9); + } + ~WithAsyncMethod_DeleteArtifacts() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestDeleteArtifacts(::grpc::ServerContext* context, ::datacatalog::DeleteArtifactsRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::DeleteArtifactResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template class WithAsyncMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodAsync(9); + ::grpc::Service::MarkMethodAsync(10); } ~WithAsyncMethod_GetOrExtendReservation() override { BaseClassMustBeDerivedFromService(this); @@ -660,7 +809,27 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetOrExtendReservation(::grpc::ServerContext* context, ::datacatalog::GetOrExtendReservationRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::GetOrExtendReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithAsyncMethod_GetOrExtendReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_GetOrExtendReservations() { + ::grpc::Service::MarkMethodAsync(11); + } + ~WithAsyncMethod_GetOrExtendReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestGetOrExtendReservations(::grpc::ServerContext* context, ::datacatalog::GetOrExtendReservationsRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::GetOrExtendReservationsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -669,7 +838,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithAsyncMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodAsync(10); + ::grpc::Service::MarkMethodAsync(12); } ~WithAsyncMethod_ReleaseReservation() override { BaseClassMustBeDerivedFromService(this); @@ -680,10 +849,30 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestReleaseReservation(::grpc::ServerContext* context, ::datacatalog::ReleaseReservationRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::ReleaseReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(12, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithAsyncMethod_ReleaseReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_ReleaseReservations() { + ::grpc::Service::MarkMethodAsync(13); + } + ~WithAsyncMethod_ReleaseReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestReleaseReservations(::grpc::ServerContext* context, ::datacatalog::ReleaseReservationsRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::ReleaseReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_CreateDataset > > > > > > > > > > AsyncService; + typedef WithAsyncMethod_CreateDataset > > > > > > > > > > > > > AsyncService; template class ExperimentalWithCallbackMethod_CreateDataset : public BaseClass { private: @@ -964,12 +1153,43 @@ class DataCatalog final { virtual void DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithCallbackMethod_DeleteArtifacts : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_DeleteArtifacts() { + ::grpc::Service::experimental().MarkMethodCallback(9, + new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>( + [this](::grpc::ServerContext* context, + const ::datacatalog::DeleteArtifactsRequest* request, + ::datacatalog::DeleteArtifactResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->DeleteArtifacts(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_DeleteArtifacts( + ::grpc::experimental::MessageAllocator< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>*>( + ::grpc::Service::experimental().GetHandler(9)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_DeleteArtifacts() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithCallbackMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_GetOrExtendReservation() { - ::grpc::Service::experimental().MarkMethodCallback(9, + ::grpc::Service::experimental().MarkMethodCallback(10, new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>( [this](::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, @@ -981,7 +1201,7 @@ class DataCatalog final { void SetMessageAllocatorFor_GetOrExtendReservation( ::grpc::experimental::MessageAllocator< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>*>( - ::grpc::Service::experimental().GetHandler(9)) + ::grpc::Service::experimental().GetHandler(10)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_GetOrExtendReservation() override { @@ -995,12 +1215,43 @@ class DataCatalog final { virtual void GetOrExtendReservation(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithCallbackMethod_GetOrExtendReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_GetOrExtendReservations() { + ::grpc::Service::experimental().MarkMethodCallback(11, + new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>( + [this](::grpc::ServerContext* context, + const ::datacatalog::GetOrExtendReservationsRequest* request, + ::datacatalog::GetOrExtendReservationsResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->GetOrExtendReservations(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_GetOrExtendReservations( + ::grpc::experimental::MessageAllocator< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>*>( + ::grpc::Service::experimental().GetHandler(11)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_GetOrExtendReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithCallbackMethod_ReleaseReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithCallbackMethod_ReleaseReservation() { - ::grpc::Service::experimental().MarkMethodCallback(10, + ::grpc::Service::experimental().MarkMethodCallback(12, new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>( [this](::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, @@ -1012,7 +1263,7 @@ class DataCatalog final { void SetMessageAllocatorFor_ReleaseReservation( ::grpc::experimental::MessageAllocator< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>*>( - ::grpc::Service::experimental().GetHandler(10)) + ::grpc::Service::experimental().GetHandler(12)) ->SetMessageAllocator(allocator); } ~ExperimentalWithCallbackMethod_ReleaseReservation() override { @@ -1025,7 +1276,38 @@ class DataCatalog final { } virtual void ReleaseReservation(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; - typedef ExperimentalWithCallbackMethod_CreateDataset > > > > > > > > > > ExperimentalCallbackService; + template + class ExperimentalWithCallbackMethod_ReleaseReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_ReleaseReservations() { + ::grpc::Service::experimental().MarkMethodCallback(13, + new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>( + [this](::grpc::ServerContext* context, + const ::datacatalog::ReleaseReservationsRequest* request, + ::datacatalog::ReleaseReservationResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->ReleaseReservations(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_ReleaseReservations( + ::grpc::experimental::MessageAllocator< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>*>( + ::grpc::Service::experimental().GetHandler(13)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_ReleaseReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + typedef ExperimentalWithCallbackMethod_CreateDataset > > > > > > > > > > > > > ExperimentalCallbackService; template class WithGenericMethod_CreateDataset : public BaseClass { private: @@ -1180,12 +1462,29 @@ class DataCatalog final { } }; template + class WithGenericMethod_DeleteArtifacts : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_DeleteArtifacts() { + ::grpc::Service::MarkMethodGeneric(9); + } + ~WithGenericMethod_DeleteArtifacts() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template class WithGenericMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodGeneric(9); + ::grpc::Service::MarkMethodGeneric(10); } ~WithGenericMethod_GetOrExtendReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1197,12 +1496,29 @@ class DataCatalog final { } }; template + class WithGenericMethod_GetOrExtendReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_GetOrExtendReservations() { + ::grpc::Service::MarkMethodGeneric(11); + } + ~WithGenericMethod_GetOrExtendReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template class WithGenericMethod_ReleaseReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithGenericMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodGeneric(10); + ::grpc::Service::MarkMethodGeneric(12); } ~WithGenericMethod_ReleaseReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1214,6 +1530,23 @@ class DataCatalog final { } }; template + class WithGenericMethod_ReleaseReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_ReleaseReservations() { + ::grpc::Service::MarkMethodGeneric(13); + } + ~WithGenericMethod_ReleaseReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template class WithRawMethod_CreateDataset : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} @@ -1394,12 +1727,32 @@ class DataCatalog final { } }; template + class WithRawMethod_DeleteArtifacts : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_DeleteArtifacts() { + ::grpc::Service::MarkMethodRaw(9); + } + ~WithRawMethod_DeleteArtifacts() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestDeleteArtifacts(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template class WithRawMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodRaw(9); + ::grpc::Service::MarkMethodRaw(10); } ~WithRawMethod_GetOrExtendReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1410,7 +1763,27 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestGetOrExtendReservation(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithRawMethod_GetOrExtendReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_GetOrExtendReservations() { + ::grpc::Service::MarkMethodRaw(11); + } + ~WithRawMethod_GetOrExtendReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestGetOrExtendReservations(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -1419,7 +1792,7 @@ class DataCatalog final { void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithRawMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodRaw(10); + ::grpc::Service::MarkMethodRaw(12); } ~WithRawMethod_ReleaseReservation() override { BaseClassMustBeDerivedFromService(this); @@ -1430,7 +1803,27 @@ class DataCatalog final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestReleaseReservation(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(12, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithRawMethod_ReleaseReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_ReleaseReservations() { + ::grpc::Service::MarkMethodRaw(13); + } + ~WithRawMethod_ReleaseReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestReleaseReservations(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -1659,12 +2052,37 @@ class DataCatalog final { virtual void DeleteArtifact(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithRawCallbackMethod_DeleteArtifacts : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_DeleteArtifacts() { + ::grpc::Service::experimental().MarkMethodRawCallback(9, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->DeleteArtifacts(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_DeleteArtifacts() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void DeleteArtifacts(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithRawCallbackMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_GetOrExtendReservation() { - ::grpc::Service::experimental().MarkMethodRawCallback(9, + ::grpc::Service::experimental().MarkMethodRawCallback(10, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -1684,12 +2102,37 @@ class DataCatalog final { virtual void GetOrExtendReservation(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithRawCallbackMethod_GetOrExtendReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_GetOrExtendReservations() { + ::grpc::Service::experimental().MarkMethodRawCallback(11, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->GetOrExtendReservations(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_GetOrExtendReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void GetOrExtendReservations(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class ExperimentalWithRawCallbackMethod_ReleaseReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: ExperimentalWithRawCallbackMethod_ReleaseReservation() { - ::grpc::Service::experimental().MarkMethodRawCallback(10, + ::grpc::Service::experimental().MarkMethodRawCallback(12, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, @@ -1709,6 +2152,31 @@ class DataCatalog final { virtual void ReleaseReservation(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template + class ExperimentalWithRawCallbackMethod_ReleaseReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_ReleaseReservations() { + ::grpc::Service::experimental().MarkMethodRawCallback(13, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->ReleaseReservations(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_ReleaseReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void ReleaseReservations(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class WithStreamedUnaryMethod_CreateDataset : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} @@ -1889,12 +2357,32 @@ class DataCatalog final { virtual ::grpc::Status StreamedDeleteArtifact(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::DeleteArtifactRequest,::datacatalog::DeleteArtifactResponse>* server_unary_streamer) = 0; }; template + class WithStreamedUnaryMethod_DeleteArtifacts : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_DeleteArtifacts() { + ::grpc::Service::MarkMethodStreamed(9, + new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>(std::bind(&WithStreamedUnaryMethod_DeleteArtifacts::StreamedDeleteArtifacts, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_DeleteArtifacts() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedDeleteArtifacts(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::DeleteArtifactsRequest,::datacatalog::DeleteArtifactResponse>* server_unary_streamer) = 0; + }; + template class WithStreamedUnaryMethod_GetOrExtendReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_GetOrExtendReservation() { - ::grpc::Service::MarkMethodStreamed(9, + ::grpc::Service::MarkMethodStreamed(10, new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>(std::bind(&WithStreamedUnaryMethod_GetOrExtendReservation::StreamedGetOrExtendReservation, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_GetOrExtendReservation() override { @@ -1909,12 +2397,32 @@ class DataCatalog final { virtual ::grpc::Status StreamedGetOrExtendReservation(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::GetOrExtendReservationRequest,::datacatalog::GetOrExtendReservationResponse>* server_unary_streamer) = 0; }; template + class WithStreamedUnaryMethod_GetOrExtendReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_GetOrExtendReservations() { + ::grpc::Service::MarkMethodStreamed(11, + new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>(std::bind(&WithStreamedUnaryMethod_GetOrExtendReservations::StreamedGetOrExtendReservations, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_GetOrExtendReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedGetOrExtendReservations(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::GetOrExtendReservationsRequest,::datacatalog::GetOrExtendReservationsResponse>* server_unary_streamer) = 0; + }; + template class WithStreamedUnaryMethod_ReleaseReservation : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: WithStreamedUnaryMethod_ReleaseReservation() { - ::grpc::Service::MarkMethodStreamed(10, + ::grpc::Service::MarkMethodStreamed(12, new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>(std::bind(&WithStreamedUnaryMethod_ReleaseReservation::StreamedReleaseReservation, this, std::placeholders::_1, std::placeholders::_2))); } ~WithStreamedUnaryMethod_ReleaseReservation() override { @@ -1928,9 +2436,29 @@ class DataCatalog final { // replace default version of method with streamed unary virtual ::grpc::Status StreamedReleaseReservation(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::ReleaseReservationRequest,::datacatalog::ReleaseReservationResponse>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > StreamedUnaryService; + template + class WithStreamedUnaryMethod_ReleaseReservations : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_ReleaseReservations() { + ::grpc::Service::MarkMethodStreamed(13, + new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>(std::bind(&WithStreamedUnaryMethod_ReleaseReservations::StreamedReleaseReservations, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_ReleaseReservations() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedReleaseReservations(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::ReleaseReservationsRequest,::datacatalog::ReleaseReservationResponse>* server_unary_streamer) = 0; + }; + typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > > > > StreamedUnaryService; typedef Service SplitStreamedService; - typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > StreamedService; + typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > > > > StreamedService; }; } // namespace datacatalog diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc index 5741f661d6..d03ea9fdfb 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc @@ -26,12 +26,15 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::g extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Partition_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TagPropertyFilter_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_ArtifactData_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_FilterExpression_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_PartitionPropertyFilter_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_ReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Tag_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_Dataset_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_GetOrExtendReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_SinglePropertyFilter_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<6> scc_info_Artifact_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; @@ -112,6 +115,10 @@ class DeleteArtifactRequestDefaultTypeInternal { ::google::protobuf::internal::ArenaStringPtr artifact_id_; ::google::protobuf::internal::ArenaStringPtr tag_name_; } _DeleteArtifactRequest_default_instance_; +class DeleteArtifactsRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _DeleteArtifactsRequest_default_instance_; class DeleteArtifactResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -124,6 +131,10 @@ class GetOrExtendReservationRequestDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GetOrExtendReservationRequest_default_instance_; +class GetOrExtendReservationsRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _GetOrExtendReservationsRequest_default_instance_; class ReservationDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -132,10 +143,18 @@ class GetOrExtendReservationResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GetOrExtendReservationResponse_default_instance_; +class GetOrExtendReservationsResponseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _GetOrExtendReservationsResponse_default_instance_; class ReleaseReservationRequestDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _ReleaseReservationRequest_default_instance_; +class ReleaseReservationsRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _ReleaseReservationsRequest_default_instance_; class ReleaseReservationResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -471,6 +490,21 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_DeleteArtifactRequest_flyteidl {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsDeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { &scc_info_DatasetID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; +static void InitDefaultsDeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::datacatalog::_DeleteArtifactsRequest_default_instance_; + new (ptr) ::datacatalog::DeleteArtifactsRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::datacatalog::DeleteArtifactsRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsDeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { + &scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; + static void InitDefaultsDeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -516,6 +550,21 @@ ::google::protobuf::internal::SCCInfo<2> scc_info_GetOrExtendReservationRequest_ &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base, &scc_info_Duration_google_2fprotobuf_2fduration_2eproto.base,}}; +static void InitDefaultsGetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::datacatalog::_GetOrExtendReservationsRequest_default_instance_; + new (ptr) ::datacatalog::GetOrExtendReservationsRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::datacatalog::GetOrExtendReservationsRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { + &scc_info_GetOrExtendReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; + static void InitDefaultsReservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -549,6 +598,21 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_GetOrExtendReservationResponse {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetOrExtendReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { &scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; +static void InitDefaultsGetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::datacatalog::_GetOrExtendReservationsResponse_default_instance_; + new (ptr) ::datacatalog::GetOrExtendReservationsResponse(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::datacatalog::GetOrExtendReservationsResponse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { + &scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; + static void InitDefaultsReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -564,6 +628,21 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_ReleaseReservationRequest_flyt {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; +static void InitDefaultsReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::datacatalog::_ReleaseReservationsRequest_default_instance_; + new (ptr) ::datacatalog::ReleaseReservationsRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::datacatalog::ReleaseReservationsRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, { + &scc_info_ReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}}; + static void InitDefaultsReleaseReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -836,12 +915,16 @@ void InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_UpdateArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_ReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_ReleaseReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_Dataset_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_Partition_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); @@ -861,7 +944,7 @@ void InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_PaginationOptions_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[40]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[44]; const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[3]; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = nullptr; @@ -981,6 +1064,12 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo offsetof(::datacatalog::DeleteArtifactRequestDefaultTypeInternal, tag_name_), PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactRequest, query_handle_), ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactsRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactsRequest, artifacts_), + ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactResponse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ @@ -1001,6 +1090,12 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationRequest, owner_id_), PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationRequest, heartbeat_interval_), ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsRequest, reservations_), + ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::datacatalog::Reservation, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ @@ -1017,6 +1112,12 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationResponse, reservation_), ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsResponse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsResponse, reservations_), + ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationRequest, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ @@ -1024,6 +1125,12 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationRequest, reservation_id_), PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationRequest, owner_id_), ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationsRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationsRequest, reservations_), + ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationResponse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ @@ -1178,29 +1285,33 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 89, -1, sizeof(::datacatalog::UpdateArtifactRequest)}, { 99, -1, sizeof(::datacatalog::UpdateArtifactResponse)}, { 105, -1, sizeof(::datacatalog::DeleteArtifactRequest)}, - { 114, -1, sizeof(::datacatalog::DeleteArtifactResponse)}, - { 119, -1, sizeof(::datacatalog::ReservationID)}, - { 126, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)}, - { 134, -1, sizeof(::datacatalog::Reservation)}, - { 144, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)}, - { 150, -1, sizeof(::datacatalog::ReleaseReservationRequest)}, - { 157, -1, sizeof(::datacatalog::ReleaseReservationResponse)}, - { 162, -1, sizeof(::datacatalog::Dataset)}, - { 170, -1, sizeof(::datacatalog::Partition)}, - { 177, -1, sizeof(::datacatalog::DatasetID)}, - { 187, -1, sizeof(::datacatalog::Artifact)}, - { 199, -1, sizeof(::datacatalog::ArtifactData)}, - { 206, -1, sizeof(::datacatalog::Tag)}, - { 214, 221, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)}, - { 223, -1, sizeof(::datacatalog::Metadata)}, - { 229, -1, sizeof(::datacatalog::FilterExpression)}, - { 235, -1, sizeof(::datacatalog::SinglePropertyFilter)}, - { 246, -1, sizeof(::datacatalog::ArtifactPropertyFilter)}, - { 253, -1, sizeof(::datacatalog::TagPropertyFilter)}, - { 260, -1, sizeof(::datacatalog::PartitionPropertyFilter)}, - { 267, -1, sizeof(::datacatalog::KeyValuePair)}, - { 274, -1, sizeof(::datacatalog::DatasetPropertyFilter)}, - { 284, -1, sizeof(::datacatalog::PaginationOptions)}, + { 114, -1, sizeof(::datacatalog::DeleteArtifactsRequest)}, + { 120, -1, sizeof(::datacatalog::DeleteArtifactResponse)}, + { 125, -1, sizeof(::datacatalog::ReservationID)}, + { 132, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)}, + { 140, -1, sizeof(::datacatalog::GetOrExtendReservationsRequest)}, + { 146, -1, sizeof(::datacatalog::Reservation)}, + { 156, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)}, + { 162, -1, sizeof(::datacatalog::GetOrExtendReservationsResponse)}, + { 168, -1, sizeof(::datacatalog::ReleaseReservationRequest)}, + { 175, -1, sizeof(::datacatalog::ReleaseReservationsRequest)}, + { 181, -1, sizeof(::datacatalog::ReleaseReservationResponse)}, + { 186, -1, sizeof(::datacatalog::Dataset)}, + { 194, -1, sizeof(::datacatalog::Partition)}, + { 201, -1, sizeof(::datacatalog::DatasetID)}, + { 211, -1, sizeof(::datacatalog::Artifact)}, + { 223, -1, sizeof(::datacatalog::ArtifactData)}, + { 230, -1, sizeof(::datacatalog::Tag)}, + { 238, 245, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)}, + { 247, -1, sizeof(::datacatalog::Metadata)}, + { 253, -1, sizeof(::datacatalog::FilterExpression)}, + { 259, -1, sizeof(::datacatalog::SinglePropertyFilter)}, + { 270, -1, sizeof(::datacatalog::ArtifactPropertyFilter)}, + { 277, -1, sizeof(::datacatalog::TagPropertyFilter)}, + { 284, -1, sizeof(::datacatalog::PartitionPropertyFilter)}, + { 291, -1, sizeof(::datacatalog::KeyValuePair)}, + { 298, -1, sizeof(::datacatalog::DatasetPropertyFilter)}, + { 308, -1, sizeof(::datacatalog::PaginationOptions)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -1221,12 +1332,16 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::datacatalog::_UpdateArtifactRequest_default_instance_), reinterpret_cast(&::datacatalog::_UpdateArtifactResponse_default_instance_), reinterpret_cast(&::datacatalog::_DeleteArtifactRequest_default_instance_), + reinterpret_cast(&::datacatalog::_DeleteArtifactsRequest_default_instance_), reinterpret_cast(&::datacatalog::_DeleteArtifactResponse_default_instance_), reinterpret_cast(&::datacatalog::_ReservationID_default_instance_), reinterpret_cast(&::datacatalog::_GetOrExtendReservationRequest_default_instance_), + reinterpret_cast(&::datacatalog::_GetOrExtendReservationsRequest_default_instance_), reinterpret_cast(&::datacatalog::_Reservation_default_instance_), reinterpret_cast(&::datacatalog::_GetOrExtendReservationResponse_default_instance_), + reinterpret_cast(&::datacatalog::_GetOrExtendReservationsResponse_default_instance_), reinterpret_cast(&::datacatalog::_ReleaseReservationRequest_default_instance_), + reinterpret_cast(&::datacatalog::_ReleaseReservationsRequest_default_instance_), reinterpret_cast(&::datacatalog::_ReleaseReservationResponse_default_instance_), reinterpret_cast(&::datacatalog::_Dataset_default_instance_), reinterpret_cast(&::datacatalog::_Partition_default_instance_), @@ -1249,7 +1364,7 @@ static ::google::protobuf::Message const * const file_default_instances[] = { ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = { {}, AddDescriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, "flyteidl/datacatalog/datacatalog.proto", schemas, file_default_instances, TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto::offsets, - file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 40, file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, + file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 44, file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, }; const char descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[] = @@ -1290,102 +1405,119 @@ const char descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eprot "tifact_id\030\001 \001(\t\"{\n\025DeleteArtifactRequest" "\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.DatasetI" "D\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001" - "(\tH\000B\016\n\014query_handle\"\030\n\026DeleteArtifactRe" - "sponse\"M\n\rReservationID\022*\n\ndataset_id\030\001 " - "\001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name\030" - "\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest\022" - "2\n\016reservation_id\030\001 \001(\0132\032.datacatalog.Re" - "servationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbe" - "at_interval\030\003 \001(\0132\031.google.protobuf.Dura" - "tion\"\343\001\n\013Reservation\0222\n\016reservation_id\030\001" - " \001(\0132\032.datacatalog.ReservationID\022\020\n\010owne" - "r_id\030\002 \001(\t\0225\n\022heartbeat_interval\030\003 \001(\0132\031" - ".google.protobuf.Duration\022.\n\nexpires_at\030" - "\004 \001(\0132\032.google.protobuf.Timestamp\022\'\n\010met" - "adata\030\006 \001(\0132\025.datacatalog.Metadata\"O\n\036Ge" - "tOrExtendReservationResponse\022-\n\013reservat" - "ion\030\001 \001(\0132\030.datacatalog.Reservation\"a\n\031R" - "eleaseReservationRequest\0222\n\016reservation_" - "id\030\001 \001(\0132\032.datacatalog.ReservationID\022\020\n\010" - "owner_id\030\002 \001(\t\"\034\n\032ReleaseReservationResp" - "onse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalo" - "g.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacata" - "log.Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tP" - "artition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\t" - "DatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t" - "\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUI" - "D\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007data" - "set\030\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004dat" - "a\030\003 \003(\0132\031.datacatalog.ArtifactData\022\'\n\010me" - "tadata\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\np" - "artitions\030\005 \003(\0132\026.datacatalog.Partition\022" - "\036\n\004tags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreat" - "ed_at\030\007 \001(\0132\032.google.protobuf.Timestamp\"" - "C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002" - " \001(\0132\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004n" - "ame\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007datase" - "t\030\003 \001(\0132\026.datacatalog.DatasetID\"m\n\010Metad" - "ata\0222\n\007key_map\030\001 \003(\0132!.datacatalog.Metad" - "ata.KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 " - "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpressi" - "on\0222\n\007filters\030\001 \003(\0132!.datacatalog.Single" - "PropertyFilter\"\211\003\n\024SinglePropertyFilter\022" - "4\n\ntag_filter\030\001 \001(\0132\036.datacatalog.TagPro" - "pertyFilterH\000\022@\n\020partition_filter\030\002 \001(\0132" - "$.datacatalog.PartitionPropertyFilterH\000\022" - ">\n\017artifact_filter\030\003 \001(\0132#.datacatalog.A" - "rtifactPropertyFilterH\000\022<\n\016dataset_filte" - "r\030\004 \001(\0132\".datacatalog.DatasetPropertyFil" - "terH\000\022F\n\010operator\030\n \001(\01624.datacatalog.Si" - "nglePropertyFilter.ComparisonOperator\" \n" - "\022ComparisonOperator\022\n\n\006EQUALS\020\000B\021\n\017prope" - "rty_filter\";\n\026ArtifactPropertyFilter\022\025\n\013" - "artifact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagPr" - "opertyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010prop" - "erty\"S\n\027PartitionPropertyFilter\022,\n\007key_v" - "al\030\001 \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n" - "\010property\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r" - "\n\005value\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021" - "\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006dom" - "ain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010proper" - "ty\"\361\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022" - "\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.dataca" - "talog.PaginationOptions.SortKey\022;\n\tsortO" - "rder\030\004 \001(\0162(.datacatalog.PaginationOptio" - "ns.SortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020" - "\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_" - "TIME\020\0002\341\007\n\013DataCatalog\022V\n\rCreateDataset\022" - "!.datacatalog.CreateDatasetRequest\032\".dat" - "acatalog.CreateDatasetResponse\022M\n\nGetDat" - "aset\022\036.datacatalog.GetDatasetRequest\032\037.d" - "atacatalog.GetDatasetResponse\022Y\n\016CreateA" - "rtifact\022\".datacatalog.CreateArtifactRequ" - "est\032#.datacatalog.CreateArtifactResponse" - "\022P\n\013GetArtifact\022\037.datacatalog.GetArtifac" - "tRequest\032 .datacatalog.GetArtifactRespon" - "se\022A\n\006AddTag\022\032.datacatalog.AddTagRequest" - "\032\033.datacatalog.AddTagResponse\022V\n\rListArt" - "ifacts\022!.datacatalog.ListArtifactsReques" - "t\032\".datacatalog.ListArtifactsResponse\022S\n" - "\014ListDatasets\022 .datacatalog.ListDatasets" - "Request\032!.datacatalog.ListDatasetsRespon" - "se\022Y\n\016UpdateArtifact\022\".datacatalog.Updat" - "eArtifactRequest\032#.datacatalog.UpdateArt" - "ifactResponse\022Y\n\016DeleteArtifact\022\".dataca" - "talog.DeleteArtifactRequest\032#.datacatalo" - "g.DeleteArtifactResponse\022q\n\026GetOrExtendR" - "eservation\022*.datacatalog.GetOrExtendRese" - "rvationRequest\032+.datacatalog.GetOrExtend" - "ReservationResponse\022e\n\022ReleaseReservatio" - "n\022&.datacatalog.ReleaseReservationReques" - "t\032\'.datacatalog.ReleaseReservationRespon" - "seB=Z;github.com/flyteorg/flyteidl/gen/p" - "b-go/flyteidl/datacatalogb\006proto3" + "(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifactsR" + "equest\0225\n\tartifacts\030\001 \003(\0132\".datacatalog." + "DeleteArtifactRequest\"\030\n\026DeleteArtifactR" + "esponse\"M\n\rReservationID\022*\n\ndataset_id\030\001" + " \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name" + "\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest" + "\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog.R" + "eservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartb" + "eat_interval\030\003 \001(\0132\031.google.protobuf.Dur" + "ation\"b\n\036GetOrExtendReservationsRequest\022" + "@\n\014reservations\030\001 \003(\0132*.datacatalog.GetO" + "rExtendReservationRequest\"\343\001\n\013Reservatio" + "n\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog." + "ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heart" + "beat_interval\030\003 \001(\0132\031.google.protobuf.Du" + "ration\022.\n\nexpires_at\030\004 \001(\0132\032.google.prot" + "obuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.datac" + "atalog.Metadata\"O\n\036GetOrExtendReservatio" + "nResponse\022-\n\013reservation\030\001 \001(\0132\030.datacat" + "alog.Reservation\"Q\n\037GetOrExtendReservati" + "onsResponse\022.\n\014reservations\030\001 \003(\0132\030.data" + "catalog.Reservation\"a\n\031ReleaseReservatio" + "nRequest\0222\n\016reservation_id\030\001 \001(\0132\032.datac" + "atalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\"Z" + "\n\032ReleaseReservationsRequest\022<\n\014reservat" + "ions\030\001 \003(\0132&.datacatalog.ReleaseReservat" + "ionRequest\"\034\n\032ReleaseReservationResponse" + "\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.Da" + "tasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog." + "Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tParti" + "tion\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\tData" + "setID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n\006" + "domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005 " + "\001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007dataset\030" + "\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004data\030\003 " + "\003(\0132\031.datacatalog.ArtifactData\022\'\n\010metada" + "ta\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\nparti" + "tions\030\005 \003(\0132\026.datacatalog.Partition\022\036\n\004t" + "ags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreated_a" + "t\030\007 \001(\0132\032.google.protobuf.Timestamp\"C\n\014A" + "rtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002 \001(\013" + "2\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004name\030" + "\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007dataset\030\003 " + "\001(\0132\026.datacatalog.DatasetID\"m\n\010Metadata\022" + "2\n\007key_map\030\001 \003(\0132!.datacatalog.Metadata." + "KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 \001(\t\022" + "\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpression\0222" + "\n\007filters\030\001 \003(\0132!.datacatalog.SingleProp" + "ertyFilter\"\211\003\n\024SinglePropertyFilter\0224\n\nt" + "ag_filter\030\001 \001(\0132\036.datacatalog.TagPropert" + "yFilterH\000\022@\n\020partition_filter\030\002 \001(\0132$.da" + "tacatalog.PartitionPropertyFilterH\000\022>\n\017a" + "rtifact_filter\030\003 \001(\0132#.datacatalog.Artif" + "actPropertyFilterH\000\022<\n\016dataset_filter\030\004 " + "\001(\0132\".datacatalog.DatasetPropertyFilterH" + "\000\022F\n\010operator\030\n \001(\01624.datacatalog.Single" + "PropertyFilter.ComparisonOperator\" \n\022Com" + "parisonOperator\022\n\n\006EQUALS\020\000B\021\n\017property_" + "filter\";\n\026ArtifactPropertyFilter\022\025\n\013arti" + "fact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagProper" + "tyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010property" + "\"S\n\027PartitionPropertyFilter\022,\n\007key_val\030\001" + " \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n\010pro" + "perty\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + "lue\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021\n\007pr" + "oject\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006domain\030" + "\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010property\"\361" + "\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005t" + "oken\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatalo" + "g.PaginationOptions.SortKey\022;\n\tsortOrder" + "\030\004 \001(\0162(.datacatalog.PaginationOptions.S" + "ortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n" + "\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME" + "\020\0002\235\n\n\013DataCatalog\022V\n\rCreateDataset\022!.da" + "tacatalog.CreateDatasetRequest\032\".datacat" + "alog.CreateDatasetResponse\022M\n\nGetDataset" + "\022\036.datacatalog.GetDatasetRequest\032\037.datac" + "atalog.GetDatasetResponse\022Y\n\016CreateArtif" + "act\022\".datacatalog.CreateArtifactRequest\032" + "#.datacatalog.CreateArtifactResponse\022P\n\013" + "GetArtifact\022\037.datacatalog.GetArtifactReq" + "uest\032 .datacatalog.GetArtifactResponse\022A" + "\n\006AddTag\022\032.datacatalog.AddTagRequest\032\033.d" + "atacatalog.AddTagResponse\022V\n\rListArtifac" + "ts\022!.datacatalog.ListArtifactsRequest\032\"." + "datacatalog.ListArtifactsResponse\022S\n\014Lis" + "tDatasets\022 .datacatalog.ListDatasetsRequ" + "est\032!.datacatalog.ListDatasetsResponse\022Y" + "\n\016UpdateArtifact\022\".datacatalog.UpdateArt" + "ifactRequest\032#.datacatalog.UpdateArtifac" + "tResponse\022Y\n\016DeleteArtifact\022\".datacatalo" + "g.DeleteArtifactRequest\032#.datacatalog.De" + "leteArtifactResponse\022[\n\017DeleteArtifacts\022" + "#.datacatalog.DeleteArtifactsRequest\032#.d" + "atacatalog.DeleteArtifactResponse\022q\n\026Get" + "OrExtendReservation\022*.datacatalog.GetOrE" + "xtendReservationRequest\032+.datacatalog.Ge" + "tOrExtendReservationResponse\022t\n\027GetOrExt" + "endReservations\022+.datacatalog.GetOrExten" + "dReservationsRequest\032,.datacatalog.GetOr" + "ExtendReservationsResponse\022e\n\022ReleaseRes" + "ervation\022&.datacatalog.ReleaseReservatio" + "nRequest\032\'.datacatalog.ReleaseReservatio" + "nResponse\022g\n\023ReleaseReservations\022\'.datac" + "atalog.ReleaseReservationsRequest\032\'.data" + "catalog.ReleaseReservationResponseB=Z;gi" + "thub.com/flyteorg/flyteidl/gen/pb-go/fly" + "teidl/datacatalogb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = { false, InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, - "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 5113, + "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 5785, }; void AddDescriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() { @@ -7078,60 +7210,65 @@ ::google::protobuf::Metadata DeleteArtifactRequest::GetMetadata() const { // =================================================================== -void DeleteArtifactResponse::InitAsDefaultInstance() { +void DeleteArtifactsRequest::InitAsDefaultInstance() { } -class DeleteArtifactResponse::HasBitSetters { +class DeleteArtifactsRequest::HasBitSetters { public: }; #if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int DeleteArtifactsRequest::kArtifactsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -DeleteArtifactResponse::DeleteArtifactResponse() +DeleteArtifactsRequest::DeleteArtifactsRequest() : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); - // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactsRequest) } -DeleteArtifactResponse::DeleteArtifactResponse(const DeleteArtifactResponse& from) +DeleteArtifactsRequest::DeleteArtifactsRequest(const DeleteArtifactsRequest& from) : ::google::protobuf::Message(), - _internal_metadata_(nullptr) { + _internal_metadata_(nullptr), + artifacts_(from.artifacts_) { _internal_metadata_.MergeFrom(from._internal_metadata_); - // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactsRequest) } -void DeleteArtifactResponse::SharedCtor() { +void DeleteArtifactsRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); } -DeleteArtifactResponse::~DeleteArtifactResponse() { - // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactResponse) +DeleteArtifactsRequest::~DeleteArtifactsRequest() { + // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactsRequest) SharedDtor(); } -void DeleteArtifactResponse::SharedDtor() { +void DeleteArtifactsRequest::SharedDtor() { } -void DeleteArtifactResponse::SetCachedSize(int size) const { +void DeleteArtifactsRequest::SetCachedSize(int size) const { _cached_size_.Set(size); } -const DeleteArtifactResponse& DeleteArtifactResponse::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); +const DeleteArtifactsRequest& DeleteArtifactsRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); return *internal_default_instance(); } -void DeleteArtifactResponse::Clear() { -// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactResponse) +void DeleteArtifactsRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactsRequest) ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + artifacts_.Clear(); _internal_metadata_.Clear(); } #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* DeleteArtifactResponse::_InternalParse(const char* begin, const char* end, void* object, +const char* DeleteArtifactsRequest::_InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); + auto msg = static_cast(object); ::google::protobuf::int32 size; (void)size; int depth; (void)depth; ::google::protobuf::uint32 tag; @@ -7141,7 +7278,24 @@ const char* DeleteArtifactResponse::_InternalParse(const char* begin, const char ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { + // repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::datacatalog::DeleteArtifactRequest::_InternalParse; + object = msg->add_artifacts(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } default: { + handle_unusual: if ((tag & 7) == 4 || tag == 0) { ctx->EndGroup(tag); return ptr; @@ -7155,63 +7309,99 @@ const char* DeleteArtifactResponse::_InternalParse(const char* begin, const char } // switch } // while return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); } #else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool DeleteArtifactResponse::MergePartialFromCodedStream( +bool DeleteArtifactsRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactsRequest) for (;;) { ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; - handle_unusual: - if (tag == 0) { - goto success; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_artifacts())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); } success: - // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactsRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactsRequest) return false; #undef DO_ } #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -void DeleteArtifactResponse::SerializeWithCachedSizes( +void DeleteArtifactsRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactsRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + // repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + for (unsigned int i = 0, + n = static_cast(this->artifacts_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, + this->artifacts(static_cast(i)), + output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactsRequest) } -::google::protobuf::uint8* DeleteArtifactResponse::InternalSerializeWithCachedSizesToArray( +::google::protobuf::uint8* DeleteArtifactsRequest::InternalSerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactsRequest) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + // repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + for (unsigned int i = 0, + n = static_cast(this->artifacts_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, this->artifacts(static_cast(i)), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactsRequest) return target; } -size_t DeleteArtifactResponse::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactResponse) +size_t DeleteArtifactsRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactsRequest) size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { @@ -7223,63 +7413,76 @@ size_t DeleteArtifactResponse::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + // repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + { + unsigned int count = static_cast(this->artifacts_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->artifacts(static_cast(i))); + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void DeleteArtifactResponse::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactResponse) +void DeleteArtifactsRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactsRequest) GOOGLE_DCHECK_NE(&from, this); - const DeleteArtifactResponse* source = - ::google::protobuf::DynamicCastToGenerated( + const DeleteArtifactsRequest* source = + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactsRequest) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactResponse) + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactsRequest) MergeFrom(*source); } } -void DeleteArtifactResponse::MergeFrom(const DeleteArtifactResponse& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactResponse) +void DeleteArtifactsRequest::MergeFrom(const DeleteArtifactsRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactsRequest) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + artifacts_.MergeFrom(from.artifacts_); } -void DeleteArtifactResponse::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactResponse) +void DeleteArtifactsRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactsRequest) if (&from == this) return; Clear(); MergeFrom(from); } -void DeleteArtifactResponse::CopyFrom(const DeleteArtifactResponse& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactResponse) +void DeleteArtifactsRequest::CopyFrom(const DeleteArtifactsRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactsRequest) if (&from == this) return; Clear(); MergeFrom(from); } -bool DeleteArtifactResponse::IsInitialized() const { +bool DeleteArtifactsRequest::IsInitialized() const { return true; } -void DeleteArtifactResponse::Swap(DeleteArtifactResponse* other) { +void DeleteArtifactsRequest::Swap(DeleteArtifactsRequest* other) { if (other == this) return; InternalSwap(other); } -void DeleteArtifactResponse::InternalSwap(DeleteArtifactResponse* other) { +void DeleteArtifactsRequest::InternalSwap(DeleteArtifactsRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); + CastToBase(&artifacts_)->InternalSwap(CastToBase(&other->artifacts_)); } -::google::protobuf::Metadata DeleteArtifactResponse::GetMetadata() const { +::google::protobuf::Metadata DeleteArtifactsRequest::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; } @@ -7287,89 +7490,60 @@ ::google::protobuf::Metadata DeleteArtifactResponse::GetMetadata() const { // =================================================================== -void ReservationID::InitAsDefaultInstance() { - ::datacatalog::_ReservationID_default_instance_._instance.get_mutable()->dataset_id_ = const_cast< ::datacatalog::DatasetID*>( - ::datacatalog::DatasetID::internal_default_instance()); +void DeleteArtifactResponse::InitAsDefaultInstance() { } -class ReservationID::HasBitSetters { +class DeleteArtifactResponse::HasBitSetters { public: - static const ::datacatalog::DatasetID& dataset_id(const ReservationID* msg); }; -const ::datacatalog::DatasetID& -ReservationID::HasBitSetters::dataset_id(const ReservationID* msg) { - return *msg->dataset_id_; -} #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ReservationID::kDatasetIdFieldNumber; -const int ReservationID::kTagNameFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -ReservationID::ReservationID() +DeleteArtifactResponse::DeleteArtifactResponse() : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); - // @@protoc_insertion_point(constructor:datacatalog.ReservationID) + // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactResponse) } -ReservationID::ReservationID(const ReservationID& from) +DeleteArtifactResponse::DeleteArtifactResponse(const DeleteArtifactResponse& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.tag_name().size() > 0) { - tag_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.tag_name_); - } - if (from.has_dataset_id()) { - dataset_id_ = new ::datacatalog::DatasetID(*from.dataset_id_); - } else { - dataset_id_ = nullptr; - } - // @@protoc_insertion_point(copy_constructor:datacatalog.ReservationID) + // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactResponse) } -void ReservationID::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); - tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - dataset_id_ = nullptr; +void DeleteArtifactResponse::SharedCtor() { } -ReservationID::~ReservationID() { - // @@protoc_insertion_point(destructor:datacatalog.ReservationID) +DeleteArtifactResponse::~DeleteArtifactResponse() { + // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactResponse) SharedDtor(); } -void ReservationID::SharedDtor() { - tag_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != internal_default_instance()) delete dataset_id_; +void DeleteArtifactResponse::SharedDtor() { } -void ReservationID::SetCachedSize(int size) const { +void DeleteArtifactResponse::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ReservationID& ReservationID::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); +const DeleteArtifactResponse& DeleteArtifactResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); return *internal_default_instance(); } -void ReservationID::Clear() { -// @@protoc_insertion_point(message_clear_start:datacatalog.ReservationID) +void DeleteArtifactResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactResponse) ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - tag_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (GetArenaNoVirtual() == nullptr && dataset_id_ != nullptr) { - delete dataset_id_; - } - dataset_id_ = nullptr; _internal_metadata_.Clear(); } #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* ReservationID::_InternalParse(const char* begin, const char* end, void* object, +const char* DeleteArtifactResponse::_InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); + auto msg = static_cast(object); ::google::protobuf::int32 size; (void)size; int depth; (void)depth; ::google::protobuf::uint32 tag; @@ -7379,26 +7553,264 @@ const char* ReservationID::_InternalParse(const char* begin, const char* end, vo ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { - // .datacatalog.DatasetID dataset_id = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::datacatalog::DatasetID::_InternalParse; - object = msg->mutable_dataset_id(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } - // string tag_name = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("datacatalog.ReservationID.tag_name"); - object = msg->mutable_tag_name(); + default: { + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool DeleteArtifactResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactResponse) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + } +success: + // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactResponse) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void DeleteArtifactResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactResponse) +} + +::google::protobuf::uint8* DeleteArtifactResponse::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactResponse) + return target; +} + +size_t DeleteArtifactResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactResponse) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void DeleteArtifactResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactResponse) + GOOGLE_DCHECK_NE(&from, this); + const DeleteArtifactResponse* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactResponse) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactResponse) + MergeFrom(*source); + } +} + +void DeleteArtifactResponse::MergeFrom(const DeleteArtifactResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactResponse) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + +} + +void DeleteArtifactResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void DeleteArtifactResponse::CopyFrom(const DeleteArtifactResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool DeleteArtifactResponse::IsInitialized() const { + return true; +} + +void DeleteArtifactResponse::Swap(DeleteArtifactResponse* other) { + if (other == this) return; + InternalSwap(other); +} +void DeleteArtifactResponse::InternalSwap(DeleteArtifactResponse* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); +} + +::google::protobuf::Metadata DeleteArtifactResponse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void ReservationID::InitAsDefaultInstance() { + ::datacatalog::_ReservationID_default_instance_._instance.get_mutable()->dataset_id_ = const_cast< ::datacatalog::DatasetID*>( + ::datacatalog::DatasetID::internal_default_instance()); +} +class ReservationID::HasBitSetters { + public: + static const ::datacatalog::DatasetID& dataset_id(const ReservationID* msg); +}; + +const ::datacatalog::DatasetID& +ReservationID::HasBitSetters::dataset_id(const ReservationID* msg) { + return *msg->dataset_id_; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int ReservationID::kDatasetIdFieldNumber; +const int ReservationID::kTagNameFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +ReservationID::ReservationID() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:datacatalog.ReservationID) +} +ReservationID::ReservationID(const ReservationID& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.tag_name().size() > 0) { + tag_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.tag_name_); + } + if (from.has_dataset_id()) { + dataset_id_ = new ::datacatalog::DatasetID(*from.dataset_id_); + } else { + dataset_id_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:datacatalog.ReservationID) +} + +void ReservationID::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + dataset_id_ = nullptr; +} + +ReservationID::~ReservationID() { + // @@protoc_insertion_point(destructor:datacatalog.ReservationID) + SharedDtor(); +} + +void ReservationID::SharedDtor() { + tag_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (this != internal_default_instance()) delete dataset_id_; +} + +void ReservationID::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const ReservationID& ReservationID::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + return *internal_default_instance(); +} + + +void ReservationID::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.ReservationID) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + tag_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (GetArenaNoVirtual() == nullptr && dataset_id_ != nullptr) { + delete dataset_id_; + } + dataset_id_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* ReservationID::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .datacatalog.DatasetID dataset_id = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::datacatalog::DatasetID::_InternalParse; + object = msg->mutable_dataset_id(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // string tag_name = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("datacatalog.ReservationID.tag_name"); + object = msg->mutable_tag_name(); if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; goto string_till_end; @@ -8050,38 +8462,318 @@ void GetOrExtendReservationRequest::MergeFrom(const GetOrExtendReservationReques } } -void GetOrExtendReservationRequest::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationRequest) +void GetOrExtendReservationRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GetOrExtendReservationRequest::CopyFrom(const GetOrExtendReservationRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GetOrExtendReservationRequest::IsInitialized() const { + return true; +} + +void GetOrExtendReservationRequest::Swap(GetOrExtendReservationRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void GetOrExtendReservationRequest::InternalSwap(GetOrExtendReservationRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + owner_id_.Swap(&other->owner_id_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); + swap(reservation_id_, other->reservation_id_); + swap(heartbeat_interval_, other->heartbeat_interval_); +} + +::google::protobuf::Metadata GetOrExtendReservationRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void GetOrExtendReservationsRequest::InitAsDefaultInstance() { +} +class GetOrExtendReservationsRequest::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GetOrExtendReservationsRequest::kReservationsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +GetOrExtendReservationsRequest::GetOrExtendReservationsRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:datacatalog.GetOrExtendReservationsRequest) +} +GetOrExtendReservationsRequest::GetOrExtendReservationsRequest(const GetOrExtendReservationsRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr), + reservations_(from.reservations_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:datacatalog.GetOrExtendReservationsRequest) +} + +void GetOrExtendReservationsRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); +} + +GetOrExtendReservationsRequest::~GetOrExtendReservationsRequest() { + // @@protoc_insertion_point(destructor:datacatalog.GetOrExtendReservationsRequest) + SharedDtor(); +} + +void GetOrExtendReservationsRequest::SharedDtor() { +} + +void GetOrExtendReservationsRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const GetOrExtendReservationsRequest& GetOrExtendReservationsRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + return *internal_default_instance(); +} + + +void GetOrExtendReservationsRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.GetOrExtendReservationsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + reservations_.Clear(); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GetOrExtendReservationsRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::datacatalog::GetOrExtendReservationRequest::_InternalParse; + object = msg->add_reservations(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GetOrExtendReservationsRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:datacatalog.GetOrExtendReservationsRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_reservations())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:datacatalog.GetOrExtendReservationsRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:datacatalog.GetOrExtendReservationsRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GetOrExtendReservationsRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:datacatalog.GetOrExtendReservationsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + for (unsigned int i = 0, + n = static_cast(this->reservations_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, + this->reservations(static_cast(i)), + output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:datacatalog.GetOrExtendReservationsRequest) +} + +::google::protobuf::uint8* GetOrExtendReservationsRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.GetOrExtendReservationsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + for (unsigned int i = 0, + n = static_cast(this->reservations_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, this->reservations(static_cast(i)), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationsRequest) + return target; +} + +size_t GetOrExtendReservationsRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationsRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + { + unsigned int count = static_cast(this->reservations_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->reservations(static_cast(i))); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void GetOrExtendReservationsRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationsRequest) + GOOGLE_DCHECK_NE(&from, this); + const GetOrExtendReservationsRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationsRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationsRequest) + MergeFrom(*source); + } +} + +void GetOrExtendReservationsRequest::MergeFrom(const GetOrExtendReservationsRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationsRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + reservations_.MergeFrom(from.reservations_); +} + +void GetOrExtendReservationsRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationsRequest) if (&from == this) return; Clear(); MergeFrom(from); } -void GetOrExtendReservationRequest::CopyFrom(const GetOrExtendReservationRequest& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationRequest) +void GetOrExtendReservationsRequest::CopyFrom(const GetOrExtendReservationsRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationsRequest) if (&from == this) return; Clear(); MergeFrom(from); } -bool GetOrExtendReservationRequest::IsInitialized() const { +bool GetOrExtendReservationsRequest::IsInitialized() const { return true; } -void GetOrExtendReservationRequest::Swap(GetOrExtendReservationRequest* other) { +void GetOrExtendReservationsRequest::Swap(GetOrExtendReservationsRequest* other) { if (other == this) return; InternalSwap(other); } -void GetOrExtendReservationRequest::InternalSwap(GetOrExtendReservationRequest* other) { +void GetOrExtendReservationsRequest::InternalSwap(GetOrExtendReservationsRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - owner_id_.Swap(&other->owner_id_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), - GetArenaNoVirtual()); - swap(reservation_id_, other->reservation_id_); - swap(heartbeat_interval_, other->heartbeat_interval_); + CastToBase(&reservations_)->InternalSwap(CastToBase(&other->reservations_)); } -::google::protobuf::Metadata GetOrExtendReservationRequest::GetMetadata() const { +::google::protobuf::Metadata GetOrExtendReservationsRequest::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; } @@ -8853,19 +9545,297 @@ ::google::protobuf::uint8* GetOrExtendReservationResponse::InternalSerializeWith if (this->has_reservation()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, HasBitSetters::reservation(this), target); + 1, HasBitSetters::reservation(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationResponse) + return target; +} + +size_t GetOrExtendReservationResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationResponse) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .datacatalog.Reservation reservation = 1; + if (this->has_reservation()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *reservation_); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void GetOrExtendReservationResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationResponse) + GOOGLE_DCHECK_NE(&from, this); + const GetOrExtendReservationResponse* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationResponse) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationResponse) + MergeFrom(*source); + } +} + +void GetOrExtendReservationResponse::MergeFrom(const GetOrExtendReservationResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationResponse) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_reservation()) { + mutable_reservation()->::datacatalog::Reservation::MergeFrom(from.reservation()); + } +} + +void GetOrExtendReservationResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GetOrExtendReservationResponse::CopyFrom(const GetOrExtendReservationResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GetOrExtendReservationResponse::IsInitialized() const { + return true; +} + +void GetOrExtendReservationResponse::Swap(GetOrExtendReservationResponse* other) { + if (other == this) return; + InternalSwap(other); +} +void GetOrExtendReservationResponse::InternalSwap(GetOrExtendReservationResponse* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(reservation_, other->reservation_); +} + +::google::protobuf::Metadata GetOrExtendReservationResponse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void GetOrExtendReservationsResponse::InitAsDefaultInstance() { +} +class GetOrExtendReservationsResponse::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GetOrExtendReservationsResponse::kReservationsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +GetOrExtendReservationsResponse::GetOrExtendReservationsResponse() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:datacatalog.GetOrExtendReservationsResponse) +} +GetOrExtendReservationsResponse::GetOrExtendReservationsResponse(const GetOrExtendReservationsResponse& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr), + reservations_(from.reservations_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:datacatalog.GetOrExtendReservationsResponse) +} + +void GetOrExtendReservationsResponse::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); +} + +GetOrExtendReservationsResponse::~GetOrExtendReservationsResponse() { + // @@protoc_insertion_point(destructor:datacatalog.GetOrExtendReservationsResponse) + SharedDtor(); +} + +void GetOrExtendReservationsResponse::SharedDtor() { +} + +void GetOrExtendReservationsResponse::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const GetOrExtendReservationsResponse& GetOrExtendReservationsResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + return *internal_default_instance(); +} + + +void GetOrExtendReservationsResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.GetOrExtendReservationsResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + reservations_.Clear(); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GetOrExtendReservationsResponse::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // repeated .datacatalog.Reservation reservations = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::datacatalog::Reservation::_InternalParse; + object = msg->add_reservations(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GetOrExtendReservationsResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:datacatalog.GetOrExtendReservationsResponse) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .datacatalog.Reservation reservations = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_reservations())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:datacatalog.GetOrExtendReservationsResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:datacatalog.GetOrExtendReservationsResponse) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GetOrExtendReservationsResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:datacatalog.GetOrExtendReservationsResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .datacatalog.Reservation reservations = 1; + for (unsigned int i = 0, + n = static_cast(this->reservations_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, + this->reservations(static_cast(i)), + output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:datacatalog.GetOrExtendReservationsResponse) +} + +::google::protobuf::uint8* GetOrExtendReservationsResponse::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.GetOrExtendReservationsResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .datacatalog.Reservation reservations = 1; + for (unsigned int i = 0, + n = static_cast(this->reservations_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, this->reservations(static_cast(i)), target); } if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationResponse) + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationsResponse) return target; } -size_t GetOrExtendReservationResponse::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationResponse) +size_t GetOrExtendReservationsResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationsResponse) size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { @@ -8877,11 +9847,15 @@ size_t GetOrExtendReservationResponse::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // .datacatalog.Reservation reservation = 1; - if (this->has_reservation()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *reservation_); + // repeated .datacatalog.Reservation reservations = 1; + { + unsigned int count = static_cast(this->reservations_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->reservations(static_cast(i))); + } } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); @@ -8889,62 +9863,60 @@ size_t GetOrExtendReservationResponse::ByteSizeLong() const { return total_size; } -void GetOrExtendReservationResponse::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationResponse) +void GetOrExtendReservationsResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationsResponse) GOOGLE_DCHECK_NE(&from, this); - const GetOrExtendReservationResponse* source = - ::google::protobuf::DynamicCastToGenerated( + const GetOrExtendReservationsResponse* source = + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationResponse) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationsResponse) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationResponse) + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationsResponse) MergeFrom(*source); } } -void GetOrExtendReservationResponse::MergeFrom(const GetOrExtendReservationResponse& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationResponse) +void GetOrExtendReservationsResponse::MergeFrom(const GetOrExtendReservationsResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationsResponse) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - if (from.has_reservation()) { - mutable_reservation()->::datacatalog::Reservation::MergeFrom(from.reservation()); - } + reservations_.MergeFrom(from.reservations_); } -void GetOrExtendReservationResponse::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationResponse) +void GetOrExtendReservationsResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationsResponse) if (&from == this) return; Clear(); MergeFrom(from); } -void GetOrExtendReservationResponse::CopyFrom(const GetOrExtendReservationResponse& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationResponse) +void GetOrExtendReservationsResponse::CopyFrom(const GetOrExtendReservationsResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationsResponse) if (&from == this) return; Clear(); MergeFrom(from); } -bool GetOrExtendReservationResponse::IsInitialized() const { +bool GetOrExtendReservationsResponse::IsInitialized() const { return true; } -void GetOrExtendReservationResponse::Swap(GetOrExtendReservationResponse* other) { +void GetOrExtendReservationsResponse::Swap(GetOrExtendReservationsResponse* other) { if (other == this) return; InternalSwap(other); } -void GetOrExtendReservationResponse::InternalSwap(GetOrExtendReservationResponse* other) { +void GetOrExtendReservationsResponse::InternalSwap(GetOrExtendReservationsResponse* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - swap(reservation_, other->reservation_); + CastToBase(&reservations_)->InternalSwap(CastToBase(&other->reservations_)); } -::google::protobuf::Metadata GetOrExtendReservationResponse::GetMetadata() const { +::google::protobuf::Metadata GetOrExtendReservationsResponse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; } @@ -9314,6 +10286,286 @@ ::google::protobuf::Metadata ReleaseReservationRequest::GetMetadata() const { } +// =================================================================== + +void ReleaseReservationsRequest::InitAsDefaultInstance() { +} +class ReleaseReservationsRequest::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int ReleaseReservationsRequest::kReservationsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +ReleaseReservationsRequest::ReleaseReservationsRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:datacatalog.ReleaseReservationsRequest) +} +ReleaseReservationsRequest::ReleaseReservationsRequest(const ReleaseReservationsRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr), + reservations_(from.reservations_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:datacatalog.ReleaseReservationsRequest) +} + +void ReleaseReservationsRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); +} + +ReleaseReservationsRequest::~ReleaseReservationsRequest() { + // @@protoc_insertion_point(destructor:datacatalog.ReleaseReservationsRequest) + SharedDtor(); +} + +void ReleaseReservationsRequest::SharedDtor() { +} + +void ReleaseReservationsRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const ReleaseReservationsRequest& ReleaseReservationsRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base); + return *internal_default_instance(); +} + + +void ReleaseReservationsRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:datacatalog.ReleaseReservationsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + reservations_.Clear(); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* ReleaseReservationsRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // repeated .datacatalog.ReleaseReservationRequest reservations = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::datacatalog::ReleaseReservationRequest::_InternalParse; + object = msg->add_reservations(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool ReleaseReservationsRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:datacatalog.ReleaseReservationsRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .datacatalog.ReleaseReservationRequest reservations = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_reservations())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:datacatalog.ReleaseReservationsRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:datacatalog.ReleaseReservationsRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void ReleaseReservationsRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:datacatalog.ReleaseReservationsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .datacatalog.ReleaseReservationRequest reservations = 1; + for (unsigned int i = 0, + n = static_cast(this->reservations_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, + this->reservations(static_cast(i)), + output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:datacatalog.ReleaseReservationsRequest) +} + +::google::protobuf::uint8* ReleaseReservationsRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:datacatalog.ReleaseReservationsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .datacatalog.ReleaseReservationRequest reservations = 1; + for (unsigned int i = 0, + n = static_cast(this->reservations_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, this->reservations(static_cast(i)), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:datacatalog.ReleaseReservationsRequest) + return target; +} + +size_t ReleaseReservationsRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:datacatalog.ReleaseReservationsRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // repeated .datacatalog.ReleaseReservationRequest reservations = 1; + { + unsigned int count = static_cast(this->reservations_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->reservations(static_cast(i))); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void ReleaseReservationsRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.ReleaseReservationsRequest) + GOOGLE_DCHECK_NE(&from, this); + const ReleaseReservationsRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.ReleaseReservationsRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.ReleaseReservationsRequest) + MergeFrom(*source); + } +} + +void ReleaseReservationsRequest::MergeFrom(const ReleaseReservationsRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.ReleaseReservationsRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + reservations_.MergeFrom(from.reservations_); +} + +void ReleaseReservationsRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.ReleaseReservationsRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void ReleaseReservationsRequest::CopyFrom(const ReleaseReservationsRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.ReleaseReservationsRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool ReleaseReservationsRequest::IsInitialized() const { + return true; +} + +void ReleaseReservationsRequest::Swap(ReleaseReservationsRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void ReleaseReservationsRequest::InternalSwap(ReleaseReservationsRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + CastToBase(&reservations_)->InternalSwap(CastToBase(&other->reservations_)); +} + +::google::protobuf::Metadata ReleaseReservationsRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages]; +} + + // =================================================================== void ReleaseReservationResponse::InitAsDefaultInstance() { @@ -12410,7 +13662,7 @@ void Metadata_KeyMapEntry_DoNotUse::MergeFrom(const Metadata_KeyMapEntry_DoNotUs } ::google::protobuf::Metadata Metadata_KeyMapEntry_DoNotUse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto); - return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[30]; + return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[34]; } void Metadata_KeyMapEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { @@ -16130,6 +17382,9 @@ template<> PROTOBUF_NOINLINE ::datacatalog::UpdateArtifactResponse* Arena::Creat template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactRequest* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactRequest >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::DeleteArtifactRequest >(arena); } +template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactsRequest* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactsRequest >(Arena* arena) { + return Arena::CreateInternal< ::datacatalog::DeleteArtifactsRequest >(arena); +} template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactResponse* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactResponse >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::DeleteArtifactResponse >(arena); } @@ -16139,15 +17394,24 @@ template<> PROTOBUF_NOINLINE ::datacatalog::ReservationID* Arena::CreateMaybeMes template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationRequest* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationRequest >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationRequest >(arena); } +template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationsRequest* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationsRequest >(Arena* arena) { + return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationsRequest >(arena); +} template<> PROTOBUF_NOINLINE ::datacatalog::Reservation* Arena::CreateMaybeMessage< ::datacatalog::Reservation >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::Reservation >(arena); } template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationResponse* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationResponse >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationResponse >(arena); } +template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationsResponse* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationsResponse >(Arena* arena) { + return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationsResponse >(arena); +} template<> PROTOBUF_NOINLINE ::datacatalog::ReleaseReservationRequest* Arena::CreateMaybeMessage< ::datacatalog::ReleaseReservationRequest >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::ReleaseReservationRequest >(arena); } +template<> PROTOBUF_NOINLINE ::datacatalog::ReleaseReservationsRequest* Arena::CreateMaybeMessage< ::datacatalog::ReleaseReservationsRequest >(Arena* arena) { + return Arena::CreateInternal< ::datacatalog::ReleaseReservationsRequest >(arena); +} template<> PROTOBUF_NOINLINE ::datacatalog::ReleaseReservationResponse* Arena::CreateMaybeMessage< ::datacatalog::ReleaseReservationResponse >(Arena* arena) { return Arena::CreateInternal< ::datacatalog::ReleaseReservationResponse >(arena); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h index e08c957829..5a70732a5d 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h @@ -48,7 +48,7 @@ struct TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[40] + static const ::google::protobuf::internal::ParseTable schema[44] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -98,6 +98,9 @@ extern DeleteArtifactRequestDefaultTypeInternal _DeleteArtifactRequest_default_i class DeleteArtifactResponse; class DeleteArtifactResponseDefaultTypeInternal; extern DeleteArtifactResponseDefaultTypeInternal _DeleteArtifactResponse_default_instance_; +class DeleteArtifactsRequest; +class DeleteArtifactsRequestDefaultTypeInternal; +extern DeleteArtifactsRequestDefaultTypeInternal _DeleteArtifactsRequest_default_instance_; class FilterExpression; class FilterExpressionDefaultTypeInternal; extern FilterExpressionDefaultTypeInternal _FilterExpression_default_instance_; @@ -119,6 +122,12 @@ extern GetOrExtendReservationRequestDefaultTypeInternal _GetOrExtendReservationR class GetOrExtendReservationResponse; class GetOrExtendReservationResponseDefaultTypeInternal; extern GetOrExtendReservationResponseDefaultTypeInternal _GetOrExtendReservationResponse_default_instance_; +class GetOrExtendReservationsRequest; +class GetOrExtendReservationsRequestDefaultTypeInternal; +extern GetOrExtendReservationsRequestDefaultTypeInternal _GetOrExtendReservationsRequest_default_instance_; +class GetOrExtendReservationsResponse; +class GetOrExtendReservationsResponseDefaultTypeInternal; +extern GetOrExtendReservationsResponseDefaultTypeInternal _GetOrExtendReservationsResponse_default_instance_; class KeyValuePair; class KeyValuePairDefaultTypeInternal; extern KeyValuePairDefaultTypeInternal _KeyValuePair_default_instance_; @@ -155,6 +164,9 @@ extern ReleaseReservationRequestDefaultTypeInternal _ReleaseReservationRequest_d class ReleaseReservationResponse; class ReleaseReservationResponseDefaultTypeInternal; extern ReleaseReservationResponseDefaultTypeInternal _ReleaseReservationResponse_default_instance_; +class ReleaseReservationsRequest; +class ReleaseReservationsRequestDefaultTypeInternal; +extern ReleaseReservationsRequestDefaultTypeInternal _ReleaseReservationsRequest_default_instance_; class Reservation; class ReservationDefaultTypeInternal; extern ReservationDefaultTypeInternal _Reservation_default_instance_; @@ -193,6 +205,7 @@ template<> ::datacatalog::DatasetID* Arena::CreateMaybeMessage<::datacatalog::Da template<> ::datacatalog::DatasetPropertyFilter* Arena::CreateMaybeMessage<::datacatalog::DatasetPropertyFilter>(Arena*); template<> ::datacatalog::DeleteArtifactRequest* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactRequest>(Arena*); template<> ::datacatalog::DeleteArtifactResponse* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactResponse>(Arena*); +template<> ::datacatalog::DeleteArtifactsRequest* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactsRequest>(Arena*); template<> ::datacatalog::FilterExpression* Arena::CreateMaybeMessage<::datacatalog::FilterExpression>(Arena*); template<> ::datacatalog::GetArtifactRequest* Arena::CreateMaybeMessage<::datacatalog::GetArtifactRequest>(Arena*); template<> ::datacatalog::GetArtifactResponse* Arena::CreateMaybeMessage<::datacatalog::GetArtifactResponse>(Arena*); @@ -200,6 +213,8 @@ template<> ::datacatalog::GetDatasetRequest* Arena::CreateMaybeMessage<::datacat template<> ::datacatalog::GetDatasetResponse* Arena::CreateMaybeMessage<::datacatalog::GetDatasetResponse>(Arena*); template<> ::datacatalog::GetOrExtendReservationRequest* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationRequest>(Arena*); template<> ::datacatalog::GetOrExtendReservationResponse* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationResponse>(Arena*); +template<> ::datacatalog::GetOrExtendReservationsRequest* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationsRequest>(Arena*); +template<> ::datacatalog::GetOrExtendReservationsResponse* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationsResponse>(Arena*); template<> ::datacatalog::KeyValuePair* Arena::CreateMaybeMessage<::datacatalog::KeyValuePair>(Arena*); template<> ::datacatalog::ListArtifactsRequest* Arena::CreateMaybeMessage<::datacatalog::ListArtifactsRequest>(Arena*); template<> ::datacatalog::ListArtifactsResponse* Arena::CreateMaybeMessage<::datacatalog::ListArtifactsResponse>(Arena*); @@ -212,6 +227,7 @@ template<> ::datacatalog::Partition* Arena::CreateMaybeMessage<::datacatalog::Pa template<> ::datacatalog::PartitionPropertyFilter* Arena::CreateMaybeMessage<::datacatalog::PartitionPropertyFilter>(Arena*); template<> ::datacatalog::ReleaseReservationRequest* Arena::CreateMaybeMessage<::datacatalog::ReleaseReservationRequest>(Arena*); template<> ::datacatalog::ReleaseReservationResponse* Arena::CreateMaybeMessage<::datacatalog::ReleaseReservationResponse>(Arena*); +template<> ::datacatalog::ReleaseReservationsRequest* Arena::CreateMaybeMessage<::datacatalog::ReleaseReservationsRequest>(Arena*); template<> ::datacatalog::Reservation* Arena::CreateMaybeMessage<::datacatalog::Reservation>(Arena*); template<> ::datacatalog::ReservationID* Arena::CreateMaybeMessage<::datacatalog::ReservationID>(Arena*); template<> ::datacatalog::SinglePropertyFilter* Arena::CreateMaybeMessage<::datacatalog::SinglePropertyFilter>(Arena*); @@ -2457,6 +2473,124 @@ class DeleteArtifactRequest final : }; // ------------------------------------------------------------------- +class DeleteArtifactsRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.DeleteArtifactsRequest) */ { + public: + DeleteArtifactsRequest(); + virtual ~DeleteArtifactsRequest(); + + DeleteArtifactsRequest(const DeleteArtifactsRequest& from); + + inline DeleteArtifactsRequest& operator=(const DeleteArtifactsRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + DeleteArtifactsRequest(DeleteArtifactsRequest&& from) noexcept + : DeleteArtifactsRequest() { + *this = ::std::move(from); + } + + inline DeleteArtifactsRequest& operator=(DeleteArtifactsRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const DeleteArtifactsRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const DeleteArtifactsRequest* internal_default_instance() { + return reinterpret_cast( + &_DeleteArtifactsRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 17; + + void Swap(DeleteArtifactsRequest* other); + friend void swap(DeleteArtifactsRequest& a, DeleteArtifactsRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline DeleteArtifactsRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + DeleteArtifactsRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const DeleteArtifactsRequest& from); + void MergeFrom(const DeleteArtifactsRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(DeleteArtifactsRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + int artifacts_size() const; + void clear_artifacts(); + static const int kArtifactsFieldNumber = 1; + ::datacatalog::DeleteArtifactRequest* mutable_artifacts(int index); + ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >* + mutable_artifacts(); + const ::datacatalog::DeleteArtifactRequest& artifacts(int index) const; + ::datacatalog::DeleteArtifactRequest* add_artifacts(); + const ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >& + artifacts() const; + + // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactsRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest > artifacts_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +}; +// ------------------------------------------------------------------- + class DeleteArtifactResponse final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.DeleteArtifactResponse) */ { public: @@ -2495,7 +2629,7 @@ class DeleteArtifactResponse final : &_DeleteArtifactResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 17; + 18; void Swap(DeleteArtifactResponse* other); friend void swap(DeleteArtifactResponse& a, DeleteArtifactResponse& b) { @@ -2600,7 +2734,7 @@ class ReservationID final : &_ReservationID_default_instance_); } static constexpr int kIndexInFileMessages = - 18; + 19; void Swap(ReservationID* other); friend void swap(ReservationID& a, ReservationID& b) { @@ -2730,7 +2864,7 @@ class GetOrExtendReservationRequest final : &_GetOrExtendReservationRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 19; + 20; void Swap(GetOrExtendReservationRequest* other); friend void swap(GetOrExtendReservationRequest& a, GetOrExtendReservationRequest& b) { @@ -2832,6 +2966,124 @@ class GetOrExtendReservationRequest final : }; // ------------------------------------------------------------------- +class GetOrExtendReservationsRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.GetOrExtendReservationsRequest) */ { + public: + GetOrExtendReservationsRequest(); + virtual ~GetOrExtendReservationsRequest(); + + GetOrExtendReservationsRequest(const GetOrExtendReservationsRequest& from); + + inline GetOrExtendReservationsRequest& operator=(const GetOrExtendReservationsRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + GetOrExtendReservationsRequest(GetOrExtendReservationsRequest&& from) noexcept + : GetOrExtendReservationsRequest() { + *this = ::std::move(from); + } + + inline GetOrExtendReservationsRequest& operator=(GetOrExtendReservationsRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const GetOrExtendReservationsRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const GetOrExtendReservationsRequest* internal_default_instance() { + return reinterpret_cast( + &_GetOrExtendReservationsRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 21; + + void Swap(GetOrExtendReservationsRequest* other); + friend void swap(GetOrExtendReservationsRequest& a, GetOrExtendReservationsRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline GetOrExtendReservationsRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + GetOrExtendReservationsRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const GetOrExtendReservationsRequest& from); + void MergeFrom(const GetOrExtendReservationsRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(GetOrExtendReservationsRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + int reservations_size() const; + void clear_reservations(); + static const int kReservationsFieldNumber = 1; + ::datacatalog::GetOrExtendReservationRequest* mutable_reservations(int index); + ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >* + mutable_reservations(); + const ::datacatalog::GetOrExtendReservationRequest& reservations(int index) const; + ::datacatalog::GetOrExtendReservationRequest* add_reservations(); + const ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >& + reservations() const; + + // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest > reservations_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +}; +// ------------------------------------------------------------------- + class Reservation final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.Reservation) */ { public: @@ -2870,7 +3122,7 @@ class Reservation final : &_Reservation_default_instance_); } static constexpr int kIndexInFileMessages = - 20; + 22; void Swap(Reservation* other); friend void swap(Reservation& a, Reservation& b) { @@ -3030,7 +3282,7 @@ class GetOrExtendReservationResponse final : &_GetOrExtendReservationResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 21; + 23; void Swap(GetOrExtendReservationResponse* other); friend void swap(GetOrExtendReservationResponse& a, GetOrExtendReservationResponse& b) { @@ -3107,6 +3359,124 @@ class GetOrExtendReservationResponse final : }; // ------------------------------------------------------------------- +class GetOrExtendReservationsResponse final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.GetOrExtendReservationsResponse) */ { + public: + GetOrExtendReservationsResponse(); + virtual ~GetOrExtendReservationsResponse(); + + GetOrExtendReservationsResponse(const GetOrExtendReservationsResponse& from); + + inline GetOrExtendReservationsResponse& operator=(const GetOrExtendReservationsResponse& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + GetOrExtendReservationsResponse(GetOrExtendReservationsResponse&& from) noexcept + : GetOrExtendReservationsResponse() { + *this = ::std::move(from); + } + + inline GetOrExtendReservationsResponse& operator=(GetOrExtendReservationsResponse&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const GetOrExtendReservationsResponse& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const GetOrExtendReservationsResponse* internal_default_instance() { + return reinterpret_cast( + &_GetOrExtendReservationsResponse_default_instance_); + } + static constexpr int kIndexInFileMessages = + 24; + + void Swap(GetOrExtendReservationsResponse* other); + friend void swap(GetOrExtendReservationsResponse& a, GetOrExtendReservationsResponse& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline GetOrExtendReservationsResponse* New() const final { + return CreateMaybeMessage(nullptr); + } + + GetOrExtendReservationsResponse* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const GetOrExtendReservationsResponse& from); + void MergeFrom(const GetOrExtendReservationsResponse& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(GetOrExtendReservationsResponse* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .datacatalog.Reservation reservations = 1; + int reservations_size() const; + void clear_reservations(); + static const int kReservationsFieldNumber = 1; + ::datacatalog::Reservation* mutable_reservations(int index); + ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >* + mutable_reservations(); + const ::datacatalog::Reservation& reservations(int index) const; + ::datacatalog::Reservation* add_reservations(); + const ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >& + reservations() const; + + // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsResponse) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation > reservations_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +}; +// ------------------------------------------------------------------- + class ReleaseReservationRequest final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.ReleaseReservationRequest) */ { public: @@ -3145,7 +3515,7 @@ class ReleaseReservationRequest final : &_ReleaseReservationRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 22; + 25; void Swap(ReleaseReservationRequest* other); friend void swap(ReleaseReservationRequest& a, ReleaseReservationRequest& b) { @@ -3237,6 +3607,124 @@ class ReleaseReservationRequest final : }; // ------------------------------------------------------------------- +class ReleaseReservationsRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.ReleaseReservationsRequest) */ { + public: + ReleaseReservationsRequest(); + virtual ~ReleaseReservationsRequest(); + + ReleaseReservationsRequest(const ReleaseReservationsRequest& from); + + inline ReleaseReservationsRequest& operator=(const ReleaseReservationsRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + ReleaseReservationsRequest(ReleaseReservationsRequest&& from) noexcept + : ReleaseReservationsRequest() { + *this = ::std::move(from); + } + + inline ReleaseReservationsRequest& operator=(ReleaseReservationsRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const ReleaseReservationsRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const ReleaseReservationsRequest* internal_default_instance() { + return reinterpret_cast( + &_ReleaseReservationsRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 26; + + void Swap(ReleaseReservationsRequest* other); + friend void swap(ReleaseReservationsRequest& a, ReleaseReservationsRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline ReleaseReservationsRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + ReleaseReservationsRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ReleaseReservationsRequest& from); + void MergeFrom(const ReleaseReservationsRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(ReleaseReservationsRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .datacatalog.ReleaseReservationRequest reservations = 1; + int reservations_size() const; + void clear_reservations(); + static const int kReservationsFieldNumber = 1; + ::datacatalog::ReleaseReservationRequest* mutable_reservations(int index); + ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >* + mutable_reservations(); + const ::datacatalog::ReleaseReservationRequest& reservations(int index) const; + ::datacatalog::ReleaseReservationRequest* add_reservations(); + const ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >& + reservations() const; + + // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationsRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest > reservations_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto; +}; +// ------------------------------------------------------------------- + class ReleaseReservationResponse final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.ReleaseReservationResponse) */ { public: @@ -3275,7 +3763,7 @@ class ReleaseReservationResponse final : &_ReleaseReservationResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 23; + 27; void Swap(ReleaseReservationResponse* other); friend void swap(ReleaseReservationResponse& a, ReleaseReservationResponse& b) { @@ -3380,7 +3868,7 @@ class Dataset final : &_Dataset_default_instance_); } static constexpr int kIndexInFileMessages = - 24; + 28; void Swap(Dataset* other); friend void swap(Dataset& a, Dataset& b) { @@ -3528,7 +4016,7 @@ class Partition final : &_Partition_default_instance_); } static constexpr int kIndexInFileMessages = - 25; + 29; void Swap(Partition* other); friend void swap(Partition& a, Partition& b) { @@ -3663,7 +4151,7 @@ class DatasetID final : &_DatasetID_default_instance_); } static constexpr int kIndexInFileMessages = - 26; + 30; void Swap(DatasetID* other); friend void swap(DatasetID& a, DatasetID& b) { @@ -3843,7 +4331,7 @@ class Artifact final : &_Artifact_default_instance_); } static constexpr int kIndexInFileMessages = - 27; + 31; void Swap(Artifact* other); friend void swap(Artifact& a, Artifact& b) { @@ -4032,7 +4520,7 @@ class ArtifactData final : &_ArtifactData_default_instance_); } static constexpr int kIndexInFileMessages = - 28; + 32; void Swap(ArtifactData* other); friend void swap(ArtifactData& a, ArtifactData& b) { @@ -4162,7 +4650,7 @@ class Tag final : &_Tag_default_instance_); } static constexpr int kIndexInFileMessages = - 29; + 33; void Swap(Tag* other); friend void swap(Tag& a, Tag& b) { @@ -4331,7 +4819,7 @@ class Metadata final : &_Metadata_default_instance_); } static constexpr int kIndexInFileMessages = - 31; + 35; void Swap(Metadata* other); friend void swap(Metadata& a, Metadata& b) { @@ -4452,7 +4940,7 @@ class FilterExpression final : &_FilterExpression_default_instance_); } static constexpr int kIndexInFileMessages = - 32; + 36; void Swap(FilterExpression* other); friend void swap(FilterExpression& a, FilterExpression& b) { @@ -4578,7 +5066,7 @@ class SinglePropertyFilter final : &_SinglePropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 33; + 37; void Swap(SinglePropertyFilter* other); friend void swap(SinglePropertyFilter& a, SinglePropertyFilter& b) { @@ -4773,7 +5261,7 @@ class ArtifactPropertyFilter final : &_ArtifactPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 34; + 38; void Swap(ArtifactPropertyFilter* other); friend void swap(ArtifactPropertyFilter& a, ArtifactPropertyFilter& b) { @@ -4912,7 +5400,7 @@ class TagPropertyFilter final : &_TagPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 35; + 39; void Swap(TagPropertyFilter* other); friend void swap(TagPropertyFilter& a, TagPropertyFilter& b) { @@ -5051,7 +5539,7 @@ class PartitionPropertyFilter final : &_PartitionPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 36; + 40; void Swap(PartitionPropertyFilter* other); friend void swap(PartitionPropertyFilter& a, PartitionPropertyFilter& b) { @@ -5177,7 +5665,7 @@ class KeyValuePair final : &_KeyValuePair_default_instance_); } static constexpr int kIndexInFileMessages = - 37; + 41; void Swap(KeyValuePair* other); friend void swap(KeyValuePair& a, KeyValuePair& b) { @@ -5320,7 +5808,7 @@ class DatasetPropertyFilter final : &_DatasetPropertyFilter_default_instance_); } static constexpr int kIndexInFileMessages = - 38; + 42; void Swap(DatasetPropertyFilter* other); friend void swap(DatasetPropertyFilter& a, DatasetPropertyFilter& b) { @@ -5511,7 +5999,7 @@ class PaginationOptions final : &_PaginationOptions_default_instance_); } static constexpr int kIndexInFileMessages = - 39; + 43; void Swap(PaginationOptions* other); friend void swap(PaginationOptions& a, PaginationOptions& b) { @@ -7281,6 +7769,40 @@ inline DeleteArtifactRequest::QueryHandleCase DeleteArtifactRequest::query_handl } // ------------------------------------------------------------------- +// DeleteArtifactsRequest + +// repeated .datacatalog.DeleteArtifactRequest artifacts = 1; +inline int DeleteArtifactsRequest::artifacts_size() const { + return artifacts_.size(); +} +inline void DeleteArtifactsRequest::clear_artifacts() { + artifacts_.Clear(); +} +inline ::datacatalog::DeleteArtifactRequest* DeleteArtifactsRequest::mutable_artifacts(int index) { + // @@protoc_insertion_point(field_mutable:datacatalog.DeleteArtifactsRequest.artifacts) + return artifacts_.Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >* +DeleteArtifactsRequest::mutable_artifacts() { + // @@protoc_insertion_point(field_mutable_list:datacatalog.DeleteArtifactsRequest.artifacts) + return &artifacts_; +} +inline const ::datacatalog::DeleteArtifactRequest& DeleteArtifactsRequest::artifacts(int index) const { + // @@protoc_insertion_point(field_get:datacatalog.DeleteArtifactsRequest.artifacts) + return artifacts_.Get(index); +} +inline ::datacatalog::DeleteArtifactRequest* DeleteArtifactsRequest::add_artifacts() { + // @@protoc_insertion_point(field_add:datacatalog.DeleteArtifactsRequest.artifacts) + return artifacts_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >& +DeleteArtifactsRequest::artifacts() const { + // @@protoc_insertion_point(field_list:datacatalog.DeleteArtifactsRequest.artifacts) + return artifacts_; +} + +// ------------------------------------------------------------------- + // DeleteArtifactResponse // ------------------------------------------------------------------- @@ -7547,6 +8069,40 @@ inline void GetOrExtendReservationRequest::set_allocated_heartbeat_interval(::go // ------------------------------------------------------------------- +// GetOrExtendReservationsRequest + +// repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; +inline int GetOrExtendReservationsRequest::reservations_size() const { + return reservations_.size(); +} +inline void GetOrExtendReservationsRequest::clear_reservations() { + reservations_.Clear(); +} +inline ::datacatalog::GetOrExtendReservationRequest* GetOrExtendReservationsRequest::mutable_reservations(int index) { + // @@protoc_insertion_point(field_mutable:datacatalog.GetOrExtendReservationsRequest.reservations) + return reservations_.Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >* +GetOrExtendReservationsRequest::mutable_reservations() { + // @@protoc_insertion_point(field_mutable_list:datacatalog.GetOrExtendReservationsRequest.reservations) + return &reservations_; +} +inline const ::datacatalog::GetOrExtendReservationRequest& GetOrExtendReservationsRequest::reservations(int index) const { + // @@protoc_insertion_point(field_get:datacatalog.GetOrExtendReservationsRequest.reservations) + return reservations_.Get(index); +} +inline ::datacatalog::GetOrExtendReservationRequest* GetOrExtendReservationsRequest::add_reservations() { + // @@protoc_insertion_point(field_add:datacatalog.GetOrExtendReservationsRequest.reservations) + return reservations_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >& +GetOrExtendReservationsRequest::reservations() const { + // @@protoc_insertion_point(field_list:datacatalog.GetOrExtendReservationsRequest.reservations) + return reservations_; +} + +// ------------------------------------------------------------------- + // Reservation // .datacatalog.ReservationID reservation_id = 1; @@ -7853,6 +8409,40 @@ inline void GetOrExtendReservationResponse::set_allocated_reservation(::datacata // ------------------------------------------------------------------- +// GetOrExtendReservationsResponse + +// repeated .datacatalog.Reservation reservations = 1; +inline int GetOrExtendReservationsResponse::reservations_size() const { + return reservations_.size(); +} +inline void GetOrExtendReservationsResponse::clear_reservations() { + reservations_.Clear(); +} +inline ::datacatalog::Reservation* GetOrExtendReservationsResponse::mutable_reservations(int index) { + // @@protoc_insertion_point(field_mutable:datacatalog.GetOrExtendReservationsResponse.reservations) + return reservations_.Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >* +GetOrExtendReservationsResponse::mutable_reservations() { + // @@protoc_insertion_point(field_mutable_list:datacatalog.GetOrExtendReservationsResponse.reservations) + return &reservations_; +} +inline const ::datacatalog::Reservation& GetOrExtendReservationsResponse::reservations(int index) const { + // @@protoc_insertion_point(field_get:datacatalog.GetOrExtendReservationsResponse.reservations) + return reservations_.Get(index); +} +inline ::datacatalog::Reservation* GetOrExtendReservationsResponse::add_reservations() { + // @@protoc_insertion_point(field_add:datacatalog.GetOrExtendReservationsResponse.reservations) + return reservations_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >& +GetOrExtendReservationsResponse::reservations() const { + // @@protoc_insertion_point(field_list:datacatalog.GetOrExtendReservationsResponse.reservations) + return reservations_; +} + +// ------------------------------------------------------------------- + // ReleaseReservationRequest // .datacatalog.ReservationID reservation_id = 1; @@ -7961,6 +8551,40 @@ inline void ReleaseReservationRequest::set_allocated_owner_id(::std::string* own // ------------------------------------------------------------------- +// ReleaseReservationsRequest + +// repeated .datacatalog.ReleaseReservationRequest reservations = 1; +inline int ReleaseReservationsRequest::reservations_size() const { + return reservations_.size(); +} +inline void ReleaseReservationsRequest::clear_reservations() { + reservations_.Clear(); +} +inline ::datacatalog::ReleaseReservationRequest* ReleaseReservationsRequest::mutable_reservations(int index) { + // @@protoc_insertion_point(field_mutable:datacatalog.ReleaseReservationsRequest.reservations) + return reservations_.Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >* +ReleaseReservationsRequest::mutable_reservations() { + // @@protoc_insertion_point(field_mutable_list:datacatalog.ReleaseReservationsRequest.reservations) + return &reservations_; +} +inline const ::datacatalog::ReleaseReservationRequest& ReleaseReservationsRequest::reservations(int index) const { + // @@protoc_insertion_point(field_get:datacatalog.ReleaseReservationsRequest.reservations) + return reservations_.Get(index); +} +inline ::datacatalog::ReleaseReservationRequest* ReleaseReservationsRequest::add_reservations() { + // @@protoc_insertion_point(field_add:datacatalog.ReleaseReservationsRequest.reservations) + return reservations_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >& +ReleaseReservationsRequest::reservations() const { + // @@protoc_insertion_point(field_list:datacatalog.ReleaseReservationsRequest.reservations) + return reservations_; +} + +// ------------------------------------------------------------------- + // ReleaseReservationResponse // ------------------------------------------------------------------- @@ -10259,6 +10883,14 @@ inline void PaginationOptions::set_sortorder(::datacatalog::PaginationOptions_So // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go index fd2e9774de..8978407ca6 100644 --- a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go @@ -47,7 +47,7 @@ func (x SinglePropertyFilter_ComparisonOperator) String() string { } func (SinglePropertyFilter_ComparisonOperator) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{32, 0} + return fileDescriptor_275951237ff4368a, []int{36, 0} } type PaginationOptions_SortOrder int32 @@ -72,7 +72,7 @@ func (x PaginationOptions_SortOrder) String() string { } func (PaginationOptions_SortOrder) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{38, 0} + return fileDescriptor_275951237ff4368a, []int{42, 0} } type PaginationOptions_SortKey int32 @@ -94,7 +94,7 @@ func (x PaginationOptions_SortKey) String() string { } func (PaginationOptions_SortKey) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{38, 1} + return fileDescriptor_275951237ff4368a, []int{42, 1} } // @@ -984,6 +984,47 @@ func (*DeleteArtifactRequest) XXX_OneofWrappers() []interface{} { } } +// Request message for deleting multiple Artifacts and their associated ArtifactData. +type DeleteArtifactsRequest struct { + // List of deletion requests for artifacts to remove + Artifacts []*DeleteArtifactRequest `protobuf:"bytes,1,rep,name=artifacts,proto3" json:"artifacts,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteArtifactsRequest) Reset() { *m = DeleteArtifactsRequest{} } +func (m *DeleteArtifactsRequest) String() string { return proto.CompactTextString(m) } +func (*DeleteArtifactsRequest) ProtoMessage() {} +func (*DeleteArtifactsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_275951237ff4368a, []int{17} +} + +func (m *DeleteArtifactsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteArtifactsRequest.Unmarshal(m, b) +} +func (m *DeleteArtifactsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteArtifactsRequest.Marshal(b, m, deterministic) +} +func (m *DeleteArtifactsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteArtifactsRequest.Merge(m, src) +} +func (m *DeleteArtifactsRequest) XXX_Size() int { + return xxx_messageInfo_DeleteArtifactsRequest.Size(m) +} +func (m *DeleteArtifactsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteArtifactsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteArtifactsRequest proto.InternalMessageInfo + +func (m *DeleteArtifactsRequest) GetArtifacts() []*DeleteArtifactRequest { + if m != nil { + return m.Artifacts + } + return nil +} + // // Response message for deleting an Artifact. type DeleteArtifactResponse struct { @@ -996,7 +1037,7 @@ func (m *DeleteArtifactResponse) Reset() { *m = DeleteArtifactResponse{} func (m *DeleteArtifactResponse) String() string { return proto.CompactTextString(m) } func (*DeleteArtifactResponse) ProtoMessage() {} func (*DeleteArtifactResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{17} + return fileDescriptor_275951237ff4368a, []int{18} } func (m *DeleteArtifactResponse) XXX_Unmarshal(b []byte) error { @@ -1033,7 +1074,7 @@ func (m *ReservationID) Reset() { *m = ReservationID{} } func (m *ReservationID) String() string { return proto.CompactTextString(m) } func (*ReservationID) ProtoMessage() {} func (*ReservationID) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{18} + return fileDescriptor_275951237ff4368a, []int{19} } func (m *ReservationID) XXX_Unmarshal(b []byte) error { @@ -1068,7 +1109,7 @@ func (m *ReservationID) GetTagName() string { return "" } -// Try to acquire or extend an artifact reservation. If an active reservation exists, retreive that instance. +// Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance. type GetOrExtendReservationRequest struct { // The unique ID for the reservation ReservationId *ReservationID `protobuf:"bytes,1,opt,name=reservation_id,json=reservationId,proto3" json:"reservation_id,omitempty"` @@ -1085,7 +1126,7 @@ func (m *GetOrExtendReservationRequest) Reset() { *m = GetOrExtendReserv func (m *GetOrExtendReservationRequest) String() string { return proto.CompactTextString(m) } func (*GetOrExtendReservationRequest) ProtoMessage() {} func (*GetOrExtendReservationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{19} + return fileDescriptor_275951237ff4368a, []int{20} } func (m *GetOrExtendReservationRequest) XXX_Unmarshal(b []byte) error { @@ -1127,6 +1168,47 @@ func (m *GetOrExtendReservationRequest) GetHeartbeatInterval() *duration.Duratio return nil } +// Request message for acquiring or extending reservations for multiple artifacts in a single operation. +type GetOrExtendReservationsRequest struct { + // List of reservation requests for artifacts to acquire + Reservations []*GetOrExtendReservationRequest `protobuf:"bytes,1,rep,name=reservations,proto3" json:"reservations,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetOrExtendReservationsRequest) Reset() { *m = GetOrExtendReservationsRequest{} } +func (m *GetOrExtendReservationsRequest) String() string { return proto.CompactTextString(m) } +func (*GetOrExtendReservationsRequest) ProtoMessage() {} +func (*GetOrExtendReservationsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_275951237ff4368a, []int{21} +} + +func (m *GetOrExtendReservationsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetOrExtendReservationsRequest.Unmarshal(m, b) +} +func (m *GetOrExtendReservationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetOrExtendReservationsRequest.Marshal(b, m, deterministic) +} +func (m *GetOrExtendReservationsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetOrExtendReservationsRequest.Merge(m, src) +} +func (m *GetOrExtendReservationsRequest) XXX_Size() int { + return xxx_messageInfo_GetOrExtendReservationsRequest.Size(m) +} +func (m *GetOrExtendReservationsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetOrExtendReservationsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetOrExtendReservationsRequest proto.InternalMessageInfo + +func (m *GetOrExtendReservationsRequest) GetReservations() []*GetOrExtendReservationRequest { + if m != nil { + return m.Reservations + } + return nil +} + // A reservation including owner, heartbeat interval, expiration timestamp, and various metadata. type Reservation struct { // The unique ID for the reservation @@ -1148,7 +1230,7 @@ func (m *Reservation) Reset() { *m = Reservation{} } func (m *Reservation) String() string { return proto.CompactTextString(m) } func (*Reservation) ProtoMessage() {} func (*Reservation) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{20} + return fileDescriptor_275951237ff4368a, []int{22} } func (m *Reservation) XXX_Unmarshal(b []byte) error { @@ -1217,7 +1299,7 @@ func (m *GetOrExtendReservationResponse) Reset() { *m = GetOrExtendReser func (m *GetOrExtendReservationResponse) String() string { return proto.CompactTextString(m) } func (*GetOrExtendReservationResponse) ProtoMessage() {} func (*GetOrExtendReservationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{21} + return fileDescriptor_275951237ff4368a, []int{23} } func (m *GetOrExtendReservationResponse) XXX_Unmarshal(b []byte) error { @@ -1245,6 +1327,47 @@ func (m *GetOrExtendReservationResponse) GetReservation() *Reservation { return nil } +// List of reservations acquired for multiple artifacts in a single operation. +type GetOrExtendReservationsResponse struct { + // List of (newly created or existing) reservations for artifacts requested + Reservations []*Reservation `protobuf:"bytes,1,rep,name=reservations,proto3" json:"reservations,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetOrExtendReservationsResponse) Reset() { *m = GetOrExtendReservationsResponse{} } +func (m *GetOrExtendReservationsResponse) String() string { return proto.CompactTextString(m) } +func (*GetOrExtendReservationsResponse) ProtoMessage() {} +func (*GetOrExtendReservationsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_275951237ff4368a, []int{24} +} + +func (m *GetOrExtendReservationsResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetOrExtendReservationsResponse.Unmarshal(m, b) +} +func (m *GetOrExtendReservationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetOrExtendReservationsResponse.Marshal(b, m, deterministic) +} +func (m *GetOrExtendReservationsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetOrExtendReservationsResponse.Merge(m, src) +} +func (m *GetOrExtendReservationsResponse) XXX_Size() int { + return xxx_messageInfo_GetOrExtendReservationsResponse.Size(m) +} +func (m *GetOrExtendReservationsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetOrExtendReservationsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetOrExtendReservationsResponse proto.InternalMessageInfo + +func (m *GetOrExtendReservationsResponse) GetReservations() []*Reservation { + if m != nil { + return m.Reservations + } + return nil +} + // Request to release reservation type ReleaseReservationRequest struct { // The unique ID for the reservation @@ -1260,7 +1383,7 @@ func (m *ReleaseReservationRequest) Reset() { *m = ReleaseReservationReq func (m *ReleaseReservationRequest) String() string { return proto.CompactTextString(m) } func (*ReleaseReservationRequest) ProtoMessage() {} func (*ReleaseReservationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{22} + return fileDescriptor_275951237ff4368a, []int{25} } func (m *ReleaseReservationRequest) XXX_Unmarshal(b []byte) error { @@ -1295,6 +1418,47 @@ func (m *ReleaseReservationRequest) GetOwnerId() string { return "" } +// Request message for releasing reservations for multiple artifacts in a single operation. +type ReleaseReservationsRequest struct { + // List of reservation requests for artifacts to release + Reservations []*ReleaseReservationRequest `protobuf:"bytes,1,rep,name=reservations,proto3" json:"reservations,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ReleaseReservationsRequest) Reset() { *m = ReleaseReservationsRequest{} } +func (m *ReleaseReservationsRequest) String() string { return proto.CompactTextString(m) } +func (*ReleaseReservationsRequest) ProtoMessage() {} +func (*ReleaseReservationsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_275951237ff4368a, []int{26} +} + +func (m *ReleaseReservationsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ReleaseReservationsRequest.Unmarshal(m, b) +} +func (m *ReleaseReservationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ReleaseReservationsRequest.Marshal(b, m, deterministic) +} +func (m *ReleaseReservationsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReleaseReservationsRequest.Merge(m, src) +} +func (m *ReleaseReservationsRequest) XXX_Size() int { + return xxx_messageInfo_ReleaseReservationsRequest.Size(m) +} +func (m *ReleaseReservationsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ReleaseReservationsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ReleaseReservationsRequest proto.InternalMessageInfo + +func (m *ReleaseReservationsRequest) GetReservations() []*ReleaseReservationRequest { + if m != nil { + return m.Reservations + } + return nil +} + // Response to release reservation type ReleaseReservationResponse struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1306,7 +1470,7 @@ func (m *ReleaseReservationResponse) Reset() { *m = ReleaseReservationRe func (m *ReleaseReservationResponse) String() string { return proto.CompactTextString(m) } func (*ReleaseReservationResponse) ProtoMessage() {} func (*ReleaseReservationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{23} + return fileDescriptor_275951237ff4368a, []int{27} } func (m *ReleaseReservationResponse) XXX_Unmarshal(b []byte) error { @@ -1342,7 +1506,7 @@ func (m *Dataset) Reset() { *m = Dataset{} } func (m *Dataset) String() string { return proto.CompactTextString(m) } func (*Dataset) ProtoMessage() {} func (*Dataset) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{24} + return fileDescriptor_275951237ff4368a, []int{28} } func (m *Dataset) XXX_Unmarshal(b []byte) error { @@ -1398,7 +1562,7 @@ func (m *Partition) Reset() { *m = Partition{} } func (m *Partition) String() string { return proto.CompactTextString(m) } func (*Partition) ProtoMessage() {} func (*Partition) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{25} + return fileDescriptor_275951237ff4368a, []int{29} } func (m *Partition) XXX_Unmarshal(b []byte) error { @@ -1450,7 +1614,7 @@ func (m *DatasetID) Reset() { *m = DatasetID{} } func (m *DatasetID) String() string { return proto.CompactTextString(m) } func (*DatasetID) ProtoMessage() {} func (*DatasetID) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{26} + return fileDescriptor_275951237ff4368a, []int{30} } func (m *DatasetID) XXX_Unmarshal(b []byte) error { @@ -1525,7 +1689,7 @@ func (m *Artifact) Reset() { *m = Artifact{} } func (m *Artifact) String() string { return proto.CompactTextString(m) } func (*Artifact) ProtoMessage() {} func (*Artifact) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{27} + return fileDescriptor_275951237ff4368a, []int{31} } func (m *Artifact) XXX_Unmarshal(b []byte) error { @@ -1609,7 +1773,7 @@ func (m *ArtifactData) Reset() { *m = ArtifactData{} } func (m *ArtifactData) String() string { return proto.CompactTextString(m) } func (*ArtifactData) ProtoMessage() {} func (*ArtifactData) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{28} + return fileDescriptor_275951237ff4368a, []int{32} } func (m *ArtifactData) XXX_Unmarshal(b []byte) error { @@ -1660,7 +1824,7 @@ func (m *Tag) Reset() { *m = Tag{} } func (m *Tag) String() string { return proto.CompactTextString(m) } func (*Tag) ProtoMessage() {} func (*Tag) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{29} + return fileDescriptor_275951237ff4368a, []int{33} } func (m *Tag) XXX_Unmarshal(b []byte) error { @@ -1715,7 +1879,7 @@ func (m *Metadata) Reset() { *m = Metadata{} } func (m *Metadata) String() string { return proto.CompactTextString(m) } func (*Metadata) ProtoMessage() {} func (*Metadata) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{30} + return fileDescriptor_275951237ff4368a, []int{34} } func (m *Metadata) XXX_Unmarshal(b []byte) error { @@ -1755,7 +1919,7 @@ func (m *FilterExpression) Reset() { *m = FilterExpression{} } func (m *FilterExpression) String() string { return proto.CompactTextString(m) } func (*FilterExpression) ProtoMessage() {} func (*FilterExpression) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{31} + return fileDescriptor_275951237ff4368a, []int{35} } func (m *FilterExpression) XXX_Unmarshal(b []byte) error { @@ -1801,7 +1965,7 @@ func (m *SinglePropertyFilter) Reset() { *m = SinglePropertyFilter{} } func (m *SinglePropertyFilter) String() string { return proto.CompactTextString(m) } func (*SinglePropertyFilter) ProtoMessage() {} func (*SinglePropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{32} + return fileDescriptor_275951237ff4368a, []int{36} } func (m *SinglePropertyFilter) XXX_Unmarshal(b []byte) error { @@ -1918,7 +2082,7 @@ func (m *ArtifactPropertyFilter) Reset() { *m = ArtifactPropertyFilter{} func (m *ArtifactPropertyFilter) String() string { return proto.CompactTextString(m) } func (*ArtifactPropertyFilter) ProtoMessage() {} func (*ArtifactPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{33} + return fileDescriptor_275951237ff4368a, []int{37} } func (m *ArtifactPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -1984,7 +2148,7 @@ func (m *TagPropertyFilter) Reset() { *m = TagPropertyFilter{} } func (m *TagPropertyFilter) String() string { return proto.CompactTextString(m) } func (*TagPropertyFilter) ProtoMessage() {} func (*TagPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{34} + return fileDescriptor_275951237ff4368a, []int{38} } func (m *TagPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -2050,7 +2214,7 @@ func (m *PartitionPropertyFilter) Reset() { *m = PartitionPropertyFilter func (m *PartitionPropertyFilter) String() string { return proto.CompactTextString(m) } func (*PartitionPropertyFilter) ProtoMessage() {} func (*PartitionPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{35} + return fileDescriptor_275951237ff4368a, []int{39} } func (m *PartitionPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -2114,7 +2278,7 @@ func (m *KeyValuePair) Reset() { *m = KeyValuePair{} } func (m *KeyValuePair) String() string { return proto.CompactTextString(m) } func (*KeyValuePair) ProtoMessage() {} func (*KeyValuePair) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{36} + return fileDescriptor_275951237ff4368a, []int{40} } func (m *KeyValuePair) XXX_Unmarshal(b []byte) error { @@ -2166,7 +2330,7 @@ func (m *DatasetPropertyFilter) Reset() { *m = DatasetPropertyFilter{} } func (m *DatasetPropertyFilter) String() string { return proto.CompactTextString(m) } func (*DatasetPropertyFilter) ProtoMessage() {} func (*DatasetPropertyFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{37} + return fileDescriptor_275951237ff4368a, []int{41} } func (m *DatasetPropertyFilter) XXX_Unmarshal(b []byte) error { @@ -2279,7 +2443,7 @@ func (m *PaginationOptions) Reset() { *m = PaginationOptions{} } func (m *PaginationOptions) String() string { return proto.CompactTextString(m) } func (*PaginationOptions) ProtoMessage() {} func (*PaginationOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_275951237ff4368a, []int{38} + return fileDescriptor_275951237ff4368a, []int{42} } func (m *PaginationOptions) XXX_Unmarshal(b []byte) error { @@ -2349,12 +2513,16 @@ func init() { proto.RegisterType((*UpdateArtifactRequest)(nil), "datacatalog.UpdateArtifactRequest") proto.RegisterType((*UpdateArtifactResponse)(nil), "datacatalog.UpdateArtifactResponse") proto.RegisterType((*DeleteArtifactRequest)(nil), "datacatalog.DeleteArtifactRequest") + proto.RegisterType((*DeleteArtifactsRequest)(nil), "datacatalog.DeleteArtifactsRequest") proto.RegisterType((*DeleteArtifactResponse)(nil), "datacatalog.DeleteArtifactResponse") proto.RegisterType((*ReservationID)(nil), "datacatalog.ReservationID") proto.RegisterType((*GetOrExtendReservationRequest)(nil), "datacatalog.GetOrExtendReservationRequest") + proto.RegisterType((*GetOrExtendReservationsRequest)(nil), "datacatalog.GetOrExtendReservationsRequest") proto.RegisterType((*Reservation)(nil), "datacatalog.Reservation") proto.RegisterType((*GetOrExtendReservationResponse)(nil), "datacatalog.GetOrExtendReservationResponse") + proto.RegisterType((*GetOrExtendReservationsResponse)(nil), "datacatalog.GetOrExtendReservationsResponse") proto.RegisterType((*ReleaseReservationRequest)(nil), "datacatalog.ReleaseReservationRequest") + proto.RegisterType((*ReleaseReservationsRequest)(nil), "datacatalog.ReleaseReservationsRequest") proto.RegisterType((*ReleaseReservationResponse)(nil), "datacatalog.ReleaseReservationResponse") proto.RegisterType((*Dataset)(nil), "datacatalog.Dataset") proto.RegisterType((*Partition)(nil), "datacatalog.Partition") @@ -2379,114 +2547,121 @@ func init() { } var fileDescriptor_275951237ff4368a = []byte{ - // 1703 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, - 0x16, 0x36, 0x25, 0x47, 0x32, 0x8f, 0x2c, 0x45, 0x9e, 0xd8, 0x0a, 0xad, 0x24, 0xb6, 0xc2, 0x04, - 0xbe, 0x46, 0xee, 0x8d, 0x94, 0x6b, 0x27, 0x41, 0x93, 0xf4, 0x25, 0x5b, 0x8a, 0xad, 0x3a, 0x7e, - 0x84, 0x7e, 0x00, 0x69, 0x0b, 0x08, 0x63, 0x73, 0xcc, 0xb0, 0xa6, 0x44, 0x86, 0x1c, 0xa7, 0xd6, - 0xaa, 0xe8, 0xb6, 0xed, 0xae, 0x40, 0x81, 0xae, 0xfb, 0x43, 0xba, 0x4c, 0x57, 0xfd, 0x0f, 0xfd, - 0x27, 0xc5, 0x90, 0x43, 0x8a, 0xa4, 0x28, 0x5b, 0xf1, 0x22, 0x68, 0x37, 0x82, 0x66, 0xe6, 0x9c, - 0x6f, 0xce, 0x63, 0x0e, 0xcf, 0x03, 0x16, 0x8e, 0x8d, 0x1e, 0x25, 0xba, 0x6a, 0xd4, 0x54, 0x4c, - 0xf1, 0x11, 0xa6, 0xd8, 0x30, 0xb5, 0xf0, 0xff, 0xaa, 0x65, 0x9b, 0xd4, 0x44, 0xb9, 0xd0, 0x56, - 0xf9, 0x66, 0xc0, 0x74, 0x64, 0xda, 0xa4, 0x66, 0xe8, 0x94, 0xd8, 0xd8, 0x70, 0x3c, 0xd2, 0xf2, - 0x9c, 0x66, 0x9a, 0x9a, 0x41, 0x6a, 0xee, 0xea, 0xf0, 0xf4, 0xb8, 0xa6, 0x9e, 0xda, 0x98, 0xea, - 0x66, 0x97, 0x9f, 0xcf, 0xc7, 0xcf, 0xa9, 0xde, 0x21, 0x0e, 0xc5, 0x1d, 0xcb, 0x23, 0x90, 0x9f, - 0xc3, 0xf4, 0xaa, 0x4d, 0x30, 0x25, 0x0d, 0x4c, 0xb1, 0x43, 0xa8, 0x42, 0xde, 0x9c, 0x12, 0x87, - 0xa2, 0x2a, 0x64, 0x55, 0x6f, 0x47, 0x12, 0x2a, 0xc2, 0x62, 0x6e, 0x69, 0xba, 0x1a, 0x16, 0xd4, - 0xa7, 0xf6, 0x89, 0xe4, 0xeb, 0x30, 0x13, 0xc3, 0x71, 0x2c, 0xb3, 0xeb, 0x10, 0xb9, 0x09, 0x53, - 0x6b, 0x84, 0xc6, 0xd0, 0x1f, 0xc4, 0xd1, 0x4b, 0x49, 0xe8, 0xad, 0x46, 0x1f, 0xbf, 0x01, 0x28, - 0x0c, 0xe3, 0x81, 0xbf, 0xb7, 0x94, 0xbf, 0x08, 0x2e, 0x4c, 0xdd, 0xa6, 0xfa, 0x31, 0x3e, 0xba, - 0xbc, 0x38, 0xe8, 0x36, 0xe4, 0x30, 0x07, 0x69, 0xeb, 0xaa, 0x94, 0xaa, 0x08, 0x8b, 0xe2, 0xfa, - 0x98, 0x02, 0xfe, 0x66, 0x4b, 0x45, 0x37, 0x60, 0x82, 0x62, 0xad, 0xdd, 0xc5, 0x1d, 0x22, 0xa5, - 0xf9, 0x79, 0x96, 0x62, 0x6d, 0x0b, 0x77, 0xc8, 0x4a, 0x01, 0x26, 0xdf, 0x9c, 0x12, 0xbb, 0xd7, - 0x7e, 0x8d, 0xbb, 0xaa, 0x41, 0xe4, 0x75, 0xb8, 0x16, 0x91, 0x8b, 0xeb, 0xf7, 0x7f, 0x98, 0xf0, - 0x11, 0xb9, 0x64, 0x33, 0x11, 0xc9, 0x02, 0x86, 0x80, 0x4c, 0xfe, 0xc2, 0x77, 0x44, 0x5c, 0xc9, - 0x4b, 0x60, 0x49, 0x50, 0x8a, 0x63, 0x71, 0xaf, 0x2e, 0x43, 0xbe, 0xae, 0xaa, 0x7b, 0x58, 0xf3, - 0xd1, 0x65, 0x48, 0x53, 0xac, 0x71, 0xe0, 0x62, 0x04, 0x98, 0x51, 0xb1, 0x43, 0xb9, 0x08, 0x05, - 0x9f, 0x89, 0xc3, 0xfc, 0x2e, 0xc0, 0xf4, 0x0b, 0xdd, 0x09, 0x14, 0x77, 0x2e, 0xef, 0x91, 0x47, - 0x90, 0x39, 0xd6, 0x0d, 0x4a, 0x6c, 0xd7, 0x19, 0xb9, 0xa5, 0x5b, 0x11, 0x86, 0xe7, 0xee, 0x51, - 0xf3, 0xcc, 0xb2, 0x89, 0xe3, 0xe8, 0x66, 0x57, 0xe1, 0xc4, 0xe8, 0x53, 0x00, 0x0b, 0x6b, 0x7a, - 0xd7, 0x0d, 0x1a, 0xd7, 0x4f, 0xb9, 0xa5, 0xb9, 0x08, 0xeb, 0x4e, 0x70, 0xbc, 0x6d, 0xb1, 0x5f, - 0x47, 0x09, 0x71, 0xc8, 0x27, 0x30, 0x13, 0x53, 0x80, 0xbb, 0x6e, 0x19, 0x44, 0xdf, 0x8e, 0x8e, - 0x24, 0x54, 0xd2, 0xc3, 0xed, 0xdd, 0xa7, 0x43, 0xb7, 0x00, 0xba, 0xe4, 0x8c, 0xb6, 0xa9, 0x79, - 0x42, 0xba, 0xde, 0xab, 0x52, 0x44, 0xb6, 0xb3, 0xc7, 0x36, 0xe4, 0x9f, 0x04, 0xb8, 0xc6, 0x6e, - 0xe3, 0xea, 0x07, 0xd6, 0xea, 0xeb, 0x2e, 0x5c, 0x5e, 0xf7, 0xd4, 0x7b, 0xeb, 0xae, 0x79, 0xce, - 0xeb, 0x4b, 0xc3, 0x55, 0x7f, 0x00, 0x13, 0xdc, 0x2b, 0xbe, 0xe6, 0xc9, 0x61, 0x19, 0x50, 0x5d, - 0xa4, 0xf7, 0x1f, 0x02, 0xcc, 0xec, 0x5b, 0x6a, 0xc2, 0xa3, 0xfe, 0xe0, 0x91, 0x8b, 0xee, 0xc3, - 0x38, 0x83, 0x92, 0xc6, 0x5d, 0xc5, 0x66, 0x13, 0x5d, 0xca, 0xae, 0x55, 0x5c, 0xb2, 0x81, 0x40, - 0x7f, 0x02, 0xa5, 0xb8, 0x26, 0xdc, 0x6a, 0xf3, 0x51, 0xc1, 0x04, 0xd7, 0x08, 0x21, 0xb1, 0xe4, - 0x5f, 0x05, 0x98, 0x69, 0x10, 0x83, 0xfc, 0x03, 0xac, 0x30, 0xa0, 0x96, 0x04, 0xa5, 0xb8, 0x68, - 0x3c, 0xc4, 0x31, 0xe4, 0x15, 0xe2, 0x10, 0xfb, 0xad, 0xfb, 0x66, 0x5a, 0x0d, 0xf4, 0x08, 0x80, - 0x4b, 0xe1, 0xab, 0x39, 0x5c, 0x5e, 0x91, 0x53, 0xb6, 0x54, 0x34, 0x1b, 0x12, 0xc7, 0x7b, 0x20, - 0xbe, 0x30, 0xf2, 0x3b, 0x01, 0x6e, 0xad, 0x11, 0xba, 0x6d, 0x37, 0xcf, 0x28, 0xe9, 0xaa, 0xa1, - 0xeb, 0x7c, 0x03, 0xd5, 0xa1, 0x60, 0xf7, 0x77, 0xfb, 0xf7, 0x96, 0x23, 0xf7, 0x46, 0xe4, 0x54, - 0xf2, 0x21, 0x0e, 0xef, 0x7e, 0xf3, 0xdb, 0x2e, 0xb1, 0x03, 0x73, 0x29, 0x59, 0x77, 0xdd, 0x52, - 0xd1, 0x3a, 0xa0, 0xd7, 0x04, 0xdb, 0xf4, 0x90, 0x60, 0xda, 0xd6, 0xbb, 0x94, 0x71, 0x19, 0xfc, - 0x5b, 0x32, 0x5b, 0xf5, 0x32, 0x70, 0xd5, 0xcf, 0xc0, 0xd5, 0x06, 0xcf, 0xd0, 0xca, 0x54, 0xc0, - 0xd4, 0xe2, 0x3c, 0xf2, 0x6f, 0x29, 0xc8, 0x85, 0xa4, 0xf8, 0xb7, 0xc8, 0x8d, 0x9e, 0x00, 0x90, - 0x33, 0x4b, 0xb7, 0x89, 0xd3, 0xc6, 0x54, 0x1a, 0xe7, 0x32, 0xc6, 0x11, 0xf6, 0xfc, 0xda, 0x43, - 0x11, 0x39, 0x75, 0xdd, 0x4d, 0x4b, 0x1d, 0x42, 0xb1, 0x1b, 0x53, 0x99, 0x84, 0xb4, 0xb4, 0xc9, - 0x0f, 0x95, 0x80, 0x4c, 0xfe, 0x1a, 0xe6, 0x86, 0xb9, 0x9b, 0xc7, 0xd2, 0x53, 0xc8, 0x85, 0xac, - 0xc0, 0x8d, 0x26, 0x0d, 0x33, 0x9a, 0x12, 0x26, 0x96, 0x7b, 0x30, 0xab, 0x10, 0x83, 0x60, 0x87, - 0x7c, 0xe8, 0x87, 0x24, 0xdf, 0x84, 0x72, 0xd2, 0xd5, 0x3c, 0x92, 0x7e, 0x10, 0x20, 0xcb, 0x43, - 0x03, 0x2d, 0x40, 0xea, 0xc2, 0xe0, 0x49, 0xe9, 0x6a, 0xc4, 0xba, 0xa9, 0x91, 0xac, 0x8b, 0xee, - 0x42, 0xde, 0x62, 0x9f, 0x01, 0x76, 0xf7, 0x06, 0xe9, 0x39, 0x52, 0xba, 0x92, 0x5e, 0x14, 0x95, - 0xe8, 0xa6, 0xbc, 0x0c, 0xe2, 0x8e, 0xbf, 0x81, 0x8a, 0x90, 0x3e, 0x21, 0x3d, 0xfe, 0xc9, 0x62, - 0x7f, 0xd1, 0x34, 0x5c, 0x79, 0x8b, 0x8d, 0x53, 0x3f, 0x54, 0xbd, 0x85, 0xfc, 0x1d, 0x88, 0x81, - 0x78, 0x48, 0x82, 0xac, 0x65, 0x9b, 0xdf, 0x10, 0x5e, 0x8e, 0x88, 0x8a, 0xbf, 0x44, 0x08, 0xc6, - 0x43, 0x61, 0xee, 0xfe, 0x47, 0x25, 0xc8, 0xa8, 0x66, 0x07, 0xeb, 0x5e, 0x8e, 0x16, 0x15, 0xbe, - 0x62, 0x28, 0x6f, 0x89, 0xcd, 0xd2, 0x9a, 0xfb, 0xec, 0x44, 0xc5, 0x5f, 0x32, 0x94, 0xfd, 0xfd, - 0x56, 0x43, 0xba, 0xe2, 0xa1, 0xb0, 0xff, 0xf2, 0xbb, 0x14, 0x4c, 0xf8, 0x5f, 0x28, 0x54, 0x08, - 0x6c, 0x28, 0xba, 0xb6, 0x0a, 0x7d, 0x45, 0x53, 0xa3, 0x7d, 0x45, 0xfd, 0x5c, 0x90, 0x1e, 0x29, - 0x17, 0x44, 0x9c, 0x31, 0x3e, 0x9a, 0x33, 0x1e, 0xb3, 0x14, 0xcd, 0xcd, 0xec, 0x48, 0x57, 0xdc, - 0x7b, 0x4a, 0xb1, 0x14, 0xcd, 0x8f, 0x95, 0x10, 0x25, 0xba, 0x0b, 0xe3, 0x14, 0x6b, 0x8e, 0x94, - 0x71, 0x39, 0x06, 0xeb, 0x31, 0xf7, 0x94, 0x85, 0xed, 0x91, 0x5b, 0xdf, 0xa9, 0x2c, 0x6c, 0xb3, - 0x17, 0x87, 0x2d, 0xa7, 0xae, 0x53, 0x79, 0x07, 0x26, 0xc3, 0x1a, 0x06, 0x3e, 0x13, 0x42, 0x3e, - 0xfb, 0x5f, 0xf8, 0x11, 0x30, 0xb9, 0xfd, 0x56, 0xa6, 0xca, 0x5a, 0x99, 0xea, 0x0b, 0xaf, 0x95, - 0xf1, 0x1f, 0x87, 0x01, 0xe9, 0x3d, 0xac, 0x25, 0x02, 0xcd, 0x27, 0x64, 0xab, 0x48, 0xae, 0x0a, - 0xb9, 0x2e, 0x3d, 0x5a, 0x3f, 0xf1, 0xbd, 0x00, 0x13, 0xbe, 0xbd, 0xd1, 0x53, 0xc8, 0x9e, 0x90, - 0x5e, 0xbb, 0x83, 0x2d, 0x5e, 0xaf, 0xdc, 0x4e, 0xf4, 0x4b, 0x75, 0x83, 0xf4, 0x36, 0xb1, 0xd5, - 0xec, 0x52, 0xbb, 0xa7, 0x64, 0x4e, 0xdc, 0x45, 0xf9, 0x09, 0xe4, 0x42, 0xdb, 0xa3, 0x86, 0xc2, - 0xd3, 0xd4, 0x47, 0x82, 0xbc, 0x0d, 0xc5, 0x78, 0x6d, 0x86, 0x9e, 0x41, 0xd6, 0xab, 0xce, 0x9c, - 0x44, 0x51, 0x76, 0xf5, 0xae, 0x66, 0x90, 0x1d, 0xdb, 0xb4, 0x88, 0x4d, 0x7b, 0x1e, 0xb7, 0xe2, - 0x73, 0xc8, 0x7f, 0xa6, 0x61, 0x3a, 0x89, 0x02, 0x7d, 0x06, 0xc0, 0x92, 0x67, 0xa4, 0x48, 0x9c, - 0x8b, 0x3f, 0x8a, 0x28, 0xcf, 0xfa, 0x98, 0x22, 0x52, 0xac, 0x71, 0x80, 0x97, 0x50, 0x0c, 0x5e, - 0x57, 0x3b, 0x52, 0x67, 0xdf, 0x4d, 0x7e, 0x8d, 0x03, 0x60, 0x57, 0x03, 0x7e, 0x0e, 0xb9, 0x05, - 0x57, 0x03, 0xa7, 0x72, 0x44, 0xcf, 0x77, 0x77, 0x12, 0xe3, 0x68, 0x00, 0xb0, 0xe0, 0x73, 0x73, - 0xbc, 0x0d, 0x28, 0xf8, 0x75, 0x05, 0x87, 0xf3, 0x62, 0x4c, 0x4e, 0x7a, 0x0a, 0x03, 0x68, 0x79, - 0xce, 0xcb, 0xc1, 0x76, 0x60, 0x82, 0x11, 0x60, 0x6a, 0xda, 0x12, 0x54, 0x84, 0xc5, 0xc2, 0xd2, - 0xc3, 0x0b, 0xfd, 0x50, 0x5d, 0x35, 0x3b, 0x16, 0xb6, 0x75, 0x87, 0x55, 0xcb, 0x1e, 0xaf, 0x12, - 0xa0, 0xc8, 0x15, 0x40, 0x83, 0xe7, 0x08, 0x20, 0xd3, 0x7c, 0xb9, 0x5f, 0x7f, 0xb1, 0x5b, 0x1c, - 0x5b, 0x99, 0x82, 0xab, 0x16, 0x07, 0xe4, 0x1a, 0xc8, 0x6b, 0x50, 0x4a, 0xd6, 0x3f, 0x5e, 0xc0, - 0x09, 0x83, 0x05, 0xdc, 0x0a, 0xc0, 0x84, 0x8f, 0x27, 0x7f, 0x0c, 0x53, 0x03, 0x1e, 0x8e, 0x54, - 0x78, 0x42, 0xbc, 0xc2, 0x0b, 0x73, 0x7f, 0x05, 0xd7, 0x87, 0x38, 0x16, 0x3d, 0xf4, 0x42, 0x87, - 0x15, 0x0e, 0x02, 0x2f, 0x1c, 0xc2, 0x76, 0xda, 0x20, 0xbd, 0x03, 0xf6, 0xde, 0x77, 0xb0, 0xce, - 0xac, 0xcc, 0x82, 0xe6, 0x00, 0x1b, 0x11, 0xf0, 0xc7, 0x30, 0x19, 0xa6, 0x1a, 0x39, 0x99, 0xfc, - 0xc8, 0xca, 0xe1, 0x24, 0x6f, 0xa2, 0x72, 0x2c, 0xb3, 0x30, 0xb5, 0xfc, 0xdc, 0x32, 0x1d, 0xce, - 0x2d, 0xeb, 0x63, 0xfc, 0x03, 0x23, 0x45, 0xb3, 0x0b, 0x93, 0x94, 0xe7, 0x97, 0x72, 0x2c, 0xbf, - 0x30, 0x2c, 0xbe, 0x11, 0xd1, 0xe2, 0xe7, 0x14, 0x4c, 0x0d, 0x74, 0x4b, 0x4c, 0x72, 0x43, 0xef, - 0xe8, 0x9e, 0x1c, 0x79, 0xc5, 0x5b, 0xb0, 0xdd, 0x70, 0xa3, 0xe3, 0x2d, 0xd0, 0xe7, 0x90, 0x75, - 0x4c, 0x9b, 0x6e, 0x90, 0x9e, 0x2b, 0x44, 0x61, 0x69, 0xe1, 0xfc, 0x56, 0xac, 0xba, 0xeb, 0x51, - 0x2b, 0x3e, 0x1b, 0x7a, 0x0e, 0x22, 0xfb, 0xbb, 0x6d, 0xab, 0xfc, 0xf1, 0x17, 0x96, 0x16, 0x47, - 0xc0, 0x70, 0xe9, 0x95, 0x3e, 0xab, 0x7c, 0x0f, 0xc4, 0x60, 0x1f, 0x15, 0x00, 0x1a, 0xcd, 0xdd, - 0xd5, 0xe6, 0x56, 0xa3, 0xb5, 0xb5, 0x56, 0x1c, 0x43, 0x79, 0x10, 0xeb, 0xc1, 0x52, 0x90, 0x6f, - 0x42, 0x96, 0xcb, 0x81, 0xa6, 0x20, 0xbf, 0xaa, 0x34, 0xeb, 0x7b, 0xad, 0xed, 0xad, 0xf6, 0x5e, - 0x6b, 0xb3, 0x59, 0x1c, 0x5b, 0xfa, 0x2b, 0x0b, 0x39, 0xe6, 0xa3, 0x55, 0x4f, 0x00, 0x74, 0x00, - 0xf9, 0xc8, 0x94, 0x08, 0x45, 0xbf, 0x6e, 0x49, 0x93, 0xa8, 0xb2, 0x7c, 0x1e, 0x09, 0xaf, 0xf7, - 0x36, 0x01, 0xfa, 0xd3, 0x21, 0x14, 0xfd, 0xb2, 0x0d, 0x4c, 0x9f, 0xca, 0xf3, 0x43, 0xcf, 0x39, - 0xdc, 0x2b, 0x28, 0x44, 0xe7, 0x1e, 0x28, 0x49, 0x88, 0x58, 0x17, 0x56, 0xbe, 0x73, 0x2e, 0x0d, - 0x87, 0xde, 0x81, 0x5c, 0x68, 0xd0, 0x83, 0x06, 0x44, 0x89, 0x83, 0x56, 0x86, 0x13, 0x70, 0xc4, - 0x3a, 0x64, 0xbc, 0xa9, 0x0a, 0x8a, 0x16, 0xa1, 0x91, 0xf9, 0x4c, 0xf9, 0x46, 0xe2, 0x19, 0x87, - 0x38, 0x80, 0x7c, 0x64, 0x88, 0x11, 0x73, 0x4b, 0xd2, 0x84, 0x26, 0xe6, 0x96, 0xe4, 0x19, 0xc8, - 0x2e, 0x4c, 0x86, 0x07, 0x04, 0xa8, 0x32, 0xc0, 0x13, 0x9b, 0x64, 0x94, 0x6f, 0x9f, 0x43, 0xd1, - 0x77, 0x4e, 0xb4, 0x83, 0x8e, 0x39, 0x27, 0x71, 0x50, 0x10, 0x73, 0xce, 0x90, 0x16, 0xfc, 0x15, - 0x14, 0xa2, 0x5d, 0x6c, 0x0c, 0x3a, 0xb1, 0xfb, 0x8e, 0x41, 0x27, 0xb7, 0xc1, 0xe8, 0x0d, 0x94, - 0x92, 0x7b, 0x16, 0x74, 0x2f, 0xee, 0xe1, 0xe1, 0x7d, 0x6c, 0xf9, 0xbf, 0x23, 0xd1, 0xf2, 0x2b, - 0x09, 0xa0, 0xc1, 0x6e, 0x02, 0x2d, 0xc4, 0x3a, 0x95, 0x21, 0x9d, 0x4e, 0xf9, 0x3f, 0x17, 0xd2, - 0x79, 0xd7, 0xac, 0x7c, 0xf2, 0xe5, 0x33, 0x4d, 0xa7, 0xaf, 0x4f, 0x0f, 0xab, 0x47, 0x66, 0xa7, - 0xe6, 0x96, 0x78, 0xa6, 0xad, 0xd5, 0x82, 0xb1, 0xb5, 0x46, 0xba, 0x35, 0xeb, 0xf0, 0xbe, 0x66, - 0xd6, 0x92, 0xc6, 0xdf, 0x87, 0x19, 0xb7, 0xce, 0x5c, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x66, - 0xa6, 0x52, 0x31, 0x1d, 0x17, 0x00, 0x00, + // 1812 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8, + 0x15, 0x37, 0x25, 0x47, 0x32, 0x9f, 0x2c, 0x59, 0x9e, 0xd8, 0x8a, 0xac, 0x4d, 0x6c, 0x85, 0x1b, + 0xa4, 0xc6, 0x76, 0x57, 0xda, 0xda, 0xbb, 0x8b, 0x26, 0xbb, 0x6d, 0x57, 0xb6, 0x14, 0x5b, 0xeb, + 0xf8, 0x63, 0xe9, 0x0f, 0x60, 0x93, 0x02, 0xc2, 0xd8, 0x1c, 0xd3, 0xac, 0x29, 0x91, 0x21, 0xc7, + 0xa9, 0x75, 0x2a, 0x7a, 0x6d, 0x7b, 0x2b, 0x50, 0xa0, 0x87, 0x9e, 0xfa, 0x87, 0xf4, 0x98, 0x9e, + 0xfa, 0x37, 0x15, 0x43, 0x0e, 0x29, 0x0e, 0x49, 0xd9, 0xb2, 0x0f, 0x41, 0x7b, 0x11, 0x38, 0x33, + 0xef, 0xfd, 0xe6, 0xbd, 0xf7, 0x9b, 0x8f, 0x37, 0x4f, 0xf0, 0xfc, 0xdc, 0x1c, 0x52, 0x62, 0x68, + 0x66, 0x53, 0xc3, 0x14, 0x9f, 0x61, 0x8a, 0x4d, 0x4b, 0x8f, 0x7e, 0x37, 0x6c, 0xc7, 0xa2, 0x16, + 0x2a, 0x44, 0xba, 0x6a, 0x8f, 0x43, 0xa5, 0x33, 0xcb, 0x21, 0x4d, 0xd3, 0xa0, 0xc4, 0xc1, 0xa6, + 0xeb, 0x8b, 0xd6, 0x96, 0x75, 0xcb, 0xd2, 0x4d, 0xd2, 0xf4, 0x5a, 0xa7, 0x57, 0xe7, 0x4d, 0xed, + 0xca, 0xc1, 0xd4, 0xb0, 0x06, 0x7c, 0x7c, 0x25, 0x3e, 0x4e, 0x8d, 0x3e, 0x71, 0x29, 0xee, 0xdb, + 0xbe, 0x80, 0xf2, 0x0a, 0x16, 0x36, 0x1d, 0x82, 0x29, 0x69, 0x63, 0x8a, 0x5d, 0x42, 0x55, 0xf2, + 0xee, 0x8a, 0xb8, 0x14, 0x35, 0x20, 0xaf, 0xf9, 0x3d, 0x55, 0xa9, 0x2e, 0xad, 0x16, 0xd6, 0x16, + 0x1a, 0x51, 0x43, 0x03, 0xe9, 0x40, 0x48, 0x79, 0x04, 0x8b, 0x31, 0x1c, 0xd7, 0xb6, 0x06, 0x2e, + 0x51, 0x3a, 0x30, 0xbf, 0x45, 0x68, 0x0c, 0xfd, 0xcb, 0x38, 0x7a, 0x25, 0x0d, 0xbd, 0xdb, 0x1e, + 0xe1, 0xb7, 0x01, 0x45, 0x61, 0x7c, 0xf0, 0x3b, 0x5b, 0xf9, 0x37, 0xc9, 0x83, 0x69, 0x39, 0xd4, + 0x38, 0xc7, 0x67, 0xf7, 0x37, 0x07, 0x3d, 0x85, 0x02, 0xe6, 0x20, 0x3d, 0x43, 0xab, 0x66, 0xea, + 0xd2, 0xaa, 0xbc, 0x3d, 0xa5, 0x42, 0xd0, 0xd9, 0xd5, 0xd0, 0x27, 0x30, 0x43, 0xb1, 0xde, 0x1b, + 0xe0, 0x3e, 0xa9, 0x66, 0xf9, 0x78, 0x9e, 0x62, 0x7d, 0x0f, 0xf7, 0xc9, 0x46, 0x09, 0x66, 0xdf, + 0x5d, 0x11, 0x67, 0xd8, 0xbb, 0xc0, 0x03, 0xcd, 0x24, 0xca, 0x36, 0x3c, 0x14, 0xec, 0xe2, 0xfe, + 0xfd, 0x02, 0x66, 0x02, 0x44, 0x6e, 0xd9, 0xa2, 0x60, 0x59, 0xa8, 0x10, 0x8a, 0x29, 0x3f, 0x04, + 0x44, 0xc4, 0x9d, 0xbc, 0x07, 0x56, 0x15, 0x2a, 0x71, 0x2c, 0xce, 0xea, 0x3a, 0x14, 0x5b, 0x9a, + 0x76, 0x84, 0xf5, 0x00, 0x5d, 0x81, 0x2c, 0xc5, 0x3a, 0x07, 0x2e, 0x0b, 0xc0, 0x4c, 0x8a, 0x0d, + 0x2a, 0x65, 0x28, 0x05, 0x4a, 0x1c, 0xe6, 0x5f, 0x12, 0x2c, 0xbc, 0x36, 0xdc, 0xd0, 0x71, 0xf7, + 0xfe, 0x8c, 0x7c, 0x0d, 0xb9, 0x73, 0xc3, 0xa4, 0xc4, 0xf1, 0xc8, 0x28, 0xac, 0x3d, 0x11, 0x14, + 0x5e, 0x79, 0x43, 0x9d, 0x6b, 0xdb, 0x21, 0xae, 0x6b, 0x58, 0x03, 0x95, 0x0b, 0xa3, 0x5f, 0x03, + 0xd8, 0x58, 0x37, 0x06, 0xde, 0xa6, 0xf1, 0x78, 0x2a, 0xac, 0x2d, 0x0b, 0xaa, 0x07, 0xe1, 0xf0, + 0xbe, 0xcd, 0x7e, 0x5d, 0x35, 0xa2, 0xa1, 0x5c, 0xc2, 0x62, 0xcc, 0x01, 0x4e, 0xdd, 0x3a, 0xc8, + 0x41, 0x1c, 0xdd, 0xaa, 0x54, 0xcf, 0x8e, 0x8f, 0xf7, 0x48, 0x0e, 0x3d, 0x01, 0x18, 0x90, 0x6b, + 0xda, 0xa3, 0xd6, 0x25, 0x19, 0xf8, 0xab, 0x4a, 0x95, 0x59, 0xcf, 0x11, 0xeb, 0x50, 0xfe, 0x22, + 0xc1, 0x43, 0x36, 0x1b, 0x77, 0x3f, 0x8c, 0xd6, 0xc8, 0x77, 0xe9, 0xfe, 0xbe, 0x67, 0xee, 0xec, + 0xbb, 0xee, 0x93, 0x37, 0xb2, 0x86, 0xbb, 0xfe, 0x25, 0xcc, 0x70, 0x56, 0x02, 0xcf, 0xd3, 0xb7, + 0x65, 0x28, 0x75, 0x9b, 0xdf, 0xff, 0x96, 0x60, 0xf1, 0xd8, 0xd6, 0x52, 0x16, 0xf5, 0x47, 0xdf, + 0xb9, 0xe8, 0x0b, 0x98, 0x66, 0x50, 0xd5, 0x69, 0xcf, 0xb1, 0xa5, 0x54, 0x4a, 0xd9, 0xb4, 0xaa, + 0x27, 0x96, 0xd8, 0xe8, 0x2f, 0xa0, 0x12, 0xf7, 0x84, 0x47, 0x6d, 0x45, 0x34, 0x4c, 0xf2, 0x82, + 0x10, 0x31, 0x4b, 0xf9, 0xbb, 0x04, 0x8b, 0x6d, 0x62, 0x92, 0xff, 0x81, 0x28, 0x24, 0xdc, 0x7a, + 0x03, 0x15, 0xd1, 0xb4, 0x70, 0x6d, 0x7e, 0x9f, 0xdc, 0x07, 0x8a, 0x68, 0x5d, 0x9a, 0x4b, 0x91, + 0x4d, 0xc1, 0x4e, 0xa1, 0xb8, 0x0c, 0x3f, 0x3e, 0x30, 0x14, 0x55, 0xe2, 0x12, 0xe7, 0xbd, 0xb7, + 0x1e, 0xbb, 0x6d, 0xf4, 0x35, 0x00, 0xf7, 0x30, 0x08, 0xe1, 0xf8, 0x58, 0xc8, 0x5c, 0xb2, 0xab, + 0xa1, 0xa5, 0x88, 0xab, 0xfe, 0xe2, 0x0b, 0x1c, 0x55, 0x3e, 0x48, 0xf0, 0x64, 0x8b, 0xd0, 0x7d, + 0xa7, 0x73, 0x4d, 0xc9, 0x40, 0x8b, 0x4c, 0x17, 0x38, 0xd8, 0x82, 0x92, 0x33, 0xea, 0x1d, 0xcd, + 0x5b, 0x13, 0xe6, 0x15, 0xec, 0x54, 0x8b, 0x11, 0x0d, 0x7f, 0x7e, 0xeb, 0xf7, 0x03, 0xe2, 0x84, + 0x54, 0xa8, 0x79, 0xaf, 0xdd, 0xd5, 0xd0, 0x36, 0xa0, 0x0b, 0x82, 0x1d, 0x7a, 0x4a, 0x30, 0xed, + 0x19, 0x03, 0xca, 0xb4, 0x4c, 0x7e, 0x4e, 0x2d, 0x35, 0xfc, 0xdb, 0xbd, 0x11, 0xdc, 0xee, 0x8d, + 0x36, 0xbf, 0xfd, 0xd5, 0xf9, 0x50, 0xa9, 0xcb, 0x75, 0x14, 0x1b, 0x96, 0xd3, 0x1d, 0x09, 0xa9, + 0xda, 0x83, 0xd9, 0x88, 0x5d, 0x01, 0x5b, 0x9f, 0x09, 0x7e, 0xdc, 0x18, 0x0b, 0x55, 0xd0, 0x57, + 0xfe, 0x99, 0x81, 0x42, 0x44, 0xe8, 0xff, 0x25, 0x52, 0xe8, 0x05, 0x00, 0xb9, 0xb6, 0x0d, 0x87, + 0xb8, 0x3d, 0x4c, 0xab, 0xd3, 0xdc, 0xc6, 0x38, 0xc2, 0x51, 0x90, 0x49, 0xa9, 0x32, 0x97, 0x6e, + 0x79, 0x97, 0x6c, 0x9f, 0x50, 0xec, 0x9d, 0x10, 0xb9, 0x94, 0x4b, 0x76, 0x97, 0x0f, 0xaa, 0xa1, + 0x98, 0xf2, 0xdb, 0x71, 0xbc, 0x84, 0x27, 0xc3, 0x4b, 0x28, 0x44, 0xa2, 0xc0, 0x83, 0x56, 0x1d, + 0x17, 0x34, 0x35, 0x2a, 0xac, 0xf4, 0x60, 0x65, 0x2c, 0xeb, 0x1c, 0xfe, 0xbb, 0x54, 0xda, 0xc7, + 0xe3, 0x8b, 0x24, 0x0f, 0x61, 0x49, 0x25, 0x26, 0xc1, 0x2e, 0xf9, 0xd8, 0x7b, 0x43, 0xb9, 0x80, + 0x5a, 0x72, 0xea, 0x70, 0x35, 0xff, 0x90, 0xea, 0xd6, 0xf3, 0xd8, 0xcc, 0x63, 0x2c, 0x8f, 0x39, + 0xf9, 0x38, 0x6d, 0xa6, 0xf0, 0x18, 0xfa, 0x93, 0x04, 0x79, 0x7e, 0xae, 0xa0, 0xe7, 0x90, 0xb9, + 0xf5, 0xe4, 0xc9, 0x18, 0x9a, 0xb0, 0x50, 0x32, 0x13, 0x2d, 0x14, 0xf4, 0x0c, 0x8a, 0x36, 0x3b, + 0x15, 0xd9, 0xdc, 0x3b, 0x64, 0xe8, 0x56, 0xb3, 0xf5, 0xec, 0xaa, 0xac, 0x8a, 0x9d, 0xca, 0x3a, + 0xc8, 0x07, 0x41, 0x07, 0x2a, 0x43, 0xf6, 0x92, 0x0c, 0xf9, 0x5d, 0xc2, 0x3e, 0xd1, 0x02, 0x3c, + 0x78, 0x8f, 0xcd, 0xab, 0xe0, 0x9c, 0xf3, 0x1b, 0xca, 0x1f, 0x40, 0x0e, 0xcd, 0x43, 0x55, 0xc8, + 0xdb, 0x8e, 0xf5, 0x3b, 0xc2, 0xf3, 0x44, 0x59, 0x0d, 0x9a, 0x08, 0xc1, 0x74, 0xe4, 0x8c, 0xf4, + 0xbe, 0x51, 0x05, 0x72, 0x9a, 0xd5, 0xc7, 0x86, 0x9f, 0x3c, 0xc9, 0x2a, 0x6f, 0x31, 0x94, 0xf7, + 0xc4, 0x61, 0xf9, 0x86, 0xb7, 0x83, 0x64, 0x35, 0x68, 0x32, 0x94, 0xe3, 0xe3, 0x6e, 0xbb, 0xfa, + 0xc0, 0x47, 0x61, 0xdf, 0xca, 0x87, 0x0c, 0xcc, 0x04, 0xc7, 0x3b, 0x2a, 0x85, 0x31, 0x94, 0xbd, + 0x58, 0x45, 0xae, 0xb7, 0xcc, 0x64, 0xd7, 0x5b, 0x70, 0x49, 0x67, 0x27, 0xba, 0xa4, 0x05, 0x32, + 0xa6, 0x27, 0x23, 0xe3, 0x1b, 0x96, 0x3b, 0xf1, 0x30, 0xbb, 0xd5, 0x07, 0xde, 0x3c, 0x95, 0x58, + 0xee, 0xc4, 0x87, 0xd5, 0x88, 0x24, 0x7a, 0x06, 0xd3, 0x14, 0xeb, 0x6e, 0x35, 0xe7, 0x69, 0x24, + 0x13, 0x65, 0x6f, 0x94, 0x9d, 0x40, 0x67, 0x5e, 0xe2, 0xad, 0xb1, 0x13, 0x28, 0x7f, 0xfb, 0x09, + 0xc4, 0xa5, 0x5b, 0x54, 0x39, 0x80, 0xd9, 0xa8, 0x87, 0x21, 0x67, 0x52, 0x84, 0xb3, 0xcf, 0xa3, + 0x8b, 0x80, 0xd9, 0x1d, 0xbc, 0x31, 0x1b, 0xec, 0x8d, 0xd9, 0x78, 0xed, 0xbf, 0x31, 0x83, 0xc5, + 0x61, 0x42, 0xf6, 0x08, 0xeb, 0xa9, 0x40, 0x2b, 0x29, 0x69, 0x84, 0x90, 0x44, 0x44, 0xa8, 0xcb, + 0x4e, 0xf6, 0xd0, 0xfb, 0xa3, 0x04, 0x33, 0x41, 0xbc, 0xd1, 0x4b, 0xc8, 0x5f, 0x92, 0x61, 0xaf, + 0x8f, 0x6d, 0xbe, 0x7d, 0x9f, 0xa6, 0xf2, 0xd2, 0xd8, 0x21, 0xc3, 0x5d, 0x6c, 0x77, 0x06, 0xd4, + 0x19, 0xaa, 0xb9, 0x4b, 0xaf, 0x51, 0x7b, 0x01, 0x85, 0x48, 0xf7, 0xa4, 0x5b, 0xe1, 0x65, 0xe6, + 0x97, 0x92, 0xb2, 0x0f, 0xe5, 0x78, 0xd2, 0x8c, 0xbe, 0x85, 0xbc, 0x9f, 0x36, 0xbb, 0xa9, 0xa6, + 0x1c, 0x1a, 0x03, 0xdd, 0x24, 0x07, 0x8e, 0x65, 0x13, 0x87, 0x0e, 0x7d, 0x6d, 0x35, 0xd0, 0x50, + 0xfe, 0x93, 0x85, 0x85, 0x34, 0x09, 0xf4, 0x1b, 0x00, 0x96, 0x79, 0x08, 0xd9, 0xfb, 0x72, 0x7c, + 0x51, 0x88, 0x3a, 0xdb, 0x53, 0xaa, 0x4c, 0xb1, 0xce, 0x01, 0x7e, 0x84, 0x72, 0xb8, 0xba, 0x7a, + 0xc2, 0x03, 0xe8, 0x59, 0xfa, 0x6a, 0x4c, 0x80, 0xcd, 0x85, 0xfa, 0x1c, 0x72, 0x0f, 0xe6, 0x42, + 0x52, 0x39, 0xa2, 0xcf, 0xdd, 0xa7, 0xa9, 0xfb, 0x28, 0x01, 0x58, 0x0a, 0xb4, 0x39, 0xde, 0x0e, + 0x94, 0x82, 0xa4, 0x8c, 0xc3, 0xf9, 0x7b, 0x4c, 0x49, 0x5b, 0x0a, 0x09, 0xb4, 0x22, 0xd7, 0xe5, + 0x60, 0x07, 0x30, 0xc3, 0x04, 0x30, 0xb5, 0x9c, 0x2a, 0xd4, 0xa5, 0xd5, 0xd2, 0xda, 0x57, 0xb7, + 0xf2, 0xd0, 0xd8, 0xb4, 0xfa, 0x36, 0x76, 0x0c, 0x97, 0x3d, 0x63, 0x7c, 0x5d, 0x35, 0x44, 0x51, + 0xea, 0x80, 0x92, 0xe3, 0x08, 0x20, 0xd7, 0xf9, 0xf1, 0xb8, 0xf5, 0xfa, 0xb0, 0x3c, 0xb5, 0x31, + 0x0f, 0x73, 0x36, 0x07, 0xe4, 0x1e, 0x28, 0x5b, 0x50, 0x49, 0xf7, 0x3f, 0x9e, 0x59, 0x4b, 0xc9, + 0xcc, 0x7a, 0x03, 0x60, 0x26, 0xc0, 0x53, 0xbe, 0x83, 0xf9, 0x04, 0xc3, 0x42, 0xea, 0x2d, 0xc5, + 0x53, 0xef, 0xa8, 0xf6, 0x5b, 0x78, 0x34, 0x86, 0x58, 0xf4, 0x95, 0xbf, 0x75, 0x58, 0x0e, 0x24, + 0xf1, 0x1c, 0x28, 0x1a, 0xa7, 0x1d, 0x32, 0x3c, 0x61, 0xeb, 0xfd, 0x00, 0x1b, 0x2c, 0xca, 0x6c, + 0xd3, 0x9c, 0x60, 0x53, 0x00, 0xff, 0x06, 0x66, 0xa3, 0x52, 0x13, 0x5f, 0x26, 0x7f, 0x66, 0xef, + 0x94, 0x34, 0x36, 0x51, 0x2d, 0x76, 0xb3, 0x30, 0xb7, 0x82, 0xbb, 0x65, 0x21, 0x7a, 0xb7, 0x6c, + 0x4f, 0xf1, 0x03, 0xa6, 0x2a, 0xde, 0x2e, 0xcc, 0x52, 0x7e, 0xbf, 0xd4, 0x62, 0xf7, 0x0b, 0xc3, + 0xe2, 0x1d, 0x82, 0x17, 0x7f, 0xcd, 0xc0, 0x7c, 0xe2, 0x19, 0xcb, 0x2c, 0x37, 0x8d, 0xbe, 0xe1, + 0xdb, 0x51, 0x54, 0xfd, 0x06, 0xeb, 0x8d, 0xbe, 0x40, 0xfd, 0x06, 0xfa, 0x1e, 0xf2, 0xae, 0xe5, + 0xd0, 0x1d, 0x32, 0xf4, 0x8c, 0x28, 0xc5, 0x72, 0x88, 0x04, 0x78, 0xe3, 0xd0, 0x97, 0x56, 0x03, + 0x35, 0xf4, 0x0a, 0x64, 0xf6, 0xb9, 0xef, 0x68, 0x7c, 0xf1, 0x97, 0xd6, 0x56, 0x27, 0xc0, 0xf0, + 0xe4, 0xd5, 0x91, 0xaa, 0xf2, 0x19, 0xc8, 0x61, 0x3f, 0x2a, 0x01, 0xb4, 0x3b, 0x87, 0x9b, 0x9d, + 0xbd, 0x76, 0x77, 0x6f, 0xab, 0x3c, 0x85, 0x8a, 0x20, 0xb7, 0xc2, 0xa6, 0xa4, 0x3c, 0x86, 0x3c, + 0xb7, 0x03, 0xcd, 0x43, 0x71, 0x53, 0xed, 0xb4, 0x8e, 0xba, 0xfb, 0x7b, 0xbd, 0xa3, 0xee, 0x6e, + 0xa7, 0x3c, 0xb5, 0xf6, 0x0f, 0x80, 0x02, 0xe3, 0x68, 0xd3, 0x37, 0x00, 0x9d, 0x40, 0x51, 0x28, + 0xdf, 0x21, 0xf1, 0x74, 0x4b, 0x2b, 0x11, 0xd6, 0x94, 0x9b, 0x44, 0x78, 0x6e, 0xb9, 0x0b, 0x30, + 0x2a, 0xdb, 0xa1, 0xe5, 0xf8, 0x53, 0x22, 0x86, 0xb8, 0x32, 0x76, 0x9c, 0xc3, 0xfd, 0x04, 0x25, + 0xb1, 0x20, 0x85, 0xd2, 0x8c, 0x88, 0xbd, 0x25, 0x6b, 0x9f, 0xde, 0x28, 0xc3, 0xa1, 0x0f, 0xa0, + 0x10, 0xa9, 0xc0, 0xa1, 0x84, 0x29, 0x71, 0xd0, 0xfa, 0x78, 0x01, 0x8e, 0xd8, 0x82, 0x9c, 0x5f, + 0xee, 0x42, 0x62, 0xba, 0x2b, 0x14, 0xce, 0x6a, 0x9f, 0xa4, 0x8e, 0x71, 0x88, 0x13, 0x28, 0x0a, + 0xd5, 0xa5, 0x18, 0x2d, 0x69, 0xa5, 0xb3, 0x18, 0x2d, 0xe9, 0xc5, 0xa9, 0x43, 0x98, 0x8d, 0x56, + 0x6e, 0x50, 0x3d, 0xa1, 0x13, 0x2b, 0x31, 0xd5, 0x9e, 0xde, 0x20, 0x31, 0x22, 0x47, 0x2c, 0x6d, + 0xc4, 0xc8, 0x49, 0xad, 0xe0, 0xc4, 0xc8, 0x19, 0x53, 0x1b, 0xf9, 0x09, 0x4a, 0x62, 0x09, 0x00, + 0x4d, 0x50, 0x43, 0x88, 0x41, 0xa7, 0xd7, 0x10, 0xd0, 0x5b, 0x98, 0x8b, 0x55, 0x2e, 0xd0, 0x4d, + 0x7a, 0xee, 0x9d, 0xc0, 0xdf, 0x41, 0x25, 0xfd, 0xf5, 0x85, 0xee, 0xf0, 0xaa, 0xae, 0xfd, 0x7c, + 0x22, 0x59, 0x3e, 0x25, 0x85, 0x47, 0x63, 0x1e, 0x7c, 0x68, 0x12, 0x9c, 0xd0, 0xbf, 0xcf, 0x27, + 0x13, 0xe6, 0xb3, 0x12, 0x40, 0xc9, 0x07, 0x12, 0x9a, 0xf0, 0xb1, 0x55, 0xfb, 0xd9, 0xad, 0x72, + 0x7c, 0x1a, 0x1d, 0x1e, 0xa6, 0xbc, 0xf8, 0xd0, 0x6d, 0xfa, 0xee, 0x5d, 0x27, 0xda, 0xf8, 0xd5, + 0x9b, 0x6f, 0x75, 0x83, 0x5e, 0x5c, 0x9d, 0x36, 0xce, 0xac, 0x7e, 0xd3, 0x4b, 0x8f, 0x2d, 0x47, + 0x6f, 0x86, 0xff, 0xc5, 0xe8, 0x64, 0xd0, 0xb4, 0x4f, 0xbf, 0xd0, 0xad, 0x66, 0xda, 0x7f, 0x3a, + 0xa7, 0x39, 0x2f, 0x47, 0x5f, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x97, 0xce, 0xf9, 0x78, + 0xf2, 0x19, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2521,6 +2696,12 @@ type DataCatalogClient interface { UpdateArtifact(ctx context.Context, in *UpdateArtifactRequest, opts ...grpc.CallOption) (*UpdateArtifactResponse, error) // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. DeleteArtifact(ctx context.Context, in *DeleteArtifactRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error) + // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage. + // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times + // will not result in an error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts deleted, however the operation can simply be retried to remove the remaining entries. + DeleteArtifacts(ctx context.Context, in *DeleteArtifactsRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error) // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -2533,9 +2714,21 @@ type DataCatalogClient interface { // task B may take over the reservation, resulting in two tasks A and B running in parallel. So // a third task C may get the Artifact from A or B, whichever writes last. GetOrExtendReservation(ctx context.Context, in *GetOrExtendReservationRequest, opts ...grpc.CallOption) (*GetOrExtendReservationResponse, error) + // Attempts to get or extend reservations for multiple artifacts in a single operation. + // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a + // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release + // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error. + GetOrExtendReservations(ctx context.Context, in *GetOrExtendReservationsRequest, opts ...grpc.CallOption) (*GetOrExtendReservationsResponse, error) // Release the reservation when the task holding the spot fails so that the other tasks // can grab the spot. ReleaseReservation(ctx context.Context, in *ReleaseReservationRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error) + // Releases reservations for multiple artifacts in a single operation. + // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple + // times will not result in error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining + // reservations. + ReleaseReservations(ctx context.Context, in *ReleaseReservationsRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error) } type dataCatalogClient struct { @@ -2627,6 +2820,15 @@ func (c *dataCatalogClient) DeleteArtifact(ctx context.Context, in *DeleteArtifa return out, nil } +func (c *dataCatalogClient) DeleteArtifacts(ctx context.Context, in *DeleteArtifactsRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error) { + out := new(DeleteArtifactResponse) + err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/DeleteArtifacts", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *dataCatalogClient) GetOrExtendReservation(ctx context.Context, in *GetOrExtendReservationRequest, opts ...grpc.CallOption) (*GetOrExtendReservationResponse, error) { out := new(GetOrExtendReservationResponse) err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/GetOrExtendReservation", in, out, opts...) @@ -2636,6 +2838,15 @@ func (c *dataCatalogClient) GetOrExtendReservation(ctx context.Context, in *GetO return out, nil } +func (c *dataCatalogClient) GetOrExtendReservations(ctx context.Context, in *GetOrExtendReservationsRequest, opts ...grpc.CallOption) (*GetOrExtendReservationsResponse, error) { + out := new(GetOrExtendReservationsResponse) + err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/GetOrExtendReservations", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *dataCatalogClient) ReleaseReservation(ctx context.Context, in *ReleaseReservationRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error) { out := new(ReleaseReservationResponse) err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/ReleaseReservation", in, out, opts...) @@ -2645,6 +2856,15 @@ func (c *dataCatalogClient) ReleaseReservation(ctx context.Context, in *ReleaseR return out, nil } +func (c *dataCatalogClient) ReleaseReservations(ctx context.Context, in *ReleaseReservationsRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error) { + out := new(ReleaseReservationResponse) + err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/ReleaseReservations", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // DataCatalogServer is the server API for DataCatalog service. type DataCatalogServer interface { // Create a new Dataset. Datasets are unique based on the DatasetID. Datasets are logical groupings of artifacts. @@ -2667,6 +2887,12 @@ type DataCatalogServer interface { UpdateArtifact(context.Context, *UpdateArtifactRequest) (*UpdateArtifactResponse, error) // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage. DeleteArtifact(context.Context, *DeleteArtifactRequest) (*DeleteArtifactResponse, error) + // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage. + // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times + // will not result in an error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts deleted, however the operation can simply be retried to remove the remaining entries. + DeleteArtifacts(context.Context, *DeleteArtifactsRequest) (*DeleteArtifactResponse, error) // Attempts to get or extend a reservation for the corresponding artifact. If one already exists // (ie. another entity owns the reservation) then that reservation is retrieved. // Once you acquire a reservation, you need to periodically extend the reservation with an @@ -2679,9 +2905,21 @@ type DataCatalogServer interface { // task B may take over the reservation, resulting in two tasks A and B running in parallel. So // a third task C may get the Artifact from A or B, whichever writes last. GetOrExtendReservation(context.Context, *GetOrExtendReservationRequest) (*GetOrExtendReservationResponse, error) + // Attempts to get or extend reservations for multiple artifacts in a single operation. + // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a + // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release + // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error. + GetOrExtendReservations(context.Context, *GetOrExtendReservationsRequest) (*GetOrExtendReservationsResponse, error) // Release the reservation when the task holding the spot fails so that the other tasks // can grab the spot. ReleaseReservation(context.Context, *ReleaseReservationRequest) (*ReleaseReservationResponse, error) + // Releases reservations for multiple artifacts in a single operation. + // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple + // times will not result in error. + // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested + // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining + // reservations. + ReleaseReservations(context.Context, *ReleaseReservationsRequest) (*ReleaseReservationResponse, error) } // UnimplementedDataCatalogServer can be embedded to have forward compatible implementations. @@ -2715,12 +2953,21 @@ func (*UnimplementedDataCatalogServer) UpdateArtifact(ctx context.Context, req * func (*UnimplementedDataCatalogServer) DeleteArtifact(ctx context.Context, req *DeleteArtifactRequest) (*DeleteArtifactResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteArtifact not implemented") } +func (*UnimplementedDataCatalogServer) DeleteArtifacts(ctx context.Context, req *DeleteArtifactsRequest) (*DeleteArtifactResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteArtifacts not implemented") +} func (*UnimplementedDataCatalogServer) GetOrExtendReservation(ctx context.Context, req *GetOrExtendReservationRequest) (*GetOrExtendReservationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetOrExtendReservation not implemented") } +func (*UnimplementedDataCatalogServer) GetOrExtendReservations(ctx context.Context, req *GetOrExtendReservationsRequest) (*GetOrExtendReservationsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetOrExtendReservations not implemented") +} func (*UnimplementedDataCatalogServer) ReleaseReservation(ctx context.Context, req *ReleaseReservationRequest) (*ReleaseReservationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ReleaseReservation not implemented") } +func (*UnimplementedDataCatalogServer) ReleaseReservations(ctx context.Context, req *ReleaseReservationsRequest) (*ReleaseReservationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReleaseReservations not implemented") +} func RegisterDataCatalogServer(s *grpc.Server, srv DataCatalogServer) { s.RegisterService(&_DataCatalog_serviceDesc, srv) @@ -2888,6 +3135,24 @@ func _DataCatalog_DeleteArtifact_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } +func _DataCatalog_DeleteArtifacts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteArtifactsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DataCatalogServer).DeleteArtifacts(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/datacatalog.DataCatalog/DeleteArtifacts", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DataCatalogServer).DeleteArtifacts(ctx, req.(*DeleteArtifactsRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _DataCatalog_GetOrExtendReservation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetOrExtendReservationRequest) if err := dec(in); err != nil { @@ -2906,6 +3171,24 @@ func _DataCatalog_GetOrExtendReservation_Handler(srv interface{}, ctx context.Co return interceptor(ctx, in, info, handler) } +func _DataCatalog_GetOrExtendReservations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetOrExtendReservationsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DataCatalogServer).GetOrExtendReservations(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/datacatalog.DataCatalog/GetOrExtendReservations", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DataCatalogServer).GetOrExtendReservations(ctx, req.(*GetOrExtendReservationsRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _DataCatalog_ReleaseReservation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ReleaseReservationRequest) if err := dec(in); err != nil { @@ -2924,6 +3207,24 @@ func _DataCatalog_ReleaseReservation_Handler(srv interface{}, ctx context.Contex return interceptor(ctx, in, info, handler) } +func _DataCatalog_ReleaseReservations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ReleaseReservationsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DataCatalogServer).ReleaseReservations(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/datacatalog.DataCatalog/ReleaseReservations", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DataCatalogServer).ReleaseReservations(ctx, req.(*ReleaseReservationsRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _DataCatalog_serviceDesc = grpc.ServiceDesc{ ServiceName: "datacatalog.DataCatalog", HandlerType: (*DataCatalogServer)(nil), @@ -2964,14 +3265,26 @@ var _DataCatalog_serviceDesc = grpc.ServiceDesc{ MethodName: "DeleteArtifact", Handler: _DataCatalog_DeleteArtifact_Handler, }, + { + MethodName: "DeleteArtifacts", + Handler: _DataCatalog_DeleteArtifacts_Handler, + }, { MethodName: "GetOrExtendReservation", Handler: _DataCatalog_GetOrExtendReservation_Handler, }, + { + MethodName: "GetOrExtendReservations", + Handler: _DataCatalog_GetOrExtendReservations_Handler, + }, { MethodName: "ReleaseReservation", Handler: _DataCatalog_ReleaseReservation_Handler, }, + { + MethodName: "ReleaseReservations", + Handler: _DataCatalog_ReleaseReservations_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "flyteidl/datacatalog/datacatalog.proto", diff --git a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go index 547139a3f1..ffb0438ab1 100644 --- a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go @@ -1392,6 +1392,88 @@ var _ interface { ErrorName() string } = DeleteArtifactRequestValidationError{} +// Validate checks the field values on DeleteArtifactsRequest with the rules +// defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *DeleteArtifactsRequest) Validate() error { + if m == nil { + return nil + } + + for idx, item := range m.GetArtifacts() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DeleteArtifactsRequestValidationError{ + field: fmt.Sprintf("Artifacts[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// DeleteArtifactsRequestValidationError is the validation error returned by +// DeleteArtifactsRequest.Validate if the designated constraints aren't met. +type DeleteArtifactsRequestValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e DeleteArtifactsRequestValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e DeleteArtifactsRequestValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e DeleteArtifactsRequestValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e DeleteArtifactsRequestValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e DeleteArtifactsRequestValidationError) ErrorName() string { + return "DeleteArtifactsRequestValidationError" +} + +// Error satisfies the builtin error interface +func (e DeleteArtifactsRequestValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sDeleteArtifactsRequest.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = DeleteArtifactsRequestValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = DeleteArtifactsRequestValidationError{} + // Validate checks the field values on DeleteArtifactResponse with the rules // defined in the proto definition for this message. If any rules are // violated, an error is returned. @@ -1626,6 +1708,89 @@ var _ interface { ErrorName() string } = GetOrExtendReservationRequestValidationError{} +// Validate checks the field values on GetOrExtendReservationsRequest with the +// rules defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *GetOrExtendReservationsRequest) Validate() error { + if m == nil { + return nil + } + + for idx, item := range m.GetReservations() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GetOrExtendReservationsRequestValidationError{ + field: fmt.Sprintf("Reservations[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// GetOrExtendReservationsRequestValidationError is the validation error +// returned by GetOrExtendReservationsRequest.Validate if the designated +// constraints aren't met. +type GetOrExtendReservationsRequestValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e GetOrExtendReservationsRequestValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e GetOrExtendReservationsRequestValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e GetOrExtendReservationsRequestValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e GetOrExtendReservationsRequestValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e GetOrExtendReservationsRequestValidationError) ErrorName() string { + return "GetOrExtendReservationsRequestValidationError" +} + +// Error satisfies the builtin error interface +func (e GetOrExtendReservationsRequestValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sGetOrExtendReservationsRequest.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = GetOrExtendReservationsRequestValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = GetOrExtendReservationsRequestValidationError{} + // Validate checks the field values on Reservation with the rules defined in // the proto definition for this message. If any rules are violated, an error // is returned. @@ -1811,6 +1976,89 @@ var _ interface { ErrorName() string } = GetOrExtendReservationResponseValidationError{} +// Validate checks the field values on GetOrExtendReservationsResponse with the +// rules defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *GetOrExtendReservationsResponse) Validate() error { + if m == nil { + return nil + } + + for idx, item := range m.GetReservations() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GetOrExtendReservationsResponseValidationError{ + field: fmt.Sprintf("Reservations[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// GetOrExtendReservationsResponseValidationError is the validation error +// returned by GetOrExtendReservationsResponse.Validate if the designated +// constraints aren't met. +type GetOrExtendReservationsResponseValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e GetOrExtendReservationsResponseValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e GetOrExtendReservationsResponseValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e GetOrExtendReservationsResponseValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e GetOrExtendReservationsResponseValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e GetOrExtendReservationsResponseValidationError) ErrorName() string { + return "GetOrExtendReservationsResponseValidationError" +} + +// Error satisfies the builtin error interface +func (e GetOrExtendReservationsResponseValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sGetOrExtendReservationsResponse.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = GetOrExtendReservationsResponseValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = GetOrExtendReservationsResponseValidationError{} + // Validate checks the field values on ReleaseReservationRequest with the rules // defined in the proto definition for this message. If any rules are // violated, an error is returned. @@ -1890,6 +2138,88 @@ var _ interface { ErrorName() string } = ReleaseReservationRequestValidationError{} +// Validate checks the field values on ReleaseReservationsRequest with the +// rules defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *ReleaseReservationsRequest) Validate() error { + if m == nil { + return nil + } + + for idx, item := range m.GetReservations() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ReleaseReservationsRequestValidationError{ + field: fmt.Sprintf("Reservations[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// ReleaseReservationsRequestValidationError is the validation error returned +// by ReleaseReservationsRequest.Validate if the designated constraints aren't met. +type ReleaseReservationsRequestValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e ReleaseReservationsRequestValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e ReleaseReservationsRequestValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e ReleaseReservationsRequestValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e ReleaseReservationsRequestValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e ReleaseReservationsRequestValidationError) ErrorName() string { + return "ReleaseReservationsRequestValidationError" +} + +// Error satisfies the builtin error interface +func (e ReleaseReservationsRequestValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sReleaseReservationsRequest.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = ReleaseReservationsRequestValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = ReleaseReservationsRequestValidationError{} + // Validate checks the field values on ReleaseReservationResponse with the // rules defined in the proto definition for this message. If any rules are // violated, an error is returned. diff --git a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java index 550f06cb5c..2dc63aab6a 100644 --- a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java +++ b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java @@ -13484,27 +13484,72 @@ public datacatalog.Datacatalog.DeleteArtifactRequest getDefaultInstanceForType() } - public interface DeleteArtifactResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactResponse) + public interface DeleteArtifactsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactsRequest) com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + java.util.List + getArtifactsList(); + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + datacatalog.Datacatalog.DeleteArtifactRequest getArtifacts(int index); + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + int getArtifactsCount(); + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + java.util.List + getArtifactsOrBuilderList(); + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder getArtifactsOrBuilder( + int index); } /** * 
-   * Response message for deleting an Artifact.
+   * Request message for deleting multiple Artifacts and their associated ArtifactData.
    *
* - * Protobuf type {@code datacatalog.DeleteArtifactResponse} + * Protobuf type {@code datacatalog.DeleteArtifactsRequest} */ - public static final class DeleteArtifactResponse extends + public static final class DeleteArtifactsRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactResponse) - DeleteArtifactResponseOrBuilder { + // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactsRequest) + DeleteArtifactsRequestOrBuilder { private static final long serialVersionUID = 0L; - // Use DeleteArtifactResponse.newBuilder() to construct. - private DeleteArtifactResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use DeleteArtifactsRequest.newBuilder() to construct. + private DeleteArtifactsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private DeleteArtifactResponse() { + private DeleteArtifactsRequest() { + artifacts_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -13512,7 +13557,7 @@ private DeleteArtifactResponse() { getUnknownFields() { return this.unknownFields; } - private DeleteArtifactResponse( + private DeleteArtifactsRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -13520,6 +13565,7 @@ private DeleteArtifactResponse( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -13530,6 +13576,15 @@ private DeleteArtifactResponse( case 0: done = true; break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + artifacts_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + artifacts_.add( + input.readMessage(datacatalog.Datacatalog.DeleteArtifactRequest.parser(), extensionRegistry)); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -13545,21 +13600,79 @@ private DeleteArtifactResponse( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + artifacts_ = java.util.Collections.unmodifiableList(artifacts_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class); + datacatalog.Datacatalog.DeleteArtifactsRequest.class, datacatalog.Datacatalog.DeleteArtifactsRequest.Builder.class); + } + + public static final int ARTIFACTS_FIELD_NUMBER = 1; + private java.util.List artifacts_; + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public java.util.List getArtifactsList() { + return artifacts_; + } + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public java.util.List + getArtifactsOrBuilderList() { + return artifacts_; + } + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public int getArtifactsCount() { + return artifacts_.size(); + } + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public datacatalog.Datacatalog.DeleteArtifactRequest getArtifacts(int index) { + return artifacts_.get(index); + } + /** + * 
+     * List of deletion requests for artifacts to remove
+     *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder getArtifactsOrBuilder( + int index) { + return artifacts_.get(index); } private byte memoizedIsInitialized = -1; @@ -13576,6 +13689,9 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + for (int i = 0; i < artifacts_.size(); i++) { + output.writeMessage(1, artifacts_.get(i)); + } unknownFields.writeTo(output); } @@ -13585,6 +13701,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + for (int i = 0; i < artifacts_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, artifacts_.get(i)); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -13595,11 +13715,13 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactResponse)) { + if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactsRequest)) { return super.equals(obj); } - datacatalog.Datacatalog.DeleteArtifactResponse other = (datacatalog.Datacatalog.DeleteArtifactResponse) obj; + datacatalog.Datacatalog.DeleteArtifactsRequest other = (datacatalog.Datacatalog.DeleteArtifactsRequest) obj; + if (!getArtifactsList() + .equals(other.getArtifactsList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -13611,74 +13733,78 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (getArtifactsCount() > 0) { + hash = (37 * hash) + ARTIFACTS_FIELD_NUMBER; + hash = (53 * hash) + getArtifactsList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(byte[] data) + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(java.io.InputStream input) + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom(java.io.InputStream input) + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -13691,7 +13817,7 @@ public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactResponse prototype) { + public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -13708,29 +13834,29 @@ protected Builder newBuilderForType( } /** * 
-     * Response message for deleting an Artifact.
+     * Request message for deleting multiple Artifacts and their associated ArtifactData.
      *
* - * Protobuf type {@code datacatalog.DeleteArtifactResponse} + * Protobuf type {@code datacatalog.DeleteArtifactsRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactResponse) - datacatalog.Datacatalog.DeleteArtifactResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactsRequest) + datacatalog.Datacatalog.DeleteArtifactsRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class); + datacatalog.Datacatalog.DeleteArtifactsRequest.class, datacatalog.Datacatalog.DeleteArtifactsRequest.Builder.class); } - // Construct using datacatalog.Datacatalog.DeleteArtifactResponse.newBuilder() + // Construct using datacatalog.Datacatalog.DeleteArtifactsRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -13743,28 +13869,35 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getArtifactsFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); + if (artifactsBuilder_ == null) { + artifacts_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + artifactsBuilder_.clear(); + } return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_descriptor; } @java.lang.Override - public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() { - return datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance(); + public datacatalog.Datacatalog.DeleteArtifactsRequest getDefaultInstanceForType() { + return datacatalog.Datacatalog.DeleteArtifactsRequest.getDefaultInstance(); } @java.lang.Override - public datacatalog.Datacatalog.DeleteArtifactResponse build() { - datacatalog.Datacatalog.DeleteArtifactResponse result = buildPartial(); + public datacatalog.Datacatalog.DeleteArtifactsRequest build() { + datacatalog.Datacatalog.DeleteArtifactsRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -13772,8 +13905,18 @@ public datacatalog.Datacatalog.DeleteArtifactResponse build() { } @java.lang.Override - public datacatalog.Datacatalog.DeleteArtifactResponse buildPartial() { - datacatalog.Datacatalog.DeleteArtifactResponse result = new datacatalog.Datacatalog.DeleteArtifactResponse(this); + public datacatalog.Datacatalog.DeleteArtifactsRequest buildPartial() { + datacatalog.Datacatalog.DeleteArtifactsRequest result = new datacatalog.Datacatalog.DeleteArtifactsRequest(this); + int from_bitField0_ = bitField0_; + if (artifactsBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + artifacts_ = java.util.Collections.unmodifiableList(artifacts_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.artifacts_ = artifacts_; + } else { + result.artifacts_ = artifactsBuilder_.build(); + } onBuilt(); return result; } @@ -13812,16 +13955,42 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof datacatalog.Datacatalog.DeleteArtifactResponse) { - return mergeFrom((datacatalog.Datacatalog.DeleteArtifactResponse)other); + if (other instanceof datacatalog.Datacatalog.DeleteArtifactsRequest) { + return mergeFrom((datacatalog.Datacatalog.DeleteArtifactsRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactResponse other) { - if (other == datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance()) return this; + public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactsRequest other) { + if (other == datacatalog.Datacatalog.DeleteArtifactsRequest.getDefaultInstance()) return this; + if (artifactsBuilder_ == null) { + if (!other.artifacts_.isEmpty()) { + if (artifacts_.isEmpty()) { + artifacts_ = other.artifacts_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureArtifactsIsMutable(); + artifacts_.addAll(other.artifacts_); + } + onChanged(); + } + } else { + if (!other.artifacts_.isEmpty()) { + if (artifactsBuilder_.isEmpty()) { + artifactsBuilder_.dispose(); + artifactsBuilder_ = null; + artifacts_ = other.artifacts_; + bitField0_ = (bitField0_ & ~0x00000001); + artifactsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getArtifactsFieldBuilder() : null; + } else { + artifactsBuilder_.addAllMessages(other.artifacts_); + } + } + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -13837,11 +14006,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - datacatalog.Datacatalog.DeleteArtifactResponse parsedMessage = null; + datacatalog.Datacatalog.DeleteArtifactsRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (datacatalog.Datacatalog.DeleteArtifactResponse) e.getUnfinishedMessage(); + parsedMessage = (datacatalog.Datacatalog.DeleteArtifactsRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -13850,124 +14019,2805 @@ public Builder mergeFrom( } return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } + private int bitField0_; - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + private java.util.List artifacts_ = + java.util.Collections.emptyList(); + private void ensureArtifactsIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + artifacts_ = new java.util.ArrayList(artifacts_); + bitField0_ |= 0x00000001; + } } + private com.google.protobuf.RepeatedFieldBuilderV3< + datacatalog.Datacatalog.DeleteArtifactRequest, datacatalog.Datacatalog.DeleteArtifactRequest.Builder, datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder> artifactsBuilder_; - // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactResponse) - } - - // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactResponse) - private static final datacatalog.Datacatalog.DeleteArtifactResponse DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactResponse(); - } - - public static datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public DeleteArtifactResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DeleteArtifactResponse(input, extensionRegistry); + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public java.util.List getArtifactsList() { + if (artifactsBuilder_ == null) { + return java.util.Collections.unmodifiableList(artifacts_); + } else { + return artifactsBuilder_.getMessageList(); + } } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - - public interface ReservationIDOrBuilder extends - // @@protoc_insertion_point(interface_extends:datacatalog.ReservationID) - com.google.protobuf.MessageOrBuilder { + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public int getArtifactsCount() { + if (artifactsBuilder_ == null) { + return artifacts_.size(); + } else { + return artifactsBuilder_.getCount(); + } + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public datacatalog.Datacatalog.DeleteArtifactRequest getArtifacts(int index) { + if (artifactsBuilder_ == null) { + return artifacts_.get(index); + } else { + return artifactsBuilder_.getMessage(index); + } + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder setArtifacts( + int index, datacatalog.Datacatalog.DeleteArtifactRequest value) { + if (artifactsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureArtifactsIsMutable(); + artifacts_.set(index, value); + onChanged(); + } else { + artifactsBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder setArtifacts( + int index, datacatalog.Datacatalog.DeleteArtifactRequest.Builder builderForValue) { + if (artifactsBuilder_ == null) { + ensureArtifactsIsMutable(); + artifacts_.set(index, builderForValue.build()); + onChanged(); + } else { + artifactsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder addArtifacts(datacatalog.Datacatalog.DeleteArtifactRequest value) { + if (artifactsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureArtifactsIsMutable(); + artifacts_.add(value); + onChanged(); + } else { + artifactsBuilder_.addMessage(value); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder addArtifacts( + int index, datacatalog.Datacatalog.DeleteArtifactRequest value) { + if (artifactsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureArtifactsIsMutable(); + artifacts_.add(index, value); + onChanged(); + } else { + artifactsBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder addArtifacts( + datacatalog.Datacatalog.DeleteArtifactRequest.Builder builderForValue) { + if (artifactsBuilder_ == null) { + ensureArtifactsIsMutable(); + artifacts_.add(builderForValue.build()); + onChanged(); + } else { + artifactsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder addArtifacts( + int index, datacatalog.Datacatalog.DeleteArtifactRequest.Builder builderForValue) { + if (artifactsBuilder_ == null) { + ensureArtifactsIsMutable(); + artifacts_.add(index, builderForValue.build()); + onChanged(); + } else { + artifactsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder addAllArtifacts( + java.lang.Iterable values) { + if (artifactsBuilder_ == null) { + ensureArtifactsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, artifacts_); + onChanged(); + } else { + artifactsBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder clearArtifacts() { + if (artifactsBuilder_ == null) { + artifacts_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + artifactsBuilder_.clear(); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public Builder removeArtifacts(int index) { + if (artifactsBuilder_ == null) { + ensureArtifactsIsMutable(); + artifacts_.remove(index); + onChanged(); + } else { + artifactsBuilder_.remove(index); + } + return this; + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public datacatalog.Datacatalog.DeleteArtifactRequest.Builder getArtifactsBuilder( + int index) { + return getArtifactsFieldBuilder().getBuilder(index); + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder getArtifactsOrBuilder( + int index) { + if (artifactsBuilder_ == null) { + return artifacts_.get(index); } else { + return artifactsBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public java.util.List + getArtifactsOrBuilderList() { + if (artifactsBuilder_ != null) { + return artifactsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(artifacts_); + } + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public datacatalog.Datacatalog.DeleteArtifactRequest.Builder addArtifactsBuilder() { + return getArtifactsFieldBuilder().addBuilder( + datacatalog.Datacatalog.DeleteArtifactRequest.getDefaultInstance()); + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public datacatalog.Datacatalog.DeleteArtifactRequest.Builder addArtifactsBuilder( + int index) { + return getArtifactsFieldBuilder().addBuilder( + index, datacatalog.Datacatalog.DeleteArtifactRequest.getDefaultInstance()); + } + /** + * 
+       * List of deletion requests for artifacts to remove
+       *
+ * + * repeated .datacatalog.DeleteArtifactRequest artifacts = 1; + */ + public java.util.List + getArtifactsBuilderList() { + return getArtifactsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + datacatalog.Datacatalog.DeleteArtifactRequest, datacatalog.Datacatalog.DeleteArtifactRequest.Builder, datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder> + getArtifactsFieldBuilder() { + if (artifactsBuilder_ == null) { + artifactsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + datacatalog.Datacatalog.DeleteArtifactRequest, datacatalog.Datacatalog.DeleteArtifactRequest.Builder, datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder>( + artifacts_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + artifacts_ = null; + } + return artifactsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactsRequest) + } + + // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactsRequest) + private static final datacatalog.Datacatalog.DeleteArtifactsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactsRequest(); + } + + public static datacatalog.Datacatalog.DeleteArtifactsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public DeleteArtifactsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DeleteArtifactsRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface DeleteArtifactResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactResponse) + com.google.protobuf.MessageOrBuilder { + } + /** + * 
+   * Response message for deleting an Artifact.
+   *
+ * + * Protobuf type {@code datacatalog.DeleteArtifactResponse} + */ + public static final class DeleteArtifactResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactResponse) + DeleteArtifactResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use DeleteArtifactResponse.newBuilder() to construct. + private DeleteArtifactResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private DeleteArtifactResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private DeleteArtifactResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactResponse)) { + return super.equals(obj); + } + datacatalog.Datacatalog.DeleteArtifactResponse other = (datacatalog.Datacatalog.DeleteArtifactResponse) obj; + + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * Response message for deleting an Artifact.
+     *
+ * + * Protobuf type {@code datacatalog.DeleteArtifactResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactResponse) + datacatalog.Datacatalog.DeleteArtifactResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class); + } + + // Construct using datacatalog.Datacatalog.DeleteArtifactResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() { + return datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance(); + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse build() { + datacatalog.Datacatalog.DeleteArtifactResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse buildPartial() { + datacatalog.Datacatalog.DeleteArtifactResponse result = new datacatalog.Datacatalog.DeleteArtifactResponse(this); + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof datacatalog.Datacatalog.DeleteArtifactResponse) { + return mergeFrom((datacatalog.Datacatalog.DeleteArtifactResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactResponse other) { + if (other == datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance()) return this; + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + datacatalog.Datacatalog.DeleteArtifactResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (datacatalog.Datacatalog.DeleteArtifactResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactResponse) + } + + // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactResponse) + private static final datacatalog.Datacatalog.DeleteArtifactResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactResponse(); + } + + public static datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public DeleteArtifactResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DeleteArtifactResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface ReservationIDOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.ReservationID) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * The unique ID for the reserved dataset
+     *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + boolean hasDatasetId(); + /** + * 
+     * The unique ID for the reserved dataset
+     *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + datacatalog.Datacatalog.DatasetID getDatasetId(); + /** + * 
+     * The unique ID for the reserved dataset
+     *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder(); + + /** + * 
+     * The specific artifact tag for the reservation
+     *
+ * + * string tag_name = 2; + */ + java.lang.String getTagName(); + /** + * 
+     * The specific artifact tag for the reservation
+     *
+ * + * string tag_name = 2; + */ + com.google.protobuf.ByteString + getTagNameBytes(); + } + /** + * 
+   * ReservationID message that is composed of several string fields.
+   *
+ * + * Protobuf type {@code datacatalog.ReservationID} + */ + public static final class ReservationID extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:datacatalog.ReservationID) + ReservationIDOrBuilder { + private static final long serialVersionUID = 0L; + // Use ReservationID.newBuilder() to construct. + private ReservationID(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ReservationID() { + tagName_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ReservationID( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + datacatalog.Datacatalog.DatasetID.Builder subBuilder = null; + if (datasetId_ != null) { + subBuilder = datasetId_.toBuilder(); + } + datasetId_ = input.readMessage(datacatalog.Datacatalog.DatasetID.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(datasetId_); + datasetId_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + tagName_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class); + } + + public static final int DATASET_ID_FIELD_NUMBER = 1; + private datacatalog.Datacatalog.DatasetID datasetId_; + /** + * 
+     * The unique ID for the reserved dataset
+     *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public boolean hasDatasetId() { + return datasetId_ != null; + } + /** + * 
+     * The unique ID for the reserved dataset
+     *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public datacatalog.Datacatalog.DatasetID getDatasetId() { + return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_; + } + /** + * 
+     * The unique ID for the reserved dataset
+     *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() { + return getDatasetId(); + } + + public static final int TAG_NAME_FIELD_NUMBER = 2; + private volatile java.lang.Object tagName_; + /** + * 
+     * The specific artifact tag for the reservation
+     *
+ * + * string tag_name = 2; + */ + public java.lang.String getTagName() { + java.lang.Object ref = tagName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + tagName_ = s; + return s; + } + } + /** + * 
+     * The specific artifact tag for the reservation
+     *
+ * + * string tag_name = 2; + */ + public com.google.protobuf.ByteString + getTagNameBytes() { + java.lang.Object ref = tagName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + tagName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (datasetId_ != null) { + output.writeMessage(1, getDatasetId()); + } + if (!getTagNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, tagName_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (datasetId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getDatasetId()); + } + if (!getTagNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, tagName_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof datacatalog.Datacatalog.ReservationID)) { + return super.equals(obj); + } + datacatalog.Datacatalog.ReservationID other = (datacatalog.Datacatalog.ReservationID) obj; + + if (hasDatasetId() != other.hasDatasetId()) return false; + if (hasDatasetId()) { + if (!getDatasetId() + .equals(other.getDatasetId())) return false; + } + if (!getTagName() + .equals(other.getTagName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasDatasetId()) { + hash = (37 * hash) + DATASET_ID_FIELD_NUMBER; + hash = (53 * hash) + getDatasetId().hashCode(); + } + hash = (37 * hash) + TAG_NAME_FIELD_NUMBER; + hash = (53 * hash) + getTagName().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static datacatalog.Datacatalog.ReservationID parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.ReservationID parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.ReservationID parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.ReservationID parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.ReservationID parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.ReservationID parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.ReservationID parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.ReservationID parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.ReservationID parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.ReservationID parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(datacatalog.Datacatalog.ReservationID prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * ReservationID message that is composed of several string fields.
+     *
+ * + * Protobuf type {@code datacatalog.ReservationID} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:datacatalog.ReservationID) + datacatalog.Datacatalog.ReservationIDOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class); + } + + // Construct using datacatalog.Datacatalog.ReservationID.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (datasetIdBuilder_ == null) { + datasetId_ = null; + } else { + datasetId_ = null; + datasetIdBuilder_ = null; + } + tagName_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor; + } + + @java.lang.Override + public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() { + return datacatalog.Datacatalog.ReservationID.getDefaultInstance(); + } + + @java.lang.Override + public datacatalog.Datacatalog.ReservationID build() { + datacatalog.Datacatalog.ReservationID result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public datacatalog.Datacatalog.ReservationID buildPartial() { + datacatalog.Datacatalog.ReservationID result = new datacatalog.Datacatalog.ReservationID(this); + if (datasetIdBuilder_ == null) { + result.datasetId_ = datasetId_; + } else { + result.datasetId_ = datasetIdBuilder_.build(); + } + result.tagName_ = tagName_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof datacatalog.Datacatalog.ReservationID) { + return mergeFrom((datacatalog.Datacatalog.ReservationID)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(datacatalog.Datacatalog.ReservationID other) { + if (other == datacatalog.Datacatalog.ReservationID.getDefaultInstance()) return this; + if (other.hasDatasetId()) { + mergeDatasetId(other.getDatasetId()); + } + if (!other.getTagName().isEmpty()) { + tagName_ = other.tagName_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + datacatalog.Datacatalog.ReservationID parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (datacatalog.Datacatalog.ReservationID) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private datacatalog.Datacatalog.DatasetID datasetId_; + private com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> datasetIdBuilder_; + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public boolean hasDatasetId() { + return datasetIdBuilder_ != null || datasetId_ != null; + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public datacatalog.Datacatalog.DatasetID getDatasetId() { + if (datasetIdBuilder_ == null) { + return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_; + } else { + return datasetIdBuilder_.getMessage(); + } + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public Builder setDatasetId(datacatalog.Datacatalog.DatasetID value) { + if (datasetIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + datasetId_ = value; + onChanged(); + } else { + datasetIdBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public Builder setDatasetId( + datacatalog.Datacatalog.DatasetID.Builder builderForValue) { + if (datasetIdBuilder_ == null) { + datasetId_ = builderForValue.build(); + onChanged(); + } else { + datasetIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public Builder mergeDatasetId(datacatalog.Datacatalog.DatasetID value) { + if (datasetIdBuilder_ == null) { + if (datasetId_ != null) { + datasetId_ = + datacatalog.Datacatalog.DatasetID.newBuilder(datasetId_).mergeFrom(value).buildPartial(); + } else { + datasetId_ = value; + } + onChanged(); + } else { + datasetIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public Builder clearDatasetId() { + if (datasetIdBuilder_ == null) { + datasetId_ = null; + onChanged(); + } else { + datasetId_ = null; + datasetIdBuilder_ = null; + } + + return this; + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public datacatalog.Datacatalog.DatasetID.Builder getDatasetIdBuilder() { + + onChanged(); + return getDatasetIdFieldBuilder().getBuilder(); + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() { + if (datasetIdBuilder_ != null) { + return datasetIdBuilder_.getMessageOrBuilder(); + } else { + return datasetId_ == null ? + datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_; + } + } + /** + * 
+       * The unique ID for the reserved dataset
+       *
+ * + * .datacatalog.DatasetID dataset_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> + getDatasetIdFieldBuilder() { + if (datasetIdBuilder_ == null) { + datasetIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder>( + getDatasetId(), + getParentForChildren(), + isClean()); + datasetId_ = null; + } + return datasetIdBuilder_; + } + + private java.lang.Object tagName_ = ""; + /** + * 
+       * The specific artifact tag for the reservation
+       *
+ * + * string tag_name = 2; + */ + public java.lang.String getTagName() { + java.lang.Object ref = tagName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + tagName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * The specific artifact tag for the reservation
+       *
+ * + * string tag_name = 2; + */ + public com.google.protobuf.ByteString + getTagNameBytes() { + java.lang.Object ref = tagName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + tagName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * The specific artifact tag for the reservation
+       *
+ * + * string tag_name = 2; + */ + public Builder setTagName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + tagName_ = value; + onChanged(); + return this; + } + /** + * 
+       * The specific artifact tag for the reservation
+       *
+ * + * string tag_name = 2; + */ + public Builder clearTagName() { + + tagName_ = getDefaultInstance().getTagName(); + onChanged(); + return this; + } + /** + * 
+       * The specific artifact tag for the reservation
+       *
+ * + * string tag_name = 2; + */ + public Builder setTagNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + tagName_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:datacatalog.ReservationID) + } + + // @@protoc_insertion_point(class_scope:datacatalog.ReservationID) + private static final datacatalog.Datacatalog.ReservationID DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReservationID(); + } + + public static datacatalog.Datacatalog.ReservationID getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ReservationID parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReservationID(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface GetOrExtendReservationRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + boolean hasReservationId(); + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + datacatalog.Datacatalog.ReservationID getReservationId(); + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder(); + + /** + * 
+     * The unique ID of the owner for the reservation
+     *
+ * + * string owner_id = 2; + */ + java.lang.String getOwnerId(); + /** + * 
+     * The unique ID of the owner for the reservation
+     *
+ * + * string owner_id = 2; + */ + com.google.protobuf.ByteString + getOwnerIdBytes(); + + /** + * 
+     * Requested reservation extension heartbeat interval
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + boolean hasHeartbeatInterval(); + /** + * 
+     * Requested reservation extension heartbeat interval
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + com.google.protobuf.Duration getHeartbeatInterval(); + /** + * 
+     * Requested reservation extension heartbeat interval
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder(); + } + /** + * 
+   * Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance.
+   *
+ * + * Protobuf type {@code datacatalog.GetOrExtendReservationRequest} + */ + public static final class GetOrExtendReservationRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationRequest) + GetOrExtendReservationRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use GetOrExtendReservationRequest.newBuilder() to construct. + private GetOrExtendReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GetOrExtendReservationRequest() { + ownerId_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private GetOrExtendReservationRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + datacatalog.Datacatalog.ReservationID.Builder subBuilder = null; + if (reservationId_ != null) { + subBuilder = reservationId_.toBuilder(); + } + reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(reservationId_); + reservationId_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + ownerId_ = s; + break; + } + case 26: { + com.google.protobuf.Duration.Builder subBuilder = null; + if (heartbeatInterval_ != null) { + subBuilder = heartbeatInterval_.toBuilder(); + } + heartbeatInterval_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(heartbeatInterval_); + heartbeatInterval_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class); + } + + public static final int RESERVATION_ID_FIELD_NUMBER = 1; + private datacatalog.Datacatalog.ReservationID reservationId_; + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public boolean hasReservationId() { + return reservationId_ != null; + } + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public datacatalog.Datacatalog.ReservationID getReservationId() { + return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_; + } + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() { + return getReservationId(); + } + + public static final int OWNER_ID_FIELD_NUMBER = 2; + private volatile java.lang.Object ownerId_; + /** + * 
+     * The unique ID of the owner for the reservation
+     *
+ * + * string owner_id = 2; + */ + public java.lang.String getOwnerId() { + java.lang.Object ref = ownerId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + ownerId_ = s; + return s; + } + } + /** + * 
+     * The unique ID of the owner for the reservation
+     *
+ * + * string owner_id = 2; + */ + public com.google.protobuf.ByteString + getOwnerIdBytes() { + java.lang.Object ref = ownerId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + ownerId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int HEARTBEAT_INTERVAL_FIELD_NUMBER = 3; + private com.google.protobuf.Duration heartbeatInterval_; + /** + * 
+     * Requested reservation extension heartbeat interval
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public boolean hasHeartbeatInterval() { + return heartbeatInterval_ != null; + } + /** + * 
+     * Requested reservation extension heartbeat interval
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public com.google.protobuf.Duration getHeartbeatInterval() { + return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_; + } + /** + * 
+     * Requested reservation extension heartbeat interval
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() { + return getHeartbeatInterval(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (reservationId_ != null) { + output.writeMessage(1, getReservationId()); + } + if (!getOwnerIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_); + } + if (heartbeatInterval_ != null) { + output.writeMessage(3, getHeartbeatInterval()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (reservationId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getReservationId()); + } + if (!getOwnerIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_); + } + if (heartbeatInterval_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getHeartbeatInterval()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest)) { + return super.equals(obj); + } + datacatalog.Datacatalog.GetOrExtendReservationRequest other = (datacatalog.Datacatalog.GetOrExtendReservationRequest) obj; + + if (hasReservationId() != other.hasReservationId()) return false; + if (hasReservationId()) { + if (!getReservationId() + .equals(other.getReservationId())) return false; + } + if (!getOwnerId() + .equals(other.getOwnerId())) return false; + if (hasHeartbeatInterval() != other.hasHeartbeatInterval()) return false; + if (hasHeartbeatInterval()) { + if (!getHeartbeatInterval() + .equals(other.getHeartbeatInterval())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasReservationId()) { + hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER; + hash = (53 * hash) + getReservationId().hashCode(); + } + hash = (37 * hash) + OWNER_ID_FIELD_NUMBER; + hash = (53 * hash) + getOwnerId().hashCode(); + if (hasHeartbeatInterval()) { + hash = (37 * hash) + HEARTBEAT_INTERVAL_FIELD_NUMBER; + hash = (53 * hash) + getHeartbeatInterval().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance.
+     *
+ * + * Protobuf type {@code datacatalog.GetOrExtendReservationRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationRequest) + datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class); + } + + // Construct using datacatalog.Datacatalog.GetOrExtendReservationRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (reservationIdBuilder_ == null) { + reservationId_ = null; + } else { + reservationId_ = null; + reservationIdBuilder_ = null; + } + ownerId_ = ""; + + if (heartbeatIntervalBuilder_ == null) { + heartbeatInterval_ = null; + } else { + heartbeatInterval_ = null; + heartbeatIntervalBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor; + } + + @java.lang.Override + public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() { + return datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance(); + } + + @java.lang.Override + public datacatalog.Datacatalog.GetOrExtendReservationRequest build() { + datacatalog.Datacatalog.GetOrExtendReservationRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public datacatalog.Datacatalog.GetOrExtendReservationRequest buildPartial() { + datacatalog.Datacatalog.GetOrExtendReservationRequest result = new datacatalog.Datacatalog.GetOrExtendReservationRequest(this); + if (reservationIdBuilder_ == null) { + result.reservationId_ = reservationId_; + } else { + result.reservationId_ = reservationIdBuilder_.build(); + } + result.ownerId_ = ownerId_; + if (heartbeatIntervalBuilder_ == null) { + result.heartbeatInterval_ = heartbeatInterval_; + } else { + result.heartbeatInterval_ = heartbeatIntervalBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest) { + return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationRequest other) { + if (other == datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance()) return this; + if (other.hasReservationId()) { + mergeReservationId(other.getReservationId()); + } + if (!other.getOwnerId().isEmpty()) { + ownerId_ = other.ownerId_; + onChanged(); + } + if (other.hasHeartbeatInterval()) { + mergeHeartbeatInterval(other.getHeartbeatInterval()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + datacatalog.Datacatalog.GetOrExtendReservationRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private datacatalog.Datacatalog.ReservationID reservationId_; + private com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_; + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public boolean hasReservationId() { + return reservationIdBuilder_ != null || reservationId_ != null; + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public datacatalog.Datacatalog.ReservationID getReservationId() { + if (reservationIdBuilder_ == null) { + return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_; + } else { + return reservationIdBuilder_.getMessage(); + } + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) { + if (reservationIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + reservationId_ = value; + onChanged(); + } else { + reservationIdBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public Builder setReservationId( + datacatalog.Datacatalog.ReservationID.Builder builderForValue) { + if (reservationIdBuilder_ == null) { + reservationId_ = builderForValue.build(); + onChanged(); + } else { + reservationIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) { + if (reservationIdBuilder_ == null) { + if (reservationId_ != null) { + reservationId_ = + datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial(); + } else { + reservationId_ = value; + } + onChanged(); + } else { + reservationIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public Builder clearReservationId() { + if (reservationIdBuilder_ == null) { + reservationId_ = null; + onChanged(); + } else { + reservationId_ = null; + reservationIdBuilder_ = null; + } + + return this; + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() { + + onChanged(); + return getReservationIdFieldBuilder().getBuilder(); + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() { + if (reservationIdBuilder_ != null) { + return reservationIdBuilder_.getMessageOrBuilder(); + } else { + return reservationId_ == null ? + datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_; + } + } + /** + * 
+       * The unique ID for the reservation
+       *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> + getReservationIdFieldBuilder() { + if (reservationIdBuilder_ == null) { + reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>( + getReservationId(), + getParentForChildren(), + isClean()); + reservationId_ = null; + } + return reservationIdBuilder_; + } + + private java.lang.Object ownerId_ = ""; + /** + * 
+       * The unique ID of the owner for the reservation
+       *
+ * + * string owner_id = 2; + */ + public java.lang.String getOwnerId() { + java.lang.Object ref = ownerId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + ownerId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * The unique ID of the owner for the reservation
+       *
+ * + * string owner_id = 2; + */ + public com.google.protobuf.ByteString + getOwnerIdBytes() { + java.lang.Object ref = ownerId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + ownerId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * The unique ID of the owner for the reservation
+       *
+ * + * string owner_id = 2; + */ + public Builder setOwnerId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + ownerId_ = value; + onChanged(); + return this; + } + /** + * 
+       * The unique ID of the owner for the reservation
+       *
+ * + * string owner_id = 2; + */ + public Builder clearOwnerId() { + + ownerId_ = getDefaultInstance().getOwnerId(); + onChanged(); + return this; + } + /** + * 
+       * The unique ID of the owner for the reservation
+       *
+ * + * string owner_id = 2; + */ + public Builder setOwnerIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + ownerId_ = value; + onChanged(); + return this; + } + + private com.google.protobuf.Duration heartbeatInterval_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_; + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public boolean hasHeartbeatInterval() { + return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null; + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public com.google.protobuf.Duration getHeartbeatInterval() { + if (heartbeatIntervalBuilder_ == null) { + return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_; + } else { + return heartbeatIntervalBuilder_.getMessage(); + } + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public Builder setHeartbeatInterval(com.google.protobuf.Duration value) { + if (heartbeatIntervalBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + heartbeatInterval_ = value; + onChanged(); + } else { + heartbeatIntervalBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public Builder setHeartbeatInterval( + com.google.protobuf.Duration.Builder builderForValue) { + if (heartbeatIntervalBuilder_ == null) { + heartbeatInterval_ = builderForValue.build(); + onChanged(); + } else { + heartbeatIntervalBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) { + if (heartbeatIntervalBuilder_ == null) { + if (heartbeatInterval_ != null) { + heartbeatInterval_ = + com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial(); + } else { + heartbeatInterval_ = value; + } + onChanged(); + } else { + heartbeatIntervalBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public Builder clearHeartbeatInterval() { + if (heartbeatIntervalBuilder_ == null) { + heartbeatInterval_ = null; + onChanged(); + } else { + heartbeatInterval_ = null; + heartbeatIntervalBuilder_ = null; + } + + return this; + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() { + + onChanged(); + return getHeartbeatIntervalFieldBuilder().getBuilder(); + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() { + if (heartbeatIntervalBuilder_ != null) { + return heartbeatIntervalBuilder_.getMessageOrBuilder(); + } else { + return heartbeatInterval_ == null ? + com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_; + } + } + /** + * 
+       * Requested reservation extension heartbeat interval
+       *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> + getHeartbeatIntervalFieldBuilder() { + if (heartbeatIntervalBuilder_ == null) { + heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>( + getHeartbeatInterval(), + getParentForChildren(), + isClean()); + heartbeatInterval_ = null; + } + return heartbeatIntervalBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationRequest) + } + + // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationRequest) + private static final datacatalog.Datacatalog.GetOrExtendReservationRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationRequest(); + } + + public static datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetOrExtendReservationRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GetOrExtendReservationRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface GetOrExtendReservationsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationsRequest) + com.google.protobuf.MessageOrBuilder { /** * 
-     * The unique ID for the reserved dataset
+     * List of reservation requests for artifacts to acquire
      *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - boolean hasDatasetId(); + java.util.List + getReservationsList(); /** * 
-     * The unique ID for the reserved dataset
+     * List of reservation requests for artifacts to acquire
      *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - datacatalog.Datacatalog.DatasetID getDatasetId(); + datacatalog.Datacatalog.GetOrExtendReservationRequest getReservations(int index); /** * 
-     * The unique ID for the reserved dataset
+     * List of reservation requests for artifacts to acquire
      *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder(); - + int getReservationsCount(); /** * 
-     * The specific artifact tag for the reservation
+     * List of reservation requests for artifacts to acquire
      *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - java.lang.String getTagName(); + java.util.List + getReservationsOrBuilderList(); /** * 
-     * The specific artifact tag for the reservation
+     * List of reservation requests for artifacts to acquire
      *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - com.google.protobuf.ByteString - getTagNameBytes(); + datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder getReservationsOrBuilder( + int index); } /** * 
-   * ReservationID message that is composed of several string fields.
+   * Request message for acquiring or extending reservations for multiple artifacts in a single operation.
    *
* - * Protobuf type {@code datacatalog.ReservationID} + * Protobuf type {@code datacatalog.GetOrExtendReservationsRequest} */ - public static final class ReservationID extends + public static final class GetOrExtendReservationsRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:datacatalog.ReservationID) - ReservationIDOrBuilder { + // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationsRequest) + GetOrExtendReservationsRequestOrBuilder { private static final long serialVersionUID = 0L; - // Use ReservationID.newBuilder() to construct. - private ReservationID(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use GetOrExtendReservationsRequest.newBuilder() to construct. + private GetOrExtendReservationsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private ReservationID() { - tagName_ = ""; + private GetOrExtendReservationsRequest() { + reservations_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -13975,7 +16825,7 @@ private ReservationID() { getUnknownFields() { return this.unknownFields; } - private ReservationID( + private GetOrExtendReservationsRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -13995,22 +16845,12 @@ private ReservationID( done = true; break; case 10: { - datacatalog.Datacatalog.DatasetID.Builder subBuilder = null; - if (datasetId_ != null) { - subBuilder = datasetId_.toBuilder(); - } - datasetId_ = input.readMessage(datacatalog.Datacatalog.DatasetID.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(datasetId_); - datasetId_ = subBuilder.buildPartial(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + reservations_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - - break; - } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - tagName_ = s; + reservations_.add( + input.readMessage(datacatalog.Datacatalog.GetOrExtendReservationRequest.parser(), extensionRegistry)); break; } default: { @@ -14028,96 +16868,79 @@ private ReservationID( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + reservations_ = java.util.Collections.unmodifiableList(reservations_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor; + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class); + datacatalog.Datacatalog.GetOrExtendReservationsRequest.class, datacatalog.Datacatalog.GetOrExtendReservationsRequest.Builder.class); } - public static final int DATASET_ID_FIELD_NUMBER = 1; - private datacatalog.Datacatalog.DatasetID datasetId_; + public static final int RESERVATIONS_FIELD_NUMBER = 1; + private java.util.List reservations_; /** * 
-     * The unique ID for the reserved dataset
+     * List of reservation requests for artifacts to acquire
      *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public boolean hasDatasetId() { - return datasetId_ != null; + public java.util.List getReservationsList() { + return reservations_; } /** * 
-     * The unique ID for the reserved dataset
+     * List of reservation requests for artifacts to acquire
      *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public datacatalog.Datacatalog.DatasetID getDatasetId() { - return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_; + public java.util.List + getReservationsOrBuilderList() { + return reservations_; } /** * 
-     * The unique ID for the reserved dataset
+     * List of reservation requests for artifacts to acquire
      *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() { - return getDatasetId(); + public int getReservationsCount() { + return reservations_.size(); } - - public static final int TAG_NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object tagName_; /** * 
-     * The specific artifact tag for the reservation
+     * List of reservation requests for artifacts to acquire
      *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public java.lang.String getTagName() { - java.lang.Object ref = tagName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - tagName_ = s; - return s; - } + public datacatalog.Datacatalog.GetOrExtendReservationRequest getReservations(int index) { + return reservations_.get(index); } /** * 
-     * The specific artifact tag for the reservation
+     * List of reservation requests for artifacts to acquire
      *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public com.google.protobuf.ByteString - getTagNameBytes() { - java.lang.Object ref = tagName_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - tagName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder getReservationsOrBuilder( + int index) { + return reservations_.get(index); } private byte memoizedIsInitialized = -1; @@ -14134,11 +16957,8 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (datasetId_ != null) { - output.writeMessage(1, getDatasetId()); - } - if (!getTagNameBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, tagName_); + for (int i = 0; i < reservations_.size(); i++) { + output.writeMessage(1, reservations_.get(i)); } unknownFields.writeTo(output); } @@ -14149,12 +16969,9 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (datasetId_ != null) { + for (int i = 0; i < reservations_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getDatasetId()); - } - if (!getTagNameBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, tagName_); + .computeMessageSize(1, reservations_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -14166,18 +16983,13 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof datacatalog.Datacatalog.ReservationID)) { + if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationsRequest)) { return super.equals(obj); } - datacatalog.Datacatalog.ReservationID other = (datacatalog.Datacatalog.ReservationID) obj; + datacatalog.Datacatalog.GetOrExtendReservationsRequest other = (datacatalog.Datacatalog.GetOrExtendReservationsRequest) obj; - if (hasDatasetId() != other.hasDatasetId()) return false; - if (hasDatasetId()) { - if (!getDatasetId() - .equals(other.getDatasetId())) return false; - } - if (!getTagName() - .equals(other.getTagName())) return false; + if (!getReservationsList() + .equals(other.getReservationsList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -14189,80 +17001,78 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasDatasetId()) { - hash = (37 * hash) + DATASET_ID_FIELD_NUMBER; - hash = (53 * hash) + getDatasetId().hashCode(); + if (getReservationsCount() > 0) { + hash = (37 * hash) + RESERVATIONS_FIELD_NUMBER; + hash = (53 * hash) + getReservationsList().hashCode(); } - hash = (37 * hash) + TAG_NAME_FIELD_NUMBER; - hash = (53 * hash) + getTagName().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static datacatalog.Datacatalog.ReservationID parseFrom(byte[] data) + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static datacatalog.Datacatalog.ReservationID parseFrom(java.io.InputStream input) + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom(java.io.InputStream input) + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static datacatalog.Datacatalog.ReservationID parseFrom( + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14275,7 +17085,7 @@ public static datacatalog.Datacatalog.ReservationID parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(datacatalog.Datacatalog.ReservationID prototype) { + public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -14292,29 +17102,29 @@ protected Builder newBuilderForType( } /** * 
-     * ReservationID message that is composed of several string fields.
+     * Request message for acquiring or extending reservations for multiple artifacts in a single operation.
      *
* - * Protobuf type {@code datacatalog.ReservationID} + * Protobuf type {@code datacatalog.GetOrExtendReservationsRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:datacatalog.ReservationID) - datacatalog.Datacatalog.ReservationIDOrBuilder { + // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationsRequest) + datacatalog.Datacatalog.GetOrExtendReservationsRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor; + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class); + datacatalog.Datacatalog.GetOrExtendReservationsRequest.class, datacatalog.Datacatalog.GetOrExtendReservationsRequest.Builder.class); } - // Construct using datacatalog.Datacatalog.ReservationID.newBuilder() + // Construct using datacatalog.Datacatalog.GetOrExtendReservationsRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -14327,36 +17137,35 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getReservationsFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (datasetIdBuilder_ == null) { - datasetId_ = null; + if (reservationsBuilder_ == null) { + reservations_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - datasetId_ = null; - datasetIdBuilder_ = null; + reservationsBuilder_.clear(); } - tagName_ = ""; - return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor; + return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor; } @java.lang.Override - public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() { - return datacatalog.Datacatalog.ReservationID.getDefaultInstance(); + public datacatalog.Datacatalog.GetOrExtendReservationsRequest getDefaultInstanceForType() { + return datacatalog.Datacatalog.GetOrExtendReservationsRequest.getDefaultInstance(); } @java.lang.Override - public datacatalog.Datacatalog.ReservationID build() { - datacatalog.Datacatalog.ReservationID result = buildPartial(); + public datacatalog.Datacatalog.GetOrExtendReservationsRequest build() { + datacatalog.Datacatalog.GetOrExtendReservationsRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -14364,14 +17173,18 @@ public datacatalog.Datacatalog.ReservationID build() { } @java.lang.Override - public datacatalog.Datacatalog.ReservationID buildPartial() { - datacatalog.Datacatalog.ReservationID result = new datacatalog.Datacatalog.ReservationID(this); - if (datasetIdBuilder_ == null) { - result.datasetId_ = datasetId_; + public datacatalog.Datacatalog.GetOrExtendReservationsRequest buildPartial() { + datacatalog.Datacatalog.GetOrExtendReservationsRequest result = new datacatalog.Datacatalog.GetOrExtendReservationsRequest(this); + int from_bitField0_ = bitField0_; + if (reservationsBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + reservations_ = java.util.Collections.unmodifiableList(reservations_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.reservations_ = reservations_; } else { - result.datasetId_ = datasetIdBuilder_.build(); + result.reservations_ = reservationsBuilder_.build(); } - result.tagName_ = tagName_; onBuilt(); return result; } @@ -14410,22 +17223,41 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof datacatalog.Datacatalog.ReservationID) { - return mergeFrom((datacatalog.Datacatalog.ReservationID)other); + if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationsRequest) { + return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationsRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(datacatalog.Datacatalog.ReservationID other) { - if (other == datacatalog.Datacatalog.ReservationID.getDefaultInstance()) return this; - if (other.hasDatasetId()) { - mergeDatasetId(other.getDatasetId()); - } - if (!other.getTagName().isEmpty()) { - tagName_ = other.tagName_; - onChanged(); + public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationsRequest other) { + if (other == datacatalog.Datacatalog.GetOrExtendReservationsRequest.getDefaultInstance()) return this; + if (reservationsBuilder_ == null) { + if (!other.reservations_.isEmpty()) { + if (reservations_.isEmpty()) { + reservations_ = other.reservations_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureReservationsIsMutable(); + reservations_.addAll(other.reservations_); + } + onChanged(); + } + } else { + if (!other.reservations_.isEmpty()) { + if (reservationsBuilder_.isEmpty()) { + reservationsBuilder_.dispose(); + reservationsBuilder_ = null; + reservations_ = other.reservations_; + bitField0_ = (bitField0_ & ~0x00000001); + reservationsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getReservationsFieldBuilder() : null; + } else { + reservationsBuilder_.addAllMessages(other.reservations_); + } + } } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -14442,11 +17274,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - datacatalog.Datacatalog.ReservationID parsedMessage = null; + datacatalog.Datacatalog.GetOrExtendReservationsRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (datacatalog.Datacatalog.ReservationID) e.getUnfinishedMessage(); + parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationsRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -14455,247 +17287,318 @@ public Builder mergeFrom( } return this; } + private int bitField0_; + + private java.util.List reservations_ = + java.util.Collections.emptyList(); + private void ensureReservationsIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + reservations_ = new java.util.ArrayList(reservations_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + datacatalog.Datacatalog.GetOrExtendReservationRequest, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder, datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder> reservationsBuilder_; - private datacatalog.Datacatalog.DatasetID datasetId_; - private com.google.protobuf.SingleFieldBuilderV3< - datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> datasetIdBuilder_; /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public boolean hasDatasetId() { - return datasetIdBuilder_ != null || datasetId_ != null; + public java.util.List getReservationsList() { + if (reservationsBuilder_ == null) { + return java.util.Collections.unmodifiableList(reservations_); + } else { + return reservationsBuilder_.getMessageList(); + } } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public datacatalog.Datacatalog.DatasetID getDatasetId() { - if (datasetIdBuilder_ == null) { - return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_; + public int getReservationsCount() { + if (reservationsBuilder_ == null) { + return reservations_.size(); } else { - return datasetIdBuilder_.getMessage(); + return reservationsBuilder_.getCount(); } } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public Builder setDatasetId(datacatalog.Datacatalog.DatasetID value) { - if (datasetIdBuilder_ == null) { + public datacatalog.Datacatalog.GetOrExtendReservationRequest getReservations(int index) { + if (reservationsBuilder_ == null) { + return reservations_.get(index); + } else { + return reservationsBuilder_.getMessage(index); + } + } + /** + * 
+       * List of reservation requests for artifacts to acquire
+       *
+ * + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + */ + public Builder setReservations( + int index, datacatalog.Datacatalog.GetOrExtendReservationRequest value) { + if (reservationsBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - datasetId_ = value; + ensureReservationsIsMutable(); + reservations_.set(index, value); onChanged(); } else { - datasetIdBuilder_.setMessage(value); + reservationsBuilder_.setMessage(index, value); } - return this; } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public Builder setDatasetId( - datacatalog.Datacatalog.DatasetID.Builder builderForValue) { - if (datasetIdBuilder_ == null) { - datasetId_ = builderForValue.build(); + public Builder setReservations( + int index, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder builderForValue) { + if (reservationsBuilder_ == null) { + ensureReservationsIsMutable(); + reservations_.set(index, builderForValue.build()); onChanged(); } else { - datasetIdBuilder_.setMessage(builderForValue.build()); + reservationsBuilder_.setMessage(index, builderForValue.build()); } - return this; } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public Builder mergeDatasetId(datacatalog.Datacatalog.DatasetID value) { - if (datasetIdBuilder_ == null) { - if (datasetId_ != null) { - datasetId_ = - datacatalog.Datacatalog.DatasetID.newBuilder(datasetId_).mergeFrom(value).buildPartial(); - } else { - datasetId_ = value; + public Builder addReservations(datacatalog.Datacatalog.GetOrExtendReservationRequest value) { + if (reservationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } + ensureReservationsIsMutable(); + reservations_.add(value); onChanged(); } else { - datasetIdBuilder_.mergeFrom(value); + reservationsBuilder_.addMessage(value); } - return this; } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public Builder clearDatasetId() { - if (datasetIdBuilder_ == null) { - datasetId_ = null; + public Builder addReservations( + int index, datacatalog.Datacatalog.GetOrExtendReservationRequest value) { + if (reservationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureReservationsIsMutable(); + reservations_.add(index, value); onChanged(); } else { - datasetId_ = null; - datasetIdBuilder_ = null; + reservationsBuilder_.addMessage(index, value); } - return this; } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public datacatalog.Datacatalog.DatasetID.Builder getDatasetIdBuilder() { - - onChanged(); - return getDatasetIdFieldBuilder().getBuilder(); + public Builder addReservations( + datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder builderForValue) { + if (reservationsBuilder_ == null) { + ensureReservationsIsMutable(); + reservations_.add(builderForValue.build()); + onChanged(); + } else { + reservationsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+       * List of reservation requests for artifacts to acquire
+       *
+ * + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + */ + public Builder addReservations( + int index, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder builderForValue) { + if (reservationsBuilder_ == null) { + ensureReservationsIsMutable(); + reservations_.add(index, builderForValue.build()); + onChanged(); + } else { + reservationsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+       * List of reservation requests for artifacts to acquire
+       *
+ * + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + */ + public Builder addAllReservations( + java.lang.Iterable values) { + if (reservationsBuilder_ == null) { + ensureReservationsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, reservations_); + onChanged(); + } else { + reservationsBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+       * List of reservation requests for artifacts to acquire
+       *
+ * + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; + */ + public Builder clearReservations() { + if (reservationsBuilder_ == null) { + reservations_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + reservationsBuilder_.clear(); + } + return this; } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() { - if (datasetIdBuilder_ != null) { - return datasetIdBuilder_.getMessageOrBuilder(); + public Builder removeReservations(int index) { + if (reservationsBuilder_ == null) { + ensureReservationsIsMutable(); + reservations_.remove(index); + onChanged(); } else { - return datasetId_ == null ? - datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_; + reservationsBuilder_.remove(index); } + return this; } /** * 
-       * The unique ID for the reserved dataset
+       * List of reservation requests for artifacts to acquire
        *
* - * .datacatalog.DatasetID dataset_id = 1; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< - datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> - getDatasetIdFieldBuilder() { - if (datasetIdBuilder_ == null) { - datasetIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder>( - getDatasetId(), - getParentForChildren(), - isClean()); - datasetId_ = null; - } - return datasetIdBuilder_; + public datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder getReservationsBuilder( + int index) { + return getReservationsFieldBuilder().getBuilder(index); } - - private java.lang.Object tagName_ = ""; /** * 
-       * The specific artifact tag for the reservation
+       * List of reservation requests for artifacts to acquire
        *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public java.lang.String getTagName() { - java.lang.Object ref = tagName_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - tagName_ = s; - return s; - } else { - return (java.lang.String) ref; + public datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder getReservationsOrBuilder( + int index) { + if (reservationsBuilder_ == null) { + return reservations_.get(index); } else { + return reservationsBuilder_.getMessageOrBuilder(index); } } /** * 
-       * The specific artifact tag for the reservation
+       * List of reservation requests for artifacts to acquire
        *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public com.google.protobuf.ByteString - getTagNameBytes() { - java.lang.Object ref = tagName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - tagName_ = b; - return b; + public java.util.List + getReservationsOrBuilderList() { + if (reservationsBuilder_ != null) { + return reservationsBuilder_.getMessageOrBuilderList(); } else { - return (com.google.protobuf.ByteString) ref; + return java.util.Collections.unmodifiableList(reservations_); } } /** * 
-       * The specific artifact tag for the reservation
+       * List of reservation requests for artifacts to acquire
        *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public Builder setTagName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - tagName_ = value; - onChanged(); - return this; + public datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder addReservationsBuilder() { + return getReservationsFieldBuilder().addBuilder( + datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance()); } /** * 
-       * The specific artifact tag for the reservation
+       * List of reservation requests for artifacts to acquire
        *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public Builder clearTagName() { - - tagName_ = getDefaultInstance().getTagName(); - onChanged(); - return this; + public datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder addReservationsBuilder( + int index) { + return getReservationsFieldBuilder().addBuilder( + index, datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance()); } /** * 
-       * The specific artifact tag for the reservation
+       * List of reservation requests for artifacts to acquire
        *
* - * string tag_name = 2; + * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1; */ - public Builder setTagNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - tagName_ = value; - onChanged(); - return this; + public java.util.List + getReservationsBuilderList() { + return getReservationsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + datacatalog.Datacatalog.GetOrExtendReservationRequest, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder, datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder> + getReservationsFieldBuilder() { + if (reservationsBuilder_ == null) { + reservationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + datacatalog.Datacatalog.GetOrExtendReservationRequest, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder, datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder>( + reservations_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + reservations_ = null; + } + return reservationsBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -14703,57 +17606,311 @@ public final Builder setUnknownFields( return super.setUnknownFields(unknownFields); } - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationsRequest) + } + + // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsRequest) + private static final datacatalog.Datacatalog.GetOrExtendReservationsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationsRequest(); + } + + public static datacatalog.Datacatalog.GetOrExtendReservationsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetOrExtendReservationsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GetOrExtendReservationsRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public datacatalog.Datacatalog.GetOrExtendReservationsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface ReservationOrBuilder extends + // @@protoc_insertion_point(interface_extends:datacatalog.Reservation) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + boolean hasReservationId(); + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + datacatalog.Datacatalog.ReservationID getReservationId(); + /** + * 
+     * The unique ID for the reservation
+     *
+ * + * .datacatalog.ReservationID reservation_id = 1; + */ + datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder(); + + /** + * 
+     * The unique ID of the owner for the reservation
+     *
+ * + * string owner_id = 2; + */ + java.lang.String getOwnerId(); + /** + * 
+     * The unique ID of the owner for the reservation
+     *
+ * + * string owner_id = 2; + */ + com.google.protobuf.ByteString + getOwnerIdBytes(); + + /** + * 
+     * Recommended heartbeat interval to extend reservation
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + boolean hasHeartbeatInterval(); + /** + * 
+     * Recommended heartbeat interval to extend reservation
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + com.google.protobuf.Duration getHeartbeatInterval(); + /** + * 
+     * Recommended heartbeat interval to extend reservation
+     *
+ * + * .google.protobuf.Duration heartbeat_interval = 3; + */ + com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder(); + + /** + * 
+     * Expiration timestamp of this reservation
+     *
+ * + * .google.protobuf.Timestamp expires_at = 4; + */ + boolean hasExpiresAt(); + /** + * 
+     * Expiration timestamp of this reservation
+     *
+ * + * .google.protobuf.Timestamp expires_at = 4; + */ + com.google.protobuf.Timestamp getExpiresAt(); + /** + * 
+     * Expiration timestamp of this reservation
+     *
+ * + * .google.protobuf.Timestamp expires_at = 4; + */ + com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder(); + + /** + * 
+     * Free-form metadata associated with the artifact
+     *
+ * + * .datacatalog.Metadata metadata = 6; + */ + boolean hasMetadata(); + /** + * 
+     * Free-form metadata associated with the artifact
+     *
+ * + * .datacatalog.Metadata metadata = 6; + */ + datacatalog.Datacatalog.Metadata getMetadata(); + /** + * 
+     * Free-form metadata associated with the artifact
+     *
+ * + * .datacatalog.Metadata metadata = 6; + */ + datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder(); + } + /** + * 
+   * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
+   *
+ * + * Protobuf type {@code datacatalog.Reservation} + */ + public static final class Reservation extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:datacatalog.Reservation) + ReservationOrBuilder { + private static final long serialVersionUID = 0L; + // Use Reservation.newBuilder() to construct. + private Reservation(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Reservation() { + ownerId_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Reservation( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + datacatalog.Datacatalog.ReservationID.Builder subBuilder = null; + if (reservationId_ != null) { + subBuilder = reservationId_.toBuilder(); + } + reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(reservationId_); + reservationId_ = subBuilder.buildPartial(); + } + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); - // @@protoc_insertion_point(builder_scope:datacatalog.ReservationID) - } + ownerId_ = s; + break; + } + case 26: { + com.google.protobuf.Duration.Builder subBuilder = null; + if (heartbeatInterval_ != null) { + subBuilder = heartbeatInterval_.toBuilder(); + } + heartbeatInterval_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(heartbeatInterval_); + heartbeatInterval_ = subBuilder.buildPartial(); + } - // @@protoc_insertion_point(class_scope:datacatalog.ReservationID) - private static final datacatalog.Datacatalog.ReservationID DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReservationID(); - } + break; + } + case 34: { + com.google.protobuf.Timestamp.Builder subBuilder = null; + if (expiresAt_ != null) { + subBuilder = expiresAt_.toBuilder(); + } + expiresAt_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(expiresAt_); + expiresAt_ = subBuilder.buildPartial(); + } - public static datacatalog.Datacatalog.ReservationID getDefaultInstance() { - return DEFAULT_INSTANCE; - } + break; + } + case 50: { + datacatalog.Datacatalog.Metadata.Builder subBuilder = null; + if (metadata_ != null) { + subBuilder = metadata_.toBuilder(); + } + metadata_ = input.readMessage(datacatalog.Datacatalog.Metadata.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(metadata_); + metadata_ = subBuilder.buildPartial(); + } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public ReservationID parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ReservationID(input, extensionRegistry); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor; } @java.lang.Override - public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() { - return DEFAULT_INSTANCE; + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class); } - } - - public interface GetOrExtendReservationRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationRequest) - com.google.protobuf.MessageOrBuilder { - + public static final int RESERVATION_ID_FIELD_NUMBER = 1; + private datacatalog.Datacatalog.ReservationID reservationId_; /** * 
      * The unique ID for the reservation
@@ -14761,7 +17918,9 @@ public interface GetOrExtendReservationRequestOrBuilder extends
      *
      * .datacatalog.ReservationID reservation_id = 1;
      */
-    boolean hasReservationId();
+    public boolean hasReservationId() {
+      return reservationId_ != null;
+    }
     /**
      * 
      * The unique ID for the reservation
@@ -14769,7 +17928,9 @@ public interface GetOrExtendReservationRequestOrBuilder extends
      *
      * .datacatalog.ReservationID reservation_id = 1;
      */
-    datacatalog.Datacatalog.ReservationID getReservationId();
+    public datacatalog.Datacatalog.ReservationID getReservationId() {
+      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+    }
     /**
      * 
      * The unique ID for the reservation
@@ -14777,8 +17938,12 @@ public interface GetOrExtendReservationRequestOrBuilder extends
      *
      * .datacatalog.ReservationID reservation_id = 1;
      */
-    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
+    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+      return getReservationId();
+    }
 
+    public static final int OWNER_ID_FIELD_NUMBER = 2;
+    private volatile java.lang.Object ownerId_;
     /**
      * 
      * The unique ID of the owner for the reservation
@@ -14786,2626 +17951,2838 @@ public interface GetOrExtendReservationRequestOrBuilder extends
      *
      * string owner_id = 2;
      */
-    java.lang.String getOwnerId();
+    public java.lang.String getOwnerId() {
+      java.lang.Object ref = ownerId_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        ownerId_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    public com.google.protobuf.ByteString
+        getOwnerIdBytes() {
+      java.lang.Object ref = ownerId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        ownerId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int HEARTBEAT_INTERVAL_FIELD_NUMBER = 3;
+    private com.google.protobuf.Duration heartbeatInterval_;
+    /**
+     * 
+     * Recommended heartbeat interval to extend reservation
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    public boolean hasHeartbeatInterval() {
+      return heartbeatInterval_ != null;
+    }
+    /**
+     * 
+     * Recommended heartbeat interval to extend reservation
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    public com.google.protobuf.Duration getHeartbeatInterval() {
+      return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+    }
+    /**
+     * 
+     * Recommended heartbeat interval to extend reservation
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
+      return getHeartbeatInterval();
+    }
+
+    public static final int EXPIRES_AT_FIELD_NUMBER = 4;
+    private com.google.protobuf.Timestamp expiresAt_;
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    public boolean hasExpiresAt() {
+      return expiresAt_ != null;
+    }
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    public com.google.protobuf.Timestamp getExpiresAt() {
+      return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
+    }
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * Expiration timestamp of this reservation
      * 

      *
-     * string owner_id = 2;
+     * .google.protobuf.Timestamp expires_at = 4;
      */
-    com.google.protobuf.ByteString
-        getOwnerIdBytes();
+    public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
+      return getExpiresAt();
+    }
 
+    public static final int METADATA_FIELD_NUMBER = 6;
+    private datacatalog.Datacatalog.Metadata metadata_;
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Free-form metadata associated with the artifact
      * 

      *
-     * .google.protobuf.Duration heartbeat_interval = 3;
+     * .datacatalog.Metadata metadata = 6;
      */
-    boolean hasHeartbeatInterval();
+    public boolean hasMetadata() {
+      return metadata_ != null;
+    }
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Free-form metadata associated with the artifact
      * 

      *
-     * .google.protobuf.Duration heartbeat_interval = 3;
+     * .datacatalog.Metadata metadata = 6;
      */
-    com.google.protobuf.Duration getHeartbeatInterval();
+    public datacatalog.Datacatalog.Metadata getMetadata() {
+      return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
+    }
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Free-form metadata associated with the artifact
      * 

      *
-     * .google.protobuf.Duration heartbeat_interval = 3;
+     * .datacatalog.Metadata metadata = 6;
      */
-    com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder();
-  }
-  /**
-   * 
-   * Try to acquire or extend an artifact reservation. If an active reservation exists, retreive that instance.
-   * 

-   *
-   * Protobuf type {@code datacatalog.GetOrExtendReservationRequest}
-   */
-  public  static final class GetOrExtendReservationRequest extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationRequest)
-      GetOrExtendReservationRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use GetOrExtendReservationRequest.newBuilder() to construct.
-    private GetOrExtendReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
+    public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
+      return getMetadata();
     }
-    private GetOrExtendReservationRequest() {
-      ownerId_ = "";
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
     }
 
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (reservationId_ != null) {
+        output.writeMessage(1, getReservationId());
+      }
+      if (!getOwnerIdBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
+      }
+      if (heartbeatInterval_ != null) {
+        output.writeMessage(3, getHeartbeatInterval());
+      }
+      if (expiresAt_ != null) {
+        output.writeMessage(4, getExpiresAt());
+      }
+      if (metadata_ != null) {
+        output.writeMessage(6, getMetadata());
+      }
+      unknownFields.writeTo(output);
     }
-    private GetOrExtendReservationRequest(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (reservationId_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, getReservationId());
       }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
-              if (reservationId_ != null) {
-                subBuilder = reservationId_.toBuilder();
-              }
-              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(reservationId_);
-                reservationId_ = subBuilder.buildPartial();
-              }
+      if (!getOwnerIdBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
+      }
+      if (heartbeatInterval_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getHeartbeatInterval());
+      }
+      if (expiresAt_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getExpiresAt());
+      }
+      if (metadata_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, getMetadata());
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
 
-              break;
-            }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof datacatalog.Datacatalog.Reservation)) {
+        return super.equals(obj);
+      }
+      datacatalog.Datacatalog.Reservation other = (datacatalog.Datacatalog.Reservation) obj;
 
-              ownerId_ = s;
-              break;
-            }
-            case 26: {
-              com.google.protobuf.Duration.Builder subBuilder = null;
-              if (heartbeatInterval_ != null) {
-                subBuilder = heartbeatInterval_.toBuilder();
-              }
-              heartbeatInterval_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(heartbeatInterval_);
-                heartbeatInterval_ = subBuilder.buildPartial();
-              }
+      if (hasReservationId() != other.hasReservationId()) return false;
+      if (hasReservationId()) {
+        if (!getReservationId()
+            .equals(other.getReservationId())) return false;
+      }
+      if (!getOwnerId()
+          .equals(other.getOwnerId())) return false;
+      if (hasHeartbeatInterval() != other.hasHeartbeatInterval()) return false;
+      if (hasHeartbeatInterval()) {
+        if (!getHeartbeatInterval()
+            .equals(other.getHeartbeatInterval())) return false;
+      }
+      if (hasExpiresAt() != other.hasExpiresAt()) return false;
+      if (hasExpiresAt()) {
+        if (!getExpiresAt()
+            .equals(other.getExpiresAt())) return false;
+      }
+      if (hasMetadata() != other.hasMetadata()) return false;
+      if (hasMetadata()) {
+        if (!getMetadata()
+            .equals(other.getMetadata())) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
 
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasReservationId()) {
+        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
+        hash = (53 * hash) + getReservationId().hashCode();
+      }
+      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOwnerId().hashCode();
+      if (hasHeartbeatInterval()) {
+        hash = (37 * hash) + HEARTBEAT_INTERVAL_FIELD_NUMBER;
+        hash = (53 * hash) + getHeartbeatInterval().hashCode();
+      }
+      if (hasExpiresAt()) {
+        hash = (37 * hash) + EXPIRES_AT_FIELD_NUMBER;
+        hash = (53 * hash) + getExpiresAt().hashCode();
+      }
+      if (hasMetadata()) {
+        hash = (37 * hash) + METADATA_FIELD_NUMBER;
+        hash = (53 * hash) + getMetadata().hashCode();
       }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
+    public static datacatalog.Datacatalog.Reservation parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
     }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class);
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.Reservation parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.Reservation parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.ReservationID reservationId_;
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public boolean hasReservationId() {
-      return reservationId_ != null;
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
     }
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public datacatalog.Datacatalog.ReservationID getReservationId() {
-      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+    public static Builder newBuilder(datacatalog.Datacatalog.Reservation prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-      return getReservationId();
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    public static final int OWNER_ID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object ownerId_;
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
      * 

      *
-     * string owner_id = 2;
+     * Protobuf type {@code datacatalog.Reservation}
      */
-    public java.lang.String getOwnerId() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        ownerId_ = s;
-        return s;
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:datacatalog.Reservation)
+        datacatalog.Datacatalog.ReservationOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class);
+      }
+
+      // Construct using datacatalog.Datacatalog.Reservation.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
+        } else {
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
+        }
+        ownerId_ = "";
+
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatInterval_ = null;
+        } else {
+          heartbeatInterval_ = null;
+          heartbeatIntervalBuilder_ = null;
+        }
+        if (expiresAtBuilder_ == null) {
+          expiresAt_ = null;
+        } else {
+          expiresAt_ = null;
+          expiresAtBuilder_ = null;
+        }
+        if (metadataBuilder_ == null) {
+          metadata_ = null;
+        } else {
+          metadata_ = null;
+          metadataBuilder_ = null;
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
+      }
+
+      @java.lang.Override
+      public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.Reservation.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public datacatalog.Datacatalog.Reservation build() {
+        datacatalog.Datacatalog.Reservation result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public datacatalog.Datacatalog.Reservation buildPartial() {
+        datacatalog.Datacatalog.Reservation result = new datacatalog.Datacatalog.Reservation(this);
+        if (reservationIdBuilder_ == null) {
+          result.reservationId_ = reservationId_;
+        } else {
+          result.reservationId_ = reservationIdBuilder_.build();
+        }
+        result.ownerId_ = ownerId_;
+        if (heartbeatIntervalBuilder_ == null) {
+          result.heartbeatInterval_ = heartbeatInterval_;
+        } else {
+          result.heartbeatInterval_ = heartbeatIntervalBuilder_.build();
+        }
+        if (expiresAtBuilder_ == null) {
+          result.expiresAt_ = expiresAt_;
+        } else {
+          result.expiresAt_ = expiresAtBuilder_.build();
+        }
+        if (metadataBuilder_ == null) {
+          result.metadata_ = metadata_;
+        } else {
+          result.metadata_ = metadataBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
       }
-    }
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    public com.google.protobuf.ByteString
-        getOwnerIdBytes() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        ownerId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof datacatalog.Datacatalog.Reservation) {
+          return mergeFrom((datacatalog.Datacatalog.Reservation)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
       }
-    }
-
-    public static final int HEARTBEAT_INTERVAL_FIELD_NUMBER = 3;
-    private com.google.protobuf.Duration heartbeatInterval_;
-    /**
-     * 
-     * Requested reservation extension heartbeat interval
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public boolean hasHeartbeatInterval() {
-      return heartbeatInterval_ != null;
-    }
-    /**
-     * 
-     * Requested reservation extension heartbeat interval
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public com.google.protobuf.Duration getHeartbeatInterval() {
-      return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-    }
-    /**
-     * 
-     * Requested reservation extension heartbeat interval
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
-      return getHeartbeatInterval();
-    }
 
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      public Builder mergeFrom(datacatalog.Datacatalog.Reservation other) {
+        if (other == datacatalog.Datacatalog.Reservation.getDefaultInstance()) return this;
+        if (other.hasReservationId()) {
+          mergeReservationId(other.getReservationId());
+        }
+        if (!other.getOwnerId().isEmpty()) {
+          ownerId_ = other.ownerId_;
+          onChanged();
+        }
+        if (other.hasHeartbeatInterval()) {
+          mergeHeartbeatInterval(other.getHeartbeatInterval());
+        }
+        if (other.hasExpiresAt()) {
+          mergeExpiresAt(other.getExpiresAt());
+        }
+        if (other.hasMetadata()) {
+          mergeMetadata(other.getMetadata());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
 
-      memoizedIsInitialized = 1;
-      return true;
-    }
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
 
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (reservationId_ != null) {
-        output.writeMessage(1, getReservationId());
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        datacatalog.Datacatalog.Reservation parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (datacatalog.Datacatalog.Reservation) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
       }
-      if (!getOwnerIdBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
+
+      private datacatalog.Datacatalog.ReservationID reservationId_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public boolean hasReservationId() {
+        return reservationIdBuilder_ != null || reservationId_ != null;
       }
-      if (heartbeatInterval_ != null) {
-        output.writeMessage(3, getHeartbeatInterval());
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public datacatalog.Datacatalog.ReservationID getReservationId() {
+        if (reservationIdBuilder_ == null) {
+          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+        } else {
+          return reservationIdBuilder_.getMessage();
+        }
       }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          reservationId_ = value;
+          onChanged();
+        } else {
+          reservationIdBuilder_.setMessage(value);
+        }
 
-      size = 0;
-      if (reservationId_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getReservationId());
+        return this;
       }
-      if (!getOwnerIdBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public Builder setReservationId(
+          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = builderForValue.build();
+          onChanged();
+        } else {
+          reservationIdBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
       }
-      if (heartbeatInterval_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getHeartbeatInterval());
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
+          if (reservationId_ != null) {
+            reservationId_ =
+              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
+          } else {
+            reservationId_ = value;
+          }
+          onChanged();
+        } else {
+          reservationIdBuilder_.mergeFrom(value);
+        }
+
+        return this;
       }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public Builder clearReservationId() {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
+          onChanged();
+        } else {
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
+        }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
+        return this;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest)) {
-        return super.equals(obj);
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
+        
+        onChanged();
+        return getReservationIdFieldBuilder().getBuilder();
       }
-      datacatalog.Datacatalog.GetOrExtendReservationRequest other = (datacatalog.Datacatalog.GetOrExtendReservationRequest) obj;
-
-      if (hasReservationId() != other.hasReservationId()) return false;
-      if (hasReservationId()) {
-        if (!getReservationId()
-            .equals(other.getReservationId())) return false;
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+        if (reservationIdBuilder_ != null) {
+          return reservationIdBuilder_.getMessageOrBuilder();
+        } else {
+          return reservationId_ == null ?
+              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+        }
       }
-      if (!getOwnerId()
-          .equals(other.getOwnerId())) return false;
-      if (hasHeartbeatInterval() != other.hasHeartbeatInterval()) return false;
-      if (hasHeartbeatInterval()) {
-        if (!getHeartbeatInterval()
-            .equals(other.getHeartbeatInterval())) return false;
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
+          getReservationIdFieldBuilder() {
+        if (reservationIdBuilder_ == null) {
+          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
+                  getReservationId(),
+                  getParentForChildren(),
+                  isClean());
+          reservationId_ = null;
+        }
+        return reservationIdBuilder_;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
 
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasReservationId()) {
-        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationId().hashCode();
+      private java.lang.Object ownerId_ = "";
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public java.lang.String getOwnerId() {
+        java.lang.Object ref = ownerId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          ownerId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
-      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerId().hashCode();
-      if (hasHeartbeatInterval()) {
-        hash = (37 * hash) + HEARTBEAT_INTERVAL_FIELD_NUMBER;
-        hash = (53 * hash) + getHeartbeatInterval().hashCode();
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public com.google.protobuf.ByteString
+          getOwnerIdBytes() {
+        java.lang.Object ref = ownerId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          ownerId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
       }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationRequest prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Try to acquire or extend an artifact reservation. If an active reservation exists, retreive that instance.
-     * 

-     *
-     * Protobuf type {@code datacatalog.GetOrExtendReservationRequest}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationRequest)
-        datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder setOwnerId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        ownerId_ = value;
+        onChanged();
+        return this;
       }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class);
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder clearOwnerId() {
+        
+        ownerId_ = getDefaultInstance().getOwnerId();
+        onChanged();
+        return this;
       }
-
-      // Construct using datacatalog.Datacatalog.GetOrExtendReservationRequest.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder setOwnerIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        ownerId_ = value;
+        onChanged();
+        return this;
       }
 
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
+      private com.google.protobuf.Duration heartbeatInterval_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_;
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public boolean hasHeartbeatInterval() {
+        return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null;
       }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.Duration getHeartbeatInterval() {
+        if (heartbeatIntervalBuilder_ == null) {
+          return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+        } else {
+          return heartbeatIntervalBuilder_.getMessage();
         }
       }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder setHeartbeatInterval(com.google.protobuf.Duration value) {
+        if (heartbeatIntervalBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          heartbeatInterval_ = value;
+          onChanged();
         } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
+          heartbeatIntervalBuilder_.setMessage(value);
         }
-        ownerId_ = "";
 
+        return this;
+      }
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder setHeartbeatInterval(
+          com.google.protobuf.Duration.Builder builderForValue) {
         if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = null;
+          heartbeatInterval_ = builderForValue.build();
+          onChanged();
         } else {
-          heartbeatInterval_ = null;
-          heartbeatIntervalBuilder_ = null;
+          heartbeatIntervalBuilder_.setMessage(builderForValue.build());
         }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
-      }
 
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest build() {
-        datacatalog.Datacatalog.GetOrExtendReservationRequest result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
+        return this;
       }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest buildPartial() {
-        datacatalog.Datacatalog.GetOrExtendReservationRequest result = new datacatalog.Datacatalog.GetOrExtendReservationRequest(this);
-        if (reservationIdBuilder_ == null) {
-          result.reservationId_ = reservationId_;
-        } else {
-          result.reservationId_ = reservationIdBuilder_.build();
-        }
-        result.ownerId_ = ownerId_;
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) {
         if (heartbeatIntervalBuilder_ == null) {
-          result.heartbeatInterval_ = heartbeatInterval_;
+          if (heartbeatInterval_ != null) {
+            heartbeatInterval_ =
+              com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial();
+          } else {
+            heartbeatInterval_ = value;
+          }
+          onChanged();
         } else {
-          result.heartbeatInterval_ = heartbeatIntervalBuilder_.build();
+          heartbeatIntervalBuilder_.mergeFrom(value);
         }
-        onBuilt();
-        return result;
-      }
 
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
+        return this;
       }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest) {
-          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationRequest)other);
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder clearHeartbeatInterval() {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatInterval_ = null;
+          onChanged();
         } else {
-          super.mergeFrom(other);
-          return this;
+          heartbeatInterval_ = null;
+          heartbeatIntervalBuilder_ = null;
         }
-      }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationRequest other) {
-        if (other == datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance()) return this;
-        if (other.hasReservationId()) {
-          mergeReservationId(other.getReservationId());
-        }
-        if (!other.getOwnerId().isEmpty()) {
-          ownerId_ = other.ownerId_;
-          onChanged();
-        }
-        if (other.hasHeartbeatInterval()) {
-          mergeHeartbeatInterval(other.getHeartbeatInterval());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
         return this;
       }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() {
+        
+        onChanged();
+        return getHeartbeatIntervalFieldBuilder().getBuilder();
       }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        datacatalog.Datacatalog.GetOrExtendReservationRequest parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationRequest) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
+        if (heartbeatIntervalBuilder_ != null) {
+          return heartbeatIntervalBuilder_.getMessageOrBuilder();
+        } else {
+          return heartbeatInterval_ == null ?
+              com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+        }
+      }
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
+          getHeartbeatIntervalFieldBuilder() {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
+                  getHeartbeatInterval(),
+                  getParentForChildren(),
+                  isClean());
+          heartbeatInterval_ = null;
         }
-        return this;
+        return heartbeatIntervalBuilder_;
       }
 
-      private datacatalog.Datacatalog.ReservationID reservationId_;
+      private com.google.protobuf.Timestamp expiresAt_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
+          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> expiresAtBuilder_;
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public boolean hasReservationId() {
-        return reservationIdBuilder_ != null || reservationId_ != null;
+      public boolean hasExpiresAt() {
+        return expiresAtBuilder_ != null || expiresAt_ != null;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public datacatalog.Datacatalog.ReservationID getReservationId() {
-        if (reservationIdBuilder_ == null) {
-          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+      public com.google.protobuf.Timestamp getExpiresAt() {
+        if (expiresAtBuilder_ == null) {
+          return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
         } else {
-          return reservationIdBuilder_.getMessage();
+          return expiresAtBuilder_.getMessage();
         }
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
+      public Builder setExpiresAt(com.google.protobuf.Timestamp value) {
+        if (expiresAtBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          reservationId_ = value;
+          expiresAt_ = value;
           onChanged();
         } else {
-          reservationIdBuilder_.setMessage(value);
+          expiresAtBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder setReservationId(
-          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = builderForValue.build();
+      public Builder setExpiresAt(
+          com.google.protobuf.Timestamp.Builder builderForValue) {
+        if (expiresAtBuilder_ == null) {
+          expiresAt_ = builderForValue.build();
           onChanged();
         } else {
-          reservationIdBuilder_.setMessage(builderForValue.build());
+          expiresAtBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
-          if (reservationId_ != null) {
-            reservationId_ =
-              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
+      public Builder mergeExpiresAt(com.google.protobuf.Timestamp value) {
+        if (expiresAtBuilder_ == null) {
+          if (expiresAt_ != null) {
+            expiresAt_ =
+              com.google.protobuf.Timestamp.newBuilder(expiresAt_).mergeFrom(value).buildPartial();
           } else {
-            reservationId_ = value;
+            expiresAt_ = value;
           }
           onChanged();
         } else {
-          reservationIdBuilder_.mergeFrom(value);
+          expiresAtBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder clearReservationId() {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
+      public Builder clearExpiresAt() {
+        if (expiresAtBuilder_ == null) {
+          expiresAt_ = null;
           onChanged();
         } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
+          expiresAt_ = null;
+          expiresAtBuilder_ = null;
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
+      public com.google.protobuf.Timestamp.Builder getExpiresAtBuilder() {
         
         onChanged();
-        return getReservationIdFieldBuilder().getBuilder();
+        return getExpiresAtFieldBuilder().getBuilder();
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-        if (reservationIdBuilder_ != null) {
-          return reservationIdBuilder_.getMessageOrBuilder();
+      public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
+        if (expiresAtBuilder_ != null) {
+          return expiresAtBuilder_.getMessageOrBuilder();
         } else {
-          return reservationId_ == null ?
-              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+          return expiresAt_ == null ?
+              com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
         }
       }
       /**
        * 
-       * The unique ID for the reservation
+       * Expiration timestamp of this reservation
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
-          getReservationIdFieldBuilder() {
-        if (reservationIdBuilder_ == null) {
-          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
-                  getReservationId(),
+          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+          getExpiresAtFieldBuilder() {
+        if (expiresAtBuilder_ == null) {
+          expiresAtBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                  getExpiresAt(),
                   getParentForChildren(),
                   isClean());
-          reservationId_ = null;
+          expiresAt_ = null;
         }
-        return reservationIdBuilder_;
+        return expiresAtBuilder_;
       }
 
-      private java.lang.Object ownerId_ = "";
+      private datacatalog.Datacatalog.Metadata metadata_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> metadataBuilder_;
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * Free-form metadata associated with the artifact
        * 

        *
-       * string owner_id = 2;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public java.lang.String getOwnerId() {
-        java.lang.Object ref = ownerId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          ownerId_ = s;
-          return s;
+      public boolean hasMetadata() {
+        return metadataBuilder_ != null || metadata_ != null;
+      }
+      /**
+       * 
+       * Free-form metadata associated with the artifact
+       * 

+       *
+       * .datacatalog.Metadata metadata = 6;
+       */
+      public datacatalog.Datacatalog.Metadata getMetadata() {
+        if (metadataBuilder_ == null) {
+          return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
         } else {
-          return (java.lang.String) ref;
+          return metadataBuilder_.getMessage();
+        }
+      }
+      /**
+       * 
+       * Free-form metadata associated with the artifact
+       * 

+       *
+       * .datacatalog.Metadata metadata = 6;
+       */
+      public Builder setMetadata(datacatalog.Datacatalog.Metadata value) {
+        if (metadataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          metadata_ = value;
+          onChanged();
+        } else {
+          metadataBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Free-form metadata associated with the artifact
+       * 

+       *
+       * .datacatalog.Metadata metadata = 6;
+       */
+      public Builder setMetadata(
+          datacatalog.Datacatalog.Metadata.Builder builderForValue) {
+        if (metadataBuilder_ == null) {
+          metadata_ = builderForValue.build();
+          onChanged();
+        } else {
+          metadataBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Free-form metadata associated with the artifact
+       * 

+       *
+       * .datacatalog.Metadata metadata = 6;
+       */
+      public Builder mergeMetadata(datacatalog.Datacatalog.Metadata value) {
+        if (metadataBuilder_ == null) {
+          if (metadata_ != null) {
+            metadata_ =
+              datacatalog.Datacatalog.Metadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
+          } else {
+            metadata_ = value;
+          }
+          onChanged();
+        } else {
+          metadataBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Free-form metadata associated with the artifact
+       * 

+       *
+       * .datacatalog.Metadata metadata = 6;
+       */
+      public Builder clearMetadata() {
+        if (metadataBuilder_ == null) {
+          metadata_ = null;
+          onChanged();
+        } else {
+          metadata_ = null;
+          metadataBuilder_ = null;
         }
+
+        return this;
+      }
+      /**
+       * 
+       * Free-form metadata associated with the artifact
+       * 

+       *
+       * .datacatalog.Metadata metadata = 6;
+       */
+      public datacatalog.Datacatalog.Metadata.Builder getMetadataBuilder() {
+        
+        onChanged();
+        return getMetadataFieldBuilder().getBuilder();
       }
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * Free-form metadata associated with the artifact
        * 

        *
-       * string owner_id = 2;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public com.google.protobuf.ByteString
-          getOwnerIdBytes() {
-        java.lang.Object ref = ownerId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          ownerId_ = b;
-          return b;
+      public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
+        if (metadataBuilder_ != null) {
+          return metadataBuilder_.getMessageOrBuilder();
         } else {
-          return (com.google.protobuf.ByteString) ref;
+          return metadata_ == null ?
+              datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
         }
       }
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * Free-form metadata associated with the artifact
        * 

        *
-       * string owner_id = 2;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public Builder setOwnerId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> 
+          getMetadataFieldBuilder() {
+        if (metadataBuilder_ == null) {
+          metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder>(
+                  getMetadata(),
+                  getParentForChildren(),
+                  isClean());
+          metadata_ = null;
+        }
+        return metadataBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:datacatalog.Reservation)
+    }
+
+    // @@protoc_insertion_point(class_scope:datacatalog.Reservation)
+    private static final datacatalog.Datacatalog.Reservation DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.Reservation();
+    }
+
+    public static datacatalog.Datacatalog.Reservation getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Override
+      public Reservation parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Reservation(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
   }
-  
-        ownerId_ = value;
-        onChanged();
-        return this;
+
+  public interface GetOrExtendReservationResponseOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationResponse)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * 
+     * The reservation to be acquired or extended
+     * 

+     *
+     * .datacatalog.Reservation reservation = 1;
+     */
+    boolean hasReservation();
+    /**
+     * 
+     * The reservation to be acquired or extended
+     * 

+     *
+     * .datacatalog.Reservation reservation = 1;
+     */
+    datacatalog.Datacatalog.Reservation getReservation();
+    /**
+     * 
+     * The reservation to be acquired or extended
+     * 

+     *
+     * .datacatalog.Reservation reservation = 1;
+     */
+    datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder();
+  }
+  /**
+   * 
+   * Response including either a newly minted reservation or the existing reservation
+   * 

+   *
+   * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
+   */
+  public  static final class GetOrExtendReservationResponse extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationResponse)
+      GetOrExtendReservationResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use GetOrExtendReservationResponse.newBuilder() to construct.
+    private GetOrExtendReservationResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+    private GetOrExtendReservationResponse() {
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private GetOrExtendReservationResponse(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
       }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder clearOwnerId() {
-        
-        ownerId_ = getDefaultInstance().getOwnerId();
-        onChanged();
-        return this;
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              datacatalog.Datacatalog.Reservation.Builder subBuilder = null;
+              if (reservation_ != null) {
+                subBuilder = reservation_.toBuilder();
+              }
+              reservation_ = input.readMessage(datacatalog.Datacatalog.Reservation.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(reservation_);
+                reservation_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
+    }
+
+    public static final int RESERVATION_FIELD_NUMBER = 1;
+    private datacatalog.Datacatalog.Reservation reservation_;
+    /**
+     * 
+     * The reservation to be acquired or extended
+     * 

+     *
+     * .datacatalog.Reservation reservation = 1;
+     */
+    public boolean hasReservation() {
+      return reservation_ != null;
+    }
+    /**
+     * 
+     * The reservation to be acquired or extended
+     * 

+     *
+     * .datacatalog.Reservation reservation = 1;
+     */
+    public datacatalog.Datacatalog.Reservation getReservation() {
+      return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
+    }
+    /**
+     * 
+     * The reservation to be acquired or extended
+     * 

+     *
+     * .datacatalog.Reservation reservation = 1;
+     */
+    public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
+      return getReservation();
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (reservation_ != null) {
+        output.writeMessage(1, getReservation());
       }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        ownerId_ = value;
-        onChanged();
-        return this;
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (reservation_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, getReservation());
       }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
 
-      private com.google.protobuf.Duration heartbeatInterval_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_;
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public boolean hasHeartbeatInterval() {
-        return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration getHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-        } else {
-          return heartbeatIntervalBuilder_.getMessage();
-        }
+      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse)) {
+        return super.equals(obj);
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          heartbeatInterval_ = value;
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.setMessage(value);
-        }
+      datacatalog.Datacatalog.GetOrExtendReservationResponse other = (datacatalog.Datacatalog.GetOrExtendReservationResponse) obj;
 
-        return this;
+      if (hasReservation() != other.hasReservation()) return false;
+      if (hasReservation()) {
+        if (!getReservation()
+            .equals(other.getReservation())) return false;
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(
-          com.google.protobuf.Duration.Builder builderForValue) {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = builderForValue.build();
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.setMessage(builderForValue.build());
-        }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
 
-        return this;
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasReservation()) {
+        hash = (37 * hash) + RESERVATION_FIELD_NUMBER;
+        hash = (53 * hash) + getReservation().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationResponse prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * 
+     * Response including either a newly minted reservation or the existing reservation
+     * 

+     *
+     * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationResponse)
+        datacatalog.Datacatalog.GetOrExtendReservationResponseOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (heartbeatInterval_ != null) {
-            heartbeatInterval_ =
-              com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial();
-          } else {
-            heartbeatInterval_ = value;
-          }
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.mergeFrom(value);
-        }
 
-        return this;
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder clearHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = null;
-          onChanged();
-        } else {
-          heartbeatInterval_ = null;
-          heartbeatIntervalBuilder_ = null;
-        }
 
-        return this;
+      // Construct using datacatalog.Datacatalog.GetOrExtendReservationResponse.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() {
-        
-        onChanged();
-        return getHeartbeatIntervalFieldBuilder().getBuilder();
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
-        if (heartbeatIntervalBuilder_ != null) {
-          return heartbeatIntervalBuilder_.getMessageOrBuilder();
-        } else {
-          return heartbeatInterval_ == null ?
-              com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
-          getHeartbeatIntervalFieldBuilder() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
-                  getHeartbeatInterval(),
-                  getParentForChildren(),
-                  isClean());
-          heartbeatInterval_ = null;
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (reservationBuilder_ == null) {
+          reservation_ = null;
+        } else {
+          reservation_ = null;
+          reservationBuilder_ = null;
         }
-        return heartbeatIntervalBuilder_;
+        return this;
       }
+
       @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
       }
 
       @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
+      public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance();
       }
 
-
-      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationRequest)
-    }
-
-    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationRequest)
-    private static final datacatalog.Datacatalog.GetOrExtendReservationRequest DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationRequest();
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public GetOrExtendReservationRequest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOrExtendReservationRequest(input, extensionRegistry);
+      public datacatalog.Datacatalog.GetOrExtendReservationResponse build() {
+        datacatalog.Datacatalog.GetOrExtendReservationResponse result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
       }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface ReservationOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.Reservation)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    boolean hasReservationId();
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    datacatalog.Datacatalog.ReservationID getReservationId();
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
 
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    java.lang.String getOwnerId();
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    com.google.protobuf.ByteString
-        getOwnerIdBytes();
+      @java.lang.Override
+      public datacatalog.Datacatalog.GetOrExtendReservationResponse buildPartial() {
+        datacatalog.Datacatalog.GetOrExtendReservationResponse result = new datacatalog.Datacatalog.GetOrExtendReservationResponse(this);
+        if (reservationBuilder_ == null) {
+          result.reservation_ = reservation_;
+        } else {
+          result.reservation_ = reservationBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
 
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    boolean hasHeartbeatInterval();
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    com.google.protobuf.Duration getHeartbeatInterval();
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder();
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse) {
+          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationResponse)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
 
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    boolean hasExpiresAt();
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    com.google.protobuf.Timestamp getExpiresAt();
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder();
+      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationResponse other) {
+        if (other == datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance()) return this;
+        if (other.hasReservation()) {
+          mergeReservation(other.getReservation());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
 
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    boolean hasMetadata();
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    datacatalog.Datacatalog.Metadata getMetadata();
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder();
-  }
-  /**
-   * 
-   * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
-   * 

-   *
-   * Protobuf type {@code datacatalog.Reservation}
-   */
-  public  static final class Reservation extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.Reservation)
-      ReservationOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Reservation.newBuilder() to construct.
-    private Reservation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Reservation() {
-      ownerId_ = "";
-    }
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Reservation(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        datacatalog.Datacatalog.GetOrExtendReservationResponse parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationResponse) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
       }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
-              if (reservationId_ != null) {
-                subBuilder = reservationId_.toBuilder();
-              }
-              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(reservationId_);
-                reservationId_ = subBuilder.buildPartial();
-              }
 
-              break;
-            }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
+      private datacatalog.Datacatalog.Reservation reservation_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> reservationBuilder_;
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public boolean hasReservation() {
+        return reservationBuilder_ != null || reservation_ != null;
+      }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public datacatalog.Datacatalog.Reservation getReservation() {
+        if (reservationBuilder_ == null) {
+          return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
+        } else {
+          return reservationBuilder_.getMessage();
+        }
+      }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public Builder setReservation(datacatalog.Datacatalog.Reservation value) {
+        if (reservationBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          reservation_ = value;
+          onChanged();
+        } else {
+          reservationBuilder_.setMessage(value);
+        }
 
-              ownerId_ = s;
-              break;
-            }
-            case 26: {
-              com.google.protobuf.Duration.Builder subBuilder = null;
-              if (heartbeatInterval_ != null) {
-                subBuilder = heartbeatInterval_.toBuilder();
-              }
-              heartbeatInterval_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(heartbeatInterval_);
-                heartbeatInterval_ = subBuilder.buildPartial();
-              }
+        return this;
+      }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public Builder setReservation(
+          datacatalog.Datacatalog.Reservation.Builder builderForValue) {
+        if (reservationBuilder_ == null) {
+          reservation_ = builderForValue.build();
+          onChanged();
+        } else {
+          reservationBuilder_.setMessage(builderForValue.build());
+        }
 
-              break;
-            }
-            case 34: {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (expiresAt_ != null) {
-                subBuilder = expiresAt_.toBuilder();
-              }
-              expiresAt_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(expiresAt_);
-                expiresAt_ = subBuilder.buildPartial();
-              }
+        return this;
+      }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public Builder mergeReservation(datacatalog.Datacatalog.Reservation value) {
+        if (reservationBuilder_ == null) {
+          if (reservation_ != null) {
+            reservation_ =
+              datacatalog.Datacatalog.Reservation.newBuilder(reservation_).mergeFrom(value).buildPartial();
+          } else {
+            reservation_ = value;
+          }
+          onChanged();
+        } else {
+          reservationBuilder_.mergeFrom(value);
+        }
 
-              break;
-            }
-            case 50: {
-              datacatalog.Datacatalog.Metadata.Builder subBuilder = null;
-              if (metadata_ != null) {
-                subBuilder = metadata_.toBuilder();
-              }
-              metadata_ = input.readMessage(datacatalog.Datacatalog.Metadata.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(metadata_);
-                metadata_ = subBuilder.buildPartial();
-              }
+        return this;
+      }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public Builder clearReservation() {
+        if (reservationBuilder_ == null) {
+          reservation_ = null;
+          onChanged();
+        } else {
+          reservation_ = null;
+          reservationBuilder_ = null;
+        }
 
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
+        return this;
+      }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public datacatalog.Datacatalog.Reservation.Builder getReservationBuilder() {
+        
+        onChanged();
+        return getReservationFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
+        if (reservationBuilder_ != null) {
+          return reservationBuilder_.getMessageOrBuilder();
+        } else {
+          return reservation_ == null ?
+              datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
         }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
       }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
-    }
+      /**
+       * 
+       * The reservation to be acquired or extended
+       * 

+       *
+       * .datacatalog.Reservation reservation = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> 
+          getReservationFieldBuilder() {
+        if (reservationBuilder_ == null) {
+          reservationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder>(
+                  getReservation(),
+                  getParentForChildren(),
+                  isClean());
+          reservation_ = null;
+        }
+        return reservationBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class);
-    }
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
 
-    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.ReservationID reservationId_;
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public boolean hasReservationId() {
-      return reservationId_ != null;
-    }
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public datacatalog.Datacatalog.ReservationID getReservationId() {
-      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+
+      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationResponse)
     }
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-      return getReservationId();
+
+    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationResponse)
+    private static final datacatalog.Datacatalog.GetOrExtendReservationResponse DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationResponse();
     }
 
-    public static final int OWNER_ID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object ownerId_;
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    public java.lang.String getOwnerId() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        ownerId_ = s;
-        return s;
-      }
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstance() {
+      return DEFAULT_INSTANCE;
     }
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    public com.google.protobuf.ByteString
-        getOwnerIdBytes() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        ownerId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
+
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Override
+      public GetOrExtendReservationResponse parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new GetOrExtendReservationResponse(input, extensionRegistry);
       }
-    }
+    };
 
-    public static final int HEARTBEAT_INTERVAL_FIELD_NUMBER = 3;
-    private com.google.protobuf.Duration heartbeatInterval_;
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public boolean hasHeartbeatInterval() {
-      return heartbeatInterval_ != null;
-    }
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public com.google.protobuf.Duration getHeartbeatInterval() {
-      return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
     }
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
-      return getHeartbeatInterval();
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
     }
 
-    public static final int EXPIRES_AT_FIELD_NUMBER = 4;
-    private com.google.protobuf.Timestamp expiresAt_;
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    public boolean hasExpiresAt() {
-      return expiresAt_ != null;
+    @java.lang.Override
+    public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
+
+  }
+
+  public interface GetOrExtendReservationsResponseOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationsResponse)
+      com.google.protobuf.MessageOrBuilder {
+
     /**
      * 
-     * Expiration timestamp of this reservation
+     * List of (newly created or existing) reservations for artifacts requested
      * 

      *
-     * .google.protobuf.Timestamp expires_at = 4;
+     * repeated .datacatalog.Reservation reservations = 1;
      */
-    public com.google.protobuf.Timestamp getExpiresAt() {
-      return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
-    }
+    java.util.List 
+        getReservationsList();
     /**
      * 
-     * Expiration timestamp of this reservation
+     * List of (newly created or existing) reservations for artifacts requested
      * 

      *
-     * .google.protobuf.Timestamp expires_at = 4;
+     * repeated .datacatalog.Reservation reservations = 1;
      */
-    public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
-      return getExpiresAt();
-    }
-
-    public static final int METADATA_FIELD_NUMBER = 6;
-    private datacatalog.Datacatalog.Metadata metadata_;
+    datacatalog.Datacatalog.Reservation getReservations(int index);
     /**
      * 
-     * Free-form metadata associated with the artifact
+     * List of (newly created or existing) reservations for artifacts requested
      * 

      *
-     * .datacatalog.Metadata metadata = 6;
+     * repeated .datacatalog.Reservation reservations = 1;
      */
-    public boolean hasMetadata() {
-      return metadata_ != null;
-    }
+    int getReservationsCount();
     /**
      * 
-     * Free-form metadata associated with the artifact
+     * List of (newly created or existing) reservations for artifacts requested
      * 

      *
-     * .datacatalog.Metadata metadata = 6;
+     * repeated .datacatalog.Reservation reservations = 1;
      */
-    public datacatalog.Datacatalog.Metadata getMetadata() {
-      return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
-    }
+    java.util.List 
+        getReservationsOrBuilderList();
     /**
      * 
-     * Free-form metadata associated with the artifact
+     * List of (newly created or existing) reservations for artifacts requested
      * 

      *
-     * .datacatalog.Metadata metadata = 6;
+     * repeated .datacatalog.Reservation reservations = 1;
      */
-    public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
-      return getMetadata();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (reservationId_ != null) {
-        output.writeMessage(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
-      }
-      if (heartbeatInterval_ != null) {
-        output.writeMessage(3, getHeartbeatInterval());
-      }
-      if (expiresAt_ != null) {
-        output.writeMessage(4, getExpiresAt());
-      }
-      if (metadata_ != null) {
-        output.writeMessage(6, getMetadata());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (reservationId_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
-      }
-      if (heartbeatInterval_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getHeartbeatInterval());
-      }
-      if (expiresAt_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getExpiresAt());
-      }
-      if (metadata_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getMetadata());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
+    datacatalog.Datacatalog.ReservationOrBuilder getReservationsOrBuilder(
+        int index);
+  }
+  /**
+   * 
+   * List of reservations acquired for multiple artifacts in a single operation.
+   * 

+   *
+   * Protobuf type {@code datacatalog.GetOrExtendReservationsResponse}
+   */
+  public  static final class GetOrExtendReservationsResponse extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationsResponse)
+      GetOrExtendReservationsResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use GetOrExtendReservationsResponse.newBuilder() to construct.
+    private GetOrExtendReservationsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
     }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof datacatalog.Datacatalog.Reservation)) {
-        return super.equals(obj);
-      }
-      datacatalog.Datacatalog.Reservation other = (datacatalog.Datacatalog.Reservation) obj;
-
-      if (hasReservationId() != other.hasReservationId()) return false;
-      if (hasReservationId()) {
-        if (!getReservationId()
-            .equals(other.getReservationId())) return false;
-      }
-      if (!getOwnerId()
-          .equals(other.getOwnerId())) return false;
-      if (hasHeartbeatInterval() != other.hasHeartbeatInterval()) return false;
-      if (hasHeartbeatInterval()) {
-        if (!getHeartbeatInterval()
-            .equals(other.getHeartbeatInterval())) return false;
-      }
-      if (hasExpiresAt() != other.hasExpiresAt()) return false;
-      if (hasExpiresAt()) {
-        if (!getExpiresAt()
-            .equals(other.getExpiresAt())) return false;
-      }
-      if (hasMetadata() != other.hasMetadata()) return false;
-      if (hasMetadata()) {
-        if (!getMetadata()
-            .equals(other.getMetadata())) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
+    private GetOrExtendReservationsResponse() {
+      reservations_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasReservationId()) {
-        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationId().hashCode();
-      }
-      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerId().hashCode();
-      if (hasHeartbeatInterval()) {
-        hash = (37 * hash) + HEARTBEAT_INTERVAL_FIELD_NUMBER;
-        hash = (53 * hash) + getHeartbeatInterval().hashCode();
-      }
-      if (hasExpiresAt()) {
-        hash = (37 * hash) + EXPIRES_AT_FIELD_NUMBER;
-        hash = (53 * hash) + getExpiresAt().hashCode();
-      }
-      if (hasMetadata()) {
-        hash = (37 * hash) + METADATA_FIELD_NUMBER;
-        hash = (53 * hash) + getMetadata().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
     }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        byte[] data,
+    private GetOrExtendReservationsResponse(
+        com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                reservations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              reservations_.add(
+                  input.readMessage(datacatalog.Datacatalog.Reservation.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          reservations_ = java.util.Collections.unmodifiableList(reservations_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
     }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              datacatalog.Datacatalog.GetOrExtendReservationsResponse.class, datacatalog.Datacatalog.GetOrExtendReservationsResponse.Builder.class);
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.Reservation prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+
+    public static final int RESERVATIONS_FIELD_NUMBER = 1;
+    private java.util.List reservations_;
+    /**
+     * 
+     * List of (newly created or existing) reservations for artifacts requested
+     * 

+     *
+     * repeated .datacatalog.Reservation reservations = 1;
+     */
+    public java.util.List getReservationsList() {
+      return reservations_;
     }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
+    /**
+     * 
+     * List of (newly created or existing) reservations for artifacts requested
+     * 

+     *
+     * repeated .datacatalog.Reservation reservations = 1;
+     */
+    public java.util.List 
+        getReservationsOrBuilderList() {
+      return reservations_;
     }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
+    /**
+     * 
+     * List of (newly created or existing) reservations for artifacts requested
+     * 

+     *
+     * repeated .datacatalog.Reservation reservations = 1;
+     */
+    public int getReservationsCount() {
+      return reservations_.size();
     }
     /**
      * 
-     * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
+     * List of (newly created or existing) reservations for artifacts requested
      * 

      *
-     * Protobuf type {@code datacatalog.Reservation}
+     * repeated .datacatalog.Reservation reservations = 1;
      */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.Reservation)
-        datacatalog.Datacatalog.ReservationOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class);
-      }
-
-      // Construct using datacatalog.Datacatalog.Reservation.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
-        } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
-        }
-        ownerId_ = "";
-
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = null;
-        } else {
-          heartbeatInterval_ = null;
-          heartbeatIntervalBuilder_ = null;
-        }
-        if (expiresAtBuilder_ == null) {
-          expiresAt_ = null;
-        } else {
-          expiresAt_ = null;
-          expiresAtBuilder_ = null;
-        }
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-        } else {
-          metadata_ = null;
-          metadataBuilder_ = null;
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.Reservation.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.Reservation build() {
-        datacatalog.Datacatalog.Reservation result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.Reservation buildPartial() {
-        datacatalog.Datacatalog.Reservation result = new datacatalog.Datacatalog.Reservation(this);
-        if (reservationIdBuilder_ == null) {
-          result.reservationId_ = reservationId_;
-        } else {
-          result.reservationId_ = reservationIdBuilder_.build();
-        }
-        result.ownerId_ = ownerId_;
-        if (heartbeatIntervalBuilder_ == null) {
-          result.heartbeatInterval_ = heartbeatInterval_;
-        } else {
-          result.heartbeatInterval_ = heartbeatIntervalBuilder_.build();
-        }
-        if (expiresAtBuilder_ == null) {
-          result.expiresAt_ = expiresAt_;
-        } else {
-          result.expiresAt_ = expiresAtBuilder_.build();
-        }
-        if (metadataBuilder_ == null) {
-          result.metadata_ = metadata_;
-        } else {
-          result.metadata_ = metadataBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
+    public datacatalog.Datacatalog.Reservation getReservations(int index) {
+      return reservations_.get(index);
+    }
+    /**
+     * 
+     * List of (newly created or existing) reservations for artifacts requested
+     * 

+     *
+     * repeated .datacatalog.Reservation reservations = 1;
+     */
+    public datacatalog.Datacatalog.ReservationOrBuilder getReservationsOrBuilder(
+        int index) {
+      return reservations_.get(index);
+    }
 
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.Reservation) {
-          return mergeFrom((datacatalog.Datacatalog.Reservation)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
-      public Builder mergeFrom(datacatalog.Datacatalog.Reservation other) {
-        if (other == datacatalog.Datacatalog.Reservation.getDefaultInstance()) return this;
-        if (other.hasReservationId()) {
-          mergeReservationId(other.getReservationId());
-        }
-        if (!other.getOwnerId().isEmpty()) {
-          ownerId_ = other.ownerId_;
-          onChanged();
-        }
-        if (other.hasHeartbeatInterval()) {
-          mergeHeartbeatInterval(other.getHeartbeatInterval());
-        }
-        if (other.hasExpiresAt()) {
-          mergeExpiresAt(other.getExpiresAt());
-        }
-        if (other.hasMetadata()) {
-          mergeMetadata(other.getMetadata());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
 
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < reservations_.size(); i++) {
+        output.writeMessage(1, reservations_.get(i));
       }
+      unknownFields.writeTo(output);
+    }
 
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        datacatalog.Datacatalog.Reservation parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.Reservation) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
 
-      private datacatalog.Datacatalog.ReservationID reservationId_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public boolean hasReservationId() {
-        return reservationIdBuilder_ != null || reservationId_ != null;
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public datacatalog.Datacatalog.ReservationID getReservationId() {
-        if (reservationIdBuilder_ == null) {
-          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
-        } else {
-          return reservationIdBuilder_.getMessage();
-        }
+      size = 0;
+      for (int i = 0; i < reservations_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, reservations_.get(i));
       }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          reservationId_ = value;
-          onChanged();
-        } else {
-          reservationIdBuilder_.setMessage(value);
-        }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
 
-        return this;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
       }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder setReservationId(
-          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = builderForValue.build();
-          onChanged();
-        } else {
-          reservationIdBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
+      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationsResponse)) {
+        return super.equals(obj);
       }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
-          if (reservationId_ != null) {
-            reservationId_ =
-              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
-          } else {
-            reservationId_ = value;
-          }
-          onChanged();
-        } else {
-          reservationIdBuilder_.mergeFrom(value);
-        }
+      datacatalog.Datacatalog.GetOrExtendReservationsResponse other = (datacatalog.Datacatalog.GetOrExtendReservationsResponse) obj;
 
-        return this;
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder clearReservationId() {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
-          onChanged();
-        } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
-        }
+      if (!getReservationsList()
+          .equals(other.getReservationsList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
 
-        return this;
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
       }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
-        
-        onChanged();
-        return getReservationIdFieldBuilder().getBuilder();
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getReservationsCount() > 0) {
+        hash = (37 * hash) + RESERVATIONS_FIELD_NUMBER;
+        hash = (53 * hash) + getReservationsList().hashCode();
       }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-        if (reservationIdBuilder_ != null) {
-          return reservationIdBuilder_.getMessageOrBuilder();
-        } else {
-          return reservationId_ == null ?
-              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
-        }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationsResponse prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * 
+     * List of reservations acquired for multiple artifacts in a single operation.
+     * 

+     *
+     * Protobuf type {@code datacatalog.GetOrExtendReservationsResponse}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationsResponse)
+        datacatalog.Datacatalog.GetOrExtendReservationsResponseOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
       }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
-          getReservationIdFieldBuilder() {
-        if (reservationIdBuilder_ == null) {
-          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
-                  getReservationId(),
-                  getParentForChildren(),
-                  isClean());
-          reservationId_ = null;
-        }
-        return reservationIdBuilder_;
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                datacatalog.Datacatalog.GetOrExtendReservationsResponse.class, datacatalog.Datacatalog.GetOrExtendReservationsResponse.Builder.class);
       }
 
-      private java.lang.Object ownerId_ = "";
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public java.lang.String getOwnerId() {
-        java.lang.Object ref = ownerId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          ownerId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
+      // Construct using datacatalog.Datacatalog.GetOrExtendReservationsResponse.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getReservationsFieldBuilder();
         }
       }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public com.google.protobuf.ByteString
-          getOwnerIdBytes() {
-        java.lang.Object ref = ownerId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          ownerId_ = b;
-          return b;
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (reservationsBuilder_ == null) {
+          reservations_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          return (com.google.protobuf.ByteString) ref;
+          reservationsBuilder_.clear();
         }
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        ownerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder clearOwnerId() {
-        
-        ownerId_ = getDefaultInstance().getOwnerId();
-        onChanged();
         return this;
       }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        ownerId_ = value;
-        onChanged();
-        return this;
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
       }
 
-      private com.google.protobuf.Duration heartbeatInterval_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_;
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public boolean hasHeartbeatInterval() {
-        return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null;
+      @java.lang.Override
+      public datacatalog.Datacatalog.GetOrExtendReservationsResponse getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.GetOrExtendReservationsResponse.getDefaultInstance();
       }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration getHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-        } else {
-          return heartbeatIntervalBuilder_.getMessage();
+
+      @java.lang.Override
+      public datacatalog.Datacatalog.GetOrExtendReservationsResponse build() {
+        datacatalog.Datacatalog.GetOrExtendReservationsResponse result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
         }
+        return result;
       }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+
+      @java.lang.Override
+      public datacatalog.Datacatalog.GetOrExtendReservationsResponse buildPartial() {
+        datacatalog.Datacatalog.GetOrExtendReservationsResponse result = new datacatalog.Datacatalog.GetOrExtendReservationsResponse(this);
+        int from_bitField0_ = bitField0_;
+        if (reservationsBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            reservations_ = java.util.Collections.unmodifiableList(reservations_);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
-          heartbeatInterval_ = value;
-          onChanged();
+          result.reservations_ = reservations_;
         } else {
-          heartbeatIntervalBuilder_.setMessage(value);
+          result.reservations_ = reservationsBuilder_.build();
         }
+        onBuilt();
+        return result;
+      }
 
-        return this;
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
       }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(
-          com.google.protobuf.Duration.Builder builderForValue) {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = builderForValue.build();
-          onChanged();
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationsResponse) {
+          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationsResponse)other);
         } else {
-          heartbeatIntervalBuilder_.setMessage(builderForValue.build());
+          super.mergeFrom(other);
+          return this;
         }
-
-        return this;
       }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (heartbeatInterval_ != null) {
-            heartbeatInterval_ =
-              com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial();
-          } else {
-            heartbeatInterval_ = value;
+
+      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationsResponse other) {
+        if (other == datacatalog.Datacatalog.GetOrExtendReservationsResponse.getDefaultInstance()) return this;
+        if (reservationsBuilder_ == null) {
+          if (!other.reservations_.isEmpty()) {
+            if (reservations_.isEmpty()) {
+              reservations_ = other.reservations_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureReservationsIsMutable();
+              reservations_.addAll(other.reservations_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.reservations_.isEmpty()) {
+            if (reservationsBuilder_.isEmpty()) {
+              reservationsBuilder_.dispose();
+              reservationsBuilder_ = null;
+              reservations_ = other.reservations_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              reservationsBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getReservationsFieldBuilder() : null;
+            } else {
+              reservationsBuilder_.addAllMessages(other.reservations_);
+            }
           }
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.mergeFrom(value);
         }
-
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder clearHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = null;
-          onChanged();
-        } else {
-          heartbeatInterval_ = null;
-          heartbeatIntervalBuilder_ = null;
-        }
 
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        datacatalog.Datacatalog.GetOrExtendReservationsResponse parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationsResponse) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() {
-        
-        onChanged();
-        return getHeartbeatIntervalFieldBuilder().getBuilder();
+      private int bitField0_;
+
+      private java.util.List reservations_ =
+        java.util.Collections.emptyList();
+      private void ensureReservationsIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          reservations_ = new java.util.ArrayList(reservations_);
+          bitField0_ |= 0x00000001;
+         }
       }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> reservationsBuilder_;
+
       /**
        * 
-       * Recommended heartbeat interval to extend reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Duration heartbeat_interval = 3;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
-        if (heartbeatIntervalBuilder_ != null) {
-          return heartbeatIntervalBuilder_.getMessageOrBuilder();
+      public java.util.List getReservationsList() {
+        if (reservationsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(reservations_);
         } else {
-          return heartbeatInterval_ == null ?
-              com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+          return reservationsBuilder_.getMessageList();
         }
       }
       /**
        * 
-       * Recommended heartbeat interval to extend reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Duration heartbeat_interval = 3;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
-          getHeartbeatIntervalFieldBuilder() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
-                  getHeartbeatInterval(),
-                  getParentForChildren(),
-                  isClean());
-          heartbeatInterval_ = null;
+      public int getReservationsCount() {
+        if (reservationsBuilder_ == null) {
+          return reservations_.size();
+        } else {
+          return reservationsBuilder_.getCount();
         }
-        return heartbeatIntervalBuilder_;
-      }
-
-      private com.google.protobuf.Timestamp expiresAt_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> expiresAtBuilder_;
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public boolean hasExpiresAt() {
-        return expiresAtBuilder_ != null || expiresAt_ != null;
       }
       /**
        * 
-       * Expiration timestamp of this reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Timestamp expires_at = 4;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public com.google.protobuf.Timestamp getExpiresAt() {
-        if (expiresAtBuilder_ == null) {
-          return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
+      public datacatalog.Datacatalog.Reservation getReservations(int index) {
+        if (reservationsBuilder_ == null) {
+          return reservations_.get(index);
         } else {
-          return expiresAtBuilder_.getMessage();
+          return reservationsBuilder_.getMessage(index);
         }
       }
       /**
        * 
-       * Expiration timestamp of this reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Timestamp expires_at = 4;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder setExpiresAt(com.google.protobuf.Timestamp value) {
-        if (expiresAtBuilder_ == null) {
+      public Builder setReservations(
+          int index, datacatalog.Datacatalog.Reservation value) {
+        if (reservationsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          expiresAt_ = value;
+          ensureReservationsIsMutable();
+          reservations_.set(index, value);
           onChanged();
         } else {
-          expiresAtBuilder_.setMessage(value);
+          reservationsBuilder_.setMessage(index, value);
         }
-
         return this;
       }
       /**
        * 
-       * Expiration timestamp of this reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Timestamp expires_at = 4;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder setExpiresAt(
-          com.google.protobuf.Timestamp.Builder builderForValue) {
-        if (expiresAtBuilder_ == null) {
-          expiresAt_ = builderForValue.build();
+      public Builder setReservations(
+          int index, datacatalog.Datacatalog.Reservation.Builder builderForValue) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.set(index, builderForValue.build());
           onChanged();
         } else {
-          expiresAtBuilder_.setMessage(builderForValue.build());
+          reservationsBuilder_.setMessage(index, builderForValue.build());
         }
-
         return this;
       }
       /**
        * 
-       * Expiration timestamp of this reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Timestamp expires_at = 4;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder mergeExpiresAt(com.google.protobuf.Timestamp value) {
-        if (expiresAtBuilder_ == null) {
-          if (expiresAt_ != null) {
-            expiresAt_ =
-              com.google.protobuf.Timestamp.newBuilder(expiresAt_).mergeFrom(value).buildPartial();
-          } else {
-            expiresAt_ = value;
+      public Builder addReservations(datacatalog.Datacatalog.Reservation value) {
+        if (reservationsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
+          ensureReservationsIsMutable();
+          reservations_.add(value);
           onChanged();
         } else {
-          expiresAtBuilder_.mergeFrom(value);
+          reservationsBuilder_.addMessage(value);
         }
-
         return this;
       }
       /**
        * 
-       * Expiration timestamp of this reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Timestamp expires_at = 4;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder clearExpiresAt() {
-        if (expiresAtBuilder_ == null) {
-          expiresAt_ = null;
+      public Builder addReservations(
+          int index, datacatalog.Datacatalog.Reservation value) {
+        if (reservationsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureReservationsIsMutable();
+          reservations_.add(index, value);
           onChanged();
         } else {
-          expiresAt_ = null;
-          expiresAtBuilder_ = null;
+          reservationsBuilder_.addMessage(index, value);
         }
-
         return this;
       }
       /**
        * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public com.google.protobuf.Timestamp.Builder getExpiresAtBuilder() {
-        
-        onChanged();
-        return getExpiresAtFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Timestamp expires_at = 4;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
-        if (expiresAtBuilder_ != null) {
-          return expiresAtBuilder_.getMessageOrBuilder();
+      public Builder addReservations(
+          datacatalog.Datacatalog.Reservation.Builder builderForValue) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.add(builderForValue.build());
+          onChanged();
         } else {
-          return expiresAt_ == null ?
-              com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
+          reservationsBuilder_.addMessage(builderForValue.build());
         }
+        return this;
       }
       /**
        * 
-       * Expiration timestamp of this reservation
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .google.protobuf.Timestamp expires_at = 4;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-          getExpiresAtFieldBuilder() {
-        if (expiresAtBuilder_ == null) {
-          expiresAtBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
-                  getExpiresAt(),
-                  getParentForChildren(),
-                  isClean());
-          expiresAt_ = null;
+      public Builder addReservations(
+          int index, datacatalog.Datacatalog.Reservation.Builder builderForValue) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          reservationsBuilder_.addMessage(index, builderForValue.build());
         }
-        return expiresAtBuilder_;
+        return this;
       }
-
-      private datacatalog.Datacatalog.Metadata metadata_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> metadataBuilder_;
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public boolean hasMetadata() {
-        return metadataBuilder_ != null || metadata_ != null;
+      public Builder addAllReservations(
+          java.lang.Iterable values) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, reservations_);
+          onChanged();
+        } else {
+          reservationsBuilder_.addAllMessages(values);
+        }
+        return this;
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public datacatalog.Datacatalog.Metadata getMetadata() {
-        if (metadataBuilder_ == null) {
-          return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
+      public Builder clearReservations() {
+        if (reservationsBuilder_ == null) {
+          reservations_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
         } else {
-          return metadataBuilder_.getMessage();
+          reservationsBuilder_.clear();
         }
+        return this;
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder setMetadata(datacatalog.Datacatalog.Metadata value) {
-        if (metadataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          metadata_ = value;
+      public Builder removeReservations(int index) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.remove(index);
           onChanged();
         } else {
-          metadataBuilder_.setMessage(value);
+          reservationsBuilder_.remove(index);
         }
-
         return this;
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder setMetadata(
-          datacatalog.Datacatalog.Metadata.Builder builderForValue) {
-        if (metadataBuilder_ == null) {
-          metadata_ = builderForValue.build();
-          onChanged();
-        } else {
-          metadataBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
+      public datacatalog.Datacatalog.Reservation.Builder getReservationsBuilder(
+          int index) {
+        return getReservationsFieldBuilder().getBuilder(index);
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder mergeMetadata(datacatalog.Datacatalog.Metadata value) {
-        if (metadataBuilder_ == null) {
-          if (metadata_ != null) {
-            metadata_ =
-              datacatalog.Datacatalog.Metadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
-          } else {
-            metadata_ = value;
-          }
-          onChanged();
-        } else {
-          metadataBuilder_.mergeFrom(value);
+      public datacatalog.Datacatalog.ReservationOrBuilder getReservationsOrBuilder(
+          int index) {
+        if (reservationsBuilder_ == null) {
+          return reservations_.get(index);  } else {
+          return reservationsBuilder_.getMessageOrBuilder(index);
         }
-
-        return this;
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public Builder clearMetadata() {
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-          onChanged();
+      public java.util.List 
+           getReservationsOrBuilderList() {
+        if (reservationsBuilder_ != null) {
+          return reservationsBuilder_.getMessageOrBuilderList();
         } else {
-          metadata_ = null;
-          metadataBuilder_ = null;
+          return java.util.Collections.unmodifiableList(reservations_);
         }
-
-        return this;
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public datacatalog.Datacatalog.Metadata.Builder getMetadataBuilder() {
-        
-        onChanged();
-        return getMetadataFieldBuilder().getBuilder();
+      public datacatalog.Datacatalog.Reservation.Builder addReservationsBuilder() {
+        return getReservationsFieldBuilder().addBuilder(
+            datacatalog.Datacatalog.Reservation.getDefaultInstance());
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
-        if (metadataBuilder_ != null) {
-          return metadataBuilder_.getMessageOrBuilder();
-        } else {
-          return metadata_ == null ?
-              datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
-        }
+      public datacatalog.Datacatalog.Reservation.Builder addReservationsBuilder(
+          int index) {
+        return getReservationsFieldBuilder().addBuilder(
+            index, datacatalog.Datacatalog.Reservation.getDefaultInstance());
       }
       /**
        * 
-       * Free-form metadata associated with the artifact
+       * List of (newly created or existing) reservations for artifacts requested
        * 

        *
-       * .datacatalog.Metadata metadata = 6;
+       * repeated .datacatalog.Reservation reservations = 1;
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> 
-          getMetadataFieldBuilder() {
-        if (metadataBuilder_ == null) {
-          metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder>(
-                  getMetadata(),
+      public java.util.List 
+           getReservationsBuilderList() {
+        return getReservationsFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> 
+          getReservationsFieldBuilder() {
+        if (reservationsBuilder_ == null) {
+          reservationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder>(
+                  reservations_,
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
-          metadata_ = null;
+          reservations_ = null;
         }
-        return metadataBuilder_;
+        return reservationsBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -17420,92 +20797,111 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:datacatalog.Reservation)
+      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationsResponse)
     }
 
-    // @@protoc_insertion_point(class_scope:datacatalog.Reservation)
-    private static final datacatalog.Datacatalog.Reservation DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsResponse)
+    private static final datacatalog.Datacatalog.GetOrExtendReservationsResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.Reservation();
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationsResponse();
     }
 
-    public static datacatalog.Datacatalog.Reservation getDefaultInstance() {
+    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public Reservation parsePartialFrom(
+      public GetOrExtendReservationsResponse parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Reservation(input, extensionRegistry);
+        return new GetOrExtendReservationsResponse(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.GetOrExtendReservationsResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface GetOrExtendReservationResponseOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationResponse)
+  public interface ReleaseReservationRequestOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.ReleaseReservationRequest)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * 
-     * The reservation to be acquired or extended
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.Reservation reservation = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    boolean hasReservation();
+    boolean hasReservationId();
     /**
      * 
-     * The reservation to be acquired or extended
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.Reservation reservation = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    datacatalog.Datacatalog.Reservation getReservation();
+    datacatalog.Datacatalog.ReservationID getReservationId();
     /**
      * 
-     * The reservation to be acquired or extended
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.Reservation reservation = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder();
+    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
+
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    java.lang.String getOwnerId();
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    com.google.protobuf.ByteString
+        getOwnerIdBytes();
   }
   /**
    * 
-   * Response including either a newly minted reservation or the existing reservation
+   * Request to release reservation
    * 

    *
-   * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
+   * Protobuf type {@code datacatalog.ReleaseReservationRequest}
    */
-  public  static final class GetOrExtendReservationResponse extends
+  public  static final class ReleaseReservationRequest extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationResponse)
-      GetOrExtendReservationResponseOrBuilder {
+      // @@protoc_insertion_point(message_implements:datacatalog.ReleaseReservationRequest)
+      ReleaseReservationRequestOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use GetOrExtendReservationResponse.newBuilder() to construct.
-    private GetOrExtendReservationResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    // Use ReleaseReservationRequest.newBuilder() to construct.
+    private ReleaseReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private GetOrExtendReservationResponse() {
+    private ReleaseReservationRequest() {
+      ownerId_ = "";
     }
 
     @java.lang.Override
@@ -17513,7 +20909,7 @@ private GetOrExtendReservationResponse() {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private GetOrExtendReservationResponse(
+    private ReleaseReservationRequest(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -17533,18 +20929,24 @@ private GetOrExtendReservationResponse(
               done = true;
               break;
             case 10: {
-              datacatalog.Datacatalog.Reservation.Builder subBuilder = null;
-              if (reservation_ != null) {
-                subBuilder = reservation_.toBuilder();
+              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
+              if (reservationId_ != null) {
+                subBuilder = reservationId_.toBuilder();
               }
-              reservation_ = input.readMessage(datacatalog.Datacatalog.Reservation.parser(), extensionRegistry);
+              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(reservation_);
-                reservation_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(reservationId_);
+                reservationId_ = subBuilder.buildPartial();
               }
 
               break;
             }
+            case 18: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              ownerId_ = s;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -17566,48 +20968,90 @@ private GetOrExtendReservationResponse(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
+              datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
     }
 
-    public static final int RESERVATION_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.Reservation reservation_;
+    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
+    private datacatalog.Datacatalog.ReservationID reservationId_;
     /**
      * 
-     * The reservation to be acquired or extended
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.Reservation reservation = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public boolean hasReservation() {
-      return reservation_ != null;
+    public boolean hasReservationId() {
+      return reservationId_ != null;
     }
     /**
      * 
-     * The reservation to be acquired or extended
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.Reservation reservation = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public datacatalog.Datacatalog.Reservation getReservation() {
-      return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
+    public datacatalog.Datacatalog.ReservationID getReservationId() {
+      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
     }
     /**
      * 
-     * The reservation to be acquired or extended
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.Reservation reservation = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
-      return getReservation();
+    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+      return getReservationId();
+    }
+
+    public static final int OWNER_ID_FIELD_NUMBER = 2;
+    private volatile java.lang.Object ownerId_;
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    public java.lang.String getOwnerId() {
+      java.lang.Object ref = ownerId_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        ownerId_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    public com.google.protobuf.ByteString
+        getOwnerIdBytes() {
+      java.lang.Object ref = ownerId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        ownerId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     private byte memoizedIsInitialized = -1;
@@ -17624,8 +21068,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (reservation_ != null) {
-        output.writeMessage(1, getReservation());
+      if (reservationId_ != null) {
+        output.writeMessage(1, getReservationId());
+      }
+      if (!getOwnerIdBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -17636,9 +21083,12 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (reservation_ != null) {
+      if (reservationId_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getReservation());
+          .computeMessageSize(1, getReservationId());
+      }
+      if (!getOwnerIdBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -17650,16 +21100,18 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse)) {
+      if (!(obj instanceof datacatalog.Datacatalog.ReleaseReservationRequest)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.GetOrExtendReservationResponse other = (datacatalog.Datacatalog.GetOrExtendReservationResponse) obj;
+      datacatalog.Datacatalog.ReleaseReservationRequest other = (datacatalog.Datacatalog.ReleaseReservationRequest) obj;
 
-      if (hasReservation() != other.hasReservation()) return false;
-      if (hasReservation()) {
-        if (!getReservation()
-            .equals(other.getReservation())) return false;
+      if (hasReservationId() != other.hasReservationId()) return false;
+      if (hasReservationId()) {
+        if (!getReservationId()
+            .equals(other.getReservationId())) return false;
       }
+      if (!getOwnerId()
+          .equals(other.getOwnerId())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -17671,78 +21123,80 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasReservation()) {
-        hash = (37 * hash) + RESERVATION_FIELD_NUMBER;
-        hash = (53 * hash) + getReservation().hashCode();
+      if (hasReservationId()) {
+        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
+        hash = (53 * hash) + getReservationId().hashCode();
       }
+      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOwnerId().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -17755,7 +21209,7 @@ public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationResponse prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.ReleaseReservationRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -17772,29 +21226,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Response including either a newly minted reservation or the existing reservation
+     * Request to release reservation
      * 

      *
-     * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
+     * Protobuf type {@code datacatalog.ReleaseReservationRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationResponse)
-        datacatalog.Datacatalog.GetOrExtendReservationResponseOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.ReleaseReservationRequest)
+        datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
+                datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.GetOrExtendReservationResponse.newBuilder()
+      // Construct using datacatalog.Datacatalog.ReleaseReservationRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -17812,29 +21266,31 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (reservationBuilder_ == null) {
-          reservation_ = null;
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
         } else {
-          reservation_ = null;
-          reservationBuilder_ = null;
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
         }
+        ownerId_ = "";
+
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance();
+      public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationResponse build() {
-        datacatalog.Datacatalog.GetOrExtendReservationResponse result = buildPartial();
+      public datacatalog.Datacatalog.ReleaseReservationRequest build() {
+        datacatalog.Datacatalog.ReleaseReservationRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -17842,13 +21298,14 @@ public datacatalog.Datacatalog.GetOrExtendReservationResponse build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationResponse buildPartial() {
-        datacatalog.Datacatalog.GetOrExtendReservationResponse result = new datacatalog.Datacatalog.GetOrExtendReservationResponse(this);
-        if (reservationBuilder_ == null) {
-          result.reservation_ = reservation_;
+      public datacatalog.Datacatalog.ReleaseReservationRequest buildPartial() {
+        datacatalog.Datacatalog.ReleaseReservationRequest result = new datacatalog.Datacatalog.ReleaseReservationRequest(this);
+        if (reservationIdBuilder_ == null) {
+          result.reservationId_ = reservationId_;
         } else {
-          result.reservation_ = reservationBuilder_.build();
+          result.reservationId_ = reservationIdBuilder_.build();
         }
+        result.ownerId_ = ownerId_;
         onBuilt();
         return result;
       }
@@ -17887,18 +21344,22 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse) {
-          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationResponse)other);
+        if (other instanceof datacatalog.Datacatalog.ReleaseReservationRequest) {
+          return mergeFrom((datacatalog.Datacatalog.ReleaseReservationRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationResponse other) {
-        if (other == datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance()) return this;
-        if (other.hasReservation()) {
-          mergeReservation(other.getReservation());
+      public Builder mergeFrom(datacatalog.Datacatalog.ReleaseReservationRequest other) {
+        if (other == datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance()) return this;
+        if (other.hasReservationId()) {
+          mergeReservationId(other.getReservationId());
+        }
+        if (!other.getOwnerId().isEmpty()) {
+          ownerId_ = other.ownerId_;
+          onChanged();
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -17915,11 +21376,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        datacatalog.Datacatalog.GetOrExtendReservationResponse parsedMessage = null;
+        datacatalog.Datacatalog.ReleaseReservationRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationResponse) e.getUnfinishedMessage();
+          parsedMessage = (datacatalog.Datacatalog.ReleaseReservationRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -17929,157 +21390,246 @@ public Builder mergeFrom(
         return this;
       }
 
-      private datacatalog.Datacatalog.Reservation reservation_;
+      private datacatalog.Datacatalog.ReservationID reservationId_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> reservationBuilder_;
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public boolean hasReservation() {
-        return reservationBuilder_ != null || reservation_ != null;
+      public boolean hasReservationId() {
+        return reservationIdBuilder_ != null || reservationId_ != null;
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public datacatalog.Datacatalog.Reservation getReservation() {
-        if (reservationBuilder_ == null) {
-          return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
+      public datacatalog.Datacatalog.ReservationID getReservationId() {
+        if (reservationIdBuilder_ == null) {
+          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
         } else {
-          return reservationBuilder_.getMessage();
+          return reservationIdBuilder_.getMessage();
         }
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder setReservation(datacatalog.Datacatalog.Reservation value) {
-        if (reservationBuilder_ == null) {
+      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          reservation_ = value;
+          reservationId_ = value;
           onChanged();
         } else {
-          reservationBuilder_.setMessage(value);
+          reservationIdBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder setReservation(
-          datacatalog.Datacatalog.Reservation.Builder builderForValue) {
-        if (reservationBuilder_ == null) {
-          reservation_ = builderForValue.build();
+      public Builder setReservationId(
+          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = builderForValue.build();
           onChanged();
         } else {
-          reservationBuilder_.setMessage(builderForValue.build());
+          reservationIdBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder mergeReservation(datacatalog.Datacatalog.Reservation value) {
-        if (reservationBuilder_ == null) {
-          if (reservation_ != null) {
-            reservation_ =
-              datacatalog.Datacatalog.Reservation.newBuilder(reservation_).mergeFrom(value).buildPartial();
+      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
+          if (reservationId_ != null) {
+            reservationId_ =
+              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
           } else {
-            reservation_ = value;
+            reservationId_ = value;
           }
           onChanged();
         } else {
-          reservationBuilder_.mergeFrom(value);
+          reservationIdBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder clearReservation() {
-        if (reservationBuilder_ == null) {
-          reservation_ = null;
+      public Builder clearReservationId() {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
           onChanged();
         } else {
-          reservation_ = null;
-          reservationBuilder_ = null;
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
         }
 
         return this;
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public datacatalog.Datacatalog.Reservation.Builder getReservationBuilder() {
+      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
         
         onChanged();
-        return getReservationFieldBuilder().getBuilder();
+        return getReservationIdFieldBuilder().getBuilder();
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
-        if (reservationBuilder_ != null) {
-          return reservationBuilder_.getMessageOrBuilder();
+      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+        if (reservationIdBuilder_ != null) {
+          return reservationIdBuilder_.getMessageOrBuilder();
         } else {
-          return reservation_ == null ?
-              datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
+          return reservationId_ == null ?
+              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+        }
+      }
+      /**
+       * 
+       * The unique ID for the reservation
+       * 

+       *
+       * .datacatalog.ReservationID reservation_id = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
+          getReservationIdFieldBuilder() {
+        if (reservationIdBuilder_ == null) {
+          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
+                  getReservationId(),
+                  getParentForChildren(),
+                  isClean());
+          reservationId_ = null;
+        }
+        return reservationIdBuilder_;
+      }
+
+      private java.lang.Object ownerId_ = "";
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public java.lang.String getOwnerId() {
+        java.lang.Object ref = ownerId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          ownerId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public com.google.protobuf.ByteString
+          getOwnerIdBytes() {
+        java.lang.Object ref = ownerId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          ownerId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
        * 
-       * The reservation to be acquired or extended
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder setOwnerId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        ownerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder clearOwnerId() {
+        
+        ownerId_ = getDefaultInstance().getOwnerId();
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * The unique ID of the owner for the reservation
        * 

        *
-       * .datacatalog.Reservation reservation = 1;
+       * string owner_id = 2;
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> 
-          getReservationFieldBuilder() {
-        if (reservationBuilder_ == null) {
-          reservationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder>(
-                  getReservation(),
-                  getParentForChildren(),
-                  isClean());
-          reservation_ = null;
-        }
-        return reservationBuilder_;
+      public Builder setOwnerIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        ownerId_ = value;
+        onChanged();
+        return this;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -18094,111 +21644,112 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationResponse)
+      // @@protoc_insertion_point(builder_scope:datacatalog.ReleaseReservationRequest)
     }
 
-    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationResponse)
-    private static final datacatalog.Datacatalog.GetOrExtendReservationResponse DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationRequest)
+    private static final datacatalog.Datacatalog.ReleaseReservationRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationResponse();
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReleaseReservationRequest();
     }
 
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstance() {
+    public static datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public GetOrExtendReservationResponse parsePartialFrom(
+      public ReleaseReservationRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOrExtendReservationResponse(input, extensionRegistry);
+        return new ReleaseReservationRequest(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface ReleaseReservationRequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.ReleaseReservationRequest)
+  public interface ReleaseReservationsRequestOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.ReleaseReservationsRequest)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * 
-     * The unique ID for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    boolean hasReservationId();
+    java.util.List 
+        getReservationsList();
     /**
      * 
-     * The unique ID for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    datacatalog.Datacatalog.ReservationID getReservationId();
+    datacatalog.Datacatalog.ReleaseReservationRequest getReservations(int index);
     /**
      * 
-     * The unique ID for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
-
+    int getReservationsCount();
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * string owner_id = 2;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    java.lang.String getOwnerId();
+    java.util.List 
+        getReservationsOrBuilderList();
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * string owner_id = 2;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    com.google.protobuf.ByteString
-        getOwnerIdBytes();
+    datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder getReservationsOrBuilder(
+        int index);
   }
   /**
    * 
-   * Request to release reservation
+   * Request message for releasing reservations for multiple artifacts in a single operation.
    * 

    *
-   * Protobuf type {@code datacatalog.ReleaseReservationRequest}
+   * Protobuf type {@code datacatalog.ReleaseReservationsRequest}
    */
-  public  static final class ReleaseReservationRequest extends
+  public  static final class ReleaseReservationsRequest extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.ReleaseReservationRequest)
-      ReleaseReservationRequestOrBuilder {
+      // @@protoc_insertion_point(message_implements:datacatalog.ReleaseReservationsRequest)
+      ReleaseReservationsRequestOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use ReleaseReservationRequest.newBuilder() to construct.
-    private ReleaseReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    // Use ReleaseReservationsRequest.newBuilder() to construct.
+    private ReleaseReservationsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private ReleaseReservationRequest() {
-      ownerId_ = "";
+    private ReleaseReservationsRequest() {
+      reservations_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -18206,7 +21757,7 @@ private ReleaseReservationRequest() {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private ReleaseReservationRequest(
+    private ReleaseReservationsRequest(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -18226,22 +21777,12 @@ private ReleaseReservationRequest(
               done = true;
               break;
             case 10: {
-              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
-              if (reservationId_ != null) {
-                subBuilder = reservationId_.toBuilder();
-              }
-              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(reservationId_);
-                reservationId_ = subBuilder.buildPartial();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                reservations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
               }
-
-              break;
-            }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              ownerId_ = s;
+              reservations_.add(
+                  input.readMessage(datacatalog.Datacatalog.ReleaseReservationRequest.parser(), extensionRegistry));
               break;
             }
             default: {
@@ -18259,96 +21800,79 @@ private ReleaseReservationRequest(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          reservations_ = java.util.Collections.unmodifiableList(reservations_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
+              datacatalog.Datacatalog.ReleaseReservationsRequest.class, datacatalog.Datacatalog.ReleaseReservationsRequest.Builder.class);
     }
 
-    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.ReservationID reservationId_;
+    public static final int RESERVATIONS_FIELD_NUMBER = 1;
+    private java.util.List reservations_;
     /**
      * 
-     * The unique ID for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    public boolean hasReservationId() {
-      return reservationId_ != null;
+    public java.util.List getReservationsList() {
+      return reservations_;
     }
     /**
      * 
-     * The unique ID for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    public datacatalog.Datacatalog.ReservationID getReservationId() {
-      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+    public java.util.List 
+        getReservationsOrBuilderList() {
+      return reservations_;
     }
     /**
      * 
-     * The unique ID for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-      return getReservationId();
+    public int getReservationsCount() {
+      return reservations_.size();
     }
-
-    public static final int OWNER_ID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object ownerId_;
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * string owner_id = 2;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    public java.lang.String getOwnerId() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        ownerId_ = s;
-        return s;
-      }
+    public datacatalog.Datacatalog.ReleaseReservationRequest getReservations(int index) {
+      return reservations_.get(index);
     }
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * List of reservation requests for artifacts to release
      * 

      *
-     * string owner_id = 2;
+     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
      */
-    public com.google.protobuf.ByteString
-        getOwnerIdBytes() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        ownerId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder getReservationsOrBuilder(
+        int index) {
+      return reservations_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -18365,11 +21889,8 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (reservationId_ != null) {
-        output.writeMessage(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
+      for (int i = 0; i < reservations_.size(); i++) {
+        output.writeMessage(1, reservations_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -18380,12 +21901,9 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (reservationId_ != null) {
+      for (int i = 0; i < reservations_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
+          .computeMessageSize(1, reservations_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -18397,18 +21915,13 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.ReleaseReservationRequest)) {
+      if (!(obj instanceof datacatalog.Datacatalog.ReleaseReservationsRequest)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.ReleaseReservationRequest other = (datacatalog.Datacatalog.ReleaseReservationRequest) obj;
+      datacatalog.Datacatalog.ReleaseReservationsRequest other = (datacatalog.Datacatalog.ReleaseReservationsRequest) obj;
 
-      if (hasReservationId() != other.hasReservationId()) return false;
-      if (hasReservationId()) {
-        if (!getReservationId()
-            .equals(other.getReservationId())) return false;
-      }
-      if (!getOwnerId()
-          .equals(other.getOwnerId())) return false;
+      if (!getReservationsList()
+          .equals(other.getReservationsList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -18420,80 +21933,78 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasReservationId()) {
-        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationId().hashCode();
+      if (getReservationsCount() > 0) {
+        hash = (37 * hash) + RESERVATIONS_FIELD_NUMBER;
+        hash = (53 * hash) + getReservationsList().hashCode();
       }
-      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerId().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -18506,7 +22017,7 @@ public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.ReleaseReservationRequest prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.ReleaseReservationsRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -18523,29 +22034,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Request to release reservation
+     * Request message for releasing reservations for multiple artifacts in a single operation.
      * 

      *
-     * Protobuf type {@code datacatalog.ReleaseReservationRequest}
+     * Protobuf type {@code datacatalog.ReleaseReservationsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.ReleaseReservationRequest)
-        datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.ReleaseReservationsRequest)
+        datacatalog.Datacatalog.ReleaseReservationsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
+                datacatalog.Datacatalog.ReleaseReservationsRequest.class, datacatalog.Datacatalog.ReleaseReservationsRequest.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.ReleaseReservationRequest.newBuilder()
+      // Construct using datacatalog.Datacatalog.ReleaseReservationsRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -18558,36 +22069,35 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getReservationsFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
+        if (reservationsBuilder_ == null) {
+          reservations_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
+          reservationsBuilder_.clear();
         }
-        ownerId_ = "";
-
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance();
+      public datacatalog.Datacatalog.ReleaseReservationsRequest getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.ReleaseReservationsRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationRequest build() {
-        datacatalog.Datacatalog.ReleaseReservationRequest result = buildPartial();
+      public datacatalog.Datacatalog.ReleaseReservationsRequest build() {
+        datacatalog.Datacatalog.ReleaseReservationsRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -18595,14 +22105,18 @@ public datacatalog.Datacatalog.ReleaseReservationRequest build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationRequest buildPartial() {
-        datacatalog.Datacatalog.ReleaseReservationRequest result = new datacatalog.Datacatalog.ReleaseReservationRequest(this);
-        if (reservationIdBuilder_ == null) {
-          result.reservationId_ = reservationId_;
+      public datacatalog.Datacatalog.ReleaseReservationsRequest buildPartial() {
+        datacatalog.Datacatalog.ReleaseReservationsRequest result = new datacatalog.Datacatalog.ReleaseReservationsRequest(this);
+        int from_bitField0_ = bitField0_;
+        if (reservationsBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            reservations_ = java.util.Collections.unmodifiableList(reservations_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.reservations_ = reservations_;
         } else {
-          result.reservationId_ = reservationIdBuilder_.build();
+          result.reservations_ = reservationsBuilder_.build();
         }
-        result.ownerId_ = ownerId_;
         onBuilt();
         return result;
       }
@@ -18641,22 +22155,41 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.ReleaseReservationRequest) {
-          return mergeFrom((datacatalog.Datacatalog.ReleaseReservationRequest)other);
+        if (other instanceof datacatalog.Datacatalog.ReleaseReservationsRequest) {
+          return mergeFrom((datacatalog.Datacatalog.ReleaseReservationsRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.ReleaseReservationRequest other) {
-        if (other == datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance()) return this;
-        if (other.hasReservationId()) {
-          mergeReservationId(other.getReservationId());
-        }
-        if (!other.getOwnerId().isEmpty()) {
-          ownerId_ = other.ownerId_;
-          onChanged();
+      public Builder mergeFrom(datacatalog.Datacatalog.ReleaseReservationsRequest other) {
+        if (other == datacatalog.Datacatalog.ReleaseReservationsRequest.getDefaultInstance()) return this;
+        if (reservationsBuilder_ == null) {
+          if (!other.reservations_.isEmpty()) {
+            if (reservations_.isEmpty()) {
+              reservations_ = other.reservations_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureReservationsIsMutable();
+              reservations_.addAll(other.reservations_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.reservations_.isEmpty()) {
+            if (reservationsBuilder_.isEmpty()) {
+              reservationsBuilder_.dispose();
+              reservationsBuilder_ = null;
+              reservations_ = other.reservations_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              reservationsBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getReservationsFieldBuilder() : null;
+            } else {
+              reservationsBuilder_.addAllMessages(other.reservations_);
+            }
+          }
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -18673,260 +22206,331 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        datacatalog.Datacatalog.ReleaseReservationRequest parsedMessage = null;
+        datacatalog.Datacatalog.ReleaseReservationsRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.ReleaseReservationRequest) e.getUnfinishedMessage();
+          parsedMessage = (datacatalog.Datacatalog.ReleaseReservationsRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
           }
         }
-        return this;
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List reservations_ =
+        java.util.Collections.emptyList();
+      private void ensureReservationsIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          reservations_ = new java.util.ArrayList(reservations_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          datacatalog.Datacatalog.ReleaseReservationRequest, datacatalog.Datacatalog.ReleaseReservationRequest.Builder, datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder> reservationsBuilder_;
+
+      /**
+       * 
+       * List of reservation requests for artifacts to release
+       * 

+       *
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       */
+      public java.util.List getReservationsList() {
+        if (reservationsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(reservations_);
+        } else {
+          return reservationsBuilder_.getMessageList();
+        }
       }
-
-      private datacatalog.Datacatalog.ReservationID reservationId_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public boolean hasReservationId() {
-        return reservationIdBuilder_ != null || reservationId_ != null;
+      public int getReservationsCount() {
+        if (reservationsBuilder_ == null) {
+          return reservations_.size();
+        } else {
+          return reservationsBuilder_.getCount();
+        }
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public datacatalog.Datacatalog.ReservationID getReservationId() {
-        if (reservationIdBuilder_ == null) {
-          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+      public datacatalog.Datacatalog.ReleaseReservationRequest getReservations(int index) {
+        if (reservationsBuilder_ == null) {
+          return reservations_.get(index);
         } else {
-          return reservationIdBuilder_.getMessage();
+          return reservationsBuilder_.getMessage(index);
         }
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
+      public Builder setReservations(
+          int index, datacatalog.Datacatalog.ReleaseReservationRequest value) {
+        if (reservationsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          reservationId_ = value;
+          ensureReservationsIsMutable();
+          reservations_.set(index, value);
           onChanged();
         } else {
-          reservationIdBuilder_.setMessage(value);
+          reservationsBuilder_.setMessage(index, value);
         }
-
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public Builder setReservationId(
-          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = builderForValue.build();
+      public Builder setReservations(
+          int index, datacatalog.Datacatalog.ReleaseReservationRequest.Builder builderForValue) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.set(index, builderForValue.build());
           onChanged();
         } else {
-          reservationIdBuilder_.setMessage(builderForValue.build());
+          reservationsBuilder_.setMessage(index, builderForValue.build());
         }
-
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
-          if (reservationId_ != null) {
-            reservationId_ =
-              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
-          } else {
-            reservationId_ = value;
+      public Builder addReservations(datacatalog.Datacatalog.ReleaseReservationRequest value) {
+        if (reservationsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
+          ensureReservationsIsMutable();
+          reservations_.add(value);
           onChanged();
         } else {
-          reservationIdBuilder_.mergeFrom(value);
+          reservationsBuilder_.addMessage(value);
         }
-
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public Builder clearReservationId() {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
+      public Builder addReservations(
+          int index, datacatalog.Datacatalog.ReleaseReservationRequest value) {
+        if (reservationsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureReservationsIsMutable();
+          reservations_.add(index, value);
           onChanged();
         } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
+          reservationsBuilder_.addMessage(index, value);
         }
-
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
-        
-        onChanged();
-        return getReservationIdFieldBuilder().getBuilder();
+      public Builder addReservations(
+          datacatalog.Datacatalog.ReleaseReservationRequest.Builder builderForValue) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.add(builderForValue.build());
+          onChanged();
+        } else {
+          reservationsBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-        if (reservationIdBuilder_ != null) {
-          return reservationIdBuilder_.getMessageOrBuilder();
+      public Builder addReservations(
+          int index, datacatalog.Datacatalog.ReleaseReservationRequest.Builder builderForValue) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.add(index, builderForValue.build());
+          onChanged();
         } else {
-          return reservationId_ == null ?
-              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+          reservationsBuilder_.addMessage(index, builderForValue.build());
         }
+        return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
-          getReservationIdFieldBuilder() {
-        if (reservationIdBuilder_ == null) {
-          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
-                  getReservationId(),
-                  getParentForChildren(),
-                  isClean());
-          reservationId_ = null;
+      public Builder addAllReservations(
+          java.lang.Iterable values) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, reservations_);
+          onChanged();
+        } else {
+          reservationsBuilder_.addAllMessages(values);
         }
-        return reservationIdBuilder_;
+        return this;
       }
-
-      private java.lang.Object ownerId_ = "";
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * string owner_id = 2;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public java.lang.String getOwnerId() {
-        java.lang.Object ref = ownerId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          ownerId_ = s;
-          return s;
+      public Builder clearReservations() {
+        if (reservationsBuilder_ == null) {
+          reservations_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
         } else {
-          return (java.lang.String) ref;
+          reservationsBuilder_.clear();
         }
+        return this;
       }
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * string owner_id = 2;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public com.google.protobuf.ByteString
-          getOwnerIdBytes() {
-        java.lang.Object ref = ownerId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          ownerId_ = b;
-          return b;
+      public Builder removeReservations(int index) {
+        if (reservationsBuilder_ == null) {
+          ensureReservationsIsMutable();
+          reservations_.remove(index);
+          onChanged();
         } else {
-          return (com.google.protobuf.ByteString) ref;
+          reservationsBuilder_.remove(index);
         }
+        return this;
       }
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * string owner_id = 2;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public Builder setOwnerId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        ownerId_ = value;
-        onChanged();
-        return this;
+      public datacatalog.Datacatalog.ReleaseReservationRequest.Builder getReservationsBuilder(
+          int index) {
+        return getReservationsFieldBuilder().getBuilder(index);
       }
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * string owner_id = 2;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public Builder clearOwnerId() {
-        
-        ownerId_ = getDefaultInstance().getOwnerId();
-        onChanged();
-        return this;
+      public datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder getReservationsOrBuilder(
+          int index) {
+        if (reservationsBuilder_ == null) {
+          return reservations_.get(index);  } else {
+          return reservationsBuilder_.getMessageOrBuilder(index);
+        }
       }
       /**
        * 
-       * The unique ID of the owner for the reservation
+       * List of reservation requests for artifacts to release
        * 

        *
-       * string owner_id = 2;
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
        */
-      public Builder setOwnerIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        ownerId_ = value;
-        onChanged();
-        return this;
+      public java.util.List 
+           getReservationsOrBuilderList() {
+        if (reservationsBuilder_ != null) {
+          return reservationsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(reservations_);
+        }
+      }
+      /**
+       * 
+       * List of reservation requests for artifacts to release
+       * 

+       *
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       */
+      public datacatalog.Datacatalog.ReleaseReservationRequest.Builder addReservationsBuilder() {
+        return getReservationsFieldBuilder().addBuilder(
+            datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance());
+      }
+      /**
+       * 
+       * List of reservation requests for artifacts to release
+       * 

+       *
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       */
+      public datacatalog.Datacatalog.ReleaseReservationRequest.Builder addReservationsBuilder(
+          int index) {
+        return getReservationsFieldBuilder().addBuilder(
+            index, datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance());
+      }
+      /**
+       * 
+       * List of reservation requests for artifacts to release
+       * 

+       *
+       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       */
+      public java.util.List 
+           getReservationsBuilderList() {
+        return getReservationsFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          datacatalog.Datacatalog.ReleaseReservationRequest, datacatalog.Datacatalog.ReleaseReservationRequest.Builder, datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder> 
+          getReservationsFieldBuilder() {
+        if (reservationsBuilder_ == null) {
+          reservationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              datacatalog.Datacatalog.ReleaseReservationRequest, datacatalog.Datacatalog.ReleaseReservationRequest.Builder, datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder>(
+                  reservations_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          reservations_ = null;
+        }
+        return reservationsBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -18941,41 +22545,41 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:datacatalog.ReleaseReservationRequest)
+      // @@protoc_insertion_point(builder_scope:datacatalog.ReleaseReservationsRequest)
     }
 
-    // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationRequest)
-    private static final datacatalog.Datacatalog.ReleaseReservationRequest DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationsRequest)
+    private static final datacatalog.Datacatalog.ReleaseReservationsRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReleaseReservationRequest();
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReleaseReservationsRequest();
     }
 
-    public static datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstance() {
+    public static datacatalog.Datacatalog.ReleaseReservationsRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public ReleaseReservationRequest parsePartialFrom(
+      public ReleaseReservationsRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReleaseReservationRequest(input, extensionRegistry);
+        return new ReleaseReservationsRequest(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.ReleaseReservationsRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -34934,6 +38538,11 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_DeleteArtifactRequest_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_datacatalog_DeleteArtifactsRequest_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_DeleteArtifactResponse_descriptor;
   private static final 
@@ -34949,6 +38558,11 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_Reservation_descriptor;
   private static final 
@@ -34959,11 +38573,21 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_ReleaseReservationRequest_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_ReleaseReservationResponse_descriptor;
   private static final 
@@ -35095,97 +38719,114 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
       "tifact_id\030\001 \001(\t\"{\n\025DeleteArtifactRequest" +
       "\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.DatasetI" +
       "D\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001" +
-      "(\tH\000B\016\n\014query_handle\"\030\n\026DeleteArtifactRe" +
-      "sponse\"M\n\rReservationID\022*\n\ndataset_id\030\001 " +
-      "\001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name\030" +
-      "\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest\022" +
-      "2\n\016reservation_id\030\001 \001(\0132\032.datacatalog.Re" +
-      "servationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbe" +
-      "at_interval\030\003 \001(\0132\031.google.protobuf.Dura" +
-      "tion\"\343\001\n\013Reservation\0222\n\016reservation_id\030\001" +
-      " \001(\0132\032.datacatalog.ReservationID\022\020\n\010owne" +
-      "r_id\030\002 \001(\t\0225\n\022heartbeat_interval\030\003 \001(\0132\031" +
-      ".google.protobuf.Duration\022.\n\nexpires_at\030" +
-      "\004 \001(\0132\032.google.protobuf.Timestamp\022\'\n\010met" +
-      "adata\030\006 \001(\0132\025.datacatalog.Metadata\"O\n\036Ge" +
-      "tOrExtendReservationResponse\022-\n\013reservat" +
-      "ion\030\001 \001(\0132\030.datacatalog.Reservation\"a\n\031R" +
-      "eleaseReservationRequest\0222\n\016reservation_" +
-      "id\030\001 \001(\0132\032.datacatalog.ReservationID\022\020\n\010" +
-      "owner_id\030\002 \001(\t\"\034\n\032ReleaseReservationResp" +
-      "onse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalo" +
-      "g.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacata" +
-      "log.Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tP" +
-      "artition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\t" +
-      "DatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t" +
-      "\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUI" +
-      "D\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007data" +
-      "set\030\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004dat" +
-      "a\030\003 \003(\0132\031.datacatalog.ArtifactData\022\'\n\010me" +
-      "tadata\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\np" +
-      "artitions\030\005 \003(\0132\026.datacatalog.Partition\022" +
-      "\036\n\004tags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreat" +
-      "ed_at\030\007 \001(\0132\032.google.protobuf.Timestamp\"" +
-      "C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002" +
-      " \001(\0132\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004n" +
-      "ame\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007datase" +
-      "t\030\003 \001(\0132\026.datacatalog.DatasetID\"m\n\010Metad" +
-      "ata\0222\n\007key_map\030\001 \003(\0132!.datacatalog.Metad" +
-      "ata.KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 " +
-      "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpressi" +
-      "on\0222\n\007filters\030\001 \003(\0132!.datacatalog.Single" +
-      "PropertyFilter\"\211\003\n\024SinglePropertyFilter\022" +
-      "4\n\ntag_filter\030\001 \001(\0132\036.datacatalog.TagPro" +
-      "pertyFilterH\000\022@\n\020partition_filter\030\002 \001(\0132" +
-      "$.datacatalog.PartitionPropertyFilterH\000\022" +
-      ">\n\017artifact_filter\030\003 \001(\0132#.datacatalog.A" +
-      "rtifactPropertyFilterH\000\022<\n\016dataset_filte" +
-      "r\030\004 \001(\0132\".datacatalog.DatasetPropertyFil" +
-      "terH\000\022F\n\010operator\030\n \001(\01624.datacatalog.Si" +
-      "nglePropertyFilter.ComparisonOperator\" \n" +
-      "\022ComparisonOperator\022\n\n\006EQUALS\020\000B\021\n\017prope" +
-      "rty_filter\";\n\026ArtifactPropertyFilter\022\025\n\013" +
-      "artifact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagPr" +
-      "opertyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010prop" +
-      "erty\"S\n\027PartitionPropertyFilter\022,\n\007key_v" +
-      "al\030\001 \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n" +
-      "\010property\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r" +
-      "\n\005value\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021" +
-      "\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006dom" +
-      "ain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010proper" +
-      "ty\"\361\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022" +
-      "\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.dataca" +
-      "talog.PaginationOptions.SortKey\022;\n\tsortO" +
-      "rder\030\004 \001(\0162(.datacatalog.PaginationOptio" +
-      "ns.SortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020" +
-      "\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_" +
-      "TIME\020\0002\341\007\n\013DataCatalog\022V\n\rCreateDataset\022" +
-      "!.datacatalog.CreateDatasetRequest\032\".dat" +
-      "acatalog.CreateDatasetResponse\022M\n\nGetDat" +
-      "aset\022\036.datacatalog.GetDatasetRequest\032\037.d" +
-      "atacatalog.GetDatasetResponse\022Y\n\016CreateA" +
-      "rtifact\022\".datacatalog.CreateArtifactRequ" +
-      "est\032#.datacatalog.CreateArtifactResponse" +
-      "\022P\n\013GetArtifact\022\037.datacatalog.GetArtifac" +
-      "tRequest\032 .datacatalog.GetArtifactRespon" +
-      "se\022A\n\006AddTag\022\032.datacatalog.AddTagRequest" +
-      "\032\033.datacatalog.AddTagResponse\022V\n\rListArt" +
-      "ifacts\022!.datacatalog.ListArtifactsReques" +
-      "t\032\".datacatalog.ListArtifactsResponse\022S\n" +
-      "\014ListDatasets\022 .datacatalog.ListDatasets" +
-      "Request\032!.datacatalog.ListDatasetsRespon" +
-      "se\022Y\n\016UpdateArtifact\022\".datacatalog.Updat" +
-      "eArtifactRequest\032#.datacatalog.UpdateArt" +
-      "ifactResponse\022Y\n\016DeleteArtifact\022\".dataca" +
-      "talog.DeleteArtifactRequest\032#.datacatalo" +
-      "g.DeleteArtifactResponse\022q\n\026GetOrExtendR" +
-      "eservation\022*.datacatalog.GetOrExtendRese" +
-      "rvationRequest\032+.datacatalog.GetOrExtend" +
-      "ReservationResponse\022e\n\022ReleaseReservatio" +
-      "n\022&.datacatalog.ReleaseReservationReques" +
-      "t\032\'.datacatalog.ReleaseReservationRespon" +
-      "seB=Z;github.com/flyteorg/flyteidl/gen/p" +
-      "b-go/flyteidl/datacatalogb\006proto3"
+      "(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifactsR" +
+      "equest\0225\n\tartifacts\030\001 \003(\0132\".datacatalog." +
+      "DeleteArtifactRequest\"\030\n\026DeleteArtifactR" +
+      "esponse\"M\n\rReservationID\022*\n\ndataset_id\030\001" +
+      " \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name" +
+      "\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest" +
+      "\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog.R" +
+      "eservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartb" +
+      "eat_interval\030\003 \001(\0132\031.google.protobuf.Dur" +
+      "ation\"b\n\036GetOrExtendReservationsRequest\022" +
+      "@\n\014reservations\030\001 \003(\0132*.datacatalog.GetO" +
+      "rExtendReservationRequest\"\343\001\n\013Reservatio" +
+      "n\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog." +
+      "ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heart" +
+      "beat_interval\030\003 \001(\0132\031.google.protobuf.Du" +
+      "ration\022.\n\nexpires_at\030\004 \001(\0132\032.google.prot" +
+      "obuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.datac" +
+      "atalog.Metadata\"O\n\036GetOrExtendReservatio" +
+      "nResponse\022-\n\013reservation\030\001 \001(\0132\030.datacat" +
+      "alog.Reservation\"Q\n\037GetOrExtendReservati" +
+      "onsResponse\022.\n\014reservations\030\001 \003(\0132\030.data" +
+      "catalog.Reservation\"a\n\031ReleaseReservatio" +
+      "nRequest\0222\n\016reservation_id\030\001 \001(\0132\032.datac" +
+      "atalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\"Z" +
+      "\n\032ReleaseReservationsRequest\022<\n\014reservat" +
+      "ions\030\001 \003(\0132&.datacatalog.ReleaseReservat" +
+      "ionRequest\"\034\n\032ReleaseReservationResponse" +
+      "\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.Da" +
+      "tasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog." +
+      "Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tParti" +
+      "tion\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\tData" +
+      "setID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n\006" +
+      "domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005 " +
+      "\001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007dataset\030" +
+      "\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004data\030\003 " +
+      "\003(\0132\031.datacatalog.ArtifactData\022\'\n\010metada" +
+      "ta\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\nparti" +
+      "tions\030\005 \003(\0132\026.datacatalog.Partition\022\036\n\004t" +
+      "ags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreated_a" +
+      "t\030\007 \001(\0132\032.google.protobuf.Timestamp\"C\n\014A" +
+      "rtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002 \001(\013" +
+      "2\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004name\030" +
+      "\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007dataset\030\003 " +
+      "\001(\0132\026.datacatalog.DatasetID\"m\n\010Metadata\022" +
+      "2\n\007key_map\030\001 \003(\0132!.datacatalog.Metadata." +
+      "KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 \001(\t\022" +
+      "\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpression\0222" +
+      "\n\007filters\030\001 \003(\0132!.datacatalog.SingleProp" +
+      "ertyFilter\"\211\003\n\024SinglePropertyFilter\0224\n\nt" +
+      "ag_filter\030\001 \001(\0132\036.datacatalog.TagPropert" +
+      "yFilterH\000\022@\n\020partition_filter\030\002 \001(\0132$.da" +
+      "tacatalog.PartitionPropertyFilterH\000\022>\n\017a" +
+      "rtifact_filter\030\003 \001(\0132#.datacatalog.Artif" +
+      "actPropertyFilterH\000\022<\n\016dataset_filter\030\004 " +
+      "\001(\0132\".datacatalog.DatasetPropertyFilterH" +
+      "\000\022F\n\010operator\030\n \001(\01624.datacatalog.Single" +
+      "PropertyFilter.ComparisonOperator\" \n\022Com" +
+      "parisonOperator\022\n\n\006EQUALS\020\000B\021\n\017property_" +
+      "filter\";\n\026ArtifactPropertyFilter\022\025\n\013arti" +
+      "fact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagProper" +
+      "tyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010property" +
+      "\"S\n\027PartitionPropertyFilter\022,\n\007key_val\030\001" +
+      " \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n\010pro" +
+      "perty\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
+      "lue\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021\n\007pr" +
+      "oject\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006domain\030" +
+      "\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010property\"\361" +
+      "\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005t" +
+      "oken\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatalo" +
+      "g.PaginationOptions.SortKey\022;\n\tsortOrder" +
+      "\030\004 \001(\0162(.datacatalog.PaginationOptions.S" +
+      "ortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n" +
+      "\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME" +
+      "\020\0002\235\n\n\013DataCatalog\022V\n\rCreateDataset\022!.da" +
+      "tacatalog.CreateDatasetRequest\032\".datacat" +
+      "alog.CreateDatasetResponse\022M\n\nGetDataset" +
+      "\022\036.datacatalog.GetDatasetRequest\032\037.datac" +
+      "atalog.GetDatasetResponse\022Y\n\016CreateArtif" +
+      "act\022\".datacatalog.CreateArtifactRequest\032" +
+      "#.datacatalog.CreateArtifactResponse\022P\n\013" +
+      "GetArtifact\022\037.datacatalog.GetArtifactReq" +
+      "uest\032 .datacatalog.GetArtifactResponse\022A" +
+      "\n\006AddTag\022\032.datacatalog.AddTagRequest\032\033.d" +
+      "atacatalog.AddTagResponse\022V\n\rListArtifac" +
+      "ts\022!.datacatalog.ListArtifactsRequest\032\"." +
+      "datacatalog.ListArtifactsResponse\022S\n\014Lis" +
+      "tDatasets\022 .datacatalog.ListDatasetsRequ" +
+      "est\032!.datacatalog.ListDatasetsResponse\022Y" +
+      "\n\016UpdateArtifact\022\".datacatalog.UpdateArt" +
+      "ifactRequest\032#.datacatalog.UpdateArtifac" +
+      "tResponse\022Y\n\016DeleteArtifact\022\".datacatalo" +
+      "g.DeleteArtifactRequest\032#.datacatalog.De" +
+      "leteArtifactResponse\022[\n\017DeleteArtifacts\022" +
+      "#.datacatalog.DeleteArtifactsRequest\032#.d" +
+      "atacatalog.DeleteArtifactResponse\022q\n\026Get" +
+      "OrExtendReservation\022*.datacatalog.GetOrE" +
+      "xtendReservationRequest\032+.datacatalog.Ge" +
+      "tOrExtendReservationResponse\022t\n\027GetOrExt" +
+      "endReservations\022+.datacatalog.GetOrExten" +
+      "dReservationsRequest\032,.datacatalog.GetOr" +
+      "ExtendReservationsResponse\022e\n\022ReleaseRes" +
+      "ervation\022&.datacatalog.ReleaseReservatio" +
+      "nRequest\032\'.datacatalog.ReleaseReservatio" +
+      "nResponse\022g\n\023ReleaseReservations\022\'.datac" +
+      "atalog.ReleaseReservationsRequest\032\'.data" +
+      "catalog.ReleaseReservationResponseB=Z;gi" +
+      "thub.com/flyteorg/flyteidl/gen/pb-go/fly" +
+      "teidl/datacatalogb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -35304,86 +38945,110 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DeleteArtifactRequest_descriptor,
         new java.lang.String[] { "Dataset", "ArtifactId", "TagName", "QueryHandle", });
-    internal_static_datacatalog_DeleteArtifactResponse_descriptor =
+    internal_static_datacatalog_DeleteArtifactsRequest_descriptor =
       getDescriptor().getMessageTypes().get(17);
+    internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_datacatalog_DeleteArtifactsRequest_descriptor,
+        new java.lang.String[] { "Artifacts", });
+    internal_static_datacatalog_DeleteArtifactResponse_descriptor =
+      getDescriptor().getMessageTypes().get(18);
     internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DeleteArtifactResponse_descriptor,
         new java.lang.String[] { });
     internal_static_datacatalog_ReservationID_descriptor =
-      getDescriptor().getMessageTypes().get(18);
+      getDescriptor().getMessageTypes().get(19);
     internal_static_datacatalog_ReservationID_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ReservationID_descriptor,
         new java.lang.String[] { "DatasetId", "TagName", });
     internal_static_datacatalog_GetOrExtendReservationRequest_descriptor =
-      getDescriptor().getMessageTypes().get(19);
+      getDescriptor().getMessageTypes().get(20);
     internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_GetOrExtendReservationRequest_descriptor,
         new java.lang.String[] { "ReservationId", "OwnerId", "HeartbeatInterval", });
+    internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(21);
+    internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor,
+        new java.lang.String[] { "Reservations", });
     internal_static_datacatalog_Reservation_descriptor =
-      getDescriptor().getMessageTypes().get(20);
+      getDescriptor().getMessageTypes().get(22);
     internal_static_datacatalog_Reservation_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Reservation_descriptor,
         new java.lang.String[] { "ReservationId", "OwnerId", "HeartbeatInterval", "ExpiresAt", "Metadata", });
     internal_static_datacatalog_GetOrExtendReservationResponse_descriptor =
-      getDescriptor().getMessageTypes().get(21);
+      getDescriptor().getMessageTypes().get(23);
     internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_GetOrExtendReservationResponse_descriptor,
         new java.lang.String[] { "Reservation", });
+    internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor =
+      getDescriptor().getMessageTypes().get(24);
+    internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor,
+        new java.lang.String[] { "Reservations", });
     internal_static_datacatalog_ReleaseReservationRequest_descriptor =
-      getDescriptor().getMessageTypes().get(22);
+      getDescriptor().getMessageTypes().get(25);
     internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ReleaseReservationRequest_descriptor,
         new java.lang.String[] { "ReservationId", "OwnerId", });
+    internal_static_datacatalog_ReleaseReservationsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(26);
+    internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_datacatalog_ReleaseReservationsRequest_descriptor,
+        new java.lang.String[] { "Reservations", });
     internal_static_datacatalog_ReleaseReservationResponse_descriptor =
-      getDescriptor().getMessageTypes().get(23);
+      getDescriptor().getMessageTypes().get(27);
     internal_static_datacatalog_ReleaseReservationResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ReleaseReservationResponse_descriptor,
         new java.lang.String[] { });
     internal_static_datacatalog_Dataset_descriptor =
-      getDescriptor().getMessageTypes().get(24);
+      getDescriptor().getMessageTypes().get(28);
     internal_static_datacatalog_Dataset_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Dataset_descriptor,
         new java.lang.String[] { "Id", "Metadata", "PartitionKeys", });
     internal_static_datacatalog_Partition_descriptor =
-      getDescriptor().getMessageTypes().get(25);
+      getDescriptor().getMessageTypes().get(29);
     internal_static_datacatalog_Partition_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Partition_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_datacatalog_DatasetID_descriptor =
-      getDescriptor().getMessageTypes().get(26);
+      getDescriptor().getMessageTypes().get(30);
     internal_static_datacatalog_DatasetID_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DatasetID_descriptor,
         new java.lang.String[] { "Project", "Name", "Domain", "Version", "UUID", });
     internal_static_datacatalog_Artifact_descriptor =
-      getDescriptor().getMessageTypes().get(27);
+      getDescriptor().getMessageTypes().get(31);
     internal_static_datacatalog_Artifact_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Artifact_descriptor,
         new java.lang.String[] { "Id", "Dataset", "Data", "Metadata", "Partitions", "Tags", "CreatedAt", });
     internal_static_datacatalog_ArtifactData_descriptor =
-      getDescriptor().getMessageTypes().get(28);
+      getDescriptor().getMessageTypes().get(32);
     internal_static_datacatalog_ArtifactData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ArtifactData_descriptor,
         new java.lang.String[] { "Name", "Value", });
     internal_static_datacatalog_Tag_descriptor =
-      getDescriptor().getMessageTypes().get(29);
+      getDescriptor().getMessageTypes().get(33);
     internal_static_datacatalog_Tag_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Tag_descriptor,
         new java.lang.String[] { "Name", "ArtifactId", "Dataset", });
     internal_static_datacatalog_Metadata_descriptor =
-      getDescriptor().getMessageTypes().get(30);
+      getDescriptor().getMessageTypes().get(34);
     internal_static_datacatalog_Metadata_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Metadata_descriptor,
@@ -35395,49 +39060,49 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
         internal_static_datacatalog_Metadata_KeyMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_datacatalog_FilterExpression_descriptor =
-      getDescriptor().getMessageTypes().get(31);
+      getDescriptor().getMessageTypes().get(35);
     internal_static_datacatalog_FilterExpression_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_FilterExpression_descriptor,
         new java.lang.String[] { "Filters", });
     internal_static_datacatalog_SinglePropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(32);
+      getDescriptor().getMessageTypes().get(36);
     internal_static_datacatalog_SinglePropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_SinglePropertyFilter_descriptor,
         new java.lang.String[] { "TagFilter", "PartitionFilter", "ArtifactFilter", "DatasetFilter", "Operator", "PropertyFilter", });
     internal_static_datacatalog_ArtifactPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(33);
+      getDescriptor().getMessageTypes().get(37);
     internal_static_datacatalog_ArtifactPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ArtifactPropertyFilter_descriptor,
         new java.lang.String[] { "ArtifactId", "Property", });
     internal_static_datacatalog_TagPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(34);
+      getDescriptor().getMessageTypes().get(38);
     internal_static_datacatalog_TagPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_TagPropertyFilter_descriptor,
         new java.lang.String[] { "TagName", "Property", });
     internal_static_datacatalog_PartitionPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(35);
+      getDescriptor().getMessageTypes().get(39);
     internal_static_datacatalog_PartitionPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_PartitionPropertyFilter_descriptor,
         new java.lang.String[] { "KeyVal", "Property", });
     internal_static_datacatalog_KeyValuePair_descriptor =
-      getDescriptor().getMessageTypes().get(36);
+      getDescriptor().getMessageTypes().get(40);
     internal_static_datacatalog_KeyValuePair_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_KeyValuePair_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_datacatalog_DatasetPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(37);
+      getDescriptor().getMessageTypes().get(41);
     internal_static_datacatalog_DatasetPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DatasetPropertyFilter_descriptor,
         new java.lang.String[] { "Project", "Name", "Domain", "Version", "Property", });
     internal_static_datacatalog_PaginationOptions_descriptor =
-      getDescriptor().getMessageTypes().get(38);
+      getDescriptor().getMessageTypes().get(42);
     internal_static_datacatalog_PaginationOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_PaginationOptions_descriptor,
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
index 93cf75a9ea..5fbb8390af 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
@@ -16,7 +16,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xc8\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61taB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"\x99\x01\n\x15\x44\x65leteArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"\x18\n\x16\x44\x65leteArtifactResponse\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x7f\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x8b\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07versionB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\xe1\x07\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12Y\n\x0e\x44\x65leteArtifact\x12\".datacatalog.DeleteArtifactRequest\x1a#.datacatalog.DeleteArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xac\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01Z;github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xc8\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61taB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"\x99\x01\n\x15\x44\x65leteArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"Z\n\x16\x44\x65leteArtifactsRequest\x12@\n\tartifacts\x18\x01 \x03(\x0b\x32\".datacatalog.DeleteArtifactRequestR\tartifacts\"\x18\n\x16\x44\x65leteArtifactResponse\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"p\n\x1eGetOrExtendReservationsRequest\x12N\n\x0creservations\x18\x01 \x03(\x0b\x32*.datacatalog.GetOrExtendReservationRequestR\x0creservations\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"_\n\x1fGetOrExtendReservationsResponse\x12<\n\x0creservations\x18\x01 \x03(\x0b\x32\x18.datacatalog.ReservationR\x0creservations\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"h\n\x1aReleaseReservationsRequest\x12J\n\x0creservations\x18\x01 \x03(\x0b\x32&.datacatalog.ReleaseReservationRequestR\x0creservations\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x7f\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x8b\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07versionB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\x9d\n\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12Y\n\x0e\x44\x65leteArtifact\x12\".datacatalog.DeleteArtifactRequest\x1a#.datacatalog.DeleteArtifactResponse\x12[\n\x0f\x44\x65leteArtifacts\x12#.datacatalog.DeleteArtifactsRequest\x1a#.datacatalog.DeleteArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12t\n\x17GetOrExtendReservations\x12+.datacatalog.GetOrExtendReservationsRequest\x1a,.datacatalog.GetOrExtendReservationsResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponse\x12g\n\x13ReleaseReservations\x12\'.datacatalog.ReleaseReservationsRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xac\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01Z;github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.datacatalog.datacatalog_pb2', globals())
@@ -60,58 +60,66 @@
   _UPDATEARTIFACTRESPONSE._serialized_end=1599
   _DELETEARTIFACTREQUEST._serialized_start=1602
   _DELETEARTIFACTREQUEST._serialized_end=1755
-  _DELETEARTIFACTRESPONSE._serialized_start=1757
-  _DELETEARTIFACTRESPONSE._serialized_end=1781
-  _RESERVATIONID._serialized_start=1783
-  _RESERVATIONID._serialized_end=1880
-  _GETOREXTENDRESERVATIONREQUEST._serialized_start=1883
-  _GETOREXTENDRESERVATIONREQUEST._serialized_end=2082
-  _RESERVATION._serialized_start=2085
-  _RESERVATION._serialized_end=2376
-  _GETOREXTENDRESERVATIONRESPONSE._serialized_start=2378
-  _GETOREXTENDRESERVATIONRESPONSE._serialized_end=2470
-  _RELEASERESERVATIONREQUEST._serialized_start=2472
-  _RELEASERESERVATIONREQUEST._serialized_end=2593
-  _RELEASERESERVATIONRESPONSE._serialized_start=2595
-  _RELEASERESERVATIONRESPONSE._serialized_end=2623
-  _DATASET._serialized_start=2626
-  _DATASET._serialized_end=2764
-  _PARTITION._serialized_start=2766
-  _PARTITION._serialized_end=2817
-  _DATASETID._serialized_start=2819
-  _DATASETID._serialized_end=2946
-  _ARTIFACT._serialized_start=2949
-  _ARTIFACT._serialized_end=3276
-  _ARTIFACTDATA._serialized_start=3278
-  _ARTIFACTDATA._serialized_end=3358
-  _TAG._serialized_start=3360
-  _TAG._serialized_end=3468
-  _METADATA._serialized_start=3471
-  _METADATA._serialized_end=3600
-  _METADATA_KEYMAPENTRY._serialized_start=3543
-  _METADATA_KEYMAPENTRY._serialized_end=3600
-  _FILTEREXPRESSION._serialized_start=3602
-  _FILTEREXPRESSION._serialized_end=3681
-  _SINGLEPROPERTYFILTER._serialized_start=3684
-  _SINGLEPROPERTYFILTER._serialized_end=4146
-  _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_start=4095
-  _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_end=4127
-  _ARTIFACTPROPERTYFILTER._serialized_start=4148
-  _ARTIFACTPROPERTYFILTER._serialized_end=4219
-  _TAGPROPERTYFILTER._serialized_start=4221
-  _TAGPROPERTYFILTER._serialized_end=4281
-  _PARTITIONPROPERTYFILTER._serialized_start=4283
-  _PARTITIONPROPERTYFILTER._serialized_end=4374
-  _KEYVALUEPAIR._serialized_start=4376
-  _KEYVALUEPAIR._serialized_end=4430
-  _DATASETPROPERTYFILTER._serialized_start=4433
-  _DATASETPROPERTYFILTER._serialized_end=4572
-  _PAGINATIONOPTIONS._serialized_start=4575
-  _PAGINATIONOPTIONS._serialized_end=4850
-  _PAGINATIONOPTIONS_SORTORDER._serialized_start=4778
-  _PAGINATIONOPTIONS_SORTORDER._serialized_end=4820
-  _PAGINATIONOPTIONS_SORTKEY._serialized_start=4822
-  _PAGINATIONOPTIONS_SORTKEY._serialized_end=4850
-  _DATACATALOG._serialized_start=4853
-  _DATACATALOG._serialized_end=5846
+  _DELETEARTIFACTSREQUEST._serialized_start=1757
+  _DELETEARTIFACTSREQUEST._serialized_end=1847
+  _DELETEARTIFACTRESPONSE._serialized_start=1849
+  _DELETEARTIFACTRESPONSE._serialized_end=1873
+  _RESERVATIONID._serialized_start=1875
+  _RESERVATIONID._serialized_end=1972
+  _GETOREXTENDRESERVATIONREQUEST._serialized_start=1975
+  _GETOREXTENDRESERVATIONREQUEST._serialized_end=2174
+  _GETOREXTENDRESERVATIONSREQUEST._serialized_start=2176
+  _GETOREXTENDRESERVATIONSREQUEST._serialized_end=2288
+  _RESERVATION._serialized_start=2291
+  _RESERVATION._serialized_end=2582
+  _GETOREXTENDRESERVATIONRESPONSE._serialized_start=2584
+  _GETOREXTENDRESERVATIONRESPONSE._serialized_end=2676
+  _GETOREXTENDRESERVATIONSRESPONSE._serialized_start=2678
+  _GETOREXTENDRESERVATIONSRESPONSE._serialized_end=2773
+  _RELEASERESERVATIONREQUEST._serialized_start=2775
+  _RELEASERESERVATIONREQUEST._serialized_end=2896
+  _RELEASERESERVATIONSREQUEST._serialized_start=2898
+  _RELEASERESERVATIONSREQUEST._serialized_end=3002
+  _RELEASERESERVATIONRESPONSE._serialized_start=3004
+  _RELEASERESERVATIONRESPONSE._serialized_end=3032
+  _DATASET._serialized_start=3035
+  _DATASET._serialized_end=3173
+  _PARTITION._serialized_start=3175
+  _PARTITION._serialized_end=3226
+  _DATASETID._serialized_start=3228
+  _DATASETID._serialized_end=3355
+  _ARTIFACT._serialized_start=3358
+  _ARTIFACT._serialized_end=3685
+  _ARTIFACTDATA._serialized_start=3687
+  _ARTIFACTDATA._serialized_end=3767
+  _TAG._serialized_start=3769
+  _TAG._serialized_end=3877
+  _METADATA._serialized_start=3880
+  _METADATA._serialized_end=4009
+  _METADATA_KEYMAPENTRY._serialized_start=3952
+  _METADATA_KEYMAPENTRY._serialized_end=4009
+  _FILTEREXPRESSION._serialized_start=4011
+  _FILTEREXPRESSION._serialized_end=4090
+  _SINGLEPROPERTYFILTER._serialized_start=4093
+  _SINGLEPROPERTYFILTER._serialized_end=4555
+  _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_start=4504
+  _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_end=4536
+  _ARTIFACTPROPERTYFILTER._serialized_start=4557
+  _ARTIFACTPROPERTYFILTER._serialized_end=4628
+  _TAGPROPERTYFILTER._serialized_start=4630
+  _TAGPROPERTYFILTER._serialized_end=4690
+  _PARTITIONPROPERTYFILTER._serialized_start=4692
+  _PARTITIONPROPERTYFILTER._serialized_end=4783
+  _KEYVALUEPAIR._serialized_start=4785
+  _KEYVALUEPAIR._serialized_end=4839
+  _DATASETPROPERTYFILTER._serialized_start=4842
+  _DATASETPROPERTYFILTER._serialized_end=4981
+  _PAGINATIONOPTIONS._serialized_start=4984
+  _PAGINATIONOPTIONS._serialized_end=5259
+  _PAGINATIONOPTIONS_SORTORDER._serialized_start=5187
+  _PAGINATIONOPTIONS_SORTORDER._serialized_end=5229
+  _PAGINATIONOPTIONS_SORTKEY._serialized_start=5231
+  _PAGINATIONOPTIONS_SORTKEY._serialized_end=5259
+  _DATACATALOG._serialized_start=5262
+  _DATACATALOG._serialized_end=6571
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
index a92db2946d..f0df3b968f 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
@@ -121,6 +121,12 @@ class DeleteArtifactResponse(_message.Message):
     __slots__ = []
     def __init__(self) -> None: ...
 
+class DeleteArtifactsRequest(_message.Message):
+    __slots__ = ["artifacts"]
+    ARTIFACTS_FIELD_NUMBER: _ClassVar[int]
+    artifacts: _containers.RepeatedCompositeFieldContainer[DeleteArtifactRequest]
+    def __init__(self, artifacts: _Optional[_Iterable[_Union[DeleteArtifactRequest, _Mapping]]] = ...) -> None: ...
+
 class FilterExpression(_message.Message):
     __slots__ = ["filters"]
     FILTERS_FIELD_NUMBER: _ClassVar[int]
@@ -171,6 +177,18 @@ class GetOrExtendReservationResponse(_message.Message):
     reservation: Reservation
     def __init__(self, reservation: _Optional[_Union[Reservation, _Mapping]] = ...) -> None: ...
 
+class GetOrExtendReservationsRequest(_message.Message):
+    __slots__ = ["reservations"]
+    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
+    reservations: _containers.RepeatedCompositeFieldContainer[GetOrExtendReservationRequest]
+    def __init__(self, reservations: _Optional[_Iterable[_Union[GetOrExtendReservationRequest, _Mapping]]] = ...) -> None: ...
+
+class GetOrExtendReservationsResponse(_message.Message):
+    __slots__ = ["reservations"]
+    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
+    reservations: _containers.RepeatedCompositeFieldContainer[Reservation]
+    def __init__(self, reservations: _Optional[_Iterable[_Union[Reservation, _Mapping]]] = ...) -> None: ...
+
 class KeyValuePair(_message.Message):
     __slots__ = ["key", "value"]
     KEY_FIELD_NUMBER: _ClassVar[int]
@@ -271,6 +289,12 @@ class ReleaseReservationResponse(_message.Message):
     __slots__ = []
     def __init__(self) -> None: ...
 
+class ReleaseReservationsRequest(_message.Message):
+    __slots__ = ["reservations"]
+    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
+    reservations: _containers.RepeatedCompositeFieldContainer[ReleaseReservationRequest]
+    def __init__(self, reservations: _Optional[_Iterable[_Union[ReleaseReservationRequest, _Mapping]]] = ...) -> None: ...
+
 class Reservation(_message.Message):
     __slots__ = ["expires_at", "heartbeat_interval", "metadata", "owner_id", "reservation_id"]
     EXPIRES_AT_FIELD_NUMBER: _ClassVar[int]
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py
index fe4158c7bb..1f4ea13f32 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py
@@ -63,16 +63,31 @@ def __init__(self, channel):
                 request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactRequest.SerializeToString,
                 response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString,
                 )
+        self.DeleteArtifacts = channel.unary_unary(
+                '/datacatalog.DataCatalog/DeleteArtifacts',
+                request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactsRequest.SerializeToString,
+                response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString,
+                )
         self.GetOrExtendReservation = channel.unary_unary(
                 '/datacatalog.DataCatalog/GetOrExtendReservation',
                 request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationRequest.SerializeToString,
                 response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationResponse.FromString,
                 )
+        self.GetOrExtendReservations = channel.unary_unary(
+                '/datacatalog.DataCatalog/GetOrExtendReservations',
+                request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsRequest.SerializeToString,
+                response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsResponse.FromString,
+                )
         self.ReleaseReservation = channel.unary_unary(
                 '/datacatalog.DataCatalog/ReleaseReservation',
                 request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationRequest.SerializeToString,
                 response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
                 )
+        self.ReleaseReservations = channel.unary_unary(
+                '/datacatalog.DataCatalog/ReleaseReservations',
+                request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationsRequest.SerializeToString,
+                response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
+                )
 
 
 class DataCatalogServicer(object):
@@ -147,6 +162,17 @@ def DeleteArtifact(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def DeleteArtifacts(self, request, context):
+        """Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
+        This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
+        will not result in an error.
+        The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
+        artifacts deleted, however the operation can simply be retried to remove the remaining entries.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def GetOrExtendReservation(self, request, context):
         """Attempts to get or extend a reservation for the corresponding artifact. If one already exists
         (ie. another entity owns the reservation) then that reservation is retrieved.
@@ -164,6 +190,16 @@ def GetOrExtendReservation(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def GetOrExtendReservations(self, request, context):
+        """Attempts to get or extend reservations for multiple artifacts in a single operation.
+        The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
+        reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
+        endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def ReleaseReservation(self, request, context):
         """Release the reservation when the task holding the spot fails so that the other tasks
         can grab the spot.
@@ -172,6 +208,18 @@ def ReleaseReservation(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def ReleaseReservations(self, request, context):
+        """Releases reservations for multiple artifacts in a single operation.
+        This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
+        times will not result in error.
+        The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
+        artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
+        reservations.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_DataCatalogServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -220,16 +268,31 @@ def add_DataCatalogServicer_to_server(servicer, server):
                     request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactRequest.FromString,
                     response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.SerializeToString,
             ),
+            'DeleteArtifacts': grpc.unary_unary_rpc_method_handler(
+                    servicer.DeleteArtifacts,
+                    request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactsRequest.FromString,
+                    response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.SerializeToString,
+            ),
             'GetOrExtendReservation': grpc.unary_unary_rpc_method_handler(
                     servicer.GetOrExtendReservation,
                     request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationRequest.FromString,
                     response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationResponse.SerializeToString,
             ),
+            'GetOrExtendReservations': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetOrExtendReservations,
+                    request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsRequest.FromString,
+                    response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsResponse.SerializeToString,
+            ),
             'ReleaseReservation': grpc.unary_unary_rpc_method_handler(
                     servicer.ReleaseReservation,
                     request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationRequest.FromString,
                     response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.SerializeToString,
             ),
+            'ReleaseReservations': grpc.unary_unary_rpc_method_handler(
+                    servicer.ReleaseReservations,
+                    request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationsRequest.FromString,
+                    response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'datacatalog.DataCatalog', rpc_method_handlers)
@@ -397,6 +460,23 @@ def DeleteArtifact(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def DeleteArtifacts(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/datacatalog.DataCatalog/DeleteArtifacts',
+            flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactsRequest.SerializeToString,
+            flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def GetOrExtendReservation(request,
             target,
@@ -414,6 +494,23 @@ def GetOrExtendReservation(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def GetOrExtendReservations(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/datacatalog.DataCatalog/GetOrExtendReservations',
+            flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsRequest.SerializeToString,
+            flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def ReleaseReservation(request,
             target,
@@ -430,3 +527,20 @@ def ReleaseReservation(request,
             flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def ReleaseReservations(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/datacatalog.DataCatalog/ReleaseReservations',
+            flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationsRequest.SerializeToString,
+            flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto b/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto
index e22dccdef0..e4ffc8aa37 100644
--- a/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto
+++ b/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto
@@ -43,6 +43,13 @@ service DataCatalog {
     // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage.
     rpc DeleteArtifact (DeleteArtifactRequest) returns (DeleteArtifactResponse);
 
+    // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
+    // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
+    // will not result in an error.
+    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
+    // artifacts deleted, however the operation can simply be retried to remove the remaining entries.
+    rpc DeleteArtifacts (DeleteArtifactsRequest) returns (DeleteArtifactResponse);
+
     // Attempts to get or extend a reservation for the corresponding artifact. If one already exists
     // (ie. another entity owns the reservation) then that reservation is retrieved.
     // Once you acquire a reservation, you need to  periodically extend the reservation with an
@@ -56,9 +63,23 @@ service DataCatalog {
     // a third task C may get the Artifact from A or B, whichever writes last.
     rpc GetOrExtendReservation (GetOrExtendReservationRequest) returns (GetOrExtendReservationResponse);
 
+    // Attempts to get or extend reservations for multiple artifacts in a single operation.
+    // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
+    // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
+    // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
+    rpc GetOrExtendReservations (GetOrExtendReservationsRequest) returns (GetOrExtendReservationsResponse);
+
     // Release the reservation when the task holding the spot fails so that the other tasks
     // can grab the spot.
     rpc ReleaseReservation (ReleaseReservationRequest) returns (ReleaseReservationResponse);
+
+    // Releases reservations for multiple artifacts in a single operation.
+    // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
+    // times will not result in error.
+    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
+    // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
+    // reservations.
+    rpc ReleaseReservations (ReleaseReservationsRequest) returns (ReleaseReservationResponse);
 }
 
 /*
@@ -216,6 +237,12 @@ message DeleteArtifactRequest {
     }
 }
 
+// Request message for deleting multiple Artifacts and their associated ArtifactData.
+message DeleteArtifactsRequest {
+    // List of deletion requests for artifacts to remove
+    repeated DeleteArtifactRequest artifacts = 1;
+}
+
 /*
  * Response message for deleting an Artifact.
  */
@@ -234,7 +261,7 @@ message ReservationID {
     string tag_name = 2;
 }
 
-// Try to acquire or extend an artifact reservation. If an active reservation exists, retreive that instance.
+// Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance.
 message GetOrExtendReservationRequest {
     // The unique ID for the reservation
     ReservationID reservation_id = 1;
@@ -246,6 +273,12 @@ message GetOrExtendReservationRequest {
     google.protobuf.Duration heartbeat_interval = 3;
 }
 
+// Request message for acquiring or extending reservations for multiple artifacts in a single operation.
+message GetOrExtendReservationsRequest {
+    // List of reservation requests for artifacts to acquire
+    repeated GetOrExtendReservationRequest reservations = 1;
+}
+
 // A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
 message Reservation {
     // The unique ID for the reservation
@@ -270,6 +303,12 @@ message GetOrExtendReservationResponse {
     Reservation reservation = 1;
 }
 
+// List of reservations acquired for multiple artifacts in a single operation.
+message GetOrExtendReservationsResponse {
+    // List of (newly created or existing) reservations for artifacts requested
+    repeated Reservation reservations = 1;
+}
+
 // Request to release reservation
 message ReleaseReservationRequest {
     // The unique ID for the reservation
@@ -279,6 +318,12 @@ message ReleaseReservationRequest {
     string owner_id = 2;
 }
 
+// Request message for releasing reservations for multiple artifacts in a single operation.
+message ReleaseReservationsRequest {
+    // List of reservation requests for artifacts to release
+    repeated ReleaseReservationRequest reservations = 1;
+}
+
 // Response to release reservation
 message ReleaseReservationResponse {
 

From d7eda4108c19aef4aafd2993c494aef116fb5b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nick=20M=C3=BCller?= 
Date: Thu, 15 Dec 2022 16:48:55 +0100
Subject: [PATCH 19/57] Implemented deletion of artifact including artifact
 data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nick Müller 
---
 datacatalog/go.mod                            |   2 +
 datacatalog/go.sum                            |   5 +-
 .../pkg/manager/impl/artifact_manager.go      |  62 +++-
 .../pkg/manager/impl/artifact_manager_test.go | 327 ++++++++++++++++++
 .../impl/validators/artifact_validator.go     |  32 ++
 .../pkg/manager/interfaces/artifact.go        |   1 +
 .../pkg/manager/mocks/artifact_manager.go     |  41 +++
 .../pkg/repositories/gormimpl/artifact.go     |  47 +++
 .../repositories/gormimpl/artifact_test.go    | 152 ++++++++
 .../repositories/interfaces/artifact_repo.go  |   1 +
 .../pkg/repositories/mocks/artifact_repo.go   |  32 ++
 .../pkg/rpc/datacatalogservice/service.go     |   4 +
 12 files changed, 702 insertions(+), 4 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index 5f5dea21cd..ce20f21988 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -2,6 +2,8 @@ module github.com/flyteorg/datacatalog
 
 go 1.18
 
+replace github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221007124753-76ba43dbb743
+
 require (
 	github.com/Selvatico/go-mocket v1.0.7
 	github.com/flyteorg/flyteidl v1.2.3
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index f3070603bc..67f4b934f2 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -151,6 +151,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20221007124753-76ba43dbb743 h1:RtdJHPeWoMcluNYAQ0H1i+eiX9idue/WPr5rHsy0om0=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20221007124753-76ba43dbb743/go.mod h1:SLTYz2JgIKvM5MbPVlMP7uILb65fnuuZQZFHHIEYh2U=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -229,8 +231,6 @@ github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGE
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/flyteorg/flyteidl v1.2.3 h1:4A90rFyGXiUtFnQIgSPxPzBZRy9RoAPsfxs7OWYHfFA=
-github.com/flyteorg/flyteidl v1.2.3/go.mod h1:f0AFl7RFycH7+JLq2th0ReH7v+Xse+QTw4jGdIxiS8I=
 github.com/flyteorg/flytestdlib v1.0.0/go.mod h1:QSVN5wIM1lM9d60eAEbX7NwweQXW96t5x4jbyftn89c=
 github.com/flyteorg/flytestdlib v1.0.11 h1:f7B8x2/zMuimEVi4Jx0zqzvNhdi7aq7+ZWoqHsbp4F4=
 github.com/flyteorg/flytestdlib v1.0.11/go.mod h1:nIBmBHtjTJvhZEn3e/EwVC/iMkR2tUX8hEiXjRBpH/s=
@@ -477,7 +477,6 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.2.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
diff --git a/datacatalog/pkg/manager/impl/artifact_manager.go b/datacatalog/pkg/manager/impl/artifact_manager.go
index b31686ae30..d11e68349e 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager.go
@@ -46,6 +46,9 @@ type artifactMetrics struct {
 	updateDataFailureCounter labeled.Counter
 	deleteDataSuccessCounter labeled.Counter
 	deleteDataFailureCounter labeled.Counter
+	deleteResponseTime       labeled.StopWatch
+	deleteSuccessCounter     labeled.Counter
+	deleteFailureCounter     labeled.Counter
 }
 
 type artifactManager struct {
@@ -350,7 +353,7 @@ func (m *artifactManager) UpdateArtifact(ctx context.Context, request *datacatal
 
 		dataLocation, err := m.artifactStore.PutData(ctx, artifact, artifactData)
 		if err != nil {
-			logger.Errorf(ctx, "Failed to store artifact data during update, err: %v", err)
+			logger.Errorf(ctx, "Failed to store artifact data [%v] during update, err: %v", artifactData.Name, err)
 			m.systemMetrics.updateDataFailureCounter.Inc(ctx)
 			m.systemMetrics.updateFailureCounter.Inc(ctx)
 			return nil, err
@@ -405,6 +408,60 @@ func (m *artifactManager) UpdateArtifact(ctx context.Context, request *datacatal
 	}, nil
 }
 
+// DeleteArtifact deletes the given artifact, removing all stored artifact data from the underlying blob storage.
+func (m *artifactManager) DeleteArtifact(ctx context.Context, request *datacatalog.DeleteArtifactRequest) (*datacatalog.DeleteArtifactResponse, error) {
+	ctx = contextutils.WithProjectDomain(ctx, request.Dataset.Project, request.Dataset.Domain)
+
+	timer := m.systemMetrics.deleteResponseTime.Start(ctx)
+	defer timer.Stop()
+
+	err := validators.ValidateDeleteArtifactRequest(request)
+	if err != nil {
+		logger.Warningf(ctx, "Invalid delete artifact request %v, err: %v", request, err)
+		m.systemMetrics.validationErrorCounter.Inc(ctx)
+		m.systemMetrics.deleteFailureCounter.Inc(ctx)
+		return nil, err
+	}
+
+	// artifact must already exist, verify first
+	artifactModel, err := m.findArtifact(ctx, request.GetDataset(), request)
+	if err != nil {
+		logger.Errorf(ctx, "Failed to get artifact for delete artifact request %v, err: %v", request, err)
+		m.systemMetrics.deleteFailureCounter.Inc(ctx)
+		return nil, err
+	}
+
+	// delete all artifact data from the blob storage
+	for _, artifactData := range artifactModel.ArtifactData {
+		if err := m.artifactStore.DeleteData(ctx, artifactData); err != nil {
+			logger.Errorf(ctx, "Failed to delete artifact data [%v] during delete, err: %v", artifactData.Name, err)
+			m.systemMetrics.deleteDataFailureCounter.Inc(ctx)
+			m.systemMetrics.deleteFailureCounter.Inc(ctx)
+			return nil, err
+		}
+
+		m.systemMetrics.deleteDataSuccessCounter.Inc(ctx)
+	}
+
+	// delete artifact from DB, also removed associated artifact data entries
+	err = m.repo.ArtifactRepo().Delete(ctx, artifactModel.ArtifactKey)
+	if err != nil {
+		if errors.IsDoesNotExistError(err) {
+			logger.Warnf(ctx, "Artifact does not exist key: %+v, err %v", artifactModel.ArtifactID, err)
+			m.systemMetrics.doesNotExistCounter.Inc(ctx)
+		} else {
+			logger.Errorf(ctx, "Failed to delete artifact %v, err: %v", artifactModel, err)
+		}
+		m.systemMetrics.deleteFailureCounter.Inc(ctx)
+		return nil, err
+	}
+
+	logger.Debugf(ctx, "Successfully deleted artifact id: %v", artifactModel.ArtifactID)
+
+	m.systemMetrics.deleteSuccessCounter.Inc(ctx)
+	return &datacatalog.DeleteArtifactResponse{}, nil
+}
+
 func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.DataStore, storagePrefix storage.DataReference, artifactScope promutils.Scope) interfaces.ArtifactManager {
 	artifactMetrics := artifactMetrics{
 		scope:                    artifactScope,
@@ -429,6 +486,9 @@ func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.Da
 		updateDataFailureCounter: labeled.NewCounter("update_data_failure_count", "The number of times update artifact data failed", artifactScope, labeled.EmitUnlabeledMetric),
 		deleteDataSuccessCounter: labeled.NewCounter("delete_data_success_count", "The number of times delete artifact data succeeded", artifactScope, labeled.EmitUnlabeledMetric),
 		deleteDataFailureCounter: labeled.NewCounter("delete_data_failure_count", "The number of times delete artifact data failed", artifactScope, labeled.EmitUnlabeledMetric),
+		deleteResponseTime:       labeled.NewStopWatch("delete_duration", "The duration of the delete artifact calls.", time.Millisecond, artifactScope, labeled.EmitUnlabeledMetric),
+		deleteSuccessCounter:     labeled.NewCounter("delete_success_count", "The number of times delete artifact succeeded", artifactScope, labeled.EmitUnlabeledMetric),
+		deleteFailureCounter:     labeled.NewCounter("delete_failure_count", "The number of times delete artifact failed", artifactScope, labeled.EmitUnlabeledMetric),
 	}
 
 	return &artifactManager{
diff --git a/datacatalog/pkg/manager/impl/artifact_manager_test.go b/datacatalog/pkg/manager/impl/artifact_manager_test.go
index e88ef09c81..93e0e6919e 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager_test.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager_test.go
@@ -813,6 +813,93 @@ func TestUpdateArtifact(t *testing.T) {
 		assert.Nil(t, artifactResponse)
 	})
 
+	t.Run("Artifact not found during update", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+
+		dcRepo.MockArtifactRepo.On("Update", mock.Anything, mock.Anything).Return(repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+			Dataset: expectedDataset.Id,
+			Id:      expectedArtifact.Id,
+		}))
+
+		request := &datacatalog.UpdateArtifactRequest{
+			Dataset: expectedDataset.Id,
+			QueryHandle: &datacatalog.UpdateArtifactRequest_ArtifactId{
+				ArtifactId: expectedArtifact.Id,
+			},
+			Data: []*datacatalog.ArtifactData{
+				{
+					Name:  "data1",
+					Value: getTestStringLiteralWithValue("value11"),
+				},
+				{
+					Name:  "data3",
+					Value: getTestStringLiteralWithValue("value3"),
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.UpdateArtifact(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.NotFound, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Artifact update failed", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+
+		dcRepo.MockArtifactRepo.On("Update", mock.Anything, mock.Anything).Return(errors.NewDataCatalogError(codes.Internal, "failed"))
+
+		request := &datacatalog.UpdateArtifactRequest{
+			Dataset: expectedDataset.Id,
+			QueryHandle: &datacatalog.UpdateArtifactRequest_ArtifactId{
+				ArtifactId: expectedArtifact.Id,
+			},
+			Data: []*datacatalog.ArtifactData{
+				{
+					Name:  "data1",
+					Value: getTestStringLiteralWithValue("value11"),
+				},
+				{
+					Name:  "data3",
+					Value: getTestStringLiteralWithValue("value3"),
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.UpdateArtifact(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.Internal, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
 	t.Run("Missing artifact ID", func(t *testing.T) {
 		ctx := context.Background()
 		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
@@ -911,3 +998,243 @@ func TestUpdateArtifact(t *testing.T) {
 		assert.Nil(t, artifactResponse)
 	})
 }
+
+func TestDeleteArtifact(t *testing.T) {
+	ctx := context.Background()
+	datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+	testStoragePrefix, err := datastore.ConstructReference(ctx, datastore.GetBaseContainerFQN(ctx), "test")
+	assert.NoError(t, err)
+
+	expectedDataset := getTestDataset()
+	expectedArtifact := getTestArtifact()
+	expectedTag := getTestTag()
+
+	t.Run("Delete by ID", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+
+		dcRepo.MockArtifactRepo.On("Delete",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(key models.ArtifactKey) bool {
+				return key.ArtifactID == expectedArtifact.Id &&
+					key.DatasetProject == expectedArtifact.Dataset.Project &&
+					key.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					key.DatasetName == expectedArtifact.Dataset.Name &&
+					key.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(nil)
+
+		request := &datacatalog.DeleteArtifactRequest{
+			Dataset: expectedDataset.Id,
+			QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+				ArtifactId: expectedArtifact.Id,
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifact(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+
+		// check that the datastore no longer has artifactData available
+		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
+		assert.NoError(t, err)
+		var value core.Literal
+		err = datastore.ReadProtobuf(ctx, dataRef, &value)
+		assert.Error(t, err)
+		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
+	})
+
+	t.Run("Delete by artifact tag", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Delete",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(key models.ArtifactKey) bool {
+				return key.ArtifactID == expectedArtifact.Id &&
+					key.DatasetProject == expectedArtifact.Dataset.Project &&
+					key.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					key.DatasetName == expectedArtifact.Dataset.Name &&
+					key.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(nil)
+
+		dcRepo.MockTagRepo.On("Get", mock.Anything,
+			mock.MatchedBy(func(tag models.TagKey) bool {
+				return tag.TagName == expectedTag.TagName &&
+					tag.DatasetProject == expectedTag.DatasetProject &&
+					tag.DatasetDomain == expectedTag.DatasetDomain &&
+					tag.DatasetVersion == expectedTag.DatasetVersion &&
+					tag.DatasetName == expectedTag.DatasetName
+			})).Return(models.Tag{
+			TagKey: models.TagKey{
+				DatasetProject: expectedTag.DatasetProject,
+				DatasetDomain:  expectedTag.DatasetDomain,
+				DatasetName:    expectedTag.DatasetName,
+				DatasetVersion: expectedTag.DatasetVersion,
+				TagName:        expectedTag.TagName,
+			},
+			DatasetUUID: expectedTag.DatasetUUID,
+			Artifact:    mockArtifactModel,
+			ArtifactID:  mockArtifactModel.ArtifactID,
+		}, nil)
+
+		request := &datacatalog.DeleteArtifactRequest{
+			Dataset: expectedDataset.Id,
+			QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{
+				TagName: expectedTag.TagName,
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifact(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+
+		// check that the datastore no longer has artifactData available
+		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
+		assert.NoError(t, err)
+		var value core.Literal
+		err = datastore.ReadProtobuf(ctx, dataRef, &value)
+		assert.Error(t, err)
+		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
+	})
+
+	t.Run("Artifact not found", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get", mock.Anything, mock.Anything).Return(models.Artifact{}, repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+			Dataset: expectedDataset.Id,
+			Id:      expectedArtifact.Id,
+		}))
+
+		request := &datacatalog.DeleteArtifactRequest{
+			Dataset: expectedDataset.Id,
+			QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+				ArtifactId: expectedArtifact.Id,
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifact(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.NotFound, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Artifact not found during delete", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).Return(repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+			Dataset: expectedDataset.Id,
+			Id:      expectedArtifact.Id,
+		}))
+
+		request := &datacatalog.DeleteArtifactRequest{
+			Dataset: expectedDataset.Id,
+			QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+				ArtifactId: expectedArtifact.Id,
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifact(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.NotFound, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Artifact delete failed", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).Return(errors.NewDataCatalogError(codes.Internal, "failed"))
+
+		request := &datacatalog.DeleteArtifactRequest{
+			Dataset: expectedDataset.Id,
+			QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+				ArtifactId: expectedArtifact.Id,
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifact(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.Internal, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Missing artifact ID", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+
+		dcRepo := newMockDataCatalogRepo()
+
+		request := &datacatalog.DeleteArtifactRequest{
+			Dataset:     expectedDataset.Id,
+			QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifact(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.InvalidArgument, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Missing artifact tag", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+
+		dcRepo := newMockDataCatalogRepo()
+
+		request := &datacatalog.DeleteArtifactRequest{
+			Dataset:     expectedDataset.Id,
+			QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifact(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.InvalidArgument, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+}
diff --git a/datacatalog/pkg/manager/impl/validators/artifact_validator.go b/datacatalog/pkg/manager/impl/validators/artifact_validator.go
index 1b3265a7d2..d38609a1ea 100644
--- a/datacatalog/pkg/manager/impl/validators/artifact_validator.go
+++ b/datacatalog/pkg/manager/impl/validators/artifact_validator.go
@@ -138,3 +138,35 @@ func ValidateUpdateArtifactRequest(request *datacatalog.UpdateArtifactRequest) e
 
 	return nil
 }
+
+func ValidateDeleteArtifactRequest(request *datacatalog.DeleteArtifactRequest) error {
+	if request.QueryHandle == nil {
+		return NewMissingArgumentError(fmt.Sprintf("one of %s/%s", artifactID, tagName))
+	}
+
+	switch request.QueryHandle.(type) {
+	case *datacatalog.DeleteArtifactRequest_ArtifactId:
+		if request.Dataset != nil {
+			err := ValidateDatasetID(request.Dataset)
+			if err != nil {
+				return err
+			}
+		}
+
+		if err := ValidateEmptyStringField(request.GetArtifactId(), artifactID); err != nil {
+			return err
+		}
+	case *datacatalog.DeleteArtifactRequest_TagName:
+		if err := ValidateDatasetID(request.Dataset); err != nil {
+			return err
+		}
+
+		if err := ValidateEmptyStringField(request.GetTagName(), tagName); err != nil {
+			return err
+		}
+	default:
+		return NewInvalidArgumentError("QueryHandle", "invalid type")
+	}
+
+	return nil
+}
diff --git a/datacatalog/pkg/manager/interfaces/artifact.go b/datacatalog/pkg/manager/interfaces/artifact.go
index 3fdae66215..a51ddd0b16 100644
--- a/datacatalog/pkg/manager/interfaces/artifact.go
+++ b/datacatalog/pkg/manager/interfaces/artifact.go
@@ -13,4 +13,5 @@ type ArtifactManager interface {
 	GetArtifact(ctx context.Context, request *idl_datacatalog.GetArtifactRequest) (*idl_datacatalog.GetArtifactResponse, error)
 	ListArtifacts(ctx context.Context, request *idl_datacatalog.ListArtifactsRequest) (*idl_datacatalog.ListArtifactsResponse, error)
 	UpdateArtifact(ctx context.Context, request *idl_datacatalog.UpdateArtifactRequest) (*idl_datacatalog.UpdateArtifactResponse, error)
+	DeleteArtifact(ctx context.Context, request *idl_datacatalog.DeleteArtifactRequest) (*idl_datacatalog.DeleteArtifactResponse, error)
 }
diff --git a/datacatalog/pkg/manager/mocks/artifact_manager.go b/datacatalog/pkg/manager/mocks/artifact_manager.go
index 98cacf0227..fb4d5c4b41 100644
--- a/datacatalog/pkg/manager/mocks/artifact_manager.go
+++ b/datacatalog/pkg/manager/mocks/artifact_manager.go
@@ -56,6 +56,47 @@ func (_m *ArtifactManager) CreateArtifact(ctx context.Context, request *datacata
 	return r0, r1
 }
 
+type ArtifactManager_DeleteArtifact struct {
+	*mock.Call
+}
+
+func (_m ArtifactManager_DeleteArtifact) Return(_a0 *datacatalog.DeleteArtifactResponse, _a1 error) *ArtifactManager_DeleteArtifact {
+	return &ArtifactManager_DeleteArtifact{Call: _m.Call.Return(_a0, _a1)}
+}
+
+func (_m *ArtifactManager) OnDeleteArtifact(ctx context.Context, request *datacatalog.DeleteArtifactRequest) *ArtifactManager_DeleteArtifact {
+	c_call := _m.On("DeleteArtifact", ctx, request)
+	return &ArtifactManager_DeleteArtifact{Call: c_call}
+}
+
+func (_m *ArtifactManager) OnDeleteArtifactMatch(matchers ...interface{}) *ArtifactManager_DeleteArtifact {
+	c_call := _m.On("DeleteArtifact", matchers...)
+	return &ArtifactManager_DeleteArtifact{Call: c_call}
+}
+
+// DeleteArtifact provides a mock function with given fields: ctx, request
+func (_m *ArtifactManager) DeleteArtifact(ctx context.Context, request *datacatalog.DeleteArtifactRequest) (*datacatalog.DeleteArtifactResponse, error) {
+	ret := _m.Called(ctx, request)
+
+	var r0 *datacatalog.DeleteArtifactResponse
+	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DeleteArtifactRequest) *datacatalog.DeleteArtifactResponse); ok {
+		r0 = rf(ctx, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*datacatalog.DeleteArtifactResponse)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.DeleteArtifactRequest) error); ok {
+		r1 = rf(ctx, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 type ArtifactManager_GetArtifact struct {
 	*mock.Call
 }
diff --git a/datacatalog/pkg/repositories/gormimpl/artifact.go b/datacatalog/pkg/repositories/gormimpl/artifact.go
index b64f2f8180..b7221e75cc 100644
--- a/datacatalog/pkg/repositories/gormimpl/artifact.go
+++ b/datacatalog/pkg/repositories/gormimpl/artifact.go
@@ -180,3 +180,50 @@ func (h *artifactRepo) Update(ctx context.Context, artifact models.Artifact) err
 
 	return nil
 }
+
+// Delete deletes the given artifact and its associated ArtifactData from the database.
+func (h *artifactRepo) Delete(ctx context.Context, key models.ArtifactKey) error {
+	timer := h.repoMetrics.DeleteDuration.Start(ctx)
+	defer timer.Stop()
+
+	tx := h.db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	if err := tx.Error; err != nil {
+		return err
+	}
+
+	// delete artifact data from database
+	if err := tx.Where(&models.ArtifactData{ArtifactKey: key}).Delete(&models.ArtifactData{}).Error; err != nil {
+		tx.Rollback()
+		return h.errorTransformer.ToDataCatalogError(err)
+	}
+
+	// delete actual artifact from database
+	if res := tx.Where(&models.Artifact{ArtifactKey: key}).Delete(&models.Artifact{}); res.Error != nil {
+		tx.Rollback()
+		return h.errorTransformer.ToDataCatalogError(res.Error)
+	} else if res.RowsAffected == 0 {
+		// no rows affected --> artifact not found
+		tx.Rollback()
+		return errors.GetMissingEntityError(string(common.Artifact), &datacatalog.Artifact{
+			Dataset: &datacatalog.DatasetID{
+				Project: key.DatasetProject,
+				Domain:  key.DatasetDomain,
+				Name:    key.DatasetName,
+				Version: key.DatasetVersion,
+			},
+			Id: key.ArtifactID,
+		})
+	}
+
+	if err := tx.Commit().Error; err != nil {
+		return h.errorTransformer.ToDataCatalogError(err)
+	}
+
+	return nil
+}
diff --git a/datacatalog/pkg/repositories/gormimpl/artifact_test.go b/datacatalog/pkg/repositories/gormimpl/artifact_test.go
index ba14f081a1..80b2f22f9a 100644
--- a/datacatalog/pkg/repositories/gormimpl/artifact_test.go
+++ b/datacatalog/pkg/repositories/gormimpl/artifact_test.go
@@ -410,6 +410,26 @@ func TestUpdateArtifactDoesNotExist(t *testing.T) {
 	GlobalMock := mocket.Catcher.Reset()
 	GlobalMock.Logging = true
 
+	artifactUpdated := false
+	GlobalMock.NewMock().WithQuery(`UPDATE "artifacts" SET "updated_at"=$1,"artifact_id"=$2 WHERE "artifact_id" = $3`).
+		WithRowsNum(0).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactUpdated = true
+		})
+	artifactDataDeleted := false
+	GlobalMock.NewMock().
+		WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1 AND name NOT IN ($2,$3)`).
+		WithRowsNum(0).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDataDeleted = true
+		})
+	artifactDataUpserted := false
+	GlobalMock.NewMock().WithQuery(`INSERT INTO "artifact_data" ("created_at","updated_at","deleted_at","dataset_project","dataset_name","dataset_domain","dataset_version","artifact_id","name","location") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10),($11,$12,$13,$14,$15,$16,$17,$18,$19,$20) ON CONFLICT DO NOTHING`).
+		WithRowsNum(1).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDataUpserted = true
+		})
+
 	updateInput := models.Artifact{
 		ArtifactKey: models.ArtifactKey{
 			ArtifactID: artifact.ArtifactID,
@@ -432,6 +452,9 @@ func TestUpdateArtifactDoesNotExist(t *testing.T) {
 	dcErr, ok := err.(apiErrors.DataCatalogError)
 	assert.True(t, ok)
 	assert.Equal(t, dcErr.Code(), codes.NotFound)
+	assert.True(t, artifactUpdated)
+	assert.False(t, artifactDataDeleted)
+	assert.False(t, artifactDataUpserted)
 }
 
 func TestUpdateArtifactError(t *testing.T) {
@@ -559,3 +582,132 @@ func TestUpdateArtifactError(t *testing.T) {
 		assert.True(t, artifactDataDeleted)
 	})
 }
+
+func TestDeleteArtifact(t *testing.T) {
+	ctx := context.Background()
+	artifact := getTestArtifact()
+
+	GlobalMock := mocket.Catcher.Reset()
+	GlobalMock.Logging = true
+
+	artifactDeleted := false
+	GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+		WithRowsNum(1).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDeleted = true
+		})
+	artifactDataDeleted := false
+	GlobalMock.NewMock().
+		WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+		WithRowsNum(1).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDataDeleted = true
+		})
+
+	deleteInput := models.ArtifactKey{
+		ArtifactID: artifact.ArtifactID,
+	}
+
+	artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
+	err := artifactRepo.Delete(ctx, deleteInput)
+	assert.NoError(t, err)
+	assert.True(t, artifactDeleted)
+	assert.True(t, artifactDataDeleted)
+}
+
+func TestDeleteArtifactDoesNotExist(t *testing.T) {
+	ctx := context.Background()
+	artifact := getTestArtifact()
+
+	GlobalMock := mocket.Catcher.Reset()
+	GlobalMock.Logging = true
+
+	artifactDeleted := false
+	GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+		WithRowsNum(0).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDeleted = true
+		})
+	artifactDataDeleted := false
+	GlobalMock.NewMock().
+		WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+		WithRowsNum(0).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDataDeleted = true
+		})
+
+	deleteInput := models.ArtifactKey{
+		ArtifactID: artifact.ArtifactID,
+	}
+
+	artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
+	err := artifactRepo.Delete(ctx, deleteInput)
+	assert.Error(t, err)
+	dcErr, ok := err.(apiErrors.DataCatalogError)
+	assert.True(t, ok)
+	assert.Equal(t, dcErr.Code(), codes.NotFound)
+	assert.True(t, artifactDeleted)
+	assert.True(t, artifactDataDeleted)
+}
+
+func TestDeleteArtifactError(t *testing.T) {
+	artifact := getTestArtifact()
+
+	t.Run("ArtifactDelete", func(t *testing.T) {
+		ctx := context.Background()
+
+		GlobalMock := mocket.Catcher.Reset()
+		GlobalMock.Logging = true
+
+		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+			WithExecException()
+		artifactDataDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				artifactDataDeleted = true
+			})
+
+		deleteInput := models.ArtifactKey{
+			ArtifactID: artifact.ArtifactID,
+		}
+
+		artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
+		err := artifactRepo.Delete(ctx, deleteInput)
+		assert.Error(t, err)
+		dcErr, ok := err.(apiErrors.DataCatalogError)
+		assert.True(t, ok)
+		assert.Equal(t, dcErr.Code(), codes.Internal)
+		assert.True(t, artifactDataDeleted)
+	})
+
+	t.Run("ArtifactDataDelete", func(t *testing.T) {
+		ctx := context.Background()
+
+		GlobalMock := mocket.Catcher.Reset()
+		GlobalMock.Logging = true
+
+		artifactDeleted := false
+		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+			WithRowsNum(1).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				artifactDeleted = true
+			})
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+			WithExecException()
+
+		deleteInput := models.ArtifactKey{
+			ArtifactID: artifact.ArtifactID,
+		}
+
+		artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
+		err := artifactRepo.Delete(ctx, deleteInput)
+		assert.Error(t, err)
+		dcErr, ok := err.(apiErrors.DataCatalogError)
+		assert.True(t, ok)
+		assert.Equal(t, dcErr.Code(), codes.Internal)
+		assert.False(t, artifactDeleted)
+	})
+}
diff --git a/datacatalog/pkg/repositories/interfaces/artifact_repo.go b/datacatalog/pkg/repositories/interfaces/artifact_repo.go
index 9607cb62d3..4d4f845dc0 100644
--- a/datacatalog/pkg/repositories/interfaces/artifact_repo.go
+++ b/datacatalog/pkg/repositories/interfaces/artifact_repo.go
@@ -13,4 +13,5 @@ type ArtifactRepo interface {
 	Get(ctx context.Context, in models.ArtifactKey) (models.Artifact, error)
 	List(ctx context.Context, datasetKey models.DatasetKey, in models.ListModelsInput) ([]models.Artifact, error)
 	Update(ctx context.Context, artifact models.Artifact) error
+	Delete(ctx context.Context, key models.ArtifactKey) error
 }
diff --git a/datacatalog/pkg/repositories/mocks/artifact_repo.go b/datacatalog/pkg/repositories/mocks/artifact_repo.go
index f1677ea7bc..1e3445fc2f 100644
--- a/datacatalog/pkg/repositories/mocks/artifact_repo.go
+++ b/datacatalog/pkg/repositories/mocks/artifact_repo.go
@@ -47,6 +47,38 @@ func (_m *ArtifactRepo) Create(ctx context.Context, in models.Artifact) error {
 	return r0
 }
 
+type ArtifactRepo_Delete struct {
+	*mock.Call
+}
+
+func (_m ArtifactRepo_Delete) Return(_a0 error) *ArtifactRepo_Delete {
+	return &ArtifactRepo_Delete{Call: _m.Call.Return(_a0)}
+}
+
+func (_m *ArtifactRepo) OnDelete(ctx context.Context, key models.ArtifactKey) *ArtifactRepo_Delete {
+	c_call := _m.On("Delete", ctx, key)
+	return &ArtifactRepo_Delete{Call: c_call}
+}
+
+func (_m *ArtifactRepo) OnDeleteMatch(matchers ...interface{}) *ArtifactRepo_Delete {
+	c_call := _m.On("Delete", matchers...)
+	return &ArtifactRepo_Delete{Call: c_call}
+}
+
+// Delete provides a mock function with given fields: ctx, key
+func (_m *ArtifactRepo) Delete(ctx context.Context, key models.ArtifactKey) error {
+	ret := _m.Called(ctx, key)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, models.ArtifactKey) error); ok {
+		r0 = rf(ctx, key)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 type ArtifactRepo_Get struct {
 	*mock.Call
 }
diff --git a/datacatalog/pkg/rpc/datacatalogservice/service.go b/datacatalog/pkg/rpc/datacatalogservice/service.go
index 0591b7da0b..6c4e69c518 100644
--- a/datacatalog/pkg/rpc/datacatalogservice/service.go
+++ b/datacatalog/pkg/rpc/datacatalogservice/service.go
@@ -65,6 +65,10 @@ func (s *DataCatalogService) UpdateArtifact(ctx context.Context, request *catalo
 	return s.ArtifactManager.UpdateArtifact(ctx, request)
 }
 
+func (s *DataCatalogService) DeleteArtifact(ctx context.Context, request *catalog.DeleteArtifactRequest) (*catalog.DeleteArtifactResponse, error) {
+	return s.ArtifactManager.DeleteArtifact(ctx, request)
+}
+
 func (s *DataCatalogService) GetOrExtendReservation(ctx context.Context, request *catalog.GetOrExtendReservationRequest) (*catalog.GetOrExtendReservationResponse, error) {
 	return s.ReservationManager.GetOrExtendReservation(ctx, request)
 }

From 8890348eed36bec0950a42a32ba1c1b8b92fc95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nick=20M=C3=BCller?= 
Date: Mon, 10 Oct 2022 14:45:41 +0200
Subject: [PATCH 20/57] Deleting artifacts cleans up tags and partitions as
 well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nick Müller 
---
 .../pkg/manager/impl/artifact_manager.go      |   2 +-
 .../pkg/manager/impl/artifact_manager_test.go |  24 +-
 .../pkg/repositories/gormimpl/artifact.go     |  28 ++-
 .../repositories/gormimpl/artifact_test.go    | 213 ++++++++++++++----
 .../repositories/interfaces/artifact_repo.go  |   2 +-
 .../pkg/repositories/mocks/artifact_repo.go   |  14 +-
 6 files changed, 212 insertions(+), 71 deletions(-)

diff --git a/datacatalog/pkg/manager/impl/artifact_manager.go b/datacatalog/pkg/manager/impl/artifact_manager.go
index d11e68349e..f738919547 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager.go
@@ -444,7 +444,7 @@ func (m *artifactManager) DeleteArtifact(ctx context.Context, request *datacatal
 	}
 
 	// delete artifact from DB, also removed associated artifact data entries
-	err = m.repo.ArtifactRepo().Delete(ctx, artifactModel.ArtifactKey)
+	err = m.repo.ArtifactRepo().Delete(ctx, artifactModel)
 	if err != nil {
 		if errors.IsDoesNotExistError(err) {
 			logger.Warnf(ctx, "Artifact does not exist key: %+v, err %v", artifactModel.ArtifactID, err)
diff --git a/datacatalog/pkg/manager/impl/artifact_manager_test.go b/datacatalog/pkg/manager/impl/artifact_manager_test.go
index 93e0e6919e..a0b355a411 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager_test.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager_test.go
@@ -1027,12 +1027,12 @@ func TestDeleteArtifact(t *testing.T) {
 
 		dcRepo.MockArtifactRepo.On("Delete",
 			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(key models.ArtifactKey) bool {
-				return key.ArtifactID == expectedArtifact.Id &&
-					key.DatasetProject == expectedArtifact.Dataset.Project &&
-					key.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					key.DatasetName == expectedArtifact.Dataset.Name &&
-					key.DatasetVersion == expectedArtifact.Dataset.Version
+			mock.MatchedBy(func(artifact models.Artifact) bool {
+				return artifact.ArtifactID == expectedArtifact.Id &&
+					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifact.DatasetName == expectedArtifact.Dataset.Name &&
+					artifact.DatasetVersion == expectedArtifact.Dataset.Version
 			})).Return(nil)
 
 		request := &datacatalog.DeleteArtifactRequest{
@@ -1064,12 +1064,12 @@ func TestDeleteArtifact(t *testing.T) {
 		dcRepo := newMockDataCatalogRepo()
 		dcRepo.MockArtifactRepo.On("Delete",
 			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(key models.ArtifactKey) bool {
-				return key.ArtifactID == expectedArtifact.Id &&
-					key.DatasetProject == expectedArtifact.Dataset.Project &&
-					key.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					key.DatasetName == expectedArtifact.Dataset.Name &&
-					key.DatasetVersion == expectedArtifact.Dataset.Version
+			mock.MatchedBy(func(artifact models.Artifact) bool {
+				return artifact.ArtifactID == expectedArtifact.Id &&
+					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifact.DatasetName == expectedArtifact.Dataset.Name &&
+					artifact.DatasetVersion == expectedArtifact.Dataset.Version
 			})).Return(nil)
 
 		dcRepo.MockTagRepo.On("Get", mock.Anything,
diff --git a/datacatalog/pkg/repositories/gormimpl/artifact.go b/datacatalog/pkg/repositories/gormimpl/artifact.go
index b7221e75cc..f76d5eb06d 100644
--- a/datacatalog/pkg/repositories/gormimpl/artifact.go
+++ b/datacatalog/pkg/repositories/gormimpl/artifact.go
@@ -182,7 +182,7 @@ func (h *artifactRepo) Update(ctx context.Context, artifact models.Artifact) err
 }
 
 // Delete deletes the given artifact and its associated ArtifactData from the database.
-func (h *artifactRepo) Delete(ctx context.Context, key models.ArtifactKey) error {
+func (h *artifactRepo) Delete(ctx context.Context, artifact models.Artifact) error {
 	timer := h.repoMetrics.DeleteDuration.Start(ctx)
 	defer timer.Stop()
 
@@ -197,14 +197,24 @@ func (h *artifactRepo) Delete(ctx context.Context, key models.ArtifactKey) error
 		return err
 	}
 
-	// delete artifact data from database
-	if err := tx.Where(&models.ArtifactData{ArtifactKey: key}).Delete(&models.ArtifactData{}).Error; err != nil {
+	// delete all data related to artifact from database
+	if err := tx.Where(&models.ArtifactData{ArtifactKey: artifact.ArtifactKey}).Delete(&models.ArtifactData{}).Error; err != nil {
+		tx.Rollback()
+		return h.errorTransformer.ToDataCatalogError(err)
+	}
+
+	if err := tx.Where(&models.Tag{ArtifactID: artifact.ArtifactID, DatasetUUID: artifact.DatasetUUID}).Delete(&models.Tag{}).Error; err != nil {
+		tx.Rollback()
+		return h.errorTransformer.ToDataCatalogError(err)
+	}
+
+	if err := tx.Where(&models.Partition{ArtifactID: artifact.ArtifactID, DatasetUUID: artifact.DatasetUUID}).Delete(&models.Partition{}).Error; err != nil {
 		tx.Rollback()
 		return h.errorTransformer.ToDataCatalogError(err)
 	}
 
 	// delete actual artifact from database
-	if res := tx.Where(&models.Artifact{ArtifactKey: key}).Delete(&models.Artifact{}); res.Error != nil {
+	if res := tx.Delete(&artifact); res.Error != nil {
 		tx.Rollback()
 		return h.errorTransformer.ToDataCatalogError(res.Error)
 	} else if res.RowsAffected == 0 {
@@ -212,12 +222,12 @@ func (h *artifactRepo) Delete(ctx context.Context, key models.ArtifactKey) error
 		tx.Rollback()
 		return errors.GetMissingEntityError(string(common.Artifact), &datacatalog.Artifact{
 			Dataset: &datacatalog.DatasetID{
-				Project: key.DatasetProject,
-				Domain:  key.DatasetDomain,
-				Name:    key.DatasetName,
-				Version: key.DatasetVersion,
+				Project: artifact.DatasetProject,
+				Domain:  artifact.DatasetDomain,
+				Name:    artifact.DatasetName,
+				Version: artifact.DatasetVersion,
 			},
-			Id: key.ArtifactID,
+			Id: artifact.ArtifactID,
 		})
 	}
 
diff --git a/datacatalog/pkg/repositories/gormimpl/artifact_test.go b/datacatalog/pkg/repositories/gormimpl/artifact_test.go
index 80b2f22f9a..0235bf0451 100644
--- a/datacatalog/pkg/repositories/gormimpl/artifact_test.go
+++ b/datacatalog/pkg/repositories/gormimpl/artifact_test.go
@@ -590,29 +590,41 @@ func TestDeleteArtifact(t *testing.T) {
 	GlobalMock := mocket.Catcher.Reset()
 	GlobalMock.Logging = true
 
-	artifactDeleted := false
-	GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+	artifactDataDeleted := false
+	GlobalMock.NewMock().
+		WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."dataset_project" = $1 AND "artifact_data"."dataset_name" = $2 AND "artifact_data"."dataset_domain" = $3 AND "artifact_data"."dataset_version" = $4 AND "artifact_data"."artifact_id" = $5`).
 		WithRowsNum(1).
 		WithCallback(func(s string, values []driver.NamedValue) {
-			artifactDeleted = true
+			artifactDataDeleted = true
 		})
-	artifactDataDeleted := false
+	tagsDeleted := false
 	GlobalMock.NewMock().
-		WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+		WithQuery(`DELETE FROM "tags" WHERE "tags"."artifact_id" = $1 AND "tags"."dataset_uuid" = $2`).
 		WithRowsNum(1).
 		WithCallback(func(s string, values []driver.NamedValue) {
-			artifactDataDeleted = true
+			tagsDeleted = true
+		})
+	partitionsDeleted := false
+	GlobalMock.NewMock().
+		WithQuery(`DELETE FROM "partitions" WHERE "partitions"."dataset_uuid" = $1 AND "partitions"."artifact_id" = $2`).
+		WithRowsNum(1).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			partitionsDeleted = true
+		})
+	artifactDeleted := false
+	GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE ("artifacts"."dataset_project","artifacts"."dataset_name","artifacts"."dataset_domain","artifacts"."dataset_version","artifacts"."artifact_id") IN (($1,$2,$3,$4,$5))`).
+		WithRowsNum(1).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDeleted = true
 		})
-
-	deleteInput := models.ArtifactKey{
-		ArtifactID: artifact.ArtifactID,
-	}
 
 	artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
-	err := artifactRepo.Delete(ctx, deleteInput)
+	err := artifactRepo.Delete(ctx, artifact)
 	assert.NoError(t, err)
-	assert.True(t, artifactDeleted)
 	assert.True(t, artifactDataDeleted)
+	assert.True(t, tagsDeleted)
+	assert.True(t, partitionsDeleted)
+	assert.True(t, artifactDeleted)
 }
 
 func TestDeleteArtifactDoesNotExist(t *testing.T) {
@@ -622,92 +634,211 @@ func TestDeleteArtifactDoesNotExist(t *testing.T) {
 	GlobalMock := mocket.Catcher.Reset()
 	GlobalMock.Logging = true
 
-	artifactDeleted := false
-	GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+	artifactDataDeleted := false
+	GlobalMock.NewMock().
+		WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."dataset_project" = $1 AND "artifact_data"."dataset_name" = $2 AND "artifact_data"."dataset_domain" = $3 AND "artifact_data"."dataset_version" = $4 AND "artifact_data"."artifact_id" = $5`).
 		WithRowsNum(0).
 		WithCallback(func(s string, values []driver.NamedValue) {
-			artifactDeleted = true
+			artifactDataDeleted = true
 		})
-	artifactDataDeleted := false
+	tagsDeleted := false
 	GlobalMock.NewMock().
-		WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+		WithQuery(`DELETE FROM "tags" WHERE "tags"."artifact_id" = $1 AND "tags"."dataset_uuid" = $2`).
 		WithRowsNum(0).
 		WithCallback(func(s string, values []driver.NamedValue) {
-			artifactDataDeleted = true
+			tagsDeleted = true
+		})
+	partitionsDeleted := false
+	GlobalMock.NewMock().
+		WithQuery(`DELETE FROM "partitions" WHERE "partitions"."dataset_uuid" = $1 AND "partitions"."artifact_id" = $2`).
+		WithRowsNum(0).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			partitionsDeleted = true
+		})
+	artifactDeleted := false
+	GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE ("artifacts"."dataset_project","artifacts"."dataset_name","artifacts"."dataset_domain","artifacts"."dataset_version","artifacts"."artifact_id") IN (($1,$2,$3,$4,$5))`).
+		WithRowsNum(0).
+		WithCallback(func(s string, values []driver.NamedValue) {
+			artifactDeleted = true
 		})
-
-	deleteInput := models.ArtifactKey{
-		ArtifactID: artifact.ArtifactID,
-	}
 
 	artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
-	err := artifactRepo.Delete(ctx, deleteInput)
+	err := artifactRepo.Delete(ctx, artifact)
 	assert.Error(t, err)
 	dcErr, ok := err.(apiErrors.DataCatalogError)
 	assert.True(t, ok)
 	assert.Equal(t, dcErr.Code(), codes.NotFound)
-	assert.True(t, artifactDeleted)
 	assert.True(t, artifactDataDeleted)
+	assert.True(t, tagsDeleted)
+	assert.True(t, partitionsDeleted)
+	assert.True(t, artifactDeleted)
 }
 
 func TestDeleteArtifactError(t *testing.T) {
 	artifact := getTestArtifact()
 
-	t.Run("ArtifactDelete", func(t *testing.T) {
+	t.Run("ArtifactDataDelete", func(t *testing.T) {
 		ctx := context.Background()
 
 		GlobalMock := mocket.Catcher.Reset()
 		GlobalMock.Logging = true
 
-		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."dataset_project" = $1 AND "artifact_data"."dataset_name" = $2 AND "artifact_data"."dataset_domain" = $3 AND "artifact_data"."dataset_version" = $4 AND "artifact_data"."artifact_id" = $5`).
 			WithExecException()
+		tagsDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "tags" WHERE "tags"."artifact_id" = $1 AND "tags"."dataset_uuid" = $2`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				tagsDeleted = true
+			})
+		partitionsDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "partitions" WHERE "partitions"."dataset_uuid" = $1 AND "partitions"."artifact_id" = $2`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				partitionsDeleted = true
+			})
+		artifactDeleted := false
+		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE ("artifacts"."dataset_project","artifacts"."dataset_name","artifacts"."dataset_domain","artifacts"."dataset_version","artifacts"."artifact_id") IN (($1,$2,$3,$4,$5))`).
+			WithRowsNum(1).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				artifactDeleted = true
+			})
+
+		artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
+		err := artifactRepo.Delete(ctx, artifact)
+		assert.Error(t, err)
+		dcErr, ok := err.(apiErrors.DataCatalogError)
+		assert.True(t, ok)
+		assert.Equal(t, dcErr.Code(), codes.Internal)
+		assert.False(t, tagsDeleted)
+		assert.False(t, partitionsDeleted)
+		assert.False(t, artifactDeleted)
+	})
+
+	t.Run("TagsDelete", func(t *testing.T) {
+		ctx := context.Background()
+
+		GlobalMock := mocket.Catcher.Reset()
+		GlobalMock.Logging = true
+
 		artifactDataDeleted := false
 		GlobalMock.NewMock().
-			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."dataset_project" = $1 AND "artifact_data"."dataset_name" = $2 AND "artifact_data"."dataset_domain" = $3 AND "artifact_data"."dataset_version" = $4 AND "artifact_data"."artifact_id" = $5`).
 			WithRowsNum(0).
 			WithCallback(func(s string, values []driver.NamedValue) {
 				artifactDataDeleted = true
 			})
-
-		deleteInput := models.ArtifactKey{
-			ArtifactID: artifact.ArtifactID,
-		}
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "tags" WHERE "tags"."artifact_id" = $1 AND "tags"."dataset_uuid" = $2`).
+			WithExecException()
+		partitionsDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "partitions" WHERE "partitions"."dataset_uuid" = $1 AND "partitions"."artifact_id" = $2`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				partitionsDeleted = true
+			})
+		artifactDeleted := false
+		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE ("artifacts"."dataset_project","artifacts"."dataset_name","artifacts"."dataset_domain","artifacts"."dataset_version","artifacts"."artifact_id") IN (($1,$2,$3,$4,$5))`).
+			WithRowsNum(1).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				artifactDeleted = true
+			})
 
 		artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
-		err := artifactRepo.Delete(ctx, deleteInput)
+		err := artifactRepo.Delete(ctx, artifact)
 		assert.Error(t, err)
 		dcErr, ok := err.(apiErrors.DataCatalogError)
 		assert.True(t, ok)
 		assert.Equal(t, dcErr.Code(), codes.Internal)
 		assert.True(t, artifactDataDeleted)
+		assert.False(t, partitionsDeleted)
+		assert.False(t, artifactDeleted)
 	})
 
-	t.Run("ArtifactDataDelete", func(t *testing.T) {
+	t.Run("PartitionsDelete", func(t *testing.T) {
 		ctx := context.Background()
 
 		GlobalMock := mocket.Catcher.Reset()
 		GlobalMock.Logging = true
 
+		artifactDataDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."dataset_project" = $1 AND "artifact_data"."dataset_name" = $2 AND "artifact_data"."dataset_domain" = $3 AND "artifact_data"."dataset_version" = $4 AND "artifact_data"."artifact_id" = $5`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				artifactDataDeleted = true
+			})
+		tagsDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "tags" WHERE "tags"."artifact_id" = $1 AND "tags"."dataset_uuid" = $2`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				tagsDeleted = true
+			})
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "partitions" WHERE "partitions"."dataset_uuid" = $1 AND "partitions"."artifact_id" = $2`).
+			WithRowsNum(0).
+			WithExecException()
 		artifactDeleted := false
-		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE "artifacts"."artifact_id" = $1`).
+		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE ("artifacts"."dataset_project","artifacts"."dataset_name","artifacts"."dataset_domain","artifacts"."dataset_version","artifacts"."artifact_id") IN (($1,$2,$3,$4,$5))`).
 			WithRowsNum(1).
 			WithCallback(func(s string, values []driver.NamedValue) {
 				artifactDeleted = true
 			})
+
+		artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
+		err := artifactRepo.Delete(ctx, artifact)
+		assert.Error(t, err)
+		dcErr, ok := err.(apiErrors.DataCatalogError)
+		assert.True(t, ok)
+		assert.Equal(t, dcErr.Code(), codes.Internal)
+		assert.True(t, artifactDataDeleted)
+		assert.True(t, tagsDeleted)
+		assert.False(t, artifactDeleted)
+	})
+
+	t.Run("ArtifactDelete", func(t *testing.T) {
+		ctx := context.Background()
+
+		GlobalMock := mocket.Catcher.Reset()
+		GlobalMock.Logging = true
+
+		artifactDataDeleted := false
 		GlobalMock.NewMock().
-			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."artifact_id" = $1`).
+			WithQuery(`DELETE FROM "artifact_data" WHERE "artifact_data"."dataset_project" = $1 AND "artifact_data"."dataset_name" = $2 AND "artifact_data"."dataset_domain" = $3 AND "artifact_data"."dataset_version" = $4 AND "artifact_data"."artifact_id" = $5`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				artifactDataDeleted = true
+			})
+		tagsDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "tags" WHERE "tags"."artifact_id" = $1 AND "tags"."dataset_uuid" = $2`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				tagsDeleted = true
+			})
+		partitionsDeleted := false
+		GlobalMock.NewMock().
+			WithQuery(`DELETE FROM "partitions" WHERE "partitions"."dataset_uuid" = $1 AND "partitions"."artifact_id" = $2`).
+			WithRowsNum(0).
+			WithCallback(func(s string, values []driver.NamedValue) {
+				partitionsDeleted = true
+			})
+		GlobalMock.NewMock().WithQuery(`DELETE FROM "artifacts" WHERE ("artifacts"."dataset_project","artifacts"."dataset_name","artifacts"."dataset_domain","artifacts"."dataset_version","artifacts"."artifact_id") IN (($1,$2,$3,$4,$5))`).
 			WithExecException()
 
-		deleteInput := models.ArtifactKey{
-			ArtifactID: artifact.ArtifactID,
-		}
-
 		artifactRepo := NewArtifactRepo(utils.GetDbForTest(t), errors.NewPostgresErrorTransformer(), promutils.NewTestScope())
-		err := artifactRepo.Delete(ctx, deleteInput)
+		err := artifactRepo.Delete(ctx, artifact)
 		assert.Error(t, err)
 		dcErr, ok := err.(apiErrors.DataCatalogError)
 		assert.True(t, ok)
 		assert.Equal(t, dcErr.Code(), codes.Internal)
-		assert.False(t, artifactDeleted)
+		assert.True(t, artifactDataDeleted)
+		assert.True(t, tagsDeleted)
+		assert.True(t, partitionsDeleted)
 	})
 }
diff --git a/datacatalog/pkg/repositories/interfaces/artifact_repo.go b/datacatalog/pkg/repositories/interfaces/artifact_repo.go
index 4d4f845dc0..a3bd35261a 100644
--- a/datacatalog/pkg/repositories/interfaces/artifact_repo.go
+++ b/datacatalog/pkg/repositories/interfaces/artifact_repo.go
@@ -13,5 +13,5 @@ type ArtifactRepo interface {
 	Get(ctx context.Context, in models.ArtifactKey) (models.Artifact, error)
 	List(ctx context.Context, datasetKey models.DatasetKey, in models.ListModelsInput) ([]models.Artifact, error)
 	Update(ctx context.Context, artifact models.Artifact) error
-	Delete(ctx context.Context, key models.ArtifactKey) error
+	Delete(ctx context.Context, artifact models.Artifact) error
 }
diff --git a/datacatalog/pkg/repositories/mocks/artifact_repo.go b/datacatalog/pkg/repositories/mocks/artifact_repo.go
index 1e3445fc2f..b6d8552e3d 100644
--- a/datacatalog/pkg/repositories/mocks/artifact_repo.go
+++ b/datacatalog/pkg/repositories/mocks/artifact_repo.go
@@ -55,8 +55,8 @@ func (_m ArtifactRepo_Delete) Return(_a0 error) *ArtifactRepo_Delete {
 	return &ArtifactRepo_Delete{Call: _m.Call.Return(_a0)}
 }
 
-func (_m *ArtifactRepo) OnDelete(ctx context.Context, key models.ArtifactKey) *ArtifactRepo_Delete {
-	c_call := _m.On("Delete", ctx, key)
+func (_m *ArtifactRepo) OnDelete(ctx context.Context, artifact models.Artifact) *ArtifactRepo_Delete {
+	c_call := _m.On("Delete", ctx, artifact)
 	return &ArtifactRepo_Delete{Call: c_call}
 }
 
@@ -65,13 +65,13 @@ func (_m *ArtifactRepo) OnDeleteMatch(matchers ...interface{}) *ArtifactRepo_Del
 	return &ArtifactRepo_Delete{Call: c_call}
 }
 
-// Delete provides a mock function with given fields: ctx, key
-func (_m *ArtifactRepo) Delete(ctx context.Context, key models.ArtifactKey) error {
-	ret := _m.Called(ctx, key)
+// Delete provides a mock function with given fields: ctx, artifact
+func (_m *ArtifactRepo) Delete(ctx context.Context, artifact models.Artifact) error {
+	ret := _m.Called(ctx, artifact)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, models.ArtifactKey) error); ok {
-		r0 = rf(ctx, key)
+	if rf, ok := ret.Get(0).(func(context.Context, models.Artifact) error); ok {
+		r0 = rf(ctx, artifact)
 	} else {
 		r0 = ret.Error(0)
 	}

From a2315f8ef1ab224d780e7b56858609c51d220213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nick=20M=C3=BCller?= 
Date: Thu, 15 Dec 2022 16:50:18 +0100
Subject: [PATCH 21/57] Updated to latest unreleased version of flyteidl and
 flytestdlib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nick Müller 
---
 datacatalog/go.mod |  30 ++-
 datacatalog/go.sum | 640 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 518 insertions(+), 152 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index ce20f21988..df707d94eb 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -2,12 +2,15 @@ module github.com/flyteorg/datacatalog
 
 go 1.18
 
-replace github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221007124753-76ba43dbb743
+replace (
+	github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6
+	github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf
+)
 
 require (
 	github.com/Selvatico/go-mocket v1.0.7
 	github.com/flyteorg/flyteidl v1.2.3
-	github.com/flyteorg/flytestdlib v1.0.11
+	github.com/flyteorg/flytestdlib v1.0.12
 	github.com/golang/glog v1.0.0
 	github.com/golang/protobuf v1.5.2
 	github.com/jackc/pgconn v1.10.1
@@ -15,7 +18,7 @@ require (
 	github.com/satori/go.uuid v1.2.0
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.7.2
 	google.golang.org/grpc v1.46.0
 	gorm.io/driver/postgres v1.2.3
 	gorm.io/driver/sqlite v1.1.1
@@ -47,7 +50,7 @@ require (
 	github.com/flyteorg/stow v0.3.6 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/gofrs/uuid v4.2.0+incompatible // indirect
 	github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -70,7 +73,7 @@ require (
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/ncw/swift v1.0.53 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
@@ -80,7 +83,7 @@ require (
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/sirupsen/logrus v1.7.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -88,21 +91,22 @@ require (
 	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
 	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
-	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
 	google.golang.org/api v0.76.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/apimachinery v0.20.2 // indirect
-	k8s.io/client-go v0.0.0-20210217172142-7279fc64d847 // indirect
-	k8s.io/klog/v2 v2.5.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apimachinery v0.24.1 // indirect
+	k8s.io/client-go v0.24.1 // indirect
+	k8s.io/klog/v2 v2.60.1 // indirect
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 )
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index 67f4b934f2..d0cf141306 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -7,6 +7,7 @@ cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxK
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
@@ -47,6 +48,7 @@ cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLq
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
+cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
 cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc=
 cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
@@ -67,83 +69,114 @@ github.com/Azure/azure-sdk-for-go v62.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
 github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo=
 github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.0/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 h1:3CVsSo4mp8NDWO11tHzN/mdo2zP0CtaSK5IcwBjfqRA=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0 h1:NVS/4LOQfkBpk+B1VopIzv1ptmYeEskA8w/3K/w7vjo=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0/go.mod h1:RG0cZndeZM17StwohYclmcXSr4oOJ8b1I5hB8llIc6Y=
 github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
+github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
 github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 h1:Px2KVERcYEg2Lv25AqC2hVr0xUWaq94wuEObLIkYzmA=
 github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2/go.mod h1:CdSJQNNzZhCkwDaV27XV1w48ZBPtxe7mlrZAsPNxD5g=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 h1:0nJeKDmB7a1a8RDMjTltahlPsaNlWjq/LpkZleSwINk=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0/go.mod h1:mbwxKc/fW+IkF0GG591MuXw0KuEQBDkeRoZ9vmVJPxg=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
-github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
+github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
+github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
+github.com/Azure/go-autorest/autorest v0.11.25/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U=
 github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A=
 github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
-github.com/Azure/go-autorest/autorest/adal v0.9.10/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
+github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
+github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
 github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ=
 github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
 github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
 github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
 github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
 github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw=
 github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU=
 github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk=
 github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg=
 github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c=
+github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295/go.mod h1:e0aH495YLkrsIe9fhedd6aSR6fgU/qhKvtroi6y7G/M=
+github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20200723154620-6f35a1152625/go.mod h1:6PnrZv6zUDkrNMw0mIoGRmGBR7i9LulhKPmxFq4rUiM=
+github.com/Jeffail/gabs/v2 v2.5.1/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Selvatico/go-mocket v1.0.7 h1:sXuFMnMfVL9b/Os8rGXPgbOFbr4HJm8aHsulD/uMTUk=
 github.com/Selvatico/go-mocket v1.0.7/go.mod h1:4gO2v+uQmsL+jzQgLANy3tyEFzaEzHlymVbZ3GP2Oes=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/adammck/venv v0.0.0-20160819025605-8a9c907a37d3/go.mod h1:3zXR2a/VSQndtpShh783rUTaEA2mpqN2VqZclBARBc0=
+github.com/adammck/venv v0.0.0-20200610172036-e77789703e7c/go.mod h1:3zXR2a/VSQndtpShh783rUTaEA2mpqN2VqZclBARBc0=
+github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
+github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d/go.mod h1:mZUP7GJmjiWtf8v3FD1X/QdK08BqyeH/1Ejt0qhNzCs=
 github.com/aws/aws-sdk-go v1.23.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.37.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.37.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.44.2 h1:5VBk5r06bgxgRKVaUtm1/4NT/rtrnH2E4cnAYv5zgQc=
 github.com/aws/aws-sdk-go v1.44.2/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/aws/aws-sdk-go-v2 v1.0.0/go.mod h1:smfAbmpW+tcRVuNUjo3MOArSZmW72t62rkCzc2i0TWM=
+github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo=
+github.com/aws/aws-sdk-go-v2/config v1.0.0/go.mod h1:WysE/OpUgE37tjtmtJd8GXgT8s1euilE5XtUkRNUQ1w=
+github.com/aws/aws-sdk-go-v2/credentials v1.0.0/go.mod h1:/SvsiqBf509hG4Bddigr3NB12MIpfHhZapyBurJe8aY=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.0/go.mod h1:wpMHDCXvOXZxGCRSidyepa8uJHY4vaBGfY2/+oKU/Bc=
+github.com/aws/aws-sdk-go-v2/service/athena v1.0.0/go.mod h1:qY8QFbemf2ceqweXcS6hQqiiIe1z42WqTvHsK2Lb0rE=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.0/go.mod h1:3jExOmpbjgPnz2FJaMOfbSk1heTkZ66aD3yNtVhnjvI=
+github.com/aws/aws-sdk-go-v2/service/sts v1.0.0/go.mod h1:5f+cELGATgill5Pu3/vK3Ebuigstc+qYEHW5MvGWZO4=
+github.com/aws/smithy-go v1.0.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1/go.mod h1:jvdWlw8vowVGnZqSDC7yhPd7AifQeQbRDkZcQXV2nRg=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -151,11 +184,17 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
-github.com/blackshark-ai/flyteidl v0.24.22-0.20221007124753-76ba43dbb743 h1:RtdJHPeWoMcluNYAQ0H1i+eiX9idue/WPr5rHsy0om0=
-github.com/blackshark-ai/flyteidl v0.24.22-0.20221007124753-76ba43dbb743/go.mod h1:SLTYz2JgIKvM5MbPVlMP7uILb65fnuuZQZFHHIEYh2U=
-github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMpKRTsX2FjEIP2WCWrdOAfvg9nwoObBkJCCnksQaM=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo=
+github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf h1:tKQlA5yx6BVA9W2zJl60b60nTOgZKTP8Uk9xIQfhDMA=
+github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
+github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -166,7 +205,8 @@ github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgk
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -180,22 +220,31 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
+github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
+github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc=
 github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -204,16 +253,17 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
+github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -225,62 +275,118 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4=
+github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc=
+github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/flyteorg/flytestdlib v1.0.0/go.mod h1:QSVN5wIM1lM9d60eAEbX7NwweQXW96t5x4jbyftn89c=
-github.com/flyteorg/flytestdlib v1.0.11 h1:f7B8x2/zMuimEVi4Jx0zqzvNhdi7aq7+ZWoqHsbp4F4=
-github.com/flyteorg/flytestdlib v1.0.11/go.mod h1:nIBmBHtjTJvhZEn3e/EwVC/iMkR2tUX8hEiXjRBpH/s=
+github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/flyteorg/flyteplugins v1.0.10/go.mod h1:GfbmRByI/rSatm/Epoj3bNyrXwIQ9NOXTVwLS6Z0p84=
+github.com/flyteorg/flyteplugins v1.0.18/go.mod h1:ZbZVBxEWh8Icj1AgfNKg0uPzHHGd9twa4eWcY2Yt6xE=
+github.com/flyteorg/flytepropeller v1.1.28/go.mod h1:QE3szUWkFnyFg3mMxpn3y93ZSs18T+1SQtVgNhcEMvA=
 github.com/flyteorg/stow v0.3.3/go.mod h1:HBld7ud0i4khMHwJjkO8v+NSP7ddKa/ruhf4I8fliaA=
+github.com/flyteorg/stow v0.3.4/go.mod h1:2T2f6KaIWoWCLgI6EFZQgjb83Vg5SolmBwc2O06WQU4=
 github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk=
 github.com/flyteorg/stow v0.3.6/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
-github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
+github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
+github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
-github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
+github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
+github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
+github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
+github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
+github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
+github.com/go-redis/redis v6.15.7+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
+github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
 github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
+github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ=
@@ -304,6 +410,7 @@ github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -322,10 +429,14 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
+github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w=
+github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w=
+github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA=
+github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -343,6 +454,7 @@ github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -363,6 +475,7 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -370,8 +483,9 @@ github.com/google/readahead v0.0.0-20161222183148-eaceba169032/go.mod h1:qYysrqQ
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -379,39 +493,54 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0
 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
 github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI=
 github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
+github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
+github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
 github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA=
 github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
+github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -420,16 +549,21 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
+github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -477,6 +611,9 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.2.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jarcoal/httpmock v1.2.0/go.mod h1:oCoTsnAz4+UoOUIf5lJOWV2QQIW5UoeUI6aM2YnWAZk=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -490,10 +627,13 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -520,23 +660,33 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kubeflow/common v0.4.3/go.mod h1:Qb/5aON7/OWVkN8OnjRqqT0i8X/XzMekRIZ8lkLosj4=
+github.com/kubeflow/training-operator v1.5.0-rc.0/go.mod h1:xgcu/ZI/RwKbTvYgzU7ZWFpxbsefSey5We3KmKroALY=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
-github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
-github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -546,16 +696,24 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/maxatome/go-testdeep v1.11.0/go.mod h1:011SgQ6efzZYAen6fDn4BqQ+lUR72ysdyKe7Dyogw70=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
@@ -567,126 +725,125 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
+github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
+github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
+github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
+github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
-github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
-github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
-github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
-github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/ncw/swift v1.0.49/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
 github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks=
 github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
-github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
-github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
-github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
+github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
+github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0=
 github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI=
 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pkg/sftp v1.10.0/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
+github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
+github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c/go.mod h1:uLBlYqsCS2nsKiVlxJxI5EVgq8CrqNeHDP5uq3hde+c=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
+github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpOAnclKvg+mdA=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -695,17 +852,18 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
+github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
+github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
 github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
@@ -713,7 +871,9 @@ github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU
 github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
+github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
 github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
@@ -724,13 +884,13 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/spf13/viper v1.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44=
 github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk=
-github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -742,69 +902,129 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8=
+go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
+go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
+go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
+go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
+go.etcd.io/etcd/client/v2 v2.305.2/go.mod h1:2D7ZejHVMIfog1221iLSYlQRzrtECw3kz4I4VAQm3qI=
+go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0=
+go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q=
+go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE=
+go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc=
+go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4=
+go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4=
+go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
+go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
+go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
+go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
+go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
+go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
+go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
+go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
+go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
+go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
+go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
+go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
+go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
+golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -815,6 +1035,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -841,18 +1062,21 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -863,6 +1087,8 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -873,6 +1099,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -882,22 +1109,28 @@ golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -908,14 +1141,15 @@ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
@@ -932,6 +1166,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -939,10 +1175,12 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -954,16 +1192,22 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -973,26 +1217,31 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1003,10 +1252,14 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1014,13 +1267,20 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1035,14 +1295,16 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -1054,14 +1316,19 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -1083,8 +1350,10 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
@@ -1097,6 +1366,7 @@ golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4X
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -1106,16 +1376,22 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM=
+golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
+golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
 golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
+gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -1136,10 +1412,10 @@ google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQW
 google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.38.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
 google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
 google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
 google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
@@ -1148,6 +1424,7 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6
 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
 google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
 google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
 google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
 google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
 google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
@@ -1158,7 +1435,6 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69
 google.golang.org/api v0.76.0 h1:UkZl25bR1FHNqtK/EKs3vCdpZtUO6gea3YElTwc8pQg=
 google.golang.org/api v0.76.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
@@ -1171,7 +1447,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
@@ -1188,6 +1463,7 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
@@ -1201,12 +1477,13 @@ google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -1230,10 +1507,13 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc
 google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
@@ -1248,13 +1528,9 @@ google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX
 google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 h1:G1IeWbjrqEq9ChWxEuRPJu6laA67+XgTFHVSAvepr38=
 google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -1304,12 +1580,12 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -1317,9 +1593,11 @@ gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
 gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/kothar/go-backblaze.v0 v0.0.0-20190520213052-702d4e7eb465/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE=
+gopkg.in/kothar/go-backblaze.v0 v0.0.0-20210124194846-35409b867216/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -1330,9 +1608,13 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/postgres v1.2.3 h1:f4t0TmNMy9gh3TU2PX+EppoA6YsgFnyq8Ojtddb42To=
 gorm.io/driver/postgres v1.2.3/go.mod h1:pJV6RgYQPG47aM1f0QeOzFH9HxQc8JcmAgjRCgS0wjs=
 gorm.io/driver/sqlite v1.1.1 h1:qtWqNAEUyi7gYSUAJXeiAMz0lUOdakZF5ia9Fqnp5G4=
@@ -1341,7 +1623,9 @@ gorm.io/gorm v1.9.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.22.3/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
 gorm.io/gorm v1.22.4 h1:8aPcyEJhY0MAt8aY6Dc524Pn+pO29K+ydu+e/cXSpQM=
 gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
+gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1349,25 +1633,103 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20210217171935-8e2decd92398/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78=
-k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8=
-k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY=
-k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg=
+k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
+k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
+k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY=
+k8s.io/api v0.19.6/go.mod h1:Plxx44Nh4zVblkJrIgxVPgPre1mvng6tXf1Sj3bs0fU=
+k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg=
+k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I=
+k8s.io/api v0.24.1/go.mod h1:JhoOvNiLXKTPQ60zh2g0ewpA+bnEYf5q44Flhquh4vQ=
+k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY=
+k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M=
+k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4=
+k8s.io/apiextensions-apiserver v0.24.0/go.mod h1:iuVe4aEpe6827lvO6yWQVxiPSpPoSKVjkq+MIdg84cM=
+k8s.io/apiextensions-apiserver v0.24.1/go.mod h1:A6MHfaLDGfjOc/We2nM7uewD5Oa/FnEbZ6cD7g2ca4Q=
+k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
+k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
+k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig=
+k8s.io/apimachinery v0.19.6/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q=
 k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
-k8s.io/client-go v0.0.0-20210217172142-7279fc64d847 h1:d+LBRNY3c/KGp7lDblRlUJkayx4Vla7WUTIazoGMdYo=
-k8s.io/client-go v0.0.0-20210217172142-7279fc64d847/go.mod h1:q0EaghmVye2uui19vxSZ2NG6ssgUWgjudO6vrwXneSI=
+k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
+k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
+k8s.io/apimachinery v0.24.1 h1:ShD4aDxTQKN5zNf8K1RQ2u98ELLdIW7jEnlO9uAMX/I=
+k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
+k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw=
+k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg=
+k8s.io/apiserver v0.19.6/go.mod h1:05XquZxCDzQ27ebk7uV2LrFIK4lm5Yt47XkkUvLAoAM=
+k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4=
+k8s.io/apiserver v0.24.0/go.mod h1:WFx2yiOMawnogNToVvUYT9nn1jaIkMKj41ZYCVycsBA=
+k8s.io/apiserver v0.24.1/go.mod h1:dQWNMx15S8NqJMp0gpYfssyvhYnkilc1LpExd/dkLh0=
+k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
+k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
+k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU=
+k8s.io/client-go v0.19.6/go.mod h1:gEiS+efRlXYUEQ9Oz4lmNXlxAl5JZ8y2zbTDGhvXXnk=
+k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA=
+k8s.io/client-go v0.24.0/go.mod h1:VFPQET+cAFpYxh6Bq6f4xyMY80G6jKKktU6G0m00VDw=
+k8s.io/client-go v0.24.1 h1:w1hNdI9PFrzu3OlovVeTnf4oHDt+FJLd9Ndluvnb42E=
+k8s.io/client-go v0.24.1/go.mod h1:f1kIDqcEYmwXS/vTbbhopMUbhKp2JhOeVTfxgaCIlF8=
+k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
+k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
+k8s.io/code-generator v0.19.6/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
+k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
+k8s.io/code-generator v0.24.0/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
+k8s.io/code-generator v0.24.1/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
+k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM=
+k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14=
+k8s.io/component-base v0.19.6/go.mod h1:8Btsf8J00/fVDa/YFmXjei7gVkcFrlKZXjSeP4SZNJg=
+k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI=
+k8s.io/component-base v0.24.0/go.mod h1:Dgazgon0i7KYUsS8krG8muGiMVtUZxG037l1MKyXgrA=
+k8s.io/component-base v0.24.1/go.mod h1:DW5vQGYVCog8WYpNob3PMmmsY8A3L9QZNg4j/dV3s38=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=
-k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
+k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc=
+k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
+k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
+k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
-k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
+k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk=
+k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
+k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
+sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E=
+sigs.k8s.io/controller-runtime v0.11.1/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
+sigs.k8s.io/controller-runtime v0.12.1/go.mod h1:BKhxlA4l7FPK4AQcsuL4X6vZeWnKDXez/vp1Y8dxTU0=
+sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI=
+sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
+sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
+sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
+sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
+sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
+sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
+sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+volcano.sh/apis v1.2.0-k8s1.19.6/go.mod h1:UaeJ/s5Hyd+ZhFLc+Kw9YlgM8gRZ/5OzXqHa0yKOoXY=

From d2565a1014eedf37824b847eb13f197efd613ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nick=20M=C3=BCller?= 
Date: Thu, 15 Dec 2022 19:20:35 +0100
Subject: [PATCH 22/57] Updated to latest unreleased version of flytestdlib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nick Müller 
---
 datacatalog/go.mod | 2 +-
 datacatalog/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index df707d94eb..194c04a00b 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 replace (
 	github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6
-	github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf
+	github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced
 )
 
 require (
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index d0cf141306..2ca9f1f292 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -187,8 +187,8 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMpKRTsX2FjEIP2WCWrdOAfvg9nwoObBkJCCnksQaM=
 github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo=
-github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf h1:tKQlA5yx6BVA9W2zJl60b60nTOgZKTP8Uk9xIQfhDMA=
-github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY=
+github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced h1:Dxj7o/Q5FPMH+nYKptNq2n5forXJET8MiR2hVDzTMqU=
+github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=

From 0167db1071dbe993b9c3b6ea87b6afe614cf1a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nick=20M=C3=BCller?= 
Date: Wed, 4 Jan 2023 16:25:22 +0100
Subject: [PATCH 23/57] Updated to latest unreleased version fo flyteidl and
 flytestdlib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nick Müller 
---
 datacatalog/go.mod | 6 +++---
 datacatalog/go.sum | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index 194c04a00b..8ec063f0a1 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -3,13 +3,13 @@ module github.com/flyteorg/datacatalog
 go 1.18
 
 replace (
-	github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6
-	github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced
+	github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f
+	github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697
 )
 
 require (
 	github.com/Selvatico/go-mocket v1.0.7
-	github.com/flyteorg/flyteidl v1.2.3
+	github.com/flyteorg/flyteidl v1.3.1
 	github.com/flyteorg/flytestdlib v1.0.12
 	github.com/golang/glog v1.0.0
 	github.com/golang/protobuf v1.5.2
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index 2ca9f1f292..15a235ca73 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -185,10 +185,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6 h1:ekMpKRTsX2FjEIP2WCWrdOAfvg9nwoObBkJCCnksQaM=
-github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo=
-github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced h1:Dxj7o/Q5FPMH+nYKptNq2n5forXJET8MiR2hVDzTMqU=
-github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215181718-9b165563eced/go.mod h1:RpZN5PTZ4081mOvsmciE5E/Q817//fT3i/dhq2aXmCY=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f h1:BFpozetWgkWdrOz2wDQY/2pcvm8Wx60uI4mJup+0yrg=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo=
+github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697 h1:N3ch1D89Hhe72LK9zVuSwZ9DrRl9G3M5fsntD6ydZEY=
+github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697/go.mod h1:ojJnMQ9sDf1VW6zrHv8TauKrMV0+Pf+6n+uProvhzac=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=

From 8f2f414cbc2f8b6d0b03af3ea7ede7c7b3db12d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nick=20M=C3=BCller?= 
Date: Thu, 19 Jan 2023 13:12:19 +0100
Subject: [PATCH 24/57] Implement acquiring/releasing of reserverations as bulk
 operation Implement deleting of artifacts as bulk operation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nick Müller 
---
 datacatalog/go.mod                            |   2 +-
 datacatalog/go.sum                            |   4 +-
 datacatalog/pkg/errors/errors.go              |   2 +-
 .../pkg/manager/impl/artifact_manager.go      |  97 ++-
 .../pkg/manager/impl/artifact_manager_test.go | 400 ++++++++++
 .../pkg/manager/impl/reservation_manager.go   | 111 ++-
 .../manager/impl/reservation_manager_test.go  | 723 +++++++++++++++++-
 .../impl/validators/artifact_validator.go     |  22 +
 .../impl/validators/reservation_validator.go  |  86 +++
 .../pkg/manager/interfaces/artifact.go        |   1 +
 .../pkg/manager/interfaces/reservation.go     |   2 +
 .../pkg/manager/mocks/artifact_manager.go     |  41 +
 .../pkg/manager/mocks/reservation_manager.go  |  82 ++
 .../pkg/rpc/datacatalogservice/service.go     |  12 +
 14 files changed, 1538 insertions(+), 47 deletions(-)
 create mode 100644 datacatalog/pkg/manager/impl/validators/reservation_validator.go

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index 8ec063f0a1..aa85579749 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -3,7 +3,7 @@ module github.com/flyteorg/datacatalog
 go 1.18
 
 replace (
-	github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f
+	github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20230119104851-e9fb728f4733
 	github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697
 )
 
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index 15a235ca73..bf24e52b7e 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -185,8 +185,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f h1:BFpozetWgkWdrOz2wDQY/2pcvm8Wx60uI4mJup+0yrg=
-github.com/blackshark-ai/flyteidl v0.24.22-0.20230104143947-9cc1f12a643f/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20230119104851-e9fb728f4733 h1:xvr9DovH3m3S10+U71+lJ6zmJDFoOHPLSZfXSRtZxEo=
+github.com/blackshark-ai/flyteidl v0.24.22-0.20230119104851-e9fb728f4733/go.mod h1:sgOlQA2lnugarwSN8M+9gWoCZmzYNFI8gpShZrm+wmo=
 github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697 h1:N3ch1D89Hhe72LK9zVuSwZ9DrRl9G3M5fsntD6ydZEY=
 github.com/blackshark-ai/flytestdlib v1.0.1-0.20230104151410-d6ec6dba8697/go.mod h1:ojJnMQ9sDf1VW6zrHv8TauKrMV0+Pf+6n+uProvhzac=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
diff --git a/datacatalog/pkg/errors/errors.go b/datacatalog/pkg/errors/errors.go
index ac778f00ad..37643a2365 100644
--- a/datacatalog/pkg/errors/errors.go
+++ b/datacatalog/pkg/errors/errors.go
@@ -51,7 +51,7 @@ func NewCollectedErrors(code codes.Code, errors []error) error {
 		errorCollection[idx] = err.Error()
 	}
 
-	return NewDataCatalogError(code, strings.Join((errorCollection), ", "))
+	return NewDataCatalogError(code, strings.Join(errorCollection, ", "))
 }
 
 func IsAlreadyExistsError(err error) bool {
diff --git a/datacatalog/pkg/manager/impl/artifact_manager.go b/datacatalog/pkg/manager/impl/artifact_manager.go
index f738919547..0d3aeec14c 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager.go
@@ -49,6 +49,9 @@ type artifactMetrics struct {
 	deleteResponseTime       labeled.StopWatch
 	deleteSuccessCounter     labeled.Counter
 	deleteFailureCounter     labeled.Counter
+	bulkDeleteResponseTime   labeled.StopWatch
+	bulkDeleteSuccessCounter labeled.Counter
+	bulkDeleteFailureCounter labeled.Counter
 }
 
 type artifactManager struct {
@@ -57,7 +60,8 @@ type artifactManager struct {
 	systemMetrics artifactMetrics
 }
 
-// Create an Artifact along with the associated ArtifactData. The ArtifactData will be stored in an offloaded location.
+// CreateArtifact creates an Artifact along with the associated ArtifactData. The ArtifactData will be stored in an
+// offloaded location.
 func (m *artifactManager) CreateArtifact(ctx context.Context, request *datacatalog.CreateArtifactRequest) (*datacatalog.CreateArtifactResponse, error) {
 	timer := m.systemMetrics.createResponseTime.Start(ctx)
 	defer timer.Stop()
@@ -133,7 +137,7 @@ func (m *artifactManager) CreateArtifact(ctx context.Context, request *datacatal
 	return &datacatalog.CreateArtifactResponse{}, nil
 }
 
-// Get the Artifact and its associated ArtifactData. The request can query by ArtifactID or TagName.
+// GetArtifact retrieves the Artifact and its associated ArtifactData. The request can query by ArtifactID or TagName.
 func (m *artifactManager) GetArtifact(ctx context.Context, request *datacatalog.GetArtifactRequest) (*datacatalog.GetArtifactResponse, error) {
 	timer := m.systemMetrics.getResponseTime.Start(ctx)
 	defer timer.Stop()
@@ -244,6 +248,8 @@ func (m *artifactManager) getArtifactDataList(ctx context.Context, artifactDataM
 	return artifactDataList, nil
 }
 
+// ListArtifacts returns a paginated list of artifacts matching the provided filter expression, including their
+// associated artifact data.
 func (m *artifactManager) ListArtifacts(ctx context.Context, request *datacatalog.ListArtifactsRequest) (*datacatalog.ListArtifactsResponse, error) {
 	err := validators.ValidateListArtifactRequest(request)
 	if err != nil {
@@ -408,36 +414,22 @@ func (m *artifactManager) UpdateArtifact(ctx context.Context, request *datacatal
 	}, nil
 }
 
-// DeleteArtifact deletes the given artifact, removing all stored artifact data from the underlying blob storage.
-func (m *artifactManager) DeleteArtifact(ctx context.Context, request *datacatalog.DeleteArtifactRequest) (*datacatalog.DeleteArtifactResponse, error) {
-	ctx = contextutils.WithProjectDomain(ctx, request.Dataset.Project, request.Dataset.Domain)
-
-	timer := m.systemMetrics.deleteResponseTime.Start(ctx)
-	defer timer.Stop()
-
-	err := validators.ValidateDeleteArtifactRequest(request)
-	if err != nil {
-		logger.Warningf(ctx, "Invalid delete artifact request %v, err: %v", request, err)
-		m.systemMetrics.validationErrorCounter.Inc(ctx)
-		m.systemMetrics.deleteFailureCounter.Inc(ctx)
-		return nil, err
-	}
+func (m *artifactManager) deleteArtifact(ctx context.Context, datasetID *datacatalog.DatasetID, queryHandle artifactQueryHandle) error {
+	ctx = contextutils.WithProjectDomain(ctx, datasetID.Project, datasetID.Domain)
 
 	// artifact must already exist, verify first
-	artifactModel, err := m.findArtifact(ctx, request.GetDataset(), request)
+	artifactModel, err := m.findArtifact(ctx, datasetID, queryHandle)
 	if err != nil {
-		logger.Errorf(ctx, "Failed to get artifact for delete artifact request %v, err: %v", request, err)
-		m.systemMetrics.deleteFailureCounter.Inc(ctx)
-		return nil, err
+		logger.Errorf(ctx, "Failed to get artifact while trying to delete [%v], err: %v", queryHandle, err)
+		return err
 	}
 
 	// delete all artifact data from the blob storage
 	for _, artifactData := range artifactModel.ArtifactData {
 		if err := m.artifactStore.DeleteData(ctx, artifactData); err != nil {
-			logger.Errorf(ctx, "Failed to delete artifact data [%v] during delete, err: %v", artifactData.Name, err)
+			logger.Errorf(ctx, "Failed to delete artifact data [%v] while deleting artifact [%v], err: %v", artifactData.Name, artifactModel.ArtifactID, err)
 			m.systemMetrics.deleteDataFailureCounter.Inc(ctx)
-			m.systemMetrics.deleteFailureCounter.Inc(ctx)
-			return nil, err
+			return err
 		}
 
 		m.systemMetrics.deleteDataSuccessCounter.Inc(ctx)
@@ -447,21 +439,71 @@ func (m *artifactManager) DeleteArtifact(ctx context.Context, request *datacatal
 	err = m.repo.ArtifactRepo().Delete(ctx, artifactModel)
 	if err != nil {
 		if errors.IsDoesNotExistError(err) {
-			logger.Warnf(ctx, "Artifact does not exist key: %+v, err %v", artifactModel.ArtifactID, err)
+			logger.Warnf(ctx, "Artifact [%v] does not exist, err %v", artifactModel.ArtifactID, err)
 			m.systemMetrics.doesNotExistCounter.Inc(ctx)
 		} else {
-			logger.Errorf(ctx, "Failed to delete artifact %v, err: %v", artifactModel, err)
+			logger.Errorf(ctx, "Failed to delete artifact [%v], err: %v", artifactModel, err)
 		}
+		return err
+	}
+
+	logger.Debugf(ctx, "Successfully deleted artifact [%v]", artifactModel.ArtifactID)
+	return nil
+}
+
+// DeleteArtifact deletes the given artifact, removing all stored artifact data from the underlying blob storage.
+func (m *artifactManager) DeleteArtifact(ctx context.Context, request *datacatalog.DeleteArtifactRequest) (*datacatalog.DeleteArtifactResponse, error) {
+	ctx = contextutils.WithProjectDomain(ctx, request.Dataset.Project, request.Dataset.Domain)
+
+	timer := m.systemMetrics.deleteResponseTime.Start(ctx)
+	defer timer.Stop()
+
+	err := validators.ValidateDeleteArtifactRequest(request)
+	if err != nil {
+		logger.Warningf(ctx, "Invalid delete artifacts request %v, err: %v", request, err)
+		m.systemMetrics.validationErrorCounter.Inc(ctx)
 		m.systemMetrics.deleteFailureCounter.Inc(ctx)
 		return nil, err
 	}
 
-	logger.Debugf(ctx, "Successfully deleted artifact id: %v", artifactModel.ArtifactID)
+	if err := m.deleteArtifact(ctx, request.GetDataset(), request); err != nil {
+		m.systemMetrics.deleteFailureCounter.Inc(ctx)
+		return nil, err
+	}
 
 	m.systemMetrics.deleteSuccessCounter.Inc(ctx)
 	return &datacatalog.DeleteArtifactResponse{}, nil
 }
 
+// DeleteArtifacts deletes the given artifacts, removing all stored artifact data from the underlying blob storage.
+func (m *artifactManager) DeleteArtifacts(ctx context.Context, request *datacatalog.DeleteArtifactsRequest) (*datacatalog.DeleteArtifactResponse, error) {
+	timer := m.systemMetrics.bulkDeleteResponseTime.Start(ctx)
+	defer timer.Stop()
+
+	err := validators.ValidateDeleteArtifactsRequest(request)
+	if err != nil {
+		logger.Warningf(ctx, "Invalid delete artifacts request %v, err: %v", request, err)
+		m.systemMetrics.validationErrorCounter.Inc(ctx)
+		m.systemMetrics.bulkDeleteFailureCounter.Inc(ctx)
+		return nil, err
+	}
+
+	for _, deleteArtifactReq := range request.Artifacts {
+		if err := m.deleteArtifact(ctx, deleteArtifactReq.GetDataset(), deleteArtifactReq); err != nil {
+			// bulk delete endpoint is idempotent, ignore errors regarding missing artifacts as they might've already
+			// been deleted by a previous call.
+			if errors.IsDoesNotExistError(err) {
+				continue
+			}
+			m.systemMetrics.bulkDeleteFailureCounter.Inc(ctx)
+			return nil, err
+		}
+	}
+
+	m.systemMetrics.bulkDeleteSuccessCounter.Inc(ctx)
+	return &datacatalog.DeleteArtifactResponse{}, nil
+}
+
 func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.DataStore, storagePrefix storage.DataReference, artifactScope promutils.Scope) interfaces.ArtifactManager {
 	artifactMetrics := artifactMetrics{
 		scope:                    artifactScope,
@@ -489,6 +531,9 @@ func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.Da
 		deleteResponseTime:       labeled.NewStopWatch("delete_duration", "The duration of the delete artifact calls.", time.Millisecond, artifactScope, labeled.EmitUnlabeledMetric),
 		deleteSuccessCounter:     labeled.NewCounter("delete_success_count", "The number of times delete artifact succeeded", artifactScope, labeled.EmitUnlabeledMetric),
 		deleteFailureCounter:     labeled.NewCounter("delete_failure_count", "The number of times delete artifact failed", artifactScope, labeled.EmitUnlabeledMetric),
+		bulkDeleteResponseTime:   labeled.NewStopWatch("bulk_delete_duration", "The duration of the bulk delete artifacts calls.", time.Millisecond, artifactScope, labeled.EmitUnlabeledMetric),
+		bulkDeleteSuccessCounter: labeled.NewCounter("bulk_delete_success_count", "The number of times bulk delete artifacts succeeded", artifactScope, labeled.EmitUnlabeledMetric),
+		bulkDeleteFailureCounter: labeled.NewCounter("bulk_delete_failure_count", "The number of times bulk delete artifacts failed", artifactScope, labeled.EmitUnlabeledMetric),
 	}
 
 	return &artifactManager{
diff --git a/datacatalog/pkg/manager/impl/artifact_manager_test.go b/datacatalog/pkg/manager/impl/artifact_manager_test.go
index a0b355a411..4bf8f1e3eb 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager_test.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager_test.go
@@ -1238,3 +1238,403 @@ func TestDeleteArtifact(t *testing.T) {
 		assert.Nil(t, artifactResponse)
 	})
 }
+
+func TestDeleteArtifacts(t *testing.T) {
+	ctx := context.Background()
+	datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+	testStoragePrefix, err := datastore.ConstructReference(ctx, datastore.GetBaseContainerFQN(ctx), "test")
+	assert.NoError(t, err)
+
+	expectedDataset := getTestDataset()
+	expectedArtifact := getTestArtifact()
+	expectedTag := getTestTag()
+
+	t.Run("Delete by ID", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+
+		dcRepo.MockArtifactRepo.On("Delete",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifact models.Artifact) bool {
+				return artifact.ArtifactID == expectedArtifact.Id &&
+					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifact.DatasetName == expectedArtifact.Dataset.Name &&
+					artifact.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(nil)
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+						ArtifactId: expectedArtifact.Id,
+					},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+
+		// check that the datastore no longer has artifactData available
+		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
+		assert.NoError(t, err)
+		var value core.Literal
+		err = datastore.ReadProtobuf(ctx, dataRef, &value)
+		assert.Error(t, err)
+		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
+	})
+
+	t.Run("Delete by artifact tag", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Delete",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifact models.Artifact) bool {
+				return artifact.ArtifactID == expectedArtifact.Id &&
+					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifact.DatasetName == expectedArtifact.Dataset.Name &&
+					artifact.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(nil)
+
+		dcRepo.MockTagRepo.On("Get", mock.Anything,
+			mock.MatchedBy(func(tag models.TagKey) bool {
+				return tag.TagName == expectedTag.TagName &&
+					tag.DatasetProject == expectedTag.DatasetProject &&
+					tag.DatasetDomain == expectedTag.DatasetDomain &&
+					tag.DatasetVersion == expectedTag.DatasetVersion &&
+					tag.DatasetName == expectedTag.DatasetName
+			})).Return(models.Tag{
+			TagKey: models.TagKey{
+				DatasetProject: expectedTag.DatasetProject,
+				DatasetDomain:  expectedTag.DatasetDomain,
+				DatasetName:    expectedTag.DatasetName,
+				DatasetVersion: expectedTag.DatasetVersion,
+				TagName:        expectedTag.TagName,
+			},
+			DatasetUUID: expectedTag.DatasetUUID,
+			Artifact:    mockArtifactModel,
+			ArtifactID:  mockArtifactModel.ArtifactID,
+		}, nil)
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{
+						TagName: expectedTag.TagName,
+					},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+
+		// check that the datastore no longer has artifactData available
+		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
+		assert.NoError(t, err)
+		var value core.Literal
+		err = datastore.ReadProtobuf(ctx, dataRef, &value)
+		assert.Error(t, err)
+		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
+	})
+
+	t.Run("Artifact not found", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get", mock.Anything, mock.Anything).Return(models.Artifact{}, repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+			Dataset: expectedDataset.Id,
+			Id:      expectedArtifact.Id,
+		}))
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+						ArtifactId: expectedArtifact.Id,
+					},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+	})
+
+	t.Run("Artifact not found during delete", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).Return(repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+			Dataset: expectedDataset.Id,
+			Id:      expectedArtifact.Id,
+		}))
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+						ArtifactId: expectedArtifact.Id,
+					},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+	})
+
+	t.Run("Artifact delete failed", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).Return(errors.NewDataCatalogError(codes.Internal, "failed"))
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+						ArtifactId: expectedArtifact.Id,
+					},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.Internal, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Missing artifact ID", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+
+		dcRepo := newMockDataCatalogRepo()
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset:     expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.InvalidArgument, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Missing artifact tag", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+
+		dcRepo := newMockDataCatalogRepo()
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset:     expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.Error(t, err)
+		assert.Equal(t, codes.InvalidArgument, status.Code(err))
+		assert.Nil(t, artifactResponse)
+	})
+
+	t.Run("Idempotency", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Once().Return(mockArtifactModel, nil)
+		dcRepo.MockArtifactRepo.On("Get", mock.Anything, mock.Anything).Return(models.Artifact{},
+			repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+				Dataset: expectedDataset.Id,
+				Id:      expectedArtifact.Id,
+			}))
+
+		dcRepo.MockArtifactRepo.On("Delete",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifact models.Artifact) bool {
+				return artifact.ArtifactID == expectedArtifact.Id &&
+					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifact.DatasetName == expectedArtifact.Dataset.Name &&
+					artifact.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Once().Return(nil)
+		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).
+			Return(repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+				Dataset: expectedDataset.Id,
+				Id:      expectedArtifact.Id,
+			}))
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+						ArtifactId: expectedArtifact.Id,
+					},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+
+		// check that the datastore no longer has artifactData available
+		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
+		assert.NoError(t, err)
+		var value core.Literal
+		err = datastore.ReadProtobuf(ctx, dataRef, &value)
+		assert.Error(t, err)
+		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
+
+		artifactResponse, err = artifactManager.DeleteArtifacts(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+	})
+
+	t.Run("Multiple states", func(t *testing.T) {
+		ctx := context.Background()
+		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
+		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
+
+		dcRepo := newMockDataCatalogRepo()
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == expectedArtifact.Id &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(mockArtifactModel, nil)
+		dcRepo.MockArtifactRepo.On("Get",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
+				return artifactKey.ArtifactID == "notFound" &&
+					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
+					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(models.Artifact{}, repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
+			Dataset: expectedDataset.Id,
+			Id:      "notFound",
+		}))
+
+		dcRepo.MockArtifactRepo.On("Delete",
+			mock.MatchedBy(func(ctx context.Context) bool { return true }),
+			mock.MatchedBy(func(artifact models.Artifact) bool {
+				return artifact.ArtifactID == expectedArtifact.Id &&
+					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
+					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
+					artifact.DatasetName == expectedArtifact.Dataset.Name &&
+					artifact.DatasetVersion == expectedArtifact.Dataset.Version
+			})).Return(nil)
+
+		request := &datacatalog.DeleteArtifactsRequest{
+			Artifacts: []*datacatalog.DeleteArtifactRequest{
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+						ArtifactId: expectedArtifact.Id,
+					},
+				},
+				{
+					Dataset: expectedDataset.Id,
+					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+						ArtifactId: "notFound",
+					},
+				},
+			},
+		}
+
+		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
+		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
+		assert.NoError(t, err)
+		assert.NotNil(t, artifactResponse)
+
+		// check that the datastore no longer has artifactData available
+		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
+		assert.NoError(t, err)
+		var value core.Literal
+		err = datastore.ReadProtobuf(ctx, dataRef, &value)
+		assert.Error(t, err)
+		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
+	})
+}
diff --git a/datacatalog/pkg/manager/impl/reservation_manager.go b/datacatalog/pkg/manager/impl/reservation_manager.go
index 3adee1141a..60a69962c3 100644
--- a/datacatalog/pkg/manager/impl/reservation_manager.go
+++ b/datacatalog/pkg/manager/impl/reservation_manager.go
@@ -9,13 +9,13 @@ import (
 	"github.com/flyteorg/flytestdlib/promutils/labeled"
 
 	"github.com/flyteorg/datacatalog/pkg/errors"
+	"github.com/flyteorg/datacatalog/pkg/manager/impl/validators"
+	"github.com/flyteorg/datacatalog/pkg/manager/interfaces"
 	"github.com/flyteorg/datacatalog/pkg/repositories"
-	repo_errors "github.com/flyteorg/datacatalog/pkg/repositories/errors"
+	repoerrors "github.com/flyteorg/datacatalog/pkg/repositories/errors"
 	"github.com/flyteorg/datacatalog/pkg/repositories/models"
 	"github.com/flyteorg/datacatalog/pkg/repositories/transformers"
 
-	"github.com/flyteorg/datacatalog/pkg/manager/interfaces"
-
 	"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
 )
 
@@ -25,7 +25,9 @@ type reservationMetrics struct {
 	reservationReleased          labeled.Counter
 	reservationAlreadyInProgress labeled.Counter
 	acquireReservationFailure    labeled.Counter
+	acquireReservationsFailure   labeled.Counter
 	releaseReservationFailure    labeled.Counter
+	releaseReservationsFailure   labeled.Counter
 	reservationDoesNotExist      labeled.Counter
 }
 
@@ -39,7 +41,7 @@ type reservationManager struct {
 	systemMetrics                  reservationMetrics
 }
 
-// Creates a new reservation manager with the specified properties
+// NewReservationManager creates a new reservation manager with the specified properties
 func NewReservationManager(
 	repo repositories.RepositoryInterface,
 	heartbeatGracePeriodMultiplier time.Duration,
@@ -67,11 +69,21 @@ func NewReservationManager(
 			"Number of times we failed to acquire reservation",
 			reservationScope,
 		),
+		acquireReservationsFailure: labeled.NewCounter(
+			"acquire_reservations_failure",
+			"Number of times we failed to acquire multiple reservations",
+			reservationScope,
+		),
 		releaseReservationFailure: labeled.NewCounter(
 			"release_reservation_failure",
 			"Number of times we failed to release a reservation",
 			reservationScope,
 		),
+		releaseReservationsFailure: labeled.NewCounter(
+			"release_reservations_failure",
+			"Number of times we failed to release multiple reservations",
+			reservationScope,
+		),
 		reservationDoesNotExist: labeled.NewCounter(
 			"reservation_does_not_exist",
 			"Number of times we attempt to modify a reservation that does not exist",
@@ -88,9 +100,15 @@ func NewReservationManager(
 	}
 }
 
-// Attempt to acquire a reservation for the specified artifact. If there is not active reservation, successfully
-// acquire it. If you are the owner of the active reservation, extend it. If another owner, return the existing reservation.
+// GetOrExtendReservation attempts to acquire a reservation for the specified artifact. If there is no active
+// reservation, successfully acquire it. If you are the owner of the active reservation, extend it. If another owner,
+// return the existing reservation.
 func (r *reservationManager) GetOrExtendReservation(ctx context.Context, request *datacatalog.GetOrExtendReservationRequest) (*datacatalog.GetOrExtendReservationResponse, error) {
+	if err := validators.ValidateGetOrExtendReservationRequest(request); err != nil {
+		r.systemMetrics.acquireReservationFailure.Inc(ctx)
+		return nil, err
+	}
+
 	reservationID := request.ReservationId
 
 	// Use minimum of maxHeartbeatInterval and requested heartbeat interval
@@ -111,6 +129,36 @@ func (r *reservationManager) GetOrExtendReservation(ctx context.Context, request
 	}, nil
 }
 
+// GetOrExtendReservations attempts to get or extend reservations for multiple artifacts in a single operation.
+func (r *reservationManager) GetOrExtendReservations(ctx context.Context, request *datacatalog.GetOrExtendReservationsRequest) (*datacatalog.GetOrExtendReservationsResponse, error) {
+	if err := validators.ValidateGetOrExtendReservationsRequest(request); err != nil {
+		r.systemMetrics.acquireReservationsFailure.Inc(ctx)
+		return nil, err
+	}
+
+	var reservations []*datacatalog.Reservation
+	for _, req := range request.GetReservations() {
+		// Use minimum of maxHeartbeatInterval and requested heartbeat interval
+		heartbeatInterval := r.maxHeartbeatInterval
+		requestHeartbeatInterval := req.GetHeartbeatInterval()
+		if requestHeartbeatInterval != nil && requestHeartbeatInterval.AsDuration() < heartbeatInterval {
+			heartbeatInterval = requestHeartbeatInterval.AsDuration()
+		}
+
+		reservation, err := r.tryAcquireReservation(ctx, req.ReservationId, req.OwnerId, heartbeatInterval)
+		if err != nil {
+			r.systemMetrics.acquireReservationsFailure.Inc(ctx)
+			return nil, err
+		}
+
+		reservations = append(reservations, &reservation)
+	}
+
+	return &datacatalog.GetOrExtendReservationsResponse{
+		Reservations: reservations,
+	}, nil
+}
+
 // tryAcquireReservation will fetch the reservation first and only create/update
 // the reservation if it does not exist or has expired.
 // This is an optimization to reduce the number of writes to db. We always need
@@ -159,7 +207,7 @@ func (r *reservationManager) tryAcquireReservation(ctx context.Context, reservat
 	}
 
 	if repoErr != nil {
-		if repoErr.Error() == repo_errors.AlreadyExists {
+		if repoErr.Error() == repoerrors.AlreadyExists {
 			// Looks like someone else tried to obtain the reservation
 			// at the same time and they won. Let's find out who won.
 			rsv1, err := repo.Get(ctx, reservationKey)
@@ -189,24 +237,57 @@ func (r *reservationManager) tryAcquireReservation(ctx context.Context, reservat
 	return reservation, nil
 }
 
-// Release an active reservation with the specified owner. If one does not exist, gracefully return.
+// ReleaseReservation releases an active reservation with the specified owner. If one does not exist, gracefully return.
 func (r *reservationManager) ReleaseReservation(ctx context.Context, request *datacatalog.ReleaseReservationRequest) (*datacatalog.ReleaseReservationResponse, error) {
+	if err := validators.ValidateReleaseReservationRequest(request); err != nil {
+		return nil, err
+	}
+
+	if err := r.releaseReservation(ctx, request.ReservationId, request.OwnerId); err != nil {
+		r.systemMetrics.releaseReservationFailure.Inc(ctx)
+		return nil, err
+	}
+
+	return &datacatalog.ReleaseReservationResponse{}, nil
+}
+
+// ReleaseReservations releases reservations for multiple artifacts in a single operation.
+// This is an idempotent operation, releasing reservations multiple times or trying to release an unknown reservation
+// will not result in an error being returned.
+func (r *reservationManager) ReleaseReservations(ctx context.Context, request *datacatalog.ReleaseReservationsRequest) (*datacatalog.ReleaseReservationResponse, error) {
+	if err := validators.ValidateReleaseReservationsRequest(request); err != nil {
+		return nil, err
+	}
+
+	for _, req := range request.GetReservations() {
+		if err := r.releaseReservation(ctx, req.ReservationId, req.OwnerId); err != nil {
+			r.systemMetrics.releaseReservationsFailure.Inc(ctx)
+			return nil, err
+		}
+	}
+
+	return &datacatalog.ReleaseReservationResponse{}, nil
+}
+
+// releaseReservation performs the actual reservation release operation, deleting the respective object from
+// datacatalog's database, thus freeing the associated artifact for other entities. If the specified reservation was not
+// found, no error will be returned.
+func (r *reservationManager) releaseReservation(ctx context.Context, reservationID *datacatalog.ReservationID, ownerID string) error {
 	repo := r.repo.ReservationRepo()
-	reservationKey := transformers.FromReservationID(request.ReservationId)
+	reservationKey := transformers.FromReservationID(reservationID)
 
-	err := repo.Delete(ctx, reservationKey, request.OwnerId)
+	err := repo.Delete(ctx, reservationKey, ownerID)
 	if err != nil {
 		if errors.IsDoesNotExistError(err) {
-			logger.Warnf(ctx, "Reservation does not exist id: %+v, err %v", request.ReservationId, err)
+			logger.Warnf(ctx, "Reservation does not exist id: %+v, err %v", reservationID, err)
 			r.systemMetrics.reservationDoesNotExist.Inc(ctx)
-			return &datacatalog.ReleaseReservationResponse{}, nil
+			return nil
 		}
 
 		logger.Errorf(ctx, "Failed to release reservation: %+v, err: %v", reservationKey, err)
-		r.systemMetrics.releaseReservationFailure.Inc(ctx)
-		return nil, err
+		return err
 	}
 
 	r.systemMetrics.reservationReleased.Inc(ctx)
-	return &datacatalog.ReleaseReservationResponse{}, nil
+	return nil
 }
diff --git a/datacatalog/pkg/manager/impl/reservation_manager_test.go b/datacatalog/pkg/manager/impl/reservation_manager_test.go
index 207ce81393..bf9d1983e9 100644
--- a/datacatalog/pkg/manager/impl/reservation_manager_test.go
+++ b/datacatalog/pkg/manager/impl/reservation_manager_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/golang/protobuf/ptypes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 )
 
@@ -91,6 +92,78 @@ func TestGetOrExtendReservation_CreateReservation(t *testing.T) {
 	assert.Equal(t, heartbeatIntervalPb, resp.GetReservation().HeartbeatInterval)
 }
 
+func TestGetOrExtendReservations_CreateReservations(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	setUpTagRepoGetNotFound(&dcRepo)
+
+	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
+	dcRepo.MockReservationRepo.On("Get",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(key models.ReservationKey) bool {
+			return key.DatasetProject == datasetID.Project &&
+				key.DatasetDomain == datasetID.Domain &&
+				key.DatasetVersion == datasetID.Version &&
+				key.DatasetName == datasetID.Name &&
+				tagNames[key.TagName]
+		})).Return(models.Reservation{}, errors2.NewDataCatalogErrorf(codes.NotFound, "entry not found"))
+
+	now := time.Now()
+	dcRepo.MockReservationRepo.On("Create",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservation models.Reservation) bool {
+			return reservation.DatasetProject == datasetID.Project &&
+				reservation.DatasetDomain == datasetID.Domain &&
+				reservation.DatasetName == datasetID.Name &&
+				reservation.DatasetVersion == datasetID.Version &&
+				tagNames[reservation.TagName] &&
+				reservation.OwnerID == currentOwner &&
+				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
+		}),
+		mock.MatchedBy(func(now time.Time) bool { return true }),
+	).Return(nil)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.GetOrExtendReservationsRequest{
+		Reservations: []*datacatalog.GetOrExtendReservationRequest{
+			{
+				ReservationId:     &reservationID,
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+		},
+	}
+
+	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+	require.NotNil(t, resp.GetReservations())
+	require.Len(t, resp.GetReservations(), 3)
+	for _, reservation := range resp.GetReservations() {
+		assert.Equal(t, currentOwner, reservation.OwnerId)
+		assert.Equal(t, heartbeatIntervalPb, reservation.HeartbeatInterval)
+	}
+}
+
 func TestGetOrExtendReservation_MaxHeartbeatInterval(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -139,6 +212,79 @@ func TestGetOrExtendReservation_MaxHeartbeatInterval(t *testing.T) {
 	assert.Equal(t, heartbeatIntervalPb, resp.GetReservation().HeartbeatInterval)
 }
 
+func TestGetOrExtendReservations_MaxHeartbeatInterval(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	setUpTagRepoGetNotFound(&dcRepo)
+
+	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
+	dcRepo.MockReservationRepo.On("Get",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(key models.ReservationKey) bool {
+			return key.DatasetProject == datasetID.Project &&
+				key.DatasetDomain == datasetID.Domain &&
+				key.DatasetVersion == datasetID.Version &&
+				key.DatasetName == datasetID.Name &&
+				tagNames[key.TagName]
+		})).Return(models.Reservation{}, errors2.NewDataCatalogErrorf(codes.NotFound, "entry not found"))
+
+	now := time.Now()
+
+	dcRepo.MockReservationRepo.On("Create",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservation models.Reservation) bool {
+			return reservation.DatasetProject == datasetID.Project &&
+				reservation.DatasetDomain == datasetID.Domain &&
+				reservation.DatasetName == datasetID.Name &&
+				reservation.DatasetVersion == datasetID.Version &&
+				tagNames[reservation.TagName] &&
+				reservation.OwnerID == currentOwner &&
+				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
+		}),
+		mock.MatchedBy(func(now time.Time) bool { return true }),
+	).Return(nil)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, heartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.GetOrExtendReservationsRequest{
+		Reservations: []*datacatalog.GetOrExtendReservationRequest{
+			{
+				ReservationId:     &reservationID,
+				OwnerId:           currentOwner,
+				HeartbeatInterval: maxHeartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: maxHeartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: maxHeartbeatIntervalPb,
+			},
+		},
+	}
+
+	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+	require.NotNil(t, resp.GetReservations())
+	require.Len(t, resp.GetReservations(), 3)
+	for _, reservation := range resp.GetReservations() {
+		assert.Equal(t, currentOwner, reservation.OwnerId)
+		assert.Equal(t, heartbeatIntervalPb, reservation.HeartbeatInterval)
+	}
+}
+
 func TestGetOrExtendReservation_ExtendReservation(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -179,6 +325,71 @@ func TestGetOrExtendReservation_ExtendReservation(t *testing.T) {
 	assert.Equal(t, prevOwner, resp.GetReservation().OwnerId)
 }
 
+func TestGetOrExtendReservations_ExtendReservations(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	setUpTagRepoGetNotFound(&dcRepo)
+
+	now := time.Now()
+	prevExpiresAt := now.Add(time.Second * 10)
+
+	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
+	setUpReservationRepoGet(&dcRepo, prevExpiresAt, tagName, "tag2", "nonexistence")
+
+	dcRepo.MockReservationRepo.On("Update",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservation models.Reservation) bool {
+			return reservation.DatasetProject == datasetID.Project &&
+				reservation.DatasetDomain == datasetID.Domain &&
+				reservation.DatasetName == datasetID.Name &&
+				reservation.DatasetVersion == datasetID.Version &&
+				tagNames[reservation.TagName] &&
+				reservation.OwnerID == prevOwner &&
+				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
+		}),
+		mock.MatchedBy(func(now time.Time) bool { return true }),
+	).Return(nil)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.GetOrExtendReservationsRequest{
+		Reservations: []*datacatalog.GetOrExtendReservationRequest{
+			{
+				ReservationId:     &reservationID,
+				OwnerId:           prevOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId:           prevOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId:           prevOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+		},
+	}
+
+	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+	require.NotNil(t, resp.GetReservations())
+	require.Len(t, resp.GetReservations(), 3)
+	for _, reservation := range resp.GetReservations() {
+		assert.Equal(t, prevOwner, reservation.OwnerId)
+	}
+}
+
 func TestGetOrExtendReservation_TakeOverReservation(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -219,6 +430,71 @@ func TestGetOrExtendReservation_TakeOverReservation(t *testing.T) {
 	assert.Equal(t, currentOwner, resp.GetReservation().OwnerId)
 }
 
+func TestGetOrExtendReservations_TakeOverReservations(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	setUpTagRepoGetNotFound(&dcRepo)
+
+	now := time.Now()
+	prevExpiresAt := now.Add(time.Second * 10 * time.Duration(-1))
+
+	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
+	setUpReservationRepoGet(&dcRepo, prevExpiresAt, tagName, "tag2", "nonexistence")
+
+	dcRepo.MockReservationRepo.On("Update",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservation models.Reservation) bool {
+			return reservation.DatasetProject == datasetID.Project &&
+				reservation.DatasetDomain == datasetID.Domain &&
+				reservation.DatasetName == datasetID.Name &&
+				reservation.DatasetVersion == datasetID.Version &&
+				tagNames[reservation.TagName] &&
+				reservation.OwnerID == currentOwner &&
+				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
+		}),
+		mock.MatchedBy(func(now time.Time) bool { return true }),
+	).Return(nil)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.GetOrExtendReservationsRequest{
+		Reservations: []*datacatalog.GetOrExtendReservationRequest{
+			{
+				ReservationId:     &reservationID,
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+		},
+	}
+
+	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+	require.NotNil(t, resp.GetReservations())
+	require.Len(t, resp.GetReservations(), 3)
+	for _, reservation := range resp.GetReservations() {
+		assert.Equal(t, currentOwner, reservation.OwnerId)
+	}
+}
+
 func TestGetOrExtendReservation_ReservationExists(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -245,6 +521,209 @@ func TestGetOrExtendReservation_ReservationExists(t *testing.T) {
 	assert.Equal(t, prevOwner, resp.GetReservation().OwnerId)
 }
 
+func TestGetOrExtendReservations_ReservationsExist(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	setUpTagRepoGetNotFound(&dcRepo)
+
+	now := time.Now()
+	prevExpiresAt := now.Add(time.Second * 10)
+
+	setUpReservationRepoGet(&dcRepo, prevExpiresAt, tagName, "tag2", "nonexistence")
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.GetOrExtendReservationsRequest{
+		Reservations: []*datacatalog.GetOrExtendReservationRequest{
+			{
+				ReservationId:     &reservationID,
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+		},
+	}
+
+	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+	require.NotNil(t, resp.GetReservations())
+	require.Len(t, resp.GetReservations(), 3)
+	for _, reservation := range resp.GetReservations() {
+		assert.Equal(t, prevOwner, reservation.OwnerId)
+	}
+}
+
+func TestGetOrExtendReservations_MultipleStates(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	setUpTagRepoGetNotFound(&dcRepo)
+
+	now := time.Now()
+	prevExpiresAt := now.Add(time.Second * 10)
+
+	dcRepo.MockReservationRepo.On("Get",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(key models.ReservationKey) bool {
+			return key.DatasetProject == datasetID.Project &&
+				key.DatasetDomain == datasetID.Domain &&
+				key.DatasetVersion == datasetID.Version &&
+				key.DatasetName == datasetID.Name &&
+				key.TagName == tagName
+		})).Return(models.Reservation{}, errors2.NewDataCatalogErrorf(codes.NotFound, "entry not found"))
+
+	dcRepo.MockReservationRepo.On("Get",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(key models.ReservationKey) bool {
+			return key.DatasetProject == datasetID.Project &&
+				key.DatasetDomain == datasetID.Domain &&
+				key.DatasetVersion == datasetID.Version &&
+				key.DatasetName == datasetID.Name &&
+				key.TagName == "prevOwner"
+		})).Return(
+		models.Reservation{
+			ReservationKey: models.ReservationKey{
+				DatasetProject: project,
+				DatasetName:    name,
+				DatasetDomain:  domain,
+				DatasetVersion: version,
+				TagName:        "prevOwner",
+			},
+			OwnerID:   prevOwner,
+			ExpiresAt: prevExpiresAt,
+		}, nil,
+	)
+
+	dcRepo.MockReservationRepo.On("Get",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(key models.ReservationKey) bool {
+			return key.DatasetProject == datasetID.Project &&
+				key.DatasetDomain == datasetID.Domain &&
+				key.DatasetVersion == datasetID.Version &&
+				key.DatasetName == datasetID.Name &&
+				key.TagName == "currentOwner"
+		})).Return(
+		models.Reservation{
+			ReservationKey: getReservationKey(),
+			OwnerID:        currentOwner,
+			ExpiresAt:      prevExpiresAt,
+		}, nil,
+	)
+
+	dcRepo.MockReservationRepo.On("Get",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(key models.ReservationKey) bool {
+			return key.DatasetProject == datasetID.Project &&
+				key.DatasetDomain == datasetID.Domain &&
+				key.DatasetVersion == datasetID.Version &&
+				key.DatasetName == datasetID.Name &&
+				key.TagName == "currentOwnerExpired"
+		})).Return(
+		models.Reservation{
+			ReservationKey: getReservationKey(),
+			OwnerID:        currentOwner,
+			ExpiresAt:      now.Add(-10 * time.Second),
+		}, nil,
+	)
+
+	dcRepo.MockReservationRepo.On("Create",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservation models.Reservation) bool {
+			return reservation.DatasetProject == datasetID.Project &&
+				reservation.DatasetDomain == datasetID.Domain &&
+				reservation.DatasetName == datasetID.Name &&
+				reservation.DatasetVersion == datasetID.Version &&
+				reservation.TagName == tagName &&
+				reservation.OwnerID == currentOwner &&
+				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
+		}),
+		mock.MatchedBy(func(now time.Time) bool { return true }),
+	).Return(nil)
+
+	updateTagNames := map[string]bool{"currentOwner": true, "currentOwnerExpired": true}
+	dcRepo.MockReservationRepo.On("Update",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservation models.Reservation) bool {
+			return reservation.DatasetProject == datasetID.Project &&
+				reservation.DatasetDomain == datasetID.Domain &&
+				reservation.DatasetName == datasetID.Name &&
+				reservation.DatasetVersion == datasetID.Version &&
+				updateTagNames[reservation.TagName] &&
+				reservation.OwnerID == currentOwner
+		}),
+		mock.MatchedBy(func(now time.Time) bool { return true }),
+	).Return(nil)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.GetOrExtendReservationsRequest{
+		Reservations: []*datacatalog.GetOrExtendReservationRequest{
+			{
+				ReservationId:     &reservationID,
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "prevOwner",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "currentOwner",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "currentOwnerExpired",
+				},
+				OwnerId:           currentOwner,
+				HeartbeatInterval: heartbeatIntervalPb,
+			},
+		},
+	}
+
+	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+	require.NotNil(t, resp.GetReservations())
+	require.Len(t, resp.GetReservations(), 4)
+	for _, reservation := range resp.GetReservations() {
+		if reservation.ReservationId.TagName == "prevOwner" {
+			assert.Equal(t, prevOwner, reservation.OwnerId)
+		} else {
+			assert.Equal(t, currentOwner, reservation.OwnerId)
+		}
+		assert.Equal(t, heartbeatIntervalPb, reservation.HeartbeatInterval)
+	}
+}
+
 func TestReleaseReservation(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -278,6 +757,58 @@ func TestReleaseReservation(t *testing.T) {
 	assert.Nil(t, err)
 }
 
+func TestReleaseReservations(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	now := time.Now()
+
+	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
+	dcRepo.MockReservationRepo.On("Delete",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
+			return reservationKey.DatasetProject == datasetID.Project &&
+				reservationKey.DatasetDomain == datasetID.Domain &&
+				reservationKey.DatasetName == datasetID.Name &&
+				reservationKey.DatasetVersion == datasetID.Version &&
+				tagNames[reservationKey.TagName]
+		}),
+		mock.MatchedBy(func(ownerID string) bool {
+			return ownerID == currentOwner
+		}),
+	).Return(nil)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.ReleaseReservationsRequest{
+		Reservations: []*datacatalog.ReleaseReservationRequest{
+			{
+				ReservationId: &reservationID,
+				OwnerId:       currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId: currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId: currentOwner,
+			},
+		},
+	}
+
+	_, err := reservationManager.ReleaseReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+}
+
 func TestReleaseReservation_Failure(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -312,6 +843,59 @@ func TestReleaseReservation_Failure(t *testing.T) {
 	assert.Equal(t, reservationErr, err)
 }
 
+func TestReleaseReservations_Failure(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	now := time.Now()
+	reservationErr := fmt.Errorf("unknown error")
+
+	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
+	dcRepo.MockReservationRepo.On("Delete",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
+			return reservationKey.DatasetProject == datasetID.Project &&
+				reservationKey.DatasetDomain == datasetID.Domain &&
+				reservationKey.DatasetName == datasetID.Name &&
+				reservationKey.DatasetVersion == datasetID.Version &&
+				tagNames[reservationKey.TagName]
+		}),
+		mock.MatchedBy(func(ownerID string) bool {
+			return ownerID == currentOwner
+		}),
+	).Return(reservationErr)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.ReleaseReservationsRequest{
+		Reservations: []*datacatalog.ReleaseReservationRequest{
+			{
+				ReservationId: &reservationID,
+				OwnerId:       currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId: currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId: currentOwner,
+			},
+		},
+	}
+
+	_, err := reservationManager.ReleaseReservations(context.Background(), req)
+
+	assert.Equal(t, reservationErr, err)
+}
+
 func TestReleaseReservation_GracefulFailure(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -350,6 +934,133 @@ func TestReleaseReservation_GracefulFailure(t *testing.T) {
 	assert.Nil(t, err)
 }
 
+func TestReleaseReservations_GracefulFailure(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	now := time.Now()
+	reservationErr := errors3.GetMissingEntityError("Reservation",
+		&datacatalog.ReservationID{
+			DatasetId: &datasetID,
+			TagName:   tagName,
+		})
+
+	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
+	dcRepo.MockReservationRepo.On("Delete",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
+			return reservationKey.DatasetProject == datasetID.Project &&
+				reservationKey.DatasetDomain == datasetID.Domain &&
+				reservationKey.DatasetName == datasetID.Name &&
+				reservationKey.DatasetVersion == datasetID.Version &&
+				tagNames[reservationKey.TagName]
+		}),
+		mock.MatchedBy(func(ownerID string) bool {
+			return ownerID == currentOwner
+		}),
+	).Return(reservationErr)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.ReleaseReservationsRequest{
+		Reservations: []*datacatalog.ReleaseReservationRequest{
+			{
+				ReservationId: &reservationID,
+				OwnerId:       currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "tag2",
+				},
+				OwnerId: currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "nonexistence",
+				},
+				OwnerId: currentOwner,
+			},
+		},
+	}
+
+	_, err := reservationManager.ReleaseReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+}
+
+func TestReleaseReservation_MultipleStates(t *testing.T) {
+	dcRepo := getDatacatalogRepo()
+
+	now := time.Now()
+	notFoundErr := errors3.GetMissingEntityError("Reservation",
+		&datacatalog.ReservationID{
+			DatasetId: &datasetID,
+			TagName:   tagName,
+		})
+
+	dcRepo.MockReservationRepo.On("Delete",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
+			return reservationKey.DatasetProject == datasetID.Project &&
+				reservationKey.DatasetDomain == datasetID.Domain &&
+				reservationKey.DatasetName == datasetID.Name &&
+				reservationKey.DatasetVersion == datasetID.Version &&
+				(reservationKey.TagName == tagName || reservationKey.TagName == prevOwner)
+		}),
+		mock.MatchedBy(func(ownerID string) bool {
+			return ownerID == currentOwner
+		}),
+	).Return(notFoundErr)
+
+	dcRepo.MockReservationRepo.On("Delete",
+		mock.MatchedBy(func(ctx context.Context) bool { return true }),
+		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
+			return reservationKey.DatasetProject == datasetID.Project &&
+				reservationKey.DatasetDomain == datasetID.Domain &&
+				reservationKey.DatasetName == datasetID.Name &&
+				reservationKey.DatasetVersion == datasetID.Version &&
+				reservationKey.TagName == "currentOwner"
+		}),
+		mock.MatchedBy(func(ownerID string) bool {
+			return ownerID == currentOwner
+		}),
+	).Return(nil)
+
+	reservationManager := NewReservationManager(&dcRepo,
+		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
+		func() time.Time { return now }, mockScope.NewTestScope())
+
+	req := &datacatalog.ReleaseReservationsRequest{
+		Reservations: []*datacatalog.ReleaseReservationRequest{
+			{
+				ReservationId: &reservationID,
+				OwnerId:       currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "prevOwner",
+				},
+				OwnerId: currentOwner,
+			},
+			{
+				ReservationId: &datacatalog.ReservationID{
+					DatasetId: &datasetID,
+					TagName:   "currentOwner",
+				},
+				OwnerId: currentOwner,
+			},
+		},
+	}
+
+	_, err := reservationManager.ReleaseReservations(context.Background(), req)
+
+	assert.Nil(t, err)
+}
+
 func getDatacatalogRepo() mocks.DataCatalogRepo {
 	return mocks.DataCatalogRepo{
 		MockReservationRepo: &mocks.ReservationRepo{},
@@ -357,7 +1068,15 @@ func getDatacatalogRepo() mocks.DataCatalogRepo {
 	}
 }
 
-func setUpReservationRepoGet(dcRepo *mocks.DataCatalogRepo, prevExpiresAt time.Time) {
+func setUpReservationRepoGet(dcRepo *mocks.DataCatalogRepo, prevExpiresAt time.Time, tagNames ...string) {
+	if len(tagNames) == 0 {
+		tagNames = []string{tagName}
+	}
+	tags := make(map[string]bool)
+	for _, tn := range tagNames {
+		tags[tn] = true
+	}
+
 	dcRepo.MockReservationRepo.On("Get",
 		mock.MatchedBy(func(ctx context.Context) bool { return true }),
 		mock.MatchedBy(func(key models.ReservationKey) bool {
@@ -365,7 +1084,7 @@ func setUpReservationRepoGet(dcRepo *mocks.DataCatalogRepo, prevExpiresAt time.T
 				key.DatasetDomain == datasetID.Domain &&
 				key.DatasetVersion == datasetID.Version &&
 				key.DatasetName == datasetID.Name &&
-				key.TagName == tagName
+				tags[key.TagName]
 		})).Return(
 		models.Reservation{
 			ReservationKey: getReservationKey(),
diff --git a/datacatalog/pkg/manager/impl/validators/artifact_validator.go b/datacatalog/pkg/manager/impl/validators/artifact_validator.go
index d38609a1ea..49a7d686ab 100644
--- a/datacatalog/pkg/manager/impl/validators/artifact_validator.go
+++ b/datacatalog/pkg/manager/impl/validators/artifact_validator.go
@@ -3,7 +3,10 @@ package validators
 import (
 	"fmt"
 
+	"google.golang.org/grpc/codes"
+
 	"github.com/flyteorg/datacatalog/pkg/common"
+	"github.com/flyteorg/datacatalog/pkg/errors"
 	"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
 )
 
@@ -170,3 +173,22 @@ func ValidateDeleteArtifactRequest(request *datacatalog.DeleteArtifactRequest) e
 
 	return nil
 }
+
+func ValidateDeleteArtifactsRequest(request *datacatalog.DeleteArtifactsRequest) error {
+	if request.GetArtifacts() == nil {
+		return NewMissingArgumentError("artifacts")
+	}
+
+	var errs []error
+	for _, deleteArtifactReq := range request.GetArtifacts() {
+		if err := ValidateDeleteArtifactRequest(deleteArtifactReq); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	if len(errs) > 0 {
+		return errors.NewCollectedErrors(codes.InvalidArgument, errs)
+	}
+
+	return nil
+}
diff --git a/datacatalog/pkg/manager/impl/validators/reservation_validator.go b/datacatalog/pkg/manager/impl/validators/reservation_validator.go
new file mode 100644
index 0000000000..e12e6f90cd
--- /dev/null
+++ b/datacatalog/pkg/manager/impl/validators/reservation_validator.go
@@ -0,0 +1,86 @@
+package validators
+
+import (
+	"google.golang.org/grpc/codes"
+
+	"github.com/flyteorg/datacatalog/pkg/errors"
+	"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
+)
+
+func ValidateGetOrExtendReservationRequest(request *datacatalog.GetOrExtendReservationRequest) error {
+	if request.GetReservationId() == nil {
+		return NewMissingArgumentError("reservationID")
+	}
+	if err := ValidateDatasetID(request.GetReservationId().GetDatasetId()); err != nil {
+		return err
+	}
+	if err := ValidateEmptyStringField(request.GetReservationId().GetTagName(), tagName); err != nil {
+		return err
+	}
+
+	if err := ValidateEmptyStringField(request.GetOwnerId(), "ownerID"); err != nil {
+		return err
+	}
+
+	if request.GetHeartbeatInterval() == nil {
+		return NewMissingArgumentError("heartbeatInterval")
+	}
+
+	return nil
+}
+
+func ValidateGetOrExtendReservationsRequest(request *datacatalog.GetOrExtendReservationsRequest) error {
+	if request.GetReservations() == nil {
+		return NewMissingArgumentError("reservations")
+	}
+
+	var errs []error
+	for _, req := range request.GetReservations() {
+		if err := ValidateGetOrExtendReservationRequest(req); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	if len(errs) > 0 {
+		return errors.NewCollectedErrors(codes.InvalidArgument, errs)
+	}
+
+	return nil
+}
+
+func ValidateReleaseReservationRequest(request *datacatalog.ReleaseReservationRequest) error {
+	if request.GetReservationId() == nil {
+		return NewMissingArgumentError("reservationID")
+	}
+	if err := ValidateDatasetID(request.GetReservationId().GetDatasetId()); err != nil {
+		return err
+	}
+	if err := ValidateEmptyStringField(request.GetReservationId().GetTagName(), tagName); err != nil {
+		return err
+	}
+
+	if err := ValidateEmptyStringField(request.GetOwnerId(), "ownerID"); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func ValidateReleaseReservationsRequest(request *datacatalog.ReleaseReservationsRequest) error {
+	if request.GetReservations() == nil {
+		return NewMissingArgumentError("reservations")
+	}
+
+	var errs []error
+	for _, req := range request.GetReservations() {
+		if err := ValidateReleaseReservationRequest(req); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	if len(errs) > 0 {
+		return errors.NewCollectedErrors(codes.InvalidArgument, errs)
+	}
+
+	return nil
+}
diff --git a/datacatalog/pkg/manager/interfaces/artifact.go b/datacatalog/pkg/manager/interfaces/artifact.go
index a51ddd0b16..73c3220248 100644
--- a/datacatalog/pkg/manager/interfaces/artifact.go
+++ b/datacatalog/pkg/manager/interfaces/artifact.go
@@ -14,4 +14,5 @@ type ArtifactManager interface {
 	ListArtifacts(ctx context.Context, request *idl_datacatalog.ListArtifactsRequest) (*idl_datacatalog.ListArtifactsResponse, error)
 	UpdateArtifact(ctx context.Context, request *idl_datacatalog.UpdateArtifactRequest) (*idl_datacatalog.UpdateArtifactResponse, error)
 	DeleteArtifact(ctx context.Context, request *idl_datacatalog.DeleteArtifactRequest) (*idl_datacatalog.DeleteArtifactResponse, error)
+	DeleteArtifacts(ctx context.Context, request *idl_datacatalog.DeleteArtifactsRequest) (*idl_datacatalog.DeleteArtifactResponse, error)
 }
diff --git a/datacatalog/pkg/manager/interfaces/reservation.go b/datacatalog/pkg/manager/interfaces/reservation.go
index 42d95b8cbf..a0c99e49a0 100644
--- a/datacatalog/pkg/manager/interfaces/reservation.go
+++ b/datacatalog/pkg/manager/interfaces/reservation.go
@@ -11,5 +11,7 @@ import (
 // in flyteidl
 type ReservationManager interface {
 	GetOrExtendReservation(context.Context, *datacatalog.GetOrExtendReservationRequest) (*datacatalog.GetOrExtendReservationResponse, error)
+	GetOrExtendReservations(context.Context, *datacatalog.GetOrExtendReservationsRequest) (*datacatalog.GetOrExtendReservationsResponse, error)
 	ReleaseReservation(context.Context, *datacatalog.ReleaseReservationRequest) (*datacatalog.ReleaseReservationResponse, error)
+	ReleaseReservations(context.Context, *datacatalog.ReleaseReservationsRequest) (*datacatalog.ReleaseReservationResponse, error)
 }
diff --git a/datacatalog/pkg/manager/mocks/artifact_manager.go b/datacatalog/pkg/manager/mocks/artifact_manager.go
index fb4d5c4b41..f61f809e6a 100644
--- a/datacatalog/pkg/manager/mocks/artifact_manager.go
+++ b/datacatalog/pkg/manager/mocks/artifact_manager.go
@@ -97,6 +97,47 @@ func (_m *ArtifactManager) DeleteArtifact(ctx context.Context, request *datacata
 	return r0, r1
 }
 
+type ArtifactManager_DeleteArtifacts struct {
+	*mock.Call
+}
+
+func (_m ArtifactManager_DeleteArtifacts) Return(_a0 *datacatalog.DeleteArtifactResponse, _a1 error) *ArtifactManager_DeleteArtifacts {
+	return &ArtifactManager_DeleteArtifacts{Call: _m.Call.Return(_a0, _a1)}
+}
+
+func (_m *ArtifactManager) OnDeleteArtifacts(ctx context.Context, request *datacatalog.DeleteArtifactsRequest) *ArtifactManager_DeleteArtifacts {
+	c_call := _m.On("DeleteArtifacts", ctx, request)
+	return &ArtifactManager_DeleteArtifacts{Call: c_call}
+}
+
+func (_m *ArtifactManager) OnDeleteArtifactsMatch(matchers ...interface{}) *ArtifactManager_DeleteArtifacts {
+	c_call := _m.On("DeleteArtifacts", matchers...)
+	return &ArtifactManager_DeleteArtifacts{Call: c_call}
+}
+
+// DeleteArtifacts provides a mock function with given fields: ctx, request
+func (_m *ArtifactManager) DeleteArtifacts(ctx context.Context, request *datacatalog.DeleteArtifactsRequest) (*datacatalog.DeleteArtifactResponse, error) {
+	ret := _m.Called(ctx, request)
+
+	var r0 *datacatalog.DeleteArtifactResponse
+	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DeleteArtifactsRequest) *datacatalog.DeleteArtifactResponse); ok {
+		r0 = rf(ctx, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*datacatalog.DeleteArtifactResponse)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.DeleteArtifactsRequest) error); ok {
+		r1 = rf(ctx, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 type ArtifactManager_GetArtifact struct {
 	*mock.Call
 }
diff --git a/datacatalog/pkg/manager/mocks/reservation_manager.go b/datacatalog/pkg/manager/mocks/reservation_manager.go
index edde09ad90..10385dfaff 100644
--- a/datacatalog/pkg/manager/mocks/reservation_manager.go
+++ b/datacatalog/pkg/manager/mocks/reservation_manager.go
@@ -56,6 +56,47 @@ func (_m *ReservationManager) GetOrExtendReservation(_a0 context.Context, _a1 *d
 	return r0, r1
 }
 
+type ReservationManager_GetOrExtendReservations struct {
+	*mock.Call
+}
+
+func (_m ReservationManager_GetOrExtendReservations) Return(_a0 *datacatalog.GetOrExtendReservationsResponse, _a1 error) *ReservationManager_GetOrExtendReservations {
+	return &ReservationManager_GetOrExtendReservations{Call: _m.Call.Return(_a0, _a1)}
+}
+
+func (_m *ReservationManager) OnGetOrExtendReservations(_a0 context.Context, _a1 *datacatalog.GetOrExtendReservationsRequest) *ReservationManager_GetOrExtendReservations {
+	c_call := _m.On("GetOrExtendReservations", _a0, _a1)
+	return &ReservationManager_GetOrExtendReservations{Call: c_call}
+}
+
+func (_m *ReservationManager) OnGetOrExtendReservationsMatch(matchers ...interface{}) *ReservationManager_GetOrExtendReservations {
+	c_call := _m.On("GetOrExtendReservations", matchers...)
+	return &ReservationManager_GetOrExtendReservations{Call: c_call}
+}
+
+// GetOrExtendReservations provides a mock function with given fields: _a0, _a1
+func (_m *ReservationManager) GetOrExtendReservations(_a0 context.Context, _a1 *datacatalog.GetOrExtendReservationsRequest) (*datacatalog.GetOrExtendReservationsResponse, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 *datacatalog.GetOrExtendReservationsResponse
+	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest) *datacatalog.GetOrExtendReservationsResponse); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*datacatalog.GetOrExtendReservationsResponse)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 type ReservationManager_ReleaseReservation struct {
 	*mock.Call
 }
@@ -96,3 +137,44 @@ func (_m *ReservationManager) ReleaseReservation(_a0 context.Context, _a1 *datac
 
 	return r0, r1
 }
+
+type ReservationManager_ReleaseReservations struct {
+	*mock.Call
+}
+
+func (_m ReservationManager_ReleaseReservations) Return(_a0 *datacatalog.ReleaseReservationResponse, _a1 error) *ReservationManager_ReleaseReservations {
+	return &ReservationManager_ReleaseReservations{Call: _m.Call.Return(_a0, _a1)}
+}
+
+func (_m *ReservationManager) OnReleaseReservations(_a0 context.Context, _a1 *datacatalog.ReleaseReservationsRequest) *ReservationManager_ReleaseReservations {
+	c_call := _m.On("ReleaseReservations", _a0, _a1)
+	return &ReservationManager_ReleaseReservations{Call: c_call}
+}
+
+func (_m *ReservationManager) OnReleaseReservationsMatch(matchers ...interface{}) *ReservationManager_ReleaseReservations {
+	c_call := _m.On("ReleaseReservations", matchers...)
+	return &ReservationManager_ReleaseReservations{Call: c_call}
+}
+
+// ReleaseReservations provides a mock function with given fields: _a0, _a1
+func (_m *ReservationManager) ReleaseReservations(_a0 context.Context, _a1 *datacatalog.ReleaseReservationsRequest) (*datacatalog.ReleaseReservationResponse, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 *datacatalog.ReleaseReservationResponse
+	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.ReleaseReservationsRequest) *datacatalog.ReleaseReservationResponse); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*datacatalog.ReleaseReservationResponse)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.ReleaseReservationsRequest) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
diff --git a/datacatalog/pkg/rpc/datacatalogservice/service.go b/datacatalog/pkg/rpc/datacatalogservice/service.go
index 6c4e69c518..8910ef4502 100644
--- a/datacatalog/pkg/rpc/datacatalogservice/service.go
+++ b/datacatalog/pkg/rpc/datacatalogservice/service.go
@@ -69,14 +69,26 @@ func (s *DataCatalogService) DeleteArtifact(ctx context.Context, request *catalo
 	return s.ArtifactManager.DeleteArtifact(ctx, request)
 }
 
+func (s *DataCatalogService) DeleteArtifacts(ctx context.Context, request *catalog.DeleteArtifactsRequest) (*catalog.DeleteArtifactResponse, error) {
+	return s.ArtifactManager.DeleteArtifacts(ctx, request)
+}
+
 func (s *DataCatalogService) GetOrExtendReservation(ctx context.Context, request *catalog.GetOrExtendReservationRequest) (*catalog.GetOrExtendReservationResponse, error) {
 	return s.ReservationManager.GetOrExtendReservation(ctx, request)
 }
 
+func (s *DataCatalogService) GetOrExtendReservations(ctx context.Context, request *catalog.GetOrExtendReservationsRequest) (*catalog.GetOrExtendReservationsResponse, error) {
+	return s.ReservationManager.GetOrExtendReservations(ctx, request)
+}
+
 func (s *DataCatalogService) ReleaseReservation(ctx context.Context, request *catalog.ReleaseReservationRequest) (*catalog.ReleaseReservationResponse, error) {
 	return s.ReservationManager.ReleaseReservation(ctx, request)
 }
 
+func (s *DataCatalogService) ReleaseReservations(ctx context.Context, request *catalog.ReleaseReservationsRequest) (*catalog.ReleaseReservationResponse, error) {
+	return s.ReservationManager.ReleaseReservations(ctx, request)
+}
+
 func NewDataCatalogService() *DataCatalogService {
 	configProvider := runtime.NewConfigurationProvider()
 	dataCatalogConfig := configProvider.ApplicationConfiguration().GetDataCatalogConfig()

From 5cd55cf8bc600462b6256712f9eec053ef0e12ad Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Fri, 29 Dec 2023 19:58:17 -0500
Subject: [PATCH 25/57] resolve conflicts

Signed-off-by: Paul Dittamo 
---
 flyteidl/clients/go/admin/authtype_enumer.go  |    1 -
 .../go/admin/mocks/CacheServiceClient.go      |    2 +-
 .../go/admin/mocks/CacheServiceServer.go      |    2 +-
 .../gen/pb-cpp/flyteidl/core/errors.pb.cc     |   25 +-
 .../flyteidl/datacatalog/datacatalog.pb.cc    |  399 +-
 .../gen/pb-cpp/flyteidl/service/admin.pb.cc   |   14 -
 .../gen/pb-cpp/flyteidl/service/cache.pb.cc   |    8 +-
 flyteidl/gen/pb-go/flyteidl/core/errors.pb.go |   74 +-
 .../pb-go/flyteidl/core/errors.pb.validate.go |  376 --
 .../flyteidl/datacatalog/datacatalog.pb.go    |  335 +-
 .../datacatalog/datacatalog.pb.validate.go    | 3535 -----------------
 .../gen/pb-go/flyteidl/service/admin.pb.go    |  141 -
 .../gen/pb-go/flyteidl/service/cache.pb.go    |   60 +-
 .../gen/pb-java/datacatalog/Datacatalog.java  |  311 +-
 .../gen/pb-java/flyteidl/core/Errors.java     |   19 +-
 .../gen/pb-java/flyteidl/service/Admin.java   |   10 -
 .../gen/pb-java/flyteidl/service/Cache.java   |    6 +-
 flyteidl/gen/pb-js/flyteidl.d.ts              |  179 +-
 flyteidl/gen/pb-js/flyteidl.js                |  510 +--
 .../gen/pb_python/flyteidl/core/errors_pb2.py |   40 +-
 .../pb_python/flyteidl/core/errors_pb2.pyi    |   59 +-
 .../flyteidl/datacatalog/datacatalog_pb2.py   |  221 +-
 .../flyteidl/datacatalog/datacatalog_pb2.pyi  |  216 +-
 .../pb_python/flyteidl/service/admin_pb2.py   |    9 -
 .../pb_python/flyteidl/service/cache_pb2.py   |   25 +-
 .../pb_python/flyteidl/service/cache_pb2.pyi  |   12 +-
 flyteidl/gen/pb_rust/datacatalog.rs           |   62 +
 flyteidl/gen/pb_rust/flyteidl.core.rs         |   79 +
 flyteidl/gen/pb_rust/flyteidl.service.rs      |   21 +
 flyteidl/go.mod                               |   21 -
 flyteidl/go.sum                               |  981 -----
 flyteidl/protos/flyteidl/service/cache.proto  |    2 +-
 32 files changed, 1117 insertions(+), 6638 deletions(-)
 delete mode 100644 flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go
 delete mode 100644 flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go

diff --git a/flyteidl/clients/go/admin/authtype_enumer.go b/flyteidl/clients/go/admin/authtype_enumer.go
index d09a85ac6f..33a816637e 100644
--- a/flyteidl/clients/go/admin/authtype_enumer.go
+++ b/flyteidl/clients/go/admin/authtype_enumer.go
@@ -1,6 +1,5 @@
 // Code generated by "enumer --type=AuthType -json -yaml -trimprefix=AuthType"; DO NOT EDIT.
 
-//
 package admin
 
 import (
diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go
index 0d8e354d98..469f798e90 100644
--- a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go
+++ b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go
@@ -9,7 +9,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
+	service "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 )
 
 // CacheServiceClient is an autogenerated mock type for the CacheServiceClient type
diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go
index d30d216737..532ce32726 100644
--- a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go
+++ b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	context "context"
 
-	service "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service"
+	service "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc
index 1f13d061a4..623030aa2e 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/core/errors.pb.cc
@@ -171,18 +171,6 @@ ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_fl
 
 const char descriptor_table_protodef_flyteidl_2fcore_2ferrors_2eproto[] =
   "\n\032flyteidl/core/errors.proto\022\rflyteidl.c"
-<<<<<<< HEAD
-  "ore\032\035flyteidl/core/execution.proto\"\310\001\n\016C"
-  "ontainerError\022\014\n\004code\030\001 \001(\t\022\017\n\007message\030\002"
-  " \001(\t\0220\n\004kind\030\003 \001(\0162\".flyteidl.core.Conta"
-  "inerError.Kind\0227\n\006origin\030\004 \001(\0162\'.flyteid"
-  "l.core.ExecutionError.ErrorKind\",\n\004Kind\022"
-  "\023\n\017NON_RECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n"
-  "\rErrorDocument\022,\n\005error\030\001 \001(\0132\035.flyteidl"
-  ".core.ContainerErrorB>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+  "l.core.CacheEvictionErrorB>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+  "flyteidl/core/errors.proto", &assign_descriptors_table_flyteidl_2fcore_2ferrors_2eproto, 975,
 };
 
 void AddDescriptors_flyteidl_2fcore_2ferrors_2eproto() {
diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc
index b2767b1ddc..3a3b1c04cd 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc
@@ -1285,61 +1285,35 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE
   { 75, -1, sizeof(::datacatalog::ListDatasetsRequest)},
   { 82, -1, sizeof(::datacatalog::ListDatasetsResponse)},
   { 89, -1, sizeof(::datacatalog::UpdateArtifactRequest)},
-<<<<<<< HEAD
   { 100, -1, sizeof(::datacatalog::UpdateArtifactResponse)},
-  { 106, -1, sizeof(::datacatalog::ReservationID)},
-  { 113, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)},
-  { 121, -1, sizeof(::datacatalog::Reservation)},
-  { 131, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)},
-  { 137, -1, sizeof(::datacatalog::ReleaseReservationRequest)},
-  { 144, -1, sizeof(::datacatalog::ReleaseReservationResponse)},
-  { 149, -1, sizeof(::datacatalog::Dataset)},
-  { 157, -1, sizeof(::datacatalog::Partition)},
-  { 164, -1, sizeof(::datacatalog::DatasetID)},
-  { 174, -1, sizeof(::datacatalog::Artifact)},
-  { 186, -1, sizeof(::datacatalog::ArtifactData)},
-  { 193, -1, sizeof(::datacatalog::Tag)},
-  { 201, 208, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)},
-  { 210, -1, sizeof(::datacatalog::Metadata)},
-  { 216, -1, sizeof(::datacatalog::FilterExpression)},
-  { 222, -1, sizeof(::datacatalog::SinglePropertyFilter)},
-  { 233, -1, sizeof(::datacatalog::ArtifactPropertyFilter)},
-  { 240, -1, sizeof(::datacatalog::TagPropertyFilter)},
-  { 247, -1, sizeof(::datacatalog::PartitionPropertyFilter)},
-  { 254, -1, sizeof(::datacatalog::KeyValuePair)},
-  { 261, -1, sizeof(::datacatalog::DatasetPropertyFilter)},
-  { 271, -1, sizeof(::datacatalog::PaginationOptions)},
-=======
-  { 99, -1, sizeof(::datacatalog::UpdateArtifactResponse)},
-  { 105, -1, sizeof(::datacatalog::DeleteArtifactRequest)},
-  { 114, -1, sizeof(::datacatalog::DeleteArtifactsRequest)},
-  { 120, -1, sizeof(::datacatalog::DeleteArtifactResponse)},
-  { 125, -1, sizeof(::datacatalog::ReservationID)},
-  { 132, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)},
-  { 140, -1, sizeof(::datacatalog::GetOrExtendReservationsRequest)},
-  { 146, -1, sizeof(::datacatalog::Reservation)},
-  { 156, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)},
-  { 162, -1, sizeof(::datacatalog::GetOrExtendReservationsResponse)},
-  { 168, -1, sizeof(::datacatalog::ReleaseReservationRequest)},
-  { 175, -1, sizeof(::datacatalog::ReleaseReservationsRequest)},
-  { 181, -1, sizeof(::datacatalog::ReleaseReservationResponse)},
-  { 186, -1, sizeof(::datacatalog::Dataset)},
-  { 194, -1, sizeof(::datacatalog::Partition)},
-  { 201, -1, sizeof(::datacatalog::DatasetID)},
-  { 211, -1, sizeof(::datacatalog::Artifact)},
-  { 223, -1, sizeof(::datacatalog::ArtifactData)},
-  { 230, -1, sizeof(::datacatalog::Tag)},
-  { 238, 245, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)},
-  { 247, -1, sizeof(::datacatalog::Metadata)},
-  { 253, -1, sizeof(::datacatalog::FilterExpression)},
-  { 259, -1, sizeof(::datacatalog::SinglePropertyFilter)},
-  { 270, -1, sizeof(::datacatalog::ArtifactPropertyFilter)},
-  { 277, -1, sizeof(::datacatalog::TagPropertyFilter)},
-  { 284, -1, sizeof(::datacatalog::PartitionPropertyFilter)},
-  { 291, -1, sizeof(::datacatalog::KeyValuePair)},
-  { 298, -1, sizeof(::datacatalog::DatasetPropertyFilter)},
-  { 308, -1, sizeof(::datacatalog::PaginationOptions)},
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+  { 106, -1, sizeof(::datacatalog::DeleteArtifactRequest)},
+  { 115, -1, sizeof(::datacatalog::DeleteArtifactsRequest)},
+  { 121, -1, sizeof(::datacatalog::DeleteArtifactResponse)},
+  { 126, -1, sizeof(::datacatalog::ReservationID)},
+  { 133, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)},
+  { 141, -1, sizeof(::datacatalog::GetOrExtendReservationsRequest)},
+  { 147, -1, sizeof(::datacatalog::Reservation)},
+  { 157, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)},
+  { 163, -1, sizeof(::datacatalog::GetOrExtendReservationsResponse)},
+  { 169, -1, sizeof(::datacatalog::ReleaseReservationRequest)},
+  { 176, -1, sizeof(::datacatalog::ReleaseReservationsRequest)},
+  { 182, -1, sizeof(::datacatalog::ReleaseReservationResponse)},
+  { 187, -1, sizeof(::datacatalog::Dataset)},
+  { 195, -1, sizeof(::datacatalog::Partition)},
+  { 202, -1, sizeof(::datacatalog::DatasetID)},
+  { 212, -1, sizeof(::datacatalog::Artifact)},
+  { 224, -1, sizeof(::datacatalog::ArtifactData)},
+  { 231, -1, sizeof(::datacatalog::Tag)},
+  { 239, 246, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)},
+  { 248, -1, sizeof(::datacatalog::Metadata)},
+  { 254, -1, sizeof(::datacatalog::FilterExpression)},
+  { 260, -1, sizeof(::datacatalog::SinglePropertyFilter)},
+  { 271, -1, sizeof(::datacatalog::ArtifactPropertyFilter)},
+  { 278, -1, sizeof(::datacatalog::TagPropertyFilter)},
+  { 285, -1, sizeof(::datacatalog::PartitionPropertyFilter)},
+  { 292, -1, sizeof(::datacatalog::KeyValuePair)},
+  { 299, -1, sizeof(::datacatalog::DatasetPropertyFilter)},
+  { 309, -1, sizeof(::datacatalog::PaginationOptions)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -1428,222 +1402,125 @@ const char descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eprot
   "\t\"\315\001\n\025UpdateArtifactRequest\022\'\n\007dataset\030\001"
   " \001(\0132\026.datacatalog.DatasetID\022\025\n\013artifact"
   "_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001(\tH\000\022\'\n\004data\030"
-<<<<<<< HEAD
   "\004 \003(\0132\031.datacatalog.ArtifactData\022\'\n\010meta"
   "data\030\005 \001(\0132\025.datacatalog.MetadataB\016\n\014que"
   "ry_handle\"-\n\026UpdateArtifactResponse\022\023\n\013a"
-  "rtifact_id\030\001 \001(\t\"M\n\rReservationID\022*\n\ndat"
-  "aset_id\030\001 \001(\0132\026.datacatalog.DatasetID\022\020\n"
-  "\010tag_name\030\002 \001(\t\"\234\001\n\035GetOrExtendReservati"
-  "onRequest\0222\n\016reservation_id\030\001 \001(\0132\032.data"
-  "catalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\022"
-  "5\n\022heartbeat_interval\030\003 \001(\0132\031.google.pro"
-  "tobuf.Duration\"\343\001\n\013Reservation\0222\n\016reserv"
-  "ation_id\030\001 \001(\0132\032.datacatalog.Reservation"
-  "ID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbeat_interv"
-  "al\030\003 \001(\0132\031.google.protobuf.Duration\022.\n\ne"
-  "xpires_at\030\004 \001(\0132\032.google.protobuf.Timest"
-  "amp\022\'\n\010metadata\030\006 \001(\0132\025.datacatalog.Meta"
-  "data\"O\n\036GetOrExtendReservationResponse\022-"
-  "\n\013reservation\030\001 \001(\0132\030.datacatalog.Reserv"
-  "ation\"a\n\031ReleaseReservationRequest\0222\n\016re"
-  "servation_id\030\001 \001(\0132\032.datacatalog.Reserva"
-  "tionID\022\020\n\010owner_id\030\002 \001(\t\"\034\n\032ReleaseReser"
-  "vationResponse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026."
-  "datacatalog.DatasetID\022\'\n\010metadata\030\002 \001(\0132"
-  "\025.datacatalog.Metadata\022\025\n\rpartitionKeys\030"
-  "\003 \003(\t\"\'\n\tPartition\022\013\n\003key\030\001 \001(\t\022\r\n\005value"
-  "\030\002 \001(\t\"Y\n\tDatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004"
-  "name\030\002 \001(\t\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 "
-  "\001(\t\022\014\n\004UUID\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001"
-  "(\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Datase"
-  "tID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.Artifact"
-  "Data\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog.Met"
-  "adata\022*\n\npartitions\030\005 \003(\0132\026.datacatalog."
-  "Partition\022\036\n\004tags\030\006 \003(\0132\020.datacatalog.Ta"
-  "g\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf."
-  "Timestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022"
-  "%\n\005value\030\002 \001(\0132\026.flyteidl.core.Literal\"Q"
-  "\n\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t"
-  "\022\'\n\007dataset\030\003 \001(\0132\026.datacatalog.DatasetI"
-  "D\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.datacat"
-  "alog.Metadata.KeyMapEntry\032-\n\013KeyMapEntry"
-  "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020Filt"
-  "erExpression\0222\n\007filters\030\001 \003(\0132!.datacata"
-  "log.SinglePropertyFilter\"\211\003\n\024SinglePrope"
-  "rtyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.datacata"
-  "log.TagPropertyFilterH\000\022@\n\020partition_fil"
-  "ter\030\002 \001(\0132$.datacatalog.PartitionPropert"
-  "yFilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#.dat"
-  "acatalog.ArtifactPropertyFilterH\000\022<\n\016dat"
-  "aset_filter\030\004 \001(\0132\".datacatalog.DatasetP"
-  "ropertyFilterH\000\022F\n\010operator\030\n \001(\01624.data"
-  "catalog.SinglePropertyFilter.ComparisonO"
-  "perator\" \n\022ComparisonOperator\022\n\n\006EQUALS\020"
-  "\000B\021\n\017property_filter\";\n\026ArtifactProperty"
-  "Filter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010propert"
-  "y\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001 \001(\t"
-  "H\000B\n\n\010property\"S\n\027PartitionPropertyFilte"
-  "r\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.KeyValu"
-  "ePairH\000B\n\n\010property\"*\n\014KeyValuePair\022\013\n\003k"
-  "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"k\n\025DatasetProper"
-  "tyFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001("
-  "\tH\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000"
-  "B\n\n\010property\"\361\001\n\021PaginationOptions\022\r\n\005li"
-  "mit\030\001 \001(\r\022\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001("
-  "\0162&.datacatalog.PaginationOptions.SortKe"
-  "y\022;\n\tsortOrder\030\004 \001(\0162(.datacatalog.Pagin"
-  "ationOptions.SortOrder\"*\n\tSortOrder\022\016\n\nD"
-  "ESCENDING\020\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n"
-  "\rCREATION_TIME\020\0002\206\007\n\013DataCatalog\022V\n\rCrea"
-  "teDataset\022!.datacatalog.CreateDatasetReq"
-  "uest\032\".datacatalog.CreateDatasetResponse"
-  "\022M\n\nGetDataset\022\036.datacatalog.GetDatasetR"
-  "equest\032\037.datacatalog.GetDatasetResponse\022"
-  "Y\n\016CreateArtifact\022\".datacatalog.CreateAr"
-  "tifactRequest\032#.datacatalog.CreateArtifa"
-  "ctResponse\022P\n\013GetArtifact\022\037.datacatalog."
-  "GetArtifactRequest\032 .datacatalog.GetArti"
-  "factResponse\022A\n\006AddTag\022\032.datacatalog.Add"
-  "TagRequest\032\033.datacatalog.AddTagResponse\022"
-  "V\n\rListArtifacts\022!.datacatalog.ListArtif"
-  "actsRequest\032\".datacatalog.ListArtifactsR"
-  "esponse\022S\n\014ListDatasets\022 .datacatalog.Li"
-  "stDatasetsRequest\032!.datacatalog.ListData"
-  "setsResponse\022Y\n\016UpdateArtifact\022\".datacat"
-  "alog.UpdateArtifactRequest\032#.datacatalog"
-  ".UpdateArtifactResponse\022q\n\026GetOrExtendRe"
-  "servation\022*.datacatalog.GetOrExtendReser"
-  "vationRequest\032+.datacatalog.GetOrExtendR"
-  "eservationResponse\022e\n\022ReleaseReservation"
-  "\022&.datacatalog.ReleaseReservationRequest"
-  "\032\'.datacatalog.ReleaseReservationRespons"
-  "eBCZAgithub.com/flyteorg/flyte/flyteidl/"
-  "gen/pb-go/flyteidl/datacatalogb\006proto3"
-=======
-  "\004 \003(\0132\031.datacatalog.ArtifactDataB\016\n\014quer"
-  "y_handle\"-\n\026UpdateArtifactResponse\022\023\n\013ar"
-  "tifact_id\030\001 \001(\t\"{\n\025DeleteArtifactRequest"
-  "\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.DatasetI"
-  "D\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001"
-  "(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifactsR"
-  "equest\0225\n\tartifacts\030\001 \003(\0132\".datacatalog."
-  "DeleteArtifactRequest\"\030\n\026DeleteArtifactR"
-  "esponse\"M\n\rReservationID\022*\n\ndataset_id\030\001"
-  " \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name"
-  "\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest"
-  "\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog.R"
-  "eservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartb"
-  "eat_interval\030\003 \001(\0132\031.google.protobuf.Dur"
-  "ation\"b\n\036GetOrExtendReservationsRequest\022"
-  "@\n\014reservations\030\001 \003(\0132*.datacatalog.GetO"
-  "rExtendReservationRequest\"\343\001\n\013Reservatio"
-  "n\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog."
+  "rtifact_id\030\001 \001(\t\"{\n\025DeleteArtifactReques"
+  "t\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.Dataset"
+  "ID\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 "
+  "\001(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifacts"
+  "Request\0225\n\tartifacts\030\001 \003(\0132\".datacatalog"
+  ".DeleteArtifactRequest\"\030\n\026DeleteArtifact"
+  "Response\"M\n\rReservationID\022*\n\ndataset_id\030"
+  "\001 \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_nam"
+  "e\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationReques"
+  "t\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog."
   "ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heart"
   "beat_interval\030\003 \001(\0132\031.google.protobuf.Du"
-  "ration\022.\n\nexpires_at\030\004 \001(\0132\032.google.prot"
-  "obuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.datac"
-  "atalog.Metadata\"O\n\036GetOrExtendReservatio"
-  "nResponse\022-\n\013reservation\030\001 \001(\0132\030.datacat"
-  "alog.Reservation\"Q\n\037GetOrExtendReservati"
-  "onsResponse\022.\n\014reservations\030\001 \003(\0132\030.data"
-  "catalog.Reservation\"a\n\031ReleaseReservatio"
-  "nRequest\0222\n\016reservation_id\030\001 \001(\0132\032.datac"
-  "atalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\"Z"
-  "\n\032ReleaseReservationsRequest\022<\n\014reservat"
-  "ions\030\001 \003(\0132&.datacatalog.ReleaseReservat"
-  "ionRequest\"\034\n\032ReleaseReservationResponse"
-  "\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.Da"
-  "tasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog."
-  "Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tParti"
-  "tion\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\tData"
-  "setID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n\006"
-  "domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005 "
-  "\001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007dataset\030"
-  "\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004data\030\003 "
-  "\003(\0132\031.datacatalog.ArtifactData\022\'\n\010metada"
-  "ta\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\nparti"
-  "tions\030\005 \003(\0132\026.datacatalog.Partition\022\036\n\004t"
-  "ags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreated_a"
-  "t\030\007 \001(\0132\032.google.protobuf.Timestamp\"C\n\014A"
-  "rtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002 \001(\013"
-  "2\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004name\030"
-  "\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007dataset\030\003 "
-  "\001(\0132\026.datacatalog.DatasetID\"m\n\010Metadata\022"
-  "2\n\007key_map\030\001 \003(\0132!.datacatalog.Metadata."
-  "KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 \001(\t\022"
-  "\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpression\0222"
-  "\n\007filters\030\001 \003(\0132!.datacatalog.SingleProp"
-  "ertyFilter\"\211\003\n\024SinglePropertyFilter\0224\n\nt"
-  "ag_filter\030\001 \001(\0132\036.datacatalog.TagPropert"
-  "yFilterH\000\022@\n\020partition_filter\030\002 \001(\0132$.da"
-  "tacatalog.PartitionPropertyFilterH\000\022>\n\017a"
-  "rtifact_filter\030\003 \001(\0132#.datacatalog.Artif"
-  "actPropertyFilterH\000\022<\n\016dataset_filter\030\004 "
-  "\001(\0132\".datacatalog.DatasetPropertyFilterH"
-  "\000\022F\n\010operator\030\n \001(\01624.datacatalog.Single"
-  "PropertyFilter.ComparisonOperator\" \n\022Com"
-  "parisonOperator\022\n\n\006EQUALS\020\000B\021\n\017property_"
-  "filter\";\n\026ArtifactPropertyFilter\022\025\n\013arti"
-  "fact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagProper"
-  "tyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010property"
-  "\"S\n\027PartitionPropertyFilter\022,\n\007key_val\030\001"
-  " \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n\010pro"
-  "perty\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005va"
-  "lue\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021\n\007pr"
-  "oject\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006domain\030"
-  "\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010property\"\361"
-  "\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005t"
-  "oken\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatalo"
-  "g.PaginationOptions.SortKey\022;\n\tsortOrder"
-  "\030\004 \001(\0162(.datacatalog.PaginationOptions.S"
-  "ortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n"
-  "\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME"
-  "\020\0002\235\n\n\013DataCatalog\022V\n\rCreateDataset\022!.da"
-  "tacatalog.CreateDatasetRequest\032\".datacat"
-  "alog.CreateDatasetResponse\022M\n\nGetDataset"
-  "\022\036.datacatalog.GetDatasetRequest\032\037.datac"
-  "atalog.GetDatasetResponse\022Y\n\016CreateArtif"
-  "act\022\".datacatalog.CreateArtifactRequest\032"
-  "#.datacatalog.CreateArtifactResponse\022P\n\013"
-  "GetArtifact\022\037.datacatalog.GetArtifactReq"
-  "uest\032 .datacatalog.GetArtifactResponse\022A"
-  "\n\006AddTag\022\032.datacatalog.AddTagRequest\032\033.d"
-  "atacatalog.AddTagResponse\022V\n\rListArtifac"
-  "ts\022!.datacatalog.ListArtifactsRequest\032\"."
-  "datacatalog.ListArtifactsResponse\022S\n\014Lis"
-  "tDatasets\022 .datacatalog.ListDatasetsRequ"
-  "est\032!.datacatalog.ListDatasetsResponse\022Y"
-  "\n\016UpdateArtifact\022\".datacatalog.UpdateArt"
-  "ifactRequest\032#.datacatalog.UpdateArtifac"
-  "tResponse\022Y\n\016DeleteArtifact\022\".datacatalo"
-  "g.DeleteArtifactRequest\032#.datacatalog.De"
-  "leteArtifactResponse\022[\n\017DeleteArtifacts\022"
-  "#.datacatalog.DeleteArtifactsRequest\032#.d"
-  "atacatalog.DeleteArtifactResponse\022q\n\026Get"
-  "OrExtendReservation\022*.datacatalog.GetOrE"
-  "xtendReservationRequest\032+.datacatalog.Ge"
-  "tOrExtendReservationResponse\022t\n\027GetOrExt"
-  "endReservations\022+.datacatalog.GetOrExten"
-  "dReservationsRequest\032,.datacatalog.GetOr"
-  "ExtendReservationsResponse\022e\n\022ReleaseRes"
-  "ervation\022&.datacatalog.ReleaseReservatio"
-  "nRequest\032\'.datacatalog.ReleaseReservatio"
-  "nResponse\022g\n\023ReleaseReservations\022\'.datac"
-  "atalog.ReleaseReservationsRequest\032\'.data"
-  "catalog.ReleaseReservationResponseB=Z;gi"
-  "thub.com/flyteorg/flyteidl/gen/pb-go/fly"
-  "teidl/datacatalogb\006proto3"
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+  "ration\"b\n\036GetOrExtendReservationsRequest"
+  "\022@\n\014reservations\030\001 \003(\0132*.datacatalog.Get"
+  "OrExtendReservationRequest\"\343\001\n\013Reservati"
+  "on\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog"
+  ".ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022hear"
+  "tbeat_interval\030\003 \001(\0132\031.google.protobuf.D"
+  "uration\022.\n\nexpires_at\030\004 \001(\0132\032.google.pro"
+  "tobuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.data"
+  "catalog.Metadata\"O\n\036GetOrExtendReservati"
+  "onResponse\022-\n\013reservation\030\001 \001(\0132\030.dataca"
+  "talog.Reservation\"Q\n\037GetOrExtendReservat"
+  "ionsResponse\022.\n\014reservations\030\001 \003(\0132\030.dat"
+  "acatalog.Reservation\"a\n\031ReleaseReservati"
+  "onRequest\0222\n\016reservation_id\030\001 \001(\0132\032.data"
+  "catalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\""
+  "Z\n\032ReleaseReservationsRequest\022<\n\014reserva"
+  "tions\030\001 \003(\0132&.datacatalog.ReleaseReserva"
+  "tionRequest\"\034\n\032ReleaseReservationRespons"
+  "e\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.D"
+  "atasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog"
+  ".Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tPart"
+  "ition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\tDat"
+  "asetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n"
+  "\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005"
+  " \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007dataset"
+  "\030\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004data\030\003"
+  " \003(\0132\031.datacatalog.ArtifactData\022\'\n\010metad"
+  "ata\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\npart"
+  "itions\030\005 \003(\0132\026.datacatalog.Partition\022\036\n\004"
+  "tags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreated_"
+  "at\030\007 \001(\0132\032.google.protobuf.Timestamp\"C\n\014"
+  "ArtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002 \001("
+  "\0132\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004name"
+  "\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007dataset\030\003"
+  " \001(\0132\026.datacatalog.DatasetID\"m\n\010Metadata"
+  "\0222\n\007key_map\030\001 \003(\0132!.datacatalog.Metadata"
+  ".KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 \001(\t"
+  "\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpression\022"
+  "2\n\007filters\030\001 \003(\0132!.datacatalog.SinglePro"
+  "pertyFilter\"\211\003\n\024SinglePropertyFilter\0224\n\n"
+  "tag_filter\030\001 \001(\0132\036.datacatalog.TagProper"
+  "tyFilterH\000\022@\n\020partition_filter\030\002 \001(\0132$.d"
+  "atacatalog.PartitionPropertyFilterH\000\022>\n\017"
+  "artifact_filter\030\003 \001(\0132#.datacatalog.Arti"
+  "factPropertyFilterH\000\022<\n\016dataset_filter\030\004"
+  " \001(\0132\".datacatalog.DatasetPropertyFilter"
+  "H\000\022F\n\010operator\030\n \001(\01624.datacatalog.Singl"
+  "ePropertyFilter.ComparisonOperator\" \n\022Co"
+  "mparisonOperator\022\n\n\006EQUALS\020\000B\021\n\017property"
+  "_filter\";\n\026ArtifactPropertyFilter\022\025\n\013art"
+  "ifact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagPrope"
+  "rtyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010propert"
+  "y\"S\n\027PartitionPropertyFilter\022,\n\007key_val\030"
+  "\001 \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n\010pr"
+  "operty\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005v"
+  "alue\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021\n\007p"
+  "roject\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006domain"
+  "\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010property\""
+  "\361\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005"
+  "token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatal"
+  "og.PaginationOptions.SortKey\022;\n\tsortOrde"
+  "r\030\004 \001(\0162(.datacatalog.PaginationOptions."
+  "SortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r"
+  "\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIM"
+  "E\020\0002\235\n\n\013DataCatalog\022V\n\rCreateDataset\022!.d"
+  "atacatalog.CreateDatasetRequest\032\".dataca"
+  "talog.CreateDatasetResponse\022M\n\nGetDatase"
+  "t\022\036.datacatalog.GetDatasetRequest\032\037.data"
+  "catalog.GetDatasetResponse\022Y\n\016CreateArti"
+  "fact\022\".datacatalog.CreateArtifactRequest"
+  "\032#.datacatalog.CreateArtifactResponse\022P\n"
+  "\013GetArtifact\022\037.datacatalog.GetArtifactRe"
+  "quest\032 .datacatalog.GetArtifactResponse\022"
+  "A\n\006AddTag\022\032.datacatalog.AddTagRequest\032\033."
+  "datacatalog.AddTagResponse\022V\n\rListArtifa"
+  "cts\022!.datacatalog.ListArtifactsRequest\032\""
+  ".datacatalog.ListArtifactsResponse\022S\n\014Li"
+  "stDatasets\022 .datacatalog.ListDatasetsReq"
+  "uest\032!.datacatalog.ListDatasetsResponse\022"
+  "Y\n\016UpdateArtifact\022\".datacatalog.UpdateAr"
+  "tifactRequest\032#.datacatalog.UpdateArtifa"
+  "ctResponse\022Y\n\016DeleteArtifact\022\".datacatal"
+  "og.DeleteArtifactRequest\032#.datacatalog.D"
+  "eleteArtifactResponse\022[\n\017DeleteArtifacts"
+  "\022#.datacatalog.DeleteArtifactsRequest\032#."
+  "datacatalog.DeleteArtifactResponse\022q\n\026Ge"
+  "tOrExtendReservation\022*.datacatalog.GetOr"
+  "ExtendReservationRequest\032+.datacatalog.G"
+  "etOrExtendReservationResponse\022t\n\027GetOrEx"
+  "tendReservations\022+.datacatalog.GetOrExte"
+  "ndReservationsRequest\032,.datacatalog.GetO"
+  "rExtendReservationsResponse\022e\n\022ReleaseRe"
+  "servation\022&.datacatalog.ReleaseReservati"
+  "onRequest\032\'.datacatalog.ReleaseReservati"
+  "onResponse\022g\n\023ReleaseReservations\022\'.data"
+  "catalog.ReleaseReservationsRequest\032\'.dat"
+  "acatalog.ReleaseReservationResponseBCZAg"
+  "ithub.com/flyteorg/flyte/flyteidl/gen/pb"
+  "-go/flyteidl/datacatalogb\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = {
   false, InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 
   descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eproto,
-<<<<<<< HEAD
-  "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 4918,
-=======
-  "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 5785,
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+  "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 5832,
 };
 
 void AddDescriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc
index 47b43e52fe..991c8bb312 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/service/admin.pb.cc
@@ -52,11 +52,7 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto[] =
   "admin/task_execution.proto\032\034flyteidl/adm"
   "in/version.proto\032\033flyteidl/admin/common."
   "proto\032\'flyteidl/admin/description_entity"
-<<<<<<< HEAD
   ".proto2\204N\n\014AdminService\022m\n\nCreateTask\022!."
-=======
-  ".proto2\274L\n\014AdminService\022m\n\nCreateTask\022!."
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
   "flyteidl.admin.TaskCreateRequest\032\".flyte"
   "idl.admin.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/a"
   "pi/v1/tasks:\001*\022\210\001\n\007GetTask\022 .flyteidl.ad"
@@ -300,7 +296,6 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto[] =
   "\002\232\001\022O/api/v1/description_entities/{resou"
   "rce_type}/{id.project}/{id.domain}/{id.n"
   "ame}ZG\022E/api/v1/description_entities/{re"
-<<<<<<< HEAD
   "source_type}/{id.project}/{id.domain}\022\305\001"
   "\n\023GetExecutionMetrics\0222.flyteidl.admin.W"
   "orkflowExecutionGetMetricsRequest\0323.flyt"
@@ -309,20 +304,11 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto[] =
   "ns/{id.project}/{id.domain}/{id.name}B\?Z"
   "=github.com/flyteorg/flyte/flyteidl/gen/"
   "pb-go/flyteidl/serviceb\006proto3"
-=======
-  "source_type}/{id.project}/{id.domain}B9Z"
-  "7github.com/flyteorg/flyteidl/gen/pb-go/"
-  "flyteidl/serviceb\006proto3"
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fadmin_2eproto = {
   false, InitDefaults_flyteidl_2fservice_2fadmin_2eproto, 
   descriptor_table_protodef_flyteidl_2fservice_2fadmin_2eproto,
-<<<<<<< HEAD
   "flyteidl/service/admin.proto", &assign_descriptors_table_flyteidl_2fservice_2fadmin_2eproto, 10670,
-=======
-  "flyteidl/service/admin.proto", &assign_descriptors_table_flyteidl_2fservice_2fadmin_2eproto, 10464,
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 };
 
 void AddDescriptors_flyteidl_2fservice_2fadmin_2eproto() {
diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc
index a063929c01..3e6db46b63 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc
@@ -159,14 +159,14 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto[] =
   "ject}/{task_execution_id.task_id.domain}"
   "/{task_execution_id.task_id.name}/{task_"
   "execution_id.task_id.version}/{task_exec"
-  "ution_id.retry_attempt}B9Z7github.com/fl"
-  "yteorg/flyteidl/gen/pb-go/flyteidl/servi"
-  "ceb\006proto3"
+  "ution_id.retry_attempt}B\?Z=github.com/fl"
+  "yteorg/flyte/flyteidl/gen/pb-go/flyteidl"
+  "/serviceb\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fcache_2eproto = {
   false, InitDefaults_flyteidl_2fservice_2fcache_2eproto, 
   descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto,
-  "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1290,
+  "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1296,
 };
 
 void AddDescriptors_flyteidl_2fservice_2fcache_2eproto() {
diff --git a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go
index d291605f59..cb7817bb8e 100644
--- a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.go
@@ -359,49 +359,28 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/core/errors.proto", fileDescriptor_c2a49b99f342b879) }
 
 var fileDescriptor_c2a49b99f342b879 = []byte{
-<<<<<<< HEAD
-	// 286 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4b, 0xc3, 0x40,
-	0x10, 0xc5, 0x8d, 0xc6, 0x8a, 0x53, 0xda, 0xca, 0x7a, 0x09, 0x85, 0x42, 0xc9, 0xc5, 0x1e, 0x74,
-	0x17, 0x5a, 0xf0, 0x20, 0x82, 0xd8, 0x36, 0x27, 0xa5, 0x85, 0x1c, 0x3c, 0x78, 0x91, 0x26, 0x59,
-	0xd7, 0xc5, 0x66, 0xa7, 0x6c, 0x36, 0xa0, 0x1f, 0xd8, 0xef, 0x21, 0x99, 0x18, 0x31, 0x3d, 0x78,
-	0x09, 0xf3, 0xe7, 0xfd, 0x5e, 0x66, 0x1f, 0x0c, 0x5f, 0xb7, 0x9f, 0x4e, 0xea, 0x6c, 0x2b, 0x52,
-	0xb4, 0x52, 0x48, 0x6b, 0xd1, 0x16, 0x7c, 0x67, 0xd1, 0x21, 0xeb, 0x35, 0x3b, 0x5e, 0xed, 0x86,
-	0xa3, 0x3d, 0xe9, 0x87, 0x4c, 0x4b, 0xa7, 0xd1, 0xd4, 0xea, 0xf0, 0xcb, 0x83, 0xfe, 0x02, 0x8d,
-	0xdb, 0x68, 0x23, 0x6d, 0x54, 0xf9, 0x30, 0x06, 0x7e, 0x8a, 0x99, 0x0c, 0xbc, 0xb1, 0x37, 0x39,
-	0x8d, 0xa9, 0x66, 0x01, 0x9c, 0xe4, 0xb2, 0x28, 0x36, 0x4a, 0x06, 0x87, 0x34, 0x6e, 0x5a, 0x76,
-	0x0d, 0xfe, 0xbb, 0x36, 0x59, 0x70, 0x34, 0xf6, 0x26, 0xfd, 0x69, 0xc8, 0x5b, 0x7f, 0xe7, 0x6d,
-	0x6b, 0xfe, 0xa0, 0x4d, 0x16, 0x93, 0x9e, 0xdd, 0x41, 0x07, 0xad, 0x56, 0xda, 0x04, 0x3e, 0x91,
-	0x17, 0x7b, 0x64, 0xd4, 0x1c, 0x5a, 0x93, 0xf4, 0x25, 0xfc, 0x07, 0x0b, 0x2f, 0xc1, 0xaf, 0x7a,
-	0x76, 0x0e, 0x83, 0xd5, 0x7a, 0xf5, 0x12, 0x47, 0x8b, 0xf5, 0x53, 0x14, 0xdf, 0xcf, 0x1f, 0xa3,
-	0xb3, 0x03, 0x36, 0x80, 0xee, 0xdf, 0x81, 0x17, 0x2e, 0xa1, 0x47, 0x16, 0x4b, 0x4c, 0xcb, 0x5c,
-	0x1a, 0xc7, 0x66, 0x70, 0x4c, 0xb1, 0xd1, 0x33, 0xbb, 0xd3, 0xd1, 0xbf, 0x87, 0xc7, 0xb5, 0x76,
-	0x7e, 0xfb, 0x7c, 0xa3, 0xb4, 0x7b, 0x2b, 0x13, 0x9e, 0x62, 0x2e, 0x88, 0x40, 0xab, 0xea, 0x42,
-	0xfc, 0x06, 0xad, 0xa4, 0x11, 0xbb, 0xe4, 0x4a, 0xa1, 0x68, 0x65, 0x9f, 0x74, 0x28, 0xf2, 0xd9,
-	0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x9d, 0x42, 0xed, 0xbe, 0x01, 0x00, 0x00,
-=======
-	// 540 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x61, 0x6f, 0xd2, 0x40,
-	0x18, 0xc7, 0xd7, 0xad, 0xc3, 0xf9, 0xe0, 0x06, 0xbb, 0xc5, 0xa5, 0x21, 0xce, 0x60, 0x5f, 0x28,
-	0x31, 0xda, 0x26, 0xcc, 0x2c, 0xd1, 0x37, 0xe6, 0x68, 0x6f, 0xb1, 0xb1, 0x29, 0x7a, 0x74, 0x33,
-	0xf1, 0x4d, 0x85, 0xf6, 0xe8, 0x2e, 0x40, 0x6f, 0x69, 0x8b, 0xe8, 0x37, 0x30, 0xf1, 0x73, 0xfa,
-	0x3d, 0x0c, 0x57, 0xc0, 0x15, 0x88, 0x7b, 0x43, 0xb8, 0xfb, 0x3f, 0xff, 0xdf, 0xdd, 0xfd, 0x9f,
-	0x3e, 0xd0, 0x18, 0x8e, 0x7f, 0xe6, 0x8c, 0x47, 0x63, 0x33, 0x14, 0x29, 0x33, 0x59, 0x9a, 0x8a,
-	0x34, 0x33, 0x6e, 0x53, 0x91, 0x0b, 0x74, 0xb8, 0xd4, 0x8c, 0xb9, 0xd6, 0x38, 0x5b, 0x2b, 0xfd,
-	0xc1, 0xc2, 0x69, 0xce, 0x45, 0x52, 0x54, 0x37, 0x9e, 0x96, 0x65, 0x1e, 0xb1, 0x24, 0xe7, 0x43,
-	0xce, 0xd2, 0x42, 0xd7, 0xff, 0x28, 0x70, 0x64, 0x89, 0x24, 0xef, 0xf3, 0x84, 0xa5, 0x64, 0x7e,
-	0x0e, 0x42, 0xa0, 0x86, 0x22, 0x62, 0x9a, 0xd2, 0x54, 0x5a, 0x0f, 0xa9, 0xfc, 0x8f, 0x34, 0x78,
-	0x30, 0x61, 0x59, 0xd6, 0x8f, 0x99, 0xb6, 0x2b, 0xb7, 0x97, 0x4b, 0x74, 0x01, 0xea, 0x88, 0x27,
-	0x91, 0xb6, 0xd7, 0x54, 0x5a, 0x47, 0x6d, 0xdd, 0x28, 0xdd, 0xce, 0x28, 0xa3, 0x8d, 0x8f, 0x3c,
+	// 542 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x61, 0x6b, 0xd3, 0x40,
+	0x18, 0xc7, 0x97, 0x2d, 0xab, 0xf3, 0xa9, 0x5b, 0xbb, 0x1b, 0x8e, 0x50, 0x9c, 0xd4, 0xbc, 0xd0,
+	0x22, 0x9a, 0x40, 0x07, 0x82, 0x43, 0x90, 0x6b, 0x72, 0xc3, 0x60, 0x48, 0xf5, 0x9a, 0x4d, 0xf0,
+	0x4d, 0x6c, 0x93, 0x6b, 0x76, 0xb4, 0xcd, 0x8d, 0x24, 0xb5, 0xfa, 0x0d, 0x04, 0x3f, 0xa7, 0xdf,
+	0x43, 0x7a, 0x69, 0xeb, 0xd2, 0x16, 0xf7, 0x26, 0xdc, 0xdd, 0xff, 0xf9, 0xff, 0xee, 0xee, 0x7f,
+	0x79, 0xa0, 0x31, 0x1c, 0xff, 0xcc, 0x19, 0x8f, 0xc6, 0x66, 0x28, 0x52, 0x66, 0xb2, 0x34, 0x15,
+	0x69, 0x66, 0xdc, 0xa6, 0x22, 0x17, 0xe8, 0x70, 0xa9, 0x19, 0x73, 0xad, 0x71, 0xb6, 0x56, 0xfa,
+	0x83, 0x85, 0xd3, 0x9c, 0x8b, 0xa4, 0xa8, 0x6e, 0x3c, 0x2d, 0xcb, 0x3c, 0x62, 0x49, 0xce, 0x87,
+	0x9c, 0xa5, 0x85, 0xae, 0xff, 0x51, 0xe0, 0xc8, 0x12, 0x49, 0xde, 0xe7, 0x09, 0x4b, 0xc9, 0x7c,
+	0x1f, 0x84, 0x40, 0x0d, 0x45, 0xc4, 0x34, 0xa5, 0xa9, 0xb4, 0x1e, 0x52, 0x39, 0x46, 0x1a, 0x3c,
+	0x98, 0xb0, 0x2c, 0xeb, 0xc7, 0x4c, 0xdb, 0x95, 0xcb, 0xcb, 0x29, 0x7a, 0x03, 0xea, 0x88, 0x27,
+	0x91, 0xb6, 0xd7, 0x54, 0x5a, 0x47, 0x6d, 0xdd, 0x28, 0x9d, 0xce, 0x28, 0xa3, 0x8d, 0x8f, 0x3c,
 	0x89, 0xa8, 0xac, 0x47, 0xef, 0xa1, 0x22, 0x52, 0x1e, 0xf3, 0x44, 0x53, 0xa5, 0xf3, 0xc5, 0x9a,
-	0x93, 0x2c, 0x1f, 0x52, 0x38, 0xe5, 0xaf, 0xb4, 0x2f, 0x6c, 0xfa, 0x2b, 0x50, 0xe7, 0x6b, 0x74,
-	0x02, 0x35, 0xaf, 0xeb, 0x05, 0x94, 0x58, 0xdd, 0x6b, 0x42, 0x71, 0xc7, 0x25, 0xf5, 0x1d, 0x54,
-	0x83, 0xea, 0xdd, 0x0d, 0x45, 0xb7, 0xe1, 0x50, 0x22, 0x6c, 0x11, 0x4e, 0x27, 0x2c, 0xc9, 0xd1,
-	0x39, 0xec, 0xcb, 0x58, 0xe5, 0x33, 0xab, 0xed, 0xb3, 0xff, 0x5e, 0x9c, 0x16, 0xb5, 0xfa, 0x6f,
-	0x15, 0x90, 0xd5, 0x0f, 0x6f, 0x18, 0xf9, 0xce, 0xc3, 0xd5, 0xe5, 0xd0, 0xbb, 0x3b, 0x89, 0x1d,
-	0xb5, 0x9f, 0xaf, 0xa3, 0x36, 0x0c, 0x86, 0x25, 0x22, 0x76, 0x6f, 0xb2, 0x14, 0x8e, 0x13, 0x11,
-	0xb1, 0x60, 0xd5, 0xd2, 0x80, 0x17, 0x31, 0x57, 0x37, 0x8e, 0xf0, 0x44, 0xc4, 0x56, 0x81, 0x39,
-	0xab, 0x1e, 0xd3, 0x5a, 0x52, 0x16, 0x90, 0x0f, 0xc7, 0x79, 0x3f, 0x1b, 0x95, 0x99, 0xea, 0x56,
+	0x93, 0x2c, 0x2f, 0x52, 0x38, 0xe5, 0x57, 0xda, 0x17, 0x36, 0xfd, 0x15, 0xa8, 0xf3, 0x39, 0x3a,
+	0x81, 0x9a, 0xd7, 0xf5, 0x02, 0x4a, 0xac, 0xee, 0x35, 0xa1, 0xb8, 0xe3, 0x92, 0xfa, 0x0e, 0xaa,
+	0x41, 0xf5, 0xee, 0x82, 0xa2, 0xdb, 0x70, 0x28, 0x11, 0xb6, 0x08, 0xa7, 0x13, 0x96, 0xe4, 0xe8,
+	0x1c, 0xf6, 0x65, 0xac, 0xf2, 0x9a, 0xd5, 0xf6, 0xd9, 0x7f, 0x0f, 0x4e, 0x8b, 0x5a, 0xfd, 0xb7,
+	0x0a, 0xc8, 0xea, 0x87, 0x37, 0x8c, 0x7c, 0xe7, 0xe1, 0xea, 0x70, 0xe8, 0xe2, 0x4e, 0x62, 0x47,
+	0xed, 0xe7, 0xeb, 0xa8, 0x0d, 0x83, 0x61, 0x89, 0x88, 0xdd, 0x9b, 0x2c, 0x85, 0xe3, 0x44, 0x44,
+	0x2c, 0x58, 0x3d, 0x69, 0xc0, 0x8b, 0x98, 0xab, 0x1b, 0x5b, 0x78, 0x22, 0x62, 0xab, 0xc0, 0x9c,
+	0xd5, 0x1b, 0xd3, 0x5a, 0x52, 0x16, 0x90, 0x0f, 0xc7, 0x79, 0x3f, 0x1b, 0x95, 0x99, 0xea, 0x56,
 	0xa6, 0xdf, 0xcf, 0x46, 0x5b, 0x98, 0x1f, 0x76, 0x68, 0x2d, 0x2f, 0x4b, 0xe8, 0x1b, 0x3c, 0x9e,
 	0x89, 0x74, 0x34, 0x1c, 0x8b, 0x59, 0x99, 0xbc, 0x2f, 0xc9, 0x2f, 0xd7, 0xc8, 0x5f, 0x16, 0xb5,
 	0xdb, 0xe9, 0x27, 0xb3, 0x4d, 0x59, 0xff, 0xa5, 0x80, 0x3a, 0x0f, 0x0d, 0x3d, 0x82, 0x03, 0xc7,
@@ -410,10 +389,9 @@ var fileDescriptor_c2a49b99f342b879 = []byte{
 	0xda, 0xd8, 0xc7, 0x1d, 0xdc, 0x23, 0xc1, 0xd5, 0x27, 0x1b, 0xfb, 0x24, 0xb8, 0xc4, 0x8e, 0x4b,
 	0xec, 0xfa, 0xee, 0x5c, 0xc3, 0xd4, 0x77, 0x2e, 0xb1, 0xe5, 0x07, 0x36, 0x71, 0xc9, 0x3f, 0x6d,
 	0x6f, 0x1b, 0x95, 0x12, 0x97, 0xe0, 0x1e, 0xb1, 0xeb, 0x6a, 0xe7, 0x00, 0x2a, 0x99, 0x98, 0xa6,
-	0x21, 0xd3, 0x7b, 0x70, 0xba, 0xd9, 0x5b, 0x97, 0x67, 0x39, 0x7a, 0x0b, 0x95, 0x62, 0x66, 0x35,
-	0xa5, 0xb9, 0xd7, 0xaa, 0xb6, 0x9f, 0xdd, 0xfb, 0x49, 0xd0, 0x85, 0xa1, 0x73, 0xf1, 0xf5, 0x4d,
-	0xcc, 0xf3, 0x9b, 0xe9, 0xc0, 0x08, 0xc5, 0xc4, 0x94, 0x36, 0x91, 0xc6, 0xe6, 0x6a, 0x8c, 0x63,
-	0x96, 0x98, 0xb7, 0x83, 0xd7, 0xb1, 0x30, 0x4b, 0x93, 0x3d, 0xa8, 0xc8, 0x79, 0x3e, 0xff, 0x1b,
-	0x00, 0x00, 0xff, 0xff, 0x2c, 0xe9, 0x29, 0x58, 0x3b, 0x04, 0x00, 0x00,
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+	0x21, 0xd3, 0x7b, 0x70, 0xba, 0xf9, 0xb6, 0x2e, 0xcf, 0x72, 0xf4, 0x16, 0x2a, 0x45, 0xcf, 0x6a,
+	0x4a, 0x73, 0xaf, 0x55, 0x6d, 0x3f, 0xbb, 0xf7, 0x97, 0xa0, 0x0b, 0x43, 0xe7, 0xdd, 0xd7, 0x8b,
+	0x98, 0xe7, 0x37, 0xd3, 0x81, 0x11, 0x8a, 0x89, 0x29, 0x6d, 0x22, 0x8d, 0x8b, 0x81, 0xb9, 0x6a,
+	0xe6, 0x98, 0x25, 0xe6, 0xed, 0xe0, 0x75, 0x2c, 0xcc, 0x52, 0x7f, 0x0f, 0x2a, 0xb2, 0xab, 0xcf,
+	0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x97, 0xe9, 0x55, 0xa9, 0x41, 0x04, 0x00, 0x00,
 }
diff --git a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go
deleted file mode 100644
index 376ac3e429..0000000000
--- a/flyteidl/gen/pb-go/flyteidl/core/errors.pb.validate.go
+++ /dev/null
@@ -1,376 +0,0 @@
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: flyteidl/core/errors.proto
-
-package core
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"github.com/golang/protobuf/ptypes"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = ptypes.DynamicAny{}
-)
-
-// define the regex for a UUID once up-front
-var _errors_uuidPattern = regexp.MustCompile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
-
-// Validate checks the field values on ContainerError with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *ContainerError) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Code
-
-	// no validation rules for Message
-
-	// no validation rules for Kind
-
-	// no validation rules for Origin
-
-	return nil
-}
-
-// ContainerErrorValidationError is the validation error returned by
-// ContainerError.Validate if the designated constraints aren't met.
-type ContainerErrorValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ContainerErrorValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ContainerErrorValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ContainerErrorValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ContainerErrorValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ContainerErrorValidationError) ErrorName() string { return "ContainerErrorValidationError" }
-
-// Error satisfies the builtin error interface
-func (e ContainerErrorValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sContainerError.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ContainerErrorValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ContainerErrorValidationError{}
-
-// Validate checks the field values on ErrorDocument with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *ErrorDocument) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetError()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ErrorDocumentValidationError{
-				field:  "Error",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// ErrorDocumentValidationError is the validation error returned by
-// ErrorDocument.Validate if the designated constraints aren't met.
-type ErrorDocumentValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ErrorDocumentValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ErrorDocumentValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ErrorDocumentValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ErrorDocumentValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ErrorDocumentValidationError) ErrorName() string { return "ErrorDocumentValidationError" }
-
-// Error satisfies the builtin error interface
-func (e ErrorDocumentValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sErrorDocument.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ErrorDocumentValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ErrorDocumentValidationError{}
-
-// Validate checks the field values on CacheEvictionError with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *CacheEvictionError) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Code
-
-	// no validation rules for Message
-
-	if v, ok := interface{}(m.GetNodeExecutionId()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return CacheEvictionErrorValidationError{
-				field:  "NodeExecutionId",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	switch m.Source.(type) {
-
-	case *CacheEvictionError_TaskExecutionId:
-
-		if v, ok := interface{}(m.GetTaskExecutionId()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return CacheEvictionErrorValidationError{
-					field:  "TaskExecutionId",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	case *CacheEvictionError_WorkflowExecutionId:
-
-		if v, ok := interface{}(m.GetWorkflowExecutionId()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return CacheEvictionErrorValidationError{
-					field:  "WorkflowExecutionId",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// CacheEvictionErrorValidationError is the validation error returned by
-// CacheEvictionError.Validate if the designated constraints aren't met.
-type CacheEvictionErrorValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e CacheEvictionErrorValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e CacheEvictionErrorValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e CacheEvictionErrorValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e CacheEvictionErrorValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e CacheEvictionErrorValidationError) ErrorName() string {
-	return "CacheEvictionErrorValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e CacheEvictionErrorValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sCacheEvictionError.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = CacheEvictionErrorValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = CacheEvictionErrorValidationError{}
-
-// Validate checks the field values on CacheEvictionErrorList with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *CacheEvictionErrorList) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetErrors() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return CacheEvictionErrorListValidationError{
-					field:  fmt.Sprintf("Errors[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// CacheEvictionErrorListValidationError is the validation error returned by
-// CacheEvictionErrorList.Validate if the designated constraints aren't met.
-type CacheEvictionErrorListValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e CacheEvictionErrorListValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e CacheEvictionErrorListValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e CacheEvictionErrorListValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e CacheEvictionErrorListValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e CacheEvictionErrorListValidationError) ErrorName() string {
-	return "CacheEvictionErrorListValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e CacheEvictionErrorListValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sCacheEvictionErrorList.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = CacheEvictionErrorListValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = CacheEvictionErrorListValidationError{}
diff --git a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go
index 1dde9fa0f4..f65a076205 100644
--- a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go
@@ -2556,230 +2556,121 @@ func init() {
 }
 
 var fileDescriptor_275951237ff4368a = []byte{
-<<<<<<< HEAD
-	// 1675 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4b, 0x6f, 0xdb, 0xc6,
-	0x13, 0x37, 0x25, 0x47, 0x32, 0x47, 0x96, 0x22, 0x6f, 0x6c, 0x47, 0x56, 0x12, 0x5b, 0x61, 0x02,
-	0xff, 0x8d, 0xfc, 0x1b, 0x29, 0xb5, 0x93, 0xa0, 0x49, 0x8b, 0xb6, 0xb2, 0xa5, 0xd8, 0xaa, 0xe3,
-	0x47, 0xe8, 0x07, 0xd0, 0x07, 0x20, 0xac, 0xcd, 0x35, 0xc3, 0x9a, 0x12, 0x19, 0x72, 0x9d, 0x5a,
-	0xa7, 0xa2, 0x97, 0x1e, 0xda, 0xde, 0x0a, 0xf4, 0x0b, 0xf4, 0x83, 0xf4, 0x98, 0x5b, 0xbf, 0x50,
-	0x2f, 0xc5, 0x92, 0xbb, 0x14, 0x49, 0x51, 0xb6, 0xe2, 0x43, 0x80, 0x5e, 0x08, 0xee, 0xee, 0xcc,
-	0x6f, 0xe7, 0xb1, 0xb3, 0x33, 0xb3, 0xb0, 0x78, 0x62, 0xf6, 0x28, 0x31, 0x34, 0xb3, 0xa6, 0x61,
-	0x8a, 0x8f, 0x31, 0xc5, 0xa6, 0xa5, 0x87, 0xff, 0xab, 0xb6, 0x63, 0x51, 0x0b, 0xe5, 0x42, 0x53,
-	0xe5, 0xdb, 0x01, 0xd3, 0xb1, 0xe5, 0x90, 0x9a, 0x69, 0x50, 0xe2, 0x60, 0xd3, 0xf5, 0x49, 0xcb,
-	0xf3, 0xba, 0x65, 0xe9, 0x26, 0xa9, 0x79, 0xa3, 0xa3, 0xb3, 0x93, 0x9a, 0x76, 0xe6, 0x60, 0x6a,
-	0x58, 0x5d, 0xbe, 0xbe, 0x10, 0x5f, 0xa7, 0x46, 0x87, 0xb8, 0x14, 0x77, 0x6c, 0x9f, 0x40, 0x79,
-	0x01, 0xd3, 0x6b, 0x0e, 0xc1, 0x94, 0x34, 0x30, 0xc5, 0x2e, 0xa1, 0x2a, 0x79, 0x73, 0x46, 0x5c,
-	0x8a, 0xaa, 0x90, 0xd5, 0xfc, 0x99, 0x92, 0x54, 0x91, 0x96, 0x72, 0xcb, 0xd3, 0xd5, 0xb0, 0xa0,
-	0x82, 0x5a, 0x10, 0x29, 0x37, 0x61, 0x26, 0x86, 0xe3, 0xda, 0x56, 0xd7, 0x25, 0x4a, 0x13, 0xa6,
-	0xd6, 0x09, 0x8d, 0xa1, 0x3f, 0x8a, 0xa3, 0xcf, 0x26, 0xa1, 0xb7, 0x1a, 0x7d, 0xfc, 0x06, 0xa0,
-	0x30, 0x8c, 0x0f, 0xfe, 0xde, 0x52, 0xfe, 0x21, 0x79, 0x30, 0x75, 0x87, 0x1a, 0x27, 0xf8, 0xf8,
-	0xea, 0xe2, 0xa0, 0xbb, 0x90, 0xc3, 0x1c, 0xa4, 0x6d, 0x68, 0xa5, 0x54, 0x45, 0x5a, 0x92, 0x37,
-	0xc6, 0x54, 0x10, 0x93, 0x2d, 0x0d, 0xdd, 0x82, 0x09, 0x8a, 0xf5, 0x76, 0x17, 0x77, 0x48, 0x29,
-	0xcd, 0xd7, 0xb3, 0x14, 0xeb, 0xdb, 0xb8, 0x43, 0x56, 0x0b, 0x30, 0xf9, 0xe6, 0x8c, 0x38, 0xbd,
-	0xf6, 0x6b, 0xdc, 0xd5, 0x4c, 0xa2, 0x6c, 0xc0, 0x8d, 0x88, 0x5c, 0x5c, 0xbf, 0x8f, 0x61, 0x42,
-	0x20, 0x72, 0xc9, 0x66, 0x22, 0x92, 0x05, 0x0c, 0x01, 0x99, 0xf2, 0x95, 0x70, 0x44, 0x5c, 0xc9,
-	0x2b, 0x60, 0x95, 0x60, 0x36, 0x8e, 0xc5, 0xbd, 0xba, 0x02, 0xf9, 0xba, 0xa6, 0xed, 0x63, 0x5d,
-	0xa0, 0x2b, 0x90, 0xa6, 0x58, 0xe7, 0xc0, 0xc5, 0x08, 0x30, 0xa3, 0x62, 0x8b, 0x4a, 0x11, 0x0a,
-	0x82, 0x89, 0xc3, 0xfc, 0x25, 0xc1, 0xf4, 0x4b, 0xc3, 0x0d, 0x14, 0x77, 0xaf, 0xee, 0x91, 0x27,
-	0x90, 0x39, 0x31, 0x4c, 0x4a, 0x1c, 0xcf, 0x19, 0xb9, 0xe5, 0x3b, 0x11, 0x86, 0x17, 0xde, 0x52,
-	0xf3, 0xdc, 0x76, 0x88, 0xeb, 0x1a, 0x56, 0x57, 0xe5, 0xc4, 0xe8, 0x73, 0x00, 0x1b, 0xeb, 0x46,
-	0xd7, 0x0b, 0x1a, 0xcf, 0x4f, 0xb9, 0xe5, 0xf9, 0x08, 0xeb, 0x6e, 0xb0, 0xbc, 0x63, 0xb3, 0xaf,
-	0xab, 0x86, 0x38, 0x94, 0x53, 0x98, 0x89, 0x29, 0xc0, 0x5d, 0xb7, 0x02, 0xb2, 0xb0, 0xa3, 0x5b,
-	0x92, 0x2a, 0xe9, 0xe1, 0xf6, 0xee, 0xd3, 0xa1, 0x3b, 0x00, 0x5d, 0x72, 0x4e, 0xdb, 0xd4, 0x3a,
-	0x25, 0x5d, 0xff, 0x54, 0xa9, 0x32, 0x9b, 0xd9, 0x67, 0x13, 0xca, 0x6f, 0x12, 0xdc, 0x60, 0xbb,
-	0x71, 0xf5, 0x03, 0x6b, 0xf5, 0x75, 0x97, 0xae, 0xae, 0x7b, 0xea, 0xbd, 0x75, 0xd7, 0x7d, 0xe7,
-	0xf5, 0xa5, 0xe1, 0xaa, 0x3f, 0x82, 0x09, 0xee, 0x15, 0xa1, 0x79, 0x72, 0x58, 0x06, 0x54, 0x97,
-	0xe9, 0xfd, 0x8f, 0x04, 0x33, 0x07, 0xb6, 0x96, 0x70, 0xa8, 0x3f, 0x78, 0xe4, 0xa2, 0x87, 0x30,
-	0xce, 0xa0, 0x4a, 0xe3, 0x9e, 0x62, 0x73, 0x89, 0x2e, 0x65, 0xdb, 0xaa, 0x1e, 0x19, 0x8b, 0xba,
-	0x0e, 0xa1, 0xd8, 0x63, 0xb9, 0x96, 0x10, 0x75, 0x5b, 0x7c, 0x51, 0x0d, 0xc8, 0x06, 0xee, 0x86,
-	0x67, 0x30, 0x1b, 0x57, 0x9e, 0x1b, 0x7a, 0x21, 0xaa, 0x8b, 0xe4, 0xd9, 0x2d, 0xa4, 0x89, 0x82,
-	0x21, 0xaf, 0x12, 0x97, 0x38, 0x6f, 0x3d, 0x87, 0xb5, 0x1a, 0xe8, 0x09, 0x00, 0x37, 0x84, 0x60,
-	0x18, 0x6e, 0x32, 0x99, 0x53, 0xb6, 0x34, 0x34, 0x17, 0xb2, 0x88, 0xef, 0x1d, 0x61, 0x0f, 0xe5,
-	0x9d, 0x04, 0x77, 0xd6, 0x09, 0xdd, 0x71, 0x9a, 0xe7, 0x94, 0x74, 0xb5, 0xd0, 0x76, 0xc2, 0x47,
-	0x75, 0x28, 0x38, 0xfd, 0xd9, 0xfe, 0xbe, 0xe5, 0xc8, 0xbe, 0x11, 0x39, 0xd5, 0x7c, 0x88, 0xc3,
-	0xdf, 0xdf, 0xfa, 0xa1, 0x4b, 0x9c, 0xc0, 0x63, 0x6a, 0xd6, 0x1b, 0xb7, 0x34, 0xb4, 0x01, 0xe8,
-	0x35, 0xc1, 0x0e, 0x3d, 0x22, 0x98, 0xb6, 0x8d, 0x2e, 0x65, 0x5c, 0x26, 0x0f, 0xe4, 0xb9, 0xaa,
-	0x9f, 0xfe, 0xaa, 0x22, 0xfd, 0x55, 0x1b, 0x3c, 0x3d, 0xaa, 0x53, 0x01, 0x53, 0x8b, 0xf3, 0x28,
-	0x7f, 0xa6, 0x20, 0x17, 0x92, 0xe2, 0xbf, 0x22, 0x37, 0x7a, 0x06, 0x40, 0xce, 0x6d, 0xc3, 0x21,
-	0x6e, 0x1b, 0xd3, 0xd2, 0x38, 0x97, 0x31, 0x8e, 0xb0, 0x2f, 0x12, 0xbf, 0x2a, 0x73, 0xea, 0x3a,
-	0x8d, 0x9c, 0xce, 0xcc, 0x48, 0xa7, 0x53, 0xf9, 0x0e, 0xe6, 0x87, 0xb9, 0x9b, 0x9f, 0xca, 0xe7,
-	0x90, 0x0b, 0x59, 0x81, 0x1b, 0xad, 0x34, 0xcc, 0x68, 0x6a, 0x98, 0x58, 0xe9, 0xc1, 0x9c, 0x4a,
-	0x4c, 0x82, 0x5d, 0xf2, 0xa1, 0x0f, 0x92, 0x72, 0x1b, 0xca, 0x49, 0x5b, 0xf3, 0x4c, 0xf5, 0x8b,
-	0x04, 0x59, 0x1e, 0x1a, 0x68, 0x11, 0x52, 0x97, 0x06, 0x4f, 0xca, 0xd0, 0x22, 0xd6, 0x4d, 0x8d,
-	0x64, 0x5d, 0x74, 0x1f, 0xf2, 0x36, 0x8b, 0x5f, 0xb6, 0xf7, 0x26, 0xe9, 0xb9, 0xa5, 0x74, 0x25,
-	0xbd, 0x24, 0xab, 0xd1, 0x49, 0x65, 0x05, 0xe4, 0x5d, 0x31, 0x81, 0x8a, 0x90, 0x3e, 0x25, 0x3d,
-	0x1e, 0xfc, 0xec, 0x17, 0x4d, 0xc3, 0xb5, 0xb7, 0xd8, 0x3c, 0x13, 0xa1, 0xea, 0x0f, 0x94, 0x1f,
-	0x41, 0x0e, 0xc4, 0x43, 0x25, 0xc8, 0xda, 0x8e, 0xf5, 0x3d, 0xe1, 0xb5, 0x80, 0xac, 0x8a, 0x21,
-	0x42, 0x30, 0x1e, 0x0a, 0x73, 0xef, 0x1f, 0xcd, 0x42, 0x46, 0xb3, 0x3a, 0xd8, 0xf0, 0x13, 0xa4,
-	0xac, 0xf2, 0x11, 0x43, 0x79, 0x4b, 0x1c, 0x96, 0x53, 0xbc, 0x63, 0x27, 0xab, 0x62, 0xc8, 0x50,
-	0x0e, 0x0e, 0x5a, 0x0d, 0xef, 0xca, 0x93, 0x55, 0xef, 0x5f, 0x79, 0x97, 0x82, 0x09, 0x71, 0x85,
-	0xa1, 0x42, 0x60, 0x43, 0xd9, 0xb3, 0x55, 0xe8, 0x22, 0x4f, 0x8d, 0x76, 0x91, 0x8b, 0x8b, 0x38,
-	0xfd, 0xfe, 0x17, 0xf1, 0xf8, 0x68, 0xce, 0x78, 0xca, 0xf2, 0x23, 0x37, 0xb3, 0x5b, 0xba, 0xe6,
-	0xed, 0x33, 0x1b, 0xcb, 0x8f, 0x7c, 0x59, 0x0d, 0x51, 0xa2, 0xfb, 0x30, 0x4e, 0xb1, 0xee, 0x96,
-	0x32, 0x1e, 0xc7, 0x60, 0x31, 0xe4, 0xad, 0xb2, 0xb0, 0x3d, 0xf6, 0x8a, 0x2b, 0x8d, 0x85, 0x6d,
-	0xf6, 0xf2, 0xb0, 0xe5, 0xd4, 0x75, 0xaa, 0xec, 0xc2, 0x64, 0x58, 0xc3, 0xc0, 0x67, 0x52, 0xc8,
-	0x67, 0x1f, 0x85, 0x0f, 0x01, 0x93, 0x5b, 0xf4, 0x11, 0x55, 0xd6, 0x47, 0x54, 0x5f, 0xfa, 0x7d,
-	0x84, 0x38, 0x1c, 0x26, 0xa4, 0xf7, 0xb1, 0x9e, 0x08, 0xb4, 0x90, 0x90, 0x30, 0x23, 0xe9, 0x32,
-	0xe4, 0xba, 0xf4, 0x68, 0xc5, 0xfc, 0x4f, 0x12, 0x4c, 0x08, 0x7b, 0xa3, 0xe7, 0x90, 0x3d, 0x25,
-	0xbd, 0x76, 0x07, 0xdb, 0xbc, 0x58, 0xb8, 0x9b, 0xe8, 0x97, 0xea, 0x26, 0xe9, 0x6d, 0x61, 0xbb,
-	0xd9, 0xa5, 0x4e, 0x4f, 0xcd, 0x9c, 0x7a, 0x83, 0xf2, 0x33, 0xc8, 0x85, 0xa6, 0x47, 0x0d, 0x85,
-	0xe7, 0xa9, 0x4f, 0x24, 0x65, 0x07, 0x8a, 0xf1, 0xc2, 0x08, 0x7d, 0x0a, 0x59, 0xbf, 0x34, 0x72,
-	0x13, 0x45, 0xd9, 0x33, 0xba, 0xba, 0x49, 0x76, 0x1d, 0xcb, 0x26, 0x0e, 0xed, 0xf9, 0xdc, 0xaa,
-	0xe0, 0x50, 0xfe, 0x4e, 0xc3, 0x74, 0x12, 0x05, 0xfa, 0x02, 0x80, 0x25, 0xcf, 0x48, 0x85, 0x36,
-	0x1f, 0x3f, 0x14, 0x51, 0x9e, 0x8d, 0x31, 0x55, 0xa6, 0x58, 0xe7, 0x00, 0xaf, 0xa0, 0x18, 0x9c,
-	0xae, 0x76, 0xa4, 0xc8, 0xbd, 0x9f, 0x7c, 0x1a, 0x07, 0xc0, 0xae, 0x07, 0xfc, 0x1c, 0x72, 0x1b,
-	0xae, 0x07, 0x4e, 0xe5, 0x88, 0xbe, 0xef, 0xee, 0x25, 0xc6, 0xd1, 0x00, 0x60, 0x41, 0x70, 0x73,
-	0xbc, 0x4d, 0x28, 0x88, 0xba, 0x82, 0xc3, 0xf9, 0x31, 0xa6, 0x24, 0x1d, 0x85, 0x01, 0xb4, 0x3c,
-	0xe7, 0xe5, 0x60, 0xbb, 0x30, 0xc1, 0x08, 0x30, 0xb5, 0x9c, 0x12, 0x54, 0xa4, 0xa5, 0xc2, 0xf2,
-	0xe3, 0x4b, 0xfd, 0x50, 0x5d, 0xb3, 0x3a, 0x36, 0x76, 0x0c, 0x97, 0x95, 0xaa, 0x3e, 0xaf, 0x1a,
-	0xa0, 0x28, 0x15, 0x40, 0x83, 0xeb, 0x08, 0x20, 0xd3, 0x7c, 0x75, 0x50, 0x7f, 0xb9, 0x57, 0x1c,
-	0x5b, 0x9d, 0x82, 0xeb, 0x36, 0x07, 0xe4, 0x1a, 0x28, 0xeb, 0x30, 0x9b, 0xac, 0x7f, 0xbc, 0x86,
-	0x94, 0x06, 0x6b, 0xc8, 0x55, 0x80, 0x09, 0x81, 0xa7, 0x7c, 0x06, 0x53, 0x03, 0x1e, 0x8e, 0x14,
-	0x99, 0x52, 0xbc, 0x3d, 0x0c, 0x73, 0x7f, 0x0b, 0x37, 0x87, 0x38, 0x16, 0x3d, 0xf6, 0x43, 0x87,
-	0x15, 0x0e, 0x12, 0x2f, 0x1c, 0xc2, 0x76, 0xda, 0x24, 0xbd, 0x43, 0x76, 0xde, 0x77, 0xb1, 0xc1,
-	0xac, 0xcc, 0x82, 0xe6, 0x10, 0x9b, 0x11, 0xf0, 0xa7, 0x30, 0x19, 0xa6, 0x1a, 0x39, 0x99, 0xfc,
-	0x2a, 0xc1, 0x4c, 0xa2, 0x37, 0x51, 0x39, 0x96, 0x59, 0x98, 0x5a, 0x22, 0xb7, 0x4c, 0x87, 0x73,
-	0xcb, 0xc6, 0x18, 0xbf, 0x60, 0x4a, 0xd1, 0xec, 0xc2, 0x24, 0xe5, 0xf9, 0xa5, 0x1c, 0xcb, 0x2f,
-	0x0c, 0x8b, 0x4f, 0x44, 0xb4, 0xf8, 0x3d, 0x05, 0x53, 0x03, 0xad, 0x0a, 0x93, 0xdc, 0x34, 0x3a,
-	0x86, 0x2f, 0x47, 0x5e, 0xf5, 0x07, 0x6c, 0x36, 0xdc, 0x65, 0xf8, 0x03, 0xf4, 0x25, 0x64, 0x5d,
-	0xcb, 0xa1, 0x9b, 0xa4, 0xe7, 0x09, 0x51, 0x58, 0x5e, 0xbc, 0xb8, 0x0f, 0xaa, 0xee, 0xf9, 0xd4,
-	0xaa, 0x60, 0x43, 0x2f, 0x40, 0x66, 0xbf, 0x3b, 0x8e, 0xc6, 0x0f, 0x7f, 0x61, 0x79, 0x69, 0x04,
-	0x0c, 0x8f, 0x5e, 0xed, 0xb3, 0x2a, 0x0f, 0x40, 0x0e, 0xe6, 0x51, 0x01, 0xa0, 0xd1, 0xdc, 0x5b,
-	0x6b, 0x6e, 0x37, 0x5a, 0xdb, 0xeb, 0xc5, 0x31, 0x94, 0x07, 0xb9, 0x1e, 0x0c, 0x25, 0xe5, 0x36,
-	0x64, 0xb9, 0x1c, 0x68, 0x0a, 0xf2, 0x6b, 0x6a, 0xb3, 0xbe, 0xdf, 0xda, 0xd9, 0x6e, 0xef, 0xb7,
-	0xb6, 0x9a, 0xc5, 0xb1, 0xe5, 0x9f, 0xb3, 0x90, 0x63, 0x3e, 0x5a, 0xf3, 0x05, 0x40, 0x87, 0x90,
-	0x8f, 0x3c, 0xd1, 0xa0, 0xe8, 0xed, 0x96, 0xf4, 0x0c, 0x54, 0x56, 0x2e, 0x22, 0xe1, 0xf5, 0xde,
-	0x16, 0x40, 0xff, 0x69, 0x06, 0x45, 0x6f, 0xb6, 0x81, 0xa7, 0x9f, 0xf2, 0xc2, 0xd0, 0x75, 0x0e,
-	0xf7, 0x35, 0x14, 0xa2, 0x8f, 0x0e, 0x28, 0x49, 0x88, 0x58, 0x23, 0x58, 0xbe, 0x77, 0x21, 0x0d,
-	0x87, 0xde, 0x85, 0x5c, 0xe8, 0x95, 0x05, 0x0d, 0x88, 0x12, 0x07, 0xad, 0x0c, 0x27, 0xe0, 0x88,
-	0x75, 0xc8, 0xf8, 0x4f, 0x1a, 0x28, 0x5a, 0x84, 0x46, 0x1e, 0x47, 0xca, 0xb7, 0x12, 0xd7, 0x38,
-	0xc4, 0x21, 0xe4, 0x23, 0x2f, 0x08, 0x31, 0xb7, 0x24, 0x3d, 0x8f, 0xc4, 0xdc, 0x92, 0xfc, 0x00,
-	0xb1, 0x07, 0x93, 0xe1, 0xee, 0x1c, 0x55, 0x06, 0x78, 0x62, 0xcf, 0x08, 0xe5, 0xbb, 0x17, 0x50,
-	0xf4, 0x9d, 0x13, 0xed, 0x45, 0x63, 0xce, 0x49, 0xec, 0xd2, 0x63, 0xce, 0x19, 0xd2, 0xcc, 0xbe,
-	0x81, 0xd9, 0xe4, 0xc6, 0x02, 0x3d, 0x88, 0xbb, 0x61, 0x78, 0xb3, 0x59, 0xfe, 0xff, 0x48, 0xb4,
-	0x7c, 0x4b, 0x02, 0x68, 0xb0, 0xe4, 0x47, 0x8b, 0xb1, 0x76, 0x62, 0x48, 0x3b, 0x52, 0xfe, 0xdf,
-	0xa5, 0x74, 0xfe, 0x36, 0xab, 0x6b, 0xdf, 0xd4, 0x75, 0x83, 0xbe, 0x3e, 0x3b, 0xaa, 0x1e, 0x5b,
-	0x9d, 0x9a, 0x57, 0x87, 0x59, 0x8e, 0xee, 0xff, 0xd4, 0x82, 0xe7, 0x5d, 0x9d, 0x74, 0x6b, 0xf6,
-	0xd1, 0x43, 0xdd, 0xaa, 0x25, 0x3d, 0x13, 0x1f, 0x65, 0xbc, 0x92, 0x70, 0xe5, 0xdf, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x62, 0x68, 0x58, 0x86, 0x45, 0x16, 0x00, 0x00,
-=======
-	// 1812 bytes of a gzipped FileDescriptorProto
+	// 1817 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
 	0x15, 0x37, 0x25, 0x47, 0x32, 0x9f, 0x2c, 0x59, 0x9e, 0xd8, 0x8a, 0xac, 0x4d, 0x6c, 0x85, 0x1b,
-	0xa4, 0xc6, 0x76, 0x57, 0xda, 0xda, 0xbb, 0x8b, 0x26, 0xbb, 0x6d, 0x57, 0xb6, 0x14, 0x5b, 0xeb,
-	0xf8, 0x63, 0xe9, 0x0f, 0x60, 0x93, 0x02, 0xc2, 0xd8, 0x1c, 0xd3, 0xac, 0x29, 0x91, 0x21, 0xc7,
-	0xa9, 0x75, 0x2a, 0x7a, 0x6d, 0x7b, 0x2b, 0x50, 0xa0, 0x87, 0x9e, 0xfa, 0x87, 0xf4, 0x98, 0x9e,
-	0xfa, 0x37, 0x15, 0x43, 0x0e, 0x29, 0x0e, 0x49, 0xd9, 0xb2, 0x0f, 0x41, 0x7b, 0x11, 0x38, 0x33,
-	0xef, 0xfd, 0xe6, 0xbd, 0xf7, 0x9b, 0x8f, 0x37, 0x4f, 0xf0, 0xfc, 0xdc, 0x1c, 0x52, 0x62, 0x68,
-	0x66, 0x53, 0xc3, 0x14, 0x9f, 0x61, 0x8a, 0x4d, 0x4b, 0x8f, 0x7e, 0x37, 0x6c, 0xc7, 0xa2, 0x16,
-	0x2a, 0x44, 0xba, 0x6a, 0x8f, 0x43, 0xa5, 0x33, 0xcb, 0x21, 0x4d, 0xd3, 0xa0, 0xc4, 0xc1, 0xa6,
-	0xeb, 0x8b, 0xd6, 0x96, 0x75, 0xcb, 0xd2, 0x4d, 0xd2, 0xf4, 0x5a, 0xa7, 0x57, 0xe7, 0x4d, 0xed,
-	0xca, 0xc1, 0xd4, 0xb0, 0x06, 0x7c, 0x7c, 0x25, 0x3e, 0x4e, 0x8d, 0x3e, 0x71, 0x29, 0xee, 0xdb,
-	0xbe, 0x80, 0xf2, 0x0a, 0x16, 0x36, 0x1d, 0x82, 0x29, 0x69, 0x63, 0x8a, 0x5d, 0x42, 0x55, 0xf2,
-	0xee, 0x8a, 0xb8, 0x14, 0x35, 0x20, 0xaf, 0xf9, 0x3d, 0x55, 0xa9, 0x2e, 0xad, 0x16, 0xd6, 0x16,
-	0x1a, 0x51, 0x43, 0x03, 0xe9, 0x40, 0x48, 0x79, 0x04, 0x8b, 0x31, 0x1c, 0xd7, 0xb6, 0x06, 0x2e,
-	0x51, 0x3a, 0x30, 0xbf, 0x45, 0x68, 0x0c, 0xfd, 0xcb, 0x38, 0x7a, 0x25, 0x0d, 0xbd, 0xdb, 0x1e,
-	0xe1, 0xb7, 0x01, 0x45, 0x61, 0x7c, 0xf0, 0x3b, 0x5b, 0xf9, 0x37, 0xc9, 0x83, 0x69, 0x39, 0xd4,
-	0x38, 0xc7, 0x67, 0xf7, 0x37, 0x07, 0x3d, 0x85, 0x02, 0xe6, 0x20, 0x3d, 0x43, 0xab, 0x66, 0xea,
-	0xd2, 0xaa, 0xbc, 0x3d, 0xa5, 0x42, 0xd0, 0xd9, 0xd5, 0xd0, 0x27, 0x30, 0x43, 0xb1, 0xde, 0x1b,
-	0xe0, 0x3e, 0xa9, 0x66, 0xf9, 0x78, 0x9e, 0x62, 0x7d, 0x0f, 0xf7, 0xc9, 0x46, 0x09, 0x66, 0xdf,
-	0x5d, 0x11, 0x67, 0xd8, 0xbb, 0xc0, 0x03, 0xcd, 0x24, 0xca, 0x36, 0x3c, 0x14, 0xec, 0xe2, 0xfe,
-	0xfd, 0x02, 0x66, 0x02, 0x44, 0x6e, 0xd9, 0xa2, 0x60, 0x59, 0xa8, 0x10, 0x8a, 0x29, 0x3f, 0x04,
-	0x44, 0xc4, 0x9d, 0xbc, 0x07, 0x56, 0x15, 0x2a, 0x71, 0x2c, 0xce, 0xea, 0x3a, 0x14, 0x5b, 0x9a,
-	0x76, 0x84, 0xf5, 0x00, 0x5d, 0x81, 0x2c, 0xc5, 0x3a, 0x07, 0x2e, 0x0b, 0xc0, 0x4c, 0x8a, 0x0d,
-	0x2a, 0x65, 0x28, 0x05, 0x4a, 0x1c, 0xe6, 0x5f, 0x12, 0x2c, 0xbc, 0x36, 0xdc, 0xd0, 0x71, 0xf7,
-	0xfe, 0x8c, 0x7c, 0x0d, 0xb9, 0x73, 0xc3, 0xa4, 0xc4, 0xf1, 0xc8, 0x28, 0xac, 0x3d, 0x11, 0x14,
-	0x5e, 0x79, 0x43, 0x9d, 0x6b, 0xdb, 0x21, 0xae, 0x6b, 0x58, 0x03, 0x95, 0x0b, 0xa3, 0x5f, 0x03,
-	0xd8, 0x58, 0x37, 0x06, 0xde, 0xa6, 0xf1, 0x78, 0x2a, 0xac, 0x2d, 0x0b, 0xaa, 0x07, 0xe1, 0xf0,
-	0xbe, 0xcd, 0x7e, 0x5d, 0x35, 0xa2, 0xa1, 0x5c, 0xc2, 0x62, 0xcc, 0x01, 0x4e, 0xdd, 0x3a, 0xc8,
-	0x41, 0x1c, 0xdd, 0xaa, 0x54, 0xcf, 0x8e, 0x8f, 0xf7, 0x48, 0x0e, 0x3d, 0x01, 0x18, 0x90, 0x6b,
-	0xda, 0xa3, 0xd6, 0x25, 0x19, 0xf8, 0xab, 0x4a, 0x95, 0x59, 0xcf, 0x11, 0xeb, 0x50, 0xfe, 0x22,
-	0xc1, 0x43, 0x36, 0x1b, 0x77, 0x3f, 0x8c, 0xd6, 0xc8, 0x77, 0xe9, 0xfe, 0xbe, 0x67, 0xee, 0xec,
-	0xbb, 0xee, 0x93, 0x37, 0xb2, 0x86, 0xbb, 0xfe, 0x25, 0xcc, 0x70, 0x56, 0x02, 0xcf, 0xd3, 0xb7,
-	0x65, 0x28, 0x75, 0x9b, 0xdf, 0xff, 0x96, 0x60, 0xf1, 0xd8, 0xd6, 0x52, 0x16, 0xf5, 0x47, 0xdf,
-	0xb9, 0xe8, 0x0b, 0x98, 0x66, 0x50, 0xd5, 0x69, 0xcf, 0xb1, 0xa5, 0x54, 0x4a, 0xd9, 0xb4, 0xaa,
-	0x27, 0x96, 0xd8, 0xe8, 0x2f, 0xa0, 0x12, 0xf7, 0x84, 0x47, 0x6d, 0x45, 0x34, 0x4c, 0xf2, 0x82,
-	0x10, 0x31, 0x4b, 0xf9, 0xbb, 0x04, 0x8b, 0x6d, 0x62, 0x92, 0xff, 0x81, 0x28, 0x24, 0xdc, 0x7a,
-	0x03, 0x15, 0xd1, 0xb4, 0x70, 0x6d, 0x7e, 0x9f, 0xdc, 0x07, 0x8a, 0x68, 0x5d, 0x9a, 0x4b, 0x91,
-	0x4d, 0xc1, 0x4e, 0xa1, 0xb8, 0x0c, 0x3f, 0x3e, 0x30, 0x14, 0x55, 0xe2, 0x12, 0xe7, 0xbd, 0xb7,
-	0x1e, 0xbb, 0x6d, 0xf4, 0x35, 0x00, 0xf7, 0x30, 0x08, 0xe1, 0xf8, 0x58, 0xc8, 0x5c, 0xb2, 0xab,
-	0xa1, 0xa5, 0x88, 0xab, 0xfe, 0xe2, 0x0b, 0x1c, 0x55, 0x3e, 0x48, 0xf0, 0x64, 0x8b, 0xd0, 0x7d,
-	0xa7, 0x73, 0x4d, 0xc9, 0x40, 0x8b, 0x4c, 0x17, 0x38, 0xd8, 0x82, 0x92, 0x33, 0xea, 0x1d, 0xcd,
-	0x5b, 0x13, 0xe6, 0x15, 0xec, 0x54, 0x8b, 0x11, 0x0d, 0x7f, 0x7e, 0xeb, 0xf7, 0x03, 0xe2, 0x84,
-	0x54, 0xa8, 0x79, 0xaf, 0xdd, 0xd5, 0xd0, 0x36, 0xa0, 0x0b, 0x82, 0x1d, 0x7a, 0x4a, 0x30, 0xed,
-	0x19, 0x03, 0xca, 0xb4, 0x4c, 0x7e, 0x4e, 0x2d, 0x35, 0xfc, 0xdb, 0xbd, 0x11, 0xdc, 0xee, 0x8d,
-	0x36, 0xbf, 0xfd, 0xd5, 0xf9, 0x50, 0xa9, 0xcb, 0x75, 0x14, 0x1b, 0x96, 0xd3, 0x1d, 0x09, 0xa9,
-	0xda, 0x83, 0xd9, 0x88, 0x5d, 0x01, 0x5b, 0x9f, 0x09, 0x7e, 0xdc, 0x18, 0x0b, 0x55, 0xd0, 0x57,
-	0xfe, 0x99, 0x81, 0x42, 0x44, 0xe8, 0xff, 0x25, 0x52, 0xe8, 0x05, 0x00, 0xb9, 0xb6, 0x0d, 0x87,
-	0xb8, 0x3d, 0x4c, 0xab, 0xd3, 0xdc, 0xc6, 0x38, 0xc2, 0x51, 0x90, 0x49, 0xa9, 0x32, 0x97, 0x6e,
-	0x79, 0x97, 0x6c, 0x9f, 0x50, 0xec, 0x9d, 0x10, 0xb9, 0x94, 0x4b, 0x76, 0x97, 0x0f, 0xaa, 0xa1,
-	0x98, 0xf2, 0xdb, 0x71, 0xbc, 0x84, 0x27, 0xc3, 0x4b, 0x28, 0x44, 0xa2, 0xc0, 0x83, 0x56, 0x1d,
-	0x17, 0x34, 0x35, 0x2a, 0xac, 0xf4, 0x60, 0x65, 0x2c, 0xeb, 0x1c, 0xfe, 0xbb, 0x54, 0xda, 0xc7,
-	0xe3, 0x8b, 0x24, 0x0f, 0x61, 0x49, 0x25, 0x26, 0xc1, 0x2e, 0xf9, 0xd8, 0x7b, 0x43, 0xb9, 0x80,
-	0x5a, 0x72, 0xea, 0x70, 0x35, 0xff, 0x90, 0xea, 0xd6, 0xf3, 0xd8, 0xcc, 0x63, 0x2c, 0x8f, 0x39,
-	0xf9, 0x38, 0x6d, 0xa6, 0xf0, 0x18, 0xfa, 0x93, 0x04, 0x79, 0x7e, 0xae, 0xa0, 0xe7, 0x90, 0xb9,
-	0xf5, 0xe4, 0xc9, 0x18, 0x9a, 0xb0, 0x50, 0x32, 0x13, 0x2d, 0x14, 0xf4, 0x0c, 0x8a, 0x36, 0x3b,
-	0x15, 0xd9, 0xdc, 0x3b, 0x64, 0xe8, 0x56, 0xb3, 0xf5, 0xec, 0xaa, 0xac, 0x8a, 0x9d, 0xca, 0x3a,
-	0xc8, 0x07, 0x41, 0x07, 0x2a, 0x43, 0xf6, 0x92, 0x0c, 0xf9, 0x5d, 0xc2, 0x3e, 0xd1, 0x02, 0x3c,
-	0x78, 0x8f, 0xcd, 0xab, 0xe0, 0x9c, 0xf3, 0x1b, 0xca, 0x1f, 0x40, 0x0e, 0xcd, 0x43, 0x55, 0xc8,
-	0xdb, 0x8e, 0xf5, 0x3b, 0xc2, 0xf3, 0x44, 0x59, 0x0d, 0x9a, 0x08, 0xc1, 0x74, 0xe4, 0x8c, 0xf4,
-	0xbe, 0x51, 0x05, 0x72, 0x9a, 0xd5, 0xc7, 0x86, 0x9f, 0x3c, 0xc9, 0x2a, 0x6f, 0x31, 0x94, 0xf7,
-	0xc4, 0x61, 0xf9, 0x86, 0xb7, 0x83, 0x64, 0x35, 0x68, 0x32, 0x94, 0xe3, 0xe3, 0x6e, 0xbb, 0xfa,
-	0xc0, 0x47, 0x61, 0xdf, 0xca, 0x87, 0x0c, 0xcc, 0x04, 0xc7, 0x3b, 0x2a, 0x85, 0x31, 0x94, 0xbd,
-	0x58, 0x45, 0xae, 0xb7, 0xcc, 0x64, 0xd7, 0x5b, 0x70, 0x49, 0x67, 0x27, 0xba, 0xa4, 0x05, 0x32,
-	0xa6, 0x27, 0x23, 0xe3, 0x1b, 0x96, 0x3b, 0xf1, 0x30, 0xbb, 0xd5, 0x07, 0xde, 0x3c, 0x95, 0x58,
-	0xee, 0xc4, 0x87, 0xd5, 0x88, 0x24, 0x7a, 0x06, 0xd3, 0x14, 0xeb, 0x6e, 0x35, 0xe7, 0x69, 0x24,
-	0x13, 0x65, 0x6f, 0x94, 0x9d, 0x40, 0x67, 0x5e, 0xe2, 0xad, 0xb1, 0x13, 0x28, 0x7f, 0xfb, 0x09,
-	0xc4, 0xa5, 0x5b, 0x54, 0x39, 0x80, 0xd9, 0xa8, 0x87, 0x21, 0x67, 0x52, 0x84, 0xb3, 0xcf, 0xa3,
-	0x8b, 0x80, 0xd9, 0x1d, 0xbc, 0x31, 0x1b, 0xec, 0x8d, 0xd9, 0x78, 0xed, 0xbf, 0x31, 0x83, 0xc5,
-	0x61, 0x42, 0xf6, 0x08, 0xeb, 0xa9, 0x40, 0x2b, 0x29, 0x69, 0x84, 0x90, 0x44, 0x44, 0xa8, 0xcb,
-	0x4e, 0xf6, 0xd0, 0xfb, 0xa3, 0x04, 0x33, 0x41, 0xbc, 0xd1, 0x4b, 0xc8, 0x5f, 0x92, 0x61, 0xaf,
-	0x8f, 0x6d, 0xbe, 0x7d, 0x9f, 0xa6, 0xf2, 0xd2, 0xd8, 0x21, 0xc3, 0x5d, 0x6c, 0x77, 0x06, 0xd4,
-	0x19, 0xaa, 0xb9, 0x4b, 0xaf, 0x51, 0x7b, 0x01, 0x85, 0x48, 0xf7, 0xa4, 0x5b, 0xe1, 0x65, 0xe6,
-	0x97, 0x92, 0xb2, 0x0f, 0xe5, 0x78, 0xd2, 0x8c, 0xbe, 0x85, 0xbc, 0x9f, 0x36, 0xbb, 0xa9, 0xa6,
-	0x1c, 0x1a, 0x03, 0xdd, 0x24, 0x07, 0x8e, 0x65, 0x13, 0x87, 0x0e, 0x7d, 0x6d, 0x35, 0xd0, 0x50,
-	0xfe, 0x93, 0x85, 0x85, 0x34, 0x09, 0xf4, 0x1b, 0x00, 0x96, 0x79, 0x08, 0xd9, 0xfb, 0x72, 0x7c,
-	0x51, 0x88, 0x3a, 0xdb, 0x53, 0xaa, 0x4c, 0xb1, 0xce, 0x01, 0x7e, 0x84, 0x72, 0xb8, 0xba, 0x7a,
-	0xc2, 0x03, 0xe8, 0x59, 0xfa, 0x6a, 0x4c, 0x80, 0xcd, 0x85, 0xfa, 0x1c, 0x72, 0x0f, 0xe6, 0x42,
-	0x52, 0x39, 0xa2, 0xcf, 0xdd, 0xa7, 0xa9, 0xfb, 0x28, 0x01, 0x58, 0x0a, 0xb4, 0x39, 0xde, 0x0e,
-	0x94, 0x82, 0xa4, 0x8c, 0xc3, 0xf9, 0x7b, 0x4c, 0x49, 0x5b, 0x0a, 0x09, 0xb4, 0x22, 0xd7, 0xe5,
-	0x60, 0x07, 0x30, 0xc3, 0x04, 0x30, 0xb5, 0x9c, 0x2a, 0xd4, 0xa5, 0xd5, 0xd2, 0xda, 0x57, 0xb7,
-	0xf2, 0xd0, 0xd8, 0xb4, 0xfa, 0x36, 0x76, 0x0c, 0x97, 0x3d, 0x63, 0x7c, 0x5d, 0x35, 0x44, 0x51,
-	0xea, 0x80, 0x92, 0xe3, 0x08, 0x20, 0xd7, 0xf9, 0xf1, 0xb8, 0xf5, 0xfa, 0xb0, 0x3c, 0xb5, 0x31,
-	0x0f, 0x73, 0x36, 0x07, 0xe4, 0x1e, 0x28, 0x5b, 0x50, 0x49, 0xf7, 0x3f, 0x9e, 0x59, 0x4b, 0xc9,
-	0xcc, 0x7a, 0x03, 0x60, 0x26, 0xc0, 0x53, 0xbe, 0x83, 0xf9, 0x04, 0xc3, 0x42, 0xea, 0x2d, 0xc5,
-	0x53, 0xef, 0xa8, 0xf6, 0x5b, 0x78, 0x34, 0x86, 0x58, 0xf4, 0x95, 0xbf, 0x75, 0x58, 0x0e, 0x24,
-	0xf1, 0x1c, 0x28, 0x1a, 0xa7, 0x1d, 0x32, 0x3c, 0x61, 0xeb, 0xfd, 0x00, 0x1b, 0x2c, 0xca, 0x6c,
-	0xd3, 0x9c, 0x60, 0x53, 0x00, 0xff, 0x06, 0x66, 0xa3, 0x52, 0x13, 0x5f, 0x26, 0x7f, 0x66, 0xef,
-	0x94, 0x34, 0x36, 0x51, 0x2d, 0x76, 0xb3, 0x30, 0xb7, 0x82, 0xbb, 0x65, 0x21, 0x7a, 0xb7, 0x6c,
-	0x4f, 0xf1, 0x03, 0xa6, 0x2a, 0xde, 0x2e, 0xcc, 0x52, 0x7e, 0xbf, 0xd4, 0x62, 0xf7, 0x0b, 0xc3,
-	0xe2, 0x1d, 0x82, 0x17, 0x7f, 0xcd, 0xc0, 0x7c, 0xe2, 0x19, 0xcb, 0x2c, 0x37, 0x8d, 0xbe, 0xe1,
-	0xdb, 0x51, 0x54, 0xfd, 0x06, 0xeb, 0x8d, 0xbe, 0x40, 0xfd, 0x06, 0xfa, 0x1e, 0xf2, 0xae, 0xe5,
-	0xd0, 0x1d, 0x32, 0xf4, 0x8c, 0x28, 0xc5, 0x72, 0x88, 0x04, 0x78, 0xe3, 0xd0, 0x97, 0x56, 0x03,
-	0x35, 0xf4, 0x0a, 0x64, 0xf6, 0xb9, 0xef, 0x68, 0x7c, 0xf1, 0x97, 0xd6, 0x56, 0x27, 0xc0, 0xf0,
-	0xe4, 0xd5, 0x91, 0xaa, 0xf2, 0x19, 0xc8, 0x61, 0x3f, 0x2a, 0x01, 0xb4, 0x3b, 0x87, 0x9b, 0x9d,
-	0xbd, 0x76, 0x77, 0x6f, 0xab, 0x3c, 0x85, 0x8a, 0x20, 0xb7, 0xc2, 0xa6, 0xa4, 0x3c, 0x86, 0x3c,
-	0xb7, 0x03, 0xcd, 0x43, 0x71, 0x53, 0xed, 0xb4, 0x8e, 0xba, 0xfb, 0x7b, 0xbd, 0xa3, 0xee, 0x6e,
-	0xa7, 0x3c, 0xb5, 0xf6, 0x0f, 0x80, 0x02, 0xe3, 0x68, 0xd3, 0x37, 0x00, 0x9d, 0x40, 0x51, 0x28,
-	0xdf, 0x21, 0xf1, 0x74, 0x4b, 0x2b, 0x11, 0xd6, 0x94, 0x9b, 0x44, 0x78, 0x6e, 0xb9, 0x0b, 0x30,
-	0x2a, 0xdb, 0xa1, 0xe5, 0xf8, 0x53, 0x22, 0x86, 0xb8, 0x32, 0x76, 0x9c, 0xc3, 0xfd, 0x04, 0x25,
-	0xb1, 0x20, 0x85, 0xd2, 0x8c, 0x88, 0xbd, 0x25, 0x6b, 0x9f, 0xde, 0x28, 0xc3, 0xa1, 0x0f, 0xa0,
-	0x10, 0xa9, 0xc0, 0xa1, 0x84, 0x29, 0x71, 0xd0, 0xfa, 0x78, 0x01, 0x8e, 0xd8, 0x82, 0x9c, 0x5f,
-	0xee, 0x42, 0x62, 0xba, 0x2b, 0x14, 0xce, 0x6a, 0x9f, 0xa4, 0x8e, 0x71, 0x88, 0x13, 0x28, 0x0a,
-	0xd5, 0xa5, 0x18, 0x2d, 0x69, 0xa5, 0xb3, 0x18, 0x2d, 0xe9, 0xc5, 0xa9, 0x43, 0x98, 0x8d, 0x56,
-	0x6e, 0x50, 0x3d, 0xa1, 0x13, 0x2b, 0x31, 0xd5, 0x9e, 0xde, 0x20, 0x31, 0x22, 0x47, 0x2c, 0x6d,
-	0xc4, 0xc8, 0x49, 0xad, 0xe0, 0xc4, 0xc8, 0x19, 0x53, 0x1b, 0xf9, 0x09, 0x4a, 0x62, 0x09, 0x00,
-	0x4d, 0x50, 0x43, 0x88, 0x41, 0xa7, 0xd7, 0x10, 0xd0, 0x5b, 0x98, 0x8b, 0x55, 0x2e, 0xd0, 0x4d,
-	0x7a, 0xee, 0x9d, 0xc0, 0xdf, 0x41, 0x25, 0xfd, 0xf5, 0x85, 0xee, 0xf0, 0xaa, 0xae, 0xfd, 0x7c,
-	0x22, 0x59, 0x3e, 0x25, 0x85, 0x47, 0x63, 0x1e, 0x7c, 0x68, 0x12, 0x9c, 0xd0, 0xbf, 0xcf, 0x27,
-	0x13, 0xe6, 0xb3, 0x12, 0x40, 0xc9, 0x07, 0x12, 0x9a, 0xf0, 0xb1, 0x55, 0xfb, 0xd9, 0xad, 0x72,
-	0x7c, 0x1a, 0x1d, 0x1e, 0xa6, 0xbc, 0xf8, 0xd0, 0x6d, 0xfa, 0xee, 0x5d, 0x27, 0xda, 0xf8, 0xd5,
-	0x9b, 0x6f, 0x75, 0x83, 0x5e, 0x5c, 0x9d, 0x36, 0xce, 0xac, 0x7e, 0xd3, 0x4b, 0x8f, 0x2d, 0x47,
-	0x6f, 0x86, 0xff, 0xc5, 0xe8, 0x64, 0xd0, 0xb4, 0x4f, 0xbf, 0xd0, 0xad, 0x66, 0xda, 0x7f, 0x3a,
-	0xa7, 0x39, 0x2f, 0x47, 0x5f, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x97, 0xce, 0xf9, 0x78,
-	0xf2, 0x19, 0x00, 0x00,
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+	0xa4, 0xc6, 0x76, 0x57, 0xda, 0xda, 0xbb, 0x8b, 0x26, 0x5d, 0xb4, 0x2b, 0x5b, 0x8a, 0xad, 0x75,
+	0xfc, 0xb1, 0xf4, 0x07, 0x90, 0xa4, 0x80, 0x30, 0x36, 0xc7, 0x34, 0x6b, 0x4a, 0x64, 0xc8, 0x71,
+	0x6a, 0x9d, 0x8a, 0x5e, 0xdb, 0xde, 0x0a, 0x14, 0xe8, 0xa1, 0xa7, 0xfe, 0x21, 0x3d, 0xe6, 0xd6,
+	0x7f, 0xa8, 0x97, 0x62, 0xc8, 0x21, 0xc5, 0x21, 0x29, 0x5b, 0xf6, 0x21, 0x68, 0x2f, 0x02, 0x67,
+	0xe6, 0xbd, 0xdf, 0xbc, 0x8f, 0x99, 0x37, 0xef, 0x3d, 0xc1, 0xf3, 0x73, 0x73, 0x48, 0x89, 0xa1,
+	0x99, 0x4d, 0x0d, 0x53, 0x7c, 0x86, 0x29, 0x36, 0x2d, 0x3d, 0xfa, 0xdd, 0xb0, 0x1d, 0x8b, 0x5a,
+	0xa8, 0x10, 0x99, 0xaa, 0x3d, 0x0e, 0x99, 0xce, 0x2c, 0x87, 0x34, 0x4d, 0x83, 0x12, 0x07, 0x9b,
+	0xae, 0x4f, 0x5a, 0x5b, 0xd6, 0x2d, 0x4b, 0x37, 0x49, 0xd3, 0x1b, 0x9d, 0x5e, 0x9d, 0x37, 0xb5,
+	0x2b, 0x07, 0x53, 0xc3, 0x1a, 0xf0, 0xf5, 0x95, 0xf8, 0x3a, 0x35, 0xfa, 0xc4, 0xa5, 0xb8, 0x6f,
+	0xfb, 0x04, 0xca, 0x2b, 0x58, 0xd8, 0x74, 0x08, 0xa6, 0xa4, 0x8d, 0x29, 0x76, 0x09, 0x55, 0xc9,
+	0xfb, 0x2b, 0xe2, 0x52, 0xd4, 0x80, 0xbc, 0xe6, 0xcf, 0x54, 0xa5, 0xba, 0xb4, 0x5a, 0x58, 0x5b,
+	0x68, 0x44, 0x05, 0x0d, 0xa8, 0x03, 0x22, 0xe5, 0x11, 0x2c, 0xc6, 0x70, 0x5c, 0xdb, 0x1a, 0xb8,
+	0x44, 0xe9, 0xc0, 0xfc, 0x16, 0xa1, 0x31, 0xf4, 0xaf, 0xe3, 0xe8, 0x95, 0x34, 0xf4, 0x6e, 0x7b,
+	0x84, 0xdf, 0x06, 0x14, 0x85, 0xf1, 0xc1, 0xef, 0x2c, 0xe5, 0xdf, 0x24, 0x0f, 0xa6, 0xe5, 0x50,
+	0xe3, 0x1c, 0x9f, 0xdd, 0x5f, 0x1c, 0xf4, 0x14, 0x0a, 0x98, 0x83, 0xf4, 0x0c, 0xad, 0x9a, 0xa9,
+	0x4b, 0xab, 0xf2, 0xf6, 0x94, 0x0a, 0xc1, 0x64, 0x57, 0x43, 0x9f, 0xc1, 0x0c, 0xc5, 0x7a, 0x6f,
+	0x80, 0xfb, 0xa4, 0x9a, 0xe5, 0xeb, 0x79, 0x8a, 0xf5, 0x3d, 0xdc, 0x27, 0x1b, 0x25, 0x98, 0x7d,
+	0x7f, 0x45, 0x9c, 0x61, 0xef, 0x02, 0x0f, 0x34, 0x93, 0x28, 0xdb, 0xf0, 0x50, 0x90, 0x8b, 0xeb,
+	0xf7, 0x0b, 0x98, 0x09, 0x10, 0xb9, 0x64, 0x8b, 0x82, 0x64, 0x21, 0x43, 0x48, 0xa6, 0xfc, 0x18,
+	0x38, 0x22, 0xae, 0xe4, 0x3d, 0xb0, 0xaa, 0x50, 0x89, 0x63, 0x71, 0xaf, 0xae, 0x43, 0xb1, 0xa5,
+	0x69, 0x47, 0x58, 0x0f, 0xd0, 0x15, 0xc8, 0x52, 0xac, 0x73, 0xe0, 0xb2, 0x00, 0xcc, 0xa8, 0xd8,
+	0xa2, 0x52, 0x86, 0x52, 0xc0, 0xc4, 0x61, 0xfe, 0x25, 0xc1, 0xc2, 0x6b, 0xc3, 0x0d, 0x15, 0x77,
+	0xef, 0xef, 0x91, 0x6f, 0x21, 0x77, 0x6e, 0x98, 0x94, 0x38, 0x9e, 0x33, 0x0a, 0x6b, 0x4f, 0x04,
+	0x86, 0x57, 0xde, 0x52, 0xe7, 0xda, 0x76, 0x88, 0xeb, 0x1a, 0xd6, 0x40, 0xe5, 0xc4, 0xe8, 0xd7,
+	0x00, 0x36, 0xd6, 0x8d, 0x81, 0x77, 0x69, 0x3c, 0x3f, 0x15, 0xd6, 0x96, 0x05, 0xd6, 0x83, 0x70,
+	0x79, 0xdf, 0x66, 0xbf, 0xae, 0x1a, 0xe1, 0x50, 0x2e, 0x61, 0x31, 0xa6, 0x00, 0x77, 0xdd, 0x3a,
+	0xc8, 0x81, 0x1d, 0xdd, 0xaa, 0x54, 0xcf, 0x8e, 0xb7, 0xf7, 0x88, 0x0e, 0x3d, 0x01, 0x18, 0x90,
+	0x6b, 0xda, 0xa3, 0xd6, 0x25, 0x19, 0xf8, 0xa7, 0x4a, 0x95, 0xd9, 0xcc, 0x11, 0x9b, 0x50, 0xfe,
+	0x22, 0xc1, 0x43, 0xb6, 0x1b, 0x57, 0x3f, 0xb4, 0xd6, 0x48, 0x77, 0xe9, 0xfe, 0xba, 0x67, 0xee,
+	0xac, 0xbb, 0xee, 0x3b, 0x6f, 0x24, 0x0d, 0x57, 0xfd, 0x6b, 0x98, 0xe1, 0x5e, 0x09, 0x34, 0x4f,
+	0xbf, 0x96, 0x21, 0xd5, 0x6d, 0x7a, 0xff, 0x47, 0x82, 0xc5, 0x63, 0x5b, 0x4b, 0x39, 0xd4, 0x9f,
+	0xfc, 0xe6, 0xa2, 0xaf, 0x60, 0x9a, 0x41, 0x55, 0xa7, 0x3d, 0xc5, 0x96, 0x52, 0x5d, 0xca, 0xb6,
+	0x55, 0x3d, 0x32, 0x76, 0xeb, 0xfa, 0x84, 0x62, 0x8f, 0xe5, 0x41, 0xca, 0xad, 0xdb, 0xe5, 0x8b,
+	0x6a, 0x48, 0x96, 0x88, 0x0d, 0x2f, 0xa0, 0x12, 0x57, 0x9e, 0x1b, 0x7a, 0x45, 0xd4, 0x45, 0xf2,
+	0xec, 0x16, 0xd1, 0x44, 0xf9, 0xbb, 0x04, 0x8b, 0x6d, 0x62, 0x92, 0xff, 0x01, 0xc3, 0x25, 0xd4,
+	0x7a, 0x0b, 0x15, 0x51, 0xb4, 0xf0, 0x38, 0xff, 0x90, 0xbc, 0x3a, 0x8a, 0x28, 0x5d, 0x9a, 0x4a,
+	0x91, 0x7b, 0xc4, 0x02, 0x57, 0x9c, 0x86, 0x47, 0x1c, 0x0c, 0x45, 0x95, 0xb8, 0xc4, 0xf9, 0xe0,
+	0x1d, 0xe1, 0x6e, 0x1b, 0x7d, 0x0b, 0xc0, 0x35, 0x0c, 0x4c, 0x38, 0xde, 0x16, 0x32, 0xa7, 0xec,
+	0x6a, 0x68, 0x29, 0xa2, 0xaa, 0x7f, 0x5e, 0x03, 0x45, 0x95, 0x8f, 0x12, 0x3c, 0xd9, 0x22, 0x74,
+	0xdf, 0xe9, 0x5c, 0x53, 0x32, 0xd0, 0x22, 0xdb, 0x05, 0x0a, 0xb6, 0xa0, 0xe4, 0x8c, 0x66, 0x47,
+	0xfb, 0xd6, 0x84, 0x7d, 0x05, 0x39, 0xd5, 0x62, 0x84, 0xc3, 0xdf, 0xdf, 0xfa, 0xfd, 0x80, 0x38,
+	0xa1, 0x2b, 0xd4, 0xbc, 0x37, 0xee, 0x6a, 0x68, 0x1b, 0xd0, 0x05, 0xc1, 0x0e, 0x3d, 0x25, 0x98,
+	0xf6, 0x8c, 0x01, 0x65, 0x5c, 0x26, 0x0f, 0x6d, 0x4b, 0x0d, 0x3f, 0x21, 0x68, 0x04, 0x09, 0x41,
+	0xa3, 0xcd, 0x13, 0x06, 0x75, 0x3e, 0x64, 0xea, 0x72, 0x1e, 0xc5, 0x86, 0xe5, 0x74, 0x45, 0x42,
+	0x57, 0xed, 0xc1, 0x6c, 0x44, 0xae, 0xc0, 0x5b, 0x5f, 0x08, 0x7a, 0xdc, 0x68, 0x0b, 0x55, 0xe0,
+	0x57, 0xfe, 0x99, 0x81, 0x42, 0x84, 0xe8, 0xff, 0xc5, 0x52, 0xe8, 0x05, 0x00, 0xb9, 0xb6, 0x0d,
+	0x87, 0xb8, 0x3d, 0x4c, 0xab, 0xd3, 0x5c, 0xc6, 0x38, 0xc2, 0x51, 0x90, 0x7c, 0xa9, 0x32, 0xa7,
+	0x6e, 0x51, 0x21, 0x42, 0xe4, 0x26, 0x8a, 0x10, 0xca, 0x6f, 0xc7, 0xf9, 0x25, 0x8c, 0x0c, 0x2f,
+	0xa1, 0x10, 0xb1, 0x02, 0x37, 0x5a, 0x75, 0x9c, 0xd1, 0xd4, 0x28, 0xb1, 0xd2, 0x83, 0x95, 0xb1,
+	0x5e, 0xe7, 0xf0, 0xdf, 0xa7, 0xba, 0x7d, 0x3c, 0xbe, 0xe8, 0xe4, 0x21, 0x2c, 0xa9, 0xc4, 0x24,
+	0xd8, 0x25, 0x9f, 0xfa, 0x6e, 0x28, 0x17, 0x50, 0x4b, 0x6e, 0x1d, 0x9e, 0xe6, 0x1f, 0x53, 0xd5,
+	0x7a, 0x1e, 0xdb, 0x79, 0x8c, 0xe4, 0x31, 0x25, 0x1f, 0xa7, 0xed, 0x14, 0x86, 0xa1, 0x3f, 0x49,
+	0x90, 0xe7, 0x71, 0x05, 0x3d, 0x87, 0xcc, 0xad, 0x91, 0x27, 0x63, 0x68, 0xc2, 0x41, 0xc9, 0x4c,
+	0x74, 0x50, 0xd0, 0x33, 0x28, 0xda, 0x2c, 0x2a, 0xb2, 0xbd, 0x77, 0xc8, 0xd0, 0xad, 0x66, 0xeb,
+	0xd9, 0x55, 0x59, 0x15, 0x27, 0x95, 0x75, 0x90, 0x0f, 0x82, 0x09, 0x54, 0x86, 0xec, 0x25, 0x19,
+	0xf2, 0xb7, 0x84, 0x7d, 0xa2, 0x05, 0x78, 0xf0, 0x01, 0x9b, 0x57, 0x41, 0x9c, 0xf3, 0x07, 0xca,
+	0x1f, 0x40, 0x0e, 0xc5, 0x43, 0x55, 0xc8, 0xdb, 0x8e, 0xf5, 0x3b, 0xc2, 0x53, 0x4b, 0x59, 0x0d,
+	0x86, 0x08, 0xc1, 0x74, 0x24, 0x46, 0x7a, 0xdf, 0xa8, 0x02, 0x39, 0xcd, 0xea, 0x63, 0xc3, 0xcf,
+	0xb7, 0x64, 0x95, 0x8f, 0x18, 0xca, 0x07, 0xe2, 0xb0, 0x14, 0xc5, 0xbb, 0x41, 0xb2, 0x1a, 0x0c,
+	0x19, 0xca, 0xf1, 0x71, 0xb7, 0xed, 0xbd, 0xa0, 0xb2, 0xea, 0x7d, 0x2b, 0x1f, 0x33, 0x30, 0x13,
+	0x84, 0x77, 0x54, 0x0a, 0x6d, 0x28, 0x7b, 0xb6, 0x8a, 0x3c, 0x6f, 0x99, 0xc9, 0x9e, 0xb7, 0xe0,
+	0x5d, 0xcf, 0xde, 0xfd, 0x5d, 0x9f, 0x9e, 0xcc, 0x19, 0xdf, 0xb1, 0x74, 0x8b, 0x9b, 0xd9, 0xad,
+	0x3e, 0xf0, 0xf6, 0xa9, 0xc4, 0xd2, 0x2d, 0xbe, 0xac, 0x46, 0x28, 0xd1, 0x33, 0x98, 0xa6, 0x58,
+	0x77, 0xab, 0x39, 0x8f, 0x23, 0x99, 0x5b, 0x7b, 0xab, 0x2c, 0x02, 0x9d, 0x79, 0xb9, 0xba, 0xc6,
+	0x22, 0x50, 0xfe, 0xf6, 0x08, 0xc4, 0xa9, 0x5b, 0x54, 0x39, 0x80, 0xd9, 0xa8, 0x86, 0xa1, 0xcf,
+	0xa4, 0x88, 0xcf, 0xbe, 0x8c, 0x1e, 0x02, 0x26, 0x77, 0x50, 0x96, 0x36, 0x58, 0x59, 0xda, 0x78,
+	0xed, 0x97, 0xa5, 0xc1, 0xe1, 0x30, 0x21, 0x7b, 0x84, 0xf5, 0x54, 0xa0, 0x95, 0x94, 0x34, 0x42,
+	0x48, 0x22, 0x22, 0xae, 0xcb, 0x4e, 0x56, 0x1b, 0xfe, 0x51, 0x82, 0x99, 0xc0, 0xde, 0xe8, 0x25,
+	0xe4, 0x2f, 0xc9, 0xb0, 0xd7, 0xc7, 0x36, 0xbf, 0xbe, 0x4f, 0x53, 0xfd, 0xd2, 0xd8, 0x21, 0xc3,
+	0x5d, 0x6c, 0x77, 0x06, 0xd4, 0x19, 0xaa, 0xb9, 0x4b, 0x6f, 0x50, 0x7b, 0x01, 0x85, 0xc8, 0xf4,
+	0xa4, 0x57, 0xe1, 0x65, 0xe6, 0x97, 0x92, 0xb2, 0x0f, 0xe5, 0x78, 0x9e, 0x8d, 0x7e, 0x05, 0x79,
+	0x3f, 0xd3, 0x76, 0x53, 0x45, 0x39, 0x34, 0x06, 0xba, 0x49, 0x0e, 0x1c, 0xcb, 0x26, 0x0e, 0x1d,
+	0xfa, 0xdc, 0x6a, 0xc0, 0xa1, 0xfc, 0x3b, 0x0b, 0x0b, 0x69, 0x14, 0xe8, 0x37, 0x00, 0x2c, 0xf3,
+	0x10, 0x12, 0xfe, 0xe5, 0xf8, 0xa1, 0x10, 0x79, 0xb6, 0xa7, 0x54, 0x99, 0x62, 0x9d, 0x03, 0xfc,
+	0x04, 0xe5, 0xf0, 0x74, 0xf5, 0x84, 0x9a, 0xe9, 0x59, 0xfa, 0x69, 0x4c, 0x80, 0xcd, 0x85, 0xfc,
+	0x1c, 0x72, 0x0f, 0xe6, 0x42, 0xa7, 0x72, 0x44, 0xdf, 0x77, 0x9f, 0xa7, 0xde, 0xa3, 0x04, 0x60,
+	0x29, 0xe0, 0xe6, 0x78, 0x3b, 0x50, 0x0a, 0x92, 0x32, 0x0e, 0xe7, 0xdf, 0x31, 0x25, 0xed, 0x28,
+	0x24, 0xd0, 0x8a, 0x9c, 0x97, 0x83, 0x1d, 0xc0, 0x0c, 0x23, 0xc0, 0xd4, 0x72, 0xaa, 0x50, 0x97,
+	0x56, 0x4b, 0x6b, 0xdf, 0xdc, 0xea, 0x87, 0xc6, 0xa6, 0xd5, 0xb7, 0xb1, 0x63, 0xb8, 0xac, 0xf2,
+	0xf1, 0x79, 0xd5, 0x10, 0x45, 0xa9, 0x03, 0x4a, 0xae, 0x23, 0x80, 0x5c, 0xe7, 0xa7, 0xe3, 0xd6,
+	0xeb, 0xc3, 0xf2, 0xd4, 0xc6, 0x3c, 0xcc, 0xd9, 0x1c, 0x90, 0x6b, 0xa0, 0x6c, 0x41, 0x25, 0x5d,
+	0xff, 0x78, 0x66, 0x2d, 0x25, 0x33, 0xeb, 0x0d, 0x80, 0x99, 0x00, 0x4f, 0xf9, 0x1e, 0xe6, 0x13,
+	0x1e, 0x16, 0x52, 0x6f, 0x29, 0x9e, 0x7a, 0x47, 0xb9, 0xdf, 0xc1, 0xa3, 0x31, 0x8e, 0x45, 0xdf,
+	0xf8, 0x57, 0x87, 0xe5, 0x40, 0x12, 0xcf, 0x81, 0xa2, 0x76, 0xda, 0x21, 0xc3, 0x13, 0x76, 0xde,
+	0x0f, 0xb0, 0xc1, 0xac, 0xcc, 0x2e, 0xcd, 0x09, 0x36, 0x05, 0xf0, 0xef, 0x60, 0x36, 0x4a, 0x35,
+	0xf1, 0x63, 0xf2, 0x67, 0x56, 0xa7, 0xa4, 0x79, 0x13, 0xd5, 0x62, 0x2f, 0x0b, 0x53, 0x2b, 0x78,
+	0x5b, 0x16, 0xa2, 0x6f, 0xcb, 0xf6, 0x14, 0x0f, 0x30, 0x55, 0xf1, 0x75, 0x61, 0x92, 0xf2, 0xf7,
+	0xa5, 0x16, 0x7b, 0x5f, 0x18, 0x16, 0x9f, 0x10, 0xb4, 0xf8, 0x6b, 0x06, 0xe6, 0x13, 0x95, 0x2f,
+	0x93, 0xdc, 0x34, 0xfa, 0x86, 0x2f, 0x47, 0x51, 0xf5, 0x07, 0x6c, 0x36, 0x5a, 0xb4, 0xfa, 0x03,
+	0xf4, 0x03, 0xe4, 0x5d, 0xcb, 0xa1, 0x3b, 0x64, 0xe8, 0x09, 0x51, 0x8a, 0xe5, 0x10, 0x09, 0xf0,
+	0xc6, 0xa1, 0x4f, 0xad, 0x06, 0x6c, 0xe8, 0x15, 0xc8, 0xec, 0x73, 0xdf, 0xd1, 0xf8, 0xe1, 0x2f,
+	0xad, 0xad, 0x4e, 0x80, 0xe1, 0xd1, 0xab, 0x23, 0x56, 0xe5, 0x0b, 0x90, 0xc3, 0x79, 0x54, 0x02,
+	0x68, 0x77, 0x0e, 0x37, 0x3b, 0x7b, 0xed, 0xee, 0xde, 0x56, 0x79, 0x0a, 0x15, 0x41, 0x6e, 0x85,
+	0x43, 0x49, 0x79, 0x0c, 0x79, 0x2e, 0x07, 0x9a, 0x87, 0xe2, 0xa6, 0xda, 0x69, 0x1d, 0x75, 0xf7,
+	0xf7, 0x7a, 0x47, 0xdd, 0xdd, 0x4e, 0x79, 0x6a, 0xed, 0x1f, 0x00, 0x05, 0xe6, 0xa3, 0x4d, 0x5f,
+	0x00, 0x74, 0x02, 0x45, 0xa1, 0xe3, 0x87, 0xc4, 0xe8, 0x96, 0xd6, 0x55, 0xac, 0x29, 0x37, 0x91,
+	0xf0, 0xdc, 0x72, 0x17, 0x60, 0xd4, 0xe9, 0x43, 0xcb, 0xf1, 0x52, 0x22, 0x86, 0xb8, 0x32, 0x76,
+	0x9d, 0xc3, 0xbd, 0x81, 0x92, 0xd8, 0xc3, 0x42, 0x69, 0x42, 0xc4, 0x6a, 0xc9, 0xda, 0xe7, 0x37,
+	0xd2, 0x70, 0xe8, 0x03, 0x28, 0x44, 0x9a, 0x76, 0x28, 0x21, 0x4a, 0x1c, 0xb4, 0x3e, 0x9e, 0x80,
+	0x23, 0xb6, 0x20, 0xe7, 0x77, 0xc8, 0x90, 0x98, 0xee, 0x0a, 0xbd, 0xb6, 0xda, 0x67, 0xa9, 0x6b,
+	0x1c, 0xe2, 0x04, 0x8a, 0x42, 0x43, 0x2a, 0xe6, 0x96, 0xb4, 0x6e, 0x5b, 0xcc, 0x2d, 0xe9, 0xfd,
+	0xac, 0x43, 0x98, 0x8d, 0x36, 0x7b, 0x50, 0x3d, 0xc1, 0x13, 0xeb, 0x4a, 0xd5, 0x9e, 0xde, 0x40,
+	0x31, 0x72, 0x8e, 0xd8, 0xda, 0x88, 0x39, 0x27, 0xb5, 0xe9, 0x13, 0x73, 0xce, 0x98, 0xde, 0xc8,
+	0x1b, 0x28, 0x89, 0x2d, 0x00, 0x34, 0x41, 0x0f, 0x21, 0x06, 0x9d, 0xde, 0x43, 0x40, 0xef, 0x60,
+	0x2e, 0xd6, 0xb9, 0x40, 0x37, 0xf1, 0xb9, 0x77, 0x02, 0x7f, 0x0f, 0x95, 0xf4, 0xea, 0x0b, 0xdd,
+	0xa1, 0xaa, 0xae, 0xfd, 0x7c, 0x22, 0x5a, 0xbe, 0x25, 0x85, 0x47, 0x63, 0x0a, 0x3e, 0x34, 0x09,
+	0x4e, 0xa8, 0xdf, 0x97, 0x93, 0x11, 0xf3, 0x5d, 0x09, 0xa0, 0x64, 0x81, 0x84, 0x26, 0x2c, 0xb6,
+	0x6a, 0x3f, 0xbb, 0x95, 0x8e, 0x6f, 0xa3, 0xc3, 0xc3, 0x94, 0x8a, 0x0f, 0xdd, 0xc6, 0xef, 0xde,
+	0x75, 0xa3, 0x8d, 0xcd, 0xb7, 0x2d, 0xdd, 0xa0, 0x17, 0x57, 0xa7, 0x8d, 0x33, 0xab, 0xdf, 0xf4,
+	0xd2, 0x63, 0xcb, 0xd1, 0xfd, 0x8f, 0x66, 0xf8, 0x27, 0x8e, 0x4e, 0x06, 0x4d, 0xfb, 0xf4, 0x2b,
+	0xdd, 0x6a, 0xa6, 0xfd, 0x19, 0x74, 0x9a, 0xf3, 0x32, 0xf5, 0xf5, 0xff, 0x06, 0x00, 0x00, 0xff,
+	0xff, 0x61, 0x1e, 0x60, 0x62, 0x2b, 0x1a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go
deleted file mode 100644
index ffb0438ab1..0000000000
--- a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.validate.go
+++ /dev/null
@@ -1,3535 +0,0 @@
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: flyteidl/datacatalog/datacatalog.proto
-
-package datacatalog
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"github.com/golang/protobuf/ptypes"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = ptypes.DynamicAny{}
-)
-
-// define the regex for a UUID once up-front
-var _datacatalog_uuidPattern = regexp.MustCompile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
-
-// Validate checks the field values on CreateDatasetRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *CreateDatasetRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return CreateDatasetRequestValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// CreateDatasetRequestValidationError is the validation error returned by
-// CreateDatasetRequest.Validate if the designated constraints aren't met.
-type CreateDatasetRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e CreateDatasetRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e CreateDatasetRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e CreateDatasetRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e CreateDatasetRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e CreateDatasetRequestValidationError) ErrorName() string {
-	return "CreateDatasetRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e CreateDatasetRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sCreateDatasetRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = CreateDatasetRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = CreateDatasetRequestValidationError{}
-
-// Validate checks the field values on CreateDatasetResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *CreateDatasetResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	return nil
-}
-
-// CreateDatasetResponseValidationError is the validation error returned by
-// CreateDatasetResponse.Validate if the designated constraints aren't met.
-type CreateDatasetResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e CreateDatasetResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e CreateDatasetResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e CreateDatasetResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e CreateDatasetResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e CreateDatasetResponseValidationError) ErrorName() string {
-	return "CreateDatasetResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e CreateDatasetResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sCreateDatasetResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = CreateDatasetResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = CreateDatasetResponseValidationError{}
-
-// Validate checks the field values on GetDatasetRequest with the rules defined
-// in the proto definition for this message. If any rules are violated, an
-// error is returned.
-func (m *GetDatasetRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetDatasetRequestValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// GetDatasetRequestValidationError is the validation error returned by
-// GetDatasetRequest.Validate if the designated constraints aren't met.
-type GetDatasetRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetDatasetRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetDatasetRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetDatasetRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetDatasetRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetDatasetRequestValidationError) ErrorName() string {
-	return "GetDatasetRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetDatasetRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetDatasetRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetDatasetRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetDatasetRequestValidationError{}
-
-// Validate checks the field values on GetDatasetResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *GetDatasetResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetDatasetResponseValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// GetDatasetResponseValidationError is the validation error returned by
-// GetDatasetResponse.Validate if the designated constraints aren't met.
-type GetDatasetResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetDatasetResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetDatasetResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetDatasetResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetDatasetResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetDatasetResponseValidationError) ErrorName() string {
-	return "GetDatasetResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetDatasetResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetDatasetResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetDatasetResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetDatasetResponseValidationError{}
-
-// Validate checks the field values on GetArtifactRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *GetArtifactRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetArtifactRequestValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	switch m.QueryHandle.(type) {
-
-	case *GetArtifactRequest_ArtifactId:
-		// no validation rules for ArtifactId
-
-	case *GetArtifactRequest_TagName:
-		// no validation rules for TagName
-
-	}
-
-	return nil
-}
-
-// GetArtifactRequestValidationError is the validation error returned by
-// GetArtifactRequest.Validate if the designated constraints aren't met.
-type GetArtifactRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetArtifactRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetArtifactRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetArtifactRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetArtifactRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetArtifactRequestValidationError) ErrorName() string {
-	return "GetArtifactRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetArtifactRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetArtifactRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetArtifactRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetArtifactRequestValidationError{}
-
-// Validate checks the field values on GetArtifactResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *GetArtifactResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetArtifact()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetArtifactResponseValidationError{
-				field:  "Artifact",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// GetArtifactResponseValidationError is the validation error returned by
-// GetArtifactResponse.Validate if the designated constraints aren't met.
-type GetArtifactResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetArtifactResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetArtifactResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetArtifactResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetArtifactResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetArtifactResponseValidationError) ErrorName() string {
-	return "GetArtifactResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetArtifactResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetArtifactResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetArtifactResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetArtifactResponseValidationError{}
-
-// Validate checks the field values on CreateArtifactRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *CreateArtifactRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetArtifact()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return CreateArtifactRequestValidationError{
-				field:  "Artifact",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// CreateArtifactRequestValidationError is the validation error returned by
-// CreateArtifactRequest.Validate if the designated constraints aren't met.
-type CreateArtifactRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e CreateArtifactRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e CreateArtifactRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e CreateArtifactRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e CreateArtifactRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e CreateArtifactRequestValidationError) ErrorName() string {
-	return "CreateArtifactRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e CreateArtifactRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sCreateArtifactRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = CreateArtifactRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = CreateArtifactRequestValidationError{}
-
-// Validate checks the field values on CreateArtifactResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *CreateArtifactResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	return nil
-}
-
-// CreateArtifactResponseValidationError is the validation error returned by
-// CreateArtifactResponse.Validate if the designated constraints aren't met.
-type CreateArtifactResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e CreateArtifactResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e CreateArtifactResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e CreateArtifactResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e CreateArtifactResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e CreateArtifactResponseValidationError) ErrorName() string {
-	return "CreateArtifactResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e CreateArtifactResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sCreateArtifactResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = CreateArtifactResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = CreateArtifactResponseValidationError{}
-
-// Validate checks the field values on AddTagRequest with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *AddTagRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetTag()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return AddTagRequestValidationError{
-				field:  "Tag",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// AddTagRequestValidationError is the validation error returned by
-// AddTagRequest.Validate if the designated constraints aren't met.
-type AddTagRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e AddTagRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e AddTagRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e AddTagRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e AddTagRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e AddTagRequestValidationError) ErrorName() string { return "AddTagRequestValidationError" }
-
-// Error satisfies the builtin error interface
-func (e AddTagRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sAddTagRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = AddTagRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = AddTagRequestValidationError{}
-
-// Validate checks the field values on AddTagResponse with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *AddTagResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	return nil
-}
-
-// AddTagResponseValidationError is the validation error returned by
-// AddTagResponse.Validate if the designated constraints aren't met.
-type AddTagResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e AddTagResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e AddTagResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e AddTagResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e AddTagResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e AddTagResponseValidationError) ErrorName() string { return "AddTagResponseValidationError" }
-
-// Error satisfies the builtin error interface
-func (e AddTagResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sAddTagResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = AddTagResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = AddTagResponseValidationError{}
-
-// Validate checks the field values on ListArtifactsRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ListArtifactsRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ListArtifactsRequestValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if v, ok := interface{}(m.GetFilter()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ListArtifactsRequestValidationError{
-				field:  "Filter",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if v, ok := interface{}(m.GetPagination()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ListArtifactsRequestValidationError{
-				field:  "Pagination",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// ListArtifactsRequestValidationError is the validation error returned by
-// ListArtifactsRequest.Validate if the designated constraints aren't met.
-type ListArtifactsRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ListArtifactsRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ListArtifactsRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ListArtifactsRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ListArtifactsRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ListArtifactsRequestValidationError) ErrorName() string {
-	return "ListArtifactsRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ListArtifactsRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sListArtifactsRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ListArtifactsRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ListArtifactsRequestValidationError{}
-
-// Validate checks the field values on ListArtifactsResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ListArtifactsResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetArtifacts() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return ListArtifactsResponseValidationError{
-					field:  fmt.Sprintf("Artifacts[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	// no validation rules for NextToken
-
-	return nil
-}
-
-// ListArtifactsResponseValidationError is the validation error returned by
-// ListArtifactsResponse.Validate if the designated constraints aren't met.
-type ListArtifactsResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ListArtifactsResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ListArtifactsResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ListArtifactsResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ListArtifactsResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ListArtifactsResponseValidationError) ErrorName() string {
-	return "ListArtifactsResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ListArtifactsResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sListArtifactsResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ListArtifactsResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ListArtifactsResponseValidationError{}
-
-// Validate checks the field values on ListDatasetsRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ListDatasetsRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetFilter()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ListDatasetsRequestValidationError{
-				field:  "Filter",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if v, ok := interface{}(m.GetPagination()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ListDatasetsRequestValidationError{
-				field:  "Pagination",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// ListDatasetsRequestValidationError is the validation error returned by
-// ListDatasetsRequest.Validate if the designated constraints aren't met.
-type ListDatasetsRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ListDatasetsRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ListDatasetsRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ListDatasetsRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ListDatasetsRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ListDatasetsRequestValidationError) ErrorName() string {
-	return "ListDatasetsRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ListDatasetsRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sListDatasetsRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ListDatasetsRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ListDatasetsRequestValidationError{}
-
-// Validate checks the field values on ListDatasetsResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ListDatasetsResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetDatasets() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return ListDatasetsResponseValidationError{
-					field:  fmt.Sprintf("Datasets[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	// no validation rules for NextToken
-
-	return nil
-}
-
-// ListDatasetsResponseValidationError is the validation error returned by
-// ListDatasetsResponse.Validate if the designated constraints aren't met.
-type ListDatasetsResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ListDatasetsResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ListDatasetsResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ListDatasetsResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ListDatasetsResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ListDatasetsResponseValidationError) ErrorName() string {
-	return "ListDatasetsResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ListDatasetsResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sListDatasetsResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ListDatasetsResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ListDatasetsResponseValidationError{}
-
-// Validate checks the field values on UpdateArtifactRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *UpdateArtifactRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return UpdateArtifactRequestValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	for idx, item := range m.GetData() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return UpdateArtifactRequestValidationError{
-					field:  fmt.Sprintf("Data[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	switch m.QueryHandle.(type) {
-
-	case *UpdateArtifactRequest_ArtifactId:
-		// no validation rules for ArtifactId
-
-	case *UpdateArtifactRequest_TagName:
-		// no validation rules for TagName
-
-	}
-
-	return nil
-}
-
-// UpdateArtifactRequestValidationError is the validation error returned by
-// UpdateArtifactRequest.Validate if the designated constraints aren't met.
-type UpdateArtifactRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e UpdateArtifactRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e UpdateArtifactRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e UpdateArtifactRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e UpdateArtifactRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e UpdateArtifactRequestValidationError) ErrorName() string {
-	return "UpdateArtifactRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e UpdateArtifactRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sUpdateArtifactRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = UpdateArtifactRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = UpdateArtifactRequestValidationError{}
-
-// Validate checks the field values on UpdateArtifactResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *UpdateArtifactResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for ArtifactId
-
-	return nil
-}
-
-// UpdateArtifactResponseValidationError is the validation error returned by
-// UpdateArtifactResponse.Validate if the designated constraints aren't met.
-type UpdateArtifactResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e UpdateArtifactResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e UpdateArtifactResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e UpdateArtifactResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e UpdateArtifactResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e UpdateArtifactResponseValidationError) ErrorName() string {
-	return "UpdateArtifactResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e UpdateArtifactResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sUpdateArtifactResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = UpdateArtifactResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = UpdateArtifactResponseValidationError{}
-
-// Validate checks the field values on DeleteArtifactRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *DeleteArtifactRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return DeleteArtifactRequestValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	switch m.QueryHandle.(type) {
-
-	case *DeleteArtifactRequest_ArtifactId:
-		// no validation rules for ArtifactId
-
-	case *DeleteArtifactRequest_TagName:
-		// no validation rules for TagName
-
-	}
-
-	return nil
-}
-
-// DeleteArtifactRequestValidationError is the validation error returned by
-// DeleteArtifactRequest.Validate if the designated constraints aren't met.
-type DeleteArtifactRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e DeleteArtifactRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e DeleteArtifactRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e DeleteArtifactRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e DeleteArtifactRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e DeleteArtifactRequestValidationError) ErrorName() string {
-	return "DeleteArtifactRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e DeleteArtifactRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sDeleteArtifactRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = DeleteArtifactRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = DeleteArtifactRequestValidationError{}
-
-// Validate checks the field values on DeleteArtifactsRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *DeleteArtifactsRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetArtifacts() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return DeleteArtifactsRequestValidationError{
-					field:  fmt.Sprintf("Artifacts[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// DeleteArtifactsRequestValidationError is the validation error returned by
-// DeleteArtifactsRequest.Validate if the designated constraints aren't met.
-type DeleteArtifactsRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e DeleteArtifactsRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e DeleteArtifactsRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e DeleteArtifactsRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e DeleteArtifactsRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e DeleteArtifactsRequestValidationError) ErrorName() string {
-	return "DeleteArtifactsRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e DeleteArtifactsRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sDeleteArtifactsRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = DeleteArtifactsRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = DeleteArtifactsRequestValidationError{}
-
-// Validate checks the field values on DeleteArtifactResponse with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *DeleteArtifactResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	return nil
-}
-
-// DeleteArtifactResponseValidationError is the validation error returned by
-// DeleteArtifactResponse.Validate if the designated constraints aren't met.
-type DeleteArtifactResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e DeleteArtifactResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e DeleteArtifactResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e DeleteArtifactResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e DeleteArtifactResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e DeleteArtifactResponseValidationError) ErrorName() string {
-	return "DeleteArtifactResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e DeleteArtifactResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sDeleteArtifactResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = DeleteArtifactResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = DeleteArtifactResponseValidationError{}
-
-// Validate checks the field values on ReservationID with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *ReservationID) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetDatasetId()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ReservationIDValidationError{
-				field:  "DatasetId",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	// no validation rules for TagName
-
-	return nil
-}
-
-// ReservationIDValidationError is the validation error returned by
-// ReservationID.Validate if the designated constraints aren't met.
-type ReservationIDValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ReservationIDValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ReservationIDValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ReservationIDValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ReservationIDValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ReservationIDValidationError) ErrorName() string { return "ReservationIDValidationError" }
-
-// Error satisfies the builtin error interface
-func (e ReservationIDValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sReservationID.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ReservationIDValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ReservationIDValidationError{}
-
-// Validate checks the field values on GetOrExtendReservationRequest with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *GetOrExtendReservationRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetReservationId()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetOrExtendReservationRequestValidationError{
-				field:  "ReservationId",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	// no validation rules for OwnerId
-
-	if v, ok := interface{}(m.GetHeartbeatInterval()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetOrExtendReservationRequestValidationError{
-				field:  "HeartbeatInterval",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// GetOrExtendReservationRequestValidationError is the validation error
-// returned by GetOrExtendReservationRequest.Validate if the designated
-// constraints aren't met.
-type GetOrExtendReservationRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetOrExtendReservationRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetOrExtendReservationRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetOrExtendReservationRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetOrExtendReservationRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetOrExtendReservationRequestValidationError) ErrorName() string {
-	return "GetOrExtendReservationRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetOrExtendReservationRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetOrExtendReservationRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetOrExtendReservationRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetOrExtendReservationRequestValidationError{}
-
-// Validate checks the field values on GetOrExtendReservationsRequest with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *GetOrExtendReservationsRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetReservations() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return GetOrExtendReservationsRequestValidationError{
-					field:  fmt.Sprintf("Reservations[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// GetOrExtendReservationsRequestValidationError is the validation error
-// returned by GetOrExtendReservationsRequest.Validate if the designated
-// constraints aren't met.
-type GetOrExtendReservationsRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetOrExtendReservationsRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetOrExtendReservationsRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetOrExtendReservationsRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetOrExtendReservationsRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetOrExtendReservationsRequestValidationError) ErrorName() string {
-	return "GetOrExtendReservationsRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetOrExtendReservationsRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetOrExtendReservationsRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetOrExtendReservationsRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetOrExtendReservationsRequestValidationError{}
-
-// Validate checks the field values on Reservation with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *Reservation) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetReservationId()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ReservationValidationError{
-				field:  "ReservationId",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	// no validation rules for OwnerId
-
-	if v, ok := interface{}(m.GetHeartbeatInterval()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ReservationValidationError{
-				field:  "HeartbeatInterval",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if v, ok := interface{}(m.GetExpiresAt()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ReservationValidationError{
-				field:  "ExpiresAt",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ReservationValidationError{
-				field:  "Metadata",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// ReservationValidationError is the validation error returned by
-// Reservation.Validate if the designated constraints aren't met.
-type ReservationValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ReservationValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ReservationValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ReservationValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ReservationValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ReservationValidationError) ErrorName() string { return "ReservationValidationError" }
-
-// Error satisfies the builtin error interface
-func (e ReservationValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sReservation.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ReservationValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ReservationValidationError{}
-
-// Validate checks the field values on GetOrExtendReservationResponse with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *GetOrExtendReservationResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetReservation()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetOrExtendReservationResponseValidationError{
-				field:  "Reservation",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// GetOrExtendReservationResponseValidationError is the validation error
-// returned by GetOrExtendReservationResponse.Validate if the designated
-// constraints aren't met.
-type GetOrExtendReservationResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetOrExtendReservationResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetOrExtendReservationResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetOrExtendReservationResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetOrExtendReservationResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetOrExtendReservationResponseValidationError) ErrorName() string {
-	return "GetOrExtendReservationResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetOrExtendReservationResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetOrExtendReservationResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetOrExtendReservationResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetOrExtendReservationResponseValidationError{}
-
-// Validate checks the field values on GetOrExtendReservationsResponse with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *GetOrExtendReservationsResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetReservations() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return GetOrExtendReservationsResponseValidationError{
-					field:  fmt.Sprintf("Reservations[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// GetOrExtendReservationsResponseValidationError is the validation error
-// returned by GetOrExtendReservationsResponse.Validate if the designated
-// constraints aren't met.
-type GetOrExtendReservationsResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e GetOrExtendReservationsResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e GetOrExtendReservationsResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e GetOrExtendReservationsResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e GetOrExtendReservationsResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e GetOrExtendReservationsResponseValidationError) ErrorName() string {
-	return "GetOrExtendReservationsResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e GetOrExtendReservationsResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sGetOrExtendReservationsResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = GetOrExtendReservationsResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = GetOrExtendReservationsResponseValidationError{}
-
-// Validate checks the field values on ReleaseReservationRequest with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ReleaseReservationRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetReservationId()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ReleaseReservationRequestValidationError{
-				field:  "ReservationId",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	// no validation rules for OwnerId
-
-	return nil
-}
-
-// ReleaseReservationRequestValidationError is the validation error returned by
-// ReleaseReservationRequest.Validate if the designated constraints aren't met.
-type ReleaseReservationRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ReleaseReservationRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ReleaseReservationRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ReleaseReservationRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ReleaseReservationRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ReleaseReservationRequestValidationError) ErrorName() string {
-	return "ReleaseReservationRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ReleaseReservationRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sReleaseReservationRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ReleaseReservationRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ReleaseReservationRequestValidationError{}
-
-// Validate checks the field values on ReleaseReservationsRequest with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ReleaseReservationsRequest) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetReservations() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return ReleaseReservationsRequestValidationError{
-					field:  fmt.Sprintf("Reservations[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ReleaseReservationsRequestValidationError is the validation error returned
-// by ReleaseReservationsRequest.Validate if the designated constraints aren't met.
-type ReleaseReservationsRequestValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ReleaseReservationsRequestValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ReleaseReservationsRequestValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ReleaseReservationsRequestValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ReleaseReservationsRequestValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ReleaseReservationsRequestValidationError) ErrorName() string {
-	return "ReleaseReservationsRequestValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ReleaseReservationsRequestValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sReleaseReservationsRequest.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ReleaseReservationsRequestValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ReleaseReservationsRequestValidationError{}
-
-// Validate checks the field values on ReleaseReservationResponse with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ReleaseReservationResponse) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	return nil
-}
-
-// ReleaseReservationResponseValidationError is the validation error returned
-// by ReleaseReservationResponse.Validate if the designated constraints aren't met.
-type ReleaseReservationResponseValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ReleaseReservationResponseValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ReleaseReservationResponseValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ReleaseReservationResponseValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ReleaseReservationResponseValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ReleaseReservationResponseValidationError) ErrorName() string {
-	return "ReleaseReservationResponseValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ReleaseReservationResponseValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sReleaseReservationResponse.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ReleaseReservationResponseValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ReleaseReservationResponseValidationError{}
-
-// Validate checks the field values on Dataset with the rules defined in the
-// proto definition for this message. If any rules are violated, an error is returned.
-func (m *Dataset) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	if v, ok := interface{}(m.GetId()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return DatasetValidationError{
-				field:  "Id",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return DatasetValidationError{
-				field:  "Metadata",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// DatasetValidationError is the validation error returned by Dataset.Validate
-// if the designated constraints aren't met.
-type DatasetValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e DatasetValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e DatasetValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e DatasetValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e DatasetValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e DatasetValidationError) ErrorName() string { return "DatasetValidationError" }
-
-// Error satisfies the builtin error interface
-func (e DatasetValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sDataset.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = DatasetValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = DatasetValidationError{}
-
-// Validate checks the field values on Partition with the rules defined in the
-// proto definition for this message. If any rules are violated, an error is returned.
-func (m *Partition) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Key
-
-	// no validation rules for Value
-
-	return nil
-}
-
-// PartitionValidationError is the validation error returned by
-// Partition.Validate if the designated constraints aren't met.
-type PartitionValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e PartitionValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e PartitionValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e PartitionValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e PartitionValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e PartitionValidationError) ErrorName() string { return "PartitionValidationError" }
-
-// Error satisfies the builtin error interface
-func (e PartitionValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sPartition.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = PartitionValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = PartitionValidationError{}
-
-// Validate checks the field values on DatasetID with the rules defined in the
-// proto definition for this message. If any rules are violated, an error is returned.
-func (m *DatasetID) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Project
-
-	// no validation rules for Name
-
-	// no validation rules for Domain
-
-	// no validation rules for Version
-
-	// no validation rules for UUID
-
-	return nil
-}
-
-// DatasetIDValidationError is the validation error returned by
-// DatasetID.Validate if the designated constraints aren't met.
-type DatasetIDValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e DatasetIDValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e DatasetIDValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e DatasetIDValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e DatasetIDValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e DatasetIDValidationError) ErrorName() string { return "DatasetIDValidationError" }
-
-// Error satisfies the builtin error interface
-func (e DatasetIDValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sDatasetID.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = DatasetIDValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = DatasetIDValidationError{}
-
-// Validate checks the field values on Artifact with the rules defined in the
-// proto definition for this message. If any rules are violated, an error is returned.
-func (m *Artifact) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Id
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ArtifactValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	for idx, item := range m.GetData() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return ArtifactValidationError{
-					field:  fmt.Sprintf("Data[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ArtifactValidationError{
-				field:  "Metadata",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	for idx, item := range m.GetPartitions() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return ArtifactValidationError{
-					field:  fmt.Sprintf("Partitions[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	for idx, item := range m.GetTags() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return ArtifactValidationError{
-					field:  fmt.Sprintf("Tags[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	if v, ok := interface{}(m.GetCreatedAt()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ArtifactValidationError{
-				field:  "CreatedAt",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// ArtifactValidationError is the validation error returned by
-// Artifact.Validate if the designated constraints aren't met.
-type ArtifactValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ArtifactValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ArtifactValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ArtifactValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ArtifactValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ArtifactValidationError) ErrorName() string { return "ArtifactValidationError" }
-
-// Error satisfies the builtin error interface
-func (e ArtifactValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sArtifact.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ArtifactValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ArtifactValidationError{}
-
-// Validate checks the field values on ArtifactData with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *ArtifactData) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Name
-
-	if v, ok := interface{}(m.GetValue()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ArtifactDataValidationError{
-				field:  "Value",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// ArtifactDataValidationError is the validation error returned by
-// ArtifactData.Validate if the designated constraints aren't met.
-type ArtifactDataValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ArtifactDataValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ArtifactDataValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ArtifactDataValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ArtifactDataValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ArtifactDataValidationError) ErrorName() string { return "ArtifactDataValidationError" }
-
-// Error satisfies the builtin error interface
-func (e ArtifactDataValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sArtifactData.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ArtifactDataValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ArtifactDataValidationError{}
-
-// Validate checks the field values on Tag with the rules defined in the proto
-// definition for this message. If any rules are violated, an error is returned.
-func (m *Tag) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Name
-
-	// no validation rules for ArtifactId
-
-	if v, ok := interface{}(m.GetDataset()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return TagValidationError{
-				field:  "Dataset",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	return nil
-}
-
-// TagValidationError is the validation error returned by Tag.Validate if the
-// designated constraints aren't met.
-type TagValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e TagValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e TagValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e TagValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e TagValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e TagValidationError) ErrorName() string { return "TagValidationError" }
-
-// Error satisfies the builtin error interface
-func (e TagValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sTag.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = TagValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = TagValidationError{}
-
-// Validate checks the field values on Metadata with the rules defined in the
-// proto definition for this message. If any rules are violated, an error is returned.
-func (m *Metadata) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for KeyMap
-
-	return nil
-}
-
-// MetadataValidationError is the validation error returned by
-// Metadata.Validate if the designated constraints aren't met.
-type MetadataValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e MetadataValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e MetadataValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e MetadataValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e MetadataValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e MetadataValidationError) ErrorName() string { return "MetadataValidationError" }
-
-// Error satisfies the builtin error interface
-func (e MetadataValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sMetadata.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = MetadataValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = MetadataValidationError{}
-
-// Validate checks the field values on FilterExpression with the rules defined
-// in the proto definition for this message. If any rules are violated, an
-// error is returned.
-func (m *FilterExpression) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	for idx, item := range m.GetFilters() {
-		_, _ = idx, item
-
-		if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return FilterExpressionValidationError{
-					field:  fmt.Sprintf("Filters[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// FilterExpressionValidationError is the validation error returned by
-// FilterExpression.Validate if the designated constraints aren't met.
-type FilterExpressionValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e FilterExpressionValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e FilterExpressionValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e FilterExpressionValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e FilterExpressionValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e FilterExpressionValidationError) ErrorName() string { return "FilterExpressionValidationError" }
-
-// Error satisfies the builtin error interface
-func (e FilterExpressionValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sFilterExpression.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = FilterExpressionValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = FilterExpressionValidationError{}
-
-// Validate checks the field values on SinglePropertyFilter with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *SinglePropertyFilter) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Operator
-
-	switch m.PropertyFilter.(type) {
-
-	case *SinglePropertyFilter_TagFilter:
-
-		if v, ok := interface{}(m.GetTagFilter()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return SinglePropertyFilterValidationError{
-					field:  "TagFilter",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	case *SinglePropertyFilter_PartitionFilter:
-
-		if v, ok := interface{}(m.GetPartitionFilter()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return SinglePropertyFilterValidationError{
-					field:  "PartitionFilter",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	case *SinglePropertyFilter_ArtifactFilter:
-
-		if v, ok := interface{}(m.GetArtifactFilter()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return SinglePropertyFilterValidationError{
-					field:  "ArtifactFilter",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	case *SinglePropertyFilter_DatasetFilter:
-
-		if v, ok := interface{}(m.GetDatasetFilter()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return SinglePropertyFilterValidationError{
-					field:  "DatasetFilter",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// SinglePropertyFilterValidationError is the validation error returned by
-// SinglePropertyFilter.Validate if the designated constraints aren't met.
-type SinglePropertyFilterValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e SinglePropertyFilterValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e SinglePropertyFilterValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e SinglePropertyFilterValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e SinglePropertyFilterValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e SinglePropertyFilterValidationError) ErrorName() string {
-	return "SinglePropertyFilterValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e SinglePropertyFilterValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sSinglePropertyFilter.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = SinglePropertyFilterValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = SinglePropertyFilterValidationError{}
-
-// Validate checks the field values on ArtifactPropertyFilter with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *ArtifactPropertyFilter) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	switch m.Property.(type) {
-
-	case *ArtifactPropertyFilter_ArtifactId:
-		// no validation rules for ArtifactId
-
-	}
-
-	return nil
-}
-
-// ArtifactPropertyFilterValidationError is the validation error returned by
-// ArtifactPropertyFilter.Validate if the designated constraints aren't met.
-type ArtifactPropertyFilterValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ArtifactPropertyFilterValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ArtifactPropertyFilterValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ArtifactPropertyFilterValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ArtifactPropertyFilterValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ArtifactPropertyFilterValidationError) ErrorName() string {
-	return "ArtifactPropertyFilterValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ArtifactPropertyFilterValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sArtifactPropertyFilter.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ArtifactPropertyFilterValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ArtifactPropertyFilterValidationError{}
-
-// Validate checks the field values on TagPropertyFilter with the rules defined
-// in the proto definition for this message. If any rules are violated, an
-// error is returned.
-func (m *TagPropertyFilter) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	switch m.Property.(type) {
-
-	case *TagPropertyFilter_TagName:
-		// no validation rules for TagName
-
-	}
-
-	return nil
-}
-
-// TagPropertyFilterValidationError is the validation error returned by
-// TagPropertyFilter.Validate if the designated constraints aren't met.
-type TagPropertyFilterValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e TagPropertyFilterValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e TagPropertyFilterValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e TagPropertyFilterValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e TagPropertyFilterValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e TagPropertyFilterValidationError) ErrorName() string {
-	return "TagPropertyFilterValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e TagPropertyFilterValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sTagPropertyFilter.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = TagPropertyFilterValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = TagPropertyFilterValidationError{}
-
-// Validate checks the field values on PartitionPropertyFilter with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *PartitionPropertyFilter) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	switch m.Property.(type) {
-
-	case *PartitionPropertyFilter_KeyVal:
-
-		if v, ok := interface{}(m.GetKeyVal()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return PartitionPropertyFilterValidationError{
-					field:  "KeyVal",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// PartitionPropertyFilterValidationError is the validation error returned by
-// PartitionPropertyFilter.Validate if the designated constraints aren't met.
-type PartitionPropertyFilterValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e PartitionPropertyFilterValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e PartitionPropertyFilterValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e PartitionPropertyFilterValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e PartitionPropertyFilterValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e PartitionPropertyFilterValidationError) ErrorName() string {
-	return "PartitionPropertyFilterValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e PartitionPropertyFilterValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sPartitionPropertyFilter.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = PartitionPropertyFilterValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = PartitionPropertyFilterValidationError{}
-
-// Validate checks the field values on KeyValuePair with the rules defined in
-// the proto definition for this message. If any rules are violated, an error
-// is returned.
-func (m *KeyValuePair) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Key
-
-	// no validation rules for Value
-
-	return nil
-}
-
-// KeyValuePairValidationError is the validation error returned by
-// KeyValuePair.Validate if the designated constraints aren't met.
-type KeyValuePairValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e KeyValuePairValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e KeyValuePairValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e KeyValuePairValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e KeyValuePairValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e KeyValuePairValidationError) ErrorName() string { return "KeyValuePairValidationError" }
-
-// Error satisfies the builtin error interface
-func (e KeyValuePairValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sKeyValuePair.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = KeyValuePairValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = KeyValuePairValidationError{}
-
-// Validate checks the field values on DatasetPropertyFilter with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, an error is returned.
-func (m *DatasetPropertyFilter) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	switch m.Property.(type) {
-
-	case *DatasetPropertyFilter_Project:
-		// no validation rules for Project
-
-	case *DatasetPropertyFilter_Name:
-		// no validation rules for Name
-
-	case *DatasetPropertyFilter_Domain:
-		// no validation rules for Domain
-
-	case *DatasetPropertyFilter_Version:
-		// no validation rules for Version
-
-	}
-
-	return nil
-}
-
-// DatasetPropertyFilterValidationError is the validation error returned by
-// DatasetPropertyFilter.Validate if the designated constraints aren't met.
-type DatasetPropertyFilterValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e DatasetPropertyFilterValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e DatasetPropertyFilterValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e DatasetPropertyFilterValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e DatasetPropertyFilterValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e DatasetPropertyFilterValidationError) ErrorName() string {
-	return "DatasetPropertyFilterValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e DatasetPropertyFilterValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sDatasetPropertyFilter.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = DatasetPropertyFilterValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = DatasetPropertyFilterValidationError{}
-
-// Validate checks the field values on PaginationOptions with the rules defined
-// in the proto definition for this message. If any rules are violated, an
-// error is returned.
-func (m *PaginationOptions) Validate() error {
-	if m == nil {
-		return nil
-	}
-
-	// no validation rules for Limit
-
-	// no validation rules for Token
-
-	// no validation rules for SortKey
-
-	// no validation rules for SortOrder
-
-	return nil
-}
-
-// PaginationOptionsValidationError is the validation error returned by
-// PaginationOptions.Validate if the designated constraints aren't met.
-type PaginationOptionsValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e PaginationOptionsValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e PaginationOptionsValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e PaginationOptionsValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e PaginationOptionsValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e PaginationOptionsValidationError) ErrorName() string {
-	return "PaginationOptionsValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e PaginationOptionsValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sPaginationOptions.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = PaginationOptionsValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = PaginationOptionsValidationError{}
diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go
index c707fd10f0..60bc47c3ec 100644
--- a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go
@@ -6,11 +6,7 @@ package service
 import (
 	context "context"
 	fmt "fmt"
-<<<<<<< HEAD
 	admin "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
-=======
-	admin "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 	proto "github.com/golang/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -33,7 +29,6 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 func init() { proto.RegisterFile("flyteidl/service/admin.proto", fileDescriptor_5cfa31da1d67295d) }
 
 var fileDescriptor_5cfa31da1d67295d = []byte{
-<<<<<<< HEAD
 	// 2165 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x9a, 0xdf, 0x6f, 0x1d, 0x47,
 	0x15, 0xc7, 0x35, 0x36, 0x02, 0x31, 0x4d, 0x62, 0x7b, 0x9a, 0x60, 0x67, 0x63, 0x27, 0xe9, 0xba,
@@ -171,142 +166,6 @@ var fileDescriptor_5cfa31da1d67295d = []byte{
 	0xfe, 0x87, 0x93, 0xdc, 0xa5, 0xdb, 0xa1, 0x3d, 0xa7, 0xbf, 0xbd, 0xbc, 0x13, 0x38, 0xd9, 0x3b,
 	0x99, 0xdb, 0x1f, 0x86, 0xeb, 0x74, 0x97, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x69, 0x42, 0xd8,
 	0x48, 0xae, 0x29, 0x00, 0x00,
-=======
-	// 2127 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x9a, 0xdf, 0x6f, 0x1d, 0x47,
-	0x15, 0xc7, 0x35, 0x36, 0x02, 0x31, 0x4d, 0x62, 0x7b, 0x9a, 0x60, 0x67, 0x63, 0x27, 0xe9, 0xba,
-	0x8e, 0x7f, 0xdf, 0x75, 0xd3, 0xb4, 0x51, 0x42, 0x7f, 0xb9, 0xb5, 0x73, 0x65, 0x08, 0x49, 0x31,
-	0x29, 0x48, 0x16, 0xd2, 0xd5, 0xfa, 0xee, 0xc4, 0xde, 0xe4, 0xde, 0xbb, 0xb7, 0xbb, 0x63, 0x17,
-	0xcb, 0xb2, 0xf8, 0xf1, 0x80, 0xa8, 0x90, 0x78, 0xe0, 0x87, 0xa0, 0x10, 0x51, 0x0a, 0x45, 0xfc,
-	0x2c, 0x2f, 0xa0, 0x22, 0x24, 0x54, 0x09, 0xc1, 0x03, 0x2f, 0xbc, 0xc0, 0x3b, 0x2f, 0xf4, 0x99,
-	0xbf, 0x01, 0xcd, 0xd9, 0x99, 0xbd, 0x3b, 0xbb, 0x3b, 0xbb, 0xb3, 0x26, 0xe5, 0x89, 0x37, 0xfb,
-	0x9e, 0xef, 0xcc, 0x7c, 0xce, 0x99, 0x33, 0x67, 0x66, 0x67, 0x17, 0x4f, 0xde, 0xed, 0x1c, 0x30,
-	0xea, 0x7b, 0x1d, 0x27, 0xa2, 0xe1, 0xbe, 0xdf, 0xa6, 0x8e, 0xeb, 0x75, 0xfd, 0x5e, 0xa3, 0x1f,
-	0x06, 0x2c, 0x20, 0xa3, 0xd2, 0xda, 0x10, 0x56, 0x6b, 0x72, 0x27, 0x08, 0x76, 0x3a, 0xd4, 0x71,
-	0xfb, 0xbe, 0xe3, 0xf6, 0x7a, 0x01, 0x73, 0x99, 0x1f, 0xf4, 0xa2, 0x58, 0x6f, 0x0d, 0x7a, 0x83,
-	0x5e, 0x9c, 0x7e, 0x18, 0xdc, 0xa3, 0x6d, 0x26, 0xac, 0x8d, 0x62, 0x6b, 0xcb, 0x0b, 0xba, 0xae,
-	0xdf, 0x6b, 0xb9, 0x8c, 0x85, 0xfe, 0xf6, 0x1e, 0xa3, 0xb2, 0xb7, 0x59, 0x8d, 0x3e, 0x27, 0x3c,
-	0x9b, 0x11, 0x32, 0x37, 0xba, 0x2f, 0x4c, 0x53, 0x19, 0xd3, 0x6b, 0x41, 0x78, 0xff, 0x6e, 0x27,
-	0x78, 0x4d, 0x98, 0xe7, 0x34, 0xe6, 0xfc, 0x18, 0x17, 0x33, 0xca, 0x8e, 0xbb, 0xd7, 0x6b, 0xef,
-	0xb6, 0xfa, 0x1d, 0x57, 0x04, 0xcb, 0xb2, 0x32, 0x0a, 0xba, 0x4f, 0x7b, 0xd2, 0xf5, 0xf3, 0x59,
-	0xdb, 0x17, 0x68, 0x7b, 0x8f, 0x47, 0x4e, 0xe3, 0x6a, 0xd7, 0x65, 0xed, 0x5d, 0x77, 0xbb, 0x43,
-	0x5b, 0x21, 0x8d, 0x82, 0xbd, 0xb0, 0x4d, 0x85, 0x70, 0x3a, 0x23, 0xec, 0x05, 0x1e, 0x6d, 0x65,
-	0x7b, 0x9b, 0x2e, 0x88, 0x47, 0x4e, 0x94, 0x9d, 0xab, 0x7d, 0x1a, 0x46, 0x03, 0xeb, 0xb9, 0x8c,
-	0xb5, 0x1d, 0x74, 0xbb, 0x5a, 0x5a, 0x8f, 0x46, 0xed, 0xd0, 0xef, 0xf3, 0xce, 0x5b, 0xb4, 0xc7,
-	0x7c, 0x76, 0x10, 0x0b, 0x2f, 0xff, 0xf1, 0x26, 0x3e, 0xb1, 0xca, 0x25, 0x9f, 0x89, 0xd3, 0x87,
-	0x74, 0x31, 0x7e, 0x29, 0xa4, 0x2e, 0xa3, 0x77, 0xdc, 0xe8, 0x3e, 0x79, 0x2c, 0xc9, 0x88, 0x46,
-	0x9c, 0x75, 0xfc, 0xd7, 0xd8, 0xbe, 0x49, 0x5f, 0xdd, 0xa3, 0x11, 0xb3, 0xec, 0x32, 0x49, 0xd4,
-	0x0f, 0x7a, 0x11, 0xb5, 0x27, 0xbe, 0xf2, 0x8f, 0xf7, 0xbf, 0x35, 0x44, 0xec, 0x93, 0x90, 0x95,
-	0xfb, 0x4f, 0x80, 0xbf, 0xd1, 0x75, 0xb4, 0x40, 0xbe, 0x86, 0xf0, 0x47, 0x9a, 0x94, 0xc1, 0x60,
-	0x17, 0xb3, 0x3d, 0xdd, 0xde, 0xe6, 0xd9, 0xd4, 0xa4, 0x4c, 0x8e, 0x75, 0xba, 0x68, 0x2c, 0x7b,
-	0x1d, 0x7a, 0x7f, 0x9e, 0x3c, 0xab, 0xf4, 0xee, 0x1c, 0xfa, 0x5e, 0x43, 0x24, 0xe4, 0x11, 0xfc,
-	0x13, 0x67, 0x71, 0xfc, 0x77, 0xcf, 0xed, 0xd2, 0xf8, 0x2f, 0x11, 0xd5, 0x23, 0xf2, 0x5d, 0x84,
-	0x1f, 0xb9, 0xe9, 0x47, 0xc0, 0xb2, 0xe1, 0x45, 0x64, 0x25, 0x3b, 0xd8, 0x2d, 0xb7, 0x4b, 0xbd,
-	0x75, 0x88, 0xde, 0x86, 0xc7, 0xa3, 0x78, 0xd7, 0xa7, 0x21, 0x6f, 0x21, 0xf1, 0xe6, 0x8d, 0x5b,
-	0xd8, 0x8b, 0xc0, 0x3c, 0x43, 0xa6, 0xd3, 0xcc, 0x2d, 0xdf, 0x8b, 0x9c, 0xc3, 0x01, 0xb3, 0x00,
-	0x26, 0xbf, 0x41, 0xf8, 0xa3, 0x92, 0x2c, 0x22, 0xd3, 0xd9, 0x51, 0x36, 0x45, 0x02, 0xa6, 0x51,
-	0x26, 0x8a, 0x22, 0x05, 0x23, 0x6f, 0xc3, 0xc8, 0x9f, 0x27, 0x2b, 0x75, 0xa3, 0xb5, 0x35, 0x47,
-	0x2e, 0x99, 0xb5, 0x21, 0x47, 0xf8, 0x54, 0x9c, 0x01, 0x9f, 0x13, 0xab, 0x95, 0xcc, 0x64, 0x79,
-	0xa4, 0x45, 0x4d, 0xa6, 0x4b, 0x55, 0x32, 0x91, 0x50, 0x93, 0xe0, 0xc4, 0xc7, 0xec, 0x31, 0x09,
-	0x24, 0xcb, 0x02, 0x24, 0xd5, 0xb7, 0x11, 0x7e, 0xa4, 0x49, 0x59, 0x32, 0x78, 0x75, 0x62, 0x4d,
-	0xe8, 0xc6, 0xb5, 0x37, 0x60, 0xa4, 0x97, 0xc8, 0x6a, 0x6e, 0xa4, 0xda, 0x09, 0xf6, 0x26, 0xc2,
-	0x23, 0x7c, 0x0a, 0x64, 0xdf, 0x1f, 0x78, 0x92, 0x39, 0xc0, 0x3e, 0x4f, 0x66, 0xb3, 0xec, 0xba,
-	0x44, 0x7b, 0x0f, 0xe1, 0x93, 0x69, 0x42, 0xc3, 0x64, 0x9b, 0xd4, 0x45, 0x0f, 0x28, 0xee, 0x01,
-	0x85, 0x47, 0xae, 0x1c, 0x27, 0x82, 0x5b, 0x4b, 0x64, 0xc1, 0xbc, 0x1d, 0xf9, 0x2a, 0xc2, 0xa3,
-	0x71, 0xaa, 0xdc, 0x84, 0xea, 0xff, 0x72, 0xc7, 0xed, 0x91, 0xd9, 0x2c, 0xde, 0xc0, 0xa6, 0x66,
-	0xdf, 0x5c, 0xb5, 0x50, 0xe4, 0xdf, 0x05, 0xf0, 0xe9, 0xac, 0x7d, 0x5a, 0xb2, 0xa5, 0x36, 0x1b,
-	0x48, 0xc1, 0x1f, 0x20, 0x7c, 0xb2, 0x49, 0x59, 0x8a, 0xa2, 0x3a, 0x09, 0x2d, 0xfd, 0xf0, 0xf6,
-	0x4d, 0x18, 0xf0, 0x06, 0x59, 0x2b, 0x1a, 0xb0, 0x76, 0x26, 0xfe, 0x18, 0xe1, 0x47, 0x9b, 0x94,
-	0xad, 0xb6, 0x99, 0xbf, 0x5f, 0x1a, 0xa9, 0xac, 0xc2, 0x04, 0xf5, 0x06, 0xa0, 0xbe, 0x40, 0x9e,
-	0x93, 0xa8, 0x2e, 0x74, 0xd2, 0xaa, 0x49, 0x4c, 0x1e, 0x20, 0x7c, 0x86, 0x27, 0x50, 0x96, 0x21,
-	0x22, 0x8b, 0x55, 0x98, 0xe9, 0xe4, 0x3c, 0xaf, 0x47, 0x85, 0xf4, 0x7c, 0x1a, 0x70, 0x57, 0x48,
-	0xa3, 0x14, 0x37, 0xbf, 0x56, 0xde, 0x46, 0x78, 0x8c, 0x77, 0x30, 0xe8, 0xee, 0x03, 0x5f, 0xcf,
-	0x97, 0x01, 0x35, 0xb5, 0x22, 0x52, 0x8c, 0xba, 0x25, 0xfd, 0x57, 0x51, 0x74, 0xd2, 0xf1, 0x33,
-	0x5a, 0xd4, 0x55, 0x71, 0xeb, 0x03, 0xcc, 0x3d, 0x72, 0xf5, 0x98, 0x19, 0xb9, 0xe5, 0x90, 0xe5,
-	0x5a, 0x4d, 0xc9, 0xbb, 0x08, 0x8f, 0xbe, 0xd2, 0xf7, 0x8c, 0x17, 0x77, 0xac, 0x35, 0x58, 0xdc,
-	0x52, 0x28, 0x16, 0xf7, 0x6d, 0xf0, 0x6c, 0xc3, 0x7a, 0x28, 0x6b, 0x8d, 0x17, 0x83, 0x2f, 0x23,
-	0x3c, 0x12, 0x17, 0x90, 0x75, 0x79, 0xc4, 0x23, 0xb9, 0x9d, 0x2e, 0x31, 0xa9, 0x35, 0x69, 0xb6,
-	0x52, 0x27, 0xa8, 0xa7, 0x80, 0x7a, 0xdc, 0x26, 0x92, 0x3a, 0x39, 0x4e, 0x42, 0x41, 0xfa, 0x06,
-	0xc2, 0x63, 0x9b, 0x34, 0xf6, 0x64, 0x40, 0x31, 0xa7, 0xed, 0x5d, 0x6a, 0x6b, 0x73, 0x5c, 0x02,
-	0x8e, 0x8b, 0xf6, 0xb9, 0x3c, 0x87, 0x13, 0x8a, 0x4e, 0x39, 0xd0, 0xd7, 0x11, 0x1e, 0xdd, 0xa4,
-	0xed, 0x60, 0x9f, 0x86, 0x03, 0x9e, 0xd9, 0x12, 0x1e, 0x90, 0xd6, 0xc6, 0x99, 0x01, 0x9c, 0x0b,
-	0xb6, 0x55, 0x88, 0x03, 0x7d, 0x72, 0x9a, 0xef, 0x20, 0x7c, 0xa2, 0x49, 0xd9, 0x80, 0x64, 0x51,
-	0xb7, 0xa7, 0x25, 0x92, 0x54, 0xe5, 0x3e, 0xab, 0xa5, 0xb1, 0x9f, 0x85, 0xf1, 0xaf, 0x92, 0xa7,
-	0x0a, 0xc6, 0x37, 0x28, 0x82, 0x6f, 0x23, 0x3c, 0x12, 0xa7, 0xa7, 0x49, 0xea, 0xa8, 0x19, 0x3f,
-	0x5b, 0xa9, 0x13, 0x31, 0x7a, 0x01, 0x18, 0xaf, 0x5b, 0xc7, 0x63, 0xe4, 0xe1, 0xfb, 0x03, 0xc2,
-	0xa3, 0xe9, 0xf0, 0xad, 0xb9, 0xcc, 0x25, 0x8e, 0x49, 0x08, 0xb9, 0x52, 0x02, 0xaf, 0x98, 0x37,
-	0x10, 0xe4, 0x2f, 0x02, 0xf9, 0x33, 0xe4, 0xba, 0x24, 0xf7, 0x5c, 0xe6, 0xd6, 0x0c, 0xf1, 0xeb,
-	0x08, 0x9f, 0xe2, 0x15, 0x2d, 0x19, 0xc4, 0xb0, 0x40, 0x4e, 0x69, 0xc3, 0x0b, 0xf5, 0xf1, 0x49,
-	0x40, 0x5b, 0x26, 0x8b, 0x35, 0x82, 0x4a, 0xde, 0x41, 0x98, 0xdc, 0xa1, 0x61, 0xd7, 0xef, 0x29,
-	0x33, 0x3e, 0xaf, 0x1d, 0x2a, 0x11, 0x4b, 0xaa, 0x05, 0x13, 0xa9, 0x3a, 0xef, 0x0b, 0xc7, 0x9f,
-	0xf7, 0xbf, 0xc7, 0xf3, 0x7e, 0x2b, 0xf0, 0x68, 0xc9, 0x22, 0x56, 0xcc, 0xa9, 0x65, 0x33, 0x55,
-	0x2a, 0xb4, 0xf7, 0x01, 0xaf, 0x4f, 0x7a, 0x12, 0x4f, 0x7d, 0x94, 0x8e, 0x19, 0x93, 0x7f, 0x5b,
-	0x59, 0x60, 0xc5, 0x92, 0xa6, 0x57, 0x0c, 0x83, 0x8a, 0x0d, 0xbd, 0xfb, 0xde, 0x11, 0xf9, 0x27,
-	0xc2, 0x84, 0x4f, 0xa1, 0x42, 0x13, 0xe5, 0x6b, 0xa5, 0x62, 0x4f, 0x67, 0xc6, 0x63, 0x95, 0x4a,
-	0xfb, 0x10, 0x7c, 0xdb, 0x23, 0x91, 0xd6, 0xb7, 0xe4, 0xac, 0xae, 0xf1, 0xb0, 0xd8, 0x9e, 0xf8,
-	0x59, 0x6c, 0x8e, 0x33, 0xfe, 0xa7, 0x1f, 0xc2, 0x67, 0xf3, 0x0e, 0xde, 0x08, 0x42, 0x78, 0x0c,
-	0x77, 0x4a, 0xe9, 0x85, 0xaa, 0xa6, 0xbb, 0xbf, 0x1d, 0x06, 0x7f, 0x7f, 0x3d, 0x4c, 0x7e, 0x31,
-	0x2c, 0x3d, 0x6e, 0xef, 0xfa, 0x1d, 0x2f, 0xa4, 0xd9, 0xcb, 0x8f, 0xc8, 0x39, 0x54, 0x7f, 0x68,
-	0xc9, 0xb9, 0x51, 0x7e, 0xd1, 0x44, 0xa5, 0x76, 0xd3, 0x24, 0x60, 0xb5, 0x5b, 0x8a, 0xcc, 0x31,
-	0x69, 0x27, 0x53, 0xab, 0x48, 0x2d, 0x1e, 0xfc, 0x4b, 0x7d, 0x90, 0x9a, 0x12, 0x58, 0x29, 0xd1,
-	0x52, 0x49, 0x81, 0x3c, 0x98, 0x14, 0x69, 0x42, 0xca, 0xc2, 0x83, 0x96, 0xcb, 0x18, 0xed, 0xf6,
-	0xd9, 0x11, 0xf9, 0x37, 0xc2, 0xa7, 0xb3, 0xab, 0x1b, 0x2a, 0xfb, 0x62, 0xd5, 0x0a, 0x4f, 0x57,
-	0xf5, 0x25, 0x33, 0xb1, 0xa8, 0x49, 0xb9, 0x85, 0x01, 0x15, 0xfd, 0x7f, 0xb4, 0xf2, 0xbf, 0x88,
-	0x47, 0x36, 0xe9, 0x8e, 0x1f, 0x31, 0x1a, 0xbe, 0x1c, 0x77, 0x98, 0xdf, 0x6c, 0x85, 0x41, 0xea,
-	0xb4, 0x9b, 0x6d, 0x4e, 0x27, 0x1c, 0x3c, 0x07, 0x0e, 0x9e, 0xb1, 0x47, 0xa5, 0x83, 0x02, 0x1d,
-	0x4e, 0x69, 0xaf, 0xe2, 0x93, 0xf1, 0xde, 0x2c, 0x87, 0x1f, 0xd7, 0x74, 0x6b, 0xcd, 0x68, 0x0c,
-	0x99, 0xad, 0xfd, 0x22, 0x8c, 0x66, 0x59, 0x67, 0xb2, 0xa3, 0x71, 0xc7, 0xa1, 0x84, 0xdf, 0xc5,
-	0x27, 0xf8, 0x12, 0x15, 0xcd, 0x23, 0x62, 0x6b, 0x3a, 0x2e, 0xbd, 0x5d, 0x92, 0xad, 0xe5, 0x4d,
-	0x1f, 0xc9, 0x79, 0x47, 0xde, 0x40, 0xf8, 0x51, 0xf5, 0x52, 0x68, 0x7d, 0x9f, 0xf6, 0x18, 0x59,
-	0xae, 0xdc, 0xf4, 0x41, 0x27, 0x87, 0x6e, 0x98, 0xca, 0x45, 0x00, 0xa6, 0x01, 0x68, 0xca, 0x9e,
-	0x48, 0xf6, 0x38, 0x6e, 0x8e, 0xd4, 0x0b, 0xa3, 0xd7, 0x93, 0x03, 0x3a, 0xe4, 0x26, 0x70, 0xcd,
-	0x97, 0xa6, 0xad, 0xc2, 0xb4, 0x60, 0x22, 0xd5, 0xdd, 0x1c, 0x08, 0x1e, 0x9e, 0x83, 0x19, 0x16,
-	0x5e, 0x67, 0x35, 0x2c, 0x60, 0x32, 0x63, 0x29, 0x92, 0x56, 0xb0, 0x24, 0xb7, 0xb3, 0x5f, 0x1a,
-	0x86, 0xed, 0x5d, 0xe9, 0x22, 0xbf, 0xbd, 0x2b, 0xe6, 0xb2, 0xed, 0x5d, 0x11, 0xda, 0x3f, 0x19,
-	0x82, 0xe1, 0x1f, 0x0c, 0x91, 0x37, 0x86, 0x94, 0x5b, 0xd0, 0xcc, 0x3a, 0x37, 0xae, 0xfd, 0x35,
-	0x8a, 0xbd, 0x71, 0x75, 0xaf, 0x28, 0xe7, 0x85, 0xf5, 0xbb, 0xa8, 0x60, 0xe7, 0x2b, 0x74, 0x61,
-	0x49, 0xce, 0xd7, 0xe0, 0xef, 0x0d, 0xc5, 0x87, 0x11, 0x25, 0x76, 0x05, 0x87, 0x11, 0xc5, 0x5e,
-	0xba, 0x3b, 0xe7, 0x94, 0xf6, 0xef, 0x10, 0xcc, 0xc4, 0x3b, 0x88, 0xfc, 0x12, 0x69, 0x67, 0xc2,
-	0x78, 0x1a, 0x4c, 0xe7, 0xc0, 0x6c, 0x02, 0xf4, 0xd1, 0x27, 0x0f, 0x86, 0x61, 0x7b, 0x52, 0xfc,
-	0x29, 0xde, 0x9e, 0xb2, 0x19, 0x5a, 0xba, 0x3d, 0x15, 0x8b, 0xc5, 0x92, 0xf9, 0x79, 0x9c, 0xb4,
-	0x6f, 0x0d, 0x91, 0x1f, 0x0e, 0x29, 0x3b, 0xd4, 0xff, 0x33, 0x37, 0x9b, 0xb9, 0xff, 0x42, 0x78,
-	0x4a, 0xd9, 0xcc, 0xd6, 0xa0, 0xcb, 0xd5, 0xe4, 0xbd, 0x1d, 0xb9, 0xa2, 0xd9, 0x46, 0xb2, 0x42,
-	0xf5, 0xb1, 0xf6, 0xa9, 0x9a, 0xad, 0xc4, 0xcc, 0xbd, 0x02, 0x13, 0x77, 0xdb, 0xfa, 0x44, 0x66,
-	0x67, 0xca, 0xbf, 0xdc, 0x74, 0x0e, 0xd5, 0x77, 0x8b, 0x22, 0x38, 0xa9, 0x1f, 0x45, 0x70, 0x78,
-	0x89, 0xfc, 0x13, 0xc2, 0x56, 0x93, 0x32, 0x9d, 0x8b, 0x4f, 0x18, 0xc2, 0xa6, 0xca, 0xe6, 0xe5,
-	0x3a, 0x4d, 0x84, 0x73, 0xcf, 0x80, 0x73, 0x4f, 0x0f, 0xee, 0xd8, 0x4b, 0x9c, 0xcb, 0xdf, 0x11,
-	0xfe, 0x0d, 0xe1, 0xa9, 0x35, 0xda, 0xa1, 0xff, 0xfd, 0x4c, 0xc5, 0xbd, 0xd4, 0x9d, 0x29, 0xd9,
-	0x4a, 0x38, 0xf3, 0x3c, 0x38, 0x73, 0x6d, 0xe1, 0x58, 0xce, 0xf0, 0x39, 0x79, 0x17, 0xe1, 0x71,
-	0x25, 0xf3, 0x52, 0x9e, 0x34, 0x34, 0x4c, 0xba, 0x6c, 0x73, 0x8c, 0xf5, 0x82, 0xfe, 0x3a, 0xd0,
-	0x5f, 0xb1, 0x9c, 0x2c, 0x7d, 0x45, 0x82, 0x71, 0xf0, 0x37, 0xe3, 0x03, 0x77, 0x9e, 0x7a, 0xb1,
-	0x92, 0x22, 0x95, 0x40, 0x4b, 0x66, 0x62, 0xc1, 0xbb, 0x04, 0xbc, 0x97, 0xc8, 0xe3, 0x65, 0xbc,
-	0x12, 0x92, 0xfc, 0x0a, 0xe1, 0x71, 0x25, 0x55, 0x6a, 0x85, 0x56, 0x4d, 0x0f, 0xc7, 0x58, 0x2f,
-	0x50, 0xc5, 0xfb, 0xac, 0x05, 0x23, 0x54, 0x1e, 0xcf, 0xf7, 0x11, 0x9e, 0x88, 0xa7, 0x47, 0x9e,
-	0x12, 0x53, 0xb8, 0xda, 0xeb, 0x29, 0x5d, 0x2a, 0xac, 0x98, 0x37, 0x10, 0xc0, 0x14, 0x80, 0x5b,
-	0xd6, 0x56, 0xee, 0x05, 0xdc, 0x31, 0xaa, 0x8d, 0xf2, 0x9b, 0xec, 0x08, 0xdc, 0xfc, 0x3d, 0xc2,
-	0x67, 0x52, 0xef, 0x3b, 0x53, 0x3e, 0x2e, 0x55, 0x23, 0xa7, 0x12, 0x67, 0xd9, 0x50, 0x2d, 0xbc,
-	0x5b, 0x05, 0xef, 0x3e, 0x4e, 0xae, 0x95, 0x7a, 0x97, 0x5b, 0xa1, 0x83, 0xbb, 0x89, 0x23, 0xf2,
-	0x67, 0x84, 0x27, 0xe2, 0x49, 0x3e, 0xde, 0x04, 0xa9, 0x09, 0xb5, 0x62, 0xde, 0x40, 0xb8, 0xb0,
-	0x06, 0x2e, 0x3c, 0xb7, 0x70, 0x7c, 0x17, 0x78, 0xfc, 0x7f, 0x84, 0xf0, 0x38, 0x3f, 0x48, 0x7d,
-	0x4a, 0x7e, 0x13, 0x52, 0xb6, 0x28, 0x34, 0x42, 0xed, 0xa2, 0xd0, 0xea, 0x85, 0x0b, 0x8f, 0x83,
-	0x0b, 0xe7, 0xc9, 0xa4, 0x74, 0x61, 0xf0, 0x65, 0xca, 0xc0, 0x07, 0x5e, 0x59, 0xe0, 0x6d, 0xd5,
-	0xe0, 0xe5, 0x92, 0x4f, 0xa3, 0xfc, 0xc3, 0x6d, 0xea, 0xdd, 0x53, 0xfa, 0x0c, 0x79, 0xa1, 0x42,
-	0x97, 0x4f, 0x05, 0x7e, 0x54, 0xf0, 0xe2, 0x4f, 0x4d, 0x7c, 0x1e, 0x42, 0xf9, 0x91, 0x4c, 0x8b,
-	0x1d, 0xf4, 0xf9, 0x19, 0x22, 0xbf, 0x09, 0xfd, 0x0c, 0xe1, 0x53, 0x4d, 0x9a, 0x02, 0x3c, 0xc8,
-	0x7f, 0x34, 0x90, 0x32, 0xa6, 0xd2, 0xf6, 0x5c, 0x89, 0xcc, 0xfe, 0x34, 0x90, 0x7d, 0x92, 0x6c,
-	0x98, 0x92, 0x55, 0x5f, 0x18, 0xbf, 0x87, 0xf0, 0x58, 0xbc, 0xd0, 0xd3, 0xb0, 0x73, 0x25, 0x14,
-	0x6a, 0x1d, 0x99, 0x37, 0x50, 0x8a, 0xc9, 0xbd, 0x03, 0xf4, 0xb7, 0xac, 0x87, 0x47, 0xcf, 0xf3,
-	0xb5, 0x83, 0x71, 0x93, 0xb2, 0xcf, 0xc6, 0x67, 0xb7, 0xfc, 0x37, 0x3e, 0x03, 0x9b, 0xf6, 0x1b,
-	0x9f, 0xb4, 0x44, 0xa0, 0x8e, 0x03, 0xea, 0x18, 0x19, 0x91, 0xa8, 0xe2, 0x6c, 0x48, 0xfe, 0x12,
-	0x6f, 0x6a, 0x6b, 0x83, 0x4f, 0x90, 0x44, 0xc4, 0xaa, 0xdf, 0x88, 0xe7, 0xd0, 0x72, 0x9d, 0xd8,
-	0x3b, 0x30, 0xac, 0x4b, 0x5a, 0xc9, 0x69, 0x3c, 0xfb, 0xa9, 0x13, 0xc4, 0x09, 0x8e, 0xa7, 0x35,
-	0x43, 0xa5, 0xbe, 0x33, 0xff, 0xe6, 0x50, 0xbc, 0xc8, 0xb3, 0x08, 0x7e, 0x51, 0x99, 0xcd, 0x71,
-	0xa6, 0x57, 0xd3, 0x8c, 0x91, 0xda, 0x7e, 0x2b, 0x7e, 0x2a, 0xfb, 0x3e, 0x22, 0xb7, 0xcb, 0x7d,
-	0xab, 0xed, 0xd8, 0x56, 0x93, 0xac, 0x3f, 0x94, 0x2e, 0x5f, 0xbc, 0xb6, 0x75, 0x75, 0xc7, 0x67,
-	0xbb, 0x7b, 0xdb, 0x8d, 0x76, 0xd0, 0x75, 0xc0, 0xad, 0x20, 0xdc, 0x71, 0x92, 0xaf, 0xcf, 0x76,
-	0x68, 0xcf, 0xe9, 0x6f, 0x2f, 0xef, 0x04, 0x4e, 0xf6, 0x2b, 0xc6, 0xed, 0x0f, 0xc3, 0x07, 0x68,
-	0x4f, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x36, 0x38, 0x50, 0x1c, 0xe0, 0x28, 0x00, 0x00,
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go
index b548e280db..82a13c75bf 100644
--- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go
@@ -6,7 +6,7 @@ package service
 import (
 	context "context"
 	fmt "fmt"
-	core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
+	core "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 	proto "github.com/golang/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -155,37 +155,37 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/service/cache.proto", fileDescriptor_c5ff5da69b96fa44) }
 
 var fileDescriptor_c5ff5da69b96fa44 = []byte{
-	// 476 bytes of a gzipped FileDescriptorProto
+	// 478 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x8a, 0x13, 0x41,
 	0x10, 0x26, 0x46, 0x72, 0x68, 0x05, 0x75, 0x16, 0x51, 0x86, 0x65, 0x91, 0xa0, 0x22, 0x41, 0xa7,
-	0x75, 0x3d, 0x88, 0x07, 0x2f, 0x4a, 0x0e, 0x82, 0xa7, 0xac, 0x20, 0x78, 0x30, 0x74, 0x7a, 0x2a,
-	0xb3, 0x6d, 0x92, 0xae, 0xb1, 0xbb, 0x32, 0x71, 0xd9, 0xcd, 0xc5, 0x57, 0xf0, 0x01, 0xbc, 0x88,
-	0xe0, 0xcd, 0x77, 0xf1, 0x15, 0x04, 0x5f, 0x43, 0xa6, 0xe7, 0x07, 0x67, 0x76, 0x5a, 0x77, 0xaf,
-	0xfd, 0x7d, 0xf5, 0xd5, 0x57, 0xf5, 0x15, 0xcd, 0x76, 0xe7, 0xcb, 0x23, 0x02, 0x15, 0x2f, 0xb9,
-	0x05, 0x93, 0x29, 0x09, 0x5c, 0x0a, 0x79, 0x08, 0x51, 0x6a, 0x90, 0x30, 0xb8, 0x5a, 0xa1, 0x51,
-	0x89, 0x86, 0xbb, 0x09, 0x62, 0xb2, 0x04, 0x2e, 0x52, 0xc5, 0x85, 0xd6, 0x48, 0x82, 0x14, 0x6a,
-	0x5b, 0xf0, 0xc3, 0xb0, 0x56, 0x93, 0x68, 0x80, 0x83, 0x31, 0x68, 0x2a, 0x6c, 0xaf, 0x89, 0xa9,
-	0x18, 0x34, 0xa9, 0xb9, 0x02, 0x53, 0xe0, 0xc3, 0x13, 0x16, 0x8e, 0x33, 0x25, 0x69, 0xfc, 0x11,
-	0xe4, 0x3a, 0x17, 0x7d, 0x91, 0x1b, 0x99, 0xc0, 0x87, 0x35, 0x58, 0x0a, 0xde, 0xb1, 0xeb, 0x1b,
-	0x34, 0x8b, 0xf9, 0x12, 0x37, 0x53, 0xa8, 0x18, 0x53, 0x15, 0xdf, 0xec, 0xdd, 0xea, 0xdd, 0xbb,
-	0xb4, 0x3f, 0x8a, 0x6a, 0xa7, 0xb9, 0x7a, 0xf4, 0xa6, 0xe4, 0xd6, 0x62, 0x2f, 0xeb, 0x76, 0x93,
-	0x9d, 0xcd, 0x69, 0x70, 0x48, 0x6c, 0xcf, 0x75, 0x7f, 0x2d, 0xec, 0xa2, 0xdb, 0xc1, 0x84, 0x5d,
-	0x23, 0x61, 0x17, 0x5d, 0xdd, 0xef, 0xb6, 0xba, 0x37, 0x44, 0xfe, 0xea, 0x7c, 0x85, 0x9a, 0xc0,
-	0xf0, 0x80, 0x05, 0xae, 0x6b, 0xd9, 0xc8, 0xa6, 0xa8, 0x2d, 0x04, 0xcf, 0xd8, 0xa0, 0xd8, 0x5c,
-	0x29, 0x7f, 0xa7, 0x25, 0xef, 0xd8, 0xae, 0x4e, 0xa1, 0x1e, 0xe7, 0xcc, 0x57, 0xca, 0xd2, 0xa4,
-	0x2c, 0xda, 0xff, 0x32, 0x60, 0x97, 0x1d, 0xe5, 0xa0, 0xc8, 0x2c, 0xf8, 0xdd, 0x63, 0x3b, 0x1d,
-	0xab, 0x0d, 0xee, 0x47, 0xed, 0x78, 0x23, 0x7f, 0x02, 0xe1, 0x6d, 0x0f, 0xbb, 0xe1, 0x7d, 0x78,
-	0xf2, 0xe9, 0xe7, 0xaf, 0xcf, 0x17, 0xb2, 0x11, 0xb9, 0x0b, 0xc9, 0x1e, 0x15, 0xe7, 0xc4, 0xeb,
-	0xa5, 0x59, 0x7e, 0xdc, 0x99, 0x63, 0x7e, 0x04, 0xef, 0x41, 0xd2, 0xd6, 0x87, 0xc7, 0xb8, 0x12,
-	0x4a, 0x7b, 0x61, 0x2d, 0x56, 0xb0, 0x0d, 0xbe, 0x5e, 0x64, 0x37, 0x3c, 0x31, 0x06, 0x0f, 0x3d,
-	0xfe, 0xbd, 0x89, 0x9f, 0x71, 0xe2, 0x1f, 0x7d, 0x37, 0xf2, 0xf7, 0xfe, 0xe8, 0x5b, 0xbf, 0x39,
-	0x74, 0xf3, 0x5c, 0x2c, 0x3f, 0x3e, 0x75, 0x3f, 0x91, 0xc6, 0x18, 0x9a, 0x2f, 0x9e, 0xa5, 0x9c,
-	0xbb, 0xb4, 0xde, 0xd7, 0xb9, 0x2b, 0xdd, 0x2a, 0xcf, 0x56, 0xe7, 0x5e, 0x54, 0xdc, 0xc9, 0x76,
-	0x2f, 0xff, 0x99, 0xa1, 0xe2, 0xfc, 0xc3, 0x6c, 0x45, 0xf1, 0xba, 0xaa, 0x08, 0x19, 0x18, 0xab,
-	0xb0, 0x5b, 0xc4, 0x00, 0x99, 0xa3, 0xa9, 0x20, 0x82, 0x55, 0x4a, 0xdb, 0xe7, 0x4f, 0xdf, 0x3e,
-	0x49, 0x14, 0x1d, 0xae, 0x67, 0x91, 0xc4, 0x15, 0x77, 0x21, 0xa3, 0x49, 0x78, 0xfd, 0x41, 0x25,
-	0xa0, 0x79, 0x3a, 0x7b, 0x90, 0x20, 0x6f, 0xff, 0x8e, 0xb3, 0x81, 0xfb, 0xac, 0x1e, 0xff, 0x09,
-	0x00, 0x00, 0xff, 0xff, 0xf4, 0x3a, 0xd2, 0x67, 0x38, 0x05, 0x00, 0x00,
+	0x75, 0x3d, 0x2f, 0x82, 0x92, 0x83, 0xe0, 0x29, 0x2b, 0x08, 0x1e, 0x0c, 0x9d, 0x9e, 0xca, 0x6c,
+	0x9b, 0xa4, 0x6b, 0xec, 0xae, 0x4c, 0x5c, 0x76, 0x73, 0xf1, 0x15, 0x7c, 0x00, 0x2f, 0x22, 0x78,
+	0xf3, 0x5d, 0x7c, 0x05, 0xc1, 0xd7, 0x90, 0xe9, 0xf9, 0xc1, 0x99, 0x9d, 0xd6, 0xdd, 0xdb, 0x30,
+	0xdf, 0x57, 0x5f, 0x7d, 0x55, 0x5f, 0xd1, 0x6c, 0x77, 0xbe, 0x3c, 0x26, 0x50, 0xf1, 0x92, 0x5b,
+	0x30, 0x99, 0x92, 0xc0, 0xa5, 0x90, 0x47, 0x10, 0xa5, 0x06, 0x09, 0x83, 0xeb, 0x15, 0x1a, 0x95,
+	0x68, 0xb8, 0x9b, 0x20, 0x26, 0x4b, 0xe0, 0x22, 0x55, 0x5c, 0x68, 0x8d, 0x24, 0x48, 0xa1, 0xb6,
+	0x05, 0x3f, 0x0c, 0x6b, 0x35, 0x89, 0x06, 0x38, 0x18, 0x83, 0xa6, 0xc2, 0xf6, 0x9a, 0x98, 0x8a,
+	0x41, 0x93, 0x9a, 0x2b, 0x30, 0x05, 0x3e, 0x3c, 0x65, 0xe1, 0x38, 0x53, 0x92, 0xc6, 0x1f, 0x41,
+	0xae, 0x73, 0xd1, 0x17, 0xb9, 0x91, 0x09, 0x7c, 0x58, 0x83, 0xa5, 0xe0, 0x1d, 0xbb, 0xb9, 0x41,
+	0xb3, 0x98, 0x2f, 0x71, 0x33, 0x85, 0x8a, 0x31, 0x55, 0xf1, 0xed, 0xde, 0x9d, 0xde, 0x83, 0x2b,
+	0xfb, 0xa3, 0xa8, 0x76, 0x9a, 0xab, 0x47, 0x6f, 0x4a, 0x6e, 0x2d, 0xf6, 0xb2, 0x6e, 0x37, 0xd9,
+	0xd9, 0x9c, 0x05, 0x87, 0xc4, 0xf6, 0x5c, 0xf7, 0xd7, 0xc2, 0x2e, 0xba, 0x1d, 0x4c, 0xd8, 0x0d,
+	0x12, 0x76, 0xd1, 0xd5, 0xfd, 0x7e, 0xab, 0x7b, 0x43, 0xe4, 0xaf, 0xce, 0xd7, 0xa8, 0x09, 0x0c,
+	0x0f, 0x59, 0xe0, 0xba, 0x96, 0x8d, 0x6c, 0x8a, 0xda, 0x42, 0x70, 0xc0, 0x06, 0xc5, 0xe6, 0x4a,
+	0xf9, 0x7b, 0x2d, 0x79, 0xc7, 0x76, 0x75, 0x0a, 0xf5, 0x38, 0x67, 0xbe, 0x52, 0x96, 0x26, 0x65,
+	0xd1, 0xfe, 0x97, 0x01, 0xbb, 0xea, 0x28, 0x87, 0x45, 0x66, 0xc1, 0xef, 0x1e, 0xdb, 0xe9, 0x58,
+	0x6d, 0xf0, 0x30, 0x6a, 0xc7, 0x1b, 0xf9, 0x13, 0x08, 0xef, 0x7a, 0xd8, 0x0d, 0xef, 0xc3, 0xd3,
+	0x4f, 0x3f, 0x7f, 0x7d, 0xbe, 0x94, 0x8d, 0xc8, 0x5d, 0x48, 0xf6, 0xa4, 0x38, 0x27, 0x5e, 0x2f,
+	0xcd, 0xf2, 0x93, 0xce, 0x1c, 0xf3, 0x23, 0x78, 0x0f, 0x92, 0xb6, 0x3e, 0x3c, 0xc6, 0x95, 0x50,
+	0xda, 0x0b, 0x6b, 0xb1, 0x82, 0x6d, 0xf0, 0xf5, 0x32, 0xbb, 0xe5, 0x89, 0x31, 0x78, 0xec, 0xf1,
+	0xef, 0x4d, 0xfc, 0x9c, 0x13, 0xff, 0xe8, 0xbb, 0x91, 0xbf, 0xf7, 0x47, 0xdf, 0xfa, 0xcd, 0xa1,
+	0x9b, 0xe7, 0x62, 0xf9, 0xc9, 0x99, 0xfb, 0x89, 0x34, 0xc6, 0xd0, 0xfc, 0xe3, 0x59, 0xca, 0x85,
+	0x4b, 0xeb, 0x7d, 0x5d, 0xb8, 0xd2, 0xad, 0xf2, 0x7c, 0x75, 0xee, 0x8f, 0x8a, 0x3b, 0xd9, 0xee,
+	0xcf, 0x7f, 0x66, 0xa8, 0x38, 0xff, 0x30, 0x5b, 0x51, 0xbc, 0xae, 0x2a, 0x42, 0x06, 0xc6, 0x2a,
+	0xec, 0x16, 0x31, 0x40, 0xe6, 0x78, 0x2a, 0x88, 0x60, 0x95, 0xd2, 0xf6, 0xf9, 0xb3, 0xb7, 0x07,
+	0x89, 0xa2, 0xa3, 0xf5, 0x2c, 0x92, 0xb8, 0xe2, 0x2e, 0x64, 0x34, 0x49, 0xf1, 0xc1, 0xeb, 0x67,
+	0x2a, 0x01, 0xcd, 0xd3, 0xd9, 0xa3, 0x04, 0x79, 0xfb, 0x8d, 0x9c, 0x0d, 0xdc, 0x93, 0xf5, 0xf4,
+	0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x66, 0x79, 0x86, 0x3e, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java
index fdf7e18fb7..efc25b640e 100644
--- a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java
+++ b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java
@@ -38968,213 +38968,120 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
       "\t\"\315\001\n\025UpdateArtifactRequest\022\'\n\007dataset\030\001" +
       " \001(\0132\026.datacatalog.DatasetID\022\025\n\013artifact" +
       "_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001(\tH\000\022\'\n\004data\030" +
-<<<<<<< HEAD
       "\004 \003(\0132\031.datacatalog.ArtifactData\022\'\n\010meta" +
       "data\030\005 \001(\0132\025.datacatalog.MetadataB\016\n\014que" +
       "ry_handle\"-\n\026UpdateArtifactResponse\022\023\n\013a" +
-      "rtifact_id\030\001 \001(\t\"M\n\rReservationID\022*\n\ndat" +
-      "aset_id\030\001 \001(\0132\026.datacatalog.DatasetID\022\020\n" +
-      "\010tag_name\030\002 \001(\t\"\234\001\n\035GetOrExtendReservati" +
-      "onRequest\0222\n\016reservation_id\030\001 \001(\0132\032.data" +
-      "catalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\022" +
-      "5\n\022heartbeat_interval\030\003 \001(\0132\031.google.pro" +
-      "tobuf.Duration\"\343\001\n\013Reservation\0222\n\016reserv" +
-      "ation_id\030\001 \001(\0132\032.datacatalog.Reservation" +
-      "ID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartbeat_interv" +
-      "al\030\003 \001(\0132\031.google.protobuf.Duration\022.\n\ne" +
-      "xpires_at\030\004 \001(\0132\032.google.protobuf.Timest" +
-      "amp\022\'\n\010metadata\030\006 \001(\0132\025.datacatalog.Meta" +
-      "data\"O\n\036GetOrExtendReservationResponse\022-" +
-      "\n\013reservation\030\001 \001(\0132\030.datacatalog.Reserv" +
-      "ation\"a\n\031ReleaseReservationRequest\0222\n\016re" +
-      "servation_id\030\001 \001(\0132\032.datacatalog.Reserva" +
-      "tionID\022\020\n\010owner_id\030\002 \001(\t\"\034\n\032ReleaseReser" +
-      "vationResponse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026." +
-      "datacatalog.DatasetID\022\'\n\010metadata\030\002 \001(\0132" +
-      "\025.datacatalog.Metadata\022\025\n\rpartitionKeys\030" +
-      "\003 \003(\t\"\'\n\tPartition\022\013\n\003key\030\001 \001(\t\022\r\n\005value" +
-      "\030\002 \001(\t\"Y\n\tDatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004" +
-      "name\030\002 \001(\t\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 " +
-      "\001(\t\022\014\n\004UUID\030\005 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001" +
-      "(\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Datase" +
-      "tID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.Artifact" +
-      "Data\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog.Met" +
-      "adata\022*\n\npartitions\030\005 \003(\0132\026.datacatalog." +
-      "Partition\022\036\n\004tags\030\006 \003(\0132\020.datacatalog.Ta" +
-      "g\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf." +
-      "Timestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022" +
-      "%\n\005value\030\002 \001(\0132\026.flyteidl.core.Literal\"Q" +
-      "\n\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t" +
-      "\022\'\n\007dataset\030\003 \001(\0132\026.datacatalog.DatasetI" +
-      "D\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.datacat" +
-      "alog.Metadata.KeyMapEntry\032-\n\013KeyMapEntry" +
-      "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020Filt" +
-      "erExpression\0222\n\007filters\030\001 \003(\0132!.datacata" +
-      "log.SinglePropertyFilter\"\211\003\n\024SinglePrope" +
-      "rtyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.datacata" +
-      "log.TagPropertyFilterH\000\022@\n\020partition_fil" +
-      "ter\030\002 \001(\0132$.datacatalog.PartitionPropert" +
-      "yFilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#.dat" +
-      "acatalog.ArtifactPropertyFilterH\000\022<\n\016dat" +
-      "aset_filter\030\004 \001(\0132\".datacatalog.DatasetP" +
-      "ropertyFilterH\000\022F\n\010operator\030\n \001(\01624.data" +
-      "catalog.SinglePropertyFilter.ComparisonO" +
-      "perator\" \n\022ComparisonOperator\022\n\n\006EQUALS\020" +
-      "\000B\021\n\017property_filter\";\n\026ArtifactProperty" +
-      "Filter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010propert" +
-      "y\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001 \001(\t" +
-      "H\000B\n\n\010property\"S\n\027PartitionPropertyFilte" +
-      "r\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.KeyValu" +
-      "ePairH\000B\n\n\010property\"*\n\014KeyValuePair\022\013\n\003k" +
-      "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"k\n\025DatasetProper" +
-      "tyFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(" +
-      "\tH\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000" +
-      "B\n\n\010property\"\361\001\n\021PaginationOptions\022\r\n\005li" +
-      "mit\030\001 \001(\r\022\r\n\005token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(" +
-      "\0162&.datacatalog.PaginationOptions.SortKe" +
-      "y\022;\n\tsortOrder\030\004 \001(\0162(.datacatalog.Pagin" +
-      "ationOptions.SortOrder\"*\n\tSortOrder\022\016\n\nD" +
-      "ESCENDING\020\000\022\r\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n" +
-      "\rCREATION_TIME\020\0002\206\007\n\013DataCatalog\022V\n\rCrea" +
-      "teDataset\022!.datacatalog.CreateDatasetReq" +
-      "uest\032\".datacatalog.CreateDatasetResponse" +
-      "\022M\n\nGetDataset\022\036.datacatalog.GetDatasetR" +
-      "equest\032\037.datacatalog.GetDatasetResponse\022" +
-      "Y\n\016CreateArtifact\022\".datacatalog.CreateAr" +
-      "tifactRequest\032#.datacatalog.CreateArtifa" +
-      "ctResponse\022P\n\013GetArtifact\022\037.datacatalog." +
-      "GetArtifactRequest\032 .datacatalog.GetArti" +
-      "factResponse\022A\n\006AddTag\022\032.datacatalog.Add" +
-      "TagRequest\032\033.datacatalog.AddTagResponse\022" +
-      "V\n\rListArtifacts\022!.datacatalog.ListArtif" +
-      "actsRequest\032\".datacatalog.ListArtifactsR" +
-      "esponse\022S\n\014ListDatasets\022 .datacatalog.Li" +
-      "stDatasetsRequest\032!.datacatalog.ListData" +
-      "setsResponse\022Y\n\016UpdateArtifact\022\".datacat" +
-      "alog.UpdateArtifactRequest\032#.datacatalog" +
-      ".UpdateArtifactResponse\022q\n\026GetOrExtendRe" +
-      "servation\022*.datacatalog.GetOrExtendReser" +
-      "vationRequest\032+.datacatalog.GetOrExtendR" +
-      "eservationResponse\022e\n\022ReleaseReservation" +
-      "\022&.datacatalog.ReleaseReservationRequest" +
-      "\032\'.datacatalog.ReleaseReservationRespons" +
-      "eBCZAgithub.com/flyteorg/flyte/flyteidl/" +
-      "gen/pb-go/flyteidl/datacatalogb\006proto3"
-=======
-      "\004 \003(\0132\031.datacatalog.ArtifactDataB\016\n\014quer" +
-      "y_handle\"-\n\026UpdateArtifactResponse\022\023\n\013ar" +
-      "tifact_id\030\001 \001(\t\"{\n\025DeleteArtifactRequest" +
-      "\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.DatasetI" +
-      "D\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 \001" +
-      "(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifactsR" +
-      "equest\0225\n\tartifacts\030\001 \003(\0132\".datacatalog." +
-      "DeleteArtifactRequest\"\030\n\026DeleteArtifactR" +
-      "esponse\"M\n\rReservationID\022*\n\ndataset_id\030\001" +
-      " \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name" +
-      "\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest" +
-      "\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog.R" +
-      "eservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartb" +
-      "eat_interval\030\003 \001(\0132\031.google.protobuf.Dur" +
-      "ation\"b\n\036GetOrExtendReservationsRequest\022" +
-      "@\n\014reservations\030\001 \003(\0132*.datacatalog.GetO" +
-      "rExtendReservationRequest\"\343\001\n\013Reservatio" +
-      "n\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog." +
+      "rtifact_id\030\001 \001(\t\"{\n\025DeleteArtifactReques" +
+      "t\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.Dataset" +
+      "ID\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 " +
+      "\001(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifacts" +
+      "Request\0225\n\tartifacts\030\001 \003(\0132\".datacatalog" +
+      ".DeleteArtifactRequest\"\030\n\026DeleteArtifact" +
+      "Response\"M\n\rReservationID\022*\n\ndataset_id\030" +
+      "\001 \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_nam" +
+      "e\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationReques" +
+      "t\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog." +
       "ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heart" +
       "beat_interval\030\003 \001(\0132\031.google.protobuf.Du" +
-      "ration\022.\n\nexpires_at\030\004 \001(\0132\032.google.prot" +
-      "obuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.datac" +
-      "atalog.Metadata\"O\n\036GetOrExtendReservatio" +
-      "nResponse\022-\n\013reservation\030\001 \001(\0132\030.datacat" +
-      "alog.Reservation\"Q\n\037GetOrExtendReservati" +
-      "onsResponse\022.\n\014reservations\030\001 \003(\0132\030.data" +
-      "catalog.Reservation\"a\n\031ReleaseReservatio" +
-      "nRequest\0222\n\016reservation_id\030\001 \001(\0132\032.datac" +
-      "atalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\"Z" +
-      "\n\032ReleaseReservationsRequest\022<\n\014reservat" +
-      "ions\030\001 \003(\0132&.datacatalog.ReleaseReservat" +
-      "ionRequest\"\034\n\032ReleaseReservationResponse" +
-      "\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.Da" +
-      "tasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog." +
-      "Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tParti" +
-      "tion\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\tData" +
-      "setID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n\006" +
-      "domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005 " +
-      "\001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007dataset\030" +
-      "\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004data\030\003 " +
-      "\003(\0132\031.datacatalog.ArtifactData\022\'\n\010metada" +
-      "ta\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\nparti" +
-      "tions\030\005 \003(\0132\026.datacatalog.Partition\022\036\n\004t" +
-      "ags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreated_a" +
-      "t\030\007 \001(\0132\032.google.protobuf.Timestamp\"C\n\014A" +
-      "rtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002 \001(\013" +
-      "2\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004name\030" +
-      "\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007dataset\030\003 " +
-      "\001(\0132\026.datacatalog.DatasetID\"m\n\010Metadata\022" +
-      "2\n\007key_map\030\001 \003(\0132!.datacatalog.Metadata." +
-      "KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 \001(\t\022" +
-      "\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpression\0222" +
-      "\n\007filters\030\001 \003(\0132!.datacatalog.SingleProp" +
-      "ertyFilter\"\211\003\n\024SinglePropertyFilter\0224\n\nt" +
-      "ag_filter\030\001 \001(\0132\036.datacatalog.TagPropert" +
-      "yFilterH\000\022@\n\020partition_filter\030\002 \001(\0132$.da" +
-      "tacatalog.PartitionPropertyFilterH\000\022>\n\017a" +
-      "rtifact_filter\030\003 \001(\0132#.datacatalog.Artif" +
-      "actPropertyFilterH\000\022<\n\016dataset_filter\030\004 " +
-      "\001(\0132\".datacatalog.DatasetPropertyFilterH" +
-      "\000\022F\n\010operator\030\n \001(\01624.datacatalog.Single" +
-      "PropertyFilter.ComparisonOperator\" \n\022Com" +
-      "parisonOperator\022\n\n\006EQUALS\020\000B\021\n\017property_" +
-      "filter\";\n\026ArtifactPropertyFilter\022\025\n\013arti" +
-      "fact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagProper" +
-      "tyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010property" +
-      "\"S\n\027PartitionPropertyFilter\022,\n\007key_val\030\001" +
-      " \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n\010pro" +
-      "perty\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
-      "lue\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021\n\007pr" +
-      "oject\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006domain\030" +
-      "\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010property\"\361" +
-      "\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005t" +
-      "oken\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatalo" +
-      "g.PaginationOptions.SortKey\022;\n\tsortOrder" +
-      "\030\004 \001(\0162(.datacatalog.PaginationOptions.S" +
-      "ortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n" +
-      "\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME" +
-      "\020\0002\235\n\n\013DataCatalog\022V\n\rCreateDataset\022!.da" +
-      "tacatalog.CreateDatasetRequest\032\".datacat" +
-      "alog.CreateDatasetResponse\022M\n\nGetDataset" +
-      "\022\036.datacatalog.GetDatasetRequest\032\037.datac" +
-      "atalog.GetDatasetResponse\022Y\n\016CreateArtif" +
-      "act\022\".datacatalog.CreateArtifactRequest\032" +
-      "#.datacatalog.CreateArtifactResponse\022P\n\013" +
-      "GetArtifact\022\037.datacatalog.GetArtifactReq" +
-      "uest\032 .datacatalog.GetArtifactResponse\022A" +
-      "\n\006AddTag\022\032.datacatalog.AddTagRequest\032\033.d" +
-      "atacatalog.AddTagResponse\022V\n\rListArtifac" +
-      "ts\022!.datacatalog.ListArtifactsRequest\032\"." +
-      "datacatalog.ListArtifactsResponse\022S\n\014Lis" +
-      "tDatasets\022 .datacatalog.ListDatasetsRequ" +
-      "est\032!.datacatalog.ListDatasetsResponse\022Y" +
-      "\n\016UpdateArtifact\022\".datacatalog.UpdateArt" +
-      "ifactRequest\032#.datacatalog.UpdateArtifac" +
-      "tResponse\022Y\n\016DeleteArtifact\022\".datacatalo" +
-      "g.DeleteArtifactRequest\032#.datacatalog.De" +
-      "leteArtifactResponse\022[\n\017DeleteArtifacts\022" +
-      "#.datacatalog.DeleteArtifactsRequest\032#.d" +
-      "atacatalog.DeleteArtifactResponse\022q\n\026Get" +
-      "OrExtendReservation\022*.datacatalog.GetOrE" +
-      "xtendReservationRequest\032+.datacatalog.Ge" +
-      "tOrExtendReservationResponse\022t\n\027GetOrExt" +
-      "endReservations\022+.datacatalog.GetOrExten" +
-      "dReservationsRequest\032,.datacatalog.GetOr" +
-      "ExtendReservationsResponse\022e\n\022ReleaseRes" +
-      "ervation\022&.datacatalog.ReleaseReservatio" +
-      "nRequest\032\'.datacatalog.ReleaseReservatio" +
-      "nResponse\022g\n\023ReleaseReservations\022\'.datac" +
-      "atalog.ReleaseReservationsRequest\032\'.data" +
-      "catalog.ReleaseReservationResponseB=Z;gi" +
-      "thub.com/flyteorg/flyteidl/gen/pb-go/fly" +
-      "teidl/datacatalogb\006proto3"
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+      "ration\"b\n\036GetOrExtendReservationsRequest" +
+      "\022@\n\014reservations\030\001 \003(\0132*.datacatalog.Get" +
+      "OrExtendReservationRequest\"\343\001\n\013Reservati" +
+      "on\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog" +
+      ".ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022hear" +
+      "tbeat_interval\030\003 \001(\0132\031.google.protobuf.D" +
+      "uration\022.\n\nexpires_at\030\004 \001(\0132\032.google.pro" +
+      "tobuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.data" +
+      "catalog.Metadata\"O\n\036GetOrExtendReservati" +
+      "onResponse\022-\n\013reservation\030\001 \001(\0132\030.dataca" +
+      "talog.Reservation\"Q\n\037GetOrExtendReservat" +
+      "ionsResponse\022.\n\014reservations\030\001 \003(\0132\030.dat" +
+      "acatalog.Reservation\"a\n\031ReleaseReservati" +
+      "onRequest\0222\n\016reservation_id\030\001 \001(\0132\032.data" +
+      "catalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\"" +
+      "Z\n\032ReleaseReservationsRequest\022<\n\014reserva" +
+      "tions\030\001 \003(\0132&.datacatalog.ReleaseReserva" +
+      "tionRequest\"\034\n\032ReleaseReservationRespons" +
+      "e\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.D" +
+      "atasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog" +
+      ".Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tPart" +
+      "ition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"Y\n\tDat" +
+      "asetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n" +
+      "\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005" +
+      " \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001(\t\022\'\n\007dataset" +
+      "\030\002 \001(\0132\026.datacatalog.DatasetID\022\'\n\004data\030\003" +
+      " \003(\0132\031.datacatalog.ArtifactData\022\'\n\010metad" +
+      "ata\030\004 \001(\0132\025.datacatalog.Metadata\022*\n\npart" +
+      "itions\030\005 \003(\0132\026.datacatalog.Partition\022\036\n\004" +
+      "tags\030\006 \003(\0132\020.datacatalog.Tag\022.\n\ncreated_" +
+      "at\030\007 \001(\0132\032.google.protobuf.Timestamp\"C\n\014" +
+      "ArtifactData\022\014\n\004name\030\001 \001(\t\022%\n\005value\030\002 \001(" +
+      "\0132\026.flyteidl.core.Literal\"Q\n\003Tag\022\014\n\004name" +
+      "\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t\022\'\n\007dataset\030\003" +
+      " \001(\0132\026.datacatalog.DatasetID\"m\n\010Metadata" +
+      "\0222\n\007key_map\030\001 \003(\0132!.datacatalog.Metadata" +
+      ".KeyMapEntry\032-\n\013KeyMapEntry\022\013\n\003key\030\001 \001(\t" +
+      "\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020FilterExpression\022" +
+      "2\n\007filters\030\001 \003(\0132!.datacatalog.SinglePro" +
+      "pertyFilter\"\211\003\n\024SinglePropertyFilter\0224\n\n" +
+      "tag_filter\030\001 \001(\0132\036.datacatalog.TagProper" +
+      "tyFilterH\000\022@\n\020partition_filter\030\002 \001(\0132$.d" +
+      "atacatalog.PartitionPropertyFilterH\000\022>\n\017" +
+      "artifact_filter\030\003 \001(\0132#.datacatalog.Arti" +
+      "factPropertyFilterH\000\022<\n\016dataset_filter\030\004" +
+      " \001(\0132\".datacatalog.DatasetPropertyFilter" +
+      "H\000\022F\n\010operator\030\n \001(\01624.datacatalog.Singl" +
+      "ePropertyFilter.ComparisonOperator\" \n\022Co" +
+      "mparisonOperator\022\n\n\006EQUALS\020\000B\021\n\017property" +
+      "_filter\";\n\026ArtifactPropertyFilter\022\025\n\013art" +
+      "ifact_id\030\001 \001(\tH\000B\n\n\010property\"3\n\021TagPrope" +
+      "rtyFilter\022\022\n\010tag_name\030\001 \001(\tH\000B\n\n\010propert" +
+      "y\"S\n\027PartitionPropertyFilter\022,\n\007key_val\030" +
+      "\001 \001(\0132\031.datacatalog.KeyValuePairH\000B\n\n\010pr" +
+      "operty\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005v" +
+      "alue\030\002 \001(\t\"k\n\025DatasetPropertyFilter\022\021\n\007p" +
+      "roject\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(\tH\000\022\020\n\006domain" +
+      "\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000B\n\n\010property\"" +
+      "\361\001\n\021PaginationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005" +
+      "token\030\002 \001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatal" +
+      "og.PaginationOptions.SortKey\022;\n\tsortOrde" +
+      "r\030\004 \001(\0162(.datacatalog.PaginationOptions." +
+      "SortOrder\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r" +
+      "\n\tASCENDING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIM" +
+      "E\020\0002\235\n\n\013DataCatalog\022V\n\rCreateDataset\022!.d" +
+      "atacatalog.CreateDatasetRequest\032\".dataca" +
+      "talog.CreateDatasetResponse\022M\n\nGetDatase" +
+      "t\022\036.datacatalog.GetDatasetRequest\032\037.data" +
+      "catalog.GetDatasetResponse\022Y\n\016CreateArti" +
+      "fact\022\".datacatalog.CreateArtifactRequest" +
+      "\032#.datacatalog.CreateArtifactResponse\022P\n" +
+      "\013GetArtifact\022\037.datacatalog.GetArtifactRe" +
+      "quest\032 .datacatalog.GetArtifactResponse\022" +
+      "A\n\006AddTag\022\032.datacatalog.AddTagRequest\032\033." +
+      "datacatalog.AddTagResponse\022V\n\rListArtifa" +
+      "cts\022!.datacatalog.ListArtifactsRequest\032\"" +
+      ".datacatalog.ListArtifactsResponse\022S\n\014Li" +
+      "stDatasets\022 .datacatalog.ListDatasetsReq" +
+      "uest\032!.datacatalog.ListDatasetsResponse\022" +
+      "Y\n\016UpdateArtifact\022\".datacatalog.UpdateAr" +
+      "tifactRequest\032#.datacatalog.UpdateArtifa" +
+      "ctResponse\022Y\n\016DeleteArtifact\022\".datacatal" +
+      "og.DeleteArtifactRequest\032#.datacatalog.D" +
+      "eleteArtifactResponse\022[\n\017DeleteArtifacts" +
+      "\022#.datacatalog.DeleteArtifactsRequest\032#." +
+      "datacatalog.DeleteArtifactResponse\022q\n\026Ge" +
+      "tOrExtendReservation\022*.datacatalog.GetOr" +
+      "ExtendReservationRequest\032+.datacatalog.G" +
+      "etOrExtendReservationResponse\022t\n\027GetOrEx" +
+      "tendReservations\022+.datacatalog.GetOrExte" +
+      "ndReservationsRequest\032,.datacatalog.GetO" +
+      "rExtendReservationsResponse\022e\n\022ReleaseRe" +
+      "servation\022&.datacatalog.ReleaseReservati" +
+      "onRequest\032\'.datacatalog.ReleaseReservati" +
+      "onResponse\022g\n\023ReleaseReservations\022\'.data" +
+      "catalog.ReleaseReservationsRequest\032\'.dat" +
+      "acatalog.ReleaseReservationResponseBCZAg" +
+      "ithub.com/flyteorg/flyte/flyteidl/gen/pb" +
+      "-go/flyteidl/datacatalogb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/flyteidl/gen/pb-java/flyteidl/core/Errors.java b/flyteidl/gen/pb-java/flyteidl/core/Errors.java
index 994f62ba56..3762b8dc54 100644
--- a/flyteidl/gen/pb-java/flyteidl/core/Errors.java
+++ b/flyteidl/gen/pb-java/flyteidl/core/Errors.java
@@ -4407,18 +4407,6 @@ public flyteidl.core.Errors.CacheEvictionErrorList getDefaultInstanceForType() {
   static {
     java.lang.String[] descriptorData = {
       "\n\032flyteidl/core/errors.proto\022\rflyteidl.c" +
-<<<<<<< HEAD
-      "ore\032\035flyteidl/core/execution.proto\"\310\001\n\016C" +
-      "ontainerError\022\014\n\004code\030\001 \001(\t\022\017\n\007message\030\002" +
-      " \001(\t\0220\n\004kind\030\003 \001(\0162\".flyteidl.core.Conta" +
-      "inerError.Kind\0227\n\006origin\030\004 \001(\0162\'.flyteid" +
-      "l.core.ExecutionError.ErrorKind\",\n\004Kind\022" +
-      "\023\n\017NON_RECOVERABLE\020\000\022\017\n\013RECOVERABLE\020\001\"=\n" +
-      "\rErrorDocument\022,\n\005error\030\001 \001(\0132\035.flyteidl" +
-      ".core.ContainerErrorB>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+      "l.core.CacheEvictionErrorB>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
       "flyteidl.admin.TaskCreateRequest\032\".flyte" +
       "idl.admin.TaskCreateResponse\"\030\202\323\344\223\002\022\"\r/a" +
       "pi/v1/tasks:\001*\022\210\001\n\007GetTask\022 .flyteidl.ad" +
@@ -286,7 +282,6 @@ public static void registerAllExtensions(
       "\002\232\001\022O/api/v1/description_entities/{resou" +
       "rce_type}/{id.project}/{id.domain}/{id.n" +
       "ame}ZG\022E/api/v1/description_entities/{re" +
-<<<<<<< HEAD
       "source_type}/{id.project}/{id.domain}\022\305\001" +
       "\n\023GetExecutionMetrics\0222.flyteidl.admin.W" +
       "orkflowExecutionGetMetricsRequest\0323.flyt" +
@@ -295,11 +290,6 @@ public static void registerAllExtensions(
       "ns/{id.project}/{id.domain}/{id.name}B?Z" +
       "=github.com/flyteorg/flyte/flyteidl/gen/" +
       "pb-go/flyteidl/serviceb\006proto3"
-=======
-      "source_type}/{id.project}/{id.domain}B9Z" +
-      "7github.com/flyteorg/flyteidl/gen/pb-go/" +
-      "flyteidl/serviceb\006proto3"
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/flyteidl/gen/pb-java/flyteidl/service/Cache.java b/flyteidl/gen/pb-java/flyteidl/service/Cache.java
index 1d4012eba2..3b72418d69 100644
--- a/flyteidl/gen/pb-java/flyteidl/service/Cache.java
+++ b/flyteidl/gen/pb-java/flyteidl/service/Cache.java
@@ -2066,9 +2066,9 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() {
       "ject}/{task_execution_id.task_id.domain}" +
       "/{task_execution_id.task_id.name}/{task_" +
       "execution_id.task_id.version}/{task_exec" +
-      "ution_id.retry_attempt}B9Z7github.com/fl" +
-      "yteorg/flyteidl/gen/pb-go/flyteidl/servi" +
-      "ceb\006proto3"
+      "ution_id.retry_attempt}B?Z=github.com/fl" +
+      "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" +
+      "/serviceb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts
index 809b8db19b..3c9deaaf47 100644
--- a/flyteidl/gen/pb-js/flyteidl.d.ts
+++ b/flyteidl/gen/pb-js/flyteidl.d.ts
@@ -7261,93 +7261,6 @@ export namespace flyteidl {
             public static verify(message: { [k: string]: any }): (string|null);
         }
 
-<<<<<<< HEAD
-        /** Properties of a Span. */
-        interface ISpan {
-
-            /** Span startTime */
-            startTime?: (google.protobuf.ITimestamp|null);
-
-            /** Span endTime */
-            endTime?: (google.protobuf.ITimestamp|null);
-
-            /** Span workflowId */
-            workflowId?: (flyteidl.core.IWorkflowExecutionIdentifier|null);
-
-            /** Span nodeId */
-            nodeId?: (flyteidl.core.INodeExecutionIdentifier|null);
-
-            /** Span taskId */
-            taskId?: (flyteidl.core.ITaskExecutionIdentifier|null);
-
-            /** Span operationId */
-            operationId?: (string|null);
-
-            /** Span spans */
-            spans?: (flyteidl.core.ISpan[]|null);
-        }
-
-        /** Represents a Span. */
-        class Span implements ISpan {
-
-            /**
-             * Constructs a new Span.
-             * @param [properties] Properties to set
-             */
-            constructor(properties?: flyteidl.core.ISpan);
-
-            /** Span startTime. */
-            public startTime?: (google.protobuf.ITimestamp|null);
-
-            /** Span endTime. */
-            public endTime?: (google.protobuf.ITimestamp|null);
-
-            /** Span workflowId. */
-            public workflowId?: (flyteidl.core.IWorkflowExecutionIdentifier|null);
-
-            /** Span nodeId. */
-            public nodeId?: (flyteidl.core.INodeExecutionIdentifier|null);
-
-            /** Span taskId. */
-            public taskId?: (flyteidl.core.ITaskExecutionIdentifier|null);
-
-            /** Span operationId. */
-            public operationId: string;
-
-            /** Span spans. */
-            public spans: flyteidl.core.ISpan[];
-
-            /** Span id. */
-            public id?: ("workflowId"|"nodeId"|"taskId"|"operationId");
-
-            /**
-             * Creates a new Span instance using the specified properties.
-             * @param [properties] Properties to set
-             * @returns Span instance
-             */
-            public static create(properties?: flyteidl.core.ISpan): flyteidl.core.Span;
-
-            /**
-             * Encodes the specified Span message. Does not implicitly {@link flyteidl.core.Span.verify|verify} messages.
-             * @param message Span message or plain object to encode
-             * @param [writer] Writer to encode to
-             * @returns Writer
-             */
-            public static encode(message: flyteidl.core.ISpan, writer?: $protobuf.Writer): $protobuf.Writer;
-
-            /**
-             * Decodes a Span message from the specified reader or buffer.
-             * @param reader Reader or buffer to decode from
-             * @param [length] Message length if known beforehand
-             * @returns Span
-             * @throws {Error} If the payload is not a reader or valid buffer
-             * @throws {$protobuf.util.ProtocolError} If required fields are missing
-             */
-            public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.core.Span;
-
-            /**
-             * Verifies a Span message.
-=======
         /** Properties of a CacheEvictionError. */
         interface ICacheEvictionError {
 
@@ -7485,7 +7398,97 @@ export namespace flyteidl {
 
             /**
              * Verifies a CacheEvictionErrorList message.
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+             * @param message Plain object to verify
+             * @returns `null` if valid, otherwise the reason why it is not
+             */
+            public static verify(message: { [k: string]: any }): (string|null);
+        }
+
+        /** Properties of a Span. */
+        interface ISpan {
+
+            /** Span startTime */
+            startTime?: (google.protobuf.ITimestamp|null);
+
+            /** Span endTime */
+            endTime?: (google.protobuf.ITimestamp|null);
+
+            /** Span workflowId */
+            workflowId?: (flyteidl.core.IWorkflowExecutionIdentifier|null);
+
+            /** Span nodeId */
+            nodeId?: (flyteidl.core.INodeExecutionIdentifier|null);
+
+            /** Span taskId */
+            taskId?: (flyteidl.core.ITaskExecutionIdentifier|null);
+
+            /** Span operationId */
+            operationId?: (string|null);
+
+            /** Span spans */
+            spans?: (flyteidl.core.ISpan[]|null);
+        }
+
+        /** Represents a Span. */
+        class Span implements ISpan {
+
+            /**
+             * Constructs a new Span.
+             * @param [properties] Properties to set
+             */
+            constructor(properties?: flyteidl.core.ISpan);
+
+            /** Span startTime. */
+            public startTime?: (google.protobuf.ITimestamp|null);
+
+            /** Span endTime. */
+            public endTime?: (google.protobuf.ITimestamp|null);
+
+            /** Span workflowId. */
+            public workflowId?: (flyteidl.core.IWorkflowExecutionIdentifier|null);
+
+            /** Span nodeId. */
+            public nodeId?: (flyteidl.core.INodeExecutionIdentifier|null);
+
+            /** Span taskId. */
+            public taskId?: (flyteidl.core.ITaskExecutionIdentifier|null);
+
+            /** Span operationId. */
+            public operationId: string;
+
+            /** Span spans. */
+            public spans: flyteidl.core.ISpan[];
+
+            /** Span id. */
+            public id?: ("workflowId"|"nodeId"|"taskId"|"operationId");
+
+            /**
+             * Creates a new Span instance using the specified properties.
+             * @param [properties] Properties to set
+             * @returns Span instance
+             */
+            public static create(properties?: flyteidl.core.ISpan): flyteidl.core.Span;
+
+            /**
+             * Encodes the specified Span message. Does not implicitly {@link flyteidl.core.Span.verify|verify} messages.
+             * @param message Span message or plain object to encode
+             * @param [writer] Writer to encode to
+             * @returns Writer
+             */
+            public static encode(message: flyteidl.core.ISpan, writer?: $protobuf.Writer): $protobuf.Writer;
+
+            /**
+             * Decodes a Span message from the specified reader or buffer.
+             * @param reader Reader or buffer to decode from
+             * @param [length] Message length if known beforehand
+             * @returns Span
+             * @throws {Error} If the payload is not a reader or valid buffer
+             * @throws {$protobuf.util.ProtocolError} If required fields are missing
+             */
+            public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.core.Span;
+
+            /**
+             * Verifies a Span message.
              * @param message Plain object to verify
              * @returns `null` if valid, otherwise the reason why it is not
              */
diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js
index 39e3e5a044..82f5d6a3fc 100644
--- a/flyteidl/gen/pb-js/flyteidl.js
+++ b/flyteidl/gen/pb-js/flyteidl.js
@@ -17525,33 +17525,6 @@
                 return ErrorDocument;
             })();
     
-<<<<<<< HEAD
-            core.Span = (function() {
-    
-                /**
-                 * Properties of a Span.
-                 * @memberof flyteidl.core
-                 * @interface ISpan
-                 * @property {google.protobuf.ITimestamp|null} [startTime] Span startTime
-                 * @property {google.protobuf.ITimestamp|null} [endTime] Span endTime
-                 * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [workflowId] Span workflowId
-                 * @property {flyteidl.core.INodeExecutionIdentifier|null} [nodeId] Span nodeId
-                 * @property {flyteidl.core.ITaskExecutionIdentifier|null} [taskId] Span taskId
-                 * @property {string|null} [operationId] Span operationId
-                 * @property {Array.|null} [spans] Span spans
-                 */
-    
-                /**
-                 * Constructs a new Span.
-                 * @memberof flyteidl.core
-                 * @classdesc Represents a Span.
-                 * @implements ISpan
-                 * @constructor
-                 * @param {flyteidl.core.ISpan=} [properties] Properties to set
-                 */
-                function Span(properties) {
-                    this.spans = [];
-=======
             core.CacheEvictionError = (function() {
     
                 /**
@@ -17574,7 +17547,6 @@
                  * @param {flyteidl.core.ICacheEvictionError=} [properties] Properties to set
                  */
                 function CacheEvictionError(properties) {
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
                     if (properties)
                         for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                             if (properties[keys[i]] != null)
@@ -17582,62 +17554,6 @@
                 }
     
                 /**
-<<<<<<< HEAD
-                 * Span startTime.
-                 * @member {google.protobuf.ITimestamp|null|undefined} startTime
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Span.prototype.startTime = null;
-    
-                /**
-                 * Span endTime.
-                 * @member {google.protobuf.ITimestamp|null|undefined} endTime
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Span.prototype.endTime = null;
-    
-                /**
-                 * Span workflowId.
-                 * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} workflowId
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Span.prototype.workflowId = null;
-    
-                /**
-                 * Span nodeId.
-                 * @member {flyteidl.core.INodeExecutionIdentifier|null|undefined} nodeId
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Span.prototype.nodeId = null;
-    
-                /**
-                 * Span taskId.
-                 * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} taskId
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Span.prototype.taskId = null;
-    
-                /**
-                 * Span operationId.
-                 * @member {string} operationId
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Span.prototype.operationId = "";
-    
-                /**
-                 * Span spans.
-                 * @member {Array.} spans
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Span.prototype.spans = $util.emptyArray;
-=======
                  * CacheEvictionError code.
                  * @member {flyteidl.core.CacheEvictionError.Code} code
                  * @memberof flyteidl.core.CacheEvictionError
@@ -17676,21 +17592,11 @@
                  * @instance
                  */
                 CacheEvictionError.prototype.workflowExecutionId = null;
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
     
                 // OneOf field names bound to virtual getters and setters
                 var $oneOfFields;
     
                 /**
-<<<<<<< HEAD
-                 * Span id.
-                 * @member {"workflowId"|"nodeId"|"taskId"|"operationId"|undefined} id
-                 * @memberof flyteidl.core.Span
-                 * @instance
-                 */
-                Object.defineProperty(Span.prototype, "id", {
-                    get: $util.oneOfGetter($oneOfFields = ["workflowId", "nodeId", "taskId", "operationId"]),
-=======
                  * CacheEvictionError source.
                  * @member {"taskExecutionId"|"workflowExecutionId"|undefined} source
                  * @memberof flyteidl.core.CacheEvictionError
@@ -17698,51 +17604,10 @@
                  */
                 Object.defineProperty(CacheEvictionError.prototype, "source", {
                     get: $util.oneOfGetter($oneOfFields = ["taskExecutionId", "workflowExecutionId"]),
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
                     set: $util.oneOfSetter($oneOfFields)
                 });
     
                 /**
-<<<<<<< HEAD
-                 * Creates a new Span instance using the specified properties.
-                 * @function create
-                 * @memberof flyteidl.core.Span
-                 * @static
-                 * @param {flyteidl.core.ISpan=} [properties] Properties to set
-                 * @returns {flyteidl.core.Span} Span instance
-                 */
-                Span.create = function create(properties) {
-                    return new Span(properties);
-                };
-    
-                /**
-                 * Encodes the specified Span message. Does not implicitly {@link flyteidl.core.Span.verify|verify} messages.
-                 * @function encode
-                 * @memberof flyteidl.core.Span
-                 * @static
-                 * @param {flyteidl.core.ISpan} message Span message or plain object to encode
-                 * @param {$protobuf.Writer} [writer] Writer to encode to
-                 * @returns {$protobuf.Writer} Writer
-                 */
-                Span.encode = function encode(message, writer) {
-                    if (!writer)
-                        writer = $Writer.create();
-                    if (message.startTime != null && message.hasOwnProperty("startTime"))
-                        $root.google.protobuf.Timestamp.encode(message.startTime, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
-                    if (message.endTime != null && message.hasOwnProperty("endTime"))
-                        $root.google.protobuf.Timestamp.encode(message.endTime, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim();
-                    if (message.workflowId != null && message.hasOwnProperty("workflowId"))
-                        $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowId, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
-                    if (message.nodeId != null && message.hasOwnProperty("nodeId"))
-                        $root.flyteidl.core.NodeExecutionIdentifier.encode(message.nodeId, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
-                    if (message.taskId != null && message.hasOwnProperty("taskId"))
-                        $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskId, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim();
-                    if (message.operationId != null && message.hasOwnProperty("operationId"))
-                        writer.uint32(/* id 6, wireType 2 =*/50).string(message.operationId);
-                    if (message.spans != null && message.spans.length)
-                        for (var i = 0; i < message.spans.length; ++i)
-                            $root.flyteidl.core.Span.encode(message.spans[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim();
-=======
                  * Creates a new CacheEvictionError instance using the specified properties.
                  * @function create
                  * @memberof flyteidl.core.CacheEvictionError
@@ -17776,27 +17641,10 @@
                         $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskExecutionId, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
                     if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId"))
                         $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowExecutionId, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim();
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
                     return writer;
                 };
     
                 /**
-<<<<<<< HEAD
-                 * Decodes a Span message from the specified reader or buffer.
-                 * @function decode
-                 * @memberof flyteidl.core.Span
-                 * @static
-                 * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @param {number} [length] Message length if known beforehand
-                 * @returns {flyteidl.core.Span} Span
-                 * @throws {Error} If the payload is not a reader or valid buffer
-                 * @throws {$protobuf.util.ProtocolError} If required fields are missing
-                 */
-                Span.decode = function decode(reader, length) {
-                    if (!(reader instanceof $Reader))
-                        reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.core.Span();
-=======
                  * Decodes a CacheEvictionError message from the specified reader or buffer.
                  * @function decode
                  * @memberof flyteidl.core.CacheEvictionError
@@ -17811,34 +17659,10 @@
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
                     var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.core.CacheEvictionError();
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
                     while (reader.pos < end) {
                         var tag = reader.uint32();
                         switch (tag >>> 3) {
                         case 1:
-<<<<<<< HEAD
-                            message.startTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32());
-                            break;
-                        case 2:
-                            message.endTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32());
-                            break;
-                        case 3:
-                            message.workflowId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32());
-                            break;
-                        case 4:
-                            message.nodeId = $root.flyteidl.core.NodeExecutionIdentifier.decode(reader, reader.uint32());
-                            break;
-                        case 5:
-                            message.taskId = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32());
-                            break;
-                        case 6:
-                            message.operationId = reader.string();
-                            break;
-                        case 7:
-                            if (!(message.spans && message.spans.length))
-                                message.spans = [];
-                            message.spans.push($root.flyteidl.core.Span.decode(reader, reader.uint32()));
-=======
                             message.code = reader.int32();
                             break;
                         case 2:
@@ -17852,7 +17676,6 @@
                             break;
                         case 5:
                             message.workflowExecutionId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32());
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
                             break;
                         default:
                             reader.skipType(tag & 7);
@@ -17863,77 +17686,13 @@
                 };
     
                 /**
-<<<<<<< HEAD
-                 * Verifies a Span message.
-                 * @function verify
-                 * @memberof flyteidl.core.Span
-=======
                  * Verifies a CacheEvictionError message.
                  * @function verify
                  * @memberof flyteidl.core.CacheEvictionError
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
                  * @static
                  * @param {Object.} message Plain object to verify
                  * @returns {string|null} `null` if valid, otherwise the reason why it is not
                  */
-<<<<<<< HEAD
-                Span.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    var properties = {};
-                    if (message.startTime != null && message.hasOwnProperty("startTime")) {
-                        var error = $root.google.protobuf.Timestamp.verify(message.startTime);
-                        if (error)
-                            return "startTime." + error;
-                    }
-                    if (message.endTime != null && message.hasOwnProperty("endTime")) {
-                        var error = $root.google.protobuf.Timestamp.verify(message.endTime);
-                        if (error)
-                            return "endTime." + error;
-                    }
-                    if (message.workflowId != null && message.hasOwnProperty("workflowId")) {
-                        properties.id = 1;
-                        {
-                            var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowId);
-                            if (error)
-                                return "workflowId." + error;
-                        }
-                    }
-                    if (message.nodeId != null && message.hasOwnProperty("nodeId")) {
-                        if (properties.id === 1)
-                            return "id: multiple values";
-                        properties.id = 1;
-                        {
-                            var error = $root.flyteidl.core.NodeExecutionIdentifier.verify(message.nodeId);
-                            if (error)
-                                return "nodeId." + error;
-                        }
-                    }
-                    if (message.taskId != null && message.hasOwnProperty("taskId")) {
-                        if (properties.id === 1)
-                            return "id: multiple values";
-                        properties.id = 1;
-                        {
-                            var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.taskId);
-                            if (error)
-                                return "taskId." + error;
-                        }
-                    }
-                    if (message.operationId != null && message.hasOwnProperty("operationId")) {
-                        if (properties.id === 1)
-                            return "id: multiple values";
-                        properties.id = 1;
-                        if (!$util.isString(message.operationId))
-                            return "operationId: string expected";
-                    }
-                    if (message.spans != null && message.hasOwnProperty("spans")) {
-                        if (!Array.isArray(message.spans))
-                            return "spans: array expected";
-                        for (var i = 0; i < message.spans.length; ++i) {
-                            var error = $root.flyteidl.core.Span.verify(message.spans[i]);
-                            if (error)
-                                return "spans." + error;
-=======
                 CacheEvictionError.verify = function verify(message) {
                     if (typeof message !== "object" || message === null)
                         return "object expected";
@@ -17973,15 +17732,11 @@
                             var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowExecutionId);
                             if (error)
                                 return "workflowExecutionId." + error;
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
                         }
                     }
                     return null;
                 };
     
-<<<<<<< HEAD
-                return Span;
-=======
                 /**
                  * Code enum.
                  * @name flyteidl.core.CacheEvictionError.Code
@@ -18123,7 +17878,270 @@
                 };
     
                 return CacheEvictionErrorList;
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+            })();
+    
+            core.Span = (function() {
+    
+                /**
+                 * Properties of a Span.
+                 * @memberof flyteidl.core
+                 * @interface ISpan
+                 * @property {google.protobuf.ITimestamp|null} [startTime] Span startTime
+                 * @property {google.protobuf.ITimestamp|null} [endTime] Span endTime
+                 * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [workflowId] Span workflowId
+                 * @property {flyteidl.core.INodeExecutionIdentifier|null} [nodeId] Span nodeId
+                 * @property {flyteidl.core.ITaskExecutionIdentifier|null} [taskId] Span taskId
+                 * @property {string|null} [operationId] Span operationId
+                 * @property {Array.|null} [spans] Span spans
+                 */
+    
+                /**
+                 * Constructs a new Span.
+                 * @memberof flyteidl.core
+                 * @classdesc Represents a Span.
+                 * @implements ISpan
+                 * @constructor
+                 * @param {flyteidl.core.ISpan=} [properties] Properties to set
+                 */
+                function Span(properties) {
+                    this.spans = [];
+                    if (properties)
+                        for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                            if (properties[keys[i]] != null)
+                                this[keys[i]] = properties[keys[i]];
+                }
+    
+                /**
+                 * Span startTime.
+                 * @member {google.protobuf.ITimestamp|null|undefined} startTime
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Span.prototype.startTime = null;
+    
+                /**
+                 * Span endTime.
+                 * @member {google.protobuf.ITimestamp|null|undefined} endTime
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Span.prototype.endTime = null;
+    
+                /**
+                 * Span workflowId.
+                 * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} workflowId
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Span.prototype.workflowId = null;
+    
+                /**
+                 * Span nodeId.
+                 * @member {flyteidl.core.INodeExecutionIdentifier|null|undefined} nodeId
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Span.prototype.nodeId = null;
+    
+                /**
+                 * Span taskId.
+                 * @member {flyteidl.core.ITaskExecutionIdentifier|null|undefined} taskId
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Span.prototype.taskId = null;
+    
+                /**
+                 * Span operationId.
+                 * @member {string} operationId
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Span.prototype.operationId = "";
+    
+                /**
+                 * Span spans.
+                 * @member {Array.} spans
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Span.prototype.spans = $util.emptyArray;
+    
+                // OneOf field names bound to virtual getters and setters
+                var $oneOfFields;
+    
+                /**
+                 * Span id.
+                 * @member {"workflowId"|"nodeId"|"taskId"|"operationId"|undefined} id
+                 * @memberof flyteidl.core.Span
+                 * @instance
+                 */
+                Object.defineProperty(Span.prototype, "id", {
+                    get: $util.oneOfGetter($oneOfFields = ["workflowId", "nodeId", "taskId", "operationId"]),
+                    set: $util.oneOfSetter($oneOfFields)
+                });
+    
+                /**
+                 * Creates a new Span instance using the specified properties.
+                 * @function create
+                 * @memberof flyteidl.core.Span
+                 * @static
+                 * @param {flyteidl.core.ISpan=} [properties] Properties to set
+                 * @returns {flyteidl.core.Span} Span instance
+                 */
+                Span.create = function create(properties) {
+                    return new Span(properties);
+                };
+    
+                /**
+                 * Encodes the specified Span message. Does not implicitly {@link flyteidl.core.Span.verify|verify} messages.
+                 * @function encode
+                 * @memberof flyteidl.core.Span
+                 * @static
+                 * @param {flyteidl.core.ISpan} message Span message or plain object to encode
+                 * @param {$protobuf.Writer} [writer] Writer to encode to
+                 * @returns {$protobuf.Writer} Writer
+                 */
+                Span.encode = function encode(message, writer) {
+                    if (!writer)
+                        writer = $Writer.create();
+                    if (message.startTime != null && message.hasOwnProperty("startTime"))
+                        $root.google.protobuf.Timestamp.encode(message.startTime, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
+                    if (message.endTime != null && message.hasOwnProperty("endTime"))
+                        $root.google.protobuf.Timestamp.encode(message.endTime, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim();
+                    if (message.workflowId != null && message.hasOwnProperty("workflowId"))
+                        $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowId, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+                    if (message.nodeId != null && message.hasOwnProperty("nodeId"))
+                        $root.flyteidl.core.NodeExecutionIdentifier.encode(message.nodeId, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
+                    if (message.taskId != null && message.hasOwnProperty("taskId"))
+                        $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskId, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim();
+                    if (message.operationId != null && message.hasOwnProperty("operationId"))
+                        writer.uint32(/* id 6, wireType 2 =*/50).string(message.operationId);
+                    if (message.spans != null && message.spans.length)
+                        for (var i = 0; i < message.spans.length; ++i)
+                            $root.flyteidl.core.Span.encode(message.spans[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim();
+                    return writer;
+                };
+    
+                /**
+                 * Decodes a Span message from the specified reader or buffer.
+                 * @function decode
+                 * @memberof flyteidl.core.Span
+                 * @static
+                 * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+                 * @param {number} [length] Message length if known beforehand
+                 * @returns {flyteidl.core.Span} Span
+                 * @throws {Error} If the payload is not a reader or valid buffer
+                 * @throws {$protobuf.util.ProtocolError} If required fields are missing
+                 */
+                Span.decode = function decode(reader, length) {
+                    if (!(reader instanceof $Reader))
+                        reader = $Reader.create(reader);
+                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.core.Span();
+                    while (reader.pos < end) {
+                        var tag = reader.uint32();
+                        switch (tag >>> 3) {
+                        case 1:
+                            message.startTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32());
+                            break;
+                        case 2:
+                            message.endTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32());
+                            break;
+                        case 3:
+                            message.workflowId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32());
+                            break;
+                        case 4:
+                            message.nodeId = $root.flyteidl.core.NodeExecutionIdentifier.decode(reader, reader.uint32());
+                            break;
+                        case 5:
+                            message.taskId = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32());
+                            break;
+                        case 6:
+                            message.operationId = reader.string();
+                            break;
+                        case 7:
+                            if (!(message.spans && message.spans.length))
+                                message.spans = [];
+                            message.spans.push($root.flyteidl.core.Span.decode(reader, reader.uint32()));
+                            break;
+                        default:
+                            reader.skipType(tag & 7);
+                            break;
+                        }
+                    }
+                    return message;
+                };
+    
+                /**
+                 * Verifies a Span message.
+                 * @function verify
+                 * @memberof flyteidl.core.Span
+                 * @static
+                 * @param {Object.} message Plain object to verify
+                 * @returns {string|null} `null` if valid, otherwise the reason why it is not
+                 */
+                Span.verify = function verify(message) {
+                    if (typeof message !== "object" || message === null)
+                        return "object expected";
+                    var properties = {};
+                    if (message.startTime != null && message.hasOwnProperty("startTime")) {
+                        var error = $root.google.protobuf.Timestamp.verify(message.startTime);
+                        if (error)
+                            return "startTime." + error;
+                    }
+                    if (message.endTime != null && message.hasOwnProperty("endTime")) {
+                        var error = $root.google.protobuf.Timestamp.verify(message.endTime);
+                        if (error)
+                            return "endTime." + error;
+                    }
+                    if (message.workflowId != null && message.hasOwnProperty("workflowId")) {
+                        properties.id = 1;
+                        {
+                            var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowId);
+                            if (error)
+                                return "workflowId." + error;
+                        }
+                    }
+                    if (message.nodeId != null && message.hasOwnProperty("nodeId")) {
+                        if (properties.id === 1)
+                            return "id: multiple values";
+                        properties.id = 1;
+                        {
+                            var error = $root.flyteidl.core.NodeExecutionIdentifier.verify(message.nodeId);
+                            if (error)
+                                return "nodeId." + error;
+                        }
+                    }
+                    if (message.taskId != null && message.hasOwnProperty("taskId")) {
+                        if (properties.id === 1)
+                            return "id: multiple values";
+                        properties.id = 1;
+                        {
+                            var error = $root.flyteidl.core.TaskExecutionIdentifier.verify(message.taskId);
+                            if (error)
+                                return "taskId." + error;
+                        }
+                    }
+                    if (message.operationId != null && message.hasOwnProperty("operationId")) {
+                        if (properties.id === 1)
+                            return "id: multiple values";
+                        properties.id = 1;
+                        if (!$util.isString(message.operationId))
+                            return "operationId: string expected";
+                    }
+                    if (message.spans != null && message.hasOwnProperty("spans")) {
+                        if (!Array.isArray(message.spans))
+                            return "spans: array expected";
+                        for (var i = 0; i < message.spans.length; ++i) {
+                            var error = $root.flyteidl.core.Span.verify(message.spans[i]);
+                            if (error)
+                                return "spans." + error;
+                        }
+                    }
+                    return null;
+                };
+    
+                return Span;
             })();
     
             core.WorkflowClosure = (function() {
diff --git a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py
index 94d41098ab..0ea330e62d 100644
--- a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.py
@@ -15,11 +15,7 @@
 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2
 
 
-<<<<<<< HEAD
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/core/errors.proto\x12\rflyteidl.core\x1a\x1d\x66lyteidl/core/execution.proto\"\xe5\x01\n\x0e\x43ontainerError\x12\x12\n\x04\x63ode\x18\x01 \x01(\tR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12\x36\n\x04kind\x18\x03 \x01(\x0e\x32\".flyteidl.core.ContainerError.KindR\x04kind\x12?\n\x06origin\x18\x04 \x01(\x0e\x32\'.flyteidl.core.ExecutionError.ErrorKindR\x06origin\",\n\x04Kind\x12\x13\n\x0fNON_RECOVERABLE\x10\x00\x12\x0f\n\x0bRECOVERABLE\x10\x01\"D\n\rErrorDocument\x12\x33\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.ContainerErrorR\x05\x65rrorB\xb1\x01\n\x11\x63om.flyteidl.coreB\x0b\x45rrorsProtoP\x01Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3')
-=======
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/core/errors.proto\x12\rflyteidl.core\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xe5\x01\n\x0e\x43ontainerError\x12\x12\n\x04\x63ode\x18\x01 \x01(\tR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12\x36\n\x04kind\x18\x03 \x01(\x0e\x32\".flyteidl.core.ContainerError.KindR\x04kind\x12?\n\x06origin\x18\x04 \x01(\x0e\x32\'.flyteidl.core.ExecutionError.ErrorKindR\x06origin\",\n\x04Kind\x12\x13\n\x0fNON_RECOVERABLE\x10\x00\x12\x0f\n\x0bRECOVERABLE\x10\x01\"D\n\rErrorDocument\x12\x33\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.ContainerErrorR\x05\x65rror\"\x8b\x04\n\x12\x43\x61\x63heEvictionError\x12:\n\x04\x63ode\x18\x01 \x01(\x0e\x32&.flyteidl.core.CacheEvictionError.CodeR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12R\n\x11node_execution_id\x18\x03 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12T\n\x11task_execution_id\x18\x04 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionId\x12`\n\x15workflow_execution_id\x18\x05 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\"\x88\x01\n\x04\x43ode\x12\x0c\n\x08INTERNAL\x10\x00\x12\x1c\n\x18RESERVATION_NOT_ACQUIRED\x10\x01\x12\x1a\n\x16\x44\x41TABASE_UPDATE_FAILED\x10\x02\x12\x1a\n\x16\x41RTIFACT_DELETE_FAILED\x10\x03\x12\x1c\n\x18RESERVATION_NOT_RELEASED\x10\x04\x42\x08\n\x06source\"S\n\x16\x43\x61\x63heEvictionErrorList\x12\x39\n\x06\x65rrors\x18\x01 \x03(\x0b\x32!.flyteidl.core.CacheEvictionErrorR\x06\x65rrorsB\xab\x01\n\x11\x63om.flyteidl.coreB\x0b\x45rrorsProtoP\x01Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3')
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/core/errors.proto\x12\rflyteidl.core\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\xe5\x01\n\x0e\x43ontainerError\x12\x12\n\x04\x63ode\x18\x01 \x01(\tR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12\x36\n\x04kind\x18\x03 \x01(\x0e\x32\".flyteidl.core.ContainerError.KindR\x04kind\x12?\n\x06origin\x18\x04 \x01(\x0e\x32\'.flyteidl.core.ExecutionError.ErrorKindR\x06origin\",\n\x04Kind\x12\x13\n\x0fNON_RECOVERABLE\x10\x00\x12\x0f\n\x0bRECOVERABLE\x10\x01\"D\n\rErrorDocument\x12\x33\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.ContainerErrorR\x05\x65rror\"\x8b\x04\n\x12\x43\x61\x63heEvictionError\x12:\n\x04\x63ode\x18\x01 \x01(\x0e\x32&.flyteidl.core.CacheEvictionError.CodeR\x04\x63ode\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\x12R\n\x11node_execution_id\x18\x03 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierR\x0fnodeExecutionId\x12T\n\x11task_execution_id\x18\x04 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x0ftaskExecutionId\x12`\n\x15workflow_execution_id\x18\x05 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\x13workflowExecutionId\"\x88\x01\n\x04\x43ode\x12\x0c\n\x08INTERNAL\x10\x00\x12\x1c\n\x18RESERVATION_NOT_ACQUIRED\x10\x01\x12\x1a\n\x16\x44\x41TABASE_UPDATE_FAILED\x10\x02\x12\x1a\n\x16\x41RTIFACT_DELETE_FAILED\x10\x03\x12\x1c\n\x18RESERVATION_NOT_RELEASED\x10\x04\x42\x08\n\x06source\"S\n\x16\x43\x61\x63heEvictionErrorList\x12\x39\n\x06\x65rrors\x18\x01 \x03(\x0b\x32!.flyteidl.core.CacheEvictionErrorR\x06\x65rrorsB\xb1\x01\n\x11\x63om.flyteidl.coreB\x0b\x45rrorsProtoP\x01Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -27,27 +23,17 @@
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-<<<<<<< HEAD
   DESCRIPTOR._serialized_options = b'\n\021com.flyteidl.coreB\013ErrorsProtoP\001Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\242\002\003FCX\252\002\rFlyteidl.Core\312\002\rFlyteidl\\Core\342\002\031Flyteidl\\Core\\GPBMetadata\352\002\016Flyteidl::Core'
-  _globals['_CONTAINERERROR']._serialized_start=77
-  _globals['_CONTAINERERROR']._serialized_end=306
-  _globals['_CONTAINERERROR_KIND']._serialized_start=262
-  _globals['_CONTAINERERROR_KIND']._serialized_end=306
-  _globals['_ERRORDOCUMENT']._serialized_start=308
-  _globals['_ERRORDOCUMENT']._serialized_end=376
-=======
-  DESCRIPTOR._serialized_options = b'\n\021com.flyteidl.coreB\013ErrorsProtoP\001Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\242\002\003FCX\252\002\rFlyteidl.Core\312\002\rFlyteidl\\Core\342\002\031Flyteidl\\Core\\GPBMetadata\352\002\016Flyteidl::Core'
-  _CONTAINERERROR._serialized_start=109
-  _CONTAINERERROR._serialized_end=338
-  _CONTAINERERROR_KIND._serialized_start=294
-  _CONTAINERERROR_KIND._serialized_end=338
-  _ERRORDOCUMENT._serialized_start=340
-  _ERRORDOCUMENT._serialized_end=408
-  _CACHEEVICTIONERROR._serialized_start=411
-  _CACHEEVICTIONERROR._serialized_end=934
-  _CACHEEVICTIONERROR_CODE._serialized_start=788
-  _CACHEEVICTIONERROR_CODE._serialized_end=924
-  _CACHEEVICTIONERRORLIST._serialized_start=936
-  _CACHEEVICTIONERRORLIST._serialized_end=1019
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+  _globals['_CONTAINERERROR']._serialized_start=109
+  _globals['_CONTAINERERROR']._serialized_end=338
+  _globals['_CONTAINERERROR_KIND']._serialized_start=294
+  _globals['_CONTAINERERROR_KIND']._serialized_end=338
+  _globals['_ERRORDOCUMENT']._serialized_start=340
+  _globals['_ERRORDOCUMENT']._serialized_end=408
+  _globals['_CACHEEVICTIONERROR']._serialized_start=411
+  _globals['_CACHEEVICTIONERROR']._serialized_end=934
+  _globals['_CACHEEVICTIONERROR_CODE']._serialized_start=788
+  _globals['_CACHEEVICTIONERROR_CODE']._serialized_end=924
+  _globals['_CACHEEVICTIONERRORLIST']._serialized_start=936
+  _globals['_CACHEEVICTIONERRORLIST']._serialized_end=1019
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi
index ded2c0b20d..6954a6a349 100644
--- a/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/core/errors_pb2.pyi
@@ -8,33 +8,6 @@ from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Map
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class CacheEvictionError(_message.Message):
-    __slots__ = ["code", "message", "node_execution_id", "task_execution_id", "workflow_execution_id"]
-    class Code(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
-        __slots__ = []
-    ARTIFACT_DELETE_FAILED: CacheEvictionError.Code
-    CODE_FIELD_NUMBER: _ClassVar[int]
-    DATABASE_UPDATE_FAILED: CacheEvictionError.Code
-    INTERNAL: CacheEvictionError.Code
-    MESSAGE_FIELD_NUMBER: _ClassVar[int]
-    NODE_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
-    RESERVATION_NOT_ACQUIRED: CacheEvictionError.Code
-    RESERVATION_NOT_RELEASED: CacheEvictionError.Code
-    TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
-    WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
-    code: CacheEvictionError.Code
-    message: str
-    node_execution_id: _identifier_pb2.NodeExecutionIdentifier
-    task_execution_id: _identifier_pb2.TaskExecutionIdentifier
-    workflow_execution_id: _identifier_pb2.WorkflowExecutionIdentifier
-    def __init__(self, code: _Optional[_Union[CacheEvictionError.Code, str]] = ..., message: _Optional[str] = ..., node_execution_id: _Optional[_Union[_identifier_pb2.NodeExecutionIdentifier, _Mapping]] = ..., task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., workflow_execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ...) -> None: ...
-
-class CacheEvictionErrorList(_message.Message):
-    __slots__ = ["errors"]
-    ERRORS_FIELD_NUMBER: _ClassVar[int]
-    errors: _containers.RepeatedCompositeFieldContainer[CacheEvictionError]
-    def __init__(self, errors: _Optional[_Iterable[_Union[CacheEvictionError, _Mapping]]] = ...) -> None: ...
-
 class ContainerError(_message.Message):
     __slots__ = ["code", "message", "kind", "origin"]
     class Kind(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
@@ -58,3 +31,35 @@ class ErrorDocument(_message.Message):
     ERROR_FIELD_NUMBER: _ClassVar[int]
     error: ContainerError
     def __init__(self, error: _Optional[_Union[ContainerError, _Mapping]] = ...) -> None: ...
+
+class CacheEvictionError(_message.Message):
+    __slots__ = ["code", "message", "node_execution_id", "task_execution_id", "workflow_execution_id"]
+    class Code(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+        INTERNAL: _ClassVar[CacheEvictionError.Code]
+        RESERVATION_NOT_ACQUIRED: _ClassVar[CacheEvictionError.Code]
+        DATABASE_UPDATE_FAILED: _ClassVar[CacheEvictionError.Code]
+        ARTIFACT_DELETE_FAILED: _ClassVar[CacheEvictionError.Code]
+        RESERVATION_NOT_RELEASED: _ClassVar[CacheEvictionError.Code]
+    INTERNAL: CacheEvictionError.Code
+    RESERVATION_NOT_ACQUIRED: CacheEvictionError.Code
+    DATABASE_UPDATE_FAILED: CacheEvictionError.Code
+    ARTIFACT_DELETE_FAILED: CacheEvictionError.Code
+    RESERVATION_NOT_RELEASED: CacheEvictionError.Code
+    CODE_FIELD_NUMBER: _ClassVar[int]
+    MESSAGE_FIELD_NUMBER: _ClassVar[int]
+    NODE_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
+    TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
+    WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
+    code: CacheEvictionError.Code
+    message: str
+    node_execution_id: _identifier_pb2.NodeExecutionIdentifier
+    task_execution_id: _identifier_pb2.TaskExecutionIdentifier
+    workflow_execution_id: _identifier_pb2.WorkflowExecutionIdentifier
+    def __init__(self, code: _Optional[_Union[CacheEvictionError.Code, str]] = ..., message: _Optional[str] = ..., node_execution_id: _Optional[_Union[_identifier_pb2.NodeExecutionIdentifier, _Mapping]] = ..., task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., workflow_execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ...) -> None: ...
+
+class CacheEvictionErrorList(_message.Message):
+    __slots__ = ["errors"]
+    ERRORS_FIELD_NUMBER: _ClassVar[int]
+    errors: _containers.RepeatedCompositeFieldContainer[CacheEvictionError]
+    def __init__(self, errors: _Optional[_Iterable[_Union[CacheEvictionError, _Mapping]]] = ...) -> None: ...
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
index c652568053..3778d16951 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
@@ -16,11 +16,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-<<<<<<< HEAD
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xfb\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x05 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadataB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x7f\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x8b\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07versionB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\x86\x07\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xb2\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01ZAgithub.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3')
-=======
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xc8\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61taB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"\x99\x01\n\x15\x44\x65leteArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"Z\n\x16\x44\x65leteArtifactsRequest\x12@\n\tartifacts\x18\x01 \x03(\x0b\x32\".datacatalog.DeleteArtifactRequestR\tartifacts\"\x18\n\x16\x44\x65leteArtifactResponse\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"p\n\x1eGetOrExtendReservationsRequest\x12N\n\x0creservations\x18\x01 \x03(\x0b\x32*.datacatalog.GetOrExtendReservationRequestR\x0creservations\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"_\n\x1fGetOrExtendReservationsResponse\x12<\n\x0creservations\x18\x01 \x03(\x0b\x32\x18.datacatalog.ReservationR\x0creservations\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"h\n\x1aReleaseReservationsRequest\x12J\n\x0creservations\x18\x01 \x03(\x0b\x32&.datacatalog.ReleaseReservationRequestR\x0creservations\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x7f\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x8b\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07versionB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\x9d\n\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12Y\n\x0e\x44\x65leteArtifact\x12\".datacatalog.DeleteArtifactRequest\x1a#.datacatalog.DeleteArtifactResponse\x12[\n\x0f\x44\x65leteArtifacts\x12#.datacatalog.DeleteArtifactsRequest\x1a#.datacatalog.DeleteArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12t\n\x17GetOrExtendReservations\x12+.datacatalog.GetOrExtendReservationsRequest\x1a,.datacatalog.GetOrExtendReservationsResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponse\x12g\n\x13ReleaseReservations\x12\'.datacatalog.ReleaseReservationsRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xac\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01Z;github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3')
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xfb\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x05 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadataB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"\x99\x01\n\x15\x44\x65leteArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"Z\n\x16\x44\x65leteArtifactsRequest\x12@\n\tartifacts\x18\x01 \x03(\x0b\x32\".datacatalog.DeleteArtifactRequestR\tartifacts\"\x18\n\x16\x44\x65leteArtifactResponse\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"p\n\x1eGetOrExtendReservationsRequest\x12N\n\x0creservations\x18\x01 \x03(\x0b\x32*.datacatalog.GetOrExtendReservationRequestR\x0creservations\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"_\n\x1fGetOrExtendReservationsResponse\x12<\n\x0creservations\x18\x01 \x03(\x0b\x32\x18.datacatalog.ReservationR\x0creservations\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"h\n\x1aReleaseReservationsRequest\x12J\n\x0creservations\x18\x01 \x03(\x0b\x32&.datacatalog.ReleaseReservationRequestR\x0creservations\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x7f\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x8b\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07versionB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\x9d\n\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12Y\n\x0e\x44\x65leteArtifact\x12\".datacatalog.DeleteArtifactRequest\x1a#.datacatalog.DeleteArtifactResponse\x12[\n\x0f\x44\x65leteArtifacts\x12#.datacatalog.DeleteArtifactsRequest\x1a#.datacatalog.DeleteArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12t\n\x17GetOrExtendReservations\x12+.datacatalog.GetOrExtendReservationsRequest\x1a,.datacatalog.GetOrExtendReservationsResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponse\x12g\n\x13ReleaseReservations\x12\'.datacatalog.ReleaseReservationsRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xb2\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01ZAgithub.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -31,7 +27,6 @@
   DESCRIPTOR._serialized_options = b'\n\017com.datacatalogB\020DatacatalogProtoP\001ZAgithub.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog\242\002\003DXX\252\002\013Datacatalog\312\002\013Datacatalog\342\002\027Datacatalog\\GPBMetadata\352\002\013Datacatalog'
   _METADATA_KEYMAPENTRY._options = None
   _METADATA_KEYMAPENTRY._serialized_options = b'8\001'
-<<<<<<< HEAD
   _globals['_CREATEDATASETREQUEST']._serialized_start=150
   _globals['_CREATEDATASETREQUEST']._serialized_end=220
   _globals['_CREATEDATASETRESPONSE']._serialized_start=222
@@ -64,154 +59,68 @@
   _globals['_UPDATEARTIFACTREQUEST']._serialized_end=1591
   _globals['_UPDATEARTIFACTRESPONSE']._serialized_start=1593
   _globals['_UPDATEARTIFACTRESPONSE']._serialized_end=1650
-  _globals['_RESERVATIONID']._serialized_start=1652
-  _globals['_RESERVATIONID']._serialized_end=1749
-  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_start=1752
-  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_end=1951
-  _globals['_RESERVATION']._serialized_start=1954
-  _globals['_RESERVATION']._serialized_end=2245
-  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_start=2247
-  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_end=2339
-  _globals['_RELEASERESERVATIONREQUEST']._serialized_start=2341
-  _globals['_RELEASERESERVATIONREQUEST']._serialized_end=2462
-  _globals['_RELEASERESERVATIONRESPONSE']._serialized_start=2464
-  _globals['_RELEASERESERVATIONRESPONSE']._serialized_end=2492
-  _globals['_DATASET']._serialized_start=2495
-  _globals['_DATASET']._serialized_end=2633
-  _globals['_PARTITION']._serialized_start=2635
-  _globals['_PARTITION']._serialized_end=2686
-  _globals['_DATASETID']._serialized_start=2688
-  _globals['_DATASETID']._serialized_end=2815
-  _globals['_ARTIFACT']._serialized_start=2818
-  _globals['_ARTIFACT']._serialized_end=3145
-  _globals['_ARTIFACTDATA']._serialized_start=3147
-  _globals['_ARTIFACTDATA']._serialized_end=3227
-  _globals['_TAG']._serialized_start=3229
-  _globals['_TAG']._serialized_end=3337
-  _globals['_METADATA']._serialized_start=3340
-  _globals['_METADATA']._serialized_end=3469
-  _globals['_METADATA_KEYMAPENTRY']._serialized_start=3412
-  _globals['_METADATA_KEYMAPENTRY']._serialized_end=3469
-  _globals['_FILTEREXPRESSION']._serialized_start=3471
-  _globals['_FILTEREXPRESSION']._serialized_end=3550
-  _globals['_SINGLEPROPERTYFILTER']._serialized_start=3553
-  _globals['_SINGLEPROPERTYFILTER']._serialized_end=4015
-  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_start=3964
-  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_end=3996
-  _globals['_ARTIFACTPROPERTYFILTER']._serialized_start=4017
-  _globals['_ARTIFACTPROPERTYFILTER']._serialized_end=4088
-  _globals['_TAGPROPERTYFILTER']._serialized_start=4090
-  _globals['_TAGPROPERTYFILTER']._serialized_end=4150
-  _globals['_PARTITIONPROPERTYFILTER']._serialized_start=4152
-  _globals['_PARTITIONPROPERTYFILTER']._serialized_end=4243
-  _globals['_KEYVALUEPAIR']._serialized_start=4245
-  _globals['_KEYVALUEPAIR']._serialized_end=4299
-  _globals['_DATASETPROPERTYFILTER']._serialized_start=4302
-  _globals['_DATASETPROPERTYFILTER']._serialized_end=4441
-  _globals['_PAGINATIONOPTIONS']._serialized_start=4444
-  _globals['_PAGINATIONOPTIONS']._serialized_end=4719
-  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_start=4647
-  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_end=4689
-  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_start=4691
-  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_end=4719
-  _globals['_DATACATALOG']._serialized_start=4722
-  _globals['_DATACATALOG']._serialized_end=5624
-=======
-  _CREATEDATASETREQUEST._serialized_start=150
-  _CREATEDATASETREQUEST._serialized_end=220
-  _CREATEDATASETRESPONSE._serialized_start=222
-  _CREATEDATASETRESPONSE._serialized_end=245
-  _GETDATASETREQUEST._serialized_start=247
-  _GETDATASETREQUEST._serialized_end=316
-  _GETDATASETRESPONSE._serialized_start=318
-  _GETDATASETRESPONSE._serialized_end=386
-  _GETARTIFACTREQUEST._serialized_start=389
-  _GETARTIFACTREQUEST._serialized_end=539
-  _GETARTIFACTRESPONSE._serialized_start=541
-  _GETARTIFACTRESPONSE._serialized_end=613
-  _CREATEARTIFACTREQUEST._serialized_start=615
-  _CREATEARTIFACTREQUEST._serialized_end=689
-  _CREATEARTIFACTRESPONSE._serialized_start=691
-  _CREATEARTIFACTRESPONSE._serialized_end=715
-  _ADDTAGREQUEST._serialized_start=717
-  _ADDTAGREQUEST._serialized_end=768
-  _ADDTAGRESPONSE._serialized_start=770
-  _ADDTAGRESPONSE._serialized_end=786
-  _LISTARTIFACTSREQUEST._serialized_start=789
-  _LISTARTIFACTSREQUEST._serialized_end=980
-  _LISTARTIFACTSRESPONSE._serialized_start=982
-  _LISTARTIFACTSRESPONSE._serialized_end=1089
-  _LISTDATASETSREQUEST._serialized_start=1092
-  _LISTDATASETSREQUEST._serialized_end=1232
-  _LISTDATASETSRESPONSE._serialized_start=1234
-  _LISTDATASETSRESPONSE._serialized_end=1337
-  _UPDATEARTIFACTREQUEST._serialized_start=1340
-  _UPDATEARTIFACTREQUEST._serialized_end=1540
-  _UPDATEARTIFACTRESPONSE._serialized_start=1542
-  _UPDATEARTIFACTRESPONSE._serialized_end=1599
-  _DELETEARTIFACTREQUEST._serialized_start=1602
-  _DELETEARTIFACTREQUEST._serialized_end=1755
-  _DELETEARTIFACTSREQUEST._serialized_start=1757
-  _DELETEARTIFACTSREQUEST._serialized_end=1847
-  _DELETEARTIFACTRESPONSE._serialized_start=1849
-  _DELETEARTIFACTRESPONSE._serialized_end=1873
-  _RESERVATIONID._serialized_start=1875
-  _RESERVATIONID._serialized_end=1972
-  _GETOREXTENDRESERVATIONREQUEST._serialized_start=1975
-  _GETOREXTENDRESERVATIONREQUEST._serialized_end=2174
-  _GETOREXTENDRESERVATIONSREQUEST._serialized_start=2176
-  _GETOREXTENDRESERVATIONSREQUEST._serialized_end=2288
-  _RESERVATION._serialized_start=2291
-  _RESERVATION._serialized_end=2582
-  _GETOREXTENDRESERVATIONRESPONSE._serialized_start=2584
-  _GETOREXTENDRESERVATIONRESPONSE._serialized_end=2676
-  _GETOREXTENDRESERVATIONSRESPONSE._serialized_start=2678
-  _GETOREXTENDRESERVATIONSRESPONSE._serialized_end=2773
-  _RELEASERESERVATIONREQUEST._serialized_start=2775
-  _RELEASERESERVATIONREQUEST._serialized_end=2896
-  _RELEASERESERVATIONSREQUEST._serialized_start=2898
-  _RELEASERESERVATIONSREQUEST._serialized_end=3002
-  _RELEASERESERVATIONRESPONSE._serialized_start=3004
-  _RELEASERESERVATIONRESPONSE._serialized_end=3032
-  _DATASET._serialized_start=3035
-  _DATASET._serialized_end=3173
-  _PARTITION._serialized_start=3175
-  _PARTITION._serialized_end=3226
-  _DATASETID._serialized_start=3228
-  _DATASETID._serialized_end=3355
-  _ARTIFACT._serialized_start=3358
-  _ARTIFACT._serialized_end=3685
-  _ARTIFACTDATA._serialized_start=3687
-  _ARTIFACTDATA._serialized_end=3767
-  _TAG._serialized_start=3769
-  _TAG._serialized_end=3877
-  _METADATA._serialized_start=3880
-  _METADATA._serialized_end=4009
-  _METADATA_KEYMAPENTRY._serialized_start=3952
-  _METADATA_KEYMAPENTRY._serialized_end=4009
-  _FILTEREXPRESSION._serialized_start=4011
-  _FILTEREXPRESSION._serialized_end=4090
-  _SINGLEPROPERTYFILTER._serialized_start=4093
-  _SINGLEPROPERTYFILTER._serialized_end=4555
-  _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_start=4504
-  _SINGLEPROPERTYFILTER_COMPARISONOPERATOR._serialized_end=4536
-  _ARTIFACTPROPERTYFILTER._serialized_start=4557
-  _ARTIFACTPROPERTYFILTER._serialized_end=4628
-  _TAGPROPERTYFILTER._serialized_start=4630
-  _TAGPROPERTYFILTER._serialized_end=4690
-  _PARTITIONPROPERTYFILTER._serialized_start=4692
-  _PARTITIONPROPERTYFILTER._serialized_end=4783
-  _KEYVALUEPAIR._serialized_start=4785
-  _KEYVALUEPAIR._serialized_end=4839
-  _DATASETPROPERTYFILTER._serialized_start=4842
-  _DATASETPROPERTYFILTER._serialized_end=4981
-  _PAGINATIONOPTIONS._serialized_start=4984
-  _PAGINATIONOPTIONS._serialized_end=5259
-  _PAGINATIONOPTIONS_SORTORDER._serialized_start=5187
-  _PAGINATIONOPTIONS_SORTORDER._serialized_end=5229
-  _PAGINATIONOPTIONS_SORTKEY._serialized_start=5231
-  _PAGINATIONOPTIONS_SORTKEY._serialized_end=5259
-  _DATACATALOG._serialized_start=5262
-  _DATACATALOG._serialized_end=6571
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
+  _globals['_DELETEARTIFACTREQUEST']._serialized_start=1653
+  _globals['_DELETEARTIFACTREQUEST']._serialized_end=1806
+  _globals['_DELETEARTIFACTSREQUEST']._serialized_start=1808
+  _globals['_DELETEARTIFACTSREQUEST']._serialized_end=1898
+  _globals['_DELETEARTIFACTRESPONSE']._serialized_start=1900
+  _globals['_DELETEARTIFACTRESPONSE']._serialized_end=1924
+  _globals['_RESERVATIONID']._serialized_start=1926
+  _globals['_RESERVATIONID']._serialized_end=2023
+  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_start=2026
+  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_end=2225
+  _globals['_GETOREXTENDRESERVATIONSREQUEST']._serialized_start=2227
+  _globals['_GETOREXTENDRESERVATIONSREQUEST']._serialized_end=2339
+  _globals['_RESERVATION']._serialized_start=2342
+  _globals['_RESERVATION']._serialized_end=2633
+  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_start=2635
+  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_end=2727
+  _globals['_GETOREXTENDRESERVATIONSRESPONSE']._serialized_start=2729
+  _globals['_GETOREXTENDRESERVATIONSRESPONSE']._serialized_end=2824
+  _globals['_RELEASERESERVATIONREQUEST']._serialized_start=2826
+  _globals['_RELEASERESERVATIONREQUEST']._serialized_end=2947
+  _globals['_RELEASERESERVATIONSREQUEST']._serialized_start=2949
+  _globals['_RELEASERESERVATIONSREQUEST']._serialized_end=3053
+  _globals['_RELEASERESERVATIONRESPONSE']._serialized_start=3055
+  _globals['_RELEASERESERVATIONRESPONSE']._serialized_end=3083
+  _globals['_DATASET']._serialized_start=3086
+  _globals['_DATASET']._serialized_end=3224
+  _globals['_PARTITION']._serialized_start=3226
+  _globals['_PARTITION']._serialized_end=3277
+  _globals['_DATASETID']._serialized_start=3279
+  _globals['_DATASETID']._serialized_end=3406
+  _globals['_ARTIFACT']._serialized_start=3409
+  _globals['_ARTIFACT']._serialized_end=3736
+  _globals['_ARTIFACTDATA']._serialized_start=3738
+  _globals['_ARTIFACTDATA']._serialized_end=3818
+  _globals['_TAG']._serialized_start=3820
+  _globals['_TAG']._serialized_end=3928
+  _globals['_METADATA']._serialized_start=3931
+  _globals['_METADATA']._serialized_end=4060
+  _globals['_METADATA_KEYMAPENTRY']._serialized_start=4003
+  _globals['_METADATA_KEYMAPENTRY']._serialized_end=4060
+  _globals['_FILTEREXPRESSION']._serialized_start=4062
+  _globals['_FILTEREXPRESSION']._serialized_end=4141
+  _globals['_SINGLEPROPERTYFILTER']._serialized_start=4144
+  _globals['_SINGLEPROPERTYFILTER']._serialized_end=4606
+  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_start=4555
+  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_end=4587
+  _globals['_ARTIFACTPROPERTYFILTER']._serialized_start=4608
+  _globals['_ARTIFACTPROPERTYFILTER']._serialized_end=4679
+  _globals['_TAGPROPERTYFILTER']._serialized_start=4681
+  _globals['_TAGPROPERTYFILTER']._serialized_end=4741
+  _globals['_PARTITIONPROPERTYFILTER']._serialized_start=4743
+  _globals['_PARTITIONPROPERTYFILTER']._serialized_end=4834
+  _globals['_KEYVALUEPAIR']._serialized_start=4836
+  _globals['_KEYVALUEPAIR']._serialized_end=4890
+  _globals['_DATASETPROPERTYFILTER']._serialized_start=4893
+  _globals['_DATASETPROPERTYFILTER']._serialized_end=5032
+  _globals['_PAGINATIONOPTIONS']._serialized_start=5035
+  _globals['_PAGINATIONOPTIONS']._serialized_end=5310
+  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_start=5238
+  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_end=5280
+  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_start=5282
+  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_end=5310
+  _globals['_DATACATALOG']._serialized_start=5313
+  _globals['_DATACATALOG']._serialized_end=6622
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
index 395bf385e1..7ea6c357dd 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
@@ -19,87 +19,6 @@ class CreateDatasetResponse(_message.Message):
     __slots__ = []
     def __init__(self) -> None: ...
 
-<<<<<<< HEAD
-=======
-class Dataset(_message.Message):
-    __slots__ = ["id", "metadata", "partitionKeys"]
-    ID_FIELD_NUMBER: _ClassVar[int]
-    METADATA_FIELD_NUMBER: _ClassVar[int]
-    PARTITIONKEYS_FIELD_NUMBER: _ClassVar[int]
-    id: DatasetID
-    metadata: Metadata
-    partitionKeys: _containers.RepeatedScalarFieldContainer[str]
-    def __init__(self, id: _Optional[_Union[DatasetID, _Mapping]] = ..., metadata: _Optional[_Union[Metadata, _Mapping]] = ..., partitionKeys: _Optional[_Iterable[str]] = ...) -> None: ...
-
-class DatasetID(_message.Message):
-    __slots__ = ["UUID", "domain", "name", "project", "version"]
-    DOMAIN_FIELD_NUMBER: _ClassVar[int]
-    NAME_FIELD_NUMBER: _ClassVar[int]
-    PROJECT_FIELD_NUMBER: _ClassVar[int]
-    UUID: str
-    UUID_FIELD_NUMBER: _ClassVar[int]
-    VERSION_FIELD_NUMBER: _ClassVar[int]
-    domain: str
-    name: str
-    project: str
-    version: str
-    def __init__(self, project: _Optional[str] = ..., name: _Optional[str] = ..., domain: _Optional[str] = ..., version: _Optional[str] = ..., UUID: _Optional[str] = ...) -> None: ...
-
-class DatasetPropertyFilter(_message.Message):
-    __slots__ = ["domain", "name", "project", "version"]
-    DOMAIN_FIELD_NUMBER: _ClassVar[int]
-    NAME_FIELD_NUMBER: _ClassVar[int]
-    PROJECT_FIELD_NUMBER: _ClassVar[int]
-    VERSION_FIELD_NUMBER: _ClassVar[int]
-    domain: str
-    name: str
-    project: str
-    version: str
-    def __init__(self, project: _Optional[str] = ..., name: _Optional[str] = ..., domain: _Optional[str] = ..., version: _Optional[str] = ...) -> None: ...
-
-class DeleteArtifactRequest(_message.Message):
-    __slots__ = ["artifact_id", "dataset", "tag_name"]
-    ARTIFACT_ID_FIELD_NUMBER: _ClassVar[int]
-    DATASET_FIELD_NUMBER: _ClassVar[int]
-    TAG_NAME_FIELD_NUMBER: _ClassVar[int]
-    artifact_id: str
-    dataset: DatasetID
-    tag_name: str
-    def __init__(self, dataset: _Optional[_Union[DatasetID, _Mapping]] = ..., artifact_id: _Optional[str] = ..., tag_name: _Optional[str] = ...) -> None: ...
-
-class DeleteArtifactResponse(_message.Message):
-    __slots__ = []
-    def __init__(self) -> None: ...
-
-class DeleteArtifactsRequest(_message.Message):
-    __slots__ = ["artifacts"]
-    ARTIFACTS_FIELD_NUMBER: _ClassVar[int]
-    artifacts: _containers.RepeatedCompositeFieldContainer[DeleteArtifactRequest]
-    def __init__(self, artifacts: _Optional[_Iterable[_Union[DeleteArtifactRequest, _Mapping]]] = ...) -> None: ...
-
-class FilterExpression(_message.Message):
-    __slots__ = ["filters"]
-    FILTERS_FIELD_NUMBER: _ClassVar[int]
-    filters: _containers.RepeatedCompositeFieldContainer[SinglePropertyFilter]
-    def __init__(self, filters: _Optional[_Iterable[_Union[SinglePropertyFilter, _Mapping]]] = ...) -> None: ...
-
-class GetArtifactRequest(_message.Message):
-    __slots__ = ["artifact_id", "dataset", "tag_name"]
-    ARTIFACT_ID_FIELD_NUMBER: _ClassVar[int]
-    DATASET_FIELD_NUMBER: _ClassVar[int]
-    TAG_NAME_FIELD_NUMBER: _ClassVar[int]
-    artifact_id: str
-    dataset: DatasetID
-    tag_name: str
-    def __init__(self, dataset: _Optional[_Union[DatasetID, _Mapping]] = ..., artifact_id: _Optional[str] = ..., tag_name: _Optional[str] = ...) -> None: ...
-
-class GetArtifactResponse(_message.Message):
-    __slots__ = ["artifact"]
-    ARTIFACT_FIELD_NUMBER: _ClassVar[int]
-    artifact: Artifact
-    def __init__(self, artifact: _Optional[_Union[Artifact, _Mapping]] = ...) -> None: ...
-
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 class GetDatasetRequest(_message.Message):
     __slots__ = ["dataset"]
     DATASET_FIELD_NUMBER: _ClassVar[int]
@@ -128,7 +47,6 @@ class GetArtifactResponse(_message.Message):
     artifact: Artifact
     def __init__(self, artifact: _Optional[_Union[Artifact, _Mapping]] = ...) -> None: ...
 
-<<<<<<< HEAD
 class CreateArtifactRequest(_message.Message):
     __slots__ = ["artifact"]
     ARTIFACT_FIELD_NUMBER: _ClassVar[int]
@@ -148,27 +66,6 @@ class AddTagRequest(_message.Message):
 class AddTagResponse(_message.Message):
     __slots__ = []
     def __init__(self) -> None: ...
-=======
-class GetOrExtendReservationsRequest(_message.Message):
-    __slots__ = ["reservations"]
-    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
-    reservations: _containers.RepeatedCompositeFieldContainer[GetOrExtendReservationRequest]
-    def __init__(self, reservations: _Optional[_Iterable[_Union[GetOrExtendReservationRequest, _Mapping]]] = ...) -> None: ...
-
-class GetOrExtendReservationsResponse(_message.Message):
-    __slots__ = ["reservations"]
-    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
-    reservations: _containers.RepeatedCompositeFieldContainer[Reservation]
-    def __init__(self, reservations: _Optional[_Iterable[_Union[Reservation, _Mapping]]] = ...) -> None: ...
-
-class KeyValuePair(_message.Message):
-    __slots__ = ["key", "value"]
-    KEY_FIELD_NUMBER: _ClassVar[int]
-    VALUE_FIELD_NUMBER: _ClassVar[int]
-    key: str
-    value: str
-    def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 
 class ListArtifactsRequest(_message.Message):
     __slots__ = ["dataset", "filter", "pagination"]
@@ -224,6 +121,26 @@ class UpdateArtifactResponse(_message.Message):
     artifact_id: str
     def __init__(self, artifact_id: _Optional[str] = ...) -> None: ...
 
+class DeleteArtifactRequest(_message.Message):
+    __slots__ = ["dataset", "artifact_id", "tag_name"]
+    DATASET_FIELD_NUMBER: _ClassVar[int]
+    ARTIFACT_ID_FIELD_NUMBER: _ClassVar[int]
+    TAG_NAME_FIELD_NUMBER: _ClassVar[int]
+    dataset: DatasetID
+    artifact_id: str
+    tag_name: str
+    def __init__(self, dataset: _Optional[_Union[DatasetID, _Mapping]] = ..., artifact_id: _Optional[str] = ..., tag_name: _Optional[str] = ...) -> None: ...
+
+class DeleteArtifactsRequest(_message.Message):
+    __slots__ = ["artifacts"]
+    ARTIFACTS_FIELD_NUMBER: _ClassVar[int]
+    artifacts: _containers.RepeatedCompositeFieldContainer[DeleteArtifactRequest]
+    def __init__(self, artifacts: _Optional[_Iterable[_Union[DeleteArtifactRequest, _Mapping]]] = ...) -> None: ...
+
+class DeleteArtifactResponse(_message.Message):
+    __slots__ = []
+    def __init__(self) -> None: ...
+
 class ReservationID(_message.Message):
     __slots__ = ["dataset_id", "tag_name"]
     DATASET_ID_FIELD_NUMBER: _ClassVar[int]
@@ -242,6 +159,12 @@ class GetOrExtendReservationRequest(_message.Message):
     heartbeat_interval: _duration_pb2.Duration
     def __init__(self, reservation_id: _Optional[_Union[ReservationID, _Mapping]] = ..., owner_id: _Optional[str] = ..., heartbeat_interval: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ...) -> None: ...
 
+class GetOrExtendReservationsRequest(_message.Message):
+    __slots__ = ["reservations"]
+    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
+    reservations: _containers.RepeatedCompositeFieldContainer[GetOrExtendReservationRequest]
+    def __init__(self, reservations: _Optional[_Iterable[_Union[GetOrExtendReservationRequest, _Mapping]]] = ...) -> None: ...
+
 class Reservation(_message.Message):
     __slots__ = ["reservation_id", "owner_id", "heartbeat_interval", "expires_at", "metadata"]
     RESERVATION_ID_FIELD_NUMBER: _ClassVar[int]
@@ -262,6 +185,12 @@ class GetOrExtendReservationResponse(_message.Message):
     reservation: Reservation
     def __init__(self, reservation: _Optional[_Union[Reservation, _Mapping]] = ...) -> None: ...
 
+class GetOrExtendReservationsResponse(_message.Message):
+    __slots__ = ["reservations"]
+    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
+    reservations: _containers.RepeatedCompositeFieldContainer[Reservation]
+    def __init__(self, reservations: _Optional[_Iterable[_Union[Reservation, _Mapping]]] = ...) -> None: ...
+
 class ReleaseReservationRequest(_message.Message):
     __slots__ = ["reservation_id", "owner_id"]
     RESERVATION_ID_FIELD_NUMBER: _ClassVar[int]
@@ -270,6 +199,12 @@ class ReleaseReservationRequest(_message.Message):
     owner_id: str
     def __init__(self, reservation_id: _Optional[_Union[ReservationID, _Mapping]] = ..., owner_id: _Optional[str] = ...) -> None: ...
 
+class ReleaseReservationsRequest(_message.Message):
+    __slots__ = ["reservations"]
+    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
+    reservations: _containers.RepeatedCompositeFieldContainer[ReleaseReservationRequest]
+    def __init__(self, reservations: _Optional[_Iterable[_Union[ReleaseReservationRequest, _Mapping]]] = ...) -> None: ...
+
 class ReleaseReservationResponse(_message.Message):
     __slots__ = []
     def __init__(self) -> None: ...
@@ -355,86 +290,11 @@ class Metadata(_message.Message):
     key_map: _containers.ScalarMap[str, str]
     def __init__(self, key_map: _Optional[_Mapping[str, str]] = ...) -> None: ...
 
-<<<<<<< HEAD
 class FilterExpression(_message.Message):
     __slots__ = ["filters"]
     FILTERS_FIELD_NUMBER: _ClassVar[int]
     filters: _containers.RepeatedCompositeFieldContainer[SinglePropertyFilter]
     def __init__(self, filters: _Optional[_Iterable[_Union[SinglePropertyFilter, _Mapping]]] = ...) -> None: ...
-=======
-class PaginationOptions(_message.Message):
-    __slots__ = ["limit", "sortKey", "sortOrder", "token"]
-    class SortKey(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
-        __slots__ = []
-    class SortOrder(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
-        __slots__ = []
-    ASCENDING: PaginationOptions.SortOrder
-    CREATION_TIME: PaginationOptions.SortKey
-    DESCENDING: PaginationOptions.SortOrder
-    LIMIT_FIELD_NUMBER: _ClassVar[int]
-    SORTKEY_FIELD_NUMBER: _ClassVar[int]
-    SORTORDER_FIELD_NUMBER: _ClassVar[int]
-    TOKEN_FIELD_NUMBER: _ClassVar[int]
-    limit: int
-    sortKey: PaginationOptions.SortKey
-    sortOrder: PaginationOptions.SortOrder
-    token: str
-    def __init__(self, limit: _Optional[int] = ..., token: _Optional[str] = ..., sortKey: _Optional[_Union[PaginationOptions.SortKey, str]] = ..., sortOrder: _Optional[_Union[PaginationOptions.SortOrder, str]] = ...) -> None: ...
-
-class Partition(_message.Message):
-    __slots__ = ["key", "value"]
-    KEY_FIELD_NUMBER: _ClassVar[int]
-    VALUE_FIELD_NUMBER: _ClassVar[int]
-    key: str
-    value: str
-    def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
-
-class PartitionPropertyFilter(_message.Message):
-    __slots__ = ["key_val"]
-    KEY_VAL_FIELD_NUMBER: _ClassVar[int]
-    key_val: KeyValuePair
-    def __init__(self, key_val: _Optional[_Union[KeyValuePair, _Mapping]] = ...) -> None: ...
-
-class ReleaseReservationRequest(_message.Message):
-    __slots__ = ["owner_id", "reservation_id"]
-    OWNER_ID_FIELD_NUMBER: _ClassVar[int]
-    RESERVATION_ID_FIELD_NUMBER: _ClassVar[int]
-    owner_id: str
-    reservation_id: ReservationID
-    def __init__(self, reservation_id: _Optional[_Union[ReservationID, _Mapping]] = ..., owner_id: _Optional[str] = ...) -> None: ...
-
-class ReleaseReservationResponse(_message.Message):
-    __slots__ = []
-    def __init__(self) -> None: ...
-
-class ReleaseReservationsRequest(_message.Message):
-    __slots__ = ["reservations"]
-    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
-    reservations: _containers.RepeatedCompositeFieldContainer[ReleaseReservationRequest]
-    def __init__(self, reservations: _Optional[_Iterable[_Union[ReleaseReservationRequest, _Mapping]]] = ...) -> None: ...
-
-class Reservation(_message.Message):
-    __slots__ = ["expires_at", "heartbeat_interval", "metadata", "owner_id", "reservation_id"]
-    EXPIRES_AT_FIELD_NUMBER: _ClassVar[int]
-    HEARTBEAT_INTERVAL_FIELD_NUMBER: _ClassVar[int]
-    METADATA_FIELD_NUMBER: _ClassVar[int]
-    OWNER_ID_FIELD_NUMBER: _ClassVar[int]
-    RESERVATION_ID_FIELD_NUMBER: _ClassVar[int]
-    expires_at: _timestamp_pb2.Timestamp
-    heartbeat_interval: _duration_pb2.Duration
-    metadata: Metadata
-    owner_id: str
-    reservation_id: ReservationID
-    def __init__(self, reservation_id: _Optional[_Union[ReservationID, _Mapping]] = ..., owner_id: _Optional[str] = ..., heartbeat_interval: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., expires_at: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., metadata: _Optional[_Union[Metadata, _Mapping]] = ...) -> None: ...
-
-class ReservationID(_message.Message):
-    __slots__ = ["dataset_id", "tag_name"]
-    DATASET_ID_FIELD_NUMBER: _ClassVar[int]
-    TAG_NAME_FIELD_NUMBER: _ClassVar[int]
-    dataset_id: DatasetID
-    tag_name: str
-    def __init__(self, dataset_id: _Optional[_Union[DatasetID, _Mapping]] = ..., tag_name: _Optional[str] = ...) -> None: ...
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 
 class SinglePropertyFilter(_message.Message):
     __slots__ = ["tag_filter", "partition_filter", "artifact_filter", "dataset_filter", "operator"]
diff --git a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py
index c9a1575a6a..d48148be62 100644
--- a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py
@@ -29,11 +29,7 @@
 from flyteidl.admin import description_entity_pb2 as flyteidl_dot_admin_dot_description__entity__pb2
 
 
-<<<<<<< HEAD
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/admin.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1c\x66lyteidl/admin/project.proto\x1a.flyteidl/admin/project_domain_attributes.proto\x1a\'flyteidl/admin/project_attributes.proto\x1a\x19\x66lyteidl/admin/task.proto\x1a\x1d\x66lyteidl/admin/workflow.proto\x1a(flyteidl/admin/workflow_attributes.proto\x1a flyteidl/admin/launch_plan.proto\x1a\x1a\x66lyteidl/admin/event.proto\x1a\x1e\x66lyteidl/admin/execution.proto\x1a\'flyteidl/admin/matchable_resource.proto\x1a#flyteidl/admin/node_execution.proto\x1a#flyteidl/admin/task_execution.proto\x1a\x1c\x66lyteidl/admin/version.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\'flyteidl/admin/description_entity.proto2\x84N\n\x0c\x41\x64minService\x12m\n\nCreateTask\x12!.flyteidl.admin.TaskCreateRequest\x1a\".flyteidl.admin.TaskCreateResponse\"\x18\x82\xd3\xe4\x93\x02\x12:\x01*\"\r/api/v1/tasks\x12\x88\x01\n\x07GetTask\x12 .flyteidl.admin.ObjectGetRequest\x1a\x14.flyteidl.admin.Task\"E\x82\xd3\xe4\x93\x02?\x12=/api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x97\x01\n\x0bListTaskIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"+\x82\xd3\xe4\x93\x02%\x12#/api/v1/task_ids/{project}/{domain}\x12\xae\x01\n\tListTasks\x12#.flyteidl.admin.ResourceListRequest\x1a\x18.flyteidl.admin.TaskList\"b\x82\xd3\xe4\x93\x02\\Z(\x12&/api/v1/tasks/{id.project}/{id.domain}\x12\x30/api/v1/tasks/{id.project}/{id.domain}/{id.name}\x12}\n\x0e\x43reateWorkflow\x12%.flyteidl.admin.WorkflowCreateRequest\x1a&.flyteidl.admin.WorkflowCreateResponse\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v1/workflows\x12\x94\x01\n\x0bGetWorkflow\x12 .flyteidl.admin.ObjectGetRequest\x1a\x18.flyteidl.admin.Workflow\"I\x82\xd3\xe4\x93\x02\x43\x12\x41/api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x9f\x01\n\x0fListWorkflowIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"/\x82\xd3\xe4\x93\x02)\x12\'/api/v1/workflow_ids/{project}/{domain}\x12\xbe\x01\n\rListWorkflows\x12#.flyteidl.admin.ResourceListRequest\x1a\x1c.flyteidl.admin.WorkflowList\"j\x82\xd3\xe4\x93\x02\x64Z,\x12*/api/v1/workflows/{id.project}/{id.domain}\x12\x34/api/v1/workflows/{id.project}/{id.domain}/{id.name}\x12\x86\x01\n\x10\x43reateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanCreateRequest\x1a(.flyteidl.admin.LaunchPlanCreateResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/launch_plans\x12\x9b\x01\n\rGetLaunchPlan\x12 .flyteidl.admin.ObjectGetRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"L\x82\xd3\xe4\x93\x02\x46\x12\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\xa2\x01\n\x13GetActiveLaunchPlan\x12\'.flyteidl.admin.ActiveLaunchPlanRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"F\x82\xd3\xe4\x93\x02@\x12>/api/v1/active_launch_plans/{id.project}/{id.domain}/{id.name}\x12\x9c\x01\n\x15ListActiveLaunchPlans\x12+.flyteidl.admin.ActiveLaunchPlanListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"6\x82\xd3\xe4\x93\x02\x30\x12./api/v1/active_launch_plans/{project}/{domain}\x12\xa4\x01\n\x11ListLaunchPlanIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"2\x82\xd3\xe4\x93\x02,\x12*/api/v1/launch_plan_ids/{project}/{domain}\x12\xc8\x01\n\x0fListLaunchPlans\x12#.flyteidl.admin.ResourceListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"p\x82\xd3\xe4\x93\x02jZ/\x12-/api/v1/launch_plans/{id.project}/{id.domain}\x12\x37/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}\x12\xb6\x01\n\x10UpdateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanUpdateRequest\x1a(.flyteidl.admin.LaunchPlanUpdateResponse\"O\x82\xd3\xe4\x93\x02I:\x01*\x1a\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x81\x01\n\x0f\x43reateExecution\x12&.flyteidl.admin.ExecutionCreateRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v1/executions\x12\x8e\x01\n\x11RelaunchExecution\x12(.flyteidl.admin.ExecutionRelaunchRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"&\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/api/v1/executions/relaunch\x12\x8b\x01\n\x10RecoverExecution\x12\'.flyteidl.admin.ExecutionRecoverRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\"\x1a/api/v1/executions/recover\x12\x95\x01\n\x0cGetExecution\x12+.flyteidl.admin.WorkflowExecutionGetRequest\x1a\x19.flyteidl.admin.Execution\"=\x82\xd3\xe4\x93\x02\x37\x12\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xa4\x01\n\x0fUpdateExecution\x12&.flyteidl.admin.ExecutionUpdateRequest\x1a\'.flyteidl.admin.ExecutionUpdateResponse\"@\x82\xd3\xe4\x93\x02::\x01*\x1a\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xb9\x01\n\x10GetExecutionData\x12/.flyteidl.admin.WorkflowExecutionGetDataRequest\x1a\x30.flyteidl.admin.WorkflowExecutionGetDataResponse\"B\x82\xd3\xe4\x93\x02<\x12:/api/v1/data/executions/{id.project}/{id.domain}/{id.name}\x12\x89\x01\n\x0eListExecutions\x12#.flyteidl.admin.ResourceListRequest\x1a\x1d.flyteidl.admin.ExecutionList\"3\x82\xd3\xe4\x93\x02-\x12+/api/v1/executions/{id.project}/{id.domain}\x12\xad\x01\n\x12TerminateExecution\x12).flyteidl.admin.ExecutionTerminateRequest\x1a*.flyteidl.admin.ExecutionTerminateResponse\"@\x82\xd3\xe4\x93\x02::\x01**5/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xd2\x01\n\x10GetNodeExecution\x12\'.flyteidl.admin.NodeExecutionGetRequest\x1a\x1d.flyteidl.admin.NodeExecution\"v\x82\xd3\xe4\x93\x02p\x12n/api/v1/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\xde\x01\n\x12ListNodeExecutions\x12(.flyteidl.admin.NodeExecutionListRequest\x1a!.flyteidl.admin.NodeExecutionList\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/node_executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa5\x04\n\x19ListNodeExecutionsForTask\x12/.flyteidl.admin.NodeExecutionForTaskListRequest\x1a!.flyteidl.admin.NodeExecutionList\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03\x12\xa9\x03/api/v1/children/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}\x12\xee\x01\n\x14GetNodeExecutionData\x12+.flyteidl.admin.NodeExecutionGetDataRequest\x1a,.flyteidl.admin.NodeExecutionGetDataResponse\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/data/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\x7f\n\x0fRegisterProject\x12&.flyteidl.admin.ProjectRegisterRequest\x1a\'.flyteidl.admin.ProjectRegisterResponse\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/v1/projects\x12q\n\rUpdateProject\x12\x17.flyteidl.admin.Project\x1a%.flyteidl.admin.ProjectUpdateResponse\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x1a\x15/api/v1/projects/{id}\x12\x66\n\x0cListProjects\x12\".flyteidl.admin.ProjectListRequest\x1a\x18.flyteidl.admin.Projects\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/api/v1/projects\x12\x99\x01\n\x13\x43reateWorkflowEvent\x12-.flyteidl.admin.WorkflowExecutionEventRequest\x1a..flyteidl.admin.WorkflowExecutionEventResponse\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v1/events/workflows\x12\x89\x01\n\x0f\x43reateNodeEvent\x12).flyteidl.admin.NodeExecutionEventRequest\x1a*.flyteidl.admin.NodeExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/nodes\x12\x89\x01\n\x0f\x43reateTaskEvent\x12).flyteidl.admin.TaskExecutionEventRequest\x1a*.flyteidl.admin.TaskExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/tasks\x12\x80\x03\n\x10GetTaskExecution\x12\'.flyteidl.admin.TaskExecutionGetRequest\x1a\x1d.flyteidl.admin.TaskExecution\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x98\x02\n\x12ListTaskExecutions\x12(.flyteidl.admin.TaskExecutionListRequest\x1a!.flyteidl.admin.TaskExecutionList\"\xb4\x01\x82\xd3\xe4\x93\x02\xad\x01\x12\xaa\x01/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}\x12\x9c\x03\n\x14GetTaskExecutionData\x12+.flyteidl.admin.TaskExecutionGetDataRequest\x1a,.flyteidl.admin.TaskExecutionGetDataResponse\"\xa8\x02\x82\xd3\xe4\x93\x02\xa1\x02\x12\x9e\x02/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\xe3\x01\n\x1dUpdateProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesUpdateRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesUpdateResponse\"U\x82\xd3\xe4\x93\x02O:\x01*\x1aJ/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}\x12\xc1\x01\n\x1aGetProjectDomainAttributes\x12\x31.flyteidl.admin.ProjectDomainAttributesGetRequest\x1a\x32.flyteidl.admin.ProjectDomainAttributesGetResponse\"<\x82\xd3\xe4\x93\x02\x36\x12\x34/api/v1/project_domain_attributes/{project}/{domain}\x12\xcd\x01\n\x1d\x44\x65leteProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesDeleteRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesDeleteResponse\"?\x82\xd3\xe4\x93\x02\x39:\x01**4/api/v1/project_domain_attributes/{project}/{domain}\x12\xb6\x01\n\x17UpdateProjectAttributes\x12..flyteidl.admin.ProjectAttributesUpdateRequest\x1a/.flyteidl.admin.ProjectAttributesUpdateResponse\":\x82\xd3\xe4\x93\x02\x34:\x01*\x1a//api/v1/project_attributes/{attributes.project}\x12\x9f\x01\n\x14GetProjectAttributes\x12+.flyteidl.admin.ProjectAttributesGetRequest\x1a,.flyteidl.admin.ProjectAttributesGetResponse\",\x82\xd3\xe4\x93\x02&\x12$/api/v1/project_attributes/{project}\x12\xab\x01\n\x17\x44\x65leteProjectAttributes\x12..flyteidl.admin.ProjectAttributesDeleteRequest\x1a/.flyteidl.admin.ProjectAttributesDeleteResponse\"/\x82\xd3\xe4\x93\x02):\x01**$/api/v1/project_attributes/{project}\x12\xe4\x01\n\x18UpdateWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesUpdateRequest\x1a\x30.flyteidl.admin.WorkflowAttributesUpdateResponse\"e\x82\xd3\xe4\x93\x02_:\x01*\x1aZ/api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow}\x12\xb7\x01\n\x15GetWorkflowAttributes\x12,.flyteidl.admin.WorkflowAttributesGetRequest\x1a-.flyteidl.admin.WorkflowAttributesGetResponse\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xc3\x01\n\x18\x44\x65leteWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesDeleteRequest\x1a\x30.flyteidl.admin.WorkflowAttributesDeleteResponse\"D\x82\xd3\xe4\x93\x02>:\x01**9/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xa0\x01\n\x17ListMatchableAttributes\x12..flyteidl.admin.ListMatchableAttributesRequest\x1a/.flyteidl.admin.ListMatchableAttributesResponse\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/api/v1/matchable_attributes\x12\x9f\x01\n\x11ListNamedEntities\x12&.flyteidl.admin.NamedEntityListRequest\x1a\x1f.flyteidl.admin.NamedEntityList\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/named_entities/{resource_type}/{project}/{domain}\x12\xa7\x01\n\x0eGetNamedEntity\x12%.flyteidl.admin.NamedEntityGetRequest\x1a\x1b.flyteidl.admin.NamedEntity\"Q\x82\xd3\xe4\x93\x02K\x12I/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12\xbe\x01\n\x11UpdateNamedEntity\x12(.flyteidl.admin.NamedEntityUpdateRequest\x1a).flyteidl.admin.NamedEntityUpdateResponse\"T\x82\xd3\xe4\x93\x02N:\x01*\x1aI/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12l\n\nGetVersion\x12!.flyteidl.admin.GetVersionRequest\x1a\".flyteidl.admin.GetVersionResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/v1/version\x12\xc4\x01\n\x14GetDescriptionEntity\x12 .flyteidl.admin.ObjectGetRequest\x1a!.flyteidl.admin.DescriptionEntity\"g\x82\xd3\xe4\x93\x02\x61\x12_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x92\x02\n\x17ListDescriptionEntities\x12,.flyteidl.admin.DescriptionEntityListRequest\x1a%.flyteidl.admin.DescriptionEntityList\"\xa1\x01\x82\xd3\xe4\x93\x02\x9a\x01ZG\x12\x45/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\x12O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12\xc5\x01\n\x13GetExecutionMetrics\x12\x32.flyteidl.admin.WorkflowExecutionGetMetricsRequest\x1a\x33.flyteidl.admin.WorkflowExecutionGetMetricsResponse\"E\x82\xd3\xe4\x93\x02?\x12=/api/v1/metrics/executions/{id.project}/{id.domain}/{id.name}B\xc2\x01\n\x14\x63om.flyteidl.serviceB\nAdminProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3')
-=======
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/admin.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1c\x66lyteidl/admin/project.proto\x1a.flyteidl/admin/project_domain_attributes.proto\x1a\'flyteidl/admin/project_attributes.proto\x1a\x19\x66lyteidl/admin/task.proto\x1a\x1d\x66lyteidl/admin/workflow.proto\x1a(flyteidl/admin/workflow_attributes.proto\x1a flyteidl/admin/launch_plan.proto\x1a\x1a\x66lyteidl/admin/event.proto\x1a\x1e\x66lyteidl/admin/execution.proto\x1a\'flyteidl/admin/matchable_resource.proto\x1a#flyteidl/admin/node_execution.proto\x1a#flyteidl/admin/task_execution.proto\x1a\x1c\x66lyteidl/admin/version.proto\x1a\x1b\x66lyteidl/admin/common.proto\x1a\'flyteidl/admin/description_entity.proto2\xbcL\n\x0c\x41\x64minService\x12m\n\nCreateTask\x12!.flyteidl.admin.TaskCreateRequest\x1a\".flyteidl.admin.TaskCreateResponse\"\x18\x82\xd3\xe4\x93\x02\x12:\x01*\"\r/api/v1/tasks\x12\x88\x01\n\x07GetTask\x12 .flyteidl.admin.ObjectGetRequest\x1a\x14.flyteidl.admin.Task\"E\x82\xd3\xe4\x93\x02?\x12=/api/v1/tasks/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x97\x01\n\x0bListTaskIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"+\x82\xd3\xe4\x93\x02%\x12#/api/v1/task_ids/{project}/{domain}\x12\xae\x01\n\tListTasks\x12#.flyteidl.admin.ResourceListRequest\x1a\x18.flyteidl.admin.TaskList\"b\x82\xd3\xe4\x93\x02\\Z(\x12&/api/v1/tasks/{id.project}/{id.domain}\x12\x30/api/v1/tasks/{id.project}/{id.domain}/{id.name}\x12}\n\x0e\x43reateWorkflow\x12%.flyteidl.admin.WorkflowCreateRequest\x1a&.flyteidl.admin.WorkflowCreateResponse\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v1/workflows\x12\x94\x01\n\x0bGetWorkflow\x12 .flyteidl.admin.ObjectGetRequest\x1a\x18.flyteidl.admin.Workflow\"I\x82\xd3\xe4\x93\x02\x43\x12\x41/api/v1/workflows/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x9f\x01\n\x0fListWorkflowIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"/\x82\xd3\xe4\x93\x02)\x12\'/api/v1/workflow_ids/{project}/{domain}\x12\xbe\x01\n\rListWorkflows\x12#.flyteidl.admin.ResourceListRequest\x1a\x1c.flyteidl.admin.WorkflowList\"j\x82\xd3\xe4\x93\x02\x64Z,\x12*/api/v1/workflows/{id.project}/{id.domain}\x12\x34/api/v1/workflows/{id.project}/{id.domain}/{id.name}\x12\x86\x01\n\x10\x43reateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanCreateRequest\x1a(.flyteidl.admin.LaunchPlanCreateResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/launch_plans\x12\x9b\x01\n\rGetLaunchPlan\x12 .flyteidl.admin.ObjectGetRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"L\x82\xd3\xe4\x93\x02\x46\x12\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\xa2\x01\n\x13GetActiveLaunchPlan\x12\'.flyteidl.admin.ActiveLaunchPlanRequest\x1a\x1a.flyteidl.admin.LaunchPlan\"F\x82\xd3\xe4\x93\x02@\x12>/api/v1/active_launch_plans/{id.project}/{id.domain}/{id.name}\x12\x9c\x01\n\x15ListActiveLaunchPlans\x12+.flyteidl.admin.ActiveLaunchPlanListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"6\x82\xd3\xe4\x93\x02\x30\x12./api/v1/active_launch_plans/{project}/{domain}\x12\xa4\x01\n\x11ListLaunchPlanIds\x12\x30.flyteidl.admin.NamedEntityIdentifierListRequest\x1a).flyteidl.admin.NamedEntityIdentifierList\"2\x82\xd3\xe4\x93\x02,\x12*/api/v1/launch_plan_ids/{project}/{domain}\x12\xc8\x01\n\x0fListLaunchPlans\x12#.flyteidl.admin.ResourceListRequest\x1a\x1e.flyteidl.admin.LaunchPlanList\"p\x82\xd3\xe4\x93\x02jZ/\x12-/api/v1/launch_plans/{id.project}/{id.domain}\x12\x37/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}\x12\xb6\x01\n\x10UpdateLaunchPlan\x12\'.flyteidl.admin.LaunchPlanUpdateRequest\x1a(.flyteidl.admin.LaunchPlanUpdateResponse\"O\x82\xd3\xe4\x93\x02I:\x01*\x1a\x44/api/v1/launch_plans/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x81\x01\n\x0f\x43reateExecution\x12&.flyteidl.admin.ExecutionCreateRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v1/executions\x12\x8e\x01\n\x11RelaunchExecution\x12(.flyteidl.admin.ExecutionRelaunchRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"&\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/api/v1/executions/relaunch\x12\x8b\x01\n\x10RecoverExecution\x12\'.flyteidl.admin.ExecutionRecoverRequest\x1a\'.flyteidl.admin.ExecutionCreateResponse\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\"\x1a/api/v1/executions/recover\x12\x95\x01\n\x0cGetExecution\x12+.flyteidl.admin.WorkflowExecutionGetRequest\x1a\x19.flyteidl.admin.Execution\"=\x82\xd3\xe4\x93\x02\x37\x12\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xa4\x01\n\x0fUpdateExecution\x12&.flyteidl.admin.ExecutionUpdateRequest\x1a\'.flyteidl.admin.ExecutionUpdateResponse\"@\x82\xd3\xe4\x93\x02::\x01*\x1a\x35/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xb9\x01\n\x10GetExecutionData\x12/.flyteidl.admin.WorkflowExecutionGetDataRequest\x1a\x30.flyteidl.admin.WorkflowExecutionGetDataResponse\"B\x82\xd3\xe4\x93\x02<\x12:/api/v1/data/executions/{id.project}/{id.domain}/{id.name}\x12\x89\x01\n\x0eListExecutions\x12#.flyteidl.admin.ResourceListRequest\x1a\x1d.flyteidl.admin.ExecutionList\"3\x82\xd3\xe4\x93\x02-\x12+/api/v1/executions/{id.project}/{id.domain}\x12\xad\x01\n\x12TerminateExecution\x12).flyteidl.admin.ExecutionTerminateRequest\x1a*.flyteidl.admin.ExecutionTerminateResponse\"@\x82\xd3\xe4\x93\x02::\x01**5/api/v1/executions/{id.project}/{id.domain}/{id.name}\x12\xd2\x01\n\x10GetNodeExecution\x12\'.flyteidl.admin.NodeExecutionGetRequest\x1a\x1d.flyteidl.admin.NodeExecution\"v\x82\xd3\xe4\x93\x02p\x12n/api/v1/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\xde\x01\n\x12ListNodeExecutions\x12(.flyteidl.admin.NodeExecutionListRequest\x1a!.flyteidl.admin.NodeExecutionList\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/node_executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa5\x04\n\x19ListNodeExecutionsForTask\x12/.flyteidl.admin.NodeExecutionForTaskListRequest\x1a!.flyteidl.admin.NodeExecutionList\"\xb3\x03\x82\xd3\xe4\x93\x02\xac\x03\x12\xa9\x03/api/v1/children/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}\x12\xee\x01\n\x14GetNodeExecutionData\x12+.flyteidl.admin.NodeExecutionGetDataRequest\x1a,.flyteidl.admin.NodeExecutionGetDataResponse\"{\x82\xd3\xe4\x93\x02u\x12s/api/v1/data/node_executions/{id.execution_id.project}/{id.execution_id.domain}/{id.execution_id.name}/{id.node_id}\x12\x7f\n\x0fRegisterProject\x12&.flyteidl.admin.ProjectRegisterRequest\x1a\'.flyteidl.admin.ProjectRegisterResponse\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/v1/projects\x12q\n\rUpdateProject\x12\x17.flyteidl.admin.Project\x1a%.flyteidl.admin.ProjectUpdateResponse\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x1a\x15/api/v1/projects/{id}\x12\x66\n\x0cListProjects\x12\".flyteidl.admin.ProjectListRequest\x1a\x18.flyteidl.admin.Projects\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/api/v1/projects\x12\x99\x01\n\x13\x43reateWorkflowEvent\x12-.flyteidl.admin.WorkflowExecutionEventRequest\x1a..flyteidl.admin.WorkflowExecutionEventResponse\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v1/events/workflows\x12\x89\x01\n\x0f\x43reateNodeEvent\x12).flyteidl.admin.NodeExecutionEventRequest\x1a*.flyteidl.admin.NodeExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/nodes\x12\x89\x01\n\x0f\x43reateTaskEvent\x12).flyteidl.admin.TaskExecutionEventRequest\x1a*.flyteidl.admin.TaskExecutionEventResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v1/events/tasks\x12\x80\x03\n\x10GetTaskExecution\x12\'.flyteidl.admin.TaskExecutionGetRequest\x1a\x1d.flyteidl.admin.TaskExecution\"\xa3\x02\x82\xd3\xe4\x93\x02\x9c\x02\x12\x99\x02/api/v1/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\x98\x02\n\x12ListTaskExecutions\x12(.flyteidl.admin.TaskExecutionListRequest\x1a!.flyteidl.admin.TaskExecutionList\"\xb4\x01\x82\xd3\xe4\x93\x02\xad\x01\x12\xaa\x01/api/v1/task_executions/{node_execution_id.execution_id.project}/{node_execution_id.execution_id.domain}/{node_execution_id.execution_id.name}/{node_execution_id.node_id}\x12\x9c\x03\n\x14GetTaskExecutionData\x12+.flyteidl.admin.TaskExecutionGetDataRequest\x1a,.flyteidl.admin.TaskExecutionGetDataResponse\"\xa8\x02\x82\xd3\xe4\x93\x02\xa1\x02\x12\x9e\x02/api/v1/data/task_executions/{id.node_execution_id.execution_id.project}/{id.node_execution_id.execution_id.domain}/{id.node_execution_id.execution_id.name}/{id.node_execution_id.node_id}/{id.task_id.project}/{id.task_id.domain}/{id.task_id.name}/{id.task_id.version}/{id.retry_attempt}\x12\xe3\x01\n\x1dUpdateProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesUpdateRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesUpdateResponse\"U\x82\xd3\xe4\x93\x02O:\x01*\x1aJ/api/v1/project_domain_attributes/{attributes.project}/{attributes.domain}\x12\xc1\x01\n\x1aGetProjectDomainAttributes\x12\x31.flyteidl.admin.ProjectDomainAttributesGetRequest\x1a\x32.flyteidl.admin.ProjectDomainAttributesGetResponse\"<\x82\xd3\xe4\x93\x02\x36\x12\x34/api/v1/project_domain_attributes/{project}/{domain}\x12\xcd\x01\n\x1d\x44\x65leteProjectDomainAttributes\x12\x34.flyteidl.admin.ProjectDomainAttributesDeleteRequest\x1a\x35.flyteidl.admin.ProjectDomainAttributesDeleteResponse\"?\x82\xd3\xe4\x93\x02\x39:\x01**4/api/v1/project_domain_attributes/{project}/{domain}\x12\xb6\x01\n\x17UpdateProjectAttributes\x12..flyteidl.admin.ProjectAttributesUpdateRequest\x1a/.flyteidl.admin.ProjectAttributesUpdateResponse\":\x82\xd3\xe4\x93\x02\x34:\x01*\x1a//api/v1/project_attributes/{attributes.project}\x12\x9f\x01\n\x14GetProjectAttributes\x12+.flyteidl.admin.ProjectAttributesGetRequest\x1a,.flyteidl.admin.ProjectAttributesGetResponse\",\x82\xd3\xe4\x93\x02&\x12$/api/v1/project_attributes/{project}\x12\xab\x01\n\x17\x44\x65leteProjectAttributes\x12..flyteidl.admin.ProjectAttributesDeleteRequest\x1a/.flyteidl.admin.ProjectAttributesDeleteResponse\"/\x82\xd3\xe4\x93\x02):\x01**$/api/v1/project_attributes/{project}\x12\xe4\x01\n\x18UpdateWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesUpdateRequest\x1a\x30.flyteidl.admin.WorkflowAttributesUpdateResponse\"e\x82\xd3\xe4\x93\x02_:\x01*\x1aZ/api/v1/workflow_attributes/{attributes.project}/{attributes.domain}/{attributes.workflow}\x12\xb7\x01\n\x15GetWorkflowAttributes\x12,.flyteidl.admin.WorkflowAttributesGetRequest\x1a-.flyteidl.admin.WorkflowAttributesGetResponse\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xc3\x01\n\x18\x44\x65leteWorkflowAttributes\x12/.flyteidl.admin.WorkflowAttributesDeleteRequest\x1a\x30.flyteidl.admin.WorkflowAttributesDeleteResponse\"D\x82\xd3\xe4\x93\x02>:\x01**9/api/v1/workflow_attributes/{project}/{domain}/{workflow}\x12\xa0\x01\n\x17ListMatchableAttributes\x12..flyteidl.admin.ListMatchableAttributesRequest\x1a/.flyteidl.admin.ListMatchableAttributesResponse\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/api/v1/matchable_attributes\x12\x9f\x01\n\x11ListNamedEntities\x12&.flyteidl.admin.NamedEntityListRequest\x1a\x1f.flyteidl.admin.NamedEntityList\"A\x82\xd3\xe4\x93\x02;\x12\x39/api/v1/named_entities/{resource_type}/{project}/{domain}\x12\xa7\x01\n\x0eGetNamedEntity\x12%.flyteidl.admin.NamedEntityGetRequest\x1a\x1b.flyteidl.admin.NamedEntity\"Q\x82\xd3\xe4\x93\x02K\x12I/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12\xbe\x01\n\x11UpdateNamedEntity\x12(.flyteidl.admin.NamedEntityUpdateRequest\x1a).flyteidl.admin.NamedEntityUpdateResponse\"T\x82\xd3\xe4\x93\x02N:\x01*\x1aI/api/v1/named_entities/{resource_type}/{id.project}/{id.domain}/{id.name}\x12l\n\nGetVersion\x12!.flyteidl.admin.GetVersionRequest\x1a\".flyteidl.admin.GetVersionResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/v1/version\x12\xc4\x01\n\x14GetDescriptionEntity\x12 .flyteidl.admin.ObjectGetRequest\x1a!.flyteidl.admin.DescriptionEntity\"g\x82\xd3\xe4\x93\x02\x61\x12_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}\x12\x92\x02\n\x17ListDescriptionEntities\x12,.flyteidl.admin.DescriptionEntityListRequest\x1a%.flyteidl.admin.DescriptionEntityList\"\xa1\x01\x82\xd3\xe4\x93\x02\x9a\x01ZG\x12\x45/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\x12O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nAdminProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3')
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -146,13 +142,8 @@
   _ADMINSERVICE.methods_by_name['GetDescriptionEntity']._serialized_options = b'\202\323\344\223\002a\022_/api/v1/description_entities/{id.resource_type}/{id.project}/{id.domain}/{id.name}/{id.version}'
   _ADMINSERVICE.methods_by_name['ListDescriptionEntities']._options = None
   _ADMINSERVICE.methods_by_name['ListDescriptionEntities']._serialized_options = b'\202\323\344\223\002\232\001ZG\022E/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}\022O/api/v1/description_entities/{resource_type}/{id.project}/{id.domain}/{id.name}'
-<<<<<<< HEAD
   _ADMINSERVICE.methods_by_name['GetExecutionMetrics']._options = None
   _ADMINSERVICE.methods_by_name['GetExecutionMetrics']._serialized_options = b'\202\323\344\223\002?\022=/api/v1/metrics/executions/{id.project}/{id.domain}/{id.name}'
   _globals['_ADMINSERVICE']._serialized_start=609
   _globals['_ADMINSERVICE']._serialized_end=10597
-=======
-  _ADMINSERVICE._serialized_start=609
-  _ADMINSERVICE._serialized_end=10397
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py
index e06d06dca5..0c634af667 100644
--- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py
@@ -16,24 +16,25 @@
 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"|\n\x1a\x45victExecutionCacheRequest\x12^\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x13workflowExecutionId\"t\n\x1e\x45victTaskExecutionCacheRequest\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x9f\x06\n\x0c\x43\x61\x63heService\x12\xe7\x01\n\x13\x45victExecutionCache\x12,.flyteidl.service.EvictExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"|\x82\xd3\xe4\x93\x02v*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa4\x04\n\x17\x45victTaskExecutionCache\x12\x30.flyteidl.service.EvictTaskExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xb0\x03\x82\xd3\xe4\x93\x02\xa9\x03*\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}B\xbc\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"|\n\x1a\x45victExecutionCacheRequest\x12^\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x13workflowExecutionId\"t\n\x1e\x45victTaskExecutionCacheRequest\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x9f\x06\n\x0c\x43\x61\x63heService\x12\xe7\x01\n\x13\x45victExecutionCache\x12,.flyteidl.service.EvictExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"|\x82\xd3\xe4\x93\x02v*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa4\x04\n\x17\x45victTaskExecutionCache\x12\x30.flyteidl.service.EvictTaskExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xb0\x03\x82\xd3\xe4\x93\x02\xa9\x03*\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}B\xc2\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.cache_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyteidl.service.cache_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nCacheProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service'
+  DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nCacheProtoP\001Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service'
   _CACHESERVICE.methods_by_name['EvictExecutionCache']._options = None
   _CACHESERVICE.methods_by_name['EvictExecutionCache']._serialized_options = b'\202\323\344\223\002v*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}'
   _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._options = None
   _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._serialized_options = b'\202\323\344\223\002\251\003*\246\003/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}'
-  _EVICTEXECUTIONCACHEREQUEST._serialized_start=140
-  _EVICTEXECUTIONCACHEREQUEST._serialized_end=264
-  _EVICTTASKEXECUTIONCACHEREQUEST._serialized_start=266
-  _EVICTTASKEXECUTIONCACHEREQUEST._serialized_end=382
-  _EVICTCACHERESPONSE._serialized_start=384
-  _EVICTCACHERESPONSE._serialized_end=467
-  _CACHESERVICE._serialized_start=470
-  _CACHESERVICE._serialized_end=1269
+  _globals['_EVICTEXECUTIONCACHEREQUEST']._serialized_start=140
+  _globals['_EVICTEXECUTIONCACHEREQUEST']._serialized_end=264
+  _globals['_EVICTTASKEXECUTIONCACHEREQUEST']._serialized_start=266
+  _globals['_EVICTTASKEXECUTIONCACHEREQUEST']._serialized_end=382
+  _globals['_EVICTCACHERESPONSE']._serialized_start=384
+  _globals['_EVICTCACHERESPONSE']._serialized_end=467
+  _globals['_CACHESERVICE']._serialized_start=470
+  _globals['_CACHESERVICE']._serialized_end=1269
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi
index 0c4988e056..8a83a33c58 100644
--- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi
@@ -7,12 +7,6 @@ from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Opti
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class EvictCacheResponse(_message.Message):
-    __slots__ = ["errors"]
-    ERRORS_FIELD_NUMBER: _ClassVar[int]
-    errors: _errors_pb2.CacheEvictionErrorList
-    def __init__(self, errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ...
-
 class EvictExecutionCacheRequest(_message.Message):
     __slots__ = ["workflow_execution_id"]
     WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
@@ -24,3 +18,9 @@ class EvictTaskExecutionCacheRequest(_message.Message):
     TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
     task_execution_id: _identifier_pb2.TaskExecutionIdentifier
     def __init__(self, task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ...) -> None: ...
+
+class EvictCacheResponse(_message.Message):
+    __slots__ = ["errors"]
+    ERRORS_FIELD_NUMBER: _ClassVar[int]
+    errors: _errors_pb2.CacheEvictionErrorList
+    def __init__(self, errors: _Optional[_Union[_errors_pb2.CacheEvictionErrorList, _Mapping]] = ...) -> None: ...
diff --git a/flyteidl/gen/pb_rust/datacatalog.rs b/flyteidl/gen/pb_rust/datacatalog.rs
index 8c8a79dcc7..7e8570205c 100644
--- a/flyteidl/gen/pb_rust/datacatalog.rs
+++ b/flyteidl/gen/pb_rust/datacatalog.rs
@@ -179,6 +179,44 @@ pub struct UpdateArtifactResponse {
     pub artifact_id: ::prost::alloc::string::String,
 }
 ///
+/// Request message for deleting an Artifact and its associated ArtifactData.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeleteArtifactRequest {
+    /// ID of dataset the artifact is associated with
+    #[prost(message, optional, tag="1")]
+    pub dataset: ::core::option::Option,
+    /// Either ID of artifact or name of tag of existing artifact
+    #[prost(oneof="delete_artifact_request::QueryHandle", tags="2, 3")]
+    pub query_handle: ::core::option::Option,
+}
+/// Nested message and enum types in `DeleteArtifactRequest`.
+pub mod delete_artifact_request {
+    /// Either ID of artifact or name of tag of existing artifact
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum QueryHandle {
+        #[prost(string, tag="2")]
+        ArtifactId(::prost::alloc::string::String),
+        #[prost(string, tag="3")]
+        TagName(::prost::alloc::string::String),
+    }
+}
+/// Request message for deleting multiple Artifacts and their associated ArtifactData.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeleteArtifactsRequest {
+    /// List of deletion requests for artifacts to remove
+    #[prost(message, repeated, tag="1")]
+    pub artifacts: ::prost::alloc::vec::Vec,
+}
+///
+/// Response message for deleting an Artifact.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeleteArtifactResponse {
+}
+///
 /// ReservationID message that is composed of several string fields.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -204,6 +242,14 @@ pub struct GetOrExtendReservationRequest {
     #[prost(message, optional, tag="3")]
     pub heartbeat_interval: ::core::option::Option<::prost_types::Duration>,
 }
+/// Request message for acquiring or extending reservations for multiple artifacts in a single operation.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetOrExtendReservationsRequest {
+    /// List of reservation requests for artifacts to acquire
+    #[prost(message, repeated, tag="1")]
+    pub reservations: ::prost::alloc::vec::Vec,
+}
 /// A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -232,6 +278,14 @@ pub struct GetOrExtendReservationResponse {
     #[prost(message, optional, tag="1")]
     pub reservation: ::core::option::Option,
 }
+/// List of reservations acquired for multiple artifacts in a single operation.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetOrExtendReservationsResponse {
+    /// List of (newly created or existing) reservations for artifacts requested
+    #[prost(message, repeated, tag="1")]
+    pub reservations: ::prost::alloc::vec::Vec,
+}
 /// Request to release reservation
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -243,6 +297,14 @@ pub struct ReleaseReservationRequest {
     #[prost(string, tag="2")]
     pub owner_id: ::prost::alloc::string::String,
 }
+/// Request message for releasing reservations for multiple artifacts in a single operation.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ReleaseReservationsRequest {
+    /// List of reservation requests for artifacts to release
+    #[prost(message, repeated, tag="1")]
+    pub reservations: ::prost::alloc::vec::Vec,
+}
 /// Response to release reservation
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
diff --git a/flyteidl/gen/pb_rust/flyteidl.core.rs b/flyteidl/gen/pb_rust/flyteidl.core.rs
index 75bb7f2f64..80dab62d03 100644
--- a/flyteidl/gen/pb_rust/flyteidl.core.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.core.rs
@@ -2861,6 +2861,85 @@ pub struct ErrorDocument {
     #[prost(message, optional, tag="1")]
     pub error: ::core::option::Option,
 }
+/// Error returned if eviction of cached output fails and should be re-tried by the user.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct CacheEvictionError {
+    /// Error code to match type of cache eviction error encountered.
+    #[prost(enumeration="cache_eviction_error::Code", tag="1")]
+    pub code: i32,
+    /// More detailed error message explaining the reason for the cache eviction failure.
+    #[prost(string, tag="2")]
+    pub message: ::prost::alloc::string::String,
+    /// ID of the node execution the cache eviction failed for.
+    #[prost(message, optional, tag="3")]
+    pub node_execution_id: ::core::option::Option,
+    /// Source of the node execution.
+    #[prost(oneof="cache_eviction_error::Source", tags="4, 5")]
+    pub source: ::core::option::Option,
+}
+/// Nested message and enum types in `CacheEvictionError`.
+pub mod cache_eviction_error {
+    /// Defines codes for distinguishing between errors encountered during cache eviction.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum Code {
+        /// Indicates a generic internal error occurred.
+        Internal = 0,
+        /// Indicates no reservation could be acquired before deleting an artifact.
+        ReservationNotAcquired = 1,
+        /// Indicates updating the database entry related to the node execution failed.
+        DatabaseUpdateFailed = 2,
+        /// Indicates deleting the artifact from datacatalog failed.
+        ArtifactDeleteFailed = 3,
+        /// Indicates the reservation previously acquired could not be released for an artifact.
+        ReservationNotReleased = 4,
+    }
+    impl Code {
+        /// String value of the enum field names used in the ProtoBuf definition.
+        ///
+        /// The values are not transformed in any way and thus are considered stable
+        /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+        pub fn as_str_name(&self) -> &'static str {
+            match self {
+                Code::Internal => "INTERNAL",
+                Code::ReservationNotAcquired => "RESERVATION_NOT_ACQUIRED",
+                Code::DatabaseUpdateFailed => "DATABASE_UPDATE_FAILED",
+                Code::ArtifactDeleteFailed => "ARTIFACT_DELETE_FAILED",
+                Code::ReservationNotReleased => "RESERVATION_NOT_RELEASED",
+            }
+        }
+        /// Creates an enum from field names used in the ProtoBuf definition.
+        pub fn from_str_name(value: &str) -> ::core::option::Option {
+            match value {
+                "INTERNAL" => Some(Self::Internal),
+                "RESERVATION_NOT_ACQUIRED" => Some(Self::ReservationNotAcquired),
+                "DATABASE_UPDATE_FAILED" => Some(Self::DatabaseUpdateFailed),
+                "ARTIFACT_DELETE_FAILED" => Some(Self::ArtifactDeleteFailed),
+                "RESERVATION_NOT_RELEASED" => Some(Self::ReservationNotReleased),
+                _ => None,
+            }
+        }
+    }
+    /// Source of the node execution.
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Source {
+        /// ID of the task execution the cache eviction failed for (if the node execution was part of a task execution).
+        #[prost(message, tag="4")]
+        TaskExecutionId(super::TaskExecutionIdentifier),
+        /// ID of the workflow execution the cache eviction failed for (if the node execution was part of a workflow execution).
+        #[prost(message, tag="5")]
+        WorkflowExecutionId(super::WorkflowExecutionIdentifier),
+    }
+}
+/// List of :ref:`ref_flyteidl.core.CacheEvictionError` encountered during a cache eviction request.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct CacheEvictionErrorList {
+    #[prost(message, repeated, tag="1")]
+    pub errors: ::prost::alloc::vec::Vec,
+}
 /// Defines an enclosed package of workflow and tasks it references.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
diff --git a/flyteidl/gen/pb_rust/flyteidl.service.rs b/flyteidl/gen/pb_rust/flyteidl.service.rs
index c427170333..c981229bc9 100644
--- a/flyteidl/gen/pb_rust/flyteidl.service.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.service.rs
@@ -75,6 +75,27 @@ pub struct PublicClientAuthConfigResponse {
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EvictExecutionCacheRequest {
+    /// Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
+    #[prost(message, optional, tag="1")]
+    pub workflow_execution_id: ::core::option::Option,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EvictTaskExecutionCacheRequest {
+    /// Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
+    #[prost(message, optional, tag="1")]
+    pub task_execution_id: ::core::option::Option,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EvictCacheResponse {
+    /// List of errors encountered during cache eviction (if any).
+    #[prost(message, optional, tag="1")]
+    pub errors: ::core::option::Option,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CreateUploadLocationResponse {
     /// SignedUrl specifies the url to use to upload content to (e.g. )
     #[prost(string, tag="1")]
diff --git a/flyteidl/go.mod b/flyteidl/go.mod
index d34f71fdf1..f410e79d6b 100644
--- a/flyteidl/go.mod
+++ b/flyteidl/go.mod
@@ -4,22 +4,14 @@ go 1.21
 
 require (
 	github.com/antihax/optional v1.0.0
-<<<<<<< HEAD
 	github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000
 	github.com/go-test/deep v1.0.7
 	github.com/golang/glog v1.1.0
 	github.com/golang/protobuf v1.5.3
-=======
-	github.com/flyteorg/flytestdlib v1.0.12
-	github.com/go-test/deep v1.0.7
-	github.com/golang/glog v1.0.0
-	github.com/golang/protobuf v1.5.2
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/jinzhu/copier v0.3.5
-<<<<<<< HEAD
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/pkg/errors v0.9.1
@@ -139,17 +131,4 @@ replace (
 	k8s.io/apimachinery => k8s.io/apimachinery v0.28.2
 	k8s.io/client-go => k8s.io/client-go v0.28.2
 	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.2
-=======
-	github.com/mitchellh/mapstructure v1.4.3
-	github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4
-	github.com/pkg/errors v0.9.1
-	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.1
-	golang.org/x/net v0.0.0-20220722155237-a158d28d115b
-	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
-	google.golang.org/api v0.76.0
-	google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46
-	google.golang.org/grpc v1.46.0
-	k8s.io/apimachinery v0.20.2
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 )
diff --git a/flyteidl/go.sum b/flyteidl/go.sum
index e564c04d33..3da11782cf 100644
--- a/flyteidl/go.sum
+++ b/flyteidl/go.sum
@@ -1,6 +1,5 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-<<<<<<< HEAD
 cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
 cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
 cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY=
@@ -46,165 +45,10 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc=
 github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-=======
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
-cloud.google.com/go v0.101.0 h1:g+LL+JvpvdyGtcaD2xw2mSByE/6F9s471eJSoaysM84=
-cloud.google.com/go v0.101.0/go.mod h1:hEiddgDb77jDQ+I80tURYNJEnuwPzFU8awCFFRLKjW0=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
-cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
-cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
-cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
-cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc=
-cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
-cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc=
-cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8=
-cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo=
-github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.0/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 h1:3CVsSo4mp8NDWO11tHzN/mdo2zP0CtaSK5IcwBjfqRA=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1/go.mod h1:w5pDIZuawUmY3Bj4tVx3Xb8KS96ToB0j315w9rqpAg0=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0 h1:NVS/4LOQfkBpk+B1VopIzv1ptmYeEskA8w/3K/w7vjo=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.14.0/go.mod h1:RG0cZndeZM17StwohYclmcXSr4oOJ8b1I5hB8llIc6Y=
-github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
-github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 h1:Px2KVERcYEg2Lv25AqC2hVr0xUWaq94wuEObLIkYzmA=
-github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2/go.mod h1:CdSJQNNzZhCkwDaV27XV1w48ZBPtxe7mlrZAsPNxD5g=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 h1:0nJeKDmB7a1a8RDMjTltahlPsaNlWjq/LpkZleSwINk=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0/go.mod h1:mbwxKc/fW+IkF0GG591MuXw0KuEQBDkeRoZ9vmVJPxg=
-github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
-github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
-github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A=
-github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U=
-github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
-github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ=
-github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
-github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
-github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
-github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw=
-github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU=
-github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk=
-github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
-github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg=
-github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
-github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
-github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c=
-github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws/aws-sdk-go v1.44.2 h1:5VBk5r06bgxgRKVaUtm1/4NT/rtrnH2E4cnAYv5zgQc=
-github.com/aws/aws-sdk-go v1.44.2/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1/go.mod h1:jvdWlw8vowVGnZqSDC7yhPd7AifQeQbRDkZcQXV2nRg=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764=
-github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc=
-github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-<<<<<<< HEAD
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
@@ -241,106 +85,18 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
-=======
-github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
-github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4=
-github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/flyteorg/flytestdlib v1.0.12 h1:A+yN5TX/SezjCjzv/JV29SzlBAyKGeLDOfAiYqzrKcw=
-github.com/flyteorg/flytestdlib v1.0.12/go.mod h1:nIBmBHtjTJvhZEn3e/EwVC/iMkR2tUX8hEiXjRBpH/s=
-github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk=
-github.com/flyteorg/stow v0.3.6/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo=
-github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
-github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
-github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
-github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-<<<<<<< HEAD
 github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
-=======
-github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
-github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ=
-github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-<<<<<<< HEAD
-=======
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -351,31 +107,18 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-<<<<<<< HEAD
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
 github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
-=======
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-<<<<<<< HEAD
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -393,63 +136,12 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
-=======
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/readahead v0.0.0-20161222183148-eaceba169032/go.mod h1:qYysrqQXuV4tzsizt4oOQ6mrBZQ0xnQXP3ylXX8Jk5Y=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
-github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
-github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI=
-github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
-github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
-github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA=
-github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg=
 github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-<<<<<<< HEAD
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -457,94 +149,27 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
 github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
-=======
-github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
-github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
-github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
-github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.3/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-<<<<<<< HEAD
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-=======
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-<<<<<<< HEAD
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-=======
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-<<<<<<< HEAD
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -559,40 +184,9 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-=======
-github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-<<<<<<< HEAD
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -624,97 +218,15 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-=======
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
-github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks=
-github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI=
-github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpOAnclKvg+mdA=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-<<<<<<< HEAD
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-=======
-github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
-github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
-github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@@ -723,25 +235,13 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-<<<<<<< HEAD
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-=======
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-<<<<<<< HEAD
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
@@ -768,207 +268,47 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-=======
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
-go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.2/go.mod h1:2D7ZejHVMIfog1221iLSYlQRzrtECw3kz4I4VAQm3qI=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
-golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-<<<<<<< HEAD
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-=======
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-<<<<<<< HEAD
-=======
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-<<<<<<< HEAD
-=======
-golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-<<<<<<< HEAD
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-=======
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-<<<<<<< HEAD
 golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
 golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
-=======
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE=
-golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-<<<<<<< HEAD
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-=======
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-<<<<<<< HEAD
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -980,224 +320,43 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-=======
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-<<<<<<< HEAD
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-=======
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-<<<<<<< HEAD
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
 golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
-=======
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-<<<<<<< HEAD
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
 gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
 google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE=
 google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
-=======
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
-google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
-google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
-google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
-google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
-google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
-google.golang.org/api v0.76.0 h1:UkZl25bR1FHNqtK/EKs3vCdpZtUO6gea3YElTwc8pQg=
-google.golang.org/api v0.76.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-<<<<<<< HEAD
-=======
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-<<<<<<< HEAD
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk=
 google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ=
@@ -1205,98 +364,13 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-=======
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 h1:G1IeWbjrqEq9ChWxEuRPJu6laA67+XgTFHVSAvepr38=
-google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-<<<<<<< HEAD
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
 google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
-=======
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8=
-google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1305,7 +379,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-<<<<<<< HEAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
@@ -1316,44 +389,16 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-=======
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/kothar/go-backblaze.v0 v0.0.0-20210124194846-35409b867216/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-<<<<<<< HEAD
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-=======
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-<<<<<<< HEAD
 k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw=
 k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg=
 k8s.io/apiextensions-apiserver v0.28.0 h1:CszgmBL8CizEnj4sj7/PtLGey6Na3YgWyGCPONv7E9E=
@@ -1378,29 +423,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kF
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
-=======
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20210217171935-8e2decd92398/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78=
-k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8=
-k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY=
-k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg=
-k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
-k8s.io/client-go v0.0.0-20210217172142-7279fc64d847 h1:d+LBRNY3c/KGp7lDblRlUJkayx4Vla7WUTIazoGMdYo=
-k8s.io/client-go v0.0.0-20210217172142-7279fc64d847/go.mod h1:q0EaghmVye2uui19vxSZ2NG6ssgUWgjudO6vrwXneSI=
-k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
-k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=
-k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
-k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
-k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
->>>>>>> blackshark-ai/flyteidl/datacatalog-delete-artifact
diff --git a/flyteidl/protos/flyteidl/service/cache.proto b/flyteidl/protos/flyteidl/service/cache.proto
index f765374727..2e22c4416e 100644
--- a/flyteidl/protos/flyteidl/service/cache.proto
+++ b/flyteidl/protos/flyteidl/service/cache.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package flyteidl.service;
 
-option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service";
+option go_package = "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service";
 
 import "google/api/annotations.proto";
 // import "protoc-gen-swagger/options/annotations.proto";

From 23d2dc1430dd6ded437f1e081781cda1e2fb017d Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 3 Jan 2024 16:32:09 -0800
Subject: [PATCH 26/57] update import paths

Signed-off-by: Paul Dittamo 
---
 .../pkg/manager/impl/validators/reservation_validator.go      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datacatalog/pkg/manager/impl/validators/reservation_validator.go b/datacatalog/pkg/manager/impl/validators/reservation_validator.go
index e12e6f90cd..28c488cb55 100644
--- a/datacatalog/pkg/manager/impl/validators/reservation_validator.go
+++ b/datacatalog/pkg/manager/impl/validators/reservation_validator.go
@@ -3,8 +3,8 @@ package validators
 import (
 	"google.golang.org/grpc/codes"
 
-	"github.com/flyteorg/datacatalog/pkg/errors"
-	"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/datacatalog"
+	"github.com/flyteorg/flyte/datacatalog/pkg/errors"
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog"
 )
 
 func ValidateGetOrExtendReservationRequest(request *datacatalog.GetOrExtendReservationRequest) error {

From cda7c343bb938bdac47aa4d32b518ad3551806b5 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 3 Jan 2024 17:36:35 -0800
Subject: [PATCH 27/57] implement new catalog client methods

Signed-off-by: Paul Dittamo 
---
 .../nodes/catalog/datacatalog/datacatalog.go  | 95 +++++++++++++++++++
 .../controller/nodes/catalog/noop_catalog.go  | 20 ++++
 2 files changed, 115 insertions(+)

diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go
index b3db72d129..de14f5b17e 100644
--- a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go
+++ b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go
@@ -404,6 +404,28 @@ func (m *CatalogClient) GetOrExtendReservation(ctx context.Context, key catalog.
 	return response.Reservation, nil
 }
 
+// GetOrExtendReservationByArtifactTag attempts to get a reservation for the cacheable task identified by the provided
+// dataset ID and artifact tag, reserving it for the given owner ID. If you have previously acquired a reservation it
+// will be extended. If another entity holds the reservation that is returned.
+func (m *CatalogClient) GetOrExtendReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID,
+	artifactTag string, ownerID string, heartbeatInterval time.Duration) (*datacatalog.Reservation, error) {
+	reservationQuery := &datacatalog.GetOrExtendReservationRequest{
+		ReservationId: &datacatalog.ReservationID{
+			DatasetId: datasetID,
+			TagName:   artifactTag,
+		},
+		OwnerId:           ownerID,
+		HeartbeatInterval: ptypes.DurationProto(heartbeatInterval),
+	}
+
+	response, err := m.client.GetOrExtendReservation(ctx, reservationQuery)
+	if err != nil {
+		return nil, err
+	}
+
+	return response.Reservation, nil
+}
+
 // ReleaseReservation attempts to release a reservation for a cacheable task. If the reservation
 // does not exist (e.x. it never existed or has been acquired by another owner) then this call
 // still succeeds.
@@ -443,6 +465,79 @@ func (m *CatalogClient) ReleaseReservation(ctx context.Context, key catalog.Key,
 	return nil
 }
 
+// ReleaseReservationByArtifactTag attempts to release a reservation by the given owner ID for a cacheable task
+// identified by the provided dataset ID and artifact tag. If the reservation does not exist (e.x. it never existed or
+// has been acquired by another owner) then this call still succeeds.
+func (m *CatalogClient) ReleaseReservationByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID,
+	artifactTag string, ownerID string) error {
+	reservationQuery := &datacatalog.ReleaseReservationRequest{
+		ReservationId: &datacatalog.ReservationID{
+			DatasetId: datasetID,
+			TagName:   artifactTag,
+		},
+		OwnerId: ownerID,
+	}
+
+	if _, err := m.client.ReleaseReservation(ctx, reservationQuery); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *CatalogClient) Delete(ctx context.Context, key catalog.Key) error {
+	datasetID, err := GenerateDatasetIDForTask(ctx, key)
+	if err != nil {
+		return err
+	}
+
+	inputs := &core.LiteralMap{}
+	if key.TypedInterface.Inputs != nil {
+		retInputs, err := key.InputReader.Get(ctx)
+		if err != nil {
+			return errors.Wrap(err, "failed to read inputs when trying to query catalog")
+		}
+		inputs = retInputs
+	}
+
+	tag, err := GenerateArtifactTagName(ctx, inputs, key.CacheIgnoreInputVars)
+	if err != nil {
+		return err
+	}
+
+	return m.DeleteByArtifactTag(ctx, datasetID, tag)
+}
+
+func (m *CatalogClient) DeleteByArtifactTag(ctx context.Context, datasetID *datacatalog.DatasetID, artifactTag string) error {
+	deleteQuery := &datacatalog.DeleteArtifactRequest{
+		Dataset: datasetID,
+		QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{
+			TagName: artifactTag,
+		},
+	}
+
+	if _, err := m.client.DeleteArtifact(ctx, deleteQuery); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *CatalogClient) DeleteByArtifactID(ctx context.Context, datasetID *datacatalog.DatasetID, artifactID string) error {
+	deleteQuery := &datacatalog.DeleteArtifactRequest{
+		Dataset: datasetID,
+		QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
+			ArtifactId: artifactID,
+		},
+	}
+
+	if _, err := m.client.DeleteArtifact(ctx, deleteQuery); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // NewDataCatalog creates a new Datacatalog client for task execution caching
 func NewDataCatalog(ctx context.Context, endpoint string, insecureConnection bool, maxCacheAge time.Duration, useAdminAuth bool, defaultServiceConfig string, authOpt ...grpc.DialOption) (*CatalogClient, error) {
 	var opts []grpc.DialOption
diff --git a/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go b/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go
index eb93026242..1af530be6c 100644
--- a/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go
+++ b/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go
@@ -35,6 +35,26 @@ func (n NOOPCatalog) GetOrExtendReservation(_ context.Context, _ catalog.Key, _
 	return nil, nil
 }
 
+func (n NOOPCatalog) GetOrExtendReservationByArtifactTag(_ context.Context, _ *datacatalog.DatasetID, _ string, _ string, _ time.Duration) (*datacatalog.Reservation, error) {
+	return nil, nil
+}
+
 func (n NOOPCatalog) ReleaseReservation(_ context.Context, _ catalog.Key, _ string) error {
 	return nil
 }
+
+func (n NOOPCatalog) ReleaseReservationByArtifactTag(_ context.Context, _ *datacatalog.DatasetID, _ string, _ string) error {
+	return nil
+}
+
+func (n NOOPCatalog) Delete(_ context.Context, _ catalog.Key) error {
+	return nil
+}
+
+func (n NOOPCatalog) DeleteByArtifactTag(_ context.Context, _ *datacatalog.DatasetID, _ string) error {
+	return nil
+}
+
+func (n NOOPCatalog) DeleteByArtifactID(_ context.Context, _ *datacatalog.DatasetID, _ string) error {
+	return nil
+}

From 5695f93dd488675d95107eac0962956af43acc1f Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 3 Jan 2024 20:08:49 -0800
Subject: [PATCH 28/57] move catalog client to stdlib

Signed-off-by: Paul Dittamo 
---
 flytepropeller/pkg/controller/controller.go   |  2 +-
 .../controller/nodes/array/handler_test.go    |  2 +-
 .../pkg/controller/nodes/executor_test.go     |  2 +-
 .../pkg/controller/workflow/executor_test.go  |  2 +-
 flytestdlib/catalog/client.go                 | 25 ++++++++++++++++++
 .../nodes => flytestdlib}/catalog/config.go   | 21 ---------------
 .../catalog/config_flags.go                   |  0
 .../catalog/config_flags_test.go              |  0
 .../catalog/datacatalog/datacatalog.go        |  0
 .../catalog/datacatalog/datacatalog_test.go   |  0
 .../catalog/datacatalog/transformer.go        |  0
 .../catalog/datacatalog/transformer_test.go   |  0
 .../catalog/noop_catalog.go                   |  0
 flytestdlib/go.mod                            | 26 +++++++++++--------
 flytestdlib/go.sum                            | 10 +++++++
 15 files changed, 54 insertions(+), 36 deletions(-)
 create mode 100644 flytestdlib/catalog/client.go
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/config.go (71%)
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/config_flags.go (100%)
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/config_flags_test.go (100%)
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/datacatalog/datacatalog.go (100%)
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/datacatalog/datacatalog_test.go (100%)
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/datacatalog/transformer.go (100%)
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/datacatalog/transformer_test.go (100%)
 rename {flytepropeller/pkg/controller/nodes => flytestdlib}/catalog/noop_catalog.go (100%)

diff --git a/flytepropeller/pkg/controller/controller.go b/flytepropeller/pkg/controller/controller.go
index 6b36dc05db..6fce0cf47c 100644
--- a/flytepropeller/pkg/controller/controller.go
+++ b/flytepropeller/pkg/controller/controller.go
@@ -5,6 +5,7 @@ package controller
 import (
 	"context"
 	"fmt"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"os"
 	"runtime/pprof"
 	"time"
@@ -41,7 +42,6 @@ import (
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/config"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes"
-	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog"
 	errors3 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/errors"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/factory"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery"
diff --git a/flytepropeller/pkg/controller/nodes/array/handler_test.go b/flytepropeller/pkg/controller/nodes/array/handler_test.go
index fbb5ae875c..a11defa83e 100644
--- a/flytepropeller/pkg/controller/nodes/array/handler_test.go
+++ b/flytepropeller/pkg/controller/nodes/array/handler_test.go
@@ -3,6 +3,7 @@ package array
 import (
 	"context"
 	"fmt"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -17,7 +18,6 @@ import (
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/config"
 	execmocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes"
-	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog"
 	gatemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate/mocks"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces"
diff --git a/flytepropeller/pkg/controller/nodes/executor_test.go b/flytepropeller/pkg/controller/nodes/executor_test.go
index 222e0a05d5..9e16e6a7ba 100644
--- a/flytepropeller/pkg/controller/nodes/executor_test.go
+++ b/flytepropeller/pkg/controller/nodes/executor_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"reflect"
 	"testing"
 	"time"
@@ -30,7 +31,6 @@ import (
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/config"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors"
 	mocks4 "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks"
-	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog"
 	gatemocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate/mocks"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces"
diff --git a/flytepropeller/pkg/controller/workflow/executor_test.go b/flytepropeller/pkg/controller/workflow/executor_test.go
index cc9910abc3..461396823b 100644
--- a/flytepropeller/pkg/controller/workflow/executor_test.go
+++ b/flytepropeller/pkg/controller/workflow/executor_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"strconv"
 	"testing"
 	"time"
@@ -33,7 +34,6 @@ import (
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/config"
 	executorMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes"
-	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/factory"
 	gateMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/gate/mocks"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/handler"
diff --git a/flytestdlib/catalog/client.go b/flytestdlib/catalog/client.go
new file mode 100644
index 0000000000..a6eb27a3bb
--- /dev/null
+++ b/flytestdlib/catalog/client.go
@@ -0,0 +1,25 @@
+package catalog
+
+import (
+	"context"
+	"fmt"
+
+	"google.golang.org/grpc"
+
+	pluginCatalog "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog"
+	"github.com/flyteorg/flyte/flytestdlib/catalog/datacatalog"
+)
+
+func NewCatalogClient(ctx context.Context, authOpt ...grpc.DialOption) (pluginCatalog.Client, error) {
+	catalogConfig := GetConfig()
+
+	switch catalogConfig.Type {
+	case DataCatalogType:
+		return datacatalog.NewDataCatalog(ctx, catalogConfig.Endpoint, catalogConfig.Insecure,
+			catalogConfig.MaxCacheAge.Duration, catalogConfig.UseAdminAuth, catalogConfig.DefaultServiceConfig,
+			authOpt...)
+	case NoOpDiscoveryType, "":
+		return NOOPCatalog{}, nil
+	}
+	return nil, fmt.Errorf("no such catalog type available: %s", catalogConfig.Type)
+}
diff --git a/flytepropeller/pkg/controller/nodes/catalog/config.go b/flytestdlib/catalog/config.go
similarity index 71%
rename from flytepropeller/pkg/controller/nodes/catalog/config.go
rename to flytestdlib/catalog/config.go
index 2b0c484fb7..a10ddb6144 100644
--- a/flytepropeller/pkg/controller/nodes/catalog/config.go
+++ b/flytestdlib/catalog/config.go
@@ -1,13 +1,6 @@
 package catalog
 
 import (
-	"context"
-	"fmt"
-
-	"google.golang.org/grpc"
-
-	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog"
-	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/catalog/datacatalog"
 	"github.com/flyteorg/flyte/flytestdlib/config"
 )
 
@@ -48,17 +41,3 @@ type Config struct {
 func GetConfig() *Config {
 	return configSection.GetConfig().(*Config)
 }
-
-func NewCatalogClient(ctx context.Context, authOpt ...grpc.DialOption) (catalog.Client, error) {
-	catalogConfig := GetConfig()
-
-	switch catalogConfig.Type {
-	case DataCatalogType:
-		return datacatalog.NewDataCatalog(ctx, catalogConfig.Endpoint, catalogConfig.Insecure,
-			catalogConfig.MaxCacheAge.Duration, catalogConfig.UseAdminAuth, catalogConfig.DefaultServiceConfig,
-			authOpt...)
-	case NoOpDiscoveryType, "":
-		return NOOPCatalog{}, nil
-	}
-	return nil, fmt.Errorf("no such catalog type available: %s", catalogConfig.Type)
-}
diff --git a/flytepropeller/pkg/controller/nodes/catalog/config_flags.go b/flytestdlib/catalog/config_flags.go
similarity index 100%
rename from flytepropeller/pkg/controller/nodes/catalog/config_flags.go
rename to flytestdlib/catalog/config_flags.go
diff --git a/flytepropeller/pkg/controller/nodes/catalog/config_flags_test.go b/flytestdlib/catalog/config_flags_test.go
similarity index 100%
rename from flytepropeller/pkg/controller/nodes/catalog/config_flags_test.go
rename to flytestdlib/catalog/config_flags_test.go
diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go b/flytestdlib/catalog/datacatalog/datacatalog.go
similarity index 100%
rename from flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go
rename to flytestdlib/catalog/datacatalog/datacatalog.go
diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog_test.go b/flytestdlib/catalog/datacatalog/datacatalog_test.go
similarity index 100%
rename from flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog_test.go
rename to flytestdlib/catalog/datacatalog/datacatalog_test.go
diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go b/flytestdlib/catalog/datacatalog/transformer.go
similarity index 100%
rename from flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go
rename to flytestdlib/catalog/datacatalog/transformer.go
diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go b/flytestdlib/catalog/datacatalog/transformer_test.go
similarity index 100%
rename from flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go
rename to flytestdlib/catalog/datacatalog/transformer_test.go
diff --git a/flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go b/flytestdlib/catalog/noop_catalog.go
similarity index 100%
rename from flytepropeller/pkg/controller/nodes/catalog/noop_catalog.go
rename to flytestdlib/catalog/noop_catalog.go
diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod
index 16d0fe3b06..c2dc96aa3d 100644
--- a/flytestdlib/go.mod
+++ b/flytestdlib/go.mod
@@ -9,6 +9,9 @@ require (
 	github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607
 	github.com/fatih/color v1.13.0
 	github.com/fatih/structtag v1.2.0
+	github.com/flyteorg/flyte/flyteidl v0.0.0-00010101000000-000000000000
+	github.com/flyteorg/flyte/flyteplugins v0.0.0-00010101000000-000000000000
+	github.com/flyteorg/flyte/flytepropeller v0.0.0-00010101000000-000000000000
 	github.com/flyteorg/stow v0.3.8
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/ghodss/yaml v1.0.0
@@ -22,7 +25,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/sirupsen/logrus v1.7.0
+	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.11.0
@@ -33,17 +36,17 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0
 	go.opentelemetry.io/otel/trace v1.19.0
 	golang.org/x/time v0.3.0
-	golang.org/x/tools v0.9.3
+	golang.org/x/tools v0.13.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gorm.io/driver/postgres v1.5.3
 	gorm.io/driver/sqlite v1.5.4
 	gorm.io/gorm v1.25.4
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.1
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
+	sigs.k8s.io/controller-runtime v0.16.3
 )
 
 require (
@@ -51,7 +54,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -61,7 +64,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
@@ -93,7 +96,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -116,8 +119,8 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
+	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -144,6 +147,7 @@ require (
 replace (
 	github.com/flyteorg/flyte/datacatalog => ../datacatalog
 	github.com/flyteorg/flyte/flyteadmin => ../flyteadmin
+	github.com/flyteorg/flyte/flyteidl => ../flyteidl
 	github.com/flyteorg/flyte/flyteplugins => ../flyteplugins
 	github.com/flyteorg/flyte/flytepropeller => ../flytepropeller
 	github.com/flyteorg/flyte/flytestdlib => ../flytestdlib
diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum
index baacaca1e5..f411a5ce5a 100644
--- a/flytestdlib/go.sum
+++ b/flytestdlib/go.sum
@@ -47,6 +47,7 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
 cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -99,6 +100,7 @@ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
 github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -328,6 +330,7 @@ github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -381,6 +384,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -476,6 +481,7 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -502,6 +508,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -610,7 +617,9 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
@@ -691,6 +700,7 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
 golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 590c379a4fc3f260bce247ec1955debd91b787f5 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 3 Jan 2024 20:18:28 -0800
Subject: [PATCH 29/57] tidy

Signed-off-by: Paul Dittamo 
---
 datacatalog/go.mod    | 16 ++++++++--------
 datacatalog/go.sum    | 20 +++++++++++---------
 flytecopilot/go.mod   | 18 +++++++++---------
 flytecopilot/go.sum   | 26 +++++++++++++------------
 flyteidl/go.mod       | 20 ++++++++++----------
 flyteidl/go.sum       | 40 ++++++++++++++++++++++-----------------
 flyteplugins/go.mod   | 18 +++++++++---------
 flyteplugins/go.sum   | 30 +++++++++++++++--------------
 flytepropeller/go.mod |  4 ++--
 flytestdlib/go.mod    |  5 ++++-
 flytestdlib/go.sum    | 44 +++++++++++++++++++++++++------------------
 11 files changed, 132 insertions(+), 109 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index 387fcb0b24..9173304be3 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -28,7 +28,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -78,7 +78,7 @@ require (
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -108,7 +108,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -126,13 +126,13 @@ require (
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.2 // indirect
-	k8s.io/apimachinery v0.28.2 // indirect
-	k8s.io/client-go v0.28.1 // indirect
+	k8s.io/api v0.28.3 // indirect
+	k8s.io/apimachinery v0.28.3 // indirect
+	k8s.io/client-go v0.28.3 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
+	sigs.k8s.io/controller-runtime v0.16.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index 32cd7cf0b1..e964477f61 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -99,8 +99,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -324,8 +324,9 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -474,8 +475,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -608,6 +609,7 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
@@ -686,8 +688,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flytecopilot/go.mod b/flytecopilot/go.mod
index 254e636513..5d1ae87696 100644
--- a/flytecopilot/go.mod
+++ b/flytecopilot/go.mod
@@ -14,9 +14,9 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.1
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
 	k8s.io/klog v1.0.0
 )
 
@@ -25,7 +25,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -36,7 +36,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -64,7 +64,7 @@ require (
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -79,7 +79,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.7.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -93,7 +93,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -115,7 +115,7 @@ require (
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
+	sigs.k8s.io/controller-runtime v0.16.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/flytecopilot/go.sum b/flytecopilot/go.sum
index 076bd774a8..b568d2524a 100644
--- a/flytecopilot/go.sum
+++ b/flytecopilot/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -91,8 +91,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -256,8 +256,9 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
@@ -302,8 +303,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -381,8 +382,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -472,7 +473,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -502,6 +502,8 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -572,8 +574,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flyteidl/go.mod b/flyteidl/go.mod
index f410e79d6b..2e13ce361a 100644
--- a/flyteidl/go.mod
+++ b/flyteidl/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/go-test/deep v1.0.7
 	github.com/golang/glog v1.1.0
 	github.com/golang/protobuf v1.5.3
-	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/jinzhu/copier v0.3.5
@@ -22,7 +22,7 @@ require (
 	google.golang.org/api v0.114.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
 	google.golang.org/grpc v1.56.1
-	k8s.io/apimachinery v0.28.2
+	k8s.io/apimachinery v0.28.3
 )
 
 require (
@@ -30,7 +30,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -42,7 +42,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -68,7 +68,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -79,7 +79,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.7.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
@@ -90,7 +90,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/term v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
@@ -103,12 +103,12 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.2 // indirect
-	k8s.io/client-go v0.28.1 // indirect
+	k8s.io/api v0.28.3 // indirect
+	k8s.io/client-go v0.28.3 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
+	sigs.k8s.io/controller-runtime v0.16.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/flyteidl/go.sum b/flyteidl/go.sum
index 3da11782cf..65a9793b2f 100644
--- a/flyteidl/go.sum
+++ b/flyteidl/go.sum
@@ -10,8 +10,8 @@ cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
 cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
 cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
 cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 h1:LNHhpdK7hzUcx/k1LIcuh5k7k1LGIWLQfCjaneSj7Fc=
@@ -51,8 +51,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -67,6 +67,8 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -81,11 +83,11 @@ github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2Kv
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
@@ -136,8 +138,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
-github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg=
-github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
@@ -157,10 +159,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -178,8 +180,9 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -219,8 +222,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
@@ -235,6 +238,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -269,8 +273,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -305,7 +309,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -315,6 +318,8 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -328,7 +333,6 @@ golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -337,8 +341,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -355,6 +359,7 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
@@ -367,6 +372,7 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
diff --git a/flyteplugins/go.mod b/flyteplugins/go.mod
index 4992ae6072..1ecf6a9208 100644
--- a/flyteplugins/go.mod
+++ b/flyteplugins/go.mod
@@ -25,17 +25,18 @@ require (
 	github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31
 	golang.org/x/net v0.15.0
 	golang.org/x/oauth2 v0.8.0
 	google.golang.org/api v0.114.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.1
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.12.1
+	sigs.k8s.io/controller-runtime v0.16.3
 )
 
 require (
@@ -43,7 +44,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -59,7 +60,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
@@ -89,7 +90,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -102,7 +103,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
@@ -118,7 +119,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/term v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum
index 6cd1d9bf49..5d0a702e3f 100644
--- a/flyteplugins/go.sum
+++ b/flyteplugins/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -116,8 +116,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -290,8 +290,9 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -338,8 +339,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -417,8 +418,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -442,8 +443,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -510,7 +511,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -540,6 +540,8 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -610,8 +612,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flytepropeller/go.mod b/flytepropeller/go.mod
index 83f5c60055..4718522389 100644
--- a/flytepropeller/go.mod
+++ b/flytepropeller/go.mod
@@ -13,8 +13,6 @@ require (
 	github.com/go-redis/redis v6.15.7+incompatible
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.5.3
-	github.com/google/uuid v1.3.1
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/imdario/mergo v0.3.13
 	github.com/magiconair/properties v1.8.6
@@ -85,8 +83,10 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod
index c2dc96aa3d..d1b7058149 100644
--- a/flytestdlib/go.mod
+++ b/flytestdlib/go.mod
@@ -18,6 +18,9 @@ require (
 	github.com/go-gormigrate/gormigrate/v2 v2.1.1
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.5.3
+	github.com/google/uuid v1.3.1
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/jackc/pgconn v1.14.1
 	github.com/jackc/pgx/v5 v5.4.3
@@ -30,6 +33,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.11.0
 	github.com/stretchr/testify v1.8.4
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0
 	go.opentelemetry.io/otel v1.19.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
@@ -78,7 +82,6 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum
index f411a5ce5a..4fa4bc6909 100644
--- a/flytestdlib/go.sum
+++ b/flytestdlib/go.sum
@@ -45,8 +45,7 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
 cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
@@ -85,6 +84,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc=
 github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY=
@@ -98,8 +99,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -107,6 +107,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
+github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607 h1:cTavhURetDkezJCvxFggiyLeP40Mrk/TtVg2+ycw1Es=
 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4=
 github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
@@ -128,6 +130,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gormigrate/gormigrate/v2 v2.1.1 h1:eGS0WTFRV30r103lU8JNXY27KbviRnqqIDobW3EV3iY=
 github.com/go-gormigrate/gormigrate/v2 v2.1.1/go.mod h1:L7nJ620PFDKei9QOhJzqA8kRCk+E3UbV2f5gv+1ndLc=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -230,6 +234,10 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -238,8 +246,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
@@ -303,6 +311,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -328,8 +337,8 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
@@ -350,6 +359,7 @@ github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU
 github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0=
@@ -382,9 +392,7 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -432,6 +440,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
 go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
 go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
 go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=
@@ -479,8 +489,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
 golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -506,8 +515,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -569,8 +577,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -698,8 +706,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -761,6 +768,7 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=

From d48d9e87b27bab395089fa96496fb4ea85ec35fa Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Fri, 5 Jan 2024 16:03:04 -0800
Subject: [PATCH 30/57] lint

Signed-off-by: Paul Dittamo 
---
 .../boilerplate/flyte/golang_test_targets/download_tooling.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flyteadmin/boilerplate/flyte/golang_test_targets/download_tooling.sh b/flyteadmin/boilerplate/flyte/golang_test_targets/download_tooling.sh
index 81b88290b0..9cd49959f4 100755
--- a/flyteadmin/boilerplate/flyte/golang_test_targets/download_tooling.sh
+++ b/flyteadmin/boilerplate/flyte/golang_test_targets/download_tooling.sh
@@ -17,7 +17,7 @@ set -e
 # In the format of ":" or ":" if no cli
 tools=(
   "github.com/EngHabu/mockery/cmd/mockery"
-  "github.com/flyteorg/flyte/flytestdlib/cli/pflags@latest"
+  "github.com/flyteorg/flytestdlib/cli/pflags@latest"
   "github.com/golangci/golangci-lint/cmd/golangci-lint"
   "github.com/daixiang0/gci"
   "github.com/alvaroloes/enumer"

From 751447af163faab6e2f3581ed566c9e9157dfca1 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Sat, 6 Jan 2024 18:26:00 -0800
Subject: [PATCH 31/57] update proto equals check

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/manager/impl/execution_manager_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flyteadmin/pkg/manager/impl/execution_manager_test.go b/flyteadmin/pkg/manager/impl/execution_manager_test.go
index 308aa4fffa..13aff30956 100644
--- a/flyteadmin/pkg/manager/impl/execution_manager_test.go
+++ b/flyteadmin/pkg/manager/impl/execution_manager_test.go
@@ -667,7 +667,7 @@ func TestCreateExecutionPropellerFailure(t *testing.T) {
 	response, err := execManager.CreateExecution(ctx, request, requestedAt)
 
 	assert.NoError(t, err)
-	assert.Equal(t, expectedResponse, response)
+	assert.True(t, proto.Equal(expectedResponse, response))
 }
 
 func TestCreateExecutionDatabaseFailure(t *testing.T) {

From 147765d1e3db5d639af1929ced0fc8df0547ef7f Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Sat, 6 Jan 2024 23:10:20 -0800
Subject: [PATCH 32/57] remove workflow executuion cache eviction endpoint

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/manager/impl/cache_manager.go  |   33 -
 .../pkg/manager/impl/cache_manager_test.go    | 5786 +----------------
 flyteadmin/pkg/manager/interfaces/cache.go    |    1 -
 flyteadmin/pkg/manager/mocks/cache.go         |   13 -
 flyteadmin/pkg/rpc/cacheservice/cache.go      |   19 -
 .../go/admin/mocks/CacheServiceClient.go      |   48 -
 .../go/admin/mocks/CacheServiceServer.go      |   41 -
 .../pb-cpp/flyteidl/service/cache.grpc.pb.cc  |   44 +-
 .../pb-cpp/flyteidl/service/cache.grpc.pb.h   |  190 +-
 .../gen/pb-cpp/flyteidl/service/cache.pb.cc   |  384 +-
 .../gen/pb-cpp/flyteidl/service/cache.pb.h    |  176 +-
 .../gen/pb-go/flyteidl/service/cache.pb.go    |  141 +-
 .../gen/pb-go/flyteidl/service/cache.pb.gw.go |   84 -
 .../pb-go/flyteidl/service/cache.swagger.json |   40 -
 .../gen/pb-java/flyteidl/service/Cache.java   |  730 +--
 flyteidl/gen/pb-js/flyteidl.d.ts              |   73 -
 flyteidl/gen/pb-js/flyteidl.js                |  145 -
 .../pb_python/flyteidl/service/cache_pb2.py   |   18 +-
 .../pb_python/flyteidl/service/cache_pb2.pyi  |    6 -
 .../flyteidl/service/cache_pb2_grpc.py        |   34 -
 flyteidl/gen/pb_rust/flyteidl.service.rs      |    7 -
 flyteidl/protos/flyteidl/service/cache.proto  |   13 -
 22 files changed, 116 insertions(+), 7910 deletions(-)

diff --git a/flyteadmin/pkg/manager/impl/cache_manager.go b/flyteadmin/pkg/manager/impl/cache_manager.go
index 05e045e843..a8334fb389 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager.go
@@ -52,39 +52,6 @@ type CacheManager struct {
 	metrics       cacheMetrics
 }
 
-func (m *CacheManager) EvictExecutionCache(ctx context.Context, req service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) {
-	if err := validation.ValidateWorkflowExecutionIdentifier(req.GetWorkflowExecutionId()); err != nil {
-		logger.Debugf(ctx, "EvictExecutionCache request [%+v] failed validation with err: %v", req, err)
-		return nil, err
-	}
-
-	ctx = getExecutionContext(ctx, req.WorkflowExecutionId)
-
-	executionModel, err := util.GetExecutionModel(ctx, m.db, *req.WorkflowExecutionId)
-	if err != nil {
-		logger.Debugf(ctx, "Failed to get workflow execution model for workflow execution ID %+v: %v", req.WorkflowExecutionId, err)
-		return nil, err
-	}
-
-	logger.Debugf(ctx, "Starting to evict cache for execution %d of workflow %+v", executionModel.ID, req.WorkflowExecutionId)
-
-	nodeExecutions, err := m.listAllNodeExecutionsForWorkflow(ctx, req.WorkflowExecutionId, "")
-	if err != nil {
-		logger.Debugf(ctx, "Failed to list all node executions for execution %d of workflow %+v: %v", executionModel.ID, req.WorkflowExecutionId, err)
-		return nil, err
-	}
-
-	var evictionErrors []*core.CacheEvictionError
-	for _, nodeExecution := range nodeExecutions {
-		evictionErrors = m.evictNodeExecutionCache(ctx, nodeExecution, evictionErrors)
-	}
-
-	logger.Debugf(ctx, "Finished evicting cache for execution %d of workflow %+v", executionModel.ID, req.WorkflowExecutionId)
-	return &service.EvictCacheResponse{
-		Errors: &core.CacheEvictionErrorList{Errors: evictionErrors},
-	}, nil
-}
-
 func (m *CacheManager) EvictTaskExecutionCache(ctx context.Context, req service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) {
 	if err := validation.ValidateTaskExecutionIdentifier(req.GetTaskExecutionId()); err != nil {
 		logger.Debugf(ctx, "EvictTaskExecutionCache request [%+v] failed validation with err: %v", req, err)
diff --git a/flyteadmin/pkg/manager/impl/cache_manager_test.go b/flyteadmin/pkg/manager/impl/cache_manager_test.go
index 31e9f2a17d..f580b43f27 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager_test.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager_test.go
@@ -2,7 +2,6 @@ package impl
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"testing"
 
@@ -181,8 +180,8 @@ func setupCacheEvictionCatalogClient(t *testing.T, catalogClient *mocks.Client,
 	return deletedArtifactIDs
 }
 
-func TestEvictExecutionCache(t *testing.T) {
-	t.Run("single task", func(t *testing.T) {
+func TestEvictTaskExecutionCache(t *testing.T) {
+	t.Run("task", func(t *testing.T) {
 		repository := repositoryMocks.NewMockRepository()
 		catalogClient := &mocks.Client{}
 		mockConfig := getMockExecutionsConfigProvider()
@@ -194,45 +193,11 @@ func TestEvictExecutionCache(t *testing.T) {
 			},
 		}
 
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
 		nodeExecutionModels := []models.NodeExecution{
 			{
 				BaseModel: models.BaseModel{
 					ID: 1,
 				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
 				NodeExecutionKey: models.NodeExecutionKey{
 					ExecutionKey: models.ExecutionKey{
 						Project: executionIdentifier.Project,
@@ -265,25 +230,6 @@ func TestEvictExecutionCache(t *testing.T) {
 					},
 				}),
 			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
 		}
 
 		taskExecutionModels := map[string][]models.TaskExecution{
@@ -319,5728 +265,28 @@ func TestEvictExecutionCache(t *testing.T) {
 			},
 		}
 
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
+		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
 			taskExecutionModels)
 		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactID := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactID.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("multiple tasks", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n1",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n1",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[1],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 4,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n2",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n2",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[2],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 5,
+		request := service.EvictTaskExecutionCacheRequest{
+			TaskExecutionId: &core.TaskExecutionIdentifier{
+				TaskId: &core.Identifier{
+					ResourceType: core.ResourceType_TASK,
+					Project:      executionIdentifier.Project,
+					Domain:       executionIdentifier.Domain,
+					Name:         executionIdentifier.Name,
+					Version:      version,
 				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
+				NodeExecutionId: &core.NodeExecutionIdentifier{
+					ExecutionId: &executionIdentifier,
+					NodeId:      "n0",
 				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
+				RetryAttempt: uint32(0),
 			},
 		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-			"n1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n1-0",
-						},
-					}),
-				},
-			},
-			"n2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n2-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("single subtask", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 4,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[1],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 5,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				},
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 6,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache_single_task",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			if len(taskExecutionModels[nodeID]) > 0 {
-				assert.Contains(t, updatedNodeExecutions, nodeID)
-			} else {
-				assert.NotContains(t, updatedNodeExecutions, nodeID)
-			}
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("multiple subtasks", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO",
-			},
-			{
-				ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYP",
-			},
-			{
-				ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYQ",
-			},
-			{
-				ArtifactId: "55bbd39e-ff7d-42c8-a03b-bcc5f4019a0f",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYR",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 4,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[1],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 5,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				},
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 6,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n1",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    false,
-					SpecNodeId:   "n1",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[2],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 7,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 8,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1-0-n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[3],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 9,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				},
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 10,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n2",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    false,
-					SpecNodeId:   "n2",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[4],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 11,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 12,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2-0-n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[5],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 13,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				},
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 14,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 4,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache_single_task",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 5,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache_single_task",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n1-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 6,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache_single_task",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n2-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n1-0-n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1-0-n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n1-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n2-0-n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2-0-n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n2-0-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			if len(taskExecutionModels[nodeID]) > 0 {
-				assert.Contains(t, updatedNodeExecutions, nodeID)
-			} else {
-				assert.NotContains(t, updatedNodeExecutions, nodeID)
-			}
-		}
-		assert.Len(t, updatedNodeExecutions, 6)
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("single launch plan", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-		}
-
-		childExecutionIdentifier := core.WorkflowExecutionIdentifier{
-			Project: "project",
-			Domain:  "domain",
-			Name:    "childname",
-		}
-
-		executionModels := map[string]models.Execution{
-			executionIdentifier.Name: {
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				ExecutionKey: models.ExecutionKey{
-					Project: executionIdentifier.Project,
-					Domain:  executionIdentifier.Domain,
-					Name:    executionIdentifier.Name,
-				},
-				LaunchPlanID: 6,
-				WorkflowID:   4,
-				TaskID:       0,
-				Phase:        core.NodeExecution_SUCCEEDED.String(),
-			},
-			childExecutionIdentifier.Name: {
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				ExecutionKey: models.ExecutionKey{
-					Project: childExecutionIdentifier.Project,
-					Domain:  childExecutionIdentifier.Domain,
-					Name:    childExecutionIdentifier.Name,
-				},
-				LaunchPlanID: 7,
-				WorkflowID:   5,
-				TaskID:       0,
-				Phase:        core.NodeExecution_SUCCEEDED.String(),
-			},
-		}
-
-		nodeExecutionModels := map[string][]models.NodeExecution{
-			executionIdentifier.Name: {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "start-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "start-node",
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "n0",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: true,
-						IsDynamic:    true,
-						SpecNodeId:   "n0",
-					}),
-					Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-						TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-							TaskNodeMetadata: &admin.TaskNodeMetadata{
-								CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-								CatalogKey: &core.CatalogMetadata{
-									DatasetId: &core.Identifier{
-										ResourceType: core.ResourceType_DATASET,
-										Project:      executionIdentifier.Project,
-										Domain:       executionIdentifier.Domain,
-										Name:         "flyte_task-test.evict.execution_cache_single_task",
-										Version:      "version",
-									},
-									ArtifactTag: artifactTags[0],
-								},
-							},
-						},
-					}),
-					ChildNodeExecutions: []models.NodeExecution{
-						{
-							BaseModel: models.BaseModel{
-								ID: 3,
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0-0-start-node",
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-								IsParentNode: false,
-								IsDynamic:    false,
-								SpecNodeId:   "start-node",
-							}),
-						},
-						{
-							BaseModel: models.BaseModel{
-								ID: 4,
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0-0-dn0",
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-								IsParentNode: false,
-								IsDynamic:    false,
-								SpecNodeId:   "dn0",
-							}),
-							Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-								TargetMetadata: &admin.NodeExecutionClosure_WorkflowNodeMetadata{
-									WorkflowNodeMetadata: &admin.WorkflowNodeMetadata{
-										ExecutionId: &childExecutionIdentifier,
-									},
-								},
-							}),
-						},
-						{
-							BaseModel: models.BaseModel{
-								ID: 5,
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0-0-end-node",
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-								IsParentNode: false,
-								IsDynamic:    false,
-								SpecNodeId:   "end-node",
-							}),
-						},
-					},
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 6,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "end-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "end-node",
-					}),
-				},
-			},
-			childExecutionIdentifier.Name: {
-				{
-					BaseModel: models.BaseModel{
-						ID: 7,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: childExecutionIdentifier.Project,
-							Domain:  childExecutionIdentifier.Domain,
-							Name:    childExecutionIdentifier.Name,
-						},
-						NodeID: "start-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "start-node",
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 8,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: childExecutionIdentifier.Project,
-							Domain:  childExecutionIdentifier.Domain,
-							Name:    childExecutionIdentifier.Name,
-						},
-						NodeID: "n0",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "n0",
-					}),
-					Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-						TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-							TaskNodeMetadata: &admin.TaskNodeMetadata{
-								CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-								CatalogKey: &core.CatalogMetadata{
-									DatasetId: &core.Identifier{
-										ResourceType: core.ResourceType_DATASET,
-										Project:      childExecutionIdentifier.Project,
-										Domain:       childExecutionIdentifier.Domain,
-										Name:         "flyte_task-test.evict.execution_cache_single_task",
-										Version:      "version",
-									},
-									ArtifactTag: artifactTags[1],
-								},
-							},
-						},
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 9,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: childExecutionIdentifier.Project,
-							Domain:  childExecutionIdentifier.Domain,
-							Name:    childExecutionIdentifier.Name,
-						},
-						NodeID: "end-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "end-node",
-					}),
-				},
-			},
-		}
-
-		taskExecutionModels := map[string]map[string][]models.TaskExecution{
-			executionIdentifier.Name: {
-				"n0": {
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						TaskExecutionKey: models.TaskExecutionKey{
-							TaskKey: models.TaskKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    "flyte_task-test.evict.execution_cache",
-								Version: "version",
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0",
-							},
-							RetryAttempt: ptr[uint32](0),
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-							Metadata: &event.TaskExecutionMetadata{
-								GeneratedName: "name-n0-0",
-							},
-						}),
-					},
-				},
-				"n0-0-dn0": {},
-			},
-			childExecutionIdentifier.Name: {
-				"n0": {
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						TaskExecutionKey: models.TaskExecutionKey{
-							TaskKey: models.TaskKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    "flyte_task-test.evict.execution_cache",
-								Version: "version",
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0",
-							},
-							RetryAttempt: ptr[uint32](0),
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-							Metadata: &event.TaskExecutionMetadata{
-								GeneratedName: "childname-n0-0",
-							},
-						}),
-					},
-				},
-			},
-		}
-
-		repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback(
-			func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) {
-				execution, ok := executionModels[input.Name]
-				require.True(t, ok)
-				return execution, nil
-			})
-
-		repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetGetCallback(
-			func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) {
-				nodeExecutions, ok := nodeExecutionModels[input.NodeExecutionIdentifier.ExecutionId.Name]
-				require.True(t, ok)
-				for _, nodeExecution := range nodeExecutions {
-					if nodeExecution.NodeID == input.NodeExecutionIdentifier.NodeId {
-						return nodeExecution, nil
-					}
-				}
-				return models.NodeExecution{}, errors.New("not found")
-			})
-
-		repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetListCallback(
-			func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.NodeExecutionCollectionOutput, error) {
-				var executionName string
-				var parentID uint
-				for _, filter := range input.InlineFilters {
-					if filter.GetField() == "execution_name" {
-						query, err := filter.GetGormJoinTableQueryExpr("")
-						require.NoError(t, err)
-						var ok bool
-						executionName, ok = query.Args.(string)
-						require.True(t, ok)
-					} else if filter.GetField() == "parent_id" {
-						query, err := filter.GetGormJoinTableQueryExpr("")
-						require.NoError(t, err)
-						var ok bool
-						parentID, ok = query.Args.(uint)
-						require.True(t, ok)
-					}
-				}
-
-				nodeExecutions, ok := nodeExecutionModels[executionName]
-				require.True(t, ok)
-
-				if parentID == 0 {
-					return interfaces.NodeExecutionCollectionOutput{NodeExecutions: nodeExecutions}, nil
-				}
-				for _, nodeExecution := range nodeExecutions {
-					if nodeExecution.ID == parentID {
-						return interfaces.NodeExecutionCollectionOutput{NodeExecutions: nodeExecution.ChildNodeExecutions}, nil
-					}
-				}
-				return interfaces.NodeExecutionCollectionOutput{}, errors.New("not found")
-			})
-
-		updatedNodeExecutions := make(map[string]map[string]struct{})
-		repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback(
-			func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
-				assert.Nil(t, nodeExecution.CacheStatus)
-
-				var closure admin.NodeExecutionClosure
-				err := proto.Unmarshal(nodeExecution.Closure, &closure)
-				require.NoError(t, err)
-				md, ok := closure.TargetMetadata.(*admin.NodeExecutionClosure_TaskNodeMetadata)
-				require.True(t, ok)
-				require.NotNil(t, md.TaskNodeMetadata)
-				assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, md.TaskNodeMetadata.CacheStatus)
-				assert.Nil(t, md.TaskNodeMetadata.CatalogKey)
-
-				if _, ok := updatedNodeExecutions[nodeExecution.Name]; !ok {
-					updatedNodeExecutions[nodeExecution.Name] = make(map[string]struct{})
-				}
-				updatedNodeExecutions[nodeExecution.Name][nodeExecution.NodeID] = struct{}{}
-				return nil
-			})
-
-		repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetListCallback(
-			func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.TaskExecutionCollectionOutput, error) {
-				var executionName string
-				var nodeID string
-				for _, filter := range input.InlineFilters {
-					if filter.GetField() == "execution_name" {
-						query, err := filter.GetGormJoinTableQueryExpr("")
-						require.NoError(t, err)
-						var ok bool
-						executionName, ok = query.Args.(string)
-						require.True(t, ok)
-					} else if filter.GetField() == "node_id" {
-						query, err := filter.GetGormJoinTableQueryExpr("")
-						require.NoError(t, err)
-						var ok bool
-						nodeID, ok = query.Args.(string)
-						require.True(t, ok)
-					}
-				}
-				require.NotEmpty(t, nodeID)
-				taskExecutions, ok := taskExecutionModels[executionName]
-				require.True(t, ok)
-				executions, ok := taskExecutions[nodeID]
-				require.True(t, ok)
-				return interfaces.TaskExecutionCollectionOutput{TaskExecutions: executions}, nil
-			})
-
-		repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetGetCallback(
-			func(ctx context.Context, input interfaces.GetTaskExecutionInput) (models.TaskExecution, error) {
-				taskExecutions, ok := taskExecutionModels[input.TaskExecutionID.NodeExecutionId.ExecutionId.Name]
-				require.True(t, ok)
-				executions, ok := taskExecutions[input.TaskExecutionID.NodeExecutionId.NodeId]
-				require.True(t, ok)
-				return executions[0], nil
-			})
-
-		for executionName := range taskExecutionModels {
-			for nodeID := range taskExecutionModels[executionName] {
-				for _, taskExecution := range taskExecutionModels[executionName][nodeID] {
-					require.NotNil(t, taskExecution.RetryAttempt)
-					ownerID := fmt.Sprintf("%s-%s-%d", executionName, nodeID, *taskExecution.RetryAttempt)
-					for _, artifactTag := range artifactTags {
-						catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
-							artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil)
-						catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
-							artifactTag.GetName(), ownerID).Return(nil)
-					}
-				}
-			}
-		}
-
-		deletedArtifactIDs := make(map[string]int)
-		for _, artifactTag := range artifactTags {
-			catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, artifactTag.GetArtifactId()).
-				Run(func(args mock.Arguments) {
-					deletedArtifactIDs[args.Get(2).(string)] = deletedArtifactIDs[args.Get(2).(string)] + 1
-				}).
-				Return(nil)
-		}
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for executionName := range taskExecutionModels {
-			require.Contains(t, updatedNodeExecutions, executionName)
-			for nodeID := range taskExecutionModels[executionName] {
-				if len(taskExecutionModels[executionName][nodeID]) > 0 {
-					assert.Contains(t, updatedNodeExecutions[executionName], nodeID)
-				} else {
-					assert.NotContains(t, updatedNodeExecutions[executionName], nodeID)
-				}
-			}
-			assert.Len(t, updatedNodeExecutions[executionName], 1)
-		}
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("single dynamic task", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO",
-			},
-			{
-				ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYP",
-			},
-			{
-				ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYQ",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    true,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_dynamic",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-						ParentID: ptr[uint](2),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 4,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[1],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 5,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn1",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn1",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[2],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 6,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn2",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn2",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[3],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 7,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn3",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn3",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[4],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 8,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-						ParentID: ptr[uint](2),
-					},
-				},
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 9,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn1-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 4,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn2",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn2-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn3": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 5,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn3",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn3-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("noop catalog", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := catalog.NOOPCatalog{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []string{"flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM"}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: &core.CatalogArtifactTag{
-									ArtifactId: "c7cc868e-767f-4896-a97d-9f4887826cdd",
-									Name:       artifactTags[0],
-								},
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		assert.Empty(t, updatedNodeExecutions)
-	})
-
-	t.Run("unknown execution", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		mockConfig := getMockExecutionsConfigProvider()
-
-		repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback(
-			func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) {
-				return models.Execution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.NotFound, "entry not found")
-			})
-
-		catalogClient := &mocks.Client{}
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		assert.Error(t, err)
-		assert.True(t, pluginCatalog.IsNotFound(err))
-		assert.Nil(t, resp)
-	})
-
-	t.Run("single task without cached results", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_DISABLED,
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		assert.Empty(t, updatedNodeExecutions)
-	})
-
-	t.Run("multiple tasks with partially cached results", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n1",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n1",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_DISABLED,
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 4,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n2",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n2",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[1],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 5,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-			"n1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n1-0",
-						},
-					}),
-				},
-			},
-			"n2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n2-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		assert.Contains(t, updatedNodeExecutions, "n0")
-		assert.Contains(t, updatedNodeExecutions, "n2")
-		assert.Len(t, updatedNodeExecutions, 2)
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("idempotency", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		resp, err = cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		resp, err = cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("reserved artifact", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-
-		catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, mock.Anything,
-			mock.Anything, mock.Anything).Return(&datacatalog.Reservation{OwnerId: "differentOwnerID"}, nil)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-		eErr := resp.GetErrors().GetErrors()[0]
-		assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code)
-		assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-		assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-		require.NotNil(t, eErr.Source)
-		assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
-
-		assert.Empty(t, updatedNodeExecutions)
-	})
-
-	t.Run("unknown artifact", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-
-		for nodeID := range taskExecutionModels {
-			for _, taskExecution := range taskExecutionModels[nodeID] {
-				require.NotNil(t, taskExecution.RetryAttempt)
-				ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt)
-				for _, artifactTag := range artifactTags {
-					catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
-						artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil)
-					catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
-						artifactTag.GetName(), ownerID).Return(nil)
-				}
-			}
-		}
-
-		catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything).
-			Return(status.Error(codes.NotFound, "not found"))
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-	})
-
-	t.Run("datacatalog error", func(t *testing.T) {
-		t.Run("GetOrExtendReservationByArtifactTag", func(t *testing.T) {
-			repository := repositoryMocks.NewMockRepository()
-			catalogClient := &mocks.Client{}
-			mockConfig := getMockExecutionsConfigProvider()
-
-			artifactTags := []*core.CatalogArtifactTag{
-				{
-					ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-					Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-				},
-			}
-
-			executionModel := models.Execution{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				ExecutionKey: models.ExecutionKey{
-					Project: executionIdentifier.Project,
-					Domain:  executionIdentifier.Domain,
-					Name:    executionIdentifier.Name,
-				},
-				LaunchPlanID: 6,
-				WorkflowID:   4,
-				TaskID:       0,
-				Phase:        core.NodeExecution_SUCCEEDED.String(),
-			}
-
-			nodeExecutionModels := []models.NodeExecution{
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "start-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "start-node",
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "n0",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "n0",
-					}),
-					Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-						TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-							TaskNodeMetadata: &admin.TaskNodeMetadata{
-								CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-								CatalogKey: &core.CatalogMetadata{
-									DatasetId: &core.Identifier{
-										ResourceType: core.ResourceType_DATASET,
-										Project:      executionIdentifier.Project,
-										Domain:       executionIdentifier.Domain,
-										Name:         "flyte_task-test.evict.execution_cache_single_task",
-										Version:      "version",
-									},
-									ArtifactTag: artifactTags[0],
-								},
-							},
-						},
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "end-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "end-node",
-					}),
-				},
-			}
-
-			taskExecutionModels := map[string][]models.TaskExecution{
-				"n0": {
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						TaskExecutionKey: models.TaskExecutionKey{
-							TaskKey: models.TaskKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    "flyte_task-test.evict.execution_cache",
-								Version: "version",
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0",
-							},
-							RetryAttempt: ptr[uint32](0),
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-							Metadata: &event.TaskExecutionMetadata{
-								GeneratedName: "name-n0-0",
-							},
-						}),
-					},
-				},
-			}
-
-			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-				taskExecutionModels)
-
-			catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
-				mock.Anything, mock.Anything, mock.Anything).Return(nil, status.Error(codes.Internal, "error"))
-
-			cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-			request := service.EvictExecutionCacheRequest{
-				WorkflowExecutionId: &executionIdentifier,
-			}
-			resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-			require.NoError(t, err)
-			require.NotNil(t, resp)
-			assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-			eErr := resp.GetErrors().GetErrors()[0]
-			assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code)
-			assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-			assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-			require.NotNil(t, eErr.Source)
-			assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
-
-			assert.Empty(t, updatedNodeExecutions)
-		})
-
-		t.Run("DeleteByArtifactID", func(t *testing.T) {
-			repository := repositoryMocks.NewMockRepository()
-			catalogClient := &mocks.Client{}
-			mockConfig := getMockExecutionsConfigProvider()
-
-			artifactTags := []*core.CatalogArtifactTag{
-				{
-					ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-					Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-				},
-			}
-
-			executionModel := models.Execution{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				ExecutionKey: models.ExecutionKey{
-					Project: executionIdentifier.Project,
-					Domain:  executionIdentifier.Domain,
-					Name:    executionIdentifier.Name,
-				},
-				LaunchPlanID: 6,
-				WorkflowID:   4,
-				TaskID:       0,
-				Phase:        core.NodeExecution_SUCCEEDED.String(),
-			}
-
-			nodeExecutionModels := []models.NodeExecution{
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "start-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "start-node",
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "n0",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "n0",
-					}),
-					Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-						TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-							TaskNodeMetadata: &admin.TaskNodeMetadata{
-								CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-								CatalogKey: &core.CatalogMetadata{
-									DatasetId: &core.Identifier{
-										ResourceType: core.ResourceType_DATASET,
-										Project:      executionIdentifier.Project,
-										Domain:       executionIdentifier.Domain,
-										Name:         "flyte_task-test.evict.execution_cache_single_task",
-										Version:      "version",
-									},
-									ArtifactTag: artifactTags[0],
-								},
-							},
-						},
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "end-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "end-node",
-					}),
-				},
-			}
-
-			taskExecutionModels := map[string][]models.TaskExecution{
-				"n0": {
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						TaskExecutionKey: models.TaskExecutionKey{
-							TaskKey: models.TaskKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    "flyte_task-test.evict.execution_cache",
-								Version: "version",
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0",
-							},
-							RetryAttempt: ptr[uint32](0),
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-							Metadata: &event.TaskExecutionMetadata{
-								GeneratedName: "name-n0-0",
-							},
-						}),
-					},
-				},
-			}
-
-			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-				taskExecutionModels)
-
-			for nodeID := range taskExecutionModels {
-				for _, taskExecution := range taskExecutionModels[nodeID] {
-					require.NotNil(t, taskExecution.RetryAttempt)
-					ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt)
-					for _, artifactTag := range artifactTags {
-						catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
-							artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil)
-					}
-				}
-			}
-
-			catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything).
-				Return(status.Error(codes.Internal, "error"))
-
-			cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-			request := service.EvictExecutionCacheRequest{
-				WorkflowExecutionId: &executionIdentifier,
-			}
-			resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-			require.NoError(t, err)
-			require.NotNil(t, resp)
-			assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-			eErr := resp.GetErrors().GetErrors()[0]
-			assert.Equal(t, core.CacheEvictionError_ARTIFACT_DELETE_FAILED, eErr.Code)
-			assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-			assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-			require.NotNil(t, eErr.Source)
-			assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
-
-			for nodeID := range taskExecutionModels {
-				assert.Contains(t, updatedNodeExecutions, nodeID)
-			}
-			assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-		})
-
-		t.Run("ReleaseReservationByArtifactTag", func(t *testing.T) {
-			repository := repositoryMocks.NewMockRepository()
-			catalogClient := &mocks.Client{}
-			mockConfig := getMockExecutionsConfigProvider()
-
-			artifactTags := []*core.CatalogArtifactTag{
-				{
-					ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-					Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-				},
-			}
-
-			executionModel := models.Execution{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				ExecutionKey: models.ExecutionKey{
-					Project: executionIdentifier.Project,
-					Domain:  executionIdentifier.Domain,
-					Name:    executionIdentifier.Name,
-				},
-				LaunchPlanID: 6,
-				WorkflowID:   4,
-				TaskID:       0,
-				Phase:        core.NodeExecution_SUCCEEDED.String(),
-			}
-
-			nodeExecutionModels := []models.NodeExecution{
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "start-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "start-node",
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "n0",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "n0",
-					}),
-					Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-						TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-							TaskNodeMetadata: &admin.TaskNodeMetadata{
-								CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-								CatalogKey: &core.CatalogMetadata{
-									DatasetId: &core.Identifier{
-										ResourceType: core.ResourceType_DATASET,
-										Project:      executionIdentifier.Project,
-										Domain:       executionIdentifier.Domain,
-										Name:         "flyte_task-test.evict.execution_cache_single_task",
-										Version:      "version",
-									},
-									ArtifactTag: artifactTags[0],
-								},
-							},
-						},
-					}),
-				},
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					NodeExecutionKey: models.NodeExecutionKey{
-						ExecutionKey: models.ExecutionKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    executionIdentifier.Name,
-						},
-						NodeID: "end-node",
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-						IsParentNode: false,
-						IsDynamic:    false,
-						SpecNodeId:   "end-node",
-					}),
-				},
-			}
-
-			taskExecutionModels := map[string][]models.TaskExecution{
-				"n0": {
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						TaskExecutionKey: models.TaskExecutionKey{
-							TaskKey: models.TaskKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    "flyte_task-test.evict.execution_cache",
-								Version: "version",
-							},
-							NodeExecutionKey: models.NodeExecutionKey{
-								ExecutionKey: models.ExecutionKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    executionIdentifier.Name,
-								},
-								NodeID: "n0",
-							},
-							RetryAttempt: ptr[uint32](0),
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-							Metadata: &event.TaskExecutionMetadata{
-								GeneratedName: "name-n0-0",
-							},
-						}),
-					},
-				},
-			}
-
-			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-				taskExecutionModels)
-
-			for nodeID := range taskExecutionModels {
-				for _, taskExecution := range taskExecutionModels[nodeID] {
-					require.NotNil(t, taskExecution.RetryAttempt)
-					ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt)
-					for _, artifactTag := range artifactTags {
-						catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
-							artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil)
-					}
-				}
-			}
-
-			deletedArtifactIDs := make(map[string]int)
-			for _, artifactTag := range artifactTags {
-				catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, artifactTag.GetArtifactId()).
-					Run(func(args mock.Arguments) {
-						deletedArtifactIDs[args.Get(2).(string)] = deletedArtifactIDs[args.Get(2).(string)] + 1
-					}).
-					Return(nil)
-			}
-
-			catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
-				mock.Anything, mock.Anything).Return(status.Error(codes.Internal, "error"))
-
-			cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-			request := service.EvictExecutionCacheRequest{
-				WorkflowExecutionId: &executionIdentifier,
-			}
-			resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-			require.NoError(t, err)
-			require.NotNil(t, resp)
-			assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-			eErr := resp.GetErrors().GetErrors()[0]
-			assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_RELEASED, eErr.Code)
-			assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-			assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-			require.NotNil(t, eErr.Source)
-			assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
-
-			for nodeID := range taskExecutionModels {
-				assert.Contains(t, updatedNodeExecutions, nodeID)
-			}
-			assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-		})
-	})
-
-	t.Run("repository error", func(t *testing.T) {
-		t.Run("ExecutionRepo", func(t *testing.T) {
-			t.Run("Get", func(t *testing.T) {
-				repository := repositoryMocks.NewMockRepository()
-				catalogClient := &mocks.Client{}
-				mockConfig := getMockExecutionsConfigProvider()
-
-				artifactTags := []*core.CatalogArtifactTag{
-					{
-						ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-						Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-					},
-				}
-
-				executionModel := models.Execution{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					LaunchPlanID: 6,
-					WorkflowID:   4,
-					TaskID:       0,
-					Phase:        core.NodeExecution_SUCCEEDED.String(),
-				}
-
-				nodeExecutionModels := []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_single_task",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[0],
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				}
-
-				taskExecutionModels := map[string][]models.TaskExecution{
-					"n0": {
-						{
-							BaseModel: models.BaseModel{
-								ID: 1,
-							},
-							TaskExecutionKey: models.TaskExecutionKey{
-								TaskKey: models.TaskKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    "flyte_task-test.evict.execution_cache",
-									Version: "version",
-								},
-								NodeExecutionKey: models.NodeExecutionKey{
-									ExecutionKey: models.ExecutionKey{
-										Project: executionIdentifier.Project,
-										Domain:  executionIdentifier.Domain,
-										Name:    executionIdentifier.Name,
-									},
-									NodeID: "n0",
-								},
-								RetryAttempt: ptr[uint32](0),
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-								Metadata: &event.TaskExecutionMetadata{
-									GeneratedName: "name-n0-0",
-								},
-							}),
-						},
-					},
-				}
-
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-					taskExecutionModels)
-
-				repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback(
-					func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) {
-						return models.Execution{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.Internal, "error")
-					})
-
-				cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-				request := service.EvictExecutionCacheRequest{
-					WorkflowExecutionId: &executionIdentifier,
-				}
-				resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-				require.Error(t, err)
-				s, ok := status.FromError(err)
-				require.True(t, ok)
-				assert.Equal(t, codes.Internal, s.Code())
-				assert.Nil(t, resp)
-
-				assert.Empty(t, updatedNodeExecutions)
-			})
-		})
-
-		t.Run("NodeExecutionRepo", func(t *testing.T) {
-			t.Run("List", func(t *testing.T) {
-				repository := repositoryMocks.NewMockRepository()
-				catalogClient := &mocks.Client{}
-				mockConfig := getMockExecutionsConfigProvider()
-
-				artifactTags := []*core.CatalogArtifactTag{
-					{
-						ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-						Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-					},
-				}
-
-				executionModel := models.Execution{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					LaunchPlanID: 6,
-					WorkflowID:   4,
-					TaskID:       0,
-					Phase:        core.NodeExecution_SUCCEEDED.String(),
-				}
-
-				nodeExecutionModels := []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_single_task",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[0],
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				}
-
-				taskExecutionModels := map[string][]models.TaskExecution{
-					"n0": {
-						{
-							BaseModel: models.BaseModel{
-								ID: 1,
-							},
-							TaskExecutionKey: models.TaskExecutionKey{
-								TaskKey: models.TaskKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    "flyte_task-test.evict.execution_cache",
-									Version: "version",
-								},
-								NodeExecutionKey: models.NodeExecutionKey{
-									ExecutionKey: models.ExecutionKey{
-										Project: executionIdentifier.Project,
-										Domain:  executionIdentifier.Domain,
-										Name:    executionIdentifier.Name,
-									},
-									NodeID: "n0",
-								},
-								RetryAttempt: ptr[uint32](0),
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-								Metadata: &event.TaskExecutionMetadata{
-									GeneratedName: "name-n0-0",
-								},
-							}),
-						},
-					},
-				}
-
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-					taskExecutionModels)
-
-				repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetListCallback(
-					func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.NodeExecutionCollectionOutput, error) {
-						return interfaces.NodeExecutionCollectionOutput{}, flyteAdminErrors.NewFlyteAdminErrorf(codes.Internal, "error")
-					})
-
-				cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-				request := service.EvictExecutionCacheRequest{
-					WorkflowExecutionId: &executionIdentifier,
-				}
-				resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-				require.Error(t, err)
-				s, ok := status.FromError(err)
-				require.True(t, ok)
-				assert.Equal(t, codes.Internal, s.Code())
-				assert.Nil(t, resp)
-
-				assert.Empty(t, updatedNodeExecutions)
-			})
-
-			t.Run("UpdateSelected", func(t *testing.T) {
-				repository := repositoryMocks.NewMockRepository()
-				catalogClient := &mocks.Client{}
-				mockConfig := getMockExecutionsConfigProvider()
-
-				artifactTags := []*core.CatalogArtifactTag{
-					{
-						ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-						Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-					},
-				}
-
-				executionModel := models.Execution{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					LaunchPlanID: 6,
-					WorkflowID:   4,
-					TaskID:       0,
-					Phase:        core.NodeExecution_SUCCEEDED.String(),
-				}
-
-				nodeExecutionModels := []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_single_task",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[0],
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				}
-
-				taskExecutionModels := map[string][]models.TaskExecution{
-					"n0": {
-						{
-							BaseModel: models.BaseModel{
-								ID: 1,
-							},
-							TaskExecutionKey: models.TaskExecutionKey{
-								TaskKey: models.TaskKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    "flyte_task-test.evict.execution_cache",
-									Version: "version",
-								},
-								NodeExecutionKey: models.NodeExecutionKey{
-									ExecutionKey: models.ExecutionKey{
-										Project: executionIdentifier.Project,
-										Domain:  executionIdentifier.Domain,
-										Name:    executionIdentifier.Name,
-									},
-									NodeID: "n0",
-								},
-								RetryAttempt: ptr[uint32](0),
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-								Metadata: &event.TaskExecutionMetadata{
-									GeneratedName: "name-n0-0",
-								},
-							}),
-						},
-					},
-				}
-
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-					taskExecutionModels)
-
-				repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback(
-					func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
-						return flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error")
-					})
-
-				deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-				cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-				request := service.EvictExecutionCacheRequest{
-					WorkflowExecutionId: &executionIdentifier,
-				}
-				resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-				require.NoError(t, err)
-				require.NotNil(t, resp)
-				assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-				eErr := resp.GetErrors().GetErrors()[0]
-				assert.Equal(t, core.CacheEvictionError_DATABASE_UPDATE_FAILED, eErr.Code)
-				assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-				assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-				require.NotNil(t, eErr.Source)
-				assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
-
-				assert.Empty(t, updatedNodeExecutions)
-				assert.Empty(t, deletedArtifactIDs)
-			})
-		})
-
-		t.Run("TaskExecutionRepo", func(t *testing.T) {
-			t.Run("List", func(t *testing.T) {
-				repository := repositoryMocks.NewMockRepository()
-				catalogClient := &mocks.Client{}
-				mockConfig := getMockExecutionsConfigProvider()
-
-				artifactTags := []*core.CatalogArtifactTag{
-					{
-						ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-						Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-					},
-				}
-
-				executionModel := models.Execution{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					LaunchPlanID: 6,
-					WorkflowID:   4,
-					TaskID:       0,
-					Phase:        core.NodeExecution_SUCCEEDED.String(),
-				}
-
-				nodeExecutionModels := []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_single_task",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[0],
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				}
-
-				taskExecutionModels := map[string][]models.TaskExecution{
-					"n0": {
-						{
-							BaseModel: models.BaseModel{
-								ID: 1,
-							},
-							TaskExecutionKey: models.TaskExecutionKey{
-								TaskKey: models.TaskKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    "flyte_task-test.evict.execution_cache",
-									Version: "version",
-								},
-								NodeExecutionKey: models.NodeExecutionKey{
-									ExecutionKey: models.ExecutionKey{
-										Project: executionIdentifier.Project,
-										Domain:  executionIdentifier.Domain,
-										Name:    executionIdentifier.Name,
-									},
-									NodeID: "n0",
-								},
-								RetryAttempt: ptr[uint32](0),
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-								Metadata: &event.TaskExecutionMetadata{
-									GeneratedName: "name-n0-0",
-								},
-							}),
-						},
-					},
-				}
-
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-					taskExecutionModels)
-
-				repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetListCallback(
-					func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.TaskExecutionCollectionOutput, error) {
-						return interfaces.TaskExecutionCollectionOutput{}, flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error")
-					})
-
-				deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-				cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-				request := service.EvictExecutionCacheRequest{
-					WorkflowExecutionId: &executionIdentifier,
-				}
-				resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-				require.NoError(t, err)
-				require.NotNil(t, resp)
-				assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-				eErr := resp.GetErrors().GetErrors()[0]
-				assert.Equal(t, core.CacheEvictionError_INTERNAL, eErr.Code)
-				assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-				assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-				require.NotNil(t, eErr.Source)
-				assert.IsType(t, &core.CacheEvictionError_WorkflowExecutionId{}, eErr.Source)
-
-				assert.Empty(t, updatedNodeExecutions)
-				assert.Empty(t, deletedArtifactIDs)
-			})
-		})
-	})
-
-	t.Run("multiple tasks with identical artifact tags", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-		}
-
-		executionModel := models.Execution{
-			BaseModel: models.BaseModel{
-				ID: 1,
-			},
-			ExecutionKey: models.ExecutionKey{
-				Project: executionIdentifier.Project,
-				Domain:  executionIdentifier.Domain,
-				Name:    executionIdentifier.Name,
-			},
-			LaunchPlanID: 6,
-			WorkflowID:   4,
-			TaskID:       0,
-			Phase:        core.NodeExecution_SUCCEEDED.String(),
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "start-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "start-node",
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 2,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 3,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n1",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n1",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[1],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 4,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n2",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n1",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[2],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 5,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n3",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n3",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[3],
-							},
-						},
-					},
-				}),
-			},
-			{
-				BaseModel: models.BaseModel{
-					ID: 6,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "end-node",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "end-node",
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-			"n1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n1-0",
-						},
-					}),
-				},
-			},
-			"n2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n2",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n2-0",
-						},
-					}),
-				},
-			},
-			"n3": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 4,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n3",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n3-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, &executionModel, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-}
-
-func TestEvictTaskExecutionCache(t *testing.T) {
-	t.Run("task", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictTaskExecutionCacheRequest{
-			TaskExecutionId: &core.TaskExecutionIdentifier{
-				TaskId: &core.Identifier{
-					ResourceType: core.ResourceType_TASK,
-					Project:      executionIdentifier.Project,
-					Domain:       executionIdentifier.Domain,
-					Name:         executionIdentifier.Name,
-					Version:      version,
-				},
-				NodeExecutionId: &core.NodeExecutionIdentifier{
-					ExecutionId: &executionIdentifier,
-					NodeId:      "n0",
-				},
-				RetryAttempt: uint32(0),
-			},
-		}
-		resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("subtask", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[1],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 4,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				},
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache_single_task",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			if len(taskExecutionModels[nodeID]) > 0 {
-				assert.Contains(t, updatedNodeExecutions, nodeID)
-			} else {
-				assert.NotContains(t, updatedNodeExecutions, nodeID)
-			}
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
-
-	t.Run("dynamic task", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO",
-			},
-			{
-				ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYP",
-			},
-			{
-				ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYQ",
-			},
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    true,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_dynamic",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-						ParentID: ptr[uint](2),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[1],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 4,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn1",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn1",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[2],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 5,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn2",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn2",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[3],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 6,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn3",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "dn3",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[4],
-									},
-								},
-							},
-						}),
-						ParentID:    ptr[uint](2),
-						CacheStatus: ptr[string](core.CatalogCacheStatus_CACHE_POPULATED.String()),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 7,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-						ParentID: ptr[uint](2),
-					},
-				},
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn1-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 4,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn2",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn2-0",
-						},
-					}),
-				},
-			},
-			"n0-0-dn3": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 5,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-dn3",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-dn3-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictExecutionCacheRequest{
-			WorkflowExecutionId: &executionIdentifier,
-		}
-		resp, err := cacheManager.EvictExecutionCache(context.Background(), request)
+		resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request)
 		require.NoError(t, err)
 		require.NotNil(t, resp)
 		assert.Empty(t, resp.GetErrors().GetErrors())
diff --git a/flyteadmin/pkg/manager/interfaces/cache.go b/flyteadmin/pkg/manager/interfaces/cache.go
index b3aa056680..f081fd98a3 100644
--- a/flyteadmin/pkg/manager/interfaces/cache.go
+++ b/flyteadmin/pkg/manager/interfaces/cache.go
@@ -7,6 +7,5 @@ import (
 )
 
 type CacheInterface interface {
-	EvictExecutionCache(ctx context.Context, request service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error)
 	EvictTaskExecutionCache(ctx context.Context, request service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error)
 }
diff --git a/flyteadmin/pkg/manager/mocks/cache.go b/flyteadmin/pkg/manager/mocks/cache.go
index 116a88fb74..e6e767a8e8 100644
--- a/flyteadmin/pkg/manager/mocks/cache.go
+++ b/flyteadmin/pkg/manager/mocks/cache.go
@@ -11,25 +11,12 @@ var (
 	_ interfaces.CacheInterface = &MockCacheManager{}
 )
 
-type EvictExecutionCacheFunc func(ctx context.Context, req service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error)
 type EvictTaskExecutionCacheFunc func(ctx context.Context, req service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error)
 
 type MockCacheManager struct {
-	evictExecutionCacheFunc     EvictExecutionCacheFunc
 	evictTaskExecutionCacheFunc EvictTaskExecutionCacheFunc
 }
 
-func (m *MockCacheManager) SetEvictExecutionCacheFunc(evictExecutionCacheFunc EvictExecutionCacheFunc) {
-	m.evictExecutionCacheFunc = evictExecutionCacheFunc
-}
-
-func (m *MockCacheManager) EvictExecutionCache(ctx context.Context, req service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) {
-	if m.evictExecutionCacheFunc != nil {
-		return m.evictExecutionCacheFunc(ctx, req)
-	}
-	return nil, nil
-}
-
 func (m *MockCacheManager) SetEvictTaskExecutionCacheFunc(evictTaskExecutionCacheFunc EvictTaskExecutionCacheFunc) {
 	m.evictTaskExecutionCacheFunc = evictTaskExecutionCacheFunc
 }
diff --git a/flyteadmin/pkg/rpc/cacheservice/cache.go b/flyteadmin/pkg/rpc/cacheservice/cache.go
index d2c5ee561e..bd844d9f67 100644
--- a/flyteadmin/pkg/rpc/cacheservice/cache.go
+++ b/flyteadmin/pkg/rpc/cacheservice/cache.go
@@ -12,25 +12,6 @@ import (
 	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
-func (s *CacheService) EvictExecutionCache(ctx context.Context, req *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) {
-	defer s.interceptPanic(ctx, req)
-	if req == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "Incorrect request, nil requests not allowed")
-	}
-
-	var resp *service.EvictCacheResponse
-	var err error
-	s.Metrics.cacheEndpointMetrics.evictExecution.Time(func() {
-		resp, err = s.CacheManager.EvictExecutionCache(ctx, *req)
-	})
-	if err != nil {
-		return nil, util.TransformAndRecordError(err, &s.Metrics.cacheEndpointMetrics.evictExecution)
-	}
-	s.Metrics.cacheEndpointMetrics.evictExecution.Success()
-
-	return resp, nil
-}
-
 func (s *CacheService) EvictTaskExecutionCache(ctx context.Context, req *service.EvictTaskExecutionCacheRequest) (*service.EvictCacheResponse, error) {
 	defer s.interceptPanic(ctx, req)
 	if req == nil {
diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go
index 469f798e90..d5f140bd1e 100644
--- a/flyteidl/clients/go/admin/mocks/CacheServiceClient.go
+++ b/flyteidl/clients/go/admin/mocks/CacheServiceClient.go
@@ -17,54 +17,6 @@ type CacheServiceClient struct {
 	mock.Mock
 }
 
-type CacheServiceClient_EvictExecutionCache struct {
-	*mock.Call
-}
-
-func (_m CacheServiceClient_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceClient_EvictExecutionCache {
-	return &CacheServiceClient_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *CacheServiceClient) OnEvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) *CacheServiceClient_EvictExecutionCache {
-	c_call := _m.On("EvictExecutionCache", ctx, in, opts)
-	return &CacheServiceClient_EvictExecutionCache{Call: c_call}
-}
-
-func (_m *CacheServiceClient) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceClient_EvictExecutionCache {
-	c_call := _m.On("EvictExecutionCache", matchers...)
-	return &CacheServiceClient_EvictExecutionCache{Call: c_call}
-}
-
-// EvictExecutionCache provides a mock function with given fields: ctx, in, opts
-func (_m *CacheServiceClient) EvictExecutionCache(ctx context.Context, in *service.EvictExecutionCacheRequest, opts ...grpc.CallOption) (*service.EvictCacheResponse, error) {
-	_va := make([]interface{}, len(opts))
-	for _i := range opts {
-		_va[_i] = opts[_i]
-	}
-	var _ca []interface{}
-	_ca = append(_ca, ctx, in)
-	_ca = append(_ca, _va...)
-	ret := _m.Called(_ca...)
-
-	var r0 *service.EvictCacheResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) *service.EvictCacheResponse); ok {
-		r0 = rf(ctx, in, opts...)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*service.EvictCacheResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest, ...grpc.CallOption) error); ok {
-		r1 = rf(ctx, in, opts...)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 type CacheServiceClient_EvictTaskExecutionCache struct {
 	*mock.Call
 }
diff --git a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go
index 532ce32726..175eb1d3a8 100644
--- a/flyteidl/clients/go/admin/mocks/CacheServiceServer.go
+++ b/flyteidl/clients/go/admin/mocks/CacheServiceServer.go
@@ -14,47 +14,6 @@ type CacheServiceServer struct {
 	mock.Mock
 }
 
-type CacheServiceServer_EvictExecutionCache struct {
-	*mock.Call
-}
-
-func (_m CacheServiceServer_EvictExecutionCache) Return(_a0 *service.EvictCacheResponse, _a1 error) *CacheServiceServer_EvictExecutionCache {
-	return &CacheServiceServer_EvictExecutionCache{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *CacheServiceServer) OnEvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) *CacheServiceServer_EvictExecutionCache {
-	c_call := _m.On("EvictExecutionCache", _a0, _a1)
-	return &CacheServiceServer_EvictExecutionCache{Call: c_call}
-}
-
-func (_m *CacheServiceServer) OnEvictExecutionCacheMatch(matchers ...interface{}) *CacheServiceServer_EvictExecutionCache {
-	c_call := _m.On("EvictExecutionCache", matchers...)
-	return &CacheServiceServer_EvictExecutionCache{Call: c_call}
-}
-
-// EvictExecutionCache provides a mock function with given fields: _a0, _a1
-func (_m *CacheServiceServer) EvictExecutionCache(_a0 context.Context, _a1 *service.EvictExecutionCacheRequest) (*service.EvictCacheResponse, error) {
-	ret := _m.Called(_a0, _a1)
-
-	var r0 *service.EvictCacheResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *service.EvictExecutionCacheRequest) *service.EvictCacheResponse); ok {
-		r0 = rf(_a0, _a1)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*service.EvictCacheResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *service.EvictExecutionCacheRequest) error); ok {
-		r1 = rf(_a0, _a1)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 type CacheServiceServer_EvictTaskExecutionCache struct {
 	*mock.Call
 }
diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc
index 90e90e8e59..1b91186e74 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.cc
@@ -20,7 +20,6 @@ namespace flyteidl {
 namespace service {
 
 static const char* CacheService_method_names[] = {
-  "/flyteidl.service.CacheService/EvictExecutionCache",
   "/flyteidl.service.CacheService/EvictTaskExecutionCache",
 };
 
@@ -31,38 +30,9 @@ std::unique_ptr< CacheService::Stub> CacheService::NewStub(const std::shared_ptr
 }
 
 CacheService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel)
-  : channel_(channel), rpcmethod_EvictExecutionCache_(CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_EvictTaskExecutionCache_(CacheService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
+  : channel_(channel), rpcmethod_EvictTaskExecutionCache_(CacheService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
   {}
 
-::grpc::Status CacheService::Stub::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictExecutionCache_, context, request, response);
-}
-
-void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f));
-}
-
-void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, std::move(f));
-}
-
-void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor);
-}
-
-void CacheService::Stub::experimental_async::EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_EvictExecutionCache_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, true);
-}
-
-::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* CacheService::Stub::PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::service::EvictCacheResponse>::Create(channel_.get(), cq, rpcmethod_EvictExecutionCache_, context, request, false);
-}
-
 ::grpc::Status CacheService::Stub::EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) {
   return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_EvictTaskExecutionCache_, context, request, response);
 }
@@ -95,11 +65,6 @@ CacheService::Service::Service() {
   AddMethod(new ::grpc::internal::RpcServiceMethod(
       CacheService_method_names[0],
       ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(
-          std::mem_fn(&CacheService::Service::EvictExecutionCache), this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      CacheService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
       new ::grpc::internal::RpcMethodHandler< CacheService::Service, ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(
           std::mem_fn(&CacheService::Service::EvictTaskExecutionCache), this)));
 }
@@ -107,13 +72,6 @@ CacheService::Service::Service() {
 CacheService::Service::~Service() {
 }
 
-::grpc::Status CacheService::Service::EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
 ::grpc::Status CacheService::Service::EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) {
   (void) context;
   (void) request;
diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h
index 8632f26b5a..92ee48da17 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h
+++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.grpc.pb.h
@@ -49,14 +49,6 @@ class CacheService final {
   class StubInterface {
    public:
     virtual ~StubInterface() {}
-    // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.
-    virtual ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq));
-    }
     // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.
     virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) = 0;
     std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
@@ -68,11 +60,6 @@ class CacheService final {
     class experimental_async_interface {
      public:
       virtual ~experimental_async_interface() {}
-      // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.
-      virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0;
-      virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0;
-      virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
-      virtual void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
       // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.
       virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0;
       virtual void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) = 0;
@@ -81,21 +68,12 @@ class CacheService final {
     };
     virtual class experimental_async_interface* experimental_async() { return nullptr; }
   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) = 0;
   };
   class Stub final : public StubInterface {
    public:
     Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
-    ::grpc::Status EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictExecutionCacheRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> PrepareAsyncEvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(PrepareAsyncEvictExecutionCacheRaw(context, request, cq));
-    }
     ::grpc::Status EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::flyteidl::service::EvictCacheResponse* response) override;
     std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>> AsyncEvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>>(AsyncEvictTaskExecutionCacheRaw(context, request, cq));
@@ -106,10 +84,6 @@ class CacheService final {
     class experimental_async final :
       public StubInterface::experimental_async_interface {
      public:
-      void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override;
-      void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override;
-      void EvictExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
-      void EvictExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
       void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override;
       void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::service::EvictCacheResponse* response, std::function) override;
       void EvictTaskExecutionCache(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
@@ -125,11 +99,8 @@ class CacheService final {
    private:
     std::shared_ptr< ::grpc::ChannelInterface> channel_;
     class experimental_async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* AsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::flyteidl::service::EvictCacheResponse>* PrepareAsyncEvictTaskExecutionCacheRaw(::grpc::ClientContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_EvictExecutionCache_;
     const ::grpc::internal::RpcMethod rpcmethod_EvictTaskExecutionCache_;
   };
   static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
@@ -138,38 +109,16 @@ class CacheService final {
    public:
     Service();
     virtual ~Service();
-    // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.
-    virtual ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response);
     // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.
     virtual ::grpc::Status EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response);
   };
   template 
-  class WithAsyncMethod_EvictExecutionCache : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithAsyncMethod_EvictExecutionCache() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_EvictExecutionCache() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestEvictExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
   class WithAsyncMethod_EvictTaskExecutionCache : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithAsyncMethod_EvictTaskExecutionCache() {
-      ::grpc::Service::MarkMethodAsync(1);
+      ::grpc::Service::MarkMethodAsync(0);
     }
     ~WithAsyncMethod_EvictTaskExecutionCache() override {
       BaseClassMustBeDerivedFromService(this);
@@ -180,48 +129,17 @@ class CacheService final {
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }
     void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::service::EvictCacheResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_EvictExecutionCache > AsyncService;
-  template 
-  class ExperimentalWithCallbackMethod_EvictExecutionCache : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithCallbackMethod_EvictExecutionCache() {
-      ::grpc::Service::experimental().MarkMethodCallback(0,
-        new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(
-          [this](::grpc::ServerContext* context,
-                 const ::flyteidl::service::EvictExecutionCacheRequest* request,
-                 ::flyteidl::service::EvictCacheResponse* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   return this->EvictExecutionCache(context, request, response, controller);
-                 }));
-    }
-    void SetMessageAllocatorFor_EvictExecutionCache(
-        ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) {
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>(
-          ::grpc::Service::experimental().GetHandler(0))
-              ->SetMessageAllocator(allocator);
-    }
-    ~ExperimentalWithCallbackMethod_EvictExecutionCache() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
     }
-    virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
+  typedef WithAsyncMethod_EvictTaskExecutionCache AsyncService;
   template 
   class ExperimentalWithCallbackMethod_EvictTaskExecutionCache : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     ExperimentalWithCallbackMethod_EvictTaskExecutionCache() {
-      ::grpc::Service::experimental().MarkMethodCallback(1,
+      ::grpc::Service::experimental().MarkMethodCallback(0,
         new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(
           [this](::grpc::ServerContext* context,
                  const ::flyteidl::service::EvictTaskExecutionCacheRequest* request,
@@ -233,7 +151,7 @@ class CacheService final {
     void SetMessageAllocatorFor_EvictTaskExecutionCache(
         ::grpc::experimental::MessageAllocator< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>* allocator) {
       static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>*>(
-          ::grpc::Service::experimental().GetHandler(1))
+          ::grpc::Service::experimental().GetHandler(0))
               ->SetMessageAllocator(allocator);
     }
     ~ExperimentalWithCallbackMethod_EvictTaskExecutionCache() override {
@@ -246,31 +164,14 @@ class CacheService final {
     }
     virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictTaskExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
-  typedef ExperimentalWithCallbackMethod_EvictExecutionCache > ExperimentalCallbackService;
-  template 
-  class WithGenericMethod_EvictExecutionCache : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithGenericMethod_EvictExecutionCache() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_EvictExecutionCache() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
+  typedef ExperimentalWithCallbackMethod_EvictTaskExecutionCache ExperimentalCallbackService;
   template 
   class WithGenericMethod_EvictTaskExecutionCache : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithGenericMethod_EvictTaskExecutionCache() {
-      ::grpc::Service::MarkMethodGeneric(1);
+      ::grpc::Service::MarkMethodGeneric(0);
     }
     ~WithGenericMethod_EvictTaskExecutionCache() override {
       BaseClassMustBeDerivedFromService(this);
@@ -282,32 +183,12 @@ class CacheService final {
     }
   };
   template 
-  class WithRawMethod_EvictExecutionCache : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithRawMethod_EvictExecutionCache() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_EvictExecutionCache() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
   class WithRawMethod_EvictTaskExecutionCache : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithRawMethod_EvictTaskExecutionCache() {
-      ::grpc::Service::MarkMethodRaw(1);
+      ::grpc::Service::MarkMethodRaw(0);
     }
     ~WithRawMethod_EvictTaskExecutionCache() override {
       BaseClassMustBeDerivedFromService(this);
@@ -318,33 +199,8 @@ class CacheService final {
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }
     void RequestEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
-  class ExperimentalWithRawCallbackMethod_EvictExecutionCache : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithRawCallbackMethod_EvictExecutionCache() {
-      ::grpc::Service::experimental().MarkMethodRawCallback(0,
-        new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-          [this](::grpc::ServerContext* context,
-                 const ::grpc::ByteBuffer* request,
-                 ::grpc::ByteBuffer* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   this->EvictExecutionCache(context, request, response, controller);
-                 }));
-    }
-    ~ExperimentalWithRawCallbackMethod_EvictExecutionCache() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
     }
-    virtual void EvictExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
   template 
   class ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache : public BaseClass {
@@ -352,7 +208,7 @@ class CacheService final {
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     ExperimentalWithRawCallbackMethod_EvictTaskExecutionCache() {
-      ::grpc::Service::experimental().MarkMethodRawCallback(1,
+      ::grpc::Service::experimental().MarkMethodRawCallback(0,
         new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
           [this](::grpc::ServerContext* context,
                  const ::grpc::ByteBuffer* request,
@@ -372,32 +228,12 @@ class CacheService final {
     virtual void EvictTaskExecutionCache(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
   template 
-  class WithStreamedUnaryMethod_EvictExecutionCache : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithStreamedUnaryMethod_EvictExecutionCache() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictExecutionCache::StreamedEvictExecutionCache, this, std::placeholders::_1, std::placeholders::_2)));
-    }
-    ~WithStreamedUnaryMethod_EvictExecutionCache() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status EvictExecutionCache(::grpc::ServerContext* context, const ::flyteidl::service::EvictExecutionCacheRequest* request, ::flyteidl::service::EvictCacheResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedEvictExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0;
-  };
-  template 
   class WithStreamedUnaryMethod_EvictTaskExecutionCache : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithStreamedUnaryMethod_EvictTaskExecutionCache() {
-      ::grpc::Service::MarkMethodStreamed(1,
+      ::grpc::Service::MarkMethodStreamed(0,
         new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::service::EvictTaskExecutionCacheRequest, ::flyteidl::service::EvictCacheResponse>(std::bind(&WithStreamedUnaryMethod_EvictTaskExecutionCache::StreamedEvictTaskExecutionCache, this, std::placeholders::_1, std::placeholders::_2)));
     }
     ~WithStreamedUnaryMethod_EvictTaskExecutionCache() override {
@@ -411,9 +247,9 @@ class CacheService final {
     // replace default version of method with streamed unary
     virtual ::grpc::Status StreamedEvictTaskExecutionCache(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::service::EvictTaskExecutionCacheRequest,::flyteidl::service::EvictCacheResponse>* server_unary_streamer) = 0;
   };
-  typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedUnaryService;
+  typedef WithStreamedUnaryMethod_EvictTaskExecutionCache StreamedUnaryService;
   typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_EvictExecutionCache > StreamedService;
+  typedef WithStreamedUnaryMethod_EvictTaskExecutionCache StreamedService;
 };
 
 }  // namespace service
diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc
index 3e6db46b63..5c67584f23 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.cc
@@ -17,14 +17,9 @@
 #include 
 
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ferrors_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto;
 namespace flyteidl {
 namespace service {
-class EvictExecutionCacheRequestDefaultTypeInternal {
- public:
-  ::google::protobuf::internal::ExplicitlyConstructed _instance;
-} _EvictExecutionCacheRequest_default_instance_;
 class EvictTaskExecutionCacheRequestDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
@@ -35,21 +30,6 @@ class EvictCacheResponseDefaultTypeInternal {
 } _EvictCacheResponse_default_instance_;
 }  // namespace service
 }  // namespace flyteidl
-static void InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  {
-    void* ptr = &::flyteidl::service::_EvictExecutionCacheRequest_default_instance_;
-    new (ptr) ::flyteidl::service::EvictExecutionCacheRequest();
-    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
-  }
-  ::flyteidl::service::EvictExecutionCacheRequest::InitAsDefaultInstance();
-}
-
-::google::protobuf::internal::SCCInfo<1> scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsEvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto}, {
-      &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base,}};
-
 static void InitDefaultsEvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
@@ -81,22 +61,15 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_EvictCacheResponse_flyteidl_2f
       &scc_info_CacheEvictionErrorList_flyteidl_2fcore_2ferrors_2eproto.base,}};
 
 void InitDefaults_flyteidl_2fservice_2fcache_2eproto() {
-  ::google::protobuf::internal::InitSCC(&scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_EvictTaskExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_EvictCacheResponse_flyteidl_2fservice_2fcache_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata_flyteidl_2fservice_2fcache_2eproto[3];
+::google::protobuf::Metadata file_level_metadata_flyteidl_2fservice_2fcache_2eproto[2];
 constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr;
 constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto = nullptr;
 
 const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictExecutionCacheRequest, workflow_execution_id_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictTaskExecutionCacheRequest, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -111,13 +84,11 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fcache_2eproto:
   PROTOBUF_FIELD_OFFSET(::flyteidl::service::EvictCacheResponse, errors_),
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(::flyteidl::service::EvictExecutionCacheRequest)},
-  { 6, -1, sizeof(::flyteidl::service::EvictTaskExecutionCacheRequest)},
-  { 12, -1, sizeof(::flyteidl::service::EvictCacheResponse)},
+  { 0, -1, sizeof(::flyteidl::service::EvictTaskExecutionCacheRequest)},
+  { 6, -1, sizeof(::flyteidl::service::EvictCacheResponse)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast(&::flyteidl::service::_EvictExecutionCacheRequest_default_instance_),
   reinterpret_cast(&::flyteidl::service::_EvictTaskExecutionCacheRequest_default_instance_),
   reinterpret_cast(&::flyteidl::service::_EvictCacheResponse_default_instance_),
 };
@@ -125,48 +96,39 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
 ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto = {
   {}, AddDescriptors_flyteidl_2fservice_2fcache_2eproto, "flyteidl/service/cache.proto", schemas,
   file_default_instances, TableStruct_flyteidl_2fservice_2fcache_2eproto::offsets,
-  file_level_metadata_flyteidl_2fservice_2fcache_2eproto, 3, file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto, file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto,
+  file_level_metadata_flyteidl_2fservice_2fcache_2eproto, 2, file_level_enum_descriptors_flyteidl_2fservice_2fcache_2eproto, file_level_service_descriptors_flyteidl_2fservice_2fcache_2eproto,
 };
 
 const char descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto[] =
   "\n\034flyteidl/service/cache.proto\022\020flyteidl"
   ".service\032\034google/api/annotations.proto\032\032"
   "flyteidl/core/errors.proto\032\036flyteidl/cor"
-  "e/identifier.proto\"g\n\032EvictExecutionCach"
-  "eRequest\022I\n\025workflow_execution_id\030\001 \001(\0132"
-  "*.flyteidl.core.WorkflowExecutionIdentif"
-  "ier\"c\n\036EvictTaskExecutionCacheRequest\022A\n"
-  "\021task_execution_id\030\001 \001(\0132&.flyteidl.core"
-  ".TaskExecutionIdentifier\"K\n\022EvictCacheRe"
-  "sponse\0225\n\006errors\030\001 \001(\0132%.flyteidl.core.C"
-  "acheEvictionErrorList2\237\006\n\014CacheService\022\347"
-  "\001\n\023EvictExecutionCache\022,.flyteidl.servic"
-  "e.EvictExecutionCacheRequest\032$.flyteidl."
-  "service.EvictCacheResponse\"|\202\323\344\223\002v*t/api"
-  "/v1/cache/executions/{workflow_execution"
-  "_id.project}/{workflow_execution_id.doma"
-  "in}/{workflow_execution_id.name}\022\244\004\n\027Evi"
-  "ctTaskExecutionCache\0220.flyteidl.service."
-  "EvictTaskExecutionCacheRequest\032$.flyteid"
-  "l.service.EvictCacheResponse\"\260\003\202\323\344\223\002\251\003*\246"
-  "\003/api/v1/cache/task_executions/{task_exe"
+  "e/identifier.proto\"c\n\036EvictTaskExecution"
+  "CacheRequest\022A\n\021task_execution_id\030\001 \001(\0132"
+  "&.flyteidl.core.TaskExecutionIdentifier\""
+  "K\n\022EvictCacheResponse\0225\n\006errors\030\001 \001(\0132%."
+  "flyteidl.core.CacheEvictionErrorList2\265\004\n"
+  "\014CacheService\022\244\004\n\027EvictTaskExecutionCach"
+  "e\0220.flyteidl.service.EvictTaskExecutionC"
+  "acheRequest\032$.flyteidl.service.EvictCach"
+  "eResponse\"\260\003\202\323\344\223\002\251\003*\246\003/api/v1/cache/task"
+  "_executions/{task_execution_id.node_exec"
+  "ution_id.execution_id.project}/{task_exe"
   "cution_id.node_execution_id.execution_id"
-  ".project}/{task_execution_id.node_execut"
-  "ion_id.execution_id.domain}/{task_execut"
-  "ion_id.node_execution_id.execution_id.na"
-  "me}/{task_execution_id.node_execution_id"
-  ".node_id}/{task_execution_id.task_id.pro"
-  "ject}/{task_execution_id.task_id.domain}"
-  "/{task_execution_id.task_id.name}/{task_"
-  "execution_id.task_id.version}/{task_exec"
-  "ution_id.retry_attempt}B\?Z=github.com/fl"
-  "yteorg/flyte/flyteidl/gen/pb-go/flyteidl"
-  "/serviceb\006proto3"
+  ".domain}/{task_execution_id.node_executi"
+  "on_id.execution_id.name}/{task_execution"
+  "_id.node_execution_id.node_id}/{task_exe"
+  "cution_id.task_id.project}/{task_executi"
+  "on_id.task_id.domain}/{task_execution_id"
+  ".task_id.name}/{task_execution_id.task_i"
+  "d.version}/{task_execution_id.retry_atte"
+  "mpt}B\?Z=github.com/flyteorg/flyte/flytei"
+  "dl/gen/pb-go/flyteidl/serviceb\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fcache_2eproto = {
   false, InitDefaults_flyteidl_2fservice_2fcache_2eproto, 
   descriptor_table_protodef_flyteidl_2fservice_2fcache_2eproto,
-  "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 1296,
+  "flyteidl/service/cache.proto", &assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto, 957,
 };
 
 void AddDescriptors_flyteidl_2fservice_2fcache_2eproto() {
@@ -184,299 +146,6 @@ static bool dynamic_init_dummy_flyteidl_2fservice_2fcache_2eproto = []() { AddDe
 namespace flyteidl {
 namespace service {
 
-// ===================================================================
-
-void EvictExecutionCacheRequest::InitAsDefaultInstance() {
-  ::flyteidl::service::_EvictExecutionCacheRequest_default_instance_._instance.get_mutable()->workflow_execution_id_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>(
-      ::flyteidl::core::WorkflowExecutionIdentifier::internal_default_instance());
-}
-class EvictExecutionCacheRequest::HasBitSetters {
- public:
-  static const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id(const EvictExecutionCacheRequest* msg);
-};
-
-const ::flyteidl::core::WorkflowExecutionIdentifier&
-EvictExecutionCacheRequest::HasBitSetters::workflow_execution_id(const EvictExecutionCacheRequest* msg) {
-  return *msg->workflow_execution_id_;
-}
-void EvictExecutionCacheRequest::clear_workflow_execution_id() {
-  if (GetArenaNoVirtual() == nullptr && workflow_execution_id_ != nullptr) {
-    delete workflow_execution_id_;
-  }
-  workflow_execution_id_ = nullptr;
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int EvictExecutionCacheRequest::kWorkflowExecutionIdFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-EvictExecutionCacheRequest::EvictExecutionCacheRequest()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:flyteidl.service.EvictExecutionCacheRequest)
-}
-EvictExecutionCacheRequest::EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_workflow_execution_id()) {
-    workflow_execution_id_ = new ::flyteidl::core::WorkflowExecutionIdentifier(*from.workflow_execution_id_);
-  } else {
-    workflow_execution_id_ = nullptr;
-  }
-  // @@protoc_insertion_point(copy_constructor:flyteidl.service.EvictExecutionCacheRequest)
-}
-
-void EvictExecutionCacheRequest::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base);
-  workflow_execution_id_ = nullptr;
-}
-
-EvictExecutionCacheRequest::~EvictExecutionCacheRequest() {
-  // @@protoc_insertion_point(destructor:flyteidl.service.EvictExecutionCacheRequest)
-  SharedDtor();
-}
-
-void EvictExecutionCacheRequest::SharedDtor() {
-  if (this != internal_default_instance()) delete workflow_execution_id_;
-}
-
-void EvictExecutionCacheRequest::SetCachedSize(int size) const {
-  _cached_size_.Set(size);
-}
-const EvictExecutionCacheRequest& EvictExecutionCacheRequest::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_EvictExecutionCacheRequest_flyteidl_2fservice_2fcache_2eproto.base);
-  return *internal_default_instance();
-}
-
-
-void EvictExecutionCacheRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:flyteidl.service.EvictExecutionCacheRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  if (GetArenaNoVirtual() == nullptr && workflow_execution_id_ != nullptr) {
-    delete workflow_execution_id_;
-  }
-  workflow_execution_id_ = nullptr;
-  _internal_metadata_.Clear();
-}
-
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* EvictExecutionCacheRequest::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        parser_till_end = ::flyteidl::core::WorkflowExecutionIdentifier::_InternalParse;
-        object = msg->mutable_workflow_execution_id();
-        if (size > end - ptr) goto len_delim_till_end;
-        ptr += size;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-            {parser_till_end, object}, ptr - size, ptr));
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-bool EvictExecutionCacheRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:flyteidl.service.EvictExecutionCacheRequest)
-  for (;;) {
-    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_workflow_execution_id()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:flyteidl.service.EvictExecutionCacheRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:flyteidl.service.EvictExecutionCacheRequest)
-  return false;
-#undef DO_
-}
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-
-void EvictExecutionCacheRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:flyteidl.service.EvictExecutionCacheRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-  if (this->has_workflow_execution_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, HasBitSetters::workflow_execution_id(this), output);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:flyteidl.service.EvictExecutionCacheRequest)
-}
-
-::google::protobuf::uint8* EvictExecutionCacheRequest::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:flyteidl.service.EvictExecutionCacheRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-  if (this->has_workflow_execution_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        1, HasBitSetters::workflow_execution_id(this), target);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:flyteidl.service.EvictExecutionCacheRequest)
-  return target;
-}
-
-size_t EvictExecutionCacheRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:flyteidl.service.EvictExecutionCacheRequest)
-  size_t total_size = 0;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
-  }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-  if (this->has_workflow_execution_id()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *workflow_execution_id_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  SetCachedSize(cached_size);
-  return total_size;
-}
-
-void EvictExecutionCacheRequest::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.service.EvictExecutionCacheRequest)
-  GOOGLE_DCHECK_NE(&from, this);
-  const EvictExecutionCacheRequest* source =
-      ::google::protobuf::DynamicCastToGenerated(
-          &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.service.EvictExecutionCacheRequest)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.service.EvictExecutionCacheRequest)
-    MergeFrom(*source);
-  }
-}
-
-void EvictExecutionCacheRequest::MergeFrom(const EvictExecutionCacheRequest& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.service.EvictExecutionCacheRequest)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_workflow_execution_id()) {
-    mutable_workflow_execution_id()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.workflow_execution_id());
-  }
-}
-
-void EvictExecutionCacheRequest::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.service.EvictExecutionCacheRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void EvictExecutionCacheRequest::CopyFrom(const EvictExecutionCacheRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.service.EvictExecutionCacheRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EvictExecutionCacheRequest::IsInitialized() const {
-  return true;
-}
-
-void EvictExecutionCacheRequest::Swap(EvictExecutionCacheRequest* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void EvictExecutionCacheRequest::InternalSwap(EvictExecutionCacheRequest* other) {
-  using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(workflow_execution_id_, other->workflow_execution_id_);
-}
-
-::google::protobuf::Metadata EvictExecutionCacheRequest::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fservice_2fcache_2eproto);
-  return ::file_level_metadata_flyteidl_2fservice_2fcache_2eproto[kIndexInFileMessages];
-}
-
-
 // ===================================================================
 
 void EvictTaskExecutionCacheRequest::InitAsDefaultInstance() {
@@ -1068,9 +737,6 @@ ::google::protobuf::Metadata EvictCacheResponse::GetMetadata() const {
 }  // namespace flyteidl
 namespace google {
 namespace protobuf {
-template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictExecutionCacheRequest >(Arena* arena) {
-  return Arena::CreateInternal< ::flyteidl::service::EvictExecutionCacheRequest >(arena);
-}
 template<> PROTOBUF_NOINLINE ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage< ::flyteidl::service::EvictTaskExecutionCacheRequest >(Arena* arena) {
   return Arena::CreateInternal< ::flyteidl::service::EvictTaskExecutionCacheRequest >(arena);
 }
diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h
index 81ae8167ca..61f8d5122d 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h
+++ b/flyteidl/gen/pb-cpp/flyteidl/service/cache.pb.h
@@ -44,7 +44,7 @@ struct TableStruct_flyteidl_2fservice_2fcache_2eproto {
     PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
     PROTOBUF_SECTION_VARIABLE(protodesc_cold);
-  static const ::google::protobuf::internal::ParseTable schema[3]
+  static const ::google::protobuf::internal::ParseTable schema[2]
     PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
@@ -56,9 +56,6 @@ namespace service {
 class EvictCacheResponse;
 class EvictCacheResponseDefaultTypeInternal;
 extern EvictCacheResponseDefaultTypeInternal _EvictCacheResponse_default_instance_;
-class EvictExecutionCacheRequest;
-class EvictExecutionCacheRequestDefaultTypeInternal;
-extern EvictExecutionCacheRequestDefaultTypeInternal _EvictExecutionCacheRequest_default_instance_;
 class EvictTaskExecutionCacheRequest;
 class EvictTaskExecutionCacheRequestDefaultTypeInternal;
 extern EvictTaskExecutionCacheRequestDefaultTypeInternal _EvictTaskExecutionCacheRequest_default_instance_;
@@ -67,7 +64,6 @@ extern EvictTaskExecutionCacheRequestDefaultTypeInternal _EvictTaskExecutionCach
 namespace google {
 namespace protobuf {
 template<> ::flyteidl::service::EvictCacheResponse* Arena::CreateMaybeMessage<::flyteidl::service::EvictCacheResponse>(Arena*);
-template<> ::flyteidl::service::EvictExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictExecutionCacheRequest>(Arena*);
 template<> ::flyteidl::service::EvictTaskExecutionCacheRequest* Arena::CreateMaybeMessage<::flyteidl::service::EvictTaskExecutionCacheRequest>(Arena*);
 }  // namespace protobuf
 }  // namespace google
@@ -76,121 +72,6 @@ namespace service {
 
 // ===================================================================
 
-class EvictExecutionCacheRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictExecutionCacheRequest) */ {
- public:
-  EvictExecutionCacheRequest();
-  virtual ~EvictExecutionCacheRequest();
-
-  EvictExecutionCacheRequest(const EvictExecutionCacheRequest& from);
-
-  inline EvictExecutionCacheRequest& operator=(const EvictExecutionCacheRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  EvictExecutionCacheRequest(EvictExecutionCacheRequest&& from) noexcept
-    : EvictExecutionCacheRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline EvictExecutionCacheRequest& operator=(EvictExecutionCacheRequest&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
-  static const EvictExecutionCacheRequest& default_instance();
-
-  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
-  static inline const EvictExecutionCacheRequest* internal_default_instance() {
-    return reinterpret_cast(
-               &_EvictExecutionCacheRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  void Swap(EvictExecutionCacheRequest* other);
-  friend void swap(EvictExecutionCacheRequest& a, EvictExecutionCacheRequest& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline EvictExecutionCacheRequest* New() const final {
-    return CreateMaybeMessage(nullptr);
-  }
-
-  EvictExecutionCacheRequest* New(::google::protobuf::Arena* arena) const final {
-    return CreateMaybeMessage(arena);
-  }
-  void CopyFrom(const ::google::protobuf::Message& from) final;
-  void MergeFrom(const ::google::protobuf::Message& from) final;
-  void CopyFrom(const EvictExecutionCacheRequest& from);
-  void MergeFrom(const EvictExecutionCacheRequest& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const final;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
-
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(EvictExecutionCacheRequest* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
-  }
-  inline void* MaybeArenaPtr() const {
-    return nullptr;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-  bool has_workflow_execution_id() const;
-  void clear_workflow_execution_id();
-  static const int kWorkflowExecutionIdFieldNumber = 1;
-  const ::flyteidl::core::WorkflowExecutionIdentifier& workflow_execution_id() const;
-  ::flyteidl::core::WorkflowExecutionIdentifier* release_workflow_execution_id();
-  ::flyteidl::core::WorkflowExecutionIdentifier* mutable_workflow_execution_id();
-  void set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id);
-
-  // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest)
- private:
-  class HasBitSetters;
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id_;
-  mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_flyteidl_2fservice_2fcache_2eproto;
-};
-// -------------------------------------------------------------------
-
 class EvictTaskExecutionCacheRequest final :
     public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.service.EvictTaskExecutionCacheRequest) */ {
  public:
@@ -229,7 +110,7 @@ class EvictTaskExecutionCacheRequest final :
                &_EvictTaskExecutionCacheRequest_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    1;
+    0;
 
   void Swap(EvictTaskExecutionCacheRequest* other);
   friend void swap(EvictTaskExecutionCacheRequest& a, EvictTaskExecutionCacheRequest& b) {
@@ -344,7 +225,7 @@ class EvictCacheResponse final :
                &_EvictCacheResponse_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    2;
+    1;
 
   void Swap(EvictCacheResponse* other);
   friend void swap(EvictCacheResponse& a, EvictCacheResponse& b) {
@@ -428,55 +309,6 @@ class EvictCacheResponse final :
   #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif  // __GNUC__
-// EvictExecutionCacheRequest
-
-// .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-inline bool EvictExecutionCacheRequest::has_workflow_execution_id() const {
-  return this != internal_default_instance() && workflow_execution_id_ != nullptr;
-}
-inline const ::flyteidl::core::WorkflowExecutionIdentifier& EvictExecutionCacheRequest::workflow_execution_id() const {
-  const ::flyteidl::core::WorkflowExecutionIdentifier* p = workflow_execution_id_;
-  // @@protoc_insertion_point(field_get:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id)
-  return p != nullptr ? *p : *reinterpret_cast(
-      &::flyteidl::core::_WorkflowExecutionIdentifier_default_instance_);
-}
-inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::release_workflow_execution_id() {
-  // @@protoc_insertion_point(field_release:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id)
-  
-  ::flyteidl::core::WorkflowExecutionIdentifier* temp = workflow_execution_id_;
-  workflow_execution_id_ = nullptr;
-  return temp;
-}
-inline ::flyteidl::core::WorkflowExecutionIdentifier* EvictExecutionCacheRequest::mutable_workflow_execution_id() {
-  
-  if (workflow_execution_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::flyteidl::core::WorkflowExecutionIdentifier>(GetArenaNoVirtual());
-    workflow_execution_id_ = p;
-  }
-  // @@protoc_insertion_point(field_mutable:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id)
-  return workflow_execution_id_;
-}
-inline void EvictExecutionCacheRequest::set_allocated_workflow_execution_id(::flyteidl::core::WorkflowExecutionIdentifier* workflow_execution_id) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == nullptr) {
-    delete reinterpret_cast< ::google::protobuf::MessageLite*>(workflow_execution_id_);
-  }
-  if (workflow_execution_id) {
-    ::google::protobuf::Arena* submessage_arena = nullptr;
-    if (message_arena != submessage_arena) {
-      workflow_execution_id = ::google::protobuf::internal::GetOwnedMessage(
-          message_arena, workflow_execution_id, submessage_arena);
-    }
-    
-  } else {
-    
-  }
-  workflow_execution_id_ = workflow_execution_id;
-  // @@protoc_insertion_point(field_set_allocated:flyteidl.service.EvictExecutionCacheRequest.workflow_execution_id)
-}
-
-// -------------------------------------------------------------------
-
 // EvictTaskExecutionCacheRequest
 
 // .flyteidl.core.TaskExecutionIdentifier task_execution_id = 1;
@@ -578,8 +410,6 @@ inline void EvictCacheResponse::set_allocated_errors(::flyteidl::core::CacheEvic
 #endif  // __GNUC__
 // -------------------------------------------------------------------
 
-// -------------------------------------------------------------------
-
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go
index 82a13c75bf..f0f2f31b8e 100644
--- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.go
@@ -26,46 +26,6 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
-type EvictExecutionCacheRequest struct {
-	// Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-	WorkflowExecutionId  *core.WorkflowExecutionIdentifier `protobuf:"bytes,1,opt,name=workflow_execution_id,json=workflowExecutionId,proto3" json:"workflow_execution_id,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
-	XXX_unrecognized     []byte                            `json:"-"`
-	XXX_sizecache        int32                             `json:"-"`
-}
-
-func (m *EvictExecutionCacheRequest) Reset()         { *m = EvictExecutionCacheRequest{} }
-func (m *EvictExecutionCacheRequest) String() string { return proto.CompactTextString(m) }
-func (*EvictExecutionCacheRequest) ProtoMessage()    {}
-func (*EvictExecutionCacheRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c5ff5da69b96fa44, []int{0}
-}
-
-func (m *EvictExecutionCacheRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_EvictExecutionCacheRequest.Unmarshal(m, b)
-}
-func (m *EvictExecutionCacheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_EvictExecutionCacheRequest.Marshal(b, m, deterministic)
-}
-func (m *EvictExecutionCacheRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EvictExecutionCacheRequest.Merge(m, src)
-}
-func (m *EvictExecutionCacheRequest) XXX_Size() int {
-	return xxx_messageInfo_EvictExecutionCacheRequest.Size(m)
-}
-func (m *EvictExecutionCacheRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_EvictExecutionCacheRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_EvictExecutionCacheRequest proto.InternalMessageInfo
-
-func (m *EvictExecutionCacheRequest) GetWorkflowExecutionId() *core.WorkflowExecutionIdentifier {
-	if m != nil {
-		return m.WorkflowExecutionId
-	}
-	return nil
-}
-
 type EvictTaskExecutionCacheRequest struct {
 	// Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
 	TaskExecutionId      *core.TaskExecutionIdentifier `protobuf:"bytes,1,opt,name=task_execution_id,json=taskExecutionId,proto3" json:"task_execution_id,omitempty"`
@@ -78,7 +38,7 @@ func (m *EvictTaskExecutionCacheRequest) Reset()         { *m = EvictTaskExecuti
 func (m *EvictTaskExecutionCacheRequest) String() string { return proto.CompactTextString(m) }
 func (*EvictTaskExecutionCacheRequest) ProtoMessage()    {}
 func (*EvictTaskExecutionCacheRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c5ff5da69b96fa44, []int{1}
+	return fileDescriptor_c5ff5da69b96fa44, []int{0}
 }
 
 func (m *EvictTaskExecutionCacheRequest) XXX_Unmarshal(b []byte) error {
@@ -118,7 +78,7 @@ func (m *EvictCacheResponse) Reset()         { *m = EvictCacheResponse{} }
 func (m *EvictCacheResponse) String() string { return proto.CompactTextString(m) }
 func (*EvictCacheResponse) ProtoMessage()    {}
 func (*EvictCacheResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c5ff5da69b96fa44, []int{2}
+	return fileDescriptor_c5ff5da69b96fa44, []int{1}
 }
 
 func (m *EvictCacheResponse) XXX_Unmarshal(b []byte) error {
@@ -147,7 +107,6 @@ func (m *EvictCacheResponse) GetErrors() *core.CacheEvictionErrorList {
 }
 
 func init() {
-	proto.RegisterType((*EvictExecutionCacheRequest)(nil), "flyteidl.service.EvictExecutionCacheRequest")
 	proto.RegisterType((*EvictTaskExecutionCacheRequest)(nil), "flyteidl.service.EvictTaskExecutionCacheRequest")
 	proto.RegisterType((*EvictCacheResponse)(nil), "flyteidl.service.EvictCacheResponse")
 }
@@ -155,37 +114,33 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/service/cache.proto", fileDescriptor_c5ff5da69b96fa44) }
 
 var fileDescriptor_c5ff5da69b96fa44 = []byte{
-	// 478 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x8a, 0x13, 0x41,
-	0x10, 0x26, 0x46, 0x72, 0x68, 0x05, 0x75, 0x16, 0x51, 0x86, 0x65, 0x91, 0xa0, 0x22, 0x41, 0xa7,
-	0x75, 0x3d, 0x2f, 0x82, 0x92, 0x83, 0xe0, 0x29, 0x2b, 0x08, 0x1e, 0x0c, 0x9d, 0x9e, 0xca, 0x6c,
-	0x9b, 0xa4, 0x6b, 0xec, 0xae, 0x4c, 0x5c, 0x76, 0x73, 0xf1, 0x15, 0x7c, 0x00, 0x2f, 0x22, 0x78,
-	0xf3, 0x5d, 0x7c, 0x05, 0xc1, 0xd7, 0x90, 0xe9, 0xf9, 0xc1, 0x99, 0x9d, 0xd6, 0xdd, 0xdb, 0x30,
-	0xdf, 0x57, 0x5f, 0x7d, 0x55, 0x5f, 0xd1, 0x6c, 0x77, 0xbe, 0x3c, 0x26, 0x50, 0xf1, 0x92, 0x5b,
-	0x30, 0x99, 0x92, 0xc0, 0xa5, 0x90, 0x47, 0x10, 0xa5, 0x06, 0x09, 0x83, 0xeb, 0x15, 0x1a, 0x95,
-	0x68, 0xb8, 0x9b, 0x20, 0x26, 0x4b, 0xe0, 0x22, 0x55, 0x5c, 0x68, 0x8d, 0x24, 0x48, 0xa1, 0xb6,
-	0x05, 0x3f, 0x0c, 0x6b, 0x35, 0x89, 0x06, 0x38, 0x18, 0x83, 0xa6, 0xc2, 0xf6, 0x9a, 0x98, 0x8a,
-	0x41, 0x93, 0x9a, 0x2b, 0x30, 0x05, 0x3e, 0x3c, 0x65, 0xe1, 0x38, 0x53, 0x92, 0xc6, 0x1f, 0x41,
-	0xae, 0x73, 0xd1, 0x17, 0xb9, 0x91, 0x09, 0x7c, 0x58, 0x83, 0xa5, 0xe0, 0x1d, 0xbb, 0xb9, 0x41,
-	0xb3, 0x98, 0x2f, 0x71, 0x33, 0x85, 0x8a, 0x31, 0x55, 0xf1, 0xed, 0xde, 0x9d, 0xde, 0x83, 0x2b,
-	0xfb, 0xa3, 0xa8, 0x76, 0x9a, 0xab, 0x47, 0x6f, 0x4a, 0x6e, 0x2d, 0xf6, 0xb2, 0x6e, 0x37, 0xd9,
-	0xd9, 0x9c, 0x05, 0x87, 0xc4, 0xf6, 0x5c, 0xf7, 0xd7, 0xc2, 0x2e, 0xba, 0x1d, 0x4c, 0xd8, 0x0d,
-	0x12, 0x76, 0xd1, 0xd5, 0xfd, 0x7e, 0xab, 0x7b, 0x43, 0xe4, 0xaf, 0xce, 0xd7, 0xa8, 0x09, 0x0c,
-	0x0f, 0x59, 0xe0, 0xba, 0x96, 0x8d, 0x6c, 0x8a, 0xda, 0x42, 0x70, 0xc0, 0x06, 0xc5, 0xe6, 0x4a,
-	0xf9, 0x7b, 0x2d, 0x79, 0xc7, 0x76, 0x75, 0x0a, 0xf5, 0x38, 0x67, 0xbe, 0x52, 0x96, 0x26, 0x65,
-	0xd1, 0xfe, 0x97, 0x01, 0xbb, 0xea, 0x28, 0x87, 0x45, 0x66, 0xc1, 0xef, 0x1e, 0xdb, 0xe9, 0x58,
-	0x6d, 0xf0, 0x30, 0x6a, 0xc7, 0x1b, 0xf9, 0x13, 0x08, 0xef, 0x7a, 0xd8, 0x0d, 0xef, 0xc3, 0xd3,
-	0x4f, 0x3f, 0x7f, 0x7d, 0xbe, 0x94, 0x8d, 0xc8, 0x5d, 0x48, 0xf6, 0xa4, 0x38, 0x27, 0x5e, 0x2f,
-	0xcd, 0xf2, 0x93, 0xce, 0x1c, 0xf3, 0x23, 0x78, 0x0f, 0x92, 0xb6, 0x3e, 0x3c, 0xc6, 0x95, 0x50,
-	0xda, 0x0b, 0x6b, 0xb1, 0x82, 0x6d, 0xf0, 0xf5, 0x32, 0xbb, 0xe5, 0x89, 0x31, 0x78, 0xec, 0xf1,
-	0xef, 0x4d, 0xfc, 0x9c, 0x13, 0xff, 0xe8, 0xbb, 0x91, 0xbf, 0xf7, 0x47, 0xdf, 0xfa, 0xcd, 0xa1,
-	0x9b, 0xe7, 0x62, 0xf9, 0xc9, 0x99, 0xfb, 0x89, 0x34, 0xc6, 0xd0, 0xfc, 0xe3, 0x59, 0xca, 0x85,
-	0x4b, 0xeb, 0x7d, 0x5d, 0xb8, 0xd2, 0xad, 0xf2, 0x7c, 0x75, 0xee, 0x8f, 0x8a, 0x3b, 0xd9, 0xee,
-	0xcf, 0x7f, 0x66, 0xa8, 0x38, 0xff, 0x30, 0x5b, 0x51, 0xbc, 0xae, 0x2a, 0x42, 0x06, 0xc6, 0x2a,
-	0xec, 0x16, 0x31, 0x40, 0xe6, 0x78, 0x2a, 0x88, 0x60, 0x95, 0xd2, 0xf6, 0xf9, 0xb3, 0xb7, 0x07,
-	0x89, 0xa2, 0xa3, 0xf5, 0x2c, 0x92, 0xb8, 0xe2, 0x2e, 0x64, 0x34, 0x49, 0xf1, 0xc1, 0xeb, 0x67,
-	0x2a, 0x01, 0xcd, 0xd3, 0xd9, 0xa3, 0x04, 0x79, 0xfb, 0x8d, 0x9c, 0x0d, 0xdc, 0x93, 0xf5, 0xf4,
-	0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x66, 0x79, 0x86, 0x3e, 0x05, 0x00, 0x00,
+	// 401 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xcd, 0x8a, 0x13, 0x41,
+	0x10, 0x26, 0x26, 0xe4, 0x30, 0x0a, 0xea, 0x5c, 0x94, 0x21, 0x04, 0x09, 0x2a, 0x22, 0xd8, 0xad,
+	0xf1, 0x1c, 0x04, 0x25, 0x07, 0xc1, 0xd3, 0xc4, 0x93, 0x97, 0xd0, 0xe9, 0xa9, 0x4c, 0xda, 0x64,
+	0xba, 0xc6, 0xee, 0xca, 0x60, 0x90, 0x5c, 0x7c, 0x05, 0x5f, 0x41, 0x16, 0xf6, 0xb6, 0x97, 0x7d,
+	0x92, 0x7d, 0x85, 0x7d, 0x90, 0x65, 0x7a, 0x7e, 0x60, 0xb2, 0x49, 0x76, 0xc9, 0x6d, 0xa6, 0xbf,
+	0x9f, 0xaa, 0xfa, 0x8a, 0xf2, 0x7a, 0xf3, 0xd5, 0x86, 0x40, 0x45, 0x2b, 0x6e, 0xc1, 0x64, 0x4a,
+	0x02, 0x97, 0x42, 0x2e, 0x80, 0xa5, 0x06, 0x09, 0xfd, 0x27, 0x15, 0xca, 0x4a, 0x34, 0xe8, 0xc5,
+	0x88, 0xf1, 0x0a, 0xb8, 0x48, 0x15, 0x17, 0x5a, 0x23, 0x09, 0x52, 0xa8, 0x6d, 0xc1, 0x0f, 0x82,
+	0xda, 0x4d, 0xa2, 0x01, 0x0e, 0xc6, 0xa0, 0xa9, 0xb0, 0x7e, 0x13, 0x53, 0x11, 0x68, 0x52, 0x73,
+	0x05, 0xa6, 0xc0, 0x07, 0xe4, 0xf5, 0xc7, 0x99, 0x92, 0xf4, 0x5d, 0xd8, 0xe5, 0xf8, 0x37, 0xc8,
+	0x75, 0x6e, 0xfc, 0x25, 0x6f, 0x26, 0x84, 0x5f, 0x6b, 0xb0, 0xe4, 0x87, 0xde, 0x53, 0x12, 0x76,
+	0x39, 0x85, 0x0a, 0x9d, 0xaa, 0xe8, 0x79, 0xeb, 0x45, 0xeb, 0xcd, 0xc3, 0xe1, 0x6b, 0x56, 0x77,
+	0x9a, 0xbb, 0xb3, 0x86, 0xc9, 0xd7, 0xba, 0x54, 0xf8, 0x98, 0x9a, 0xc0, 0x60, 0xe2, 0xf9, 0xae,
+	0x6a, 0x59, 0xc8, 0xa6, 0xa8, 0x2d, 0xf8, 0x23, 0xaf, 0x5b, 0xf4, 0x5e, 0xda, 0xbf, 0xda, 0xb1,
+	0x77, 0x6c, 0xa7, 0x53, 0xa8, 0xc7, 0x39, 0xf3, 0x9b, 0xb2, 0x14, 0x96, 0xa2, 0xe1, 0x65, 0xc7,
+	0x7b, 0xe4, 0x28, 0x93, 0x22, 0x35, 0xff, 0x7f, 0xc7, 0x7b, 0x76, 0x60, 0x38, 0xff, 0x3d, 0xdb,
+	0x0d, 0x99, 0x1d, 0xcf, 0x21, 0x78, 0x79, 0x40, 0xd1, 0x98, 0x61, 0x70, 0xd1, 0xfe, 0x7b, 0x75,
+	0xfd, 0xef, 0xc1, 0x79, 0xfb, 0xed, 0x59, 0xdb, 0xad, 0x2b, 0xfb, 0x50, 0xec, 0x96, 0x37, 0x43,
+	0xb4, 0xfc, 0xcf, 0xad, 0x54, 0x99, 0xc6, 0x08, 0x9a, 0x2f, 0x8d, 0x9f, 0xd4, 0xe0, 0x4f, 0x90,
+	0xb4, 0x3d, 0x41, 0x1a, 0x61, 0x22, 0x94, 0x3e, 0x45, 0xa9, 0x45, 0x02, 0xf7, 0xd4, 0xb9, 0x17,
+	0x15, 0xed, 0x65, 0xbb, 0x97, 0x3b, 0x66, 0xa8, 0x38, 0x47, 0x9a, 0xad, 0x28, 0x07, 0xbb, 0xaa,
+	0x08, 0x19, 0x18, 0xab, 0x70, 0xbf, 0x89, 0x01, 0x32, 0x9b, 0xa9, 0x20, 0x82, 0x24, 0xa5, 0xed,
+	0xe7, 0x4f, 0x3f, 0x46, 0xb1, 0xa2, 0xc5, 0x7a, 0xc6, 0x24, 0x26, 0xdc, 0x2d, 0x19, 0x4d, 0x5c,
+	0x7c, 0xf0, 0xfa, 0x7c, 0x62, 0xd0, 0x3c, 0x9d, 0xbd, 0x8b, 0x91, 0xef, 0xde, 0xee, 0xac, 0xeb,
+	0x4e, 0xe9, 0xe3, 0x4d, 0x00, 0x00, 0x00, 0xff, 0xff, 0x41, 0xb6, 0x15, 0x7a, 0xd6, 0x03, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -200,8 +155,6 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type CacheServiceClient interface {
-	// Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.
-	EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error)
 	// Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.
 	EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error)
 }
@@ -214,15 +167,6 @@ func NewCacheServiceClient(cc *grpc.ClientConn) CacheServiceClient {
 	return &cacheServiceClient{cc}
 }
 
-func (c *cacheServiceClient) EvictExecutionCache(ctx context.Context, in *EvictExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) {
-	out := new(EvictCacheResponse)
-	err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictExecutionCache", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *EvictTaskExecutionCacheRequest, opts ...grpc.CallOption) (*EvictCacheResponse, error) {
 	out := new(EvictCacheResponse)
 	err := c.cc.Invoke(ctx, "/flyteidl.service.CacheService/EvictTaskExecutionCache", in, out, opts...)
@@ -234,8 +178,6 @@ func (c *cacheServiceClient) EvictTaskExecutionCache(ctx context.Context, in *Ev
 
 // CacheServiceServer is the server API for CacheService service.
 type CacheServiceServer interface {
-	// Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.
-	EvictExecutionCache(context.Context, *EvictExecutionCacheRequest) (*EvictCacheResponse, error)
 	// Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.
 	EvictTaskExecutionCache(context.Context, *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error)
 }
@@ -244,9 +186,6 @@ type CacheServiceServer interface {
 type UnimplementedCacheServiceServer struct {
 }
 
-func (*UnimplementedCacheServiceServer) EvictExecutionCache(ctx context.Context, req *EvictExecutionCacheRequest) (*EvictCacheResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method EvictExecutionCache not implemented")
-}
 func (*UnimplementedCacheServiceServer) EvictTaskExecutionCache(ctx context.Context, req *EvictTaskExecutionCacheRequest) (*EvictCacheResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method EvictTaskExecutionCache not implemented")
 }
@@ -255,24 +194,6 @@ func RegisterCacheServiceServer(s *grpc.Server, srv CacheServiceServer) {
 	s.RegisterService(&_CacheService_serviceDesc, srv)
 }
 
-func _CacheService_EvictExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(EvictExecutionCacheRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(CacheServiceServer).EvictExecutionCache(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/flyteidl.service.CacheService/EvictExecutionCache",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(CacheServiceServer).EvictExecutionCache(ctx, req.(*EvictExecutionCacheRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _CacheService_EvictTaskExecutionCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(EvictTaskExecutionCacheRequest)
 	if err := dec(in); err != nil {
@@ -295,10 +216,6 @@ var _CacheService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "flyteidl.service.CacheService",
 	HandlerType: (*CacheServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "EvictExecutionCache",
-			Handler:    _CacheService_EvictExecutionCache_Handler,
-		},
 		{
 			MethodName: "EvictTaskExecutionCache",
 			Handler:    _CacheService_EvictTaskExecutionCache_Handler,
diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go
index fdf0495d8d..c1ff145886 100644
--- a/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go
+++ b/flyteidl/gen/pb-go/flyteidl/service/cache.pb.gw.go
@@ -28,66 +28,6 @@ var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
 
-var (
-	filter_CacheService_EvictExecutionCache_0 = &utilities.DoubleArray{Encoding: map[string]int{"workflow_execution_id": 0, "project": 1, "domain": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}}
-)
-
-func request_CacheService_EvictExecutionCache_0(ctx context.Context, marshaler runtime.Marshaler, client CacheServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq EvictExecutionCacheRequest
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["workflow_execution_id.project"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "workflow_execution_id.project")
-	}
-
-	err = runtime.PopulateFieldFromPath(&protoReq, "workflow_execution_id.project", val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.project", err)
-	}
-
-	val, ok = pathParams["workflow_execution_id.domain"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "workflow_execution_id.domain")
-	}
-
-	err = runtime.PopulateFieldFromPath(&protoReq, "workflow_execution_id.domain", val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.domain", err)
-	}
-
-	val, ok = pathParams["workflow_execution_id.name"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "workflow_execution_id.name")
-	}
-
-	err = runtime.PopulateFieldFromPath(&protoReq, "workflow_execution_id.name", val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "workflow_execution_id.name", err)
-	}
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CacheService_EvictExecutionCache_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.EvictExecutionCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
 var (
 	filter_CacheService_EvictTaskExecutionCache_0 = &utilities.DoubleArray{Encoding: map[string]int{"task_execution_id": 0, "node_execution_id": 1, "execution_id": 2, "project": 3, "domain": 4, "name": 5, "node_id": 6, "task_id": 7, "version": 8, "retry_attempt": 9}, Base: []int{1, 20, 1, 1, 1, 4, 3, 2, 7, 5, 3, 0, 0, 0, 9, 6, 0, 15, 9, 0, 17, 12, 0, 19, 15, 0, 19, 18, 0, 20, 0}, Check: []int{0, 1, 2, 3, 4, 2, 6, 7, 2, 9, 10, 5, 8, 11, 2, 15, 16, 2, 18, 19, 2, 21, 22, 2, 24, 25, 2, 27, 28, 2, 30}}
 )
@@ -252,26 +192,6 @@ func RegisterCacheServiceHandler(ctx context.Context, mux *runtime.ServeMux, con
 // "CacheServiceClient" to call the correct interceptors.
 func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client CacheServiceClient) error {
 
-	mux.Handle("DELETE", pattern_CacheService_EvictExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_CacheService_EvictExecutionCache_0(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_CacheService_EvictExecutionCache_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("DELETE", pattern_CacheService_EvictTaskExecutionCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -296,13 +216,9 @@ func RegisterCacheServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 }
 
 var (
-	pattern_CacheService_EvictExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"api", "v1", "cache", "executions", "workflow_execution_id.project", "workflow_execution_id.domain", "workflow_execution_id.name"}, ""))
-
 	pattern_CacheService_EvictTaskExecutionCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 1, 0, 4, 1, 5, 12}, []string{"api", "v1", "cache", "task_executions", "task_execution_id.node_execution_id.execution_id.project", "task_execution_id.node_execution_id.execution_id.domain", "task_execution_id.node_execution_id.execution_id.name", "task_execution_id.node_execution_id.node_id", "task_execution_id.task_id.project", "task_execution_id.task_id.domain", "task_execution_id.task_id.name", "task_execution_id.task_id.version", "task_execution_id.retry_attempt"}, ""))
 )
 
 var (
-	forward_CacheService_EvictExecutionCache_0 = runtime.ForwardResponseMessage
-
 	forward_CacheService_EvictTaskExecutionCache_0 = runtime.ForwardResponseMessage
 )
diff --git a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json
index b2aa09e733..cc16d17b2c 100644
--- a/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json
+++ b/flyteidl/gen/pb-go/flyteidl/service/cache.swagger.json
@@ -15,46 +15,6 @@
     "application/json"
   ],
   "paths": {
-    "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}": {
-      "delete": {
-        "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.",
-        "operationId": "EvictExecutionCache",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/serviceEvictCacheResponse"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "workflow_execution_id.project",
-            "description": "Name of the project the resource belongs to.",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "workflow_execution_id.domain",
-            "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project.",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "workflow_execution_id.name",
-            "description": "User or system provided value for the resource.",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "CacheService"
-        ]
-      }
-    },
     "/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}": {
       "delete": {
         "summary": "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.",
diff --git a/flyteidl/gen/pb-java/flyteidl/service/Cache.java b/flyteidl/gen/pb-java/flyteidl/service/Cache.java
index 3b72418d69..75880954fd 100644
--- a/flyteidl/gen/pb-java/flyteidl/service/Cache.java
+++ b/flyteidl/gen/pb-java/flyteidl/service/Cache.java
@@ -14,672 +14,6 @@ public static void registerAllExtensions(
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface EvictExecutionCacheRequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictExecutionCacheRequest)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     * 

-     *
-     * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-     */
-    boolean hasWorkflowExecutionId();
-    /**
-     * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     * 

-     *
-     * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-     */
-    flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId();
-    /**
-     * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     * 

-     *
-     * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-     */
-    flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder();
-  }
-  /**
-   * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest}
-   */
-  public  static final class EvictExecutionCacheRequest extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:flyteidl.service.EvictExecutionCacheRequest)
-      EvictExecutionCacheRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use EvictExecutionCacheRequest.newBuilder() to construct.
-    private EvictExecutionCacheRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private EvictExecutionCacheRequest() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EvictExecutionCacheRequest(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null;
-              if (workflowExecutionId_ != null) {
-                subBuilder = workflowExecutionId_.toBuilder();
-              }
-              workflowExecutionId_ = input.readMessage(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(workflowExecutionId_);
-                workflowExecutionId_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class);
-    }
-
-    public static final int WORKFLOW_EXECUTION_ID_FIELD_NUMBER = 1;
-    private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier workflowExecutionId_;
-    /**
-     * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     * 

-     *
-     * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-     */
-    public boolean hasWorkflowExecutionId() {
-      return workflowExecutionId_ != null;
-    }
-    /**
-     * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     * 

-     *
-     * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-     */
-    public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() {
-      return workflowExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : workflowExecutionId_;
-    }
-    /**
-     * 
-     * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-     * 

-     *
-     * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-     */
-    public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() {
-      return getWorkflowExecutionId();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (workflowExecutionId_ != null) {
-        output.writeMessage(1, getWorkflowExecutionId());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (workflowExecutionId_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getWorkflowExecutionId());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof flyteidl.service.Cache.EvictExecutionCacheRequest)) {
-        return super.equals(obj);
-      }
-      flyteidl.service.Cache.EvictExecutionCacheRequest other = (flyteidl.service.Cache.EvictExecutionCacheRequest) obj;
-
-      if (hasWorkflowExecutionId() != other.hasWorkflowExecutionId()) return false;
-      if (hasWorkflowExecutionId()) {
-        if (!getWorkflowExecutionId()
-            .equals(other.getWorkflowExecutionId())) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasWorkflowExecutionId()) {
-        hash = (37 * hash) + WORKFLOW_EXECUTION_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getWorkflowExecutionId().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(flyteidl.service.Cache.EvictExecutionCacheRequest prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code flyteidl.service.EvictExecutionCacheRequest}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:flyteidl.service.EvictExecutionCacheRequest)
-        flyteidl.service.Cache.EvictExecutionCacheRequestOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                flyteidl.service.Cache.EvictExecutionCacheRequest.class, flyteidl.service.Cache.EvictExecutionCacheRequest.Builder.class);
-      }
-
-      // Construct using flyteidl.service.Cache.EvictExecutionCacheRequest.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (workflowExecutionIdBuilder_ == null) {
-          workflowExecutionId_ = null;
-        } else {
-          workflowExecutionId_ = null;
-          workflowExecutionIdBuilder_ = null;
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return flyteidl.service.Cache.internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor;
-      }
-
-      @java.lang.Override
-      public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() {
-        return flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public flyteidl.service.Cache.EvictExecutionCacheRequest build() {
-        flyteidl.service.Cache.EvictExecutionCacheRequest result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public flyteidl.service.Cache.EvictExecutionCacheRequest buildPartial() {
-        flyteidl.service.Cache.EvictExecutionCacheRequest result = new flyteidl.service.Cache.EvictExecutionCacheRequest(this);
-        if (workflowExecutionIdBuilder_ == null) {
-          result.workflowExecutionId_ = workflowExecutionId_;
-        } else {
-          result.workflowExecutionId_ = workflowExecutionIdBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof flyteidl.service.Cache.EvictExecutionCacheRequest) {
-          return mergeFrom((flyteidl.service.Cache.EvictExecutionCacheRequest)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(flyteidl.service.Cache.EvictExecutionCacheRequest other) {
-        if (other == flyteidl.service.Cache.EvictExecutionCacheRequest.getDefaultInstance()) return this;
-        if (other.hasWorkflowExecutionId()) {
-          mergeWorkflowExecutionId(other.getWorkflowExecutionId());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        flyteidl.service.Cache.EvictExecutionCacheRequest parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (flyteidl.service.Cache.EvictExecutionCacheRequest) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier workflowExecutionId_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> workflowExecutionIdBuilder_;
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public boolean hasWorkflowExecutionId() {
-        return workflowExecutionIdBuilder_ != null || workflowExecutionId_ != null;
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getWorkflowExecutionId() {
-        if (workflowExecutionIdBuilder_ == null) {
-          return workflowExecutionId_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : workflowExecutionId_;
-        } else {
-          return workflowExecutionIdBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public Builder setWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) {
-        if (workflowExecutionIdBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          workflowExecutionId_ = value;
-          onChanged();
-        } else {
-          workflowExecutionIdBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public Builder setWorkflowExecutionId(
-          flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) {
-        if (workflowExecutionIdBuilder_ == null) {
-          workflowExecutionId_ = builderForValue.build();
-          onChanged();
-        } else {
-          workflowExecutionIdBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public Builder mergeWorkflowExecutionId(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) {
-        if (workflowExecutionIdBuilder_ == null) {
-          if (workflowExecutionId_ != null) {
-            workflowExecutionId_ =
-              flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.newBuilder(workflowExecutionId_).mergeFrom(value).buildPartial();
-          } else {
-            workflowExecutionId_ = value;
-          }
-          onChanged();
-        } else {
-          workflowExecutionIdBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public Builder clearWorkflowExecutionId() {
-        if (workflowExecutionIdBuilder_ == null) {
-          workflowExecutionId_ = null;
-          onChanged();
-        } else {
-          workflowExecutionId_ = null;
-          workflowExecutionIdBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getWorkflowExecutionIdBuilder() {
-        
-        onChanged();
-        return getWorkflowExecutionIdFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getWorkflowExecutionIdOrBuilder() {
-        if (workflowExecutionIdBuilder_ != null) {
-          return workflowExecutionIdBuilder_.getMessageOrBuilder();
-        } else {
-          return workflowExecutionId_ == null ?
-              flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : workflowExecutionId_;
-        }
-      }
-      /**
-       * 
-       * Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-       * 

-       *
-       * .flyteidl.core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> 
-          getWorkflowExecutionIdFieldBuilder() {
-        if (workflowExecutionIdBuilder_ == null) {
-          workflowExecutionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder>(
-                  getWorkflowExecutionId(),
-                  getParentForChildren(),
-                  isClean());
-          workflowExecutionId_ = null;
-        }
-        return workflowExecutionIdBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:flyteidl.service.EvictExecutionCacheRequest)
-    }
-
-    // @@protoc_insertion_point(class_scope:flyteidl.service.EvictExecutionCacheRequest)
-    private static final flyteidl.service.Cache.EvictExecutionCacheRequest DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new flyteidl.service.Cache.EvictExecutionCacheRequest();
-    }
-
-    public static flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public EvictExecutionCacheRequest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new EvictExecutionCacheRequest(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public flyteidl.service.Cache.EvictExecutionCacheRequest getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
   public interface EvictTaskExecutionCacheRequestOrBuilder extends
       // @@protoc_insertion_point(interface_extends:flyteidl.service.EvictTaskExecutionCacheRequest)
       com.google.protobuf.MessageOrBuilder {
@@ -2012,11 +1346,6 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() {
 
   }
 
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor;
   private static final 
@@ -2039,36 +1368,27 @@ public flyteidl.service.Cache.EvictCacheResponse getDefaultInstanceForType() {
       "\n\034flyteidl/service/cache.proto\022\020flyteidl" +
       ".service\032\034google/api/annotations.proto\032\032" +
       "flyteidl/core/errors.proto\032\036flyteidl/cor" +
-      "e/identifier.proto\"g\n\032EvictExecutionCach" +
-      "eRequest\022I\n\025workflow_execution_id\030\001 \001(\0132" +
-      "*.flyteidl.core.WorkflowExecutionIdentif" +
-      "ier\"c\n\036EvictTaskExecutionCacheRequest\022A\n" +
-      "\021task_execution_id\030\001 \001(\0132&.flyteidl.core" +
-      ".TaskExecutionIdentifier\"K\n\022EvictCacheRe" +
-      "sponse\0225\n\006errors\030\001 \001(\0132%.flyteidl.core.C" +
-      "acheEvictionErrorList2\237\006\n\014CacheService\022\347" +
-      "\001\n\023EvictExecutionCache\022,.flyteidl.servic" +
-      "e.EvictExecutionCacheRequest\032$.flyteidl." +
-      "service.EvictCacheResponse\"|\202\323\344\223\002v*t/api" +
-      "/v1/cache/executions/{workflow_execution" +
-      "_id.project}/{workflow_execution_id.doma" +
-      "in}/{workflow_execution_id.name}\022\244\004\n\027Evi" +
-      "ctTaskExecutionCache\0220.flyteidl.service." +
-      "EvictTaskExecutionCacheRequest\032$.flyteid" +
-      "l.service.EvictCacheResponse\"\260\003\202\323\344\223\002\251\003*\246" +
-      "\003/api/v1/cache/task_executions/{task_exe" +
+      "e/identifier.proto\"c\n\036EvictTaskExecution" +
+      "CacheRequest\022A\n\021task_execution_id\030\001 \001(\0132" +
+      "&.flyteidl.core.TaskExecutionIdentifier\"" +
+      "K\n\022EvictCacheResponse\0225\n\006errors\030\001 \001(\0132%." +
+      "flyteidl.core.CacheEvictionErrorList2\265\004\n" +
+      "\014CacheService\022\244\004\n\027EvictTaskExecutionCach" +
+      "e\0220.flyteidl.service.EvictTaskExecutionC" +
+      "acheRequest\032$.flyteidl.service.EvictCach" +
+      "eResponse\"\260\003\202\323\344\223\002\251\003*\246\003/api/v1/cache/task" +
+      "_executions/{task_execution_id.node_exec" +
+      "ution_id.execution_id.project}/{task_exe" +
       "cution_id.node_execution_id.execution_id" +
-      ".project}/{task_execution_id.node_execut" +
-      "ion_id.execution_id.domain}/{task_execut" +
-      "ion_id.node_execution_id.execution_id.na" +
-      "me}/{task_execution_id.node_execution_id" +
-      ".node_id}/{task_execution_id.task_id.pro" +
-      "ject}/{task_execution_id.task_id.domain}" +
-      "/{task_execution_id.task_id.name}/{task_" +
-      "execution_id.task_id.version}/{task_exec" +
-      "ution_id.retry_attempt}B?Z=github.com/fl" +
-      "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" +
-      "/serviceb\006proto3"
+      ".domain}/{task_execution_id.node_executi" +
+      "on_id.execution_id.name}/{task_execution" +
+      "_id.node_execution_id.node_id}/{task_exe" +
+      "cution_id.task_id.project}/{task_executi" +
+      "on_id.task_id.domain}/{task_execution_id" +
+      ".task_id.name}/{task_execution_id.task_i" +
+      "d.version}/{task_execution_id.retry_atte" +
+      "mpt}B?Z=github.com/flyteorg/flyte/flytei" +
+      "dl/gen/pb-go/flyteidl/serviceb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -2085,20 +1405,14 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
           flyteidl.core.Errors.getDescriptor(),
           flyteidl.core.IdentifierOuterClass.getDescriptor(),
         }, assigner);
-    internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_flyteidl_service_EvictExecutionCacheRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_flyteidl_service_EvictExecutionCacheRequest_descriptor,
-        new java.lang.String[] { "WorkflowExecutionId", });
     internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor =
-      getDescriptor().getMessageTypes().get(1);
+      getDescriptor().getMessageTypes().get(0);
     internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_service_EvictTaskExecutionCacheRequest_descriptor,
         new java.lang.String[] { "TaskExecutionId", });
     internal_static_flyteidl_service_EvictCacheResponse_descriptor =
-      getDescriptor().getMessageTypes().get(2);
+      getDescriptor().getMessageTypes().get(1);
     internal_static_flyteidl_service_EvictCacheResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_service_EvictCacheResponse_descriptor,
diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts
index 3c9deaaf47..7d655f46de 100644
--- a/flyteidl/gen/pb-js/flyteidl.d.ts
+++ b/flyteidl/gen/pb-js/flyteidl.d.ts
@@ -21485,58 +21485,6 @@ export namespace flyteidl {
             type GetPublicClientConfigCallback = (error: (Error|null), response?: flyteidl.service.PublicClientAuthConfigResponse) => void;
         }
 
-        /** Properties of an EvictExecutionCacheRequest. */
-        interface IEvictExecutionCacheRequest {
-
-            /** EvictExecutionCacheRequest workflowExecutionId */
-            workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null);
-        }
-
-        /** Represents an EvictExecutionCacheRequest. */
-        class EvictExecutionCacheRequest implements IEvictExecutionCacheRequest {
-
-            /**
-             * Constructs a new EvictExecutionCacheRequest.
-             * @param [properties] Properties to set
-             */
-            constructor(properties?: flyteidl.service.IEvictExecutionCacheRequest);
-
-            /** EvictExecutionCacheRequest workflowExecutionId. */
-            public workflowExecutionId?: (flyteidl.core.IWorkflowExecutionIdentifier|null);
-
-            /**
-             * Creates a new EvictExecutionCacheRequest instance using the specified properties.
-             * @param [properties] Properties to set
-             * @returns EvictExecutionCacheRequest instance
-             */
-            public static create(properties?: flyteidl.service.IEvictExecutionCacheRequest): flyteidl.service.EvictExecutionCacheRequest;
-
-            /**
-             * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages.
-             * @param message EvictExecutionCacheRequest message or plain object to encode
-             * @param [writer] Writer to encode to
-             * @returns Writer
-             */
-            public static encode(message: flyteidl.service.IEvictExecutionCacheRequest, writer?: $protobuf.Writer): $protobuf.Writer;
-
-            /**
-             * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer.
-             * @param reader Reader or buffer to decode from
-             * @param [length] Message length if known beforehand
-             * @returns EvictExecutionCacheRequest
-             * @throws {Error} If the payload is not a reader or valid buffer
-             * @throws {$protobuf.util.ProtocolError} If required fields are missing
-             */
-            public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.service.EvictExecutionCacheRequest;
-
-            /**
-             * Verifies an EvictExecutionCacheRequest message.
-             * @param message Plain object to verify
-             * @returns `null` if valid, otherwise the reason why it is not
-             */
-            public static verify(message: { [k: string]: any }): (string|null);
-        }
-
         /** Properties of an EvictTaskExecutionCacheRequest. */
         interface IEvictTaskExecutionCacheRequest {
 
@@ -21661,20 +21609,6 @@ export namespace flyteidl {
              */
             public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): CacheService;
 
-            /**
-             * Calls EvictExecutionCache.
-             * @param request EvictExecutionCacheRequest message or plain object
-             * @param callback Node-style callback called with the error, if any, and EvictCacheResponse
-             */
-            public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest, callback: flyteidl.service.CacheService.EvictExecutionCacheCallback): void;
-
-            /**
-             * Calls EvictExecutionCache.
-             * @param request EvictExecutionCacheRequest message or plain object
-             * @returns Promise
-             */
-            public evictExecutionCache(request: flyteidl.service.IEvictExecutionCacheRequest): Promise;
-
             /**
              * Calls EvictTaskExecutionCache.
              * @param request EvictTaskExecutionCacheRequest message or plain object
@@ -21692,13 +21626,6 @@ export namespace flyteidl {
 
         namespace CacheService {
 
-            /**
-             * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}.
-             * @param error Error, if any
-             * @param [response] EvictCacheResponse
-             */
-            type EvictExecutionCacheCallback = (error: (Error|null), response?: flyteidl.service.EvictCacheResponse) => void;
-
             /**
              * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}.
              * @param error Error, if any
diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js
index 82f5d6a3fc..cd74985738 100644
--- a/flyteidl/gen/pb-js/flyteidl.js
+++ b/flyteidl/gen/pb-js/flyteidl.js
@@ -50389,118 +50389,6 @@
                 return AuthMetadataService;
             })();
     
-            service.EvictExecutionCacheRequest = (function() {
-    
-                /**
-                 * Properties of an EvictExecutionCacheRequest.
-                 * @memberof flyteidl.service
-                 * @interface IEvictExecutionCacheRequest
-                 * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [workflowExecutionId] EvictExecutionCacheRequest workflowExecutionId
-                 */
-    
-                /**
-                 * Constructs a new EvictExecutionCacheRequest.
-                 * @memberof flyteidl.service
-                 * @classdesc Represents an EvictExecutionCacheRequest.
-                 * @implements IEvictExecutionCacheRequest
-                 * @constructor
-                 * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set
-                 */
-                function EvictExecutionCacheRequest(properties) {
-                    if (properties)
-                        for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                            if (properties[keys[i]] != null)
-                                this[keys[i]] = properties[keys[i]];
-                }
-    
-                /**
-                 * EvictExecutionCacheRequest workflowExecutionId.
-                 * @member {flyteidl.core.IWorkflowExecutionIdentifier|null|undefined} workflowExecutionId
-                 * @memberof flyteidl.service.EvictExecutionCacheRequest
-                 * @instance
-                 */
-                EvictExecutionCacheRequest.prototype.workflowExecutionId = null;
-    
-                /**
-                 * Creates a new EvictExecutionCacheRequest instance using the specified properties.
-                 * @function create
-                 * @memberof flyteidl.service.EvictExecutionCacheRequest
-                 * @static
-                 * @param {flyteidl.service.IEvictExecutionCacheRequest=} [properties] Properties to set
-                 * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest instance
-                 */
-                EvictExecutionCacheRequest.create = function create(properties) {
-                    return new EvictExecutionCacheRequest(properties);
-                };
-    
-                /**
-                 * Encodes the specified EvictExecutionCacheRequest message. Does not implicitly {@link flyteidl.service.EvictExecutionCacheRequest.verify|verify} messages.
-                 * @function encode
-                 * @memberof flyteidl.service.EvictExecutionCacheRequest
-                 * @static
-                 * @param {flyteidl.service.IEvictExecutionCacheRequest} message EvictExecutionCacheRequest message or plain object to encode
-                 * @param {$protobuf.Writer} [writer] Writer to encode to
-                 * @returns {$protobuf.Writer} Writer
-                 */
-                EvictExecutionCacheRequest.encode = function encode(message, writer) {
-                    if (!writer)
-                        writer = $Writer.create();
-                    if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId"))
-                        $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.workflowExecutionId, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
-                    return writer;
-                };
-    
-                /**
-                 * Decodes an EvictExecutionCacheRequest message from the specified reader or buffer.
-                 * @function decode
-                 * @memberof flyteidl.service.EvictExecutionCacheRequest
-                 * @static
-                 * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @param {number} [length] Message length if known beforehand
-                 * @returns {flyteidl.service.EvictExecutionCacheRequest} EvictExecutionCacheRequest
-                 * @throws {Error} If the payload is not a reader or valid buffer
-                 * @throws {$protobuf.util.ProtocolError} If required fields are missing
-                 */
-                EvictExecutionCacheRequest.decode = function decode(reader, length) {
-                    if (!(reader instanceof $Reader))
-                        reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.service.EvictExecutionCacheRequest();
-                    while (reader.pos < end) {
-                        var tag = reader.uint32();
-                        switch (tag >>> 3) {
-                        case 1:
-                            message.workflowExecutionId = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32());
-                            break;
-                        default:
-                            reader.skipType(tag & 7);
-                            break;
-                        }
-                    }
-                    return message;
-                };
-    
-                /**
-                 * Verifies an EvictExecutionCacheRequest message.
-                 * @function verify
-                 * @memberof flyteidl.service.EvictExecutionCacheRequest
-                 * @static
-                 * @param {Object.} message Plain object to verify
-                 * @returns {string|null} `null` if valid, otherwise the reason why it is not
-                 */
-                EvictExecutionCacheRequest.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    if (message.workflowExecutionId != null && message.hasOwnProperty("workflowExecutionId")) {
-                        var error = $root.flyteidl.core.WorkflowExecutionIdentifier.verify(message.workflowExecutionId);
-                        if (error)
-                            return "workflowExecutionId." + error;
-                    }
-                    return null;
-                };
-    
-                return EvictExecutionCacheRequest;
-            })();
-    
             service.EvictTaskExecutionCacheRequest = (function() {
     
                 /**
@@ -50757,39 +50645,6 @@
                     return new this(rpcImpl, requestDelimited, responseDelimited);
                 };
     
-                /**
-                 * Callback as used by {@link flyteidl.service.CacheService#evictExecutionCache}.
-                 * @memberof flyteidl.service.CacheService
-                 * @typedef EvictExecutionCacheCallback
-                 * @type {function}
-                 * @param {Error|null} error Error, if any
-                 * @param {flyteidl.service.EvictCacheResponse} [response] EvictCacheResponse
-                 */
-    
-                /**
-                 * Calls EvictExecutionCache.
-                 * @function evictExecutionCache
-                 * @memberof flyteidl.service.CacheService
-                 * @instance
-                 * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object
-                 * @param {flyteidl.service.CacheService.EvictExecutionCacheCallback} callback Node-style callback called with the error, if any, and EvictCacheResponse
-                 * @returns {undefined}
-                 * @variation 1
-                 */
-                Object.defineProperty(CacheService.prototype.evictExecutionCache = function evictExecutionCache(request, callback) {
-                    return this.rpcCall(evictExecutionCache, $root.flyteidl.service.EvictExecutionCacheRequest, $root.flyteidl.service.EvictCacheResponse, request, callback);
-                }, "name", { value: "EvictExecutionCache" });
-    
-                /**
-                 * Calls EvictExecutionCache.
-                 * @function evictExecutionCache
-                 * @memberof flyteidl.service.CacheService
-                 * @instance
-                 * @param {flyteidl.service.IEvictExecutionCacheRequest} request EvictExecutionCacheRequest message or plain object
-                 * @returns {Promise} Promise
-                 * @variation 2
-                 */
-    
                 /**
                  * Callback as used by {@link flyteidl.service.CacheService#evictTaskExecutionCache}.
                  * @memberof flyteidl.service.CacheService
diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py
index 0c634af667..47d1b3399a 100644
--- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.py
@@ -16,7 +16,7 @@
 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"|\n\x1a\x45victExecutionCacheRequest\x12^\n\x15workflow_execution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x13workflowExecutionId\"t\n\x1e\x45victTaskExecutionCacheRequest\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\x9f\x06\n\x0c\x43\x61\x63heService\x12\xe7\x01\n\x13\x45victExecutionCache\x12,.flyteidl.service.EvictExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"|\x82\xd3\xe4\x93\x02v*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}\x12\xa4\x04\n\x17\x45victTaskExecutionCache\x12\x30.flyteidl.service.EvictTaskExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xb0\x03\x82\xd3\xe4\x93\x02\xa9\x03*\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}B\xc2\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/cache.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/core/errors.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"t\n\x1e\x45victTaskExecutionCacheRequest\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\"S\n\x12\x45victCacheResponse\x12=\n\x06\x65rrors\x18\x01 \x01(\x0b\x32%.flyteidl.core.CacheEvictionErrorListR\x06\x65rrors2\xb5\x04\n\x0c\x43\x61\x63heService\x12\xa4\x04\n\x17\x45victTaskExecutionCache\x12\x30.flyteidl.service.EvictTaskExecutionCacheRequest\x1a$.flyteidl.service.EvictCacheResponse\"\xb0\x03\x82\xd3\xe4\x93\x02\xa9\x03*\xa6\x03/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}B\xc2\x01\n\x14\x63om.flyteidl.serviceB\nCacheProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -25,16 +25,12 @@
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nCacheProtoP\001Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service'
-  _CACHESERVICE.methods_by_name['EvictExecutionCache']._options = None
-  _CACHESERVICE.methods_by_name['EvictExecutionCache']._serialized_options = b'\202\323\344\223\002v*t/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}'
   _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._options = None
   _CACHESERVICE.methods_by_name['EvictTaskExecutionCache']._serialized_options = b'\202\323\344\223\002\251\003*\246\003/api/v1/cache/task_executions/{task_execution_id.node_execution_id.execution_id.project}/{task_execution_id.node_execution_id.execution_id.domain}/{task_execution_id.node_execution_id.execution_id.name}/{task_execution_id.node_execution_id.node_id}/{task_execution_id.task_id.project}/{task_execution_id.task_id.domain}/{task_execution_id.task_id.name}/{task_execution_id.task_id.version}/{task_execution_id.retry_attempt}'
-  _globals['_EVICTEXECUTIONCACHEREQUEST']._serialized_start=140
-  _globals['_EVICTEXECUTIONCACHEREQUEST']._serialized_end=264
-  _globals['_EVICTTASKEXECUTIONCACHEREQUEST']._serialized_start=266
-  _globals['_EVICTTASKEXECUTIONCACHEREQUEST']._serialized_end=382
-  _globals['_EVICTCACHERESPONSE']._serialized_start=384
-  _globals['_EVICTCACHERESPONSE']._serialized_end=467
-  _globals['_CACHESERVICE']._serialized_start=470
-  _globals['_CACHESERVICE']._serialized_end=1269
+  _globals['_EVICTTASKEXECUTIONCACHEREQUEST']._serialized_start=140
+  _globals['_EVICTTASKEXECUTIONCACHEREQUEST']._serialized_end=256
+  _globals['_EVICTCACHERESPONSE']._serialized_start=258
+  _globals['_EVICTCACHERESPONSE']._serialized_end=341
+  _globals['_CACHESERVICE']._serialized_start=344
+  _globals['_CACHESERVICE']._serialized_end=909
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi
index 8a83a33c58..26472fa38d 100644
--- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2.pyi
@@ -7,12 +7,6 @@ from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Opti
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class EvictExecutionCacheRequest(_message.Message):
-    __slots__ = ["workflow_execution_id"]
-    WORKFLOW_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
-    workflow_execution_id: _identifier_pb2.WorkflowExecutionIdentifier
-    def __init__(self, workflow_execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ...) -> None: ...
-
 class EvictTaskExecutionCacheRequest(_message.Message):
     __slots__ = ["task_execution_id"]
     TASK_EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
diff --git a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py
index 80b802f242..86c189a675 100644
--- a/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py
+++ b/flyteidl/gen/pb_python/flyteidl/service/cache_pb2_grpc.py
@@ -15,11 +15,6 @@ def __init__(self, channel):
         Args:
             channel: A grpc.Channel.
         """
-        self.EvictExecutionCache = channel.unary_unary(
-                '/flyteidl.service.CacheService/EvictExecutionCache',
-                request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString,
-                response_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString,
-                )
         self.EvictTaskExecutionCache = channel.unary_unary(
                 '/flyteidl.service.CacheService/EvictTaskExecutionCache',
                 request_serializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.SerializeToString,
@@ -31,13 +26,6 @@ class CacheServiceServicer(object):
     """CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis.
     """
 
-    def EvictExecutionCache(self, request, context):
-        """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def EvictTaskExecutionCache(self, request, context):
         """Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.
         """
@@ -48,11 +36,6 @@ def EvictTaskExecutionCache(self, request, context):
 
 def add_CacheServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
-            'EvictExecutionCache': grpc.unary_unary_rpc_method_handler(
-                    servicer.EvictExecutionCache,
-                    request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.FromString,
-                    response_serializer=flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.SerializeToString,
-            ),
             'EvictTaskExecutionCache': grpc.unary_unary_rpc_method_handler(
                     servicer.EvictTaskExecutionCache,
                     request_deserializer=flyteidl_dot_service_dot_cache__pb2.EvictTaskExecutionCacheRequest.FromString,
@@ -69,23 +52,6 @@ class CacheService(object):
     """CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis.
     """
 
-    @staticmethod
-    def EvictExecutionCache(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flyteidl.service.CacheService/EvictExecutionCache',
-            flyteidl_dot_service_dot_cache__pb2.EvictExecutionCacheRequest.SerializeToString,
-            flyteidl_dot_service_dot_cache__pb2.EvictCacheResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
     @staticmethod
     def EvictTaskExecutionCache(request,
             target,
diff --git a/flyteidl/gen/pb_rust/flyteidl.service.rs b/flyteidl/gen/pb_rust/flyteidl.service.rs
index c981229bc9..258315fb9a 100644
--- a/flyteidl/gen/pb_rust/flyteidl.service.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.service.rs
@@ -75,13 +75,6 @@ pub struct PublicClientAuthConfigResponse {
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct EvictExecutionCacheRequest {
-    /// Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-    #[prost(message, optional, tag="1")]
-    pub workflow_execution_id: ::core::option::Option,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EvictTaskExecutionCacheRequest {
     /// Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
     #[prost(message, optional, tag="1")]
diff --git a/flyteidl/protos/flyteidl/service/cache.proto b/flyteidl/protos/flyteidl/service/cache.proto
index 2e22c4416e..605a34d772 100644
--- a/flyteidl/protos/flyteidl/service/cache.proto
+++ b/flyteidl/protos/flyteidl/service/cache.proto
@@ -9,10 +9,6 @@ import "google/api/annotations.proto";
 import "flyteidl/core/errors.proto";
 import "flyteidl/core/identifier.proto";
 
-message EvictExecutionCacheRequest {
-  // Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for.
-  core.WorkflowExecutionIdentifier workflow_execution_id = 1;
-}
 
 message EvictTaskExecutionCacheRequest {
   // Identifier of :ref:`ref_flyteidl.admin.TaskExecution` to evict cache for.
@@ -26,15 +22,6 @@ message EvictCacheResponse {
 
 // CacheService defines an RPC Service for interacting with cached data in Flyte on a high level basis.
 service CacheService {
-  // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`.
-  rpc EvictExecutionCache (EvictExecutionCacheRequest) returns (EvictCacheResponse) {
-    option (google.api.http) = {
-      delete: "/api/v1/cache/executions/{workflow_execution_id.project}/{workflow_execution_id.domain}/{workflow_execution_id.name}"
-    };
-    // option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = {
-    //   description: "Evicts all cached data for the referenced (workflow) execution."
-    // };
-  }
 
   // Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`.
   rpc EvictTaskExecutionCache (EvictTaskExecutionCacheRequest) returns (EvictCacheResponse) {

From 7c93bb66bc7ededf61c25f588ab0d346c7c290a7 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Sat, 6 Jan 2024 23:10:52 -0800
Subject: [PATCH 33/57] update idl service docs

Signed-off-by: Paul Dittamo 
---
 flyteidl/generate_protos.sh              |   2 +-
 flyteidl/protos/docs/service/service.rst | 348 +++++++++++++++++++++--
 2 files changed, 324 insertions(+), 26 deletions(-)

diff --git a/flyteidl/generate_protos.sh b/flyteidl/generate_protos.sh
index 7955536737..09eb8cd230 100755
--- a/flyteidl/generate_protos.sh
+++ b/flyteidl/generate_protos.sh
@@ -67,7 +67,7 @@ find gen/pb_python -type d -exec touch {}/__init__.py \;
 # # Remove any currently generated service docs file
 # ls -d protos/docs/service/* | grep -v index.rst | xargs rm
 # # Use list of proto files in service directory to generate the RST files required for sphinx conversion
-# docker run --rm -u $(id -u):$(id -g) -v $DIR/protos:/protos:ro -v $DIR/protos/docs/service:/out:rw -v $DIR/tmp/doc_gen_deps:/tmp/doc_gen_deps:ro $PROTOC_GEN_DOC_IMAGE --doc_opt=protos/docs/withoutscalar_restructuredtext.tmpl,service.rst -I=protos -I=tmp/doc_gen_deps `ls protos/flyteidl/service/*.proto | xargs`
+docker run --rm -u $(id -u):$(id -g) -v $DIR/protos:/protos:ro -v $DIR/protos/docs/service:/out:rw -v $DIR/tmp/doc_gen_deps:/tmp/doc_gen_deps:ro $PROTOC_GEN_DOC_IMAGE --doc_opt=protos/docs/withoutscalar_restructuredtext.tmpl,service.rst -I=protos -I=tmp/doc_gen_deps `ls protos/flyteidl/service/*.proto | xargs`
 
 # Generate binary data from OpenAPI 2 file
 docker run --rm -u $(id -u):$(id -g) -v $DIR/gen/pb-go/flyteidl/service:/service --entrypoint go-bindata $LYFT_IMAGE -pkg service -o /service/openapi.go -prefix /service/ -modtime 1562572800 /service/admin.swagger.json
diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst
index d512bf5815..b14e733c6b 100644
--- a/flyteidl/protos/docs/service/service.rst
+++ b/flyteidl/protos/docs/service/service.rst
@@ -90,6 +90,65 @@ Standard response codes for both are defined here: https://github.com/grpc-ecosy
    "GetVersion", ":ref:`ref_flyteidl.admin.GetVersionRequest`", ":ref:`ref_flyteidl.admin.GetVersionResponse`", ""
    "GetDescriptionEntity", ":ref:`ref_flyteidl.admin.ObjectGetRequest`", ":ref:`ref_flyteidl.admin.DescriptionEntity`", "Fetch a :ref:`ref_flyteidl.admin.DescriptionEntity` object."
    "ListDescriptionEntities", ":ref:`ref_flyteidl.admin.DescriptionEntityListRequest`", ":ref:`ref_flyteidl.admin.DescriptionEntityList`", "Fetch a list of :ref:`ref_flyteidl.admin.DescriptionEntity` definitions."
+   "GetExecutionMetrics", ":ref:`ref_flyteidl.admin.WorkflowExecutionGetMetricsRequest`", ":ref:`ref_flyteidl.admin.WorkflowExecutionGetMetricsResponse`", "Fetches runtime metrics for a :ref:`ref_flyteidl.admin.Execution`."
+
+..
+   end services
+
+
+
+
+.. _ref_flyteidl/service/agent.proto:
+
+flyteidl/service/agent.proto
+==================================================================
+
+
+
+
+..
+   end messages
+
+
+..
+   end enums
+
+
+..
+   end HasExtensions
+
+
+
+.. _ref_flyteidl.service.AgentMetadataService:
+
+AgentMetadataService
+------------------------------------------------------------------
+
+AgentMetadataService defines an RPC service that is also served over HTTP via grpc-gateway.
+This service allows propeller or users to get the metadata of agents.
+
+.. csv-table:: AgentMetadataService service methods
+   :header: "Method Name", "Request Type", "Response Type", "Description"
+   :widths: auto
+
+   "GetAgent", ":ref:`ref_flyteidl.admin.GetAgentRequest`", ":ref:`ref_flyteidl.admin.GetAgentResponse`", "Fetch a :ref:`ref_flyteidl.admin.Agent` definition."
+   "ListAgents", ":ref:`ref_flyteidl.admin.ListAgentsRequest`", ":ref:`ref_flyteidl.admin.ListAgentsResponse`", "Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions."
+
+
+.. _ref_flyteidl.service.AsyncAgentService:
+
+AsyncAgentService
+------------------------------------------------------------------
+
+AsyncAgentService defines an RPC Service that allows propeller to send the request to the agent server.
+
+.. csv-table:: AsyncAgentService service methods
+   :header: "Method Name", "Request Type", "Response Type", "Description"
+   :widths: auto
+
+   "CreateTask", ":ref:`ref_flyteidl.admin.CreateTaskRequest`", ":ref:`ref_flyteidl.admin.CreateTaskResponse`", "Send a task create request to the agent server."
+   "GetTask", ":ref:`ref_flyteidl.admin.GetTaskRequest`", ":ref:`ref_flyteidl.admin.GetTaskResponse`", "Get job status."
+   "DeleteTask", ":ref:`ref_flyteidl.admin.DeleteTaskRequest`", ":ref:`ref_flyteidl.admin.DeleteTaskResponse`", "Delete the task resource."
 
 ..
    end services
@@ -255,27 +314,6 @@ EvictCacheResponse
 
 
 
-.. _ref_flyteidl.service.EvictExecutionCacheRequest:
-
-EvictExecutionCacheRequest
-------------------------------------------------------------------
-
-
-
-
-
-.. csv-table:: EvictExecutionCacheRequest type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "workflow_execution_id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for."
-
-
-
-
-
-
-
 .. _ref_flyteidl.service.EvictTaskExecutionCacheRequest:
 
 EvictTaskExecutionCacheRequest
@@ -320,7 +358,6 @@ CacheService defines an RPC Service for interacting with cached data in Flyte on
    :header: "Method Name", "Request Type", "Response Type", "Description"
    :widths: auto
 
-   "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`."
    "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictTaskExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`."
 
 ..
@@ -374,8 +411,9 @@ CreateDownloadLinkResponse defines the response for the generated links
    :header: "Field", "Type", "Label", "Description"
    :widths: auto
 
-   "signed_url", ":ref:`ref_string`", "repeated", "SignedUrl specifies the url to use to download content from (e.g. https://my-bucket.s3.amazonaws.com/randomstring/suffix.tar?X-...)"
-   "expires_at", ":ref:`ref_google.protobuf.Timestamp`", "", "ExpiresAt defines when will the signed URL expire."
+   "signed_url", ":ref:`ref_string`", "repeated", "**Deprecated.** SignedUrl specifies the url to use to download content from (e.g. https://my-bucket.s3.amazonaws.com/randomstring/suffix.tar?X-...)"
+   "expires_at", ":ref:`ref_google.protobuf.Timestamp`", "", "**Deprecated.** ExpiresAt defines when will the signed URL expire."
+   "pre_signed_urls", ":ref:`ref_flyteidl.service.PreSignedURLs`", "", "New wrapper object containing the signed urls and expiration time"
 
 
 
@@ -433,6 +471,10 @@ CreateUploadLocationRequest
 ------------------------------------------------------------------
 
 CreateUploadLocationRequest specified request for the CreateUploadLocation API.
+The implementation in data proxy service will create the s3 location with some server side configured prefixes,
+and then:
+  - project/domain/(a deterministic str representation of the content_md5)/filename (if present); OR
+  - project/domain/filename_root (if present)/filename (if present).
 
 
 
@@ -445,6 +487,7 @@ CreateUploadLocationRequest specified request for the CreateUploadLocation API.
    "filename", ":ref:`ref_string`", "", "Filename specifies a desired suffix for the generated location. E.g. `file.py` or `pre/fix/file.zip`. +optional. By default, the service will generate a consistent name based on the provided parameters."
    "expires_in", ":ref:`ref_google.protobuf.Duration`", "", "ExpiresIn defines a requested expiration duration for the generated url. The request will be rejected if this exceeds the platform allowed max. +optional. The default value comes from a global config."
    "content_md5", ":ref:`ref_bytes`", "", "ContentMD5 restricts the upload location to the specific MD5 provided. The ContentMD5 will also appear in the generated path. +required"
+   "filename_root", ":ref:`ref_string`", "", "If present, data proxy will use this string in lieu of the md5 hash in the path. When the filename is also included this makes the upload location deterministic. The native url will still be prefixed by the upload location prefix in data proxy config. This option is useful when uploading multiple files. +optional"
 
 
 
@@ -474,6 +517,72 @@ CreateUploadLocationResponse
 
 
 
+
+.. _ref_flyteidl.service.GetDataRequest:
+
+GetDataRequest
+------------------------------------------------------------------
+
+General request artifact to retrieve data from a Flyte artifact url.
+
+
+
+.. csv-table:: GetDataRequest type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "flyte_url", ":ref:`ref_string`", "", "A unique identifier in the form of flyte:// that uniquely, for a given Flyte backend, identifies a Flyte artifact ([i]nput, [o]output, flyte [d]eck, etc.). e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) flyte://v1/proj/development/execid/n2/i (for node execution input) flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node)"
+
+
+
+
+
+
+
+.. _ref_flyteidl.service.GetDataResponse:
+
+GetDataResponse
+------------------------------------------------------------------
+
+
+
+
+
+.. csv-table:: GetDataResponse type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "literal_map", ":ref:`ref_flyteidl.core.LiteralMap`", "", "literal map data will be returned"
+   "pre_signed_urls", ":ref:`ref_flyteidl.service.PreSignedURLs`", "", "Flyte deck html will be returned as a signed url users can download"
+   "literal", ":ref:`ref_flyteidl.core.Literal`", "", "Single literal will be returned. This is returned when the user/url requests a specific output or input by name. See the o3 example above."
+
+
+
+
+
+
+
+.. _ref_flyteidl.service.PreSignedURLs:
+
+PreSignedURLs
+------------------------------------------------------------------
+
+Wrapper object since the message is shared across this and the GetDataResponse
+
+
+
+.. csv-table:: PreSignedURLs type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "signed_url", ":ref:`ref_string`", "repeated", "SignedUrl specifies the url to use to download content from (e.g. https://my-bucket.s3.amazonaws.com/randomstring/suffix.tar?X-...)"
+   "expires_at", ":ref:`ref_google.protobuf.Timestamp`", "", "ExpiresAt defines when will the signed URL expire."
+
+
+
+
+
+
 ..
    end messages
 
@@ -517,6 +626,192 @@ DataProxyService defines an RPC Service that allows access to user-data in a con
    "CreateUploadLocation", ":ref:`ref_flyteidl.service.CreateUploadLocationRequest`", ":ref:`ref_flyteidl.service.CreateUploadLocationResponse`", "CreateUploadLocation creates a signed url to upload artifacts to for a given project/domain."
    "CreateDownloadLocation", ":ref:`ref_flyteidl.service.CreateDownloadLocationRequest`", ":ref:`ref_flyteidl.service.CreateDownloadLocationResponse`", "CreateDownloadLocation creates a signed url to download artifacts."
    "CreateDownloadLink", ":ref:`ref_flyteidl.service.CreateDownloadLinkRequest`", ":ref:`ref_flyteidl.service.CreateDownloadLinkResponse`", "CreateDownloadLocation creates a signed url to download artifacts."
+   "GetData", ":ref:`ref_flyteidl.service.GetDataRequest`", ":ref:`ref_flyteidl.service.GetDataResponse`", ""
+
+..
+   end services
+
+
+
+
+.. _ref_flyteidl/service/external_plugin_service.proto:
+
+flyteidl/service/external_plugin_service.proto
+==================================================================
+
+
+
+
+
+.. _ref_flyteidl.service.TaskCreateRequest:
+
+TaskCreateRequest
+------------------------------------------------------------------
+
+Represents a request structure to create task.
+
+
+
+.. csv-table:: TaskCreateRequest type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "inputs", ":ref:`ref_flyteidl.core.LiteralMap`", "", "The inputs required to start the execution. All required inputs must be included in this map. If not required and not provided, defaults apply. +optional"
+   "template", ":ref:`ref_flyteidl.core.TaskTemplate`", "", "Template of the task that encapsulates all the metadata of the task."
+   "output_prefix", ":ref:`ref_string`", "", "Prefix for where task output data will be written. (e.g. s3://my-bucket/randomstring)"
+
+
+
+
+
+
+
+.. _ref_flyteidl.service.TaskCreateResponse:
+
+TaskCreateResponse
+------------------------------------------------------------------
+
+Represents a create response structure.
+
+
+
+.. csv-table:: TaskCreateResponse type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "job_id", ":ref:`ref_string`", "", ""
+
+
+
+
+
+
+
+.. _ref_flyteidl.service.TaskDeleteRequest:
+
+TaskDeleteRequest
+------------------------------------------------------------------
+
+A message used to delete a task.
+
+
+
+.. csv-table:: TaskDeleteRequest type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "task_type", ":ref:`ref_string`", "", "A predefined yet extensible Task type identifier."
+   "job_id", ":ref:`ref_string`", "", "The unique id identifying the job."
+
+
+
+
+
+
+
+.. _ref_flyteidl.service.TaskDeleteResponse:
+
+TaskDeleteResponse
+------------------------------------------------------------------
+
+Response to delete a task.
+
+
+
+
+
+
+
+
+.. _ref_flyteidl.service.TaskGetRequest:
+
+TaskGetRequest
+------------------------------------------------------------------
+
+A message used to fetch a job state from backend plugin server.
+
+
+
+.. csv-table:: TaskGetRequest type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "task_type", ":ref:`ref_string`", "", "A predefined yet extensible Task type identifier."
+   "job_id", ":ref:`ref_string`", "", "The unique id identifying the job."
+
+
+
+
+
+
+
+.. _ref_flyteidl.service.TaskGetResponse:
+
+TaskGetResponse
+------------------------------------------------------------------
+
+Response to get an individual task state.
+
+
+
+.. csv-table:: TaskGetResponse type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "state", ":ref:`ref_flyteidl.service.State`", "", "The state of the execution is used to control its visibility in the UI/CLI."
+   "outputs", ":ref:`ref_flyteidl.core.LiteralMap`", "", "The outputs of the execution. It's typically used by sql task. Flyteplugins service will create a Structured dataset pointing to the query result table. +optional"
+
+
+
+
+
+
+..
+   end messages
+
+
+
+.. _ref_flyteidl.service.State:
+
+State
+------------------------------------------------------------------
+
+The state of the execution is used to control its visibility in the UI/CLI.
+
+.. csv-table:: Enum State values
+   :header: "Name", "Number", "Description"
+   :widths: auto
+
+   "RETRYABLE_FAILURE", "0", ""
+   "PERMANENT_FAILURE", "1", ""
+   "PENDING", "2", ""
+   "RUNNING", "3", ""
+   "SUCCEEDED", "4", ""
+
+
+..
+   end enums
+
+
+..
+   end HasExtensions
+
+
+
+.. _ref_flyteidl.service.ExternalPluginService:
+
+ExternalPluginService
+------------------------------------------------------------------
+
+ExternalPluginService defines an RPC Service that allows propeller to send the request to the backend plugin server.
+
+.. csv-table:: ExternalPluginService service methods
+   :header: "Method Name", "Request Type", "Response Type", "Description"
+   :widths: auto
+
+   "CreateTask", ":ref:`ref_flyteidl.service.TaskCreateRequest`", ":ref:`ref_flyteidl.service.TaskCreateResponse`", "Send a task create request to the backend plugin server."
+   "GetTask", ":ref:`ref_flyteidl.service.TaskGetRequest`", ":ref:`ref_flyteidl.service.TaskGetResponse`", "Get job status."
+   "DeleteTask", ":ref:`ref_flyteidl.service.TaskDeleteRequest`", ":ref:`ref_flyteidl.service.TaskDeleteResponse`", "Delete the task resource."
 
 ..
    end services
@@ -567,6 +862,7 @@ See the OpenID Connect spec at https://openid.net/specs/openid-connect-core-1_0.
    "family_name", ":ref:`ref_string`", "", "Surname(s) or last name(s)"
    "email", ":ref:`ref_string`", "", "Preferred e-mail address"
    "picture", ":ref:`ref_string`", "", "Profile picture URL"
+   "additional_claims", ":ref:`ref_google.protobuf.Struct`", "", "Additional claims"
 
 
 
@@ -637,7 +933,9 @@ SignalService defines an RPC Service that may create, update, and retrieve signa
    :header: "Method Name", "Request Type", "Response Type", "Description"
    :widths: auto
 
-   "GetOrCreateSignal", ":ref:`ref_flyteidl.admin.SignalGetOrCreateRequest`", ":ref:`ref_flyteidl.admin.Signal`", "Fetches or creates a :ref:`ref_flyteidl.admin.Signal`."
+   "GetOrCreateSignal", ":ref:`ref_flyteidl.admin.SignalGetOrCreateRequest`", ":ref:`ref_flyteidl.admin.Signal`", "Fetches or creates a :ref:`ref_flyteidl.admin.Signal`.
+
+Purposefully left out an HTTP API for this RPC call. This is meant to idempotently retrieve a signal, meaning the first call will create the signal and all subsequent calls will fetch the existing signal. This is only useful during Flyte Workflow execution and therefore is not exposed to mitigate unintended behavior. option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { description: "Retrieve a signal, creating it if it does not exist." };"
    "ListSignals", ":ref:`ref_flyteidl.admin.SignalListRequest`", ":ref:`ref_flyteidl.admin.SignalList`", "Fetch a list of :ref:`ref_flyteidl.admin.Signal` definitions."
    "SetSignal", ":ref:`ref_flyteidl.admin.SignalSetRequest`", ":ref:`ref_flyteidl.admin.SignalSetResponse`", "Sets the value on a :ref:`ref_flyteidl.admin.Signal` definition"
 

From 114a45e4061dd178d31de395052cdd7b0677469a Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Sun, 7 Jan 2024 20:13:15 -0800
Subject: [PATCH 34/57] only support cache eviction for single task

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/manager/impl/cache_manager.go  |  197 +--
 .../pkg/manager/impl/cache_manager_test.go    | 1138 +----------------
 flyteadmin/pkg/rpc/cacheservice/base.go       |    1 -
 3 files changed, 79 insertions(+), 1257 deletions(-)

diff --git a/flyteadmin/pkg/manager/impl/cache_manager.go b/flyteadmin/pkg/manager/impl/cache_manager.go
index a8334fb389..45d5705e68 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager.go
@@ -2,7 +2,6 @@ package impl
 
 import (
 	"context"
-	"strings"
 	"time"
 
 	"github.com/golang/protobuf/proto"
@@ -20,7 +19,6 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/catalog"
-	"github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
 	"github.com/flyteorg/flyte/flytestdlib/catalog/datacatalog"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
@@ -30,11 +28,7 @@ var (
 	_ interfaces.CacheInterface = &CacheManager{}
 )
 
-var sortByCreatedAtAsc = &admin.Sort{Key: shared.CreatedAt, Direction: admin.Sort_ASCENDING}
-
 const (
-	nodeExecutionLimit   = 10000
-	taskExecutionLimit   = 10000
 	reservationHeartbeat = 10 * time.Second
 )
 
@@ -59,39 +53,23 @@ func (m *CacheManager) EvictTaskExecutionCache(ctx context.Context, req service.
 	}
 
 	ctx = getTaskExecutionContext(ctx, req.TaskExecutionId)
+	var evictionErrors []*core.CacheEvictionError
 
-	// Sanity check to ensure referenced task execution exists although only encapsulated node execution is strictly required
-	_, err := util.GetTaskExecutionModel(ctx, m.db, req.TaskExecutionId)
+	taskExecutionModel, err := util.GetTaskExecutionModel(ctx, m.db, req.TaskExecutionId)
 	if err != nil {
 		logger.Debugf(ctx, "Failed to get task execution model for task execution ID %+v: %v", req.TaskExecutionId, err)
 		return nil, err
 	}
 
-	logger.Debugf(ctx, "Starting to evict cache for execution %+v of task %+v", req.TaskExecutionId, req.TaskExecutionId.TaskId)
-
 	nodeExecutionModel, err := util.GetNodeExecutionModel(ctx, m.db, req.TaskExecutionId.NodeExecutionId)
 	if err != nil {
 		logger.Debugf(ctx, "Failed to get node execution model for node execution ID %+v: %v", req.TaskExecutionId.NodeExecutionId, err)
 		return nil, err
 	}
 
-	evictionErrors := m.evictNodeExecutionCache(ctx, *nodeExecutionModel, nil)
-
-	logger.Debugf(ctx, "Finished evicting cache for execution %+v of task %+v", req.TaskExecutionId, req.TaskExecutionId.TaskId)
-	return &service.EvictCacheResponse{
-		Errors: &core.CacheEvictionErrorList{Errors: evictionErrors},
-	}, nil
-}
-
-func (m *CacheManager) evictNodeExecutionCache(ctx context.Context, nodeExecutionModel models.NodeExecution,
-	evictionErrors []*core.CacheEvictionError) []*core.CacheEvictionError {
-	if strings.HasSuffix(nodeExecutionModel.NodeID, v1alpha1.StartNodeID) || strings.HasSuffix(nodeExecutionModel.NodeID, v1alpha1.EndNodeID) {
-		return evictionErrors
-	}
-
-	nodeExecution, err := transformers.FromNodeExecutionModel(nodeExecutionModel, transformers.DefaultExecutionTransformerOptions)
+	nodeExecution, err := transformers.FromNodeExecutionModel(*nodeExecutionModel, transformers.DefaultExecutionTransformerOptions)
 	if err != nil {
-		logger.Warnf(ctx, "Failed to transform node execution model %+v: %v",
+		logger.Debugf(ctx, "Failed to transform node execution model %+v: %v",
 			nodeExecutionModel.NodeExecutionKey, err)
 		m.metrics.CacheEvictionFailures.Inc()
 		evictionErrors = append(evictionErrors, &core.CacheEvictionError{
@@ -106,83 +84,35 @@ func (m *CacheManager) evictNodeExecutionCache(ctx context.Context, nodeExecutio
 			Code:    core.CacheEvictionError_INTERNAL,
 			Message: "Internal error",
 		})
-		return evictionErrors
-	}
-
-	logger.Debugf(ctx, "Starting to evict cache for node execution %+v", nodeExecution.Id)
-	t := m.metrics.CacheEvictionTime.Start()
-	defer t.Stop()
-
-	if nodeExecution.Metadata.IsParentNode {
-		var childNodeExecutions []models.NodeExecution
-		if nodeExecution.Metadata.IsDynamic {
-			var err error
-			childNodeExecutions, err = m.listAllNodeExecutionsForWorkflow(ctx, nodeExecution.Id.ExecutionId, nodeExecution.Id.NodeId)
-			if err != nil {
-				logger.Warnf(ctx, "Failed to list child node executions for dynamic node execution %+v: %v",
-					nodeExecution.Id, err)
-				m.metrics.CacheEvictionFailures.Inc()
-				evictionErrors = append(evictionErrors, &core.CacheEvictionError{
-					NodeExecutionId: nodeExecution.Id,
-					Source: &core.CacheEvictionError_WorkflowExecutionId{
-						WorkflowExecutionId: nodeExecution.Id.ExecutionId,
-					},
-					Code:    core.CacheEvictionError_INTERNAL,
-					Message: "Failed to list child node executions",
-				})
-				return evictionErrors
-			}
-		} else {
-			childNodeExecutions = nodeExecutionModel.ChildNodeExecutions
-		}
-		for _, childNodeExecution := range childNodeExecutions {
-			evictionErrors = m.evictNodeExecutionCache(ctx, childNodeExecution, evictionErrors)
-		}
+		return &service.EvictCacheResponse{
+			Errors: &core.CacheEvictionErrorList{Errors: evictionErrors},
+		}, nil
 	}
 
-	taskExecutions, err := m.listAllTaskExecutions(ctx, nodeExecution.Id)
+	taskExecution, err := transformers.FromTaskExecutionModel(*taskExecutionModel, transformers.DefaultExecutionTransformerOptions)
 	if err != nil {
-		logger.Warnf(ctx, "Failed to list task executions for node execution %+v: %v",
-			nodeExecution.Id, err)
+		logger.Debugf(ctx, "Failed to transform task execution model %+v: %v",
+			taskExecutionModel.TaskExecutionKey, err)
 		m.metrics.CacheEvictionFailures.Inc()
 		evictionErrors = append(evictionErrors, &core.CacheEvictionError{
 			NodeExecutionId: nodeExecution.Id,
-			Source: &core.CacheEvictionError_WorkflowExecutionId{
-				WorkflowExecutionId: nodeExecution.Id.ExecutionId,
+			Source: &core.CacheEvictionError_TaskExecutionId{
+				TaskExecutionId: taskExecution.Id,
 			},
 			Code:    core.CacheEvictionError_INTERNAL,
-			Message: "Failed to list task executions",
+			Message: "Internal error",
 		})
-		return evictionErrors
+		return &service.EvictCacheResponse{
+			Errors: &core.CacheEvictionErrorList{Errors: evictionErrors},
+		}, nil
 	}
 
-	switch md := nodeExecution.GetClosure().GetTargetMetadata().(type) {
-	case *admin.NodeExecutionClosure_TaskNodeMetadata:
-		for _, taskExecutionModel := range taskExecutions {
-			taskExecution, err := transformers.FromTaskExecutionModel(taskExecutionModel, transformers.DefaultExecutionTransformerOptions)
-			if err != nil {
-				logger.Warnf(ctx, "Failed to transform task execution model %+v: %v",
-					taskExecutionModel.TaskExecutionKey, err)
-				m.metrics.CacheEvictionFailures.Inc()
-				evictionErrors = append(evictionErrors, &core.CacheEvictionError{
-					NodeExecutionId: nodeExecution.Id,
-					Source: &core.CacheEvictionError_TaskExecutionId{
-						TaskExecutionId: taskExecution.Id,
-					},
-					Code:    core.CacheEvictionError_INTERNAL,
-					Message: "Internal error",
-				})
-				return evictionErrors
-			}
+	logger.Debugf(ctx, "Starting to evict cache for execution %+v of task %+v", req.TaskExecutionId, req.TaskExecutionId.TaskId)
 
-			evictionErrors = m.evictTaskNodeExecutionCache(ctx, nodeExecutionModel, nodeExecution, taskExecution,
-				md.TaskNodeMetadata, evictionErrors)
-		}
-	case *admin.NodeExecutionClosure_WorkflowNodeMetadata:
-		evictionErrors = m.evictWorkflowNodeExecutionCache(ctx, nodeExecution, md.WorkflowNodeMetadata, evictionErrors)
-	default:
-		logger.Errorf(ctx, "Invalid target metadata type %T for node execution closure %+v for node execution %+v",
-			md, md, nodeExecution.Id)
+	metadata, ok := nodeExecution.GetClosure().GetTargetMetadata().(*admin.NodeExecutionClosure_TaskNodeMetadata)
+	if !ok {
+		logger.Debugf(ctx, "Node execution %+v did not contain task node metadata, skipping cache eviction",
+			nodeExecution.Id)
 		m.metrics.CacheEvictionFailures.Inc()
 		evictionErrors = append(evictionErrors, &core.CacheEvictionError{
 			NodeExecutionId: nodeExecution.Id,
@@ -192,9 +122,16 @@ func (m *CacheManager) evictNodeExecutionCache(ctx context.Context, nodeExecutio
 			Code:    core.CacheEvictionError_INTERNAL,
 			Message: "Internal error",
 		})
+		return &service.EvictCacheResponse{
+			Errors: &core.CacheEvictionErrorList{Errors: evictionErrors},
+		}, nil
 	}
 
-	return evictionErrors
+	evictionErrors = m.evictTaskNodeExecutionCache(ctx, *nodeExecutionModel, nodeExecution, taskExecution, metadata.TaskNodeMetadata, nil)
+	logger.Debugf(ctx, "Finished evicting cache for execution %+v of task %+v", req.TaskExecutionId, req.TaskExecutionId.TaskId)
+	return &service.EvictCacheResponse{
+		Errors: &core.CacheEvictionErrorList{Errors: evictionErrors},
+	}, nil
 }
 
 func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExecutionModel models.NodeExecution,
@@ -333,82 +270,6 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 	return evictionErrors
 }
 
-func (m *CacheManager) evictWorkflowNodeExecutionCache(ctx context.Context, nodeExecution *admin.NodeExecution,
-	workflowNodeMetadata *admin.WorkflowNodeMetadata, evictionErrors []*core.CacheEvictionError) []*core.CacheEvictionError {
-	if workflowNodeMetadata == nil {
-		logger.Debugf(ctx, "Node execution %+v did not contain cached data, skipping cache eviction",
-			nodeExecution.Id)
-		return evictionErrors
-	}
-
-	childNodeExecutions, err := m.listAllNodeExecutionsForWorkflow(ctx, workflowNodeMetadata.GetExecutionId(), "")
-	if err != nil {
-		logger.Debugf(ctx, "Failed to list child executions for node execution %+v of workflow %+v: %v",
-			nodeExecution.Id, workflowNodeMetadata.GetExecutionId(), err)
-		m.metrics.CacheEvictionFailures.Inc()
-		evictionErrors = append(evictionErrors, &core.CacheEvictionError{
-			NodeExecutionId: nodeExecution.Id,
-			Source: &core.CacheEvictionError_WorkflowExecutionId{
-				WorkflowExecutionId: workflowNodeMetadata.GetExecutionId(),
-			},
-			Code:    core.CacheEvictionError_INTERNAL,
-			Message: "Failed to evict child executions for workflow",
-		})
-		return evictionErrors
-	}
-	for _, childNodeExecution := range childNodeExecutions {
-		evictionErrors = m.evictNodeExecutionCache(ctx, childNodeExecution, evictionErrors)
-	}
-
-	logger.Debugf(ctx, "Successfully evicted cache for workflow node execution %+v", nodeExecution.Id)
-	m.metrics.CacheEvictionSuccess.Inc()
-
-	return evictionErrors
-}
-
-func (m *CacheManager) listAllNodeExecutionsForWorkflow(ctx context.Context,
-	workflowExecutionID *core.WorkflowExecutionIdentifier, uniqueParentID string) ([]models.NodeExecution, error) {
-	var nodeExecutions []models.NodeExecution
-	var token string
-	for {
-		executions, newToken, err := util.ListNodeExecutionsForWorkflow(ctx, m.db, workflowExecutionID,
-			uniqueParentID, "", nodeExecutionLimit, token, sortByCreatedAtAsc)
-		if err != nil {
-			return nil, err
-		}
-
-		nodeExecutions = append(nodeExecutions, executions...)
-		if len(newToken) == 0 {
-			// empty token is returned once no more node executions are available
-			break
-		}
-		token = newToken
-	}
-
-	return nodeExecutions, nil
-}
-
-func (m *CacheManager) listAllTaskExecutions(ctx context.Context, nodeExecutionID *core.NodeExecutionIdentifier) ([]models.TaskExecution, error) {
-	var taskExecutions []models.TaskExecution
-	var token string
-	for {
-		executions, newToken, err := util.ListTaskExecutions(ctx, m.db, nodeExecutionID, "",
-			taskExecutionLimit, token, sortByCreatedAtAsc)
-		if err != nil {
-			return nil, err
-		}
-
-		taskExecutions = append(taskExecutions, executions...)
-		if len(newToken) == 0 {
-			// empty token is returned once no more task executions are available
-			break
-		}
-		token = newToken
-	}
-
-	return taskExecutions, nil
-}
-
 func NewCacheManager(db repoInterfaces.Repository, config runtimeInterfaces.Configuration, catalogClient catalog.Client,
 	scope promutils.Scope) interfaces.CacheInterface {
 	metrics := cacheMetrics{
diff --git a/flyteadmin/pkg/manager/impl/cache_manager_test.go b/flyteadmin/pkg/manager/impl/cache_manager_test.go
index f580b43f27..dad2d2da93 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager_test.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager_test.go
@@ -52,17 +52,8 @@ func ptr[T any](val T) *T {
 	return &val
 }
 
-func setupCacheEvictionMockRepositories(t *testing.T, repository interfaces.Repository, executionModel *models.Execution,
-	nodeExecutionModels []models.NodeExecution, taskExecutionModels map[string][]models.TaskExecution) map[string]int {
-	if executionModel != nil {
-		repository.ExecutionRepo().(*repositoryMocks.MockExecutionRepo).SetGetCallback(
-			func(ctx context.Context, input interfaces.Identifier) (models.Execution, error) {
-				assert.Equal(t, executionIdentifier.Domain, input.Domain)
-				assert.Equal(t, executionIdentifier.Name, input.Name)
-				assert.Equal(t, executionIdentifier.Project, input.Project)
-				return *executionModel, nil
-			})
-	}
+func setupCacheEvictionMockRepositories(t *testing.T, repository interfaces.Repository, nodeExecutionModels []models.NodeExecution,
+	taskExecutionModels map[string][]models.TaskExecution) map[string]int {
 
 	repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetGetCallback(
 		func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) {
@@ -265,8 +256,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 			},
 		}
 
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
+		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
@@ -386,8 +376,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 			},
 		}
 
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
+		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
 		request := service.EvictTaskExecutionCacheRequest{
@@ -583,8 +572,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 			},
 		}
 
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
+		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
 		request := service.EvictTaskExecutionCacheRequest{
@@ -611,7 +599,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 		assert.Empty(t, updatedNodeExecutions)
 	})
 
-	t.Run("subtask with partially cached results", func(t *testing.T) {
+	t.Run("idempotency", func(t *testing.T) {
 		repository := repositoryMocks.NewMockRepository()
 		catalogClient := &mocks.Client{}
 		mockConfig := getMockExecutionsConfigProvider()
@@ -621,14 +609,6 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
 				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
 			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYO",
-			},
 		}
 
 		nodeExecutionModels := []models.NodeExecution{
@@ -646,7 +626,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 				},
 				Phase: core.NodeExecution_SUCCEEDED.String(),
 				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
+					IsParentNode: false,
 					IsDynamic:    false,
 					SpecNodeId:   "n0",
 				}),
@@ -667,176 +647,6 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 						},
 					},
 				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[1],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 4,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n1",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n1",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_DISABLED,
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 5,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n2",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n2",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[2],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn2",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 6,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				},
 			},
 		}
 
@@ -846,96 +656,6 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 					BaseModel: models.BaseModel{
 						ID: 1,
 					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache_single_task",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n1-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
 					TaskExecutionKey: models.TaskExecutionKey{
 						TaskKey: models.TaskKey{
 							Project: executionIdentifier.Project,
@@ -949,22 +669,21 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 								Domain:  executionIdentifier.Domain,
 								Name:    executionIdentifier.Name,
 							},
-							NodeID: "n0-0-n2",
+							NodeID: "n0",
 						},
 						RetryAttempt: ptr[uint32](0),
 					},
 					Phase: core.NodeExecution_SUCCEEDED.String(),
 					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
 						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n2-0",
+							GeneratedName: "name-n0-0",
 						},
 					}),
 				},
 			},
 		}
 
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
+		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
@@ -989,10 +708,10 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 		require.NotNil(t, resp)
 		assert.Empty(t, resp.GetErrors().GetErrors())
 
-		assert.Contains(t, updatedNodeExecutions, "n0")
-		assert.Contains(t, updatedNodeExecutions, "n0-0-n0")
-		assert.Contains(t, updatedNodeExecutions, "n0-0-n2")
-		assert.Len(t, updatedNodeExecutions, 3)
+		for nodeID := range taskExecutionModels {
+			assert.Contains(t, updatedNodeExecutions, nodeID)
+		}
+		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
 
 		for _, artifactTag := range artifactTags {
 			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
@@ -1000,7 +719,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 		assert.Len(t, deletedArtifactIDs, len(artifactTags))
 	})
 
-	t.Run("idempotency", func(t *testing.T) {
+	t.Run("reserved artifact", func(t *testing.T) {
 		repository := repositoryMocks.NewMockRepository()
 		catalogClient := &mocks.Client{}
 		mockConfig := getMockExecutionsConfigProvider()
@@ -1084,9 +803,10 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 			},
 		}
 
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
+		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
+
+		catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, mock.Anything,
+			mock.Anything, mock.Anything).Return(&datacatalog.Reservation{OwnerId: "otherOwnerID"}, nil)
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
 		request := service.EvictTaskExecutionCacheRequest{
@@ -1108,20 +828,18 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 		resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request)
 		require.NoError(t, err)
 		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
+		assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
+		eErr := resp.GetErrors().GetErrors()[0]
+		assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code)
+		assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
+		assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
+		require.NotNil(t, eErr.Source)
+		assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
 
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
+		assert.Empty(t, updatedNodeExecutions)
 	})
 
-	t.Run("reserved artifact", func(t *testing.T) {
+	t.Run("unknown artifact", func(t *testing.T) {
 		repository := repositoryMocks.NewMockRepository()
 		catalogClient := &mocks.Client{}
 		mockConfig := getMockExecutionsConfigProvider()
@@ -1205,145 +923,23 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 			},
 		}
 
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
+		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
-		catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, mock.Anything,
-			mock.Anything, mock.Anything).Return(&datacatalog.Reservation{OwnerId: "otherOwnerID"}, nil)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictTaskExecutionCacheRequest{
-			TaskExecutionId: &core.TaskExecutionIdentifier{
-				TaskId: &core.Identifier{
-					ResourceType: core.ResourceType_TASK,
-					Project:      executionIdentifier.Project,
-					Domain:       executionIdentifier.Domain,
-					Name:         executionIdentifier.Name,
-					Version:      version,
-				},
-				NodeExecutionId: &core.NodeExecutionIdentifier{
-					ExecutionId: &executionIdentifier,
-					NodeId:      "n0",
-				},
-				RetryAttempt: uint32(0),
-			},
-		}
-		resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-		eErr := resp.GetErrors().GetErrors()[0]
-		assert.Equal(t, core.CacheEvictionError_RESERVATION_NOT_ACQUIRED, eErr.Code)
-		assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-		assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-		require.NotNil(t, eErr.Source)
-		assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
-
-		assert.Empty(t, updatedNodeExecutions)
-	})
-
-	t.Run("unknown artifact", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: false,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
-
-		for nodeID := range taskExecutionModels {
-			for _, taskExecution := range taskExecutionModels[nodeID] {
-				require.NotNil(t, taskExecution.RetryAttempt)
-				ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt)
-				for _, artifactTag := range artifactTags {
-					catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
-						artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil)
-					catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
-						artifactTag.GetName(), ownerID).Return(nil)
-				}
-			}
-		}
-
-		catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything).
-			Return(status.Error(codes.NotFound, "not found"))
+		for nodeID := range taskExecutionModels {
+			for _, taskExecution := range taskExecutionModels[nodeID] {
+				require.NotNil(t, taskExecution.RetryAttempt)
+				ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt)
+				for _, artifactTag := range artifactTags {
+					catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
+						artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil)
+					catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
+						artifactTag.GetName(), ownerID).Return(nil)
+				}
+			}
+		}
+
+		catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything).
+			Return(status.Error(codes.NotFound, "not found"))
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
 		request := service.EvictTaskExecutionCacheRequest{
@@ -1458,8 +1054,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 				},
 			}
 
-			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-				taskExecutionModels)
+			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 			catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
 				mock.Anything, mock.Anything, mock.Anything).Return(nil, status.Error(codes.Internal, "error"))
@@ -1579,8 +1174,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 				},
 			}
 
-			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-				taskExecutionModels)
+			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 			for nodeID := range taskExecutionModels {
 				for _, taskExecution := range taskExecutionModels[nodeID] {
@@ -1714,8 +1308,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 				},
 			}
 
-			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-				taskExecutionModels)
+			updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 			for nodeID := range taskExecutionModels {
 				for _, taskExecution := range taskExecutionModels[nodeID] {
@@ -1861,8 +1454,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 					},
 				}
 
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-					taskExecutionModels)
+				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 				repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetGetCallback(
 					func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) {
@@ -1980,8 +1572,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 					},
 				}
 
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-					taskExecutionModels)
+				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 				repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback(
 					func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
@@ -2024,129 +1615,6 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 		})
 
 		t.Run("TaskExecutionRepo", func(t *testing.T) {
-			t.Run("List", func(t *testing.T) {
-				repository := repositoryMocks.NewMockRepository()
-				catalogClient := &mocks.Client{}
-				mockConfig := getMockExecutionsConfigProvider()
-
-				artifactTags := []*core.CatalogArtifactTag{
-					{
-						ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-						Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-					},
-				}
-
-				nodeExecutionModels := []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 1,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_single_task",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[0],
-									},
-								},
-							},
-						}),
-					},
-				}
-
-				taskExecutionModels := map[string][]models.TaskExecution{
-					"n0": {
-						{
-							BaseModel: models.BaseModel{
-								ID: 1,
-							},
-							TaskExecutionKey: models.TaskExecutionKey{
-								TaskKey: models.TaskKey{
-									Project: executionIdentifier.Project,
-									Domain:  executionIdentifier.Domain,
-									Name:    "flyte_task-test.evict.execution_cache",
-									Version: "version",
-								},
-								NodeExecutionKey: models.NodeExecutionKey{
-									ExecutionKey: models.ExecutionKey{
-										Project: executionIdentifier.Project,
-										Domain:  executionIdentifier.Domain,
-										Name:    executionIdentifier.Name,
-									},
-									NodeID: "n0",
-								},
-								RetryAttempt: ptr[uint32](0),
-							},
-							Phase: core.NodeExecution_SUCCEEDED.String(),
-							Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-								Metadata: &event.TaskExecutionMetadata{
-									GeneratedName: "name-n0-0",
-								},
-							}),
-						},
-					},
-				}
-
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-					taskExecutionModels)
-
-				repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetListCallback(
-					func(ctx context.Context, input interfaces.ListResourceInput) (interfaces.TaskExecutionCollectionOutput, error) {
-						return interfaces.TaskExecutionCollectionOutput{}, flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error")
-					})
-
-				cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-				request := service.EvictTaskExecutionCacheRequest{
-					TaskExecutionId: &core.TaskExecutionIdentifier{
-						TaskId: &core.Identifier{
-							ResourceType: core.ResourceType_TASK,
-							Project:      executionIdentifier.Project,
-							Domain:       executionIdentifier.Domain,
-							Name:         executionIdentifier.Name,
-							Version:      version,
-						},
-						NodeExecutionId: &core.NodeExecutionIdentifier{
-							ExecutionId: &executionIdentifier,
-							NodeId:      "n0",
-						},
-						RetryAttempt: uint32(0),
-					},
-				}
-				resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request)
-				require.NoError(t, err)
-				require.NotNil(t, resp)
-				assert.Len(t, resp.GetErrors().GetErrors(), len(artifactTags))
-				eErr := resp.GetErrors().GetErrors()[0]
-				assert.Equal(t, core.CacheEvictionError_INTERNAL, eErr.Code)
-				assert.Equal(t, "n0", eErr.NodeExecutionId.NodeId)
-				assert.True(t, proto.Equal(&executionIdentifier, eErr.NodeExecutionId.ExecutionId))
-				require.NotNil(t, eErr.Source)
-				assert.IsType(t, &core.CacheEvictionError_WorkflowExecutionId{}, eErr.Source)
-
-				assert.Empty(t, updatedNodeExecutions)
-			})
-
 			t.Run("Get", func(t *testing.T) {
 				repository := repositoryMocks.NewMockRepository()
 				catalogClient := &mocks.Client{}
@@ -2231,8 +1699,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 					},
 				}
 
-				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-					taskExecutionModels)
+				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
 				repository.TaskExecutionRepo().(*repositoryMocks.MockTaskExecutionRepo).SetGetCallback(
 					func(ctx context.Context, input interfaces.GetTaskExecutionInput) (models.TaskExecution, error) {
@@ -2267,509 +1734,4 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 			})
 		})
 	})
-
-	t.Run("subtask with identical artifact tags", func(t *testing.T) {
-		repository := repositoryMocks.NewMockRepository()
-		catalogClient := &mocks.Client{}
-		mockConfig := getMockExecutionsConfigProvider()
-
-		artifactTags := []*core.CatalogArtifactTag{
-			{
-				ArtifactId: "0285ddb9-ddfb-4835-bc22-80e1bdf7f560",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYM",
-			},
-			{
-				ArtifactId: "4074be3e-7cee-4a7b-8c45-56577fa32f24",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "a8bd60d5-b2bb-4b06-a2ac-240d183a4ca8",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "8a47c342-ff71-481e-9c7b-0e6ecb57e742",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-			{
-				ArtifactId: "dafdef15-0aba-4f7c-a4aa-deba89568277",
-				Name:       "flyte_cached-G3ACyxqY0U3sEf99tLMta5vuLCOk7j9O7MStxubzxYN",
-			},
-		}
-
-		nodeExecutionModels := []models.NodeExecution{
-			{
-				BaseModel: models.BaseModel{
-					ID: 1,
-				},
-				NodeExecutionKey: models.NodeExecutionKey{
-					ExecutionKey: models.ExecutionKey{
-						Project: executionIdentifier.Project,
-						Domain:  executionIdentifier.Domain,
-						Name:    executionIdentifier.Name,
-					},
-					NodeID: "n0",
-				},
-				Phase: core.NodeExecution_SUCCEEDED.String(),
-				NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-					IsParentNode: true,
-					IsDynamic:    false,
-					SpecNodeId:   "n0",
-				}),
-				Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-					TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-						TaskNodeMetadata: &admin.TaskNodeMetadata{
-							CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-							CatalogKey: &core.CatalogMetadata{
-								DatasetId: &core.Identifier{
-									ResourceType: core.ResourceType_DATASET,
-									Project:      executionIdentifier.Project,
-									Domain:       executionIdentifier.Domain,
-									Name:         "flyte_task-test.evict.execution_cache_single_task",
-									Version:      "version",
-								},
-								ArtifactTag: artifactTags[0],
-							},
-						},
-					},
-				}),
-				ChildNodeExecutions: []models.NodeExecution{
-					{
-						BaseModel: models.BaseModel{
-							ID: 2,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-start-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "start-node",
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 3,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n0",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[1],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 4,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n1",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n1",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[2],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn0",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 5,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n2",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n2",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[3],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn2",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 6,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n3",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "n3",
-						}),
-						Closure: serializeNodeExecutionClosure(t, &admin.NodeExecutionClosure{
-							TargetMetadata: &admin.NodeExecutionClosure_TaskNodeMetadata{
-								TaskNodeMetadata: &admin.TaskNodeMetadata{
-									CacheStatus: core.CatalogCacheStatus_CACHE_POPULATED,
-									CatalogKey: &core.CatalogMetadata{
-										DatasetId: &core.Identifier{
-											ResourceType: core.ResourceType_DATASET,
-											Project:      executionIdentifier.Project,
-											Domain:       executionIdentifier.Domain,
-											Name:         "flyte_task-test.evict.execution_cache_sub",
-											Version:      "version",
-										},
-										ArtifactTag: artifactTags[4],
-										SourceExecution: &core.CatalogMetadata_SourceTaskExecution{
-											SourceTaskExecution: &core.TaskExecutionIdentifier{
-												TaskId: &core.Identifier{
-													ResourceType: core.ResourceType_TASK,
-													Project:      executionIdentifier.Project,
-													Domain:       executionIdentifier.Domain,
-													Name:         "flyte_task-test.evict.execution_cache",
-													Version:      "version",
-												},
-												NodeExecutionId: &core.NodeExecutionIdentifier{
-													NodeId:      "dn3",
-													ExecutionId: &executionIdentifier,
-												},
-												RetryAttempt: 0,
-											},
-										},
-									},
-								},
-							},
-						}),
-					},
-					{
-						BaseModel: models.BaseModel{
-							ID: 7,
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-end-node",
-						},
-						Phase: core.NodeExecution_SUCCEEDED.String(),
-						NodeExecutionMetadata: serializeNodeExecutionMetadata(t, &admin.NodeExecutionMetaData{
-							IsParentNode: false,
-							IsDynamic:    false,
-							SpecNodeId:   "end-node",
-						}),
-					},
-				},
-			},
-		}
-
-		taskExecutionModels := map[string][]models.TaskExecution{
-			"n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 1,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache_single_task",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n0": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n0",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n0-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n1": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 2,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n1",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n1-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n2": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 3,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n2",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n2-0",
-						},
-					}),
-				},
-			},
-			"n0-0-n3": {
-				{
-					BaseModel: models.BaseModel{
-						ID: 4,
-					},
-					TaskExecutionKey: models.TaskExecutionKey{
-						TaskKey: models.TaskKey{
-							Project: executionIdentifier.Project,
-							Domain:  executionIdentifier.Domain,
-							Name:    "flyte_task-test.evict.execution_cache",
-							Version: "version",
-						},
-						NodeExecutionKey: models.NodeExecutionKey{
-							ExecutionKey: models.ExecutionKey{
-								Project: executionIdentifier.Project,
-								Domain:  executionIdentifier.Domain,
-								Name:    executionIdentifier.Name,
-							},
-							NodeID: "n0-0-n3",
-						},
-						RetryAttempt: ptr[uint32](0),
-					},
-					Phase: core.NodeExecution_SUCCEEDED.String(),
-					Closure: serializeTaskExecutionClosure(t, &admin.TaskExecutionClosure{
-						Metadata: &event.TaskExecutionMetadata{
-							GeneratedName: "name-n0-0-n3-0",
-						},
-					}),
-				},
-			},
-		}
-
-		updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nil, nodeExecutionModels,
-			taskExecutionModels)
-		deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
-		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
-		request := service.EvictTaskExecutionCacheRequest{
-			TaskExecutionId: &core.TaskExecutionIdentifier{
-				TaskId: &core.Identifier{
-					ResourceType: core.ResourceType_TASK,
-					Project:      executionIdentifier.Project,
-					Domain:       executionIdentifier.Domain,
-					Name:         executionIdentifier.Name,
-					Version:      version,
-				},
-				NodeExecutionId: &core.NodeExecutionIdentifier{
-					ExecutionId: &executionIdentifier,
-					NodeId:      "n0",
-				},
-				RetryAttempt: uint32(0),
-			},
-		}
-		resp, err := cacheManager.EvictTaskExecutionCache(context.Background(), request)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		assert.Empty(t, resp.GetErrors().GetErrors())
-
-		for nodeID := range taskExecutionModels {
-			assert.Contains(t, updatedNodeExecutions, nodeID)
-		}
-		assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
-
-		for _, artifactTag := range artifactTags {
-			assert.Equal(t, 1, deletedArtifactIDs[artifactTag.GetArtifactId()])
-		}
-		assert.Len(t, deletedArtifactIDs, len(artifactTags))
-	})
 }
diff --git a/flyteadmin/pkg/rpc/cacheservice/base.go b/flyteadmin/pkg/rpc/cacheservice/base.go
index f94cfef0b5..18c3b88801 100644
--- a/flyteadmin/pkg/rpc/cacheservice/base.go
+++ b/flyteadmin/pkg/rpc/cacheservice/base.go
@@ -3,7 +3,6 @@ package cacheservice
 import (
 	"context"
 	"fmt"
-
 	"runtime/debug"
 
 	"github.com/golang/protobuf/proto"

From 2157d0dfb2db4f646a884faa1e712812b384d19d Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Mon, 8 Jan 2024 22:44:36 -0800
Subject: [PATCH 35/57] delete dataset along with artifact

Signed-off-by: Paul Dittamo 
---
 datacatalog/pkg/repositories/gormimpl/artifact.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/datacatalog/pkg/repositories/gormimpl/artifact.go b/datacatalog/pkg/repositories/gormimpl/artifact.go
index 7f8ee11784..9b578b55d6 100644
--- a/datacatalog/pkg/repositories/gormimpl/artifact.go
+++ b/datacatalog/pkg/repositories/gormimpl/artifact.go
@@ -213,6 +213,17 @@ func (h *artifactRepo) Delete(ctx context.Context, artifact models.Artifact) err
 		return h.errorTransformer.ToDataCatalogError(err)
 	}
 
+	if err := tx.Where(&models.Dataset{DatasetKey: models.DatasetKey{
+		Project: artifact.DatasetProject,
+		Domain:  artifact.DatasetDomain,
+		Name:    artifact.DatasetName,
+		Version: artifact.DatasetVersion,
+		UUID:    artifact.DatasetUUID,
+	}}).Delete(&models.Dataset{}).Error; err != nil {
+		tx.Rollback()
+		return h.errorTransformer.ToDataCatalogError(err)
+	}
+
 	// delete actual artifact from database
 	if res := tx.Delete(&artifact); res.Error != nil {
 		tx.Rollback()

From 5fa9c8fafb8e0662e076e289d7b4e1681ca1560a Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Mon, 8 Jan 2024 23:38:46 -0800
Subject: [PATCH 36/57] always attempt releasing reservation after it has been
 acquired

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/manager/impl/cache_manager.go  | 35 ++++++++++---------
 .../pkg/manager/impl/cache_manager_test.go    |  4 +++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/flyteadmin/pkg/manager/impl/cache_manager.go b/flyteadmin/pkg/manager/impl/cache_manager.go
index 45d5705e68..207c382ea9 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager.go
@@ -127,7 +127,7 @@ func (m *CacheManager) EvictTaskExecutionCache(ctx context.Context, req service.
 		}, nil
 	}
 
-	evictionErrors = m.evictTaskNodeExecutionCache(ctx, *nodeExecutionModel, nodeExecution, taskExecution, metadata.TaskNodeMetadata, nil)
+	evictionErrors = m.evictTaskNodeExecutionCache(ctx, *nodeExecutionModel, nodeExecution, taskExecution, metadata.TaskNodeMetadata, evictionErrors)
 	logger.Debugf(ctx, "Finished evicting cache for execution %+v of task %+v", req.TaskExecutionId, req.TaskExecutionId.TaskId)
 	return &service.EvictCacheResponse{
 		Errors: &core.CacheEvictionErrorList{Errors: evictionErrors},
@@ -136,7 +136,8 @@ func (m *CacheManager) EvictTaskExecutionCache(ctx context.Context, req service.
 
 func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExecutionModel models.NodeExecution,
 	nodeExecution *admin.NodeExecution, taskExecution *admin.TaskExecution,
-	taskNodeMetadata *admin.TaskNodeMetadata, evictionErrors []*core.CacheEvictionError) []*core.CacheEvictionError {
+	taskNodeMetadata *admin.TaskNodeMetadata, errors []*core.CacheEvictionError) (evictionErrors []*core.CacheEvictionError) {
+	evictionErrors = errors
 	if taskNodeMetadata == nil || (taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_HIT &&
 		taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_POPULATED) {
 		logger.Debugf(ctx, "Node execution %+v did not contain cached data, skipping cache eviction",
@@ -167,6 +168,21 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 		return evictionErrors
 	}
 
+	defer func() {
+		if err := m.catalogClient.ReleaseReservationByArtifactTag(ctx, datasetID, artifactTag, ownerID); err != nil {
+			logger.Warnf(ctx, "Failed to release reservation for artifact of node execution %+v",
+				nodeExecution.Id)
+			evictionErrors = append(evictionErrors, &core.CacheEvictionError{
+				NodeExecutionId: nodeExecution.Id,
+				Source: &core.CacheEvictionError_TaskExecutionId{
+					TaskExecutionId: taskExecution.Id,
+				},
+				Code:    core.CacheEvictionError_RESERVATION_NOT_RELEASED,
+				Message: "Failed to release reservation for artifact",
+			})
+		}
+	}()
+
 	if len(reservation.GetOwnerId()) == 0 {
 		logger.Debugf(ctx, "Received empty owner ID for artifact of node execution %+v, assuming NOOP catalog, skipping cache eviction",
 			nodeExecution.Id)
@@ -249,21 +265,6 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 		}
 	}
 
-	if err := m.catalogClient.ReleaseReservationByArtifactTag(ctx, datasetID, artifactTag, ownerID); err != nil {
-		logger.Warnf(ctx, "Failed to release reservation for artifact of node execution %+v, cannot evict cache",
-			nodeExecution.Id)
-		m.metrics.CacheEvictionFailures.Inc()
-		evictionErrors = append(evictionErrors, &core.CacheEvictionError{
-			NodeExecutionId: nodeExecution.Id,
-			Source: &core.CacheEvictionError_TaskExecutionId{
-				TaskExecutionId: taskExecution.Id,
-			},
-			Code:    core.CacheEvictionError_RESERVATION_NOT_RELEASED,
-			Message: "Failed to release reservation for artifact",
-		})
-		return evictionErrors
-	}
-
 	logger.Debugf(ctx, "Successfully evicted cache for task node execution %+v", nodeExecution.Id)
 	m.metrics.CacheEvictionSuccess.Inc()
 
diff --git a/flyteadmin/pkg/manager/impl/cache_manager_test.go b/flyteadmin/pkg/manager/impl/cache_manager_test.go
index dad2d2da93..3becfb1b26 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager_test.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager_test.go
@@ -807,6 +807,8 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 
 		catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything, mock.Anything,
 			mock.Anything, mock.Anything).Return(&datacatalog.Reservation{OwnerId: "otherOwnerID"}, nil)
+		catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
+			mock.Anything, mock.Anything).Return(nil)
 
 		cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
 		request := service.EvictTaskExecutionCacheRequest{
@@ -1189,6 +1191,8 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 
 			catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, mock.Anything).
 				Return(status.Error(codes.Internal, "error"))
+			catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
+				mock.Anything, mock.Anything).Return(nil)
 
 			cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
 			request := service.EvictTaskExecutionCacheRequest{

From 80823c58d2134f91619138645ea6144137ced082 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Tue, 9 Jan 2024 09:14:13 -0800
Subject: [PATCH 37/57] move utility functions back to execution managers

Signed-off-by: Paul Dittamo 
---
 .../manager/impl/node_execution_manager.go    | 107 ++++++++++---
 .../manager/impl/task_execution_manager.go    |  40 ++++-
 flyteadmin/pkg/manager/impl/util/shared.go    | 145 ------------------
 3 files changed, 123 insertions(+), 169 deletions(-)

diff --git a/flyteadmin/pkg/manager/impl/node_execution_manager.go b/flyteadmin/pkg/manager/impl/node_execution_manager.go
index f9788d8591..afe17b6ac6 100644
--- a/flyteadmin/pkg/manager/impl/node_execution_manager.go
+++ b/flyteadmin/pkg/manager/impl/node_execution_manager.go
@@ -3,6 +3,7 @@ package impl
 import (
 	"context"
 	"fmt"
+	"strconv"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/prometheus"
@@ -14,6 +15,7 @@ import (
 	"github.com/flyteorg/flyte/flyteadmin/pkg/common"
 	dataInterfaces "github.com/flyteorg/flyte/flyteadmin/pkg/data/interfaces"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/errors"
+	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces"
@@ -63,6 +65,11 @@ const (
 	alreadyInTerminalStatus
 )
 
+var isParent = common.NewMapFilter(map[string]interface{}{
+	shared.ParentTaskExecutionID: nil,
+	shared.ParentID:              nil,
+})
+
 func getNodeExecutionContext(ctx context.Context, identifier *core.NodeExecutionIdentifier) context.Context {
 	ctx = contextutils.WithProjectDomain(ctx, identifier.ExecutionId.Project, identifier.ExecutionId.Domain)
 	ctx = contextutils.WithExecutionID(ctx, identifier.ExecutionId.Name)
@@ -354,23 +361,47 @@ func (m *NodeExecutionManager) GetNodeExecution(
 	return nodeExecution, nil
 }
 
-func (m *NodeExecutionManager) ListNodeExecutions(
-	ctx context.Context, request admin.NodeExecutionListRequest) (*admin.NodeExecutionList, error) {
-	// Check required fields
-	if err := validation.ValidateNodeExecutionListRequest(request); err != nil {
+func (m *NodeExecutionManager) listNodeExecutions(
+	ctx context.Context, identifierFilters []common.InlineFilter,
+	requestFilters string, limit uint32, requestToken string, sortBy *admin.Sort, mapFilters []common.MapFilter) (
+	*admin.NodeExecutionList, error) {
+
+	filters, err := util.AddRequestFilters(requestFilters, common.NodeExecution, identifierFilters)
+	if err != nil {
 		return nil, err
 	}
-	ctx = getExecutionContext(ctx, request.WorkflowExecutionId)
 
-	nodeExecutions, token, err := util.ListNodeExecutionsForWorkflow(ctx, m.db, request.WorkflowExecutionId,
-		request.UniqueParentId, request.Filters, request.Limit, request.Token, request.SortBy)
+	sortParameter, err := common.NewSortParameter(sortBy, models.NodeExecutionColumns)
 	if err != nil {
 		return nil, err
 	}
 
-	nodeExecutionList, err := m.transformNodeExecutionModelList(ctx, nodeExecutions)
+	offset, err := validation.ValidateToken(requestToken)
+	if err != nil {
+		return nil, errors.NewFlyteAdminErrorf(codes.InvalidArgument,
+			"invalid pagination token %s for ListNodeExecutions", requestToken)
+	}
+	listInput := repoInterfaces.ListResourceInput{
+		Limit:         int(limit),
+		Offset:        offset,
+		InlineFilters: filters,
+		SortParameter: sortParameter,
+	}
+
+	listInput.MapFilters = mapFilters
+	output, err := m.db.NodeExecutionRepo().List(ctx, listInput)
 	if err != nil {
-		logger.Debugf(ctx, "failed to transform node execution models for request [%+v] with err: %v", request, err)
+		logger.Debugf(ctx, "Failed to list node executions for request with err %v", err)
+		return nil, err
+	}
+
+	var token string
+	if len(output.NodeExecutions) == int(limit) {
+		token = strconv.Itoa(offset + len(output.NodeExecutions))
+	}
+	nodeExecutionList, err := m.transformNodeExecutionModelList(ctx, output.NodeExecutions)
+	if err != nil {
+		logger.Debugf(ctx, "failed to transform node execution models for request with err: %v", err)
 		return nil, err
 	}
 
@@ -380,6 +411,42 @@ func (m *NodeExecutionManager) ListNodeExecutions(
 	}, nil
 }
 
+func (m *NodeExecutionManager) ListNodeExecutions(
+	ctx context.Context, request admin.NodeExecutionListRequest) (*admin.NodeExecutionList, error) {
+	// Check required fields
+	if err := validation.ValidateNodeExecutionListRequest(request); err != nil {
+		return nil, err
+	}
+	ctx = getExecutionContext(ctx, request.WorkflowExecutionId)
+
+	identifierFilters, err := util.GetWorkflowExecutionIdentifierFilters(ctx, *request.WorkflowExecutionId)
+	if err != nil {
+		return nil, err
+	}
+	var mapFilters []common.MapFilter
+	if request.UniqueParentId != "" {
+		parentNodeExecution, err := util.GetNodeExecutionModel(ctx, m.db, &core.NodeExecutionIdentifier{
+			ExecutionId: request.WorkflowExecutionId,
+			NodeId:      request.UniqueParentId,
+		})
+		if err != nil {
+			return nil, err
+		}
+		parentIDFilter, err := common.NewSingleValueFilter(
+			common.NodeExecution, common.Equal, shared.ParentID, parentNodeExecution.ID)
+		if err != nil {
+			return nil, err
+		}
+		identifierFilters = append(identifierFilters, parentIDFilter)
+	} else {
+		mapFilters = []common.MapFilter{
+			isParent,
+		}
+	}
+	return m.listNodeExecutions(
+		ctx, identifierFilters, request.Filters, request.Limit, request.Token, request.SortBy, mapFilters)
+}
+
 // Filters on node executions matching the execution parameters (execution project, domain, and name) as well as the
 // parent task execution id corresponding to the task execution identified in the request params.
 func (m *NodeExecutionManager) ListNodeExecutionsForTask(
@@ -389,23 +456,23 @@ func (m *NodeExecutionManager) ListNodeExecutionsForTask(
 		return nil, err
 	}
 	ctx = getTaskExecutionContext(ctx, request.TaskExecutionId)
-
-	nodeExecutions, token, err := util.ListNodeExecutionsForTask(ctx, m.db, request.TaskExecutionId,
-		request.TaskExecutionId.NodeExecutionId.ExecutionId, request.Filters, request.Limit, request.Token, request.SortBy)
+	identifierFilters, err := util.GetWorkflowExecutionIdentifierFilters(
+		ctx, *request.TaskExecutionId.NodeExecutionId.ExecutionId)
 	if err != nil {
 		return nil, err
 	}
-
-	nodeExecutionList, err := m.transformNodeExecutionModelList(ctx, nodeExecutions)
+	parentTaskExecutionModel, err := util.GetTaskExecutionModel(ctx, m.db, request.TaskExecutionId)
 	if err != nil {
-		logger.Debugf(ctx, "failed to transform node execution models for request [%+v] with err: %v", request, err)
 		return nil, err
 	}
-
-	return &admin.NodeExecutionList{
-		NodeExecutions: nodeExecutionList,
-		Token:          token,
-	}, nil
+	nodeIDFilter, err := common.NewSingleValueFilter(
+		common.NodeExecution, common.Equal, shared.ParentTaskExecutionID, parentTaskExecutionModel.ID)
+	if err != nil {
+		return nil, err
+	}
+	identifierFilters = append(identifierFilters, nodeIDFilter)
+	return m.listNodeExecutions(
+		ctx, identifierFilters, request.Filters, request.Limit, request.Token, request.SortBy, nil)
 }
 
 func (m *NodeExecutionManager) GetNodeExecutionData(
diff --git a/flyteadmin/pkg/manager/impl/task_execution_manager.go b/flyteadmin/pkg/manager/impl/task_execution_manager.go
index bd923b6161..61d94a086f 100644
--- a/flyteadmin/pkg/manager/impl/task_execution_manager.go
+++ b/flyteadmin/pkg/manager/impl/task_execution_manager.go
@@ -3,6 +3,7 @@ package impl
 import (
 	"context"
 	"fmt"
+	"strconv"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/prometheus"
@@ -245,18 +246,49 @@ func (m *TaskExecutionManager) ListTaskExecutions(
 	}
 	ctx = getNodeExecutionContext(ctx, request.NodeExecutionId)
 
-	taskExecutions, token, err := util.ListTaskExecutions(ctx, m.db, request.NodeExecutionId, request.Filters,
-		request.Limit, request.Token, request.SortBy)
+	identifierFilters, err := util.GetNodeExecutionIdentifierFilters(ctx, *request.NodeExecutionId)
 	if err != nil {
 		return nil, err
 	}
 
-	taskExecutionList, err := transformers.FromTaskExecutionModels(taskExecutions, transformers.DefaultExecutionTransformerOptions)
+	filters, err := util.AddRequestFilters(request.Filters, common.TaskExecution, identifierFilters)
 	if err != nil {
-		logger.Debugf(ctx, "failed to transform task execution models for request [%+v] with err: %v", request, err)
 		return nil, err
 	}
 
+	sortParameter, err := common.NewSortParameter(request.SortBy, models.TaskExecutionColumns)
+	if err != nil {
+		return nil, err
+	}
+
+	offset, err := validation.ValidateToken(request.Token)
+	if err != nil {
+		return nil, errors.NewFlyteAdminErrorf(codes.InvalidArgument,
+			"invalid pagination token %s for ListTaskExecutions", request.Token)
+	}
+
+	output, err := m.db.TaskExecutionRepo().List(ctx, repoInterfaces.ListResourceInput{
+		InlineFilters: filters,
+		Offset:        offset,
+		Limit:         int(request.Limit),
+		SortParameter: sortParameter,
+	})
+	if err != nil {
+		logger.Debugf(ctx, "Failed to list task executions with request [%+v] with err %v",
+			request, err)
+		return nil, err
+	}
+
+	// Use default transformer options so that error messages shown for task execution attempts in the console sidebar show the full error stack trace.
+	taskExecutionList, err := transformers.FromTaskExecutionModels(output.TaskExecutions, transformers.DefaultExecutionTransformerOptions)
+	if err != nil {
+		logger.Debugf(ctx, "failed to transform task execution models for request [%+v] with err: %v", request, err)
+		return nil, err
+	}
+	var token string
+	if len(taskExecutionList) == int(request.Limit) {
+		token = strconv.Itoa(offset + len(taskExecutionList))
+	}
 	return &admin.TaskExecutionList{
 		TaskExecutions: taskExecutionList,
 		Token:          token,
diff --git a/flyteadmin/pkg/manager/impl/util/shared.go b/flyteadmin/pkg/manager/impl/util/shared.go
index 49c7303930..24c97f416a 100644
--- a/flyteadmin/pkg/manager/impl/util/shared.go
+++ b/flyteadmin/pkg/manager/impl/util/shared.go
@@ -3,7 +3,6 @@ package util
 
 import (
 	"context"
-	"strconv"
 	"time"
 
 	"google.golang.org/grpc/codes"
@@ -333,147 +332,3 @@ func MergeIntoExecConfig(workflowExecConfig admin.WorkflowExecutionConfig, spec
 
 	return workflowExecConfig
 }
-
-func ListNodeExecutions(ctx context.Context, repo repoInterfaces.Repository, identifierFilters []common.InlineFilter,
-	requestFilters string, limit uint32, requestToken string, sortBy *admin.Sort,
-	mapFilters []common.MapFilter) ([]models.NodeExecution, string, error) {
-	filters, err := AddRequestFilters(requestFilters, common.NodeExecution, identifierFilters)
-	if err != nil {
-		return nil, "", err
-	}
-	var sortParameter common.SortParameter
-	if sortBy != nil {
-		sortParameter, err = common.NewSortParameter(sortBy, models.NodeExecutionColumns)
-		if err != nil {
-			return nil, "", err
-		}
-	}
-	offset, err := validation.ValidateToken(requestToken)
-	if err != nil {
-		return nil, "", errors.NewFlyteAdminErrorf(codes.InvalidArgument,
-			"invalid pagination token %s for ListNodeExecutions", requestToken)
-	}
-	listInput := repoInterfaces.ListResourceInput{
-		Limit:         int(limit),
-		Offset:        offset,
-		InlineFilters: filters,
-		SortParameter: sortParameter,
-		MapFilters:    mapFilters,
-	}
-
-	output, err := repo.NodeExecutionRepo().List(ctx, listInput)
-	if err != nil {
-		logger.Debugf(ctx, "Failed to list node executions: %v", err)
-		return nil, "", err
-	}
-
-	var token string
-	if len(output.NodeExecutions) == int(limit) {
-		token = strconv.Itoa(offset + len(output.NodeExecutions))
-	}
-
-	return output.NodeExecutions, token, nil
-}
-
-func ListNodeExecutionsForWorkflow(ctx context.Context, repo repoInterfaces.Repository,
-	workflowExecutionID *core.WorkflowExecutionIdentifier, uniqueParentID string, requestFilters string,
-	limit uint32, requestToken string, sortBy *admin.Sort) ([]models.NodeExecution, string, error) {
-	identifierFilters, err := GetWorkflowExecutionIdentifierFilters(ctx, *workflowExecutionID)
-	if err != nil {
-		return nil, "", err
-	}
-
-	var mapFilters []common.MapFilter
-	if len(uniqueParentID) > 0 {
-		parentNodeExecution, err := GetNodeExecutionModel(ctx, repo, &core.NodeExecutionIdentifier{
-			ExecutionId: workflowExecutionID,
-			NodeId:      uniqueParentID,
-		})
-		if err != nil {
-			return nil, "", err
-		}
-		parentIDFilter, err := common.NewSingleValueFilter(
-			common.NodeExecution, common.Equal, shared.ParentID, parentNodeExecution.ID)
-		if err != nil {
-			return nil, "", err
-		}
-		identifierFilters = append(identifierFilters, parentIDFilter)
-	} else {
-		mapFilters = []common.MapFilter{
-			common.NewMapFilter(map[string]interface{}{
-				shared.ParentTaskExecutionID: nil,
-				shared.ParentID:              nil,
-			}),
-		}
-	}
-
-	return ListNodeExecutions(ctx, repo, identifierFilters, requestFilters, limit, requestToken, sortBy, mapFilters)
-}
-
-func ListNodeExecutionsForTask(ctx context.Context, repo repoInterfaces.Repository,
-	taskExecutionID *core.TaskExecutionIdentifier, workflowExecutionID *core.WorkflowExecutionIdentifier,
-	requestFilters string, limit uint32, requestToken string, sortBy *admin.Sort) ([]models.NodeExecution, string, error) {
-	identifierFilters, err := GetWorkflowExecutionIdentifierFilters(ctx, *workflowExecutionID)
-	if err != nil {
-		return nil, "", err
-	}
-
-	parentTaskExecutionModel, err := GetTaskExecutionModel(ctx, repo, taskExecutionID)
-	if err != nil {
-		return nil, "", err
-	}
-
-	nodeIDFilter, err := common.NewSingleValueFilter(
-		common.NodeExecution, common.Equal, shared.ParentTaskExecutionID, parentTaskExecutionModel.ID)
-	if err != nil {
-		return nil, "", err
-	}
-	identifierFilters = append(identifierFilters, nodeIDFilter)
-
-	return ListNodeExecutions(ctx, repo, identifierFilters, requestFilters, limit, requestToken, sortBy, nil)
-}
-
-func ListTaskExecutions(ctx context.Context, repo repoInterfaces.Repository,
-	nodeExecutionID *core.NodeExecutionIdentifier, requestFilters string, limit uint32, requestToken string,
-	sortBy *admin.Sort) ([]models.TaskExecution, string, error) {
-	identifierFilters, err := GetNodeExecutionIdentifierFilters(ctx, *nodeExecutionID)
-	if err != nil {
-		return nil, "", err
-	}
-
-	filters, err := AddRequestFilters(requestFilters, common.TaskExecution, identifierFilters)
-	if err != nil {
-		return nil, "", err
-	}
-	var sortParameter common.SortParameter
-	if sortBy != nil {
-		sortParameter, err = common.NewSortParameter(sortBy, models.TaskExecutionColumns)
-		if err != nil {
-			return nil, "", err
-		}
-	}
-
-	offset, err := validation.ValidateToken(requestToken)
-	if err != nil {
-		return nil, "", errors.NewFlyteAdminErrorf(codes.InvalidArgument,
-			"invalid pagination token %s for ListTaskExecutions", requestToken)
-	}
-
-	output, err := repo.TaskExecutionRepo().List(ctx, repoInterfaces.ListResourceInput{
-		InlineFilters: filters,
-		Offset:        offset,
-		Limit:         int(limit),
-		SortParameter: sortParameter,
-	})
-	if err != nil {
-		logger.Debugf(ctx, "Failed to list task executions: %v", err)
-		return nil, "", err
-	}
-
-	var token string
-	if len(output.TaskExecutions) == int(limit) {
-		token = strconv.Itoa(offset + len(output.TaskExecutions))
-	}
-
-	return output.TaskExecutions, token, nil
-}

From 968fba6c23380da0f78a002ac43d419a00c89f31 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Tue, 9 Jan 2024 11:08:21 -0800
Subject: [PATCH 38/57] set db context on UpdateSelected

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go
index 8f99d0aa6d..baa94fe306 100644
--- a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go
+++ b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go
@@ -107,7 +107,7 @@ func (r *NodeExecutionRepo) Update(ctx context.Context, nodeExecution *models.No
 
 func (r *NodeExecutionRepo) UpdateSelected(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
 	timer := r.metrics.UpdateDuration.Start()
-	tx := r.db.Model(&nodeExecution).Select(selectedFields).Updates(nodeExecution)
+	tx := r.db.WithContext(ctx).Model(&nodeExecution).Select(selectedFields).Updates(nodeExecution)
 	timer.Stop()
 	if err := tx.Error; err != nil {
 		return r.errorTransformer.ToFlyteAdminError(err)

From 4d422a679cc282a597a1d0e780b65ea02e20f0a8 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Tue, 9 Jan 2024 11:24:09 -0800
Subject: [PATCH 39/57] Revert "update idl service docs"

This reverts commit 7c93bb66bc7ededf61c25f588ab0d346c7c290a7.

Signed-off-by: Paul Dittamo 
---
 flyteidl/generate_protos.sh              |   2 +-
 flyteidl/protos/docs/service/service.rst | 348 ++---------------------
 2 files changed, 26 insertions(+), 324 deletions(-)

diff --git a/flyteidl/generate_protos.sh b/flyteidl/generate_protos.sh
index 09eb8cd230..7955536737 100755
--- a/flyteidl/generate_protos.sh
+++ b/flyteidl/generate_protos.sh
@@ -67,7 +67,7 @@ find gen/pb_python -type d -exec touch {}/__init__.py \;
 # # Remove any currently generated service docs file
 # ls -d protos/docs/service/* | grep -v index.rst | xargs rm
 # # Use list of proto files in service directory to generate the RST files required for sphinx conversion
-docker run --rm -u $(id -u):$(id -g) -v $DIR/protos:/protos:ro -v $DIR/protos/docs/service:/out:rw -v $DIR/tmp/doc_gen_deps:/tmp/doc_gen_deps:ro $PROTOC_GEN_DOC_IMAGE --doc_opt=protos/docs/withoutscalar_restructuredtext.tmpl,service.rst -I=protos -I=tmp/doc_gen_deps `ls protos/flyteidl/service/*.proto | xargs`
+# docker run --rm -u $(id -u):$(id -g) -v $DIR/protos:/protos:ro -v $DIR/protos/docs/service:/out:rw -v $DIR/tmp/doc_gen_deps:/tmp/doc_gen_deps:ro $PROTOC_GEN_DOC_IMAGE --doc_opt=protos/docs/withoutscalar_restructuredtext.tmpl,service.rst -I=protos -I=tmp/doc_gen_deps `ls protos/flyteidl/service/*.proto | xargs`
 
 # Generate binary data from OpenAPI 2 file
 docker run --rm -u $(id -u):$(id -g) -v $DIR/gen/pb-go/flyteidl/service:/service --entrypoint go-bindata $LYFT_IMAGE -pkg service -o /service/openapi.go -prefix /service/ -modtime 1562572800 /service/admin.swagger.json
diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst
index b14e733c6b..d512bf5815 100644
--- a/flyteidl/protos/docs/service/service.rst
+++ b/flyteidl/protos/docs/service/service.rst
@@ -90,65 +90,6 @@ Standard response codes for both are defined here: https://github.com/grpc-ecosy
    "GetVersion", ":ref:`ref_flyteidl.admin.GetVersionRequest`", ":ref:`ref_flyteidl.admin.GetVersionResponse`", ""
    "GetDescriptionEntity", ":ref:`ref_flyteidl.admin.ObjectGetRequest`", ":ref:`ref_flyteidl.admin.DescriptionEntity`", "Fetch a :ref:`ref_flyteidl.admin.DescriptionEntity` object."
    "ListDescriptionEntities", ":ref:`ref_flyteidl.admin.DescriptionEntityListRequest`", ":ref:`ref_flyteidl.admin.DescriptionEntityList`", "Fetch a list of :ref:`ref_flyteidl.admin.DescriptionEntity` definitions."
-   "GetExecutionMetrics", ":ref:`ref_flyteidl.admin.WorkflowExecutionGetMetricsRequest`", ":ref:`ref_flyteidl.admin.WorkflowExecutionGetMetricsResponse`", "Fetches runtime metrics for a :ref:`ref_flyteidl.admin.Execution`."
-
-..
-   end services
-
-
-
-
-.. _ref_flyteidl/service/agent.proto:
-
-flyteidl/service/agent.proto
-==================================================================
-
-
-
-
-..
-   end messages
-
-
-..
-   end enums
-
-
-..
-   end HasExtensions
-
-
-
-.. _ref_flyteidl.service.AgentMetadataService:
-
-AgentMetadataService
-------------------------------------------------------------------
-
-AgentMetadataService defines an RPC service that is also served over HTTP via grpc-gateway.
-This service allows propeller or users to get the metadata of agents.
-
-.. csv-table:: AgentMetadataService service methods
-   :header: "Method Name", "Request Type", "Response Type", "Description"
-   :widths: auto
-
-   "GetAgent", ":ref:`ref_flyteidl.admin.GetAgentRequest`", ":ref:`ref_flyteidl.admin.GetAgentResponse`", "Fetch a :ref:`ref_flyteidl.admin.Agent` definition."
-   "ListAgents", ":ref:`ref_flyteidl.admin.ListAgentsRequest`", ":ref:`ref_flyteidl.admin.ListAgentsResponse`", "Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions."
-
-
-.. _ref_flyteidl.service.AsyncAgentService:
-
-AsyncAgentService
-------------------------------------------------------------------
-
-AsyncAgentService defines an RPC Service that allows propeller to send the request to the agent server.
-
-.. csv-table:: AsyncAgentService service methods
-   :header: "Method Name", "Request Type", "Response Type", "Description"
-   :widths: auto
-
-   "CreateTask", ":ref:`ref_flyteidl.admin.CreateTaskRequest`", ":ref:`ref_flyteidl.admin.CreateTaskResponse`", "Send a task create request to the agent server."
-   "GetTask", ":ref:`ref_flyteidl.admin.GetTaskRequest`", ":ref:`ref_flyteidl.admin.GetTaskResponse`", "Get job status."
-   "DeleteTask", ":ref:`ref_flyteidl.admin.DeleteTaskRequest`", ":ref:`ref_flyteidl.admin.DeleteTaskResponse`", "Delete the task resource."
 
 ..
    end services
@@ -314,6 +255,27 @@ EvictCacheResponse
 
 
 
+.. _ref_flyteidl.service.EvictExecutionCacheRequest:
+
+EvictExecutionCacheRequest
+------------------------------------------------------------------
+
+
+
+
+
+.. csv-table:: EvictExecutionCacheRequest type fields
+   :header: "Field", "Type", "Label", "Description"
+   :widths: auto
+
+   "workflow_execution_id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for."
+
+
+
+
+
+
+
 .. _ref_flyteidl.service.EvictTaskExecutionCacheRequest:
 
 EvictTaskExecutionCacheRequest
@@ -358,6 +320,7 @@ CacheService defines an RPC Service for interacting with cached data in Flyte on
    :header: "Method Name", "Request Type", "Response Type", "Description"
    :widths: auto
 
+   "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`."
    "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictTaskExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`."
 
 ..
@@ -411,9 +374,8 @@ CreateDownloadLinkResponse defines the response for the generated links
    :header: "Field", "Type", "Label", "Description"
    :widths: auto
 
-   "signed_url", ":ref:`ref_string`", "repeated", "**Deprecated.** SignedUrl specifies the url to use to download content from (e.g. https://my-bucket.s3.amazonaws.com/randomstring/suffix.tar?X-...)"
-   "expires_at", ":ref:`ref_google.protobuf.Timestamp`", "", "**Deprecated.** ExpiresAt defines when will the signed URL expire."
-   "pre_signed_urls", ":ref:`ref_flyteidl.service.PreSignedURLs`", "", "New wrapper object containing the signed urls and expiration time"
+   "signed_url", ":ref:`ref_string`", "repeated", "SignedUrl specifies the url to use to download content from (e.g. https://my-bucket.s3.amazonaws.com/randomstring/suffix.tar?X-...)"
+   "expires_at", ":ref:`ref_google.protobuf.Timestamp`", "", "ExpiresAt defines when will the signed URL expire."
 
 
 
@@ -471,10 +433,6 @@ CreateUploadLocationRequest
 ------------------------------------------------------------------
 
 CreateUploadLocationRequest specified request for the CreateUploadLocation API.
-The implementation in data proxy service will create the s3 location with some server side configured prefixes,
-and then:
-  - project/domain/(a deterministic str representation of the content_md5)/filename (if present); OR
-  - project/domain/filename_root (if present)/filename (if present).
 
 
 
@@ -487,7 +445,6 @@ and then:
    "filename", ":ref:`ref_string`", "", "Filename specifies a desired suffix for the generated location. E.g. `file.py` or `pre/fix/file.zip`. +optional. By default, the service will generate a consistent name based on the provided parameters."
    "expires_in", ":ref:`ref_google.protobuf.Duration`", "", "ExpiresIn defines a requested expiration duration for the generated url. The request will be rejected if this exceeds the platform allowed max. +optional. The default value comes from a global config."
    "content_md5", ":ref:`ref_bytes`", "", "ContentMD5 restricts the upload location to the specific MD5 provided. The ContentMD5 will also appear in the generated path. +required"
-   "filename_root", ":ref:`ref_string`", "", "If present, data proxy will use this string in lieu of the md5 hash in the path. When the filename is also included this makes the upload location deterministic. The native url will still be prefixed by the upload location prefix in data proxy config. This option is useful when uploading multiple files. +optional"
 
 
 
@@ -517,72 +474,6 @@ CreateUploadLocationResponse
 
 
 
-
-.. _ref_flyteidl.service.GetDataRequest:
-
-GetDataRequest
-------------------------------------------------------------------
-
-General request artifact to retrieve data from a Flyte artifact url.
-
-
-
-.. csv-table:: GetDataRequest type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "flyte_url", ":ref:`ref_string`", "", "A unique identifier in the form of flyte:// that uniquely, for a given Flyte backend, identifies a Flyte artifact ([i]nput, [o]output, flyte [d]eck, etc.). e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) flyte://v1/proj/development/execid/n2/i (for node execution input) flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node)"
-
-
-
-
-
-
-
-.. _ref_flyteidl.service.GetDataResponse:
-
-GetDataResponse
-------------------------------------------------------------------
-
-
-
-
-
-.. csv-table:: GetDataResponse type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "literal_map", ":ref:`ref_flyteidl.core.LiteralMap`", "", "literal map data will be returned"
-   "pre_signed_urls", ":ref:`ref_flyteidl.service.PreSignedURLs`", "", "Flyte deck html will be returned as a signed url users can download"
-   "literal", ":ref:`ref_flyteidl.core.Literal`", "", "Single literal will be returned. This is returned when the user/url requests a specific output or input by name. See the o3 example above."
-
-
-
-
-
-
-
-.. _ref_flyteidl.service.PreSignedURLs:
-
-PreSignedURLs
-------------------------------------------------------------------
-
-Wrapper object since the message is shared across this and the GetDataResponse
-
-
-
-.. csv-table:: PreSignedURLs type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "signed_url", ":ref:`ref_string`", "repeated", "SignedUrl specifies the url to use to download content from (e.g. https://my-bucket.s3.amazonaws.com/randomstring/suffix.tar?X-...)"
-   "expires_at", ":ref:`ref_google.protobuf.Timestamp`", "", "ExpiresAt defines when will the signed URL expire."
-
-
-
-
-
-
 ..
    end messages
 
@@ -626,192 +517,6 @@ DataProxyService defines an RPC Service that allows access to user-data in a con
    "CreateUploadLocation", ":ref:`ref_flyteidl.service.CreateUploadLocationRequest`", ":ref:`ref_flyteidl.service.CreateUploadLocationResponse`", "CreateUploadLocation creates a signed url to upload artifacts to for a given project/domain."
    "CreateDownloadLocation", ":ref:`ref_flyteidl.service.CreateDownloadLocationRequest`", ":ref:`ref_flyteidl.service.CreateDownloadLocationResponse`", "CreateDownloadLocation creates a signed url to download artifacts."
    "CreateDownloadLink", ":ref:`ref_flyteidl.service.CreateDownloadLinkRequest`", ":ref:`ref_flyteidl.service.CreateDownloadLinkResponse`", "CreateDownloadLocation creates a signed url to download artifacts."
-   "GetData", ":ref:`ref_flyteidl.service.GetDataRequest`", ":ref:`ref_flyteidl.service.GetDataResponse`", ""
-
-..
-   end services
-
-
-
-
-.. _ref_flyteidl/service/external_plugin_service.proto:
-
-flyteidl/service/external_plugin_service.proto
-==================================================================
-
-
-
-
-
-.. _ref_flyteidl.service.TaskCreateRequest:
-
-TaskCreateRequest
-------------------------------------------------------------------
-
-Represents a request structure to create task.
-
-
-
-.. csv-table:: TaskCreateRequest type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "inputs", ":ref:`ref_flyteidl.core.LiteralMap`", "", "The inputs required to start the execution. All required inputs must be included in this map. If not required and not provided, defaults apply. +optional"
-   "template", ":ref:`ref_flyteidl.core.TaskTemplate`", "", "Template of the task that encapsulates all the metadata of the task."
-   "output_prefix", ":ref:`ref_string`", "", "Prefix for where task output data will be written. (e.g. s3://my-bucket/randomstring)"
-
-
-
-
-
-
-
-.. _ref_flyteidl.service.TaskCreateResponse:
-
-TaskCreateResponse
-------------------------------------------------------------------
-
-Represents a create response structure.
-
-
-
-.. csv-table:: TaskCreateResponse type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "job_id", ":ref:`ref_string`", "", ""
-
-
-
-
-
-
-
-.. _ref_flyteidl.service.TaskDeleteRequest:
-
-TaskDeleteRequest
-------------------------------------------------------------------
-
-A message used to delete a task.
-
-
-
-.. csv-table:: TaskDeleteRequest type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "task_type", ":ref:`ref_string`", "", "A predefined yet extensible Task type identifier."
-   "job_id", ":ref:`ref_string`", "", "The unique id identifying the job."
-
-
-
-
-
-
-
-.. _ref_flyteidl.service.TaskDeleteResponse:
-
-TaskDeleteResponse
-------------------------------------------------------------------
-
-Response to delete a task.
-
-
-
-
-
-
-
-
-.. _ref_flyteidl.service.TaskGetRequest:
-
-TaskGetRequest
-------------------------------------------------------------------
-
-A message used to fetch a job state from backend plugin server.
-
-
-
-.. csv-table:: TaskGetRequest type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "task_type", ":ref:`ref_string`", "", "A predefined yet extensible Task type identifier."
-   "job_id", ":ref:`ref_string`", "", "The unique id identifying the job."
-
-
-
-
-
-
-
-.. _ref_flyteidl.service.TaskGetResponse:
-
-TaskGetResponse
-------------------------------------------------------------------
-
-Response to get an individual task state.
-
-
-
-.. csv-table:: TaskGetResponse type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "state", ":ref:`ref_flyteidl.service.State`", "", "The state of the execution is used to control its visibility in the UI/CLI."
-   "outputs", ":ref:`ref_flyteidl.core.LiteralMap`", "", "The outputs of the execution. It's typically used by sql task. Flyteplugins service will create a Structured dataset pointing to the query result table. +optional"
-
-
-
-
-
-
-..
-   end messages
-
-
-
-.. _ref_flyteidl.service.State:
-
-State
-------------------------------------------------------------------
-
-The state of the execution is used to control its visibility in the UI/CLI.
-
-.. csv-table:: Enum State values
-   :header: "Name", "Number", "Description"
-   :widths: auto
-
-   "RETRYABLE_FAILURE", "0", ""
-   "PERMANENT_FAILURE", "1", ""
-   "PENDING", "2", ""
-   "RUNNING", "3", ""
-   "SUCCEEDED", "4", ""
-
-
-..
-   end enums
-
-
-..
-   end HasExtensions
-
-
-
-.. _ref_flyteidl.service.ExternalPluginService:
-
-ExternalPluginService
-------------------------------------------------------------------
-
-ExternalPluginService defines an RPC Service that allows propeller to send the request to the backend plugin server.
-
-.. csv-table:: ExternalPluginService service methods
-   :header: "Method Name", "Request Type", "Response Type", "Description"
-   :widths: auto
-
-   "CreateTask", ":ref:`ref_flyteidl.service.TaskCreateRequest`", ":ref:`ref_flyteidl.service.TaskCreateResponse`", "Send a task create request to the backend plugin server."
-   "GetTask", ":ref:`ref_flyteidl.service.TaskGetRequest`", ":ref:`ref_flyteidl.service.TaskGetResponse`", "Get job status."
-   "DeleteTask", ":ref:`ref_flyteidl.service.TaskDeleteRequest`", ":ref:`ref_flyteidl.service.TaskDeleteResponse`", "Delete the task resource."
 
 ..
    end services
@@ -862,7 +567,6 @@ See the OpenID Connect spec at https://openid.net/specs/openid-connect-core-1_0.
    "family_name", ":ref:`ref_string`", "", "Surname(s) or last name(s)"
    "email", ":ref:`ref_string`", "", "Preferred e-mail address"
    "picture", ":ref:`ref_string`", "", "Profile picture URL"
-   "additional_claims", ":ref:`ref_google.protobuf.Struct`", "", "Additional claims"
 
 
 
@@ -933,9 +637,7 @@ SignalService defines an RPC Service that may create, update, and retrieve signa
    :header: "Method Name", "Request Type", "Response Type", "Description"
    :widths: auto
 
-   "GetOrCreateSignal", ":ref:`ref_flyteidl.admin.SignalGetOrCreateRequest`", ":ref:`ref_flyteidl.admin.Signal`", "Fetches or creates a :ref:`ref_flyteidl.admin.Signal`.
-
-Purposefully left out an HTTP API for this RPC call. This is meant to idempotently retrieve a signal, meaning the first call will create the signal and all subsequent calls will fetch the existing signal. This is only useful during Flyte Workflow execution and therefore is not exposed to mitigate unintended behavior. option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = { description: "Retrieve a signal, creating it if it does not exist." };"
+   "GetOrCreateSignal", ":ref:`ref_flyteidl.admin.SignalGetOrCreateRequest`", ":ref:`ref_flyteidl.admin.Signal`", "Fetches or creates a :ref:`ref_flyteidl.admin.Signal`."
    "ListSignals", ":ref:`ref_flyteidl.admin.SignalListRequest`", ":ref:`ref_flyteidl.admin.SignalList`", "Fetch a list of :ref:`ref_flyteidl.admin.Signal` definitions."
    "SetSignal", ":ref:`ref_flyteidl.admin.SignalSetRequest`", ":ref:`ref_flyteidl.admin.SignalSetResponse`", "Sets the value on a :ref:`ref_flyteidl.admin.Signal` definition"
 

From 77b1b2c17ed652dc411ffb5d6ad09865923fc18d Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Tue, 9 Jan 2024 11:25:09 -0800
Subject: [PATCH 40/57] manually remove EvictExecutionCache mentions from
 service.rst

Signed-off-by: Paul Dittamo 
---
 flyteidl/protos/docs/service/service.rst | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/flyteidl/protos/docs/service/service.rst b/flyteidl/protos/docs/service/service.rst
index d512bf5815..5d76bce851 100644
--- a/flyteidl/protos/docs/service/service.rst
+++ b/flyteidl/protos/docs/service/service.rst
@@ -255,27 +255,6 @@ EvictCacheResponse
 
 
 
-.. _ref_flyteidl.service.EvictExecutionCacheRequest:
-
-EvictExecutionCacheRequest
-------------------------------------------------------------------
-
-
-
-
-
-.. csv-table:: EvictExecutionCacheRequest type fields
-   :header: "Field", "Type", "Label", "Description"
-   :widths: auto
-
-   "workflow_execution_id", ":ref:`ref_flyteidl.core.WorkflowExecutionIdentifier`", "", "Identifier of :ref:`ref_flyteidl.admin.Execution` to evict cache for."
-
-
-
-
-
-
-
 .. _ref_flyteidl.service.EvictTaskExecutionCacheRequest:
 
 EvictTaskExecutionCacheRequest
@@ -320,7 +299,6 @@ CacheService defines an RPC Service for interacting with cached data in Flyte on
    :header: "Method Name", "Request Type", "Response Type", "Description"
    :widths: auto
 
-   "EvictExecutionCache", ":ref:`ref_flyteidl.service.EvictExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.Execution`."
    "EvictTaskExecutionCache", ":ref:`ref_flyteidl.service.EvictTaskExecutionCacheRequest`", ":ref:`ref_flyteidl.service.EvictCacheResponse`", "Evicts all cached data for the referenced :ref:`ref_flyteidl.admin.TaskExecution`."
 
 ..

From 2525232581a2a9a01402d44994948ea6779ecfe7 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Tue, 9 Jan 2024 13:32:47 -0800
Subject: [PATCH 41/57] update node execution closure after succeesful artifact
 deletion

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/manager/impl/cache_manager.go  | 42 +++++++++----------
 .../pkg/manager/impl/cache_manager_test.go    | 23 ++++++----
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/flyteadmin/pkg/manager/impl/cache_manager.go b/flyteadmin/pkg/manager/impl/cache_manager.go
index 207c382ea9..b4c832e046 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager.go
@@ -202,6 +202,26 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 		return evictionErrors
 	}
 
+	if err := m.catalogClient.DeleteByArtifactID(ctx, datasetID, artifactID); err != nil {
+		if catalog.IsNotFound(err) {
+			logger.Debugf(ctx, "Artifact with ID %s for dataset %+v of node execution %+v not found, assuming already deleted by previous eviction. Skipping...",
+				artifactID, datasetID, nodeExecution.Id)
+		} else {
+			logger.Warnf(ctx, "Failed to delete artifact with ID %s for dataset %+v of node execution %+v: %v",
+				artifactID, datasetID, nodeExecution.Id, err)
+			m.metrics.CacheEvictionFailures.Inc()
+			evictionErrors = append(evictionErrors, &core.CacheEvictionError{
+				NodeExecutionId: nodeExecution.Id,
+				Source: &core.CacheEvictionError_TaskExecutionId{
+					TaskExecutionId: taskExecution.Id,
+				},
+				Code:    core.CacheEvictionError_ARTIFACT_DELETE_FAILED,
+				Message: "Failed to delete artifact",
+			})
+			return evictionErrors
+		}
+	}
+
 	selectedFields := []string{shared.CreatedAt}
 	nodeExecutionModel.CacheStatus = nil
 
@@ -231,7 +251,7 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 	selectedFields = append(selectedFields, shared.Closure)
 
 	if err := m.db.NodeExecutionRepo().UpdateSelected(ctx, &nodeExecutionModel, selectedFields); err != nil {
-		logger.Warnf(ctx, "Failed to update node execution model %+v before deleting artifact: %v",
+		logger.Warnf(ctx, "Failed to update node execution model %+v before after artifact: %v",
 			nodeExecution.Id, err)
 		m.metrics.CacheEvictionFailures.Inc()
 		evictionErrors = append(evictionErrors, &core.CacheEvictionError{
@@ -245,26 +265,6 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 		return evictionErrors
 	}
 
-	if err := m.catalogClient.DeleteByArtifactID(ctx, datasetID, artifactID); err != nil {
-		if catalog.IsNotFound(err) {
-			logger.Debugf(ctx, "Artifact with ID %s for dataset %+v of node execution %+v not found, assuming already deleted by previous eviction. Skipping...",
-				artifactID, datasetID, nodeExecution.Id)
-		} else {
-			logger.Warnf(ctx, "Failed to delete artifact with ID %s for dataset %+v of node execution %+v: %v",
-				artifactID, datasetID, nodeExecution.Id, err)
-			m.metrics.CacheEvictionFailures.Inc()
-			evictionErrors = append(evictionErrors, &core.CacheEvictionError{
-				NodeExecutionId: nodeExecution.Id,
-				Source: &core.CacheEvictionError_TaskExecutionId{
-					TaskExecutionId: taskExecution.Id,
-				},
-				Code:    core.CacheEvictionError_ARTIFACT_DELETE_FAILED,
-				Message: "Failed to delete artifact",
-			})
-			return evictionErrors
-		}
-	}
-
 	logger.Debugf(ctx, "Successfully evicted cache for task node execution %+v", nodeExecution.Id)
 	m.metrics.CacheEvictionSuccess.Inc()
 
diff --git a/flyteadmin/pkg/manager/impl/cache_manager_test.go b/flyteadmin/pkg/manager/impl/cache_manager_test.go
index 3becfb1b26..cf026325bd 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager_test.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager_test.go
@@ -1222,10 +1222,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 			require.NotNil(t, eErr.Source)
 			assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
 
-			for nodeID := range taskExecutionModels {
-				assert.Contains(t, updatedNodeExecutions, nodeID)
-			}
-			assert.Len(t, updatedNodeExecutions, len(taskExecutionModels))
+			assert.Len(t, updatedNodeExecutions, 0)
 		})
 
 		t.Run("ReleaseReservationByArtifactTag", func(t *testing.T) {
@@ -1578,13 +1575,26 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 
 				updatedNodeExecutions := setupCacheEvictionMockRepositories(t, repository, nodeExecutionModels, taskExecutionModels)
 
+				for nodeID := range taskExecutionModels {
+					for _, taskExecution := range taskExecutionModels[nodeID] {
+						require.NotNil(t, taskExecution.RetryAttempt)
+						ownerID := fmt.Sprintf("%s-%s-%d", executionIdentifier.Name, nodeID, *taskExecution.RetryAttempt)
+						for _, artifactTag := range artifactTags {
+							catalogClient.On("GetOrExtendReservationByArtifactTag", mock.Anything, mock.Anything,
+								artifactTag.GetName(), ownerID, mock.Anything).Return(&datacatalog.Reservation{OwnerId: ownerID}, nil)
+							catalogClient.On("ReleaseReservationByArtifactTag", mock.Anything, mock.Anything,
+								artifactTag.GetName(), ownerID).Return(nil)
+							catalogClient.On("DeleteByArtifactID", mock.Anything, mock.Anything, artifactTag.GetArtifactId()).
+								Return(nil)
+						}
+					}
+				}
+
 				repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback(
 					func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
 						return flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error")
 					})
 
-				deletedArtifactIDs := setupCacheEvictionCatalogClient(t, catalogClient, artifactTags, taskExecutionModels)
-
 				cacheManager := NewCacheManager(repository, mockConfig, catalogClient, promutils.NewTestScope())
 				request := service.EvictTaskExecutionCacheRequest{
 					TaskExecutionId: &core.TaskExecutionIdentifier{
@@ -1614,7 +1624,6 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 				assert.IsType(t, &core.CacheEvictionError_TaskExecutionId{}, eErr.Source)
 
 				assert.Empty(t, updatedNodeExecutions)
-				assert.Empty(t, deletedArtifactIDs)
 			})
 		})
 

From 5bfd6e9dda5f51f52586f0a952b78e66a98e7b57 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Tue, 9 Jan 2024 14:05:46 -0800
Subject: [PATCH 42/57] don't remove catalog key from taskNodeMetadata to
 better support retries

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/manager/impl/cache_manager.go      | 1 -
 flyteadmin/pkg/manager/impl/cache_manager_test.go | 1 -
 2 files changed, 2 deletions(-)

diff --git a/flyteadmin/pkg/manager/impl/cache_manager.go b/flyteadmin/pkg/manager/impl/cache_manager.go
index b4c832e046..988aece5fe 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager.go
@@ -226,7 +226,6 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 	nodeExecutionModel.CacheStatus = nil
 
 	taskNodeMetadata.CacheStatus = core.CatalogCacheStatus_CACHE_DISABLED
-	taskNodeMetadata.CatalogKey = nil
 	nodeExecution.Closure.TargetMetadata = &admin.NodeExecutionClosure_TaskNodeMetadata{
 		TaskNodeMetadata: taskNodeMetadata,
 	}
diff --git a/flyteadmin/pkg/manager/impl/cache_manager_test.go b/flyteadmin/pkg/manager/impl/cache_manager_test.go
index cf026325bd..0f9cfb4a9a 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager_test.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager_test.go
@@ -100,7 +100,6 @@ func setupCacheEvictionMockRepositories(t *testing.T, repository interfaces.Repo
 			require.True(t, ok)
 			require.NotNil(t, md.TaskNodeMetadata)
 			assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, md.TaskNodeMetadata.CacheStatus)
-			assert.Nil(t, md.TaskNodeMetadata.CatalogKey)
 
 			updatedNodeExecutions[nodeExecution.NodeID]++
 

From d7ac714254224c732e5d603f3f8c6176f56832a2 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 10 Jan 2024 09:59:42 -0800
Subject: [PATCH 43/57] set node execution CacheStatus and taskNodeMetadata
 CacheStatus to cache evicted

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/manager/impl/cache_manager.go      | 15 +++++++--------
 flyteadmin/pkg/manager/impl/cache_manager_test.go | 15 ++++++++-------
 .../repositories/gormimpl/node_execution_repo.go  | 10 ----------
 .../interfaces/node_execution_repo.go             |  3 ---
 .../pkg/repositories/mocks/node_execution_repo.go | 13 -------------
 5 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/flyteadmin/pkg/manager/impl/cache_manager.go b/flyteadmin/pkg/manager/impl/cache_manager.go
index 988aece5fe..6306e26118 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager.go
@@ -7,7 +7,6 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/shared"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/util"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/impl/validation"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/manager/interfaces"
@@ -139,7 +138,8 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 	taskNodeMetadata *admin.TaskNodeMetadata, errors []*core.CacheEvictionError) (evictionErrors []*core.CacheEvictionError) {
 	evictionErrors = errors
 	if taskNodeMetadata == nil || (taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_HIT &&
-		taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_POPULATED) {
+		taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_POPULATED &&
+		taskNodeMetadata.GetCacheStatus() != core.CatalogCacheStatus_CACHE_EVICTED) {
 		logger.Debugf(ctx, "Node execution %+v did not contain cached data, skipping cache eviction",
 			nodeExecution.Id)
 		return evictionErrors
@@ -222,10 +222,10 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 		}
 	}
 
-	selectedFields := []string{shared.CreatedAt}
-	nodeExecutionModel.CacheStatus = nil
+	cacheEvictedStatus := core.CatalogCacheStatus_CACHE_EVICTED.String()
+	nodeExecutionModel.CacheStatus = &cacheEvictedStatus
 
-	taskNodeMetadata.CacheStatus = core.CatalogCacheStatus_CACHE_DISABLED
+	taskNodeMetadata.CacheStatus = core.CatalogCacheStatus_CACHE_EVICTED
 	nodeExecution.Closure.TargetMetadata = &admin.NodeExecutionClosure_TaskNodeMetadata{
 		TaskNodeMetadata: taskNodeMetadata,
 	}
@@ -247,10 +247,9 @@ func (m *CacheManager) evictTaskNodeExecutionCache(ctx context.Context, nodeExec
 	}
 
 	nodeExecutionModel.Closure = marshaledClosure
-	selectedFields = append(selectedFields, shared.Closure)
 
-	if err := m.db.NodeExecutionRepo().UpdateSelected(ctx, &nodeExecutionModel, selectedFields); err != nil {
-		logger.Warnf(ctx, "Failed to update node execution model %+v before after artifact: %v",
+	if err := m.db.NodeExecutionRepo().Update(ctx, &nodeExecutionModel); err != nil {
+		logger.Warnf(ctx, "Failed to update node execution model %+v after deleting artifact: %v",
 			nodeExecution.Id, err)
 		m.metrics.CacheEvictionFailures.Inc()
 		evictionErrors = append(evictionErrors, &core.CacheEvictionError{
diff --git a/flyteadmin/pkg/manager/impl/cache_manager_test.go b/flyteadmin/pkg/manager/impl/cache_manager_test.go
index 0f9cfb4a9a..954119de97 100644
--- a/flyteadmin/pkg/manager/impl/cache_manager_test.go
+++ b/flyteadmin/pkg/manager/impl/cache_manager_test.go
@@ -89,9 +89,10 @@ func setupCacheEvictionMockRepositories(t *testing.T, repository interfaces.Repo
 		})
 
 	updatedNodeExecutions := make(map[string]int)
-	repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback(
-		func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
-			assert.Nil(t, nodeExecution.CacheStatus)
+
+	repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateCallback(
+		func(ctx context.Context, nodeExecution *models.NodeExecution) error {
+			assert.Equal(t, core.CatalogCacheStatus_CACHE_EVICTED.String(), *nodeExecution.CacheStatus)
 
 			var closure admin.NodeExecutionClosure
 			err := proto.Unmarshal(nodeExecution.Closure, &closure)
@@ -99,7 +100,7 @@ func setupCacheEvictionMockRepositories(t *testing.T, repository interfaces.Repo
 			md, ok := closure.TargetMetadata.(*admin.NodeExecutionClosure_TaskNodeMetadata)
 			require.True(t, ok)
 			require.NotNil(t, md.TaskNodeMetadata)
-			assert.Equal(t, core.CatalogCacheStatus_CACHE_DISABLED, md.TaskNodeMetadata.CacheStatus)
+			assert.Equal(t, core.CatalogCacheStatus_CACHE_EVICTED, md.TaskNodeMetadata.CacheStatus)
 
 			updatedNodeExecutions[nodeExecution.NodeID]++
 
@@ -1488,7 +1489,7 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 				assert.Empty(t, updatedNodeExecutions)
 			})
 
-			t.Run("UpdateSelected", func(t *testing.T) {
+			t.Run("Update", func(t *testing.T) {
 				repository := repositoryMocks.NewMockRepository()
 				catalogClient := &mocks.Client{}
 				mockConfig := getMockExecutionsConfigProvider()
@@ -1589,8 +1590,8 @@ func TestEvictTaskExecutionCache(t *testing.T) {
 					}
 				}
 
-				repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateSelectedCallback(
-					func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
+				repository.NodeExecutionRepo().(*repositoryMocks.MockNodeExecutionRepo).SetUpdateCallback(
+					func(ctx context.Context, nodeExecution *models.NodeExecution) error {
 						return flyteAdminErrors.NewFlyteAdminError(codes.Internal, "error")
 					})
 
diff --git a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go
index baa94fe306..0fe97d2f8c 100644
--- a/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go
+++ b/flyteadmin/pkg/repositories/gormimpl/node_execution_repo.go
@@ -105,16 +105,6 @@ func (r *NodeExecutionRepo) Update(ctx context.Context, nodeExecution *models.No
 	return nil
 }
 
-func (r *NodeExecutionRepo) UpdateSelected(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
-	timer := r.metrics.UpdateDuration.Start()
-	tx := r.db.WithContext(ctx).Model(&nodeExecution).Select(selectedFields).Updates(nodeExecution)
-	timer.Stop()
-	if err := tx.Error; err != nil {
-		return r.errorTransformer.ToFlyteAdminError(err)
-	}
-	return nil
-}
-
 func (r *NodeExecutionRepo) List(ctx context.Context, input interfaces.ListResourceInput) (
 	interfaces.NodeExecutionCollectionOutput, error) {
 	// First validate input.
diff --git a/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go b/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go
index 88eb724a83..bbc7b7acb3 100644
--- a/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go
+++ b/flyteadmin/pkg/repositories/interfaces/node_execution_repo.go
@@ -13,9 +13,6 @@ type NodeExecutionRepoInterface interface {
 	Create(ctx context.Context, execution *models.NodeExecution) error
 	// Update an existing node execution in the database store with all non-empty fields in the input.
 	Update(ctx context.Context, execution *models.NodeExecution) error
-	// UpdateSelected updates the selected fields of an existing node execution in the database.
-	// This is required when updating fields to their zero values (e.g. nil) as Update will only handle non-empty fields.
-	UpdateSelected(ctx context.Context, execution *models.NodeExecution, selectedFields []string) error
 	// Get returns a matching execution if it exists.
 	Get(ctx context.Context, input NodeExecutionResource) (models.NodeExecution, error)
 	// GetWithChildren returns a matching execution with preloaded child node executions. This should only be called for legacy node executions
diff --git a/flyteadmin/pkg/repositories/mocks/node_execution_repo.go b/flyteadmin/pkg/repositories/mocks/node_execution_repo.go
index 16c6f6ae69..763d4e17dc 100644
--- a/flyteadmin/pkg/repositories/mocks/node_execution_repo.go
+++ b/flyteadmin/pkg/repositories/mocks/node_execution_repo.go
@@ -9,7 +9,6 @@ import (
 
 type CreateNodeExecutionFunc func(ctx context.Context, input *models.NodeExecution) error
 type UpdateNodeExecutionFunc func(ctx context.Context, nodeExecution *models.NodeExecution) error
-type UpdateSelectedNodeExecutionFunc func(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error
 type GetNodeExecutionFunc func(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error)
 type ListNodeExecutionFunc func(ctx context.Context, input interfaces.ListResourceInput) (
 	interfaces.NodeExecutionCollectionOutput, error)
@@ -19,7 +18,6 @@ type CountNodeExecutionFunc func(ctx context.Context, input interfaces.CountReso
 type MockNodeExecutionRepo struct {
 	createFunction          CreateNodeExecutionFunc
 	updateFunction          UpdateNodeExecutionFunc
-	updateSelectedFunction  UpdateSelectedNodeExecutionFunc
 	getFunction             GetNodeExecutionFunc
 	getWithChildrenFunction GetNodeExecutionFunc
 	listFunction            ListNodeExecutionFunc
@@ -49,17 +47,6 @@ func (r *MockNodeExecutionRepo) SetUpdateCallback(updateFunction UpdateNodeExecu
 	r.updateFunction = updateFunction
 }
 
-func (r *MockNodeExecutionRepo) UpdateSelected(ctx context.Context, nodeExecution *models.NodeExecution, selectedFields []string) error {
-	if r.updateSelectedFunction != nil {
-		return r.updateSelectedFunction(ctx, nodeExecution, selectedFields)
-	}
-	return nil
-}
-
-func (r *MockNodeExecutionRepo) SetUpdateSelectedCallback(updateSelectedFunction UpdateSelectedNodeExecutionFunc) {
-	r.updateSelectedFunction = updateSelectedFunction
-}
-
 func (r *MockNodeExecutionRepo) Get(ctx context.Context, input interfaces.NodeExecutionResource) (models.NodeExecution, error) {
 	if r.getFunction != nil {
 		return r.getFunction(ctx, input)

From 6aeaae19000a84c34a8cbdd62559ec675c5806af Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Fri, 26 Jan 2024 01:30:23 -0800
Subject: [PATCH 44/57] remove bulk endpoints

Signed-off-by: Paul Dittamo 
---
 .../pkg/manager/impl/artifact_manager.go      |   29 -
 .../pkg/manager/impl/artifact_manager_test.go |  417 +-
 .../pkg/manager/impl/reservation_manager.go   |   60 -
 .../manager/impl/reservation_manager_test.go  |  711 --
 .../impl/validators/artifact_validator.go     |   22 -
 .../impl/validators/reservation_validator.go  |   41 -
 .../pkg/manager/interfaces/artifact.go        |    1 -
 .../pkg/manager/interfaces/reservation.go     |    2 -
 .../pkg/manager/mocks/artifact_manager.go     |   41 -
 .../pkg/manager/mocks/reservation_manager.go  |   82 -
 .../pkg/rpc/datacatalogservice/service.go     |   12 -
 .../go/datacatalog/mocks/DataCatalogClient.go |  144 -
 .../datacatalog/datacatalog.grpc.pb.cc        |  132 +-
 .../datacatalog/datacatalog.grpc.pb.h         |  572 +-
 .../flyteidl/datacatalog/datacatalog.pb.cc    | 1790 +---
 .../flyteidl/datacatalog/datacatalog.pb.h     |  678 +-
 .../flyteidl/datacatalog/datacatalog.pb.go    |  582 +-
 .../gen/pb-java/datacatalog/Datacatalog.java  | 8581 +++++------------
 .../flyteidl/datacatalog/datacatalog_pb2.py   |  118 +-
 .../flyteidl/datacatalog/datacatalog_pb2.pyi  |   24 -
 .../datacatalog/datacatalog_pb2_grpc.py       |  114 -
 flyteidl/gen/pb_rust/datacatalog.rs           |   32 -
 .../flyteidl/datacatalog/datacatalog.proto    |   45 -
 23 files changed, 2967 insertions(+), 11263 deletions(-)

diff --git a/datacatalog/pkg/manager/impl/artifact_manager.go b/datacatalog/pkg/manager/impl/artifact_manager.go
index c5fa9512a3..655e1f6b25 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager.go
@@ -486,35 +486,6 @@ func (m *artifactManager) DeleteArtifact(ctx context.Context, request *datacatal
 	return &datacatalog.DeleteArtifactResponse{}, nil
 }
 
-// DeleteArtifacts deletes the given artifacts, removing all stored artifact data from the underlying blob storage.
-func (m *artifactManager) DeleteArtifacts(ctx context.Context, request *datacatalog.DeleteArtifactsRequest) (*datacatalog.DeleteArtifactResponse, error) {
-	timer := m.systemMetrics.bulkDeleteResponseTime.Start(ctx)
-	defer timer.Stop()
-
-	err := validators.ValidateDeleteArtifactsRequest(request)
-	if err != nil {
-		logger.Warningf(ctx, "Invalid delete artifacts request %v, err: %v", request, err)
-		m.systemMetrics.validationErrorCounter.Inc(ctx)
-		m.systemMetrics.bulkDeleteFailureCounter.Inc(ctx)
-		return nil, err
-	}
-
-	for _, deleteArtifactReq := range request.Artifacts {
-		if err := m.deleteArtifact(ctx, deleteArtifactReq.GetDataset(), deleteArtifactReq); err != nil {
-			// bulk delete endpoint is idempotent, ignore errors regarding missing artifacts as they might've already
-			// been deleted by a previous call.
-			if errors.IsDoesNotExistError(err) {
-				continue
-			}
-			m.systemMetrics.bulkDeleteFailureCounter.Inc(ctx)
-			return nil, err
-		}
-	}
-
-	m.systemMetrics.bulkDeleteSuccessCounter.Inc(ctx)
-	return &datacatalog.DeleteArtifactResponse{}, nil
-}
-
 func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.DataStore, storagePrefix storage.DataReference, artifactScope promutils.Scope) interfaces.ArtifactManager {
 	artifactMetrics := artifactMetrics{
 		scope:                    artifactScope,
diff --git a/datacatalog/pkg/manager/impl/artifact_manager_test.go b/datacatalog/pkg/manager/impl/artifact_manager_test.go
index 3313980cb1..a06fe4c744 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager_test.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager_test.go
@@ -5,28 +5,28 @@ import (
 	stdErrors "errors"
 	"fmt"
 	"os"
+	"reflect"
 	"testing"
 	"time"
-	"reflect"
 
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"
 	"github.com/flyteorg/flyte/datacatalog/pkg/common"
 	"github.com/flyteorg/flyte/datacatalog/pkg/errors"
 	repoErrors "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/mocks"
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
+	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog"
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	mockScope "github.com/flyteorg/flyte/flytestdlib/promutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
 	"github.com/flyteorg/flyte/flytestdlib/storage"
+	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/ptypes"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 func init() {
@@ -657,7 +657,6 @@ func TestUpdateArtifact(t *testing.T) {
 					reflect.DeepEqual(artifact.SerializedMetadata, serializedMetadata)
 			})).Return(nil)
 
-
 		request := &datacatalog.UpdateArtifactRequest{
 			Dataset: expectedDataset.Id,
 			QueryHandle: &datacatalog.UpdateArtifactRequest_ArtifactId{
@@ -1262,403 +1261,3 @@ func TestDeleteArtifact(t *testing.T) {
 		assert.Nil(t, artifactResponse)
 	})
 }
-
-func TestDeleteArtifacts(t *testing.T) {
-	ctx := context.Background()
-	datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-	testStoragePrefix, err := datastore.ConstructReference(ctx, datastore.GetBaseContainerFQN(ctx), "test")
-	assert.NoError(t, err)
-
-	expectedDataset := getTestDataset()
-	expectedArtifact := getTestArtifact()
-	expectedTag := getTestTag()
-
-	t.Run("Delete by ID", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
-
-		dcRepo := newMockDataCatalogRepo()
-		dcRepo.MockArtifactRepo.On("Get",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
-				return artifactKey.ArtifactID == expectedArtifact.Id &&
-					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
-					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(mockArtifactModel, nil)
-
-		dcRepo.MockArtifactRepo.On("Delete",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifact models.Artifact) bool {
-				return artifact.ArtifactID == expectedArtifact.Id &&
-					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifact.DatasetName == expectedArtifact.Dataset.Name &&
-					artifact.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(nil)
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
-						ArtifactId: expectedArtifact.Id,
-					},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.NoError(t, err)
-		assert.NotNil(t, artifactResponse)
-
-		// check that the datastore no longer has artifactData available
-		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
-		assert.NoError(t, err)
-		var value core.Literal
-		err = datastore.ReadProtobuf(ctx, dataRef, &value)
-		assert.Error(t, err)
-		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
-	})
-
-	t.Run("Delete by artifact tag", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
-
-		dcRepo := newMockDataCatalogRepo()
-		dcRepo.MockArtifactRepo.On("Delete",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifact models.Artifact) bool {
-				return artifact.ArtifactID == expectedArtifact.Id &&
-					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifact.DatasetName == expectedArtifact.Dataset.Name &&
-					artifact.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(nil)
-
-		dcRepo.MockTagRepo.On("Get", mock.Anything,
-			mock.MatchedBy(func(tag models.TagKey) bool {
-				return tag.TagName == expectedTag.TagName &&
-					tag.DatasetProject == expectedTag.DatasetProject &&
-					tag.DatasetDomain == expectedTag.DatasetDomain &&
-					tag.DatasetVersion == expectedTag.DatasetVersion &&
-					tag.DatasetName == expectedTag.DatasetName
-			})).Return(models.Tag{
-			TagKey: models.TagKey{
-				DatasetProject: expectedTag.DatasetProject,
-				DatasetDomain:  expectedTag.DatasetDomain,
-				DatasetName:    expectedTag.DatasetName,
-				DatasetVersion: expectedTag.DatasetVersion,
-				TagName:        expectedTag.TagName,
-			},
-			DatasetUUID: expectedTag.DatasetUUID,
-			Artifact:    mockArtifactModel,
-			ArtifactID:  mockArtifactModel.ArtifactID,
-		}, nil)
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{
-						TagName: expectedTag.TagName,
-					},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.NoError(t, err)
-		assert.NotNil(t, artifactResponse)
-
-		// check that the datastore no longer has artifactData available
-		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
-		assert.NoError(t, err)
-		var value core.Literal
-		err = datastore.ReadProtobuf(ctx, dataRef, &value)
-		assert.Error(t, err)
-		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
-	})
-
-	t.Run("Artifact not found", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-
-		dcRepo := newMockDataCatalogRepo()
-		dcRepo.MockArtifactRepo.On("Get", mock.Anything, mock.Anything).Return(models.Artifact{}, repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
-			Dataset: expectedDataset.Id,
-			Id:      expectedArtifact.Id,
-		}))
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
-						ArtifactId: expectedArtifact.Id,
-					},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.NoError(t, err)
-		assert.NotNil(t, artifactResponse)
-	})
-
-	t.Run("Artifact not found during delete", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
-
-		dcRepo := newMockDataCatalogRepo()
-		dcRepo.MockArtifactRepo.On("Get",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
-				return artifactKey.ArtifactID == expectedArtifact.Id &&
-					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
-					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(mockArtifactModel, nil)
-		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).Return(repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
-			Dataset: expectedDataset.Id,
-			Id:      expectedArtifact.Id,
-		}))
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
-						ArtifactId: expectedArtifact.Id,
-					},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.NoError(t, err)
-		assert.NotNil(t, artifactResponse)
-	})
-
-	t.Run("Artifact delete failed", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
-
-		dcRepo := newMockDataCatalogRepo()
-		dcRepo.MockArtifactRepo.On("Get",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
-				return artifactKey.ArtifactID == expectedArtifact.Id &&
-					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
-					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(mockArtifactModel, nil)
-		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).Return(errors.NewDataCatalogError(codes.Internal, "failed"))
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
-						ArtifactId: expectedArtifact.Id,
-					},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.Error(t, err)
-		assert.Equal(t, codes.Internal, status.Code(err))
-		assert.Nil(t, artifactResponse)
-	})
-
-	t.Run("Missing artifact ID", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-
-		dcRepo := newMockDataCatalogRepo()
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset:     expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.Error(t, err)
-		assert.Equal(t, codes.InvalidArgument, status.Code(err))
-		assert.Nil(t, artifactResponse)
-	})
-
-	t.Run("Missing artifact tag", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-
-		dcRepo := newMockDataCatalogRepo()
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset:     expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_TagName{},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.Error(t, err)
-		assert.Equal(t, codes.InvalidArgument, status.Code(err))
-		assert.Nil(t, artifactResponse)
-	})
-
-	t.Run("Idempotency", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
-
-		dcRepo := newMockDataCatalogRepo()
-		dcRepo.MockArtifactRepo.On("Get",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
-				return artifactKey.ArtifactID == expectedArtifact.Id &&
-					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
-					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Once().Return(mockArtifactModel, nil)
-		dcRepo.MockArtifactRepo.On("Get", mock.Anything, mock.Anything).Return(models.Artifact{},
-			repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
-				Dataset: expectedDataset.Id,
-				Id:      expectedArtifact.Id,
-			}))
-
-		dcRepo.MockArtifactRepo.On("Delete",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifact models.Artifact) bool {
-				return artifact.ArtifactID == expectedArtifact.Id &&
-					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifact.DatasetName == expectedArtifact.Dataset.Name &&
-					artifact.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Once().Return(nil)
-		dcRepo.MockArtifactRepo.On("Delete", mock.Anything, mock.Anything).
-			Return(repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
-				Dataset: expectedDataset.Id,
-				Id:      expectedArtifact.Id,
-			}))
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
-						ArtifactId: expectedArtifact.Id,
-					},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.NoError(t, err)
-		assert.NotNil(t, artifactResponse)
-
-		// check that the datastore no longer has artifactData available
-		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
-		assert.NoError(t, err)
-		var value core.Literal
-		err = datastore.ReadProtobuf(ctx, dataRef, &value)
-		assert.Error(t, err)
-		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
-
-		artifactResponse, err = artifactManager.DeleteArtifacts(ctx, request)
-		assert.NoError(t, err)
-		assert.NotNil(t, artifactResponse)
-	})
-
-	t.Run("Multiple states", func(t *testing.T) {
-		ctx := context.Background()
-		datastore := createInmemoryDataStore(t, mockScope.NewTestScope())
-		mockArtifactModel := getExpectedArtifactModel(ctx, t, datastore, expectedArtifact)
-
-		dcRepo := newMockDataCatalogRepo()
-		dcRepo.MockArtifactRepo.On("Get",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
-				return artifactKey.ArtifactID == expectedArtifact.Id &&
-					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
-					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(mockArtifactModel, nil)
-		dcRepo.MockArtifactRepo.On("Get",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifactKey models.ArtifactKey) bool {
-				return artifactKey.ArtifactID == "notFound" &&
-					artifactKey.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifactKey.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifactKey.DatasetName == expectedArtifact.Dataset.Name &&
-					artifactKey.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(models.Artifact{}, repoErrors.GetMissingEntityError("Artifact", &datacatalog.Artifact{
-			Dataset: expectedDataset.Id,
-			Id:      "notFound",
-		}))
-
-		dcRepo.MockArtifactRepo.On("Delete",
-			mock.MatchedBy(func(ctx context.Context) bool { return true }),
-			mock.MatchedBy(func(artifact models.Artifact) bool {
-				return artifact.ArtifactID == expectedArtifact.Id &&
-					artifact.DatasetProject == expectedArtifact.Dataset.Project &&
-					artifact.DatasetDomain == expectedArtifact.Dataset.Domain &&
-					artifact.DatasetName == expectedArtifact.Dataset.Name &&
-					artifact.DatasetVersion == expectedArtifact.Dataset.Version
-			})).Return(nil)
-
-		request := &datacatalog.DeleteArtifactsRequest{
-			Artifacts: []*datacatalog.DeleteArtifactRequest{
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
-						ArtifactId: expectedArtifact.Id,
-					},
-				},
-				{
-					Dataset: expectedDataset.Id,
-					QueryHandle: &datacatalog.DeleteArtifactRequest_ArtifactId{
-						ArtifactId: "notFound",
-					},
-				},
-			},
-		}
-
-		artifactManager := NewArtifactManager(dcRepo, datastore, testStoragePrefix, mockScope.NewTestScope())
-		artifactResponse, err := artifactManager.DeleteArtifacts(ctx, request)
-		assert.NoError(t, err)
-		assert.NotNil(t, artifactResponse)
-
-		// check that the datastore no longer has artifactData available
-		dataRef, err := getExpectedDatastoreLocationFromName(ctx, datastore, testStoragePrefix, expectedArtifact, "data1")
-		assert.NoError(t, err)
-		var value core.Literal
-		err = datastore.ReadProtobuf(ctx, dataRef, &value)
-		assert.Error(t, err)
-		assert.True(t, stdErrors.Is(err, os.ErrNotExist))
-	})
-}
diff --git a/datacatalog/pkg/manager/impl/reservation_manager.go b/datacatalog/pkg/manager/impl/reservation_manager.go
index 08d324ccf5..d63a28f85d 100644
--- a/datacatalog/pkg/manager/impl/reservation_manager.go
+++ b/datacatalog/pkg/manager/impl/reservation_manager.go
@@ -23,9 +23,7 @@ type reservationMetrics struct {
 	reservationReleased          labeled.Counter
 	reservationAlreadyInProgress labeled.Counter
 	acquireReservationFailure    labeled.Counter
-	acquireReservationsFailure   labeled.Counter
 	releaseReservationFailure    labeled.Counter
-	releaseReservationsFailure   labeled.Counter
 	reservationDoesNotExist      labeled.Counter
 }
 
@@ -67,21 +65,11 @@ func NewReservationManager(
 			"Number of times we failed to acquire reservation",
 			reservationScope,
 		),
-		acquireReservationsFailure: labeled.NewCounter(
-			"acquire_reservations_failure",
-			"Number of times we failed to acquire multiple reservations",
-			reservationScope,
-		),
 		releaseReservationFailure: labeled.NewCounter(
 			"release_reservation_failure",
 			"Number of times we failed to release a reservation",
 			reservationScope,
 		),
-		releaseReservationsFailure: labeled.NewCounter(
-			"release_reservations_failure",
-			"Number of times we failed to release multiple reservations",
-			reservationScope,
-		),
 		reservationDoesNotExist: labeled.NewCounter(
 			"reservation_does_not_exist",
 			"Number of times we attempt to modify a reservation that does not exist",
@@ -127,36 +115,6 @@ func (r *reservationManager) GetOrExtendReservation(ctx context.Context, request
 	}, nil
 }
 
-// GetOrExtendReservations attempts to get or extend reservations for multiple artifacts in a single operation.
-func (r *reservationManager) GetOrExtendReservations(ctx context.Context, request *datacatalog.GetOrExtendReservationsRequest) (*datacatalog.GetOrExtendReservationsResponse, error) {
-	if err := validators.ValidateGetOrExtendReservationsRequest(request); err != nil {
-		r.systemMetrics.acquireReservationsFailure.Inc(ctx)
-		return nil, err
-	}
-
-	var reservations []*datacatalog.Reservation
-	for _, req := range request.GetReservations() {
-		// Use minimum of maxHeartbeatInterval and requested heartbeat interval
-		heartbeatInterval := r.maxHeartbeatInterval
-		requestHeartbeatInterval := req.GetHeartbeatInterval()
-		if requestHeartbeatInterval != nil && requestHeartbeatInterval.AsDuration() < heartbeatInterval {
-			heartbeatInterval = requestHeartbeatInterval.AsDuration()
-		}
-
-		reservation, err := r.tryAcquireReservation(ctx, req.ReservationId, req.OwnerId, heartbeatInterval)
-		if err != nil {
-			r.systemMetrics.acquireReservationsFailure.Inc(ctx)
-			return nil, err
-		}
-
-		reservations = append(reservations, &reservation)
-	}
-
-	return &datacatalog.GetOrExtendReservationsResponse{
-		Reservations: reservations,
-	}, nil
-}
-
 // tryAcquireReservation will fetch the reservation first and only create/update
 // the reservation if it does not exist or has expired.
 // This is an optimization to reduce the number of writes to db. We always need
@@ -249,24 +207,6 @@ func (r *reservationManager) ReleaseReservation(ctx context.Context, request *da
 	return &datacatalog.ReleaseReservationResponse{}, nil
 }
 
-// ReleaseReservations releases reservations for multiple artifacts in a single operation.
-// This is an idempotent operation, releasing reservations multiple times or trying to release an unknown reservation
-// will not result in an error being returned.
-func (r *reservationManager) ReleaseReservations(ctx context.Context, request *datacatalog.ReleaseReservationsRequest) (*datacatalog.ReleaseReservationResponse, error) {
-	if err := validators.ValidateReleaseReservationsRequest(request); err != nil {
-		return nil, err
-	}
-
-	for _, req := range request.GetReservations() {
-		if err := r.releaseReservation(ctx, req.ReservationId, req.OwnerId); err != nil {
-			r.systemMetrics.releaseReservationsFailure.Inc(ctx)
-			return nil, err
-		}
-	}
-
-	return &datacatalog.ReleaseReservationResponse{}, nil
-}
-
 // releaseReservation performs the actual reservation release operation, deleting the respective object from
 // datacatalog's database, thus freeing the associated artifact for other entities. If the specified reservation was not
 // found, no error will be returned.
diff --git a/datacatalog/pkg/manager/impl/reservation_manager_test.go b/datacatalog/pkg/manager/impl/reservation_manager_test.go
index b7f36e3395..fc883600cf 100644
--- a/datacatalog/pkg/manager/impl/reservation_manager_test.go
+++ b/datacatalog/pkg/manager/impl/reservation_manager_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/golang/protobuf/ptypes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 
 	errors2 "github.com/flyteorg/flyte/datacatalog/pkg/errors"
@@ -91,78 +90,6 @@ func TestGetOrExtendReservation_CreateReservation(t *testing.T) {
 	assert.Equal(t, heartbeatIntervalPb, resp.GetReservation().HeartbeatInterval)
 }
 
-func TestGetOrExtendReservations_CreateReservations(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	setUpTagRepoGetNotFound(&dcRepo)
-
-	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
-	dcRepo.MockReservationRepo.On("Get",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(key models.ReservationKey) bool {
-			return key.DatasetProject == datasetID.Project &&
-				key.DatasetDomain == datasetID.Domain &&
-				key.DatasetVersion == datasetID.Version &&
-				key.DatasetName == datasetID.Name &&
-				tagNames[key.TagName]
-		})).Return(models.Reservation{}, errors2.NewDataCatalogErrorf(codes.NotFound, "entry not found"))
-
-	now := time.Now()
-	dcRepo.MockReservationRepo.On("Create",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservation models.Reservation) bool {
-			return reservation.DatasetProject == datasetID.Project &&
-				reservation.DatasetDomain == datasetID.Domain &&
-				reservation.DatasetName == datasetID.Name &&
-				reservation.DatasetVersion == datasetID.Version &&
-				tagNames[reservation.TagName] &&
-				reservation.OwnerID == currentOwner &&
-				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
-		}),
-		mock.MatchedBy(func(now time.Time) bool { return true }),
-	).Return(nil)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.GetOrExtendReservationsRequest{
-		Reservations: []*datacatalog.GetOrExtendReservationRequest{
-			{
-				ReservationId:     &reservationID,
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-		},
-	}
-
-	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-	require.NotNil(t, resp.GetReservations())
-	require.Len(t, resp.GetReservations(), 3)
-	for _, reservation := range resp.GetReservations() {
-		assert.Equal(t, currentOwner, reservation.OwnerId)
-		assert.Equal(t, heartbeatIntervalPb, reservation.HeartbeatInterval)
-	}
-}
-
 func TestGetOrExtendReservation_MaxHeartbeatInterval(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -211,79 +138,6 @@ func TestGetOrExtendReservation_MaxHeartbeatInterval(t *testing.T) {
 	assert.Equal(t, heartbeatIntervalPb, resp.GetReservation().HeartbeatInterval)
 }
 
-func TestGetOrExtendReservations_MaxHeartbeatInterval(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	setUpTagRepoGetNotFound(&dcRepo)
-
-	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
-	dcRepo.MockReservationRepo.On("Get",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(key models.ReservationKey) bool {
-			return key.DatasetProject == datasetID.Project &&
-				key.DatasetDomain == datasetID.Domain &&
-				key.DatasetVersion == datasetID.Version &&
-				key.DatasetName == datasetID.Name &&
-				tagNames[key.TagName]
-		})).Return(models.Reservation{}, errors2.NewDataCatalogErrorf(codes.NotFound, "entry not found"))
-
-	now := time.Now()
-
-	dcRepo.MockReservationRepo.On("Create",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservation models.Reservation) bool {
-			return reservation.DatasetProject == datasetID.Project &&
-				reservation.DatasetDomain == datasetID.Domain &&
-				reservation.DatasetName == datasetID.Name &&
-				reservation.DatasetVersion == datasetID.Version &&
-				tagNames[reservation.TagName] &&
-				reservation.OwnerID == currentOwner &&
-				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
-		}),
-		mock.MatchedBy(func(now time.Time) bool { return true }),
-	).Return(nil)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, heartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.GetOrExtendReservationsRequest{
-		Reservations: []*datacatalog.GetOrExtendReservationRequest{
-			{
-				ReservationId:     &reservationID,
-				OwnerId:           currentOwner,
-				HeartbeatInterval: maxHeartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: maxHeartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: maxHeartbeatIntervalPb,
-			},
-		},
-	}
-
-	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-	require.NotNil(t, resp.GetReservations())
-	require.Len(t, resp.GetReservations(), 3)
-	for _, reservation := range resp.GetReservations() {
-		assert.Equal(t, currentOwner, reservation.OwnerId)
-		assert.Equal(t, heartbeatIntervalPb, reservation.HeartbeatInterval)
-	}
-}
-
 func TestGetOrExtendReservation_ExtendReservation(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -324,71 +178,6 @@ func TestGetOrExtendReservation_ExtendReservation(t *testing.T) {
 	assert.Equal(t, prevOwner, resp.GetReservation().OwnerId)
 }
 
-func TestGetOrExtendReservations_ExtendReservations(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	setUpTagRepoGetNotFound(&dcRepo)
-
-	now := time.Now()
-	prevExpiresAt := now.Add(time.Second * 10)
-
-	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
-	setUpReservationRepoGet(&dcRepo, prevExpiresAt, tagName, "tag2", "nonexistence")
-
-	dcRepo.MockReservationRepo.On("Update",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservation models.Reservation) bool {
-			return reservation.DatasetProject == datasetID.Project &&
-				reservation.DatasetDomain == datasetID.Domain &&
-				reservation.DatasetName == datasetID.Name &&
-				reservation.DatasetVersion == datasetID.Version &&
-				tagNames[reservation.TagName] &&
-				reservation.OwnerID == prevOwner &&
-				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
-		}),
-		mock.MatchedBy(func(now time.Time) bool { return true }),
-	).Return(nil)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.GetOrExtendReservationsRequest{
-		Reservations: []*datacatalog.GetOrExtendReservationRequest{
-			{
-				ReservationId:     &reservationID,
-				OwnerId:           prevOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId:           prevOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId:           prevOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-		},
-	}
-
-	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-	require.NotNil(t, resp.GetReservations())
-	require.Len(t, resp.GetReservations(), 3)
-	for _, reservation := range resp.GetReservations() {
-		assert.Equal(t, prevOwner, reservation.OwnerId)
-	}
-}
-
 func TestGetOrExtendReservation_TakeOverReservation(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -429,71 +218,6 @@ func TestGetOrExtendReservation_TakeOverReservation(t *testing.T) {
 	assert.Equal(t, currentOwner, resp.GetReservation().OwnerId)
 }
 
-func TestGetOrExtendReservations_TakeOverReservations(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	setUpTagRepoGetNotFound(&dcRepo)
-
-	now := time.Now()
-	prevExpiresAt := now.Add(time.Second * 10 * time.Duration(-1))
-
-	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
-	setUpReservationRepoGet(&dcRepo, prevExpiresAt, tagName, "tag2", "nonexistence")
-
-	dcRepo.MockReservationRepo.On("Update",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservation models.Reservation) bool {
-			return reservation.DatasetProject == datasetID.Project &&
-				reservation.DatasetDomain == datasetID.Domain &&
-				reservation.DatasetName == datasetID.Name &&
-				reservation.DatasetVersion == datasetID.Version &&
-				tagNames[reservation.TagName] &&
-				reservation.OwnerID == currentOwner &&
-				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
-		}),
-		mock.MatchedBy(func(now time.Time) bool { return true }),
-	).Return(nil)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.GetOrExtendReservationsRequest{
-		Reservations: []*datacatalog.GetOrExtendReservationRequest{
-			{
-				ReservationId:     &reservationID,
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-		},
-	}
-
-	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-	require.NotNil(t, resp.GetReservations())
-	require.Len(t, resp.GetReservations(), 3)
-	for _, reservation := range resp.GetReservations() {
-		assert.Equal(t, currentOwner, reservation.OwnerId)
-	}
-}
-
 func TestGetOrExtendReservation_ReservationExists(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -520,209 +244,6 @@ func TestGetOrExtendReservation_ReservationExists(t *testing.T) {
 	assert.Equal(t, prevOwner, resp.GetReservation().OwnerId)
 }
 
-func TestGetOrExtendReservations_ReservationsExist(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	setUpTagRepoGetNotFound(&dcRepo)
-
-	now := time.Now()
-	prevExpiresAt := now.Add(time.Second * 10)
-
-	setUpReservationRepoGet(&dcRepo, prevExpiresAt, tagName, "tag2", "nonexistence")
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.GetOrExtendReservationsRequest{
-		Reservations: []*datacatalog.GetOrExtendReservationRequest{
-			{
-				ReservationId:     &reservationID,
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-		},
-	}
-
-	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-	require.NotNil(t, resp.GetReservations())
-	require.Len(t, resp.GetReservations(), 3)
-	for _, reservation := range resp.GetReservations() {
-		assert.Equal(t, prevOwner, reservation.OwnerId)
-	}
-}
-
-func TestGetOrExtendReservations_MultipleStates(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	setUpTagRepoGetNotFound(&dcRepo)
-
-	now := time.Now()
-	prevExpiresAt := now.Add(time.Second * 10)
-
-	dcRepo.MockReservationRepo.On("Get",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(key models.ReservationKey) bool {
-			return key.DatasetProject == datasetID.Project &&
-				key.DatasetDomain == datasetID.Domain &&
-				key.DatasetVersion == datasetID.Version &&
-				key.DatasetName == datasetID.Name &&
-				key.TagName == tagName
-		})).Return(models.Reservation{}, errors2.NewDataCatalogErrorf(codes.NotFound, "entry not found"))
-
-	dcRepo.MockReservationRepo.On("Get",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(key models.ReservationKey) bool {
-			return key.DatasetProject == datasetID.Project &&
-				key.DatasetDomain == datasetID.Domain &&
-				key.DatasetVersion == datasetID.Version &&
-				key.DatasetName == datasetID.Name &&
-				key.TagName == "prevOwner"
-		})).Return(
-		models.Reservation{
-			ReservationKey: models.ReservationKey{
-				DatasetProject: project,
-				DatasetName:    name,
-				DatasetDomain:  domain,
-				DatasetVersion: version,
-				TagName:        "prevOwner",
-			},
-			OwnerID:   prevOwner,
-			ExpiresAt: prevExpiresAt,
-		}, nil,
-	)
-
-	dcRepo.MockReservationRepo.On("Get",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(key models.ReservationKey) bool {
-			return key.DatasetProject == datasetID.Project &&
-				key.DatasetDomain == datasetID.Domain &&
-				key.DatasetVersion == datasetID.Version &&
-				key.DatasetName == datasetID.Name &&
-				key.TagName == "currentOwner"
-		})).Return(
-		models.Reservation{
-			ReservationKey: getReservationKey(),
-			OwnerID:        currentOwner,
-			ExpiresAt:      prevExpiresAt,
-		}, nil,
-	)
-
-	dcRepo.MockReservationRepo.On("Get",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(key models.ReservationKey) bool {
-			return key.DatasetProject == datasetID.Project &&
-				key.DatasetDomain == datasetID.Domain &&
-				key.DatasetVersion == datasetID.Version &&
-				key.DatasetName == datasetID.Name &&
-				key.TagName == "currentOwnerExpired"
-		})).Return(
-		models.Reservation{
-			ReservationKey: getReservationKey(),
-			OwnerID:        currentOwner,
-			ExpiresAt:      now.Add(-10 * time.Second),
-		}, nil,
-	)
-
-	dcRepo.MockReservationRepo.On("Create",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservation models.Reservation) bool {
-			return reservation.DatasetProject == datasetID.Project &&
-				reservation.DatasetDomain == datasetID.Domain &&
-				reservation.DatasetName == datasetID.Name &&
-				reservation.DatasetVersion == datasetID.Version &&
-				reservation.TagName == tagName &&
-				reservation.OwnerID == currentOwner &&
-				reservation.ExpiresAt == now.Add(heartbeatInterval*heartbeatGracePeriodMultiplier)
-		}),
-		mock.MatchedBy(func(now time.Time) bool { return true }),
-	).Return(nil)
-
-	updateTagNames := map[string]bool{"currentOwner": true, "currentOwnerExpired": true}
-	dcRepo.MockReservationRepo.On("Update",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservation models.Reservation) bool {
-			return reservation.DatasetProject == datasetID.Project &&
-				reservation.DatasetDomain == datasetID.Domain &&
-				reservation.DatasetName == datasetID.Name &&
-				reservation.DatasetVersion == datasetID.Version &&
-				updateTagNames[reservation.TagName] &&
-				reservation.OwnerID == currentOwner
-		}),
-		mock.MatchedBy(func(now time.Time) bool { return true }),
-	).Return(nil)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.GetOrExtendReservationsRequest{
-		Reservations: []*datacatalog.GetOrExtendReservationRequest{
-			{
-				ReservationId:     &reservationID,
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "prevOwner",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "currentOwner",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "currentOwnerExpired",
-				},
-				OwnerId:           currentOwner,
-				HeartbeatInterval: heartbeatIntervalPb,
-			},
-		},
-	}
-
-	resp, err := reservationManager.GetOrExtendReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-	require.NotNil(t, resp.GetReservations())
-	require.Len(t, resp.GetReservations(), 4)
-	for _, reservation := range resp.GetReservations() {
-		if reservation.ReservationId.TagName == "prevOwner" {
-			assert.Equal(t, prevOwner, reservation.OwnerId)
-		} else {
-			assert.Equal(t, currentOwner, reservation.OwnerId)
-		}
-		assert.Equal(t, heartbeatIntervalPb, reservation.HeartbeatInterval)
-	}
-}
-
 func TestReleaseReservation(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -756,58 +277,6 @@ func TestReleaseReservation(t *testing.T) {
 	assert.Nil(t, err)
 }
 
-func TestReleaseReservations(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	now := time.Now()
-
-	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
-	dcRepo.MockReservationRepo.On("Delete",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
-			return reservationKey.DatasetProject == datasetID.Project &&
-				reservationKey.DatasetDomain == datasetID.Domain &&
-				reservationKey.DatasetName == datasetID.Name &&
-				reservationKey.DatasetVersion == datasetID.Version &&
-				tagNames[reservationKey.TagName]
-		}),
-		mock.MatchedBy(func(ownerID string) bool {
-			return ownerID == currentOwner
-		}),
-	).Return(nil)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.ReleaseReservationsRequest{
-		Reservations: []*datacatalog.ReleaseReservationRequest{
-			{
-				ReservationId: &reservationID,
-				OwnerId:       currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId: currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId: currentOwner,
-			},
-		},
-	}
-
-	_, err := reservationManager.ReleaseReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-}
-
 func TestReleaseReservation_Failure(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -842,59 +311,6 @@ func TestReleaseReservation_Failure(t *testing.T) {
 	assert.Equal(t, reservationErr, err)
 }
 
-func TestReleaseReservations_Failure(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	now := time.Now()
-	reservationErr := fmt.Errorf("unknown error")
-
-	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
-	dcRepo.MockReservationRepo.On("Delete",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
-			return reservationKey.DatasetProject == datasetID.Project &&
-				reservationKey.DatasetDomain == datasetID.Domain &&
-				reservationKey.DatasetName == datasetID.Name &&
-				reservationKey.DatasetVersion == datasetID.Version &&
-				tagNames[reservationKey.TagName]
-		}),
-		mock.MatchedBy(func(ownerID string) bool {
-			return ownerID == currentOwner
-		}),
-	).Return(reservationErr)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.ReleaseReservationsRequest{
-		Reservations: []*datacatalog.ReleaseReservationRequest{
-			{
-				ReservationId: &reservationID,
-				OwnerId:       currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId: currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId: currentOwner,
-			},
-		},
-	}
-
-	_, err := reservationManager.ReleaseReservations(context.Background(), req)
-
-	assert.Equal(t, reservationErr, err)
-}
-
 func TestReleaseReservation_GracefulFailure(t *testing.T) {
 	dcRepo := getDatacatalogRepo()
 
@@ -933,133 +349,6 @@ func TestReleaseReservation_GracefulFailure(t *testing.T) {
 	assert.Nil(t, err)
 }
 
-func TestReleaseReservations_GracefulFailure(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	now := time.Now()
-	reservationErr := errors3.GetMissingEntityError("Reservation",
-		&datacatalog.ReservationID{
-			DatasetId: &datasetID,
-			TagName:   tagName,
-		})
-
-	tagNames := map[string]bool{tagName: true, "tag2": true, "nonexistence": true}
-	dcRepo.MockReservationRepo.On("Delete",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
-			return reservationKey.DatasetProject == datasetID.Project &&
-				reservationKey.DatasetDomain == datasetID.Domain &&
-				reservationKey.DatasetName == datasetID.Name &&
-				reservationKey.DatasetVersion == datasetID.Version &&
-				tagNames[reservationKey.TagName]
-		}),
-		mock.MatchedBy(func(ownerID string) bool {
-			return ownerID == currentOwner
-		}),
-	).Return(reservationErr)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.ReleaseReservationsRequest{
-		Reservations: []*datacatalog.ReleaseReservationRequest{
-			{
-				ReservationId: &reservationID,
-				OwnerId:       currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "tag2",
-				},
-				OwnerId: currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "nonexistence",
-				},
-				OwnerId: currentOwner,
-			},
-		},
-	}
-
-	_, err := reservationManager.ReleaseReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-}
-
-func TestReleaseReservation_MultipleStates(t *testing.T) {
-	dcRepo := getDatacatalogRepo()
-
-	now := time.Now()
-	notFoundErr := errors3.GetMissingEntityError("Reservation",
-		&datacatalog.ReservationID{
-			DatasetId: &datasetID,
-			TagName:   tagName,
-		})
-
-	dcRepo.MockReservationRepo.On("Delete",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
-			return reservationKey.DatasetProject == datasetID.Project &&
-				reservationKey.DatasetDomain == datasetID.Domain &&
-				reservationKey.DatasetName == datasetID.Name &&
-				reservationKey.DatasetVersion == datasetID.Version &&
-				(reservationKey.TagName == tagName || reservationKey.TagName == prevOwner)
-		}),
-		mock.MatchedBy(func(ownerID string) bool {
-			return ownerID == currentOwner
-		}),
-	).Return(notFoundErr)
-
-	dcRepo.MockReservationRepo.On("Delete",
-		mock.MatchedBy(func(ctx context.Context) bool { return true }),
-		mock.MatchedBy(func(reservationKey models.ReservationKey) bool {
-			return reservationKey.DatasetProject == datasetID.Project &&
-				reservationKey.DatasetDomain == datasetID.Domain &&
-				reservationKey.DatasetName == datasetID.Name &&
-				reservationKey.DatasetVersion == datasetID.Version &&
-				reservationKey.TagName == "currentOwner"
-		}),
-		mock.MatchedBy(func(ownerID string) bool {
-			return ownerID == currentOwner
-		}),
-	).Return(nil)
-
-	reservationManager := NewReservationManager(&dcRepo,
-		heartbeatGracePeriodMultiplier, maxHeartbeatInterval,
-		func() time.Time { return now }, mockScope.NewTestScope())
-
-	req := &datacatalog.ReleaseReservationsRequest{
-		Reservations: []*datacatalog.ReleaseReservationRequest{
-			{
-				ReservationId: &reservationID,
-				OwnerId:       currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "prevOwner",
-				},
-				OwnerId: currentOwner,
-			},
-			{
-				ReservationId: &datacatalog.ReservationID{
-					DatasetId: &datasetID,
-					TagName:   "currentOwner",
-				},
-				OwnerId: currentOwner,
-			},
-		},
-	}
-
-	_, err := reservationManager.ReleaseReservations(context.Background(), req)
-
-	assert.Nil(t, err)
-}
-
 func getDatacatalogRepo() mocks.DataCatalogRepo {
 	return mocks.DataCatalogRepo{
 		MockReservationRepo: &mocks.ReservationRepo{},
diff --git a/datacatalog/pkg/manager/impl/validators/artifact_validator.go b/datacatalog/pkg/manager/impl/validators/artifact_validator.go
index cdbcdf16a4..4244c2b0ac 100644
--- a/datacatalog/pkg/manager/impl/validators/artifact_validator.go
+++ b/datacatalog/pkg/manager/impl/validators/artifact_validator.go
@@ -3,10 +3,7 @@ package validators
 import (
 	"fmt"
 
-	"google.golang.org/grpc/codes"
-
 	"github.com/flyteorg/flyte/datacatalog/pkg/common"
-	"github.com/flyteorg/flyte/datacatalog/pkg/errors"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog"
 )
 
@@ -173,22 +170,3 @@ func ValidateDeleteArtifactRequest(request *datacatalog.DeleteArtifactRequest) e
 
 	return nil
 }
-
-func ValidateDeleteArtifactsRequest(request *datacatalog.DeleteArtifactsRequest) error {
-	if request.GetArtifacts() == nil {
-		return NewMissingArgumentError("artifacts")
-	}
-
-	var errs []error
-	for _, deleteArtifactReq := range request.GetArtifacts() {
-		if err := ValidateDeleteArtifactRequest(deleteArtifactReq); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if len(errs) > 0 {
-		return errors.NewCollectedErrors(codes.InvalidArgument, errs)
-	}
-
-	return nil
-}
diff --git a/datacatalog/pkg/manager/impl/validators/reservation_validator.go b/datacatalog/pkg/manager/impl/validators/reservation_validator.go
index 28c488cb55..150751bd21 100644
--- a/datacatalog/pkg/manager/impl/validators/reservation_validator.go
+++ b/datacatalog/pkg/manager/impl/validators/reservation_validator.go
@@ -1,9 +1,6 @@
 package validators
 
 import (
-	"google.golang.org/grpc/codes"
-
-	"github.com/flyteorg/flyte/datacatalog/pkg/errors"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog"
 )
 
@@ -29,25 +26,6 @@ func ValidateGetOrExtendReservationRequest(request *datacatalog.GetOrExtendReser
 	return nil
 }
 
-func ValidateGetOrExtendReservationsRequest(request *datacatalog.GetOrExtendReservationsRequest) error {
-	if request.GetReservations() == nil {
-		return NewMissingArgumentError("reservations")
-	}
-
-	var errs []error
-	for _, req := range request.GetReservations() {
-		if err := ValidateGetOrExtendReservationRequest(req); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if len(errs) > 0 {
-		return errors.NewCollectedErrors(codes.InvalidArgument, errs)
-	}
-
-	return nil
-}
-
 func ValidateReleaseReservationRequest(request *datacatalog.ReleaseReservationRequest) error {
 	if request.GetReservationId() == nil {
 		return NewMissingArgumentError("reservationID")
@@ -65,22 +43,3 @@ func ValidateReleaseReservationRequest(request *datacatalog.ReleaseReservationRe
 
 	return nil
 }
-
-func ValidateReleaseReservationsRequest(request *datacatalog.ReleaseReservationsRequest) error {
-	if request.GetReservations() == nil {
-		return NewMissingArgumentError("reservations")
-	}
-
-	var errs []error
-	for _, req := range request.GetReservations() {
-		if err := ValidateReleaseReservationRequest(req); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if len(errs) > 0 {
-		return errors.NewCollectedErrors(codes.InvalidArgument, errs)
-	}
-
-	return nil
-}
diff --git a/datacatalog/pkg/manager/interfaces/artifact.go b/datacatalog/pkg/manager/interfaces/artifact.go
index fdddf9ff12..c527c55233 100644
--- a/datacatalog/pkg/manager/interfaces/artifact.go
+++ b/datacatalog/pkg/manager/interfaces/artifact.go
@@ -14,5 +14,4 @@ type ArtifactManager interface {
 	ListArtifacts(ctx context.Context, request *idl_datacatalog.ListArtifactsRequest) (*idl_datacatalog.ListArtifactsResponse, error)
 	UpdateArtifact(ctx context.Context, request *idl_datacatalog.UpdateArtifactRequest) (*idl_datacatalog.UpdateArtifactResponse, error)
 	DeleteArtifact(ctx context.Context, request *idl_datacatalog.DeleteArtifactRequest) (*idl_datacatalog.DeleteArtifactResponse, error)
-	DeleteArtifacts(ctx context.Context, request *idl_datacatalog.DeleteArtifactsRequest) (*idl_datacatalog.DeleteArtifactResponse, error)
 }
diff --git a/datacatalog/pkg/manager/interfaces/reservation.go b/datacatalog/pkg/manager/interfaces/reservation.go
index 73e9dd7377..a20750ff9b 100644
--- a/datacatalog/pkg/manager/interfaces/reservation.go
+++ b/datacatalog/pkg/manager/interfaces/reservation.go
@@ -11,7 +11,5 @@ import (
 // in flyteidl
 type ReservationManager interface {
 	GetOrExtendReservation(context.Context, *datacatalog.GetOrExtendReservationRequest) (*datacatalog.GetOrExtendReservationResponse, error)
-	GetOrExtendReservations(context.Context, *datacatalog.GetOrExtendReservationsRequest) (*datacatalog.GetOrExtendReservationsResponse, error)
 	ReleaseReservation(context.Context, *datacatalog.ReleaseReservationRequest) (*datacatalog.ReleaseReservationResponse, error)
-	ReleaseReservations(context.Context, *datacatalog.ReleaseReservationsRequest) (*datacatalog.ReleaseReservationResponse, error)
 }
diff --git a/datacatalog/pkg/manager/mocks/artifact_manager.go b/datacatalog/pkg/manager/mocks/artifact_manager.go
index 31bc614756..a4d2b5ba30 100644
--- a/datacatalog/pkg/manager/mocks/artifact_manager.go
+++ b/datacatalog/pkg/manager/mocks/artifact_manager.go
@@ -97,47 +97,6 @@ func (_m *ArtifactManager) DeleteArtifact(ctx context.Context, request *datacata
 	return r0, r1
 }
 
-type ArtifactManager_DeleteArtifacts struct {
-	*mock.Call
-}
-
-func (_m ArtifactManager_DeleteArtifacts) Return(_a0 *datacatalog.DeleteArtifactResponse, _a1 error) *ArtifactManager_DeleteArtifacts {
-	return &ArtifactManager_DeleteArtifacts{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *ArtifactManager) OnDeleteArtifacts(ctx context.Context, request *datacatalog.DeleteArtifactsRequest) *ArtifactManager_DeleteArtifacts {
-	c_call := _m.On("DeleteArtifacts", ctx, request)
-	return &ArtifactManager_DeleteArtifacts{Call: c_call}
-}
-
-func (_m *ArtifactManager) OnDeleteArtifactsMatch(matchers ...interface{}) *ArtifactManager_DeleteArtifacts {
-	c_call := _m.On("DeleteArtifacts", matchers...)
-	return &ArtifactManager_DeleteArtifacts{Call: c_call}
-}
-
-// DeleteArtifacts provides a mock function with given fields: ctx, request
-func (_m *ArtifactManager) DeleteArtifacts(ctx context.Context, request *datacatalog.DeleteArtifactsRequest) (*datacatalog.DeleteArtifactResponse, error) {
-	ret := _m.Called(ctx, request)
-
-	var r0 *datacatalog.DeleteArtifactResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DeleteArtifactsRequest) *datacatalog.DeleteArtifactResponse); ok {
-		r0 = rf(ctx, request)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*datacatalog.DeleteArtifactResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.DeleteArtifactsRequest) error); ok {
-		r1 = rf(ctx, request)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 type ArtifactManager_GetArtifact struct {
 	*mock.Call
 }
diff --git a/datacatalog/pkg/manager/mocks/reservation_manager.go b/datacatalog/pkg/manager/mocks/reservation_manager.go
index 3f7b6003a6..3753ee64e4 100644
--- a/datacatalog/pkg/manager/mocks/reservation_manager.go
+++ b/datacatalog/pkg/manager/mocks/reservation_manager.go
@@ -56,47 +56,6 @@ func (_m *ReservationManager) GetOrExtendReservation(_a0 context.Context, _a1 *d
 	return r0, r1
 }
 
-type ReservationManager_GetOrExtendReservations struct {
-	*mock.Call
-}
-
-func (_m ReservationManager_GetOrExtendReservations) Return(_a0 *datacatalog.GetOrExtendReservationsResponse, _a1 error) *ReservationManager_GetOrExtendReservations {
-	return &ReservationManager_GetOrExtendReservations{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *ReservationManager) OnGetOrExtendReservations(_a0 context.Context, _a1 *datacatalog.GetOrExtendReservationsRequest) *ReservationManager_GetOrExtendReservations {
-	c_call := _m.On("GetOrExtendReservations", _a0, _a1)
-	return &ReservationManager_GetOrExtendReservations{Call: c_call}
-}
-
-func (_m *ReservationManager) OnGetOrExtendReservationsMatch(matchers ...interface{}) *ReservationManager_GetOrExtendReservations {
-	c_call := _m.On("GetOrExtendReservations", matchers...)
-	return &ReservationManager_GetOrExtendReservations{Call: c_call}
-}
-
-// GetOrExtendReservations provides a mock function with given fields: _a0, _a1
-func (_m *ReservationManager) GetOrExtendReservations(_a0 context.Context, _a1 *datacatalog.GetOrExtendReservationsRequest) (*datacatalog.GetOrExtendReservationsResponse, error) {
-	ret := _m.Called(_a0, _a1)
-
-	var r0 *datacatalog.GetOrExtendReservationsResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest) *datacatalog.GetOrExtendReservationsResponse); ok {
-		r0 = rf(_a0, _a1)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*datacatalog.GetOrExtendReservationsResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest) error); ok {
-		r1 = rf(_a0, _a1)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 type ReservationManager_ReleaseReservation struct {
 	*mock.Call
 }
@@ -137,44 +96,3 @@ func (_m *ReservationManager) ReleaseReservation(_a0 context.Context, _a1 *datac
 
 	return r0, r1
 }
-
-type ReservationManager_ReleaseReservations struct {
-	*mock.Call
-}
-
-func (_m ReservationManager_ReleaseReservations) Return(_a0 *datacatalog.ReleaseReservationResponse, _a1 error) *ReservationManager_ReleaseReservations {
-	return &ReservationManager_ReleaseReservations{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *ReservationManager) OnReleaseReservations(_a0 context.Context, _a1 *datacatalog.ReleaseReservationsRequest) *ReservationManager_ReleaseReservations {
-	c_call := _m.On("ReleaseReservations", _a0, _a1)
-	return &ReservationManager_ReleaseReservations{Call: c_call}
-}
-
-func (_m *ReservationManager) OnReleaseReservationsMatch(matchers ...interface{}) *ReservationManager_ReleaseReservations {
-	c_call := _m.On("ReleaseReservations", matchers...)
-	return &ReservationManager_ReleaseReservations{Call: c_call}
-}
-
-// ReleaseReservations provides a mock function with given fields: _a0, _a1
-func (_m *ReservationManager) ReleaseReservations(_a0 context.Context, _a1 *datacatalog.ReleaseReservationsRequest) (*datacatalog.ReleaseReservationResponse, error) {
-	ret := _m.Called(_a0, _a1)
-
-	var r0 *datacatalog.ReleaseReservationResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.ReleaseReservationsRequest) *datacatalog.ReleaseReservationResponse); ok {
-		r0 = rf(_a0, _a1)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*datacatalog.ReleaseReservationResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.ReleaseReservationsRequest) error); ok {
-		r1 = rf(_a0, _a1)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
diff --git a/datacatalog/pkg/rpc/datacatalogservice/service.go b/datacatalog/pkg/rpc/datacatalogservice/service.go
index f6613e4075..163c24b92c 100644
--- a/datacatalog/pkg/rpc/datacatalogservice/service.go
+++ b/datacatalog/pkg/rpc/datacatalogservice/service.go
@@ -71,26 +71,14 @@ func (s *DataCatalogService) DeleteArtifact(ctx context.Context, request *catalo
 	return s.ArtifactManager.DeleteArtifact(ctx, request)
 }
 
-func (s *DataCatalogService) DeleteArtifacts(ctx context.Context, request *catalog.DeleteArtifactsRequest) (*catalog.DeleteArtifactResponse, error) {
-	return s.ArtifactManager.DeleteArtifacts(ctx, request)
-}
-
 func (s *DataCatalogService) GetOrExtendReservation(ctx context.Context, request *catalog.GetOrExtendReservationRequest) (*catalog.GetOrExtendReservationResponse, error) {
 	return s.ReservationManager.GetOrExtendReservation(ctx, request)
 }
 
-func (s *DataCatalogService) GetOrExtendReservations(ctx context.Context, request *catalog.GetOrExtendReservationsRequest) (*catalog.GetOrExtendReservationsResponse, error) {
-	return s.ReservationManager.GetOrExtendReservations(ctx, request)
-}
-
 func (s *DataCatalogService) ReleaseReservation(ctx context.Context, request *catalog.ReleaseReservationRequest) (*catalog.ReleaseReservationResponse, error) {
 	return s.ReservationManager.ReleaseReservation(ctx, request)
 }
 
-func (s *DataCatalogService) ReleaseReservations(ctx context.Context, request *catalog.ReleaseReservationsRequest) (*catalog.ReleaseReservationResponse, error) {
-	return s.ReservationManager.ReleaseReservations(ctx, request)
-}
-
 func NewDataCatalogService() *DataCatalogService {
 	configProvider := runtime.NewConfigurationProvider()
 	dataCatalogConfig := configProvider.ApplicationConfiguration().GetDataCatalogConfig()
diff --git a/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go b/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go
index 6653a4bca2..1a9a449456 100644
--- a/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go
+++ b/flyteidl/clients/go/datacatalog/mocks/DataCatalogClient.go
@@ -208,54 +208,6 @@ func (_m *DataCatalogClient) DeleteArtifact(ctx context.Context, in *datacatalog
 	return r0, r1
 }
 
-type DataCatalogClient_DeleteArtifacts struct {
-	*mock.Call
-}
-
-func (_m DataCatalogClient_DeleteArtifacts) Return(_a0 *datacatalog.DeleteArtifactResponse, _a1 error) *DataCatalogClient_DeleteArtifacts {
-	return &DataCatalogClient_DeleteArtifacts{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *DataCatalogClient) OnDeleteArtifacts(ctx context.Context, in *datacatalog.DeleteArtifactsRequest, opts ...grpc.CallOption) *DataCatalogClient_DeleteArtifacts {
-	c_call := _m.On("DeleteArtifacts", ctx, in, opts)
-	return &DataCatalogClient_DeleteArtifacts{Call: c_call}
-}
-
-func (_m *DataCatalogClient) OnDeleteArtifactsMatch(matchers ...interface{}) *DataCatalogClient_DeleteArtifacts {
-	c_call := _m.On("DeleteArtifacts", matchers...)
-	return &DataCatalogClient_DeleteArtifacts{Call: c_call}
-}
-
-// DeleteArtifacts provides a mock function with given fields: ctx, in, opts
-func (_m *DataCatalogClient) DeleteArtifacts(ctx context.Context, in *datacatalog.DeleteArtifactsRequest, opts ...grpc.CallOption) (*datacatalog.DeleteArtifactResponse, error) {
-	_va := make([]interface{}, len(opts))
-	for _i := range opts {
-		_va[_i] = opts[_i]
-	}
-	var _ca []interface{}
-	_ca = append(_ca, ctx, in)
-	_ca = append(_ca, _va...)
-	ret := _m.Called(_ca...)
-
-	var r0 *datacatalog.DeleteArtifactResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.DeleteArtifactsRequest, ...grpc.CallOption) *datacatalog.DeleteArtifactResponse); ok {
-		r0 = rf(ctx, in, opts...)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*datacatalog.DeleteArtifactResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.DeleteArtifactsRequest, ...grpc.CallOption) error); ok {
-		r1 = rf(ctx, in, opts...)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 type DataCatalogClient_GetArtifact struct {
 	*mock.Call
 }
@@ -400,54 +352,6 @@ func (_m *DataCatalogClient) GetOrExtendReservation(ctx context.Context, in *dat
 	return r0, r1
 }
 
-type DataCatalogClient_GetOrExtendReservations struct {
-	*mock.Call
-}
-
-func (_m DataCatalogClient_GetOrExtendReservations) Return(_a0 *datacatalog.GetOrExtendReservationsResponse, _a1 error) *DataCatalogClient_GetOrExtendReservations {
-	return &DataCatalogClient_GetOrExtendReservations{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *DataCatalogClient) OnGetOrExtendReservations(ctx context.Context, in *datacatalog.GetOrExtendReservationsRequest, opts ...grpc.CallOption) *DataCatalogClient_GetOrExtendReservations {
-	c_call := _m.On("GetOrExtendReservations", ctx, in, opts)
-	return &DataCatalogClient_GetOrExtendReservations{Call: c_call}
-}
-
-func (_m *DataCatalogClient) OnGetOrExtendReservationsMatch(matchers ...interface{}) *DataCatalogClient_GetOrExtendReservations {
-	c_call := _m.On("GetOrExtendReservations", matchers...)
-	return &DataCatalogClient_GetOrExtendReservations{Call: c_call}
-}
-
-// GetOrExtendReservations provides a mock function with given fields: ctx, in, opts
-func (_m *DataCatalogClient) GetOrExtendReservations(ctx context.Context, in *datacatalog.GetOrExtendReservationsRequest, opts ...grpc.CallOption) (*datacatalog.GetOrExtendReservationsResponse, error) {
-	_va := make([]interface{}, len(opts))
-	for _i := range opts {
-		_va[_i] = opts[_i]
-	}
-	var _ca []interface{}
-	_ca = append(_ca, ctx, in)
-	_ca = append(_ca, _va...)
-	ret := _m.Called(_ca...)
-
-	var r0 *datacatalog.GetOrExtendReservationsResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest, ...grpc.CallOption) *datacatalog.GetOrExtendReservationsResponse); ok {
-		r0 = rf(ctx, in, opts...)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*datacatalog.GetOrExtendReservationsResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.GetOrExtendReservationsRequest, ...grpc.CallOption) error); ok {
-		r1 = rf(ctx, in, opts...)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 type DataCatalogClient_ListArtifacts struct {
 	*mock.Call
 }
@@ -592,54 +496,6 @@ func (_m *DataCatalogClient) ReleaseReservation(ctx context.Context, in *datacat
 	return r0, r1
 }
 
-type DataCatalogClient_ReleaseReservations struct {
-	*mock.Call
-}
-
-func (_m DataCatalogClient_ReleaseReservations) Return(_a0 *datacatalog.ReleaseReservationResponse, _a1 error) *DataCatalogClient_ReleaseReservations {
-	return &DataCatalogClient_ReleaseReservations{Call: _m.Call.Return(_a0, _a1)}
-}
-
-func (_m *DataCatalogClient) OnReleaseReservations(ctx context.Context, in *datacatalog.ReleaseReservationsRequest, opts ...grpc.CallOption) *DataCatalogClient_ReleaseReservations {
-	c_call := _m.On("ReleaseReservations", ctx, in, opts)
-	return &DataCatalogClient_ReleaseReservations{Call: c_call}
-}
-
-func (_m *DataCatalogClient) OnReleaseReservationsMatch(matchers ...interface{}) *DataCatalogClient_ReleaseReservations {
-	c_call := _m.On("ReleaseReservations", matchers...)
-	return &DataCatalogClient_ReleaseReservations{Call: c_call}
-}
-
-// ReleaseReservations provides a mock function with given fields: ctx, in, opts
-func (_m *DataCatalogClient) ReleaseReservations(ctx context.Context, in *datacatalog.ReleaseReservationsRequest, opts ...grpc.CallOption) (*datacatalog.ReleaseReservationResponse, error) {
-	_va := make([]interface{}, len(opts))
-	for _i := range opts {
-		_va[_i] = opts[_i]
-	}
-	var _ca []interface{}
-	_ca = append(_ca, ctx, in)
-	_ca = append(_ca, _va...)
-	ret := _m.Called(_ca...)
-
-	var r0 *datacatalog.ReleaseReservationResponse
-	if rf, ok := ret.Get(0).(func(context.Context, *datacatalog.ReleaseReservationsRequest, ...grpc.CallOption) *datacatalog.ReleaseReservationResponse); ok {
-		r0 = rf(ctx, in, opts...)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*datacatalog.ReleaseReservationResponse)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *datacatalog.ReleaseReservationsRequest, ...grpc.CallOption) error); ok {
-		r1 = rf(ctx, in, opts...)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 type DataCatalogClient_UpdateArtifact struct {
 	*mock.Call
 }
diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc
index b8ce82e486..3abf6da52c 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.cc
@@ -28,11 +28,8 @@ static const char* DataCatalog_method_names[] = {
   "/datacatalog.DataCatalog/ListDatasets",
   "/datacatalog.DataCatalog/UpdateArtifact",
   "/datacatalog.DataCatalog/DeleteArtifact",
-  "/datacatalog.DataCatalog/DeleteArtifacts",
   "/datacatalog.DataCatalog/GetOrExtendReservation",
-  "/datacatalog.DataCatalog/GetOrExtendReservations",
   "/datacatalog.DataCatalog/ReleaseReservation",
-  "/datacatalog.DataCatalog/ReleaseReservations",
 };
 
 std::unique_ptr< DataCatalog::Stub> DataCatalog::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
@@ -51,11 +48,8 @@ DataCatalog::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channe
   , rpcmethod_ListDatasets_(DataCatalog_method_names[6], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
   , rpcmethod_UpdateArtifact_(DataCatalog_method_names[7], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
   , rpcmethod_DeleteArtifact_(DataCatalog_method_names[8], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_DeleteArtifacts_(DataCatalog_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_GetOrExtendReservation_(DataCatalog_method_names[10], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_GetOrExtendReservations_(DataCatalog_method_names[11], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ReleaseReservation_(DataCatalog_method_names[12], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ReleaseReservations_(DataCatalog_method_names[13], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
+  , rpcmethod_GetOrExtendReservation_(DataCatalog_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
+  , rpcmethod_ReleaseReservation_(DataCatalog_method_names[10], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
   {}
 
 ::grpc::Status DataCatalog::Stub::CreateDataset(::grpc::ClientContext* context, const ::datacatalog::CreateDatasetRequest& request, ::datacatalog::CreateDatasetResponse* response) {
@@ -310,34 +304,6 @@ ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataC
   return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifact_, context, request, false);
 }
 
-::grpc::Status DataCatalog::Stub::DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::datacatalog::DeleteArtifactResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_DeleteArtifacts_, context, request, response);
-}
-
-void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, std::move(f));
-}
-
-void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, std::move(f));
-}
-
-void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, reactor);
-}
-
-void DataCatalog::Stub::experimental_async::DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_DeleteArtifacts_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataCatalog::Stub::AsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifacts_, context, request, true);
-}
-
-::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* DataCatalog::Stub::PrepareAsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::DeleteArtifactResponse>::Create(channel_.get(), cq, rpcmethod_DeleteArtifacts_, context, request, false);
-}
-
 ::grpc::Status DataCatalog::Stub::GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::datacatalog::GetOrExtendReservationResponse* response) {
   return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_GetOrExtendReservation_, context, request, response);
 }
@@ -366,34 +332,6 @@ ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse
   return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::GetOrExtendReservationResponse>::Create(channel_.get(), cq, rpcmethod_GetOrExtendReservation_, context, request, false);
 }
 
-::grpc::Status DataCatalog::Stub::GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::datacatalog::GetOrExtendReservationsResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_GetOrExtendReservations_, context, request, response);
-}
-
-void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, std::move(f));
-}
-
-void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, std::move(f));
-}
-
-void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, reactor);
-}
-
-void DataCatalog::Stub::experimental_async::GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_GetOrExtendReservations_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* DataCatalog::Stub::AsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::GetOrExtendReservationsResponse>::Create(channel_.get(), cq, rpcmethod_GetOrExtendReservations_, context, request, true);
-}
-
-::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* DataCatalog::Stub::PrepareAsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::GetOrExtendReservationsResponse>::Create(channel_.get(), cq, rpcmethod_GetOrExtendReservations_, context, request, false);
-}
-
 ::grpc::Status DataCatalog::Stub::ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::datacatalog::ReleaseReservationResponse* response) {
   return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_ReleaseReservation_, context, request, response);
 }
@@ -422,34 +360,6 @@ ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* D
   return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::ReleaseReservationResponse>::Create(channel_.get(), cq, rpcmethod_ReleaseReservation_, context, request, false);
 }
 
-::grpc::Status DataCatalog::Stub::ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::datacatalog::ReleaseReservationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_ReleaseReservations_, context, request, response);
-}
-
-void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, std::move(f));
-}
-
-void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function f) {
-  ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, std::move(f));
-}
-
-void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, reactor);
-}
-
-void DataCatalog::Stub::experimental_async::ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ReleaseReservations_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* DataCatalog::Stub::AsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::ReleaseReservationResponse>::Create(channel_.get(), cq, rpcmethod_ReleaseReservations_, context, request, true);
-}
-
-::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* DataCatalog::Stub::PrepareAsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::datacatalog::ReleaseReservationResponse>::Create(channel_.get(), cq, rpcmethod_ReleaseReservations_, context, request, false);
-}
-
 DataCatalog::Service::Service() {
   AddMethod(new ::grpc::internal::RpcServiceMethod(
       DataCatalog_method_names[0],
@@ -499,28 +409,13 @@ DataCatalog::Service::Service() {
   AddMethod(new ::grpc::internal::RpcServiceMethod(
       DataCatalog_method_names[9],
       ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>(
-          std::mem_fn(&DataCatalog::Service::DeleteArtifacts), this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      DataCatalog_method_names[10],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
       new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>(
           std::mem_fn(&DataCatalog::Service::GetOrExtendReservation), this)));
   AddMethod(new ::grpc::internal::RpcServiceMethod(
-      DataCatalog_method_names[11],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>(
-          std::mem_fn(&DataCatalog::Service::GetOrExtendReservations), this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      DataCatalog_method_names[12],
+      DataCatalog_method_names[10],
       ::grpc::internal::RpcMethod::NORMAL_RPC,
       new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>(
           std::mem_fn(&DataCatalog::Service::ReleaseReservation), this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      DataCatalog_method_names[13],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< DataCatalog::Service, ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>(
-          std::mem_fn(&DataCatalog::Service::ReleaseReservations), this)));
 }
 
 DataCatalog::Service::~Service() {
@@ -589,13 +484,6 @@ ::grpc::Status DataCatalog::Service::DeleteArtifact(::grpc::ServerContext* conte
   return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
 }
 
-::grpc::Status DataCatalog::Service::DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
 ::grpc::Status DataCatalog::Service::GetOrExtendReservation(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response) {
   (void) context;
   (void) request;
@@ -603,13 +491,6 @@ ::grpc::Status DataCatalog::Service::GetOrExtendReservation(::grpc::ServerContex
   return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
 }
 
-::grpc::Status DataCatalog::Service::GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
 ::grpc::Status DataCatalog::Service::ReleaseReservation(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response) {
   (void) context;
   (void) request;
@@ -617,13 +498,6 @@ ::grpc::Status DataCatalog::Service::ReleaseReservation(::grpc::ServerContext* c
   return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
 }
 
-::grpc::Status DataCatalog::Service::ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
 
 }  // namespace datacatalog
 
diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h
index 6a7c039a44..b4c3a41a3c 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h
+++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.grpc.pb.h
@@ -125,18 +125,6 @@ class DataCatalog final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactRaw(context, request, cq));
     }
-    // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
-    // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
-    // will not result in an error.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-    // artifacts deleted, however the operation can simply be retried to remove the remaining entries.
-    virtual ::grpc::Status DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::datacatalog::DeleteArtifactResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> AsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(AsyncDeleteArtifactsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactsRaw(context, request, cq));
-    }
     // Attempts to get or extend a reservation for the corresponding artifact. If one already exists
     // (ie. another entity owns the reservation) then that reservation is retrieved.
     // Once you acquire a reservation, you need to  periodically extend the reservation with an
@@ -155,17 +143,6 @@ class DataCatalog final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>> PrepareAsyncGetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>>(PrepareAsyncGetOrExtendReservationRaw(context, request, cq));
     }
-    // Attempts to get or extend reservations for multiple artifacts in a single operation.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
-    // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
-    // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
-    virtual ::grpc::Status GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::datacatalog::GetOrExtendReservationsResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>> AsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>>(AsyncGetOrExtendReservationsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>> PrepareAsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>>(PrepareAsyncGetOrExtendReservationsRaw(context, request, cq));
-    }
     // Release the reservation when the task holding the spot fails so that the other tasks
     // can grab the spot.
     virtual ::grpc::Status ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::datacatalog::ReleaseReservationResponse* response) = 0;
@@ -175,19 +152,6 @@ class DataCatalog final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationRaw(context, request, cq));
     }
-    // Releases reservations for multiple artifacts in a single operation.
-    // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
-    // times will not result in error.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-    // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
-    // reservations.
-    virtual ::grpc::Status ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::datacatalog::ReleaseReservationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>> AsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>>(AsyncReleaseReservationsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationsRaw(context, request, cq));
-    }
     class experimental_async_interface {
      public:
       virtual ~experimental_async_interface() {}
@@ -238,15 +202,6 @@ class DataCatalog final {
       virtual void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0;
       virtual void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
       virtual void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
-      // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
-      // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
-      // will not result in an error.
-      // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-      // artifacts deleted, however the operation can simply be retried to remove the remaining entries.
-      virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0;
-      virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) = 0;
-      virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
-      virtual void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
       // Attempts to get or extend a reservation for the corresponding artifact. If one already exists
       // (ie. another entity owns the reservation) then that reservation is retrieved.
       // Once you acquire a reservation, you need to  periodically extend the reservation with an
@@ -262,30 +217,12 @@ class DataCatalog final {
       virtual void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) = 0;
       virtual void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
       virtual void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
-      // Attempts to get or extend reservations for multiple artifacts in a single operation.
-      // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
-      // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
-      // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
-      virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) = 0;
-      virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) = 0;
-      virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
-      virtual void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
       // Release the reservation when the task holding the spot fails so that the other tasks
       // can grab the spot.
       virtual void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0;
       virtual void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0;
       virtual void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
       virtual void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
-      // Releases reservations for multiple artifacts in a single operation.
-      // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
-      // times will not result in error.
-      // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-      // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
-      // reservations.
-      virtual void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0;
-      virtual void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) = 0;
-      virtual void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
-      virtual void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0;
     };
     virtual class experimental_async_interface* experimental_async() { return nullptr; }
   private:
@@ -307,16 +244,10 @@ class DataCatalog final {
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::UpdateArtifactResponse>* PrepareAsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>* AsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationResponse>* PrepareAsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>* AsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::GetOrExtendReservationsResponse>* PrepareAsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) = 0;
   };
   class Stub final : public StubInterface {
    public:
@@ -384,13 +315,6 @@ class DataCatalog final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactRaw(context, request, cq));
     }
-    ::grpc::Status DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::datacatalog::DeleteArtifactResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> AsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(AsyncDeleteArtifactsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>> PrepareAsyncDeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>>(PrepareAsyncDeleteArtifactsRaw(context, request, cq));
-    }
     ::grpc::Status GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::datacatalog::GetOrExtendReservationResponse* response) override;
     std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>> AsyncGetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>>(AsyncGetOrExtendReservationRaw(context, request, cq));
@@ -398,13 +322,6 @@ class DataCatalog final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>> PrepareAsyncGetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>>(PrepareAsyncGetOrExtendReservationRaw(context, request, cq));
     }
-    ::grpc::Status GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::datacatalog::GetOrExtendReservationsResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>> AsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>>(AsyncGetOrExtendReservationsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>> PrepareAsyncGetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>>(PrepareAsyncGetOrExtendReservationsRaw(context, request, cq));
-    }
     ::grpc::Status ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::datacatalog::ReleaseReservationResponse* response) override;
     std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> AsyncReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(AsyncReleaseReservationRaw(context, request, cq));
@@ -412,13 +329,6 @@ class DataCatalog final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationRaw(context, request, cq));
     }
-    ::grpc::Status ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::datacatalog::ReleaseReservationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> AsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(AsyncReleaseReservationsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>> PrepareAsyncReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>>(PrepareAsyncReleaseReservationsRaw(context, request, cq));
-    }
     class experimental_async final :
       public StubInterface::experimental_async_interface {
      public:
@@ -458,26 +368,14 @@ class DataCatalog final {
       void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override;
       void DeleteArtifact(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
       void DeleteArtifact(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
-      void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override;
-      void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, std::function) override;
-      void DeleteArtifacts(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
-      void DeleteArtifacts(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
       void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) override;
       void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, std::function) override;
       void GetOrExtendReservation(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
       void GetOrExtendReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
-      void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) override;
-      void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, std::function) override;
-      void GetOrExtendReservations(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
-      void GetOrExtendReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
       void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override;
       void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override;
       void ReleaseReservation(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
       void ReleaseReservation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
-      void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override;
-      void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, std::function) override;
-      void ReleaseReservations(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
-      void ReleaseReservations(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override;
      private:
       friend class Stub;
       explicit experimental_async(Stub* stub): stub_(stub) { }
@@ -507,16 +405,10 @@ class DataCatalog final {
     ::grpc::ClientAsyncResponseReader< ::datacatalog::UpdateArtifactResponse>* PrepareAsyncUpdateArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::UpdateArtifactRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* AsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::datacatalog::DeleteArtifactResponse>* PrepareAsyncDeleteArtifactsRaw(::grpc::ClientContext* context, const ::datacatalog::DeleteArtifactsRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>* AsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationResponse>* PrepareAsyncGetOrExtendReservationRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* AsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::datacatalog::GetOrExtendReservationsResponse>* PrepareAsyncGetOrExtendReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::GetOrExtendReservationsRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* AsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::datacatalog::ReleaseReservationResponse>* PrepareAsyncReleaseReservationsRaw(::grpc::ClientContext* context, const ::datacatalog::ReleaseReservationsRequest& request, ::grpc::CompletionQueue* cq) override;
     const ::grpc::internal::RpcMethod rpcmethod_CreateDataset_;
     const ::grpc::internal::RpcMethod rpcmethod_GetDataset_;
     const ::grpc::internal::RpcMethod rpcmethod_CreateArtifact_;
@@ -526,11 +418,8 @@ class DataCatalog final {
     const ::grpc::internal::RpcMethod rpcmethod_ListDatasets_;
     const ::grpc::internal::RpcMethod rpcmethod_UpdateArtifact_;
     const ::grpc::internal::RpcMethod rpcmethod_DeleteArtifact_;
-    const ::grpc::internal::RpcMethod rpcmethod_DeleteArtifacts_;
     const ::grpc::internal::RpcMethod rpcmethod_GetOrExtendReservation_;
-    const ::grpc::internal::RpcMethod rpcmethod_GetOrExtendReservations_;
     const ::grpc::internal::RpcMethod rpcmethod_ReleaseReservation_;
-    const ::grpc::internal::RpcMethod rpcmethod_ReleaseReservations_;
   };
   static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
 
@@ -558,12 +447,6 @@ class DataCatalog final {
     virtual ::grpc::Status UpdateArtifact(::grpc::ServerContext* context, const ::datacatalog::UpdateArtifactRequest* request, ::datacatalog::UpdateArtifactResponse* response);
     // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage.
     virtual ::grpc::Status DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response);
-    // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
-    // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
-    // will not result in an error.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-    // artifacts deleted, however the operation can simply be retried to remove the remaining entries.
-    virtual ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response);
     // Attempts to get or extend a reservation for the corresponding artifact. If one already exists
     // (ie. another entity owns the reservation) then that reservation is retrieved.
     // Once you acquire a reservation, you need to  periodically extend the reservation with an
@@ -576,21 +459,9 @@ class DataCatalog final {
     // task B may take over the reservation, resulting in two tasks A and B running in parallel. So
     // a third task C may get the Artifact from A or B, whichever writes last.
     virtual ::grpc::Status GetOrExtendReservation(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response);
-    // Attempts to get or extend reservations for multiple artifacts in a single operation.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
-    // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
-    // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
-    virtual ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response);
     // Release the reservation when the task holding the spot fails so that the other tasks
     // can grab the spot.
     virtual ::grpc::Status ReleaseReservation(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response);
-    // Releases reservations for multiple artifacts in a single operation.
-    // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
-    // times will not result in error.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-    // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
-    // reservations.
-    virtual ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response);
   };
   template 
   class WithAsyncMethod_CreateDataset : public BaseClass {
@@ -773,32 +644,12 @@ class DataCatalog final {
     }
   };
   template 
-  class WithAsyncMethod_DeleteArtifacts : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithAsyncMethod_DeleteArtifacts() {
-      ::grpc::Service::MarkMethodAsync(9);
-    }
-    ~WithAsyncMethod_DeleteArtifacts() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDeleteArtifacts(::grpc::ServerContext* context, ::datacatalog::DeleteArtifactsRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::DeleteArtifactResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
   class WithAsyncMethod_GetOrExtendReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithAsyncMethod_GetOrExtendReservation() {
-      ::grpc::Service::MarkMethodAsync(10);
+      ::grpc::Service::MarkMethodAsync(9);
     }
     ~WithAsyncMethod_GetOrExtendReservation() override {
       BaseClassMustBeDerivedFromService(this);
@@ -809,27 +660,7 @@ class DataCatalog final {
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }
     void RequestGetOrExtendReservation(::grpc::ServerContext* context, ::datacatalog::GetOrExtendReservationRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::GetOrExtendReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
-  class WithAsyncMethod_GetOrExtendReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithAsyncMethod_GetOrExtendReservations() {
-      ::grpc::Service::MarkMethodAsync(11);
-    }
-    ~WithAsyncMethod_GetOrExtendReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetOrExtendReservations(::grpc::ServerContext* context, ::datacatalog::GetOrExtendReservationsRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::GetOrExtendReservationsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag);
+      ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag);
     }
   };
   template 
@@ -838,7 +669,7 @@ class DataCatalog final {
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithAsyncMethod_ReleaseReservation() {
-      ::grpc::Service::MarkMethodAsync(12);
+      ::grpc::Service::MarkMethodAsync(10);
     }
     ~WithAsyncMethod_ReleaseReservation() override {
       BaseClassMustBeDerivedFromService(this);
@@ -849,30 +680,10 @@ class DataCatalog final {
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }
     void RequestReleaseReservation(::grpc::ServerContext* context, ::datacatalog::ReleaseReservationRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::ReleaseReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(12, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
-  class WithAsyncMethod_ReleaseReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithAsyncMethod_ReleaseReservations() {
-      ::grpc::Service::MarkMethodAsync(13);
-    }
-    ~WithAsyncMethod_ReleaseReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestReleaseReservations(::grpc::ServerContext* context, ::datacatalog::ReleaseReservationsRequest* request, ::grpc::ServerAsyncResponseWriter< ::datacatalog::ReleaseReservationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag);
+      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
     }
   };
-  typedef WithAsyncMethod_CreateDataset > > > > > > > > > > > > > AsyncService;
+  typedef WithAsyncMethod_CreateDataset > > > > > > > > > > AsyncService;
   template 
   class ExperimentalWithCallbackMethod_CreateDataset : public BaseClass {
    private:
@@ -1153,43 +964,12 @@ class DataCatalog final {
     virtual void DeleteArtifact(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
   template 
-  class ExperimentalWithCallbackMethod_DeleteArtifacts : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithCallbackMethod_DeleteArtifacts() {
-      ::grpc::Service::experimental().MarkMethodCallback(9,
-        new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>(
-          [this](::grpc::ServerContext* context,
-                 const ::datacatalog::DeleteArtifactsRequest* request,
-                 ::datacatalog::DeleteArtifactResponse* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   return this->DeleteArtifacts(context, request, response, controller);
-                 }));
-    }
-    void SetMessageAllocatorFor_DeleteArtifacts(
-        ::grpc::experimental::MessageAllocator< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>* allocator) {
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>*>(
-          ::grpc::Service::experimental().GetHandler(9))
-              ->SetMessageAllocator(allocator);
-    }
-    ~ExperimentalWithCallbackMethod_DeleteArtifacts() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual void DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
-  };
-  template 
   class ExperimentalWithCallbackMethod_GetOrExtendReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     ExperimentalWithCallbackMethod_GetOrExtendReservation() {
-      ::grpc::Service::experimental().MarkMethodCallback(10,
+      ::grpc::Service::experimental().MarkMethodCallback(9,
         new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>(
           [this](::grpc::ServerContext* context,
                  const ::datacatalog::GetOrExtendReservationRequest* request,
@@ -1201,7 +981,7 @@ class DataCatalog final {
     void SetMessageAllocatorFor_GetOrExtendReservation(
         ::grpc::experimental::MessageAllocator< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>* allocator) {
       static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>*>(
-          ::grpc::Service::experimental().GetHandler(10))
+          ::grpc::Service::experimental().GetHandler(9))
               ->SetMessageAllocator(allocator);
     }
     ~ExperimentalWithCallbackMethod_GetOrExtendReservation() override {
@@ -1215,43 +995,12 @@ class DataCatalog final {
     virtual void GetOrExtendReservation(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationRequest* request, ::datacatalog::GetOrExtendReservationResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
   template 
-  class ExperimentalWithCallbackMethod_GetOrExtendReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithCallbackMethod_GetOrExtendReservations() {
-      ::grpc::Service::experimental().MarkMethodCallback(11,
-        new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>(
-          [this](::grpc::ServerContext* context,
-                 const ::datacatalog::GetOrExtendReservationsRequest* request,
-                 ::datacatalog::GetOrExtendReservationsResponse* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   return this->GetOrExtendReservations(context, request, response, controller);
-                 }));
-    }
-    void SetMessageAllocatorFor_GetOrExtendReservations(
-        ::grpc::experimental::MessageAllocator< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>* allocator) {
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>*>(
-          ::grpc::Service::experimental().GetHandler(11))
-              ->SetMessageAllocator(allocator);
-    }
-    ~ExperimentalWithCallbackMethod_GetOrExtendReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual void GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
-  };
-  template 
   class ExperimentalWithCallbackMethod_ReleaseReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     ExperimentalWithCallbackMethod_ReleaseReservation() {
-      ::grpc::Service::experimental().MarkMethodCallback(12,
+      ::grpc::Service::experimental().MarkMethodCallback(10,
         new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>(
           [this](::grpc::ServerContext* context,
                  const ::datacatalog::ReleaseReservationRequest* request,
@@ -1263,7 +1012,7 @@ class DataCatalog final {
     void SetMessageAllocatorFor_ReleaseReservation(
         ::grpc::experimental::MessageAllocator< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>* allocator) {
       static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>*>(
-          ::grpc::Service::experimental().GetHandler(12))
+          ::grpc::Service::experimental().GetHandler(10))
               ->SetMessageAllocator(allocator);
     }
     ~ExperimentalWithCallbackMethod_ReleaseReservation() override {
@@ -1276,38 +1025,7 @@ class DataCatalog final {
     }
     virtual void ReleaseReservation(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
-  template 
-  class ExperimentalWithCallbackMethod_ReleaseReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithCallbackMethod_ReleaseReservations() {
-      ::grpc::Service::experimental().MarkMethodCallback(13,
-        new ::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>(
-          [this](::grpc::ServerContext* context,
-                 const ::datacatalog::ReleaseReservationsRequest* request,
-                 ::datacatalog::ReleaseReservationResponse* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   return this->ReleaseReservations(context, request, response, controller);
-                 }));
-    }
-    void SetMessageAllocatorFor_ReleaseReservations(
-        ::grpc::experimental::MessageAllocator< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>* allocator) {
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>*>(
-          ::grpc::Service::experimental().GetHandler(13))
-              ->SetMessageAllocator(allocator);
-    }
-    ~ExperimentalWithCallbackMethod_ReleaseReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual void ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
-  };
-  typedef ExperimentalWithCallbackMethod_CreateDataset > > > > > > > > > > > > > ExperimentalCallbackService;
+  typedef ExperimentalWithCallbackMethod_CreateDataset > > > > > > > > > > ExperimentalCallbackService;
   template 
   class WithGenericMethod_CreateDataset : public BaseClass {
    private:
@@ -1462,29 +1180,12 @@ class DataCatalog final {
     }
   };
   template 
-  class WithGenericMethod_DeleteArtifacts : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithGenericMethod_DeleteArtifacts() {
-      ::grpc::Service::MarkMethodGeneric(9);
-    }
-    ~WithGenericMethod_DeleteArtifacts() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template 
   class WithGenericMethod_GetOrExtendReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithGenericMethod_GetOrExtendReservation() {
-      ::grpc::Service::MarkMethodGeneric(10);
+      ::grpc::Service::MarkMethodGeneric(9);
     }
     ~WithGenericMethod_GetOrExtendReservation() override {
       BaseClassMustBeDerivedFromService(this);
@@ -1496,29 +1197,12 @@ class DataCatalog final {
     }
   };
   template 
-  class WithGenericMethod_GetOrExtendReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithGenericMethod_GetOrExtendReservations() {
-      ::grpc::Service::MarkMethodGeneric(11);
-    }
-    ~WithGenericMethod_GetOrExtendReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template 
   class WithGenericMethod_ReleaseReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithGenericMethod_ReleaseReservation() {
-      ::grpc::Service::MarkMethodGeneric(12);
+      ::grpc::Service::MarkMethodGeneric(10);
     }
     ~WithGenericMethod_ReleaseReservation() override {
       BaseClassMustBeDerivedFromService(this);
@@ -1530,23 +1214,6 @@ class DataCatalog final {
     }
   };
   template 
-  class WithGenericMethod_ReleaseReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithGenericMethod_ReleaseReservations() {
-      ::grpc::Service::MarkMethodGeneric(13);
-    }
-    ~WithGenericMethod_ReleaseReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template 
   class WithRawMethod_CreateDataset : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
@@ -1727,32 +1394,12 @@ class DataCatalog final {
     }
   };
   template 
-  class WithRawMethod_DeleteArtifacts : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithRawMethod_DeleteArtifacts() {
-      ::grpc::Service::MarkMethodRaw(9);
-    }
-    ~WithRawMethod_DeleteArtifacts() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDeleteArtifacts(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
   class WithRawMethod_GetOrExtendReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithRawMethod_GetOrExtendReservation() {
-      ::grpc::Service::MarkMethodRaw(10);
+      ::grpc::Service::MarkMethodRaw(9);
     }
     ~WithRawMethod_GetOrExtendReservation() override {
       BaseClassMustBeDerivedFromService(this);
@@ -1763,27 +1410,7 @@ class DataCatalog final {
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }
     void RequestGetOrExtendReservation(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
-  class WithRawMethod_GetOrExtendReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithRawMethod_GetOrExtendReservations() {
-      ::grpc::Service::MarkMethodRaw(11);
-    }
-    ~WithRawMethod_GetOrExtendReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetOrExtendReservations(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag);
+      ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag);
     }
   };
   template 
@@ -1792,7 +1419,7 @@ class DataCatalog final {
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithRawMethod_ReleaseReservation() {
-      ::grpc::Service::MarkMethodRaw(12);
+      ::grpc::Service::MarkMethodRaw(10);
     }
     ~WithRawMethod_ReleaseReservation() override {
       BaseClassMustBeDerivedFromService(this);
@@ -1803,27 +1430,7 @@ class DataCatalog final {
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }
     void RequestReleaseReservation(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(12, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template 
-  class WithRawMethod_ReleaseReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithRawMethod_ReleaseReservations() {
-      ::grpc::Service::MarkMethodRaw(13);
-    }
-    ~WithRawMethod_ReleaseReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestReleaseReservations(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag);
+      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
     }
   };
   template 
@@ -2052,37 +1659,12 @@ class DataCatalog final {
     virtual void DeleteArtifact(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
   template 
-  class ExperimentalWithRawCallbackMethod_DeleteArtifacts : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithRawCallbackMethod_DeleteArtifacts() {
-      ::grpc::Service::experimental().MarkMethodRawCallback(9,
-        new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-          [this](::grpc::ServerContext* context,
-                 const ::grpc::ByteBuffer* request,
-                 ::grpc::ByteBuffer* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   this->DeleteArtifacts(context, request, response, controller);
-                 }));
-    }
-    ~ExperimentalWithRawCallbackMethod_DeleteArtifacts() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual void DeleteArtifacts(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
-  };
-  template 
   class ExperimentalWithRawCallbackMethod_GetOrExtendReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     ExperimentalWithRawCallbackMethod_GetOrExtendReservation() {
-      ::grpc::Service::experimental().MarkMethodRawCallback(10,
+      ::grpc::Service::experimental().MarkMethodRawCallback(9,
         new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
           [this](::grpc::ServerContext* context,
                  const ::grpc::ByteBuffer* request,
@@ -2102,37 +1684,12 @@ class DataCatalog final {
     virtual void GetOrExtendReservation(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
   template 
-  class ExperimentalWithRawCallbackMethod_GetOrExtendReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithRawCallbackMethod_GetOrExtendReservations() {
-      ::grpc::Service::experimental().MarkMethodRawCallback(11,
-        new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-          [this](::grpc::ServerContext* context,
-                 const ::grpc::ByteBuffer* request,
-                 ::grpc::ByteBuffer* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   this->GetOrExtendReservations(context, request, response, controller);
-                 }));
-    }
-    ~ExperimentalWithRawCallbackMethod_GetOrExtendReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual void GetOrExtendReservations(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
-  };
-  template 
   class ExperimentalWithRawCallbackMethod_ReleaseReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     ExperimentalWithRawCallbackMethod_ReleaseReservation() {
-      ::grpc::Service::experimental().MarkMethodRawCallback(12,
+      ::grpc::Service::experimental().MarkMethodRawCallback(10,
         new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
           [this](::grpc::ServerContext* context,
                  const ::grpc::ByteBuffer* request,
@@ -2152,31 +1709,6 @@ class DataCatalog final {
     virtual void ReleaseReservation(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
   };
   template 
-  class ExperimentalWithRawCallbackMethod_ReleaseReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    ExperimentalWithRawCallbackMethod_ReleaseReservations() {
-      ::grpc::Service::experimental().MarkMethodRawCallback(13,
-        new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-          [this](::grpc::ServerContext* context,
-                 const ::grpc::ByteBuffer* request,
-                 ::grpc::ByteBuffer* response,
-                 ::grpc::experimental::ServerCallbackRpcController* controller) {
-                   this->ReleaseReservations(context, request, response, controller);
-                 }));
-    }
-    ~ExperimentalWithRawCallbackMethod_ReleaseReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual void ReleaseReservations(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); }
-  };
-  template 
   class WithStreamedUnaryMethod_CreateDataset : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
@@ -2357,32 +1889,12 @@ class DataCatalog final {
     virtual ::grpc::Status StreamedDeleteArtifact(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::DeleteArtifactRequest,::datacatalog::DeleteArtifactResponse>* server_unary_streamer) = 0;
   };
   template 
-  class WithStreamedUnaryMethod_DeleteArtifacts : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithStreamedUnaryMethod_DeleteArtifacts() {
-      ::grpc::Service::MarkMethodStreamed(9,
-        new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::DeleteArtifactsRequest, ::datacatalog::DeleteArtifactResponse>(std::bind(&WithStreamedUnaryMethod_DeleteArtifacts::StreamedDeleteArtifacts, this, std::placeholders::_1, std::placeholders::_2)));
-    }
-    ~WithStreamedUnaryMethod_DeleteArtifacts() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status DeleteArtifacts(::grpc::ServerContext* context, const ::datacatalog::DeleteArtifactsRequest* request, ::datacatalog::DeleteArtifactResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedDeleteArtifacts(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::DeleteArtifactsRequest,::datacatalog::DeleteArtifactResponse>* server_unary_streamer) = 0;
-  };
-  template 
   class WithStreamedUnaryMethod_GetOrExtendReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithStreamedUnaryMethod_GetOrExtendReservation() {
-      ::grpc::Service::MarkMethodStreamed(10,
+      ::grpc::Service::MarkMethodStreamed(9,
         new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::GetOrExtendReservationRequest, ::datacatalog::GetOrExtendReservationResponse>(std::bind(&WithStreamedUnaryMethod_GetOrExtendReservation::StreamedGetOrExtendReservation, this, std::placeholders::_1, std::placeholders::_2)));
     }
     ~WithStreamedUnaryMethod_GetOrExtendReservation() override {
@@ -2397,32 +1909,12 @@ class DataCatalog final {
     virtual ::grpc::Status StreamedGetOrExtendReservation(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::GetOrExtendReservationRequest,::datacatalog::GetOrExtendReservationResponse>* server_unary_streamer) = 0;
   };
   template 
-  class WithStreamedUnaryMethod_GetOrExtendReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithStreamedUnaryMethod_GetOrExtendReservations() {
-      ::grpc::Service::MarkMethodStreamed(11,
-        new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::GetOrExtendReservationsRequest, ::datacatalog::GetOrExtendReservationsResponse>(std::bind(&WithStreamedUnaryMethod_GetOrExtendReservations::StreamedGetOrExtendReservations, this, std::placeholders::_1, std::placeholders::_2)));
-    }
-    ~WithStreamedUnaryMethod_GetOrExtendReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status GetOrExtendReservations(::grpc::ServerContext* context, const ::datacatalog::GetOrExtendReservationsRequest* request, ::datacatalog::GetOrExtendReservationsResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedGetOrExtendReservations(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::GetOrExtendReservationsRequest,::datacatalog::GetOrExtendReservationsResponse>* server_unary_streamer) = 0;
-  };
-  template 
   class WithStreamedUnaryMethod_ReleaseReservation : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
     WithStreamedUnaryMethod_ReleaseReservation() {
-      ::grpc::Service::MarkMethodStreamed(12,
+      ::grpc::Service::MarkMethodStreamed(10,
         new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::ReleaseReservationRequest, ::datacatalog::ReleaseReservationResponse>(std::bind(&WithStreamedUnaryMethod_ReleaseReservation::StreamedReleaseReservation, this, std::placeholders::_1, std::placeholders::_2)));
     }
     ~WithStreamedUnaryMethod_ReleaseReservation() override {
@@ -2436,29 +1928,9 @@ class DataCatalog final {
     // replace default version of method with streamed unary
     virtual ::grpc::Status StreamedReleaseReservation(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::ReleaseReservationRequest,::datacatalog::ReleaseReservationResponse>* server_unary_streamer) = 0;
   };
-  template 
-  class WithStreamedUnaryMethod_ReleaseReservations : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithStreamedUnaryMethod_ReleaseReservations() {
-      ::grpc::Service::MarkMethodStreamed(13,
-        new ::grpc::internal::StreamedUnaryHandler< ::datacatalog::ReleaseReservationsRequest, ::datacatalog::ReleaseReservationResponse>(std::bind(&WithStreamedUnaryMethod_ReleaseReservations::StreamedReleaseReservations, this, std::placeholders::_1, std::placeholders::_2)));
-    }
-    ~WithStreamedUnaryMethod_ReleaseReservations() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ReleaseReservations(::grpc::ServerContext* context, const ::datacatalog::ReleaseReservationsRequest* request, ::datacatalog::ReleaseReservationResponse* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedReleaseReservations(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::datacatalog::ReleaseReservationsRequest,::datacatalog::ReleaseReservationResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > > > > StreamedUnaryService;
+  typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > StreamedUnaryService;
   typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > > > > StreamedService;
+  typedef WithStreamedUnaryMethod_CreateDataset > > > > > > > > > > StreamedService;
 };
 
 }  // namespace datacatalog
diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc
index eae7501337..7fd95ef25c 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.cc
@@ -26,15 +26,12 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::g
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Partition_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TagPropertyFilter_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_ArtifactData_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_FilterExpression_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_PartitionPropertyFilter_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_ReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Tag_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_Dataset_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_GetOrExtendReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_SinglePropertyFilter_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fdatacatalog_2fdatacatalog_2eproto ::google::protobuf::internal::SCCInfo<6> scc_info_Artifact_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
@@ -115,10 +112,6 @@ class DeleteArtifactRequestDefaultTypeInternal {
   ::google::protobuf::internal::ArenaStringPtr artifact_id_;
   ::google::protobuf::internal::ArenaStringPtr tag_name_;
 } _DeleteArtifactRequest_default_instance_;
-class DeleteArtifactsRequestDefaultTypeInternal {
- public:
-  ::google::protobuf::internal::ExplicitlyConstructed _instance;
-} _DeleteArtifactsRequest_default_instance_;
 class DeleteArtifactResponseDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
@@ -131,10 +124,6 @@ class GetOrExtendReservationRequestDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
 } _GetOrExtendReservationRequest_default_instance_;
-class GetOrExtendReservationsRequestDefaultTypeInternal {
- public:
-  ::google::protobuf::internal::ExplicitlyConstructed _instance;
-} _GetOrExtendReservationsRequest_default_instance_;
 class ReservationDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
@@ -143,18 +132,10 @@ class GetOrExtendReservationResponseDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
 } _GetOrExtendReservationResponse_default_instance_;
-class GetOrExtendReservationsResponseDefaultTypeInternal {
- public:
-  ::google::protobuf::internal::ExplicitlyConstructed _instance;
-} _GetOrExtendReservationsResponse_default_instance_;
 class ReleaseReservationRequestDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
 } _ReleaseReservationRequest_default_instance_;
-class ReleaseReservationsRequestDefaultTypeInternal {
- public:
-  ::google::protobuf::internal::ExplicitlyConstructed _instance;
-} _ReleaseReservationsRequest_default_instance_;
 class ReleaseReservationResponseDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
@@ -492,21 +473,6 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_DeleteArtifactRequest_flyteidl
     {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsDeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {
       &scc_info_DatasetID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}};
 
-static void InitDefaultsDeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  {
-    void* ptr = &::datacatalog::_DeleteArtifactsRequest_default_instance_;
-    new (ptr) ::datacatalog::DeleteArtifactsRequest();
-    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
-  }
-  ::datacatalog::DeleteArtifactsRequest::InitAsDefaultInstance();
-}
-
-::google::protobuf::internal::SCCInfo<1> scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsDeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {
-      &scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}};
-
 static void InitDefaultsDeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
@@ -552,21 +518,6 @@ ::google::protobuf::internal::SCCInfo<2> scc_info_GetOrExtendReservationRequest_
       &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,
       &scc_info_Duration_google_2fprotobuf_2fduration_2eproto.base,}};
 
-static void InitDefaultsGetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  {
-    void* ptr = &::datacatalog::_GetOrExtendReservationsRequest_default_instance_;
-    new (ptr) ::datacatalog::GetOrExtendReservationsRequest();
-    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
-  }
-  ::datacatalog::GetOrExtendReservationsRequest::InitAsDefaultInstance();
-}
-
-::google::protobuf::internal::SCCInfo<1> scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {
-      &scc_info_GetOrExtendReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}};
-
 static void InitDefaultsReservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
@@ -600,21 +551,6 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_GetOrExtendReservationResponse
     {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetOrExtendReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {
       &scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}};
 
-static void InitDefaultsGetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  {
-    void* ptr = &::datacatalog::_GetOrExtendReservationsResponse_default_instance_;
-    new (ptr) ::datacatalog::GetOrExtendReservationsResponse();
-    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
-  }
-  ::datacatalog::GetOrExtendReservationsResponse::InitAsDefaultInstance();
-}
-
-::google::protobuf::internal::SCCInfo<1> scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {
-      &scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}};
-
 static void InitDefaultsReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
@@ -630,21 +566,6 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_ReleaseReservationRequest_flyt
     {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {
       &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}};
 
-static void InitDefaultsReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  {
-    void* ptr = &::datacatalog::_ReleaseReservationsRequest_default_instance_;
-    new (ptr) ::datacatalog::ReleaseReservationsRequest();
-    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
-  }
-  ::datacatalog::ReleaseReservationsRequest::InitAsDefaultInstance();
-}
-
-::google::protobuf::internal::SCCInfo<1> scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto}, {
-      &scc_info_ReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base,}};
-
 static void InitDefaultsReleaseReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
@@ -917,16 +838,12 @@ void InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
   ::google::protobuf::internal::InitSCC(&scc_info_UpdateArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_UpdateArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_Reservation_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_ReleaseReservationRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_ReleaseReservationResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_Dataset_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_Partition_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
@@ -946,7 +863,7 @@ void InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
   ::google::protobuf::internal::InitSCC(&scc_info_PaginationOptions_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[44];
+::google::protobuf::Metadata file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[40];
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[3];
 constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = nullptr;
 
@@ -1067,12 +984,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo
   offsetof(::datacatalog::DeleteArtifactRequestDefaultTypeInternal, tag_name_),
   PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactRequest, query_handle_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactsRequest, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactsRequest, artifacts_),
-  ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::datacatalog::DeleteArtifactResponse, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
@@ -1093,12 +1004,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo
   PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationRequest, owner_id_),
   PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationRequest, heartbeat_interval_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsRequest, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsRequest, reservations_),
-  ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::datacatalog::Reservation, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
@@ -1115,12 +1020,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo
   ~0u,  // no _weak_field_map_
   PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationResponse, reservation_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsResponse, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::GetOrExtendReservationsResponse, reservations_),
-  ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationRequest, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
@@ -1128,12 +1027,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fdatacatalog_2fdatacatalo
   PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationRequest, reservation_id_),
   PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationRequest, owner_id_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationsRequest, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationsRequest, reservations_),
-  ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::datacatalog::ReleaseReservationResponse, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
@@ -1290,33 +1183,29 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE
   { 89, -1, sizeof(::datacatalog::UpdateArtifactRequest)},
   { 100, -1, sizeof(::datacatalog::UpdateArtifactResponse)},
   { 106, -1, sizeof(::datacatalog::DeleteArtifactRequest)},
-  { 115, -1, sizeof(::datacatalog::DeleteArtifactsRequest)},
-  { 121, -1, sizeof(::datacatalog::DeleteArtifactResponse)},
-  { 126, -1, sizeof(::datacatalog::ReservationID)},
-  { 133, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)},
-  { 141, -1, sizeof(::datacatalog::GetOrExtendReservationsRequest)},
-  { 147, -1, sizeof(::datacatalog::Reservation)},
-  { 157, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)},
-  { 163, -1, sizeof(::datacatalog::GetOrExtendReservationsResponse)},
-  { 169, -1, sizeof(::datacatalog::ReleaseReservationRequest)},
-  { 176, -1, sizeof(::datacatalog::ReleaseReservationsRequest)},
-  { 182, -1, sizeof(::datacatalog::ReleaseReservationResponse)},
-  { 187, -1, sizeof(::datacatalog::Dataset)},
-  { 195, -1, sizeof(::datacatalog::Partition)},
-  { 202, -1, sizeof(::datacatalog::DatasetID)},
-  { 213, -1, sizeof(::datacatalog::Artifact)},
-  { 225, -1, sizeof(::datacatalog::ArtifactData)},
-  { 232, -1, sizeof(::datacatalog::Tag)},
-  { 240, 247, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)},
-  { 249, -1, sizeof(::datacatalog::Metadata)},
-  { 255, -1, sizeof(::datacatalog::FilterExpression)},
-  { 261, -1, sizeof(::datacatalog::SinglePropertyFilter)},
-  { 272, -1, sizeof(::datacatalog::ArtifactPropertyFilter)},
-  { 279, -1, sizeof(::datacatalog::TagPropertyFilter)},
-  { 286, -1, sizeof(::datacatalog::PartitionPropertyFilter)},
-  { 293, -1, sizeof(::datacatalog::KeyValuePair)},
-  { 300, -1, sizeof(::datacatalog::DatasetPropertyFilter)},
-  { 311, -1, sizeof(::datacatalog::PaginationOptions)},
+  { 115, -1, sizeof(::datacatalog::DeleteArtifactResponse)},
+  { 120, -1, sizeof(::datacatalog::ReservationID)},
+  { 127, -1, sizeof(::datacatalog::GetOrExtendReservationRequest)},
+  { 135, -1, sizeof(::datacatalog::Reservation)},
+  { 145, -1, sizeof(::datacatalog::GetOrExtendReservationResponse)},
+  { 151, -1, sizeof(::datacatalog::ReleaseReservationRequest)},
+  { 158, -1, sizeof(::datacatalog::ReleaseReservationResponse)},
+  { 163, -1, sizeof(::datacatalog::Dataset)},
+  { 171, -1, sizeof(::datacatalog::Partition)},
+  { 178, -1, sizeof(::datacatalog::DatasetID)},
+  { 189, -1, sizeof(::datacatalog::Artifact)},
+  { 201, -1, sizeof(::datacatalog::ArtifactData)},
+  { 208, -1, sizeof(::datacatalog::Tag)},
+  { 216, 223, sizeof(::datacatalog::Metadata_KeyMapEntry_DoNotUse)},
+  { 225, -1, sizeof(::datacatalog::Metadata)},
+  { 231, -1, sizeof(::datacatalog::FilterExpression)},
+  { 237, -1, sizeof(::datacatalog::SinglePropertyFilter)},
+  { 248, -1, sizeof(::datacatalog::ArtifactPropertyFilter)},
+  { 255, -1, sizeof(::datacatalog::TagPropertyFilter)},
+  { 262, -1, sizeof(::datacatalog::PartitionPropertyFilter)},
+  { 269, -1, sizeof(::datacatalog::KeyValuePair)},
+  { 276, -1, sizeof(::datacatalog::DatasetPropertyFilter)},
+  { 287, -1, sizeof(::datacatalog::PaginationOptions)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -1337,16 +1226,12 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   reinterpret_cast(&::datacatalog::_UpdateArtifactRequest_default_instance_),
   reinterpret_cast(&::datacatalog::_UpdateArtifactResponse_default_instance_),
   reinterpret_cast(&::datacatalog::_DeleteArtifactRequest_default_instance_),
-  reinterpret_cast(&::datacatalog::_DeleteArtifactsRequest_default_instance_),
   reinterpret_cast(&::datacatalog::_DeleteArtifactResponse_default_instance_),
   reinterpret_cast(&::datacatalog::_ReservationID_default_instance_),
   reinterpret_cast(&::datacatalog::_GetOrExtendReservationRequest_default_instance_),
-  reinterpret_cast(&::datacatalog::_GetOrExtendReservationsRequest_default_instance_),
   reinterpret_cast(&::datacatalog::_Reservation_default_instance_),
   reinterpret_cast(&::datacatalog::_GetOrExtendReservationResponse_default_instance_),
-  reinterpret_cast(&::datacatalog::_GetOrExtendReservationsResponse_default_instance_),
   reinterpret_cast(&::datacatalog::_ReleaseReservationRequest_default_instance_),
-  reinterpret_cast(&::datacatalog::_ReleaseReservationsRequest_default_instance_),
   reinterpret_cast(&::datacatalog::_ReleaseReservationResponse_default_instance_),
   reinterpret_cast(&::datacatalog::_Dataset_default_instance_),
   reinterpret_cast(&::datacatalog::_Partition_default_instance_),
@@ -1369,7 +1254,7 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
 ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = {
   {}, AddDescriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, "flyteidl/datacatalog/datacatalog.proto", schemas,
   file_default_instances, TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto::offsets,
-  file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 44, file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto,
+  file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 40, file_level_enum_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, file_level_service_descriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto,
 };
 
 const char descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[] =
@@ -1411,120 +1296,103 @@ const char descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eprot
   "rtifact_id\030\001 \001(\t\"{\n\025DeleteArtifactReques"
   "t\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.Dataset"
   "ID\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 "
-  "\001(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifacts"
-  "Request\0225\n\tartifacts\030\001 \003(\0132\".datacatalog"
-  ".DeleteArtifactRequest\"\030\n\026DeleteArtifact"
-  "Response\"M\n\rReservationID\022*\n\ndataset_id\030"
-  "\001 \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_nam"
-  "e\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationReques"
-  "t\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog."
-  "ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heart"
-  "beat_interval\030\003 \001(\0132\031.google.protobuf.Du"
-  "ration\"b\n\036GetOrExtendReservationsRequest"
-  "\022@\n\014reservations\030\001 \003(\0132*.datacatalog.Get"
-  "OrExtendReservationRequest\"\343\001\n\013Reservati"
-  "on\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog"
-  ".ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022hear"
-  "tbeat_interval\030\003 \001(\0132\031.google.protobuf.D"
-  "uration\022.\n\nexpires_at\030\004 \001(\0132\032.google.pro"
-  "tobuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.data"
-  "catalog.Metadata\"O\n\036GetOrExtendReservati"
-  "onResponse\022-\n\013reservation\030\001 \001(\0132\030.dataca"
-  "talog.Reservation\"Q\n\037GetOrExtendReservat"
-  "ionsResponse\022.\n\014reservations\030\001 \003(\0132\030.dat"
-  "acatalog.Reservation\"a\n\031ReleaseReservati"
-  "onRequest\0222\n\016reservation_id\030\001 \001(\0132\032.data"
-  "catalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\""
-  "Z\n\032ReleaseReservationsRequest\022<\n\014reserva"
-  "tions\030\001 \003(\0132&.datacatalog.ReleaseReserva"
-  "tionRequest\"\034\n\032ReleaseReservationRespons"
-  "e\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.D"
-  "atasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog"
-  ".Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tPart"
-  "ition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"f\n\tDat"
-  "asetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n"
-  "\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005"
-  " \001(\t\022\013\n\003org\030\006 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001"
-  "(\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Datase"
-  "tID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.Artifact"
-  "Data\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog.Met"
-  "adata\022*\n\npartitions\030\005 \003(\0132\026.datacatalog."
-  "Partition\022\036\n\004tags\030\006 \003(\0132\020.datacatalog.Ta"
-  "g\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf."
-  "Timestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022"
-  "%\n\005value\030\002 \001(\0132\026.flyteidl.core.Literal\"Q"
-  "\n\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t"
-  "\022\'\n\007dataset\030\003 \001(\0132\026.datacatalog.DatasetI"
-  "D\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.datacat"
-  "alog.Metadata.KeyMapEntry\032-\n\013KeyMapEntry"
-  "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020Filt"
-  "erExpression\0222\n\007filters\030\001 \003(\0132!.datacata"
-  "log.SinglePropertyFilter\"\211\003\n\024SinglePrope"
-  "rtyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.datacata"
-  "log.TagPropertyFilterH\000\022@\n\020partition_fil"
-  "ter\030\002 \001(\0132$.datacatalog.PartitionPropert"
-  "yFilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#.dat"
-  "acatalog.ArtifactPropertyFilterH\000\022<\n\016dat"
-  "aset_filter\030\004 \001(\0132\".datacatalog.DatasetP"
-  "ropertyFilterH\000\022F\n\010operator\030\n \001(\01624.data"
-  "catalog.SinglePropertyFilter.ComparisonO"
-  "perator\" \n\022ComparisonOperator\022\n\n\006EQUALS\020"
-  "\000B\021\n\017property_filter\";\n\026ArtifactProperty"
-  "Filter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010propert"
-  "y\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001 \001(\t"
-  "H\000B\n\n\010property\"S\n\027PartitionPropertyFilte"
-  "r\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.KeyValu"
-  "ePairH\000B\n\n\010property\"*\n\014KeyValuePair\022\013\n\003k"
-  "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"z\n\025DatasetProper"
-  "tyFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001("
-  "\tH\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000"
-  "\022\r\n\003org\030\005 \001(\tH\000B\n\n\010property\"\361\001\n\021Paginati"
-  "onOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005token\030\002 \001(\t\022"
-  "7\n\007sortKey\030\003 \001(\0162&.datacatalog.Paginatio"
-  "nOptions.SortKey\022;\n\tsortOrder\030\004 \001(\0162(.da"
-  "tacatalog.PaginationOptions.SortOrder\"*\n"
-  "\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n\tASCENDING\020"
-  "\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME\020\0002\235\n\n\013Data"
-  "Catalog\022V\n\rCreateDataset\022!.datacatalog.C"
-  "reateDatasetRequest\032\".datacatalog.Create"
-  "DatasetResponse\022M\n\nGetDataset\022\036.datacata"
-  "log.GetDatasetRequest\032\037.datacatalog.GetD"
-  "atasetResponse\022Y\n\016CreateArtifact\022\".datac"
-  "atalog.CreateArtifactRequest\032#.datacatal"
-  "og.CreateArtifactResponse\022P\n\013GetArtifact"
-  "\022\037.datacatalog.GetArtifactRequest\032 .data"
-  "catalog.GetArtifactResponse\022A\n\006AddTag\022\032."
-  "datacatalog.AddTagRequest\032\033.datacatalog."
-  "AddTagResponse\022V\n\rListArtifacts\022!.dataca"
-  "talog.ListArtifactsRequest\032\".datacatalog"
-  ".ListArtifactsResponse\022S\n\014ListDatasets\022 "
-  ".datacatalog.ListDatasetsRequest\032!.datac"
-  "atalog.ListDatasetsResponse\022Y\n\016UpdateArt"
-  "ifact\022\".datacatalog.UpdateArtifactReques"
-  "t\032#.datacatalog.UpdateArtifactResponse\022Y"
-  "\n\016DeleteArtifact\022\".datacatalog.DeleteArt"
-  "ifactRequest\032#.datacatalog.DeleteArtifac"
-  "tResponse\022[\n\017DeleteArtifacts\022#.datacatal"
-  "og.DeleteArtifactsRequest\032#.datacatalog."
-  "DeleteArtifactResponse\022q\n\026GetOrExtendRes"
-  "ervation\022*.datacatalog.GetOrExtendReserv"
-  "ationRequest\032+.datacatalog.GetOrExtendRe"
-  "servationResponse\022t\n\027GetOrExtendReservat"
-  "ions\022+.datacatalog.GetOrExtendReservatio"
-  "nsRequest\032,.datacatalog.GetOrExtendReser"
-  "vationsResponse\022e\n\022ReleaseReservation\022&."
-  "datacatalog.ReleaseReservationRequest\032\'."
-  "datacatalog.ReleaseReservationResponse\022g"
-  "\n\023ReleaseReservations\022\'.datacatalog.Rele"
-  "aseReservationsRequest\032\'.datacatalog.Rel"
-  "easeReservationResponseBCZAgithub.com/fl"
-  "yteorg/flyte/flyteidl/gen/pb-go/flyteidl"
-  "/datacatalogb\006proto3"
+  "\001(\tH\000B\016\n\014query_handle\"\030\n\026DeleteArtifactR"
+  "esponse\"M\n\rReservationID\022*\n\ndataset_id\030\001"
+  " \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name"
+  "\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest"
+  "\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog.R"
+  "eservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartb"
+  "eat_interval\030\003 \001(\0132\031.google.protobuf.Dur"
+  "ation\"\343\001\n\013Reservation\0222\n\016reservation_id\030"
+  "\001 \001(\0132\032.datacatalog.ReservationID\022\020\n\010own"
+  "er_id\030\002 \001(\t\0225\n\022heartbeat_interval\030\003 \001(\0132"
+  "\031.google.protobuf.Duration\022.\n\nexpires_at"
+  "\030\004 \001(\0132\032.google.protobuf.Timestamp\022\'\n\010me"
+  "tadata\030\006 \001(\0132\025.datacatalog.Metadata\"O\n\036G"
+  "etOrExtendReservationResponse\022-\n\013reserva"
+  "tion\030\001 \001(\0132\030.datacatalog.Reservation\"a\n\031"
+  "ReleaseReservationRequest\0222\n\016reservation"
+  "_id\030\001 \001(\0132\032.datacatalog.ReservationID\022\020\n"
+  "\010owner_id\030\002 \001(\t\"\034\n\032ReleaseReservationRes"
+  "ponse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatal"
+  "og.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacat"
+  "alog.Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\t"
+  "Partition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"f\n"
+  "\tDatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001("
+  "\t\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UU"
+  "ID\030\005 \001(\t\022\013\n\003org\030\006 \001(\t\"\215\002\n\010Artifact\022\n\n\002id"
+  "\030\001 \001(\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Da"
+  "tasetID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.Arti"
+  "factData\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog"
+  ".Metadata\022*\n\npartitions\030\005 \003(\0132\026.datacata"
+  "log.Partition\022\036\n\004tags\030\006 \003(\0132\020.datacatalo"
+  "g.Tag\022.\n\ncreated_at\030\007 \001(\0132\032.google.proto"
+  "buf.Timestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 "
+  "\001(\t\022%\n\005value\030\002 \001(\0132\026.flyteidl.core.Liter"
+  "al\"Q\n\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002"
+  " \001(\t\022\'\n\007dataset\030\003 \001(\0132\026.datacatalog.Data"
+  "setID\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.dat"
+  "acatalog.Metadata.KeyMapEntry\032-\n\013KeyMapE"
+  "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020"
+  "FilterExpression\0222\n\007filters\030\001 \003(\0132!.data"
+  "catalog.SinglePropertyFilter\"\211\003\n\024SingleP"
+  "ropertyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.data"
+  "catalog.TagPropertyFilterH\000\022@\n\020partition"
+  "_filter\030\002 \001(\0132$.datacatalog.PartitionPro"
+  "pertyFilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#"
+  ".datacatalog.ArtifactPropertyFilterH\000\022<\n"
+  "\016dataset_filter\030\004 \001(\0132\".datacatalog.Data"
+  "setPropertyFilterH\000\022F\n\010operator\030\n \001(\01624."
+  "datacatalog.SinglePropertyFilter.Compari"
+  "sonOperator\" \n\022ComparisonOperator\022\n\n\006EQU"
+  "ALS\020\000B\021\n\017property_filter\";\n\026ArtifactProp"
+  "ertyFilter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010pro"
+  "perty\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001"
+  " \001(\tH\000B\n\n\010property\"S\n\027PartitionPropertyF"
+  "ilter\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.Key"
+  "ValuePairH\000B\n\n\010property\"*\n\014KeyValuePair\022"
+  "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"z\n\025DatasetPr"
+  "opertyFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030"
+  "\002 \001(\tH\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001"
+  "(\tH\000\022\r\n\003org\030\005 \001(\tH\000B\n\n\010property\"\361\001\n\021Pagi"
+  "nationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005token\030\002 "
+  "\001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatalog.Pagin"
+  "ationOptions.SortKey\022;\n\tsortOrder\030\004 \001(\0162"
+  "(.datacatalog.PaginationOptions.SortOrde"
+  "r\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n\tASCEND"
+  "ING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME\020\0002\341\007\n\013"
+  "DataCatalog\022V\n\rCreateDataset\022!.datacatal"
+  "og.CreateDatasetRequest\032\".datacatalog.Cr"
+  "eateDatasetResponse\022M\n\nGetDataset\022\036.data"
+  "catalog.GetDatasetRequest\032\037.datacatalog."
+  "GetDatasetResponse\022Y\n\016CreateArtifact\022\".d"
+  "atacatalog.CreateArtifactRequest\032#.datac"
+  "atalog.CreateArtifactResponse\022P\n\013GetArti"
+  "fact\022\037.datacatalog.GetArtifactRequest\032 ."
+  "datacatalog.GetArtifactResponse\022A\n\006AddTa"
+  "g\022\032.datacatalog.AddTagRequest\032\033.datacata"
+  "log.AddTagResponse\022V\n\rListArtifacts\022!.da"
+  "tacatalog.ListArtifactsRequest\032\".datacat"
+  "alog.ListArtifactsResponse\022S\n\014ListDatase"
+  "ts\022 .datacatalog.ListDatasetsRequest\032!.d"
+  "atacatalog.ListDatasetsResponse\022Y\n\016Updat"
+  "eArtifact\022\".datacatalog.UpdateArtifactRe"
+  "quest\032#.datacatalog.UpdateArtifactRespon"
+  "se\022Y\n\016DeleteArtifact\022\".datacatalog.Delet"
+  "eArtifactRequest\032#.datacatalog.DeleteArt"
+  "ifactResponse\022q\n\026GetOrExtendReservation\022"
+  "*.datacatalog.GetOrExtendReservationRequ"
+  "est\032+.datacatalog.GetOrExtendReservation"
+  "Response\022e\n\022ReleaseReservation\022&.datacat"
+  "alog.ReleaseReservationRequest\032\'.datacat"
+  "alog.ReleaseReservationResponseBCZAgithu"
+  "b.com/flyteorg/flyte/flyteidl/gen/pb-go/"
+  "flyteidl/datacatalogb\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto = {
   false, InitDefaults_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 
   descriptor_table_protodef_flyteidl_2fdatacatalog_2fdatacatalog_2eproto,
-  "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 5860,
+  "flyteidl/datacatalog/datacatalog.proto", &assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto, 5188,
 };
 
 void AddDescriptors_flyteidl_2fdatacatalog_2fdatacatalog_2eproto() {
@@ -7285,65 +7153,60 @@ ::google::protobuf::Metadata DeleteArtifactRequest::GetMetadata() const {
 
 // ===================================================================
 
-void DeleteArtifactsRequest::InitAsDefaultInstance() {
+void DeleteArtifactResponse::InitAsDefaultInstance() {
 }
-class DeleteArtifactsRequest::HasBitSetters {
+class DeleteArtifactResponse::HasBitSetters {
  public:
 };
 
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int DeleteArtifactsRequest::kArtifactsFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
-DeleteArtifactsRequest::DeleteArtifactsRequest()
+DeleteArtifactResponse::DeleteArtifactResponse()
   : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
-  // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactResponse)
 }
-DeleteArtifactsRequest::DeleteArtifactsRequest(const DeleteArtifactsRequest& from)
+DeleteArtifactResponse::DeleteArtifactResponse(const DeleteArtifactResponse& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr),
-      artifacts_(from.artifacts_) {
+      _internal_metadata_(nullptr) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactResponse)
 }
 
-void DeleteArtifactsRequest::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
+void DeleteArtifactResponse::SharedCtor() {
 }
 
-DeleteArtifactsRequest::~DeleteArtifactsRequest() {
-  // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactsRequest)
+DeleteArtifactResponse::~DeleteArtifactResponse() {
+  // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactResponse)
   SharedDtor();
 }
 
-void DeleteArtifactsRequest::SharedDtor() {
+void DeleteArtifactResponse::SharedDtor() {
 }
 
-void DeleteArtifactsRequest::SetCachedSize(int size) const {
+void DeleteArtifactResponse::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const DeleteArtifactsRequest& DeleteArtifactsRequest::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
+const DeleteArtifactResponse& DeleteArtifactResponse::default_instance() {
+  ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   return *internal_default_instance();
 }
 
 
-void DeleteArtifactsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactsRequest)
+void DeleteArtifactResponse::Clear() {
+// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactResponse)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  artifacts_.Clear();
   _internal_metadata_.Clear();
 }
 
 #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* DeleteArtifactsRequest::_InternalParse(const char* begin, const char* end, void* object,
+const char* DeleteArtifactResponse::_InternalParse(const char* begin, const char* end, void* object,
                   ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast(object);
+  auto msg = static_cast(object);
   ::google::protobuf::int32 size; (void)size;
   int depth; (void)depth;
   ::google::protobuf::uint32 tag;
@@ -7353,24 +7216,7 @@ const char* DeleteArtifactsRequest::_InternalParse(const char* begin, const char
     ptr = ::google::protobuf::io::Parse32(ptr, &tag);
     GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
     switch (tag >> 3) {
-      // repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        do {
-          ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          parser_till_end = ::datacatalog::DeleteArtifactRequest::_InternalParse;
-          object = msg->add_artifacts();
-          if (size > end - ptr) goto len_delim_till_end;
-          ptr += size;
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-              {parser_till_end, object}, ptr - size, ptr));
-          if (ptr >= end) break;
-        } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1));
-        break;
-      }
       default: {
-      handle_unusual:
         if ((tag & 7) == 4 || tag == 0) {
           ctx->EndGroup(tag);
           return ptr;
@@ -7384,99 +7230,63 @@ const char* DeleteArtifactsRequest::_InternalParse(const char* begin, const char
     }  // switch
   }  // while
   return ptr;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
 }
 #else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-bool DeleteArtifactsRequest::MergePartialFromCodedStream(
+bool DeleteArtifactResponse::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactResponse)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-                input, add_artifacts()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
+  handle_unusual:
+    if (tag == 0) {
+      goto success;
     }
+    DO_(::google::protobuf::internal::WireFormat::SkipField(
+          input, tag, _internal_metadata_.mutable_unknown_fields()));
   }
 success:
-  // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactResponse)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactResponse)
   return false;
 #undef DO_
 }
 #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
-void DeleteArtifactsRequest::SerializeWithCachedSizes(
+void DeleteArtifactResponse::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactResponse)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->artifacts_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1,
-      this->artifacts(static_cast(i)),
-      output);
-  }
-
   if (_internal_metadata_.have_unknown_fields()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactResponse)
 }
 
-::google::protobuf::uint8* DeleteArtifactsRequest::InternalSerializeWithCachedSizesToArray(
+::google::protobuf::uint8* DeleteArtifactResponse::InternalSerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactResponse)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->artifacts_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        1, this->artifacts(static_cast(i)), target);
-  }
-
   if (_internal_metadata_.have_unknown_fields()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactResponse)
   return target;
 }
 
-size_t DeleteArtifactsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactsRequest)
+size_t DeleteArtifactResponse::ByteSizeLong() const {
+// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactResponse)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -7488,76 +7298,63 @@ size_t DeleteArtifactsRequest::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-  {
-    unsigned int count = static_cast(this->artifacts_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSize(
-          this->artifacts(static_cast(i)));
-    }
-  }
-
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
   return total_size;
 }
 
-void DeleteArtifactsRequest::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactsRequest)
+void DeleteArtifactResponse::MergeFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactResponse)
   GOOGLE_DCHECK_NE(&from, this);
-  const DeleteArtifactsRequest* source =
-      ::google::protobuf::DynamicCastToGenerated(
+  const DeleteArtifactResponse* source =
+      ::google::protobuf::DynamicCastToGenerated(
           &from);
   if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactResponse)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactsRequest)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactResponse)
     MergeFrom(*source);
   }
 }
 
-void DeleteArtifactsRequest::MergeFrom(const DeleteArtifactsRequest& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactsRequest)
+void DeleteArtifactResponse::MergeFrom(const DeleteArtifactResponse& from) {
+// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactResponse)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  artifacts_.MergeFrom(from.artifacts_);
 }
 
-void DeleteArtifactsRequest::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactsRequest)
+void DeleteArtifactResponse::CopyFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactResponse)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void DeleteArtifactsRequest::CopyFrom(const DeleteArtifactsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactsRequest)
+void DeleteArtifactResponse::CopyFrom(const DeleteArtifactResponse& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactResponse)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool DeleteArtifactsRequest::IsInitialized() const {
+bool DeleteArtifactResponse::IsInitialized() const {
   return true;
 }
 
-void DeleteArtifactsRequest::Swap(DeleteArtifactsRequest* other) {
+void DeleteArtifactResponse::Swap(DeleteArtifactResponse* other) {
   if (other == this) return;
   InternalSwap(other);
 }
-void DeleteArtifactsRequest::InternalSwap(DeleteArtifactsRequest* other) {
+void DeleteArtifactResponse::InternalSwap(DeleteArtifactResponse* other) {
   using std::swap;
   _internal_metadata_.Swap(&other->_internal_metadata_);
-  CastToBase(&artifacts_)->InternalSwap(CastToBase(&other->artifacts_));
 }
 
-::google::protobuf::Metadata DeleteArtifactsRequest::GetMetadata() const {
+::google::protobuf::Metadata DeleteArtifactResponse::GetMetadata() const {
   ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
   return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages];
 }
@@ -7565,298 +7362,89 @@ ::google::protobuf::Metadata DeleteArtifactsRequest::GetMetadata() const {
 
 // ===================================================================
 
-void DeleteArtifactResponse::InitAsDefaultInstance() {
+void ReservationID::InitAsDefaultInstance() {
+  ::datacatalog::_ReservationID_default_instance_._instance.get_mutable()->dataset_id_ = const_cast< ::datacatalog::DatasetID*>(
+      ::datacatalog::DatasetID::internal_default_instance());
 }
-class DeleteArtifactResponse::HasBitSetters {
+class ReservationID::HasBitSetters {
  public:
+  static const ::datacatalog::DatasetID& dataset_id(const ReservationID* msg);
 };
 
+const ::datacatalog::DatasetID&
+ReservationID::HasBitSetters::dataset_id(const ReservationID* msg) {
+  return *msg->dataset_id_;
+}
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
+const int ReservationID::kDatasetIdFieldNumber;
+const int ReservationID::kTagNameFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
-DeleteArtifactResponse::DeleteArtifactResponse()
+ReservationID::ReservationID()
   : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
-  // @@protoc_insertion_point(constructor:datacatalog.DeleteArtifactResponse)
+  // @@protoc_insertion_point(constructor:datacatalog.ReservationID)
 }
-DeleteArtifactResponse::DeleteArtifactResponse(const DeleteArtifactResponse& from)
+ReservationID::ReservationID(const ReservationID& from)
   : ::google::protobuf::Message(),
       _internal_metadata_(nullptr) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:datacatalog.DeleteArtifactResponse)
+  tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (from.tag_name().size() > 0) {
+    tag_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.tag_name_);
+  }
+  if (from.has_dataset_id()) {
+    dataset_id_ = new ::datacatalog::DatasetID(*from.dataset_id_);
+  } else {
+    dataset_id_ = nullptr;
+  }
+  // @@protoc_insertion_point(copy_constructor:datacatalog.ReservationID)
 }
 
-void DeleteArtifactResponse::SharedCtor() {
+void ReservationID::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
+  tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  dataset_id_ = nullptr;
 }
 
-DeleteArtifactResponse::~DeleteArtifactResponse() {
-  // @@protoc_insertion_point(destructor:datacatalog.DeleteArtifactResponse)
+ReservationID::~ReservationID() {
+  // @@protoc_insertion_point(destructor:datacatalog.ReservationID)
   SharedDtor();
 }
 
-void DeleteArtifactResponse::SharedDtor() {
+void ReservationID::SharedDtor() {
+  tag_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (this != internal_default_instance()) delete dataset_id_;
 }
 
-void DeleteArtifactResponse::SetCachedSize(int size) const {
+void ReservationID::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const DeleteArtifactResponse& DeleteArtifactResponse::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_DeleteArtifactResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
+const ReservationID& ReservationID::default_instance() {
+  ::google::protobuf::internal::InitSCC(&::scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
   return *internal_default_instance();
 }
 
 
-void DeleteArtifactResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:datacatalog.DeleteArtifactResponse)
+void ReservationID::Clear() {
+// @@protoc_insertion_point(message_clear_start:datacatalog.ReservationID)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
+  tag_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (GetArenaNoVirtual() == nullptr && dataset_id_ != nullptr) {
+    delete dataset_id_;
+  }
+  dataset_id_ = nullptr;
   _internal_metadata_.Clear();
 }
 
 #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* DeleteArtifactResponse::_InternalParse(const char* begin, const char* end, void* object,
+const char* ReservationID::_InternalParse(const char* begin, const char* end, void* object,
                   ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      default: {
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-bool DeleteArtifactResponse::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:datacatalog.DeleteArtifactResponse)
-  for (;;) {
-    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-  handle_unusual:
-    if (tag == 0) {
-      goto success;
-    }
-    DO_(::google::protobuf::internal::WireFormat::SkipField(
-          input, tag, _internal_metadata_.mutable_unknown_fields()));
-  }
-success:
-  // @@protoc_insertion_point(parse_success:datacatalog.DeleteArtifactResponse)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:datacatalog.DeleteArtifactResponse)
-  return false;
-#undef DO_
-}
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-
-void DeleteArtifactResponse::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:datacatalog.DeleteArtifactResponse)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:datacatalog.DeleteArtifactResponse)
-}
-
-::google::protobuf::uint8* DeleteArtifactResponse::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:datacatalog.DeleteArtifactResponse)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.DeleteArtifactResponse)
-  return target;
-}
-
-size_t DeleteArtifactResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:datacatalog.DeleteArtifactResponse)
-  size_t total_size = 0;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
-  }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  SetCachedSize(cached_size);
-  return total_size;
-}
-
-void DeleteArtifactResponse::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.DeleteArtifactResponse)
-  GOOGLE_DCHECK_NE(&from, this);
-  const DeleteArtifactResponse* source =
-      ::google::protobuf::DynamicCastToGenerated(
-          &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.DeleteArtifactResponse)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.DeleteArtifactResponse)
-    MergeFrom(*source);
-  }
-}
-
-void DeleteArtifactResponse::MergeFrom(const DeleteArtifactResponse& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.DeleteArtifactResponse)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-}
-
-void DeleteArtifactResponse::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.DeleteArtifactResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void DeleteArtifactResponse::CopyFrom(const DeleteArtifactResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.DeleteArtifactResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool DeleteArtifactResponse::IsInitialized() const {
-  return true;
-}
-
-void DeleteArtifactResponse::Swap(DeleteArtifactResponse* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void DeleteArtifactResponse::InternalSwap(DeleteArtifactResponse* other) {
-  using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-}
-
-::google::protobuf::Metadata DeleteArtifactResponse::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
-  return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages];
-}
-
-
-// ===================================================================
-
-void ReservationID::InitAsDefaultInstance() {
-  ::datacatalog::_ReservationID_default_instance_._instance.get_mutable()->dataset_id_ = const_cast< ::datacatalog::DatasetID*>(
-      ::datacatalog::DatasetID::internal_default_instance());
-}
-class ReservationID::HasBitSetters {
- public:
-  static const ::datacatalog::DatasetID& dataset_id(const ReservationID* msg);
-};
-
-const ::datacatalog::DatasetID&
-ReservationID::HasBitSetters::dataset_id(const ReservationID* msg) {
-  return *msg->dataset_id_;
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ReservationID::kDatasetIdFieldNumber;
-const int ReservationID::kTagNameFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ReservationID::ReservationID()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:datacatalog.ReservationID)
-}
-ReservationID::ReservationID(const ReservationID& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.tag_name().size() > 0) {
-    tag_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.tag_name_);
-  }
-  if (from.has_dataset_id()) {
-    dataset_id_ = new ::datacatalog::DatasetID(*from.dataset_id_);
-  } else {
-    dataset_id_ = nullptr;
-  }
-  // @@protoc_insertion_point(copy_constructor:datacatalog.ReservationID)
-}
-
-void ReservationID::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  tag_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  dataset_id_ = nullptr;
-}
-
-ReservationID::~ReservationID() {
-  // @@protoc_insertion_point(destructor:datacatalog.ReservationID)
-  SharedDtor();
-}
-
-void ReservationID::SharedDtor() {
-  tag_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (this != internal_default_instance()) delete dataset_id_;
-}
-
-void ReservationID::SetCachedSize(int size) const {
-  _cached_size_.Set(size);
-}
-const ReservationID& ReservationID::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_ReservationID_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  return *internal_default_instance();
-}
-
-
-void ReservationID::Clear() {
-// @@protoc_insertion_point(message_clear_start:datacatalog.ReservationID)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  tag_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (GetArenaNoVirtual() == nullptr && dataset_id_ != nullptr) {
-    delete dataset_id_;
-  }
-  dataset_id_ = nullptr;
-  _internal_metadata_.Clear();
-}
-
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* ReservationID::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast(object);
+  auto msg = static_cast(object);
   ::google::protobuf::int32 size; (void)size;
   int depth; (void)depth;
   ::google::protobuf::uint32 tag;
@@ -8531,324 +8119,44 @@ void GetOrExtendReservationRequest::MergeFrom(const GetOrExtendReservationReques
   }
   if (from.has_reservation_id()) {
     mutable_reservation_id()->::datacatalog::ReservationID::MergeFrom(from.reservation_id());
-  }
-  if (from.has_heartbeat_interval()) {
-    mutable_heartbeat_interval()->::google::protobuf::Duration::MergeFrom(from.heartbeat_interval());
-  }
-}
-
-void GetOrExtendReservationRequest::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void GetOrExtendReservationRequest::CopyFrom(const GetOrExtendReservationRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GetOrExtendReservationRequest::IsInitialized() const {
-  return true;
-}
-
-void GetOrExtendReservationRequest::Swap(GetOrExtendReservationRequest* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void GetOrExtendReservationRequest::InternalSwap(GetOrExtendReservationRequest* other) {
-  using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  owner_id_.Swap(&other->owner_id_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-    GetArenaNoVirtual());
-  swap(reservation_id_, other->reservation_id_);
-  swap(heartbeat_interval_, other->heartbeat_interval_);
-}
-
-::google::protobuf::Metadata GetOrExtendReservationRequest::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
-  return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages];
-}
-
-
-// ===================================================================
-
-void GetOrExtendReservationsRequest::InitAsDefaultInstance() {
-}
-class GetOrExtendReservationsRequest::HasBitSetters {
- public:
-};
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int GetOrExtendReservationsRequest::kReservationsFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-GetOrExtendReservationsRequest::GetOrExtendReservationsRequest()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:datacatalog.GetOrExtendReservationsRequest)
-}
-GetOrExtendReservationsRequest::GetOrExtendReservationsRequest(const GetOrExtendReservationsRequest& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr),
-      reservations_(from.reservations_) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:datacatalog.GetOrExtendReservationsRequest)
-}
-
-void GetOrExtendReservationsRequest::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-}
-
-GetOrExtendReservationsRequest::~GetOrExtendReservationsRequest() {
-  // @@protoc_insertion_point(destructor:datacatalog.GetOrExtendReservationsRequest)
-  SharedDtor();
-}
-
-void GetOrExtendReservationsRequest::SharedDtor() {
-}
-
-void GetOrExtendReservationsRequest::SetCachedSize(int size) const {
-  _cached_size_.Set(size);
-}
-const GetOrExtendReservationsRequest& GetOrExtendReservationsRequest::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_GetOrExtendReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  return *internal_default_instance();
-}
-
-
-void GetOrExtendReservationsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:datacatalog.GetOrExtendReservationsRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  reservations_.Clear();
-  _internal_metadata_.Clear();
-}
-
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* GetOrExtendReservationsRequest::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        do {
-          ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          parser_till_end = ::datacatalog::GetOrExtendReservationRequest::_InternalParse;
-          object = msg->add_reservations();
-          if (size > end - ptr) goto len_delim_till_end;
-          ptr += size;
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-              {parser_till_end, object}, ptr - size, ptr));
-          if (ptr >= end) break;
-        } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1));
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-bool GetOrExtendReservationsRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:datacatalog.GetOrExtendReservationsRequest)
-  for (;;) {
-    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-                input, add_reservations()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:datacatalog.GetOrExtendReservationsRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:datacatalog.GetOrExtendReservationsRequest)
-  return false;
-#undef DO_
-}
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-
-void GetOrExtendReservationsRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:datacatalog.GetOrExtendReservationsRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->reservations_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1,
-      this->reservations(static_cast(i)),
-      output);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:datacatalog.GetOrExtendReservationsRequest)
-}
-
-::google::protobuf::uint8* GetOrExtendReservationsRequest::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:datacatalog.GetOrExtendReservationsRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->reservations_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        1, this->reservations(static_cast(i)), target);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationsRequest)
-  return target;
-}
-
-size_t GetOrExtendReservationsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationsRequest)
-  size_t total_size = 0;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
-  }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-  {
-    unsigned int count = static_cast(this->reservations_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSize(
-          this->reservations(static_cast(i)));
-    }
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  SetCachedSize(cached_size);
-  return total_size;
-}
-
-void GetOrExtendReservationsRequest::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationsRequest)
-  GOOGLE_DCHECK_NE(&from, this);
-  const GetOrExtendReservationsRequest* source =
-      ::google::protobuf::DynamicCastToGenerated(
-          &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationsRequest)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationsRequest)
-    MergeFrom(*source);
-  }
-}
-
-void GetOrExtendReservationsRequest::MergeFrom(const GetOrExtendReservationsRequest& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationsRequest)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  reservations_.MergeFrom(from.reservations_);
+  }
+  if (from.has_heartbeat_interval()) {
+    mutable_heartbeat_interval()->::google::protobuf::Duration::MergeFrom(from.heartbeat_interval());
+  }
 }
 
-void GetOrExtendReservationsRequest::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationsRequest)
+void GetOrExtendReservationRequest::CopyFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationRequest)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void GetOrExtendReservationsRequest::CopyFrom(const GetOrExtendReservationsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationsRequest)
+void GetOrExtendReservationRequest::CopyFrom(const GetOrExtendReservationRequest& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationRequest)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool GetOrExtendReservationsRequest::IsInitialized() const {
+bool GetOrExtendReservationRequest::IsInitialized() const {
   return true;
 }
 
-void GetOrExtendReservationsRequest::Swap(GetOrExtendReservationsRequest* other) {
+void GetOrExtendReservationRequest::Swap(GetOrExtendReservationRequest* other) {
   if (other == this) return;
   InternalSwap(other);
 }
-void GetOrExtendReservationsRequest::InternalSwap(GetOrExtendReservationsRequest* other) {
+void GetOrExtendReservationRequest::InternalSwap(GetOrExtendReservationRequest* other) {
   using std::swap;
   _internal_metadata_.Swap(&other->_internal_metadata_);
-  CastToBase(&reservations_)->InternalSwap(CastToBase(&other->reservations_));
+  owner_id_.Swap(&other->owner_id_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+    GetArenaNoVirtual());
+  swap(reservation_id_, other->reservation_id_);
+  swap(heartbeat_interval_, other->heartbeat_interval_);
 }
 
-::google::protobuf::Metadata GetOrExtendReservationsRequest::GetMetadata() const {
+::google::protobuf::Metadata GetOrExtendReservationRequest::GetMetadata() const {
   ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
   return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages];
 }
@@ -9616,301 +8924,23 @@ ::google::protobuf::uint8* GetOrExtendReservationResponse::InternalSerializeWith
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .datacatalog.Reservation reservation = 1;
-  if (this->has_reservation()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        1, HasBitSetters::reservation(this), target);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationResponse)
-  return target;
-}
-
-size_t GetOrExtendReservationResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationResponse)
-  size_t total_size = 0;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
-  }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .datacatalog.Reservation reservation = 1;
-  if (this->has_reservation()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *reservation_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  SetCachedSize(cached_size);
-  return total_size;
-}
-
-void GetOrExtendReservationResponse::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationResponse)
-  GOOGLE_DCHECK_NE(&from, this);
-  const GetOrExtendReservationResponse* source =
-      ::google::protobuf::DynamicCastToGenerated(
-          &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationResponse)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationResponse)
-    MergeFrom(*source);
-  }
-}
-
-void GetOrExtendReservationResponse::MergeFrom(const GetOrExtendReservationResponse& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationResponse)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_reservation()) {
-    mutable_reservation()->::datacatalog::Reservation::MergeFrom(from.reservation());
-  }
-}
-
-void GetOrExtendReservationResponse::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void GetOrExtendReservationResponse::CopyFrom(const GetOrExtendReservationResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GetOrExtendReservationResponse::IsInitialized() const {
-  return true;
-}
-
-void GetOrExtendReservationResponse::Swap(GetOrExtendReservationResponse* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void GetOrExtendReservationResponse::InternalSwap(GetOrExtendReservationResponse* other) {
-  using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(reservation_, other->reservation_);
-}
-
-::google::protobuf::Metadata GetOrExtendReservationResponse::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
-  return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages];
-}
-
-
-// ===================================================================
-
-void GetOrExtendReservationsResponse::InitAsDefaultInstance() {
-}
-class GetOrExtendReservationsResponse::HasBitSetters {
- public:
-};
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int GetOrExtendReservationsResponse::kReservationsFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-GetOrExtendReservationsResponse::GetOrExtendReservationsResponse()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:datacatalog.GetOrExtendReservationsResponse)
-}
-GetOrExtendReservationsResponse::GetOrExtendReservationsResponse(const GetOrExtendReservationsResponse& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr),
-      reservations_(from.reservations_) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:datacatalog.GetOrExtendReservationsResponse)
-}
-
-void GetOrExtendReservationsResponse::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-}
-
-GetOrExtendReservationsResponse::~GetOrExtendReservationsResponse() {
-  // @@protoc_insertion_point(destructor:datacatalog.GetOrExtendReservationsResponse)
-  SharedDtor();
-}
-
-void GetOrExtendReservationsResponse::SharedDtor() {
-}
-
-void GetOrExtendReservationsResponse::SetCachedSize(int size) const {
-  _cached_size_.Set(size);
-}
-const GetOrExtendReservationsResponse& GetOrExtendReservationsResponse::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_GetOrExtendReservationsResponse_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  return *internal_default_instance();
-}
-
-
-void GetOrExtendReservationsResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:datacatalog.GetOrExtendReservationsResponse)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  reservations_.Clear();
-  _internal_metadata_.Clear();
-}
-
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* GetOrExtendReservationsResponse::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // repeated .datacatalog.Reservation reservations = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        do {
-          ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          parser_till_end = ::datacatalog::Reservation::_InternalParse;
-          object = msg->add_reservations();
-          if (size > end - ptr) goto len_delim_till_end;
-          ptr += size;
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-              {parser_till_end, object}, ptr - size, ptr));
-          if (ptr >= end) break;
-        } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1));
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-bool GetOrExtendReservationsResponse::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:datacatalog.GetOrExtendReservationsResponse)
-  for (;;) {
-    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .datacatalog.Reservation reservations = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-                input, add_reservations()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:datacatalog.GetOrExtendReservationsResponse)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:datacatalog.GetOrExtendReservationsResponse)
-  return false;
-#undef DO_
-}
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-
-void GetOrExtendReservationsResponse::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:datacatalog.GetOrExtendReservationsResponse)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.Reservation reservations = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->reservations_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1,
-      this->reservations(static_cast(i)),
-      output);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:datacatalog.GetOrExtendReservationsResponse)
-}
-
-::google::protobuf::uint8* GetOrExtendReservationsResponse::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:datacatalog.GetOrExtendReservationsResponse)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.Reservation reservations = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->reservations_size()); i < n; i++) {
+  // .datacatalog.Reservation reservation = 1;
+  if (this->has_reservation()) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        1, this->reservations(static_cast(i)), target);
+        1, HasBitSetters::reservation(this), target);
   }
 
   if (_internal_metadata_.have_unknown_fields()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationsResponse)
+  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.GetOrExtendReservationResponse)
   return target;
 }
 
-size_t GetOrExtendReservationsResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationsResponse)
+size_t GetOrExtendReservationResponse::ByteSizeLong() const {
+// @@protoc_insertion_point(message_byte_size_start:datacatalog.GetOrExtendReservationResponse)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -9922,15 +8952,11 @@ size_t GetOrExtendReservationsResponse::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated .datacatalog.Reservation reservations = 1;
-  {
-    unsigned int count = static_cast(this->reservations_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSize(
-          this->reservations(static_cast(i)));
-    }
+  // .datacatalog.Reservation reservation = 1;
+  if (this->has_reservation()) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *reservation_);
   }
 
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
@@ -9938,60 +8964,62 @@ size_t GetOrExtendReservationsResponse::ByteSizeLong() const {
   return total_size;
 }
 
-void GetOrExtendReservationsResponse::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationsResponse)
+void GetOrExtendReservationResponse::MergeFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.GetOrExtendReservationResponse)
   GOOGLE_DCHECK_NE(&from, this);
-  const GetOrExtendReservationsResponse* source =
-      ::google::protobuf::DynamicCastToGenerated(
+  const GetOrExtendReservationResponse* source =
+      ::google::protobuf::DynamicCastToGenerated(
           &from);
   if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationsResponse)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.GetOrExtendReservationResponse)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationsResponse)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.GetOrExtendReservationResponse)
     MergeFrom(*source);
   }
 }
 
-void GetOrExtendReservationsResponse::MergeFrom(const GetOrExtendReservationsResponse& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationsResponse)
+void GetOrExtendReservationResponse::MergeFrom(const GetOrExtendReservationResponse& from) {
+// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.GetOrExtendReservationResponse)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  reservations_.MergeFrom(from.reservations_);
+  if (from.has_reservation()) {
+    mutable_reservation()->::datacatalog::Reservation::MergeFrom(from.reservation());
+  }
 }
 
-void GetOrExtendReservationsResponse::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationsResponse)
+void GetOrExtendReservationResponse::CopyFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.GetOrExtendReservationResponse)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void GetOrExtendReservationsResponse::CopyFrom(const GetOrExtendReservationsResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationsResponse)
+void GetOrExtendReservationResponse::CopyFrom(const GetOrExtendReservationResponse& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.GetOrExtendReservationResponse)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool GetOrExtendReservationsResponse::IsInitialized() const {
+bool GetOrExtendReservationResponse::IsInitialized() const {
   return true;
 }
 
-void GetOrExtendReservationsResponse::Swap(GetOrExtendReservationsResponse* other) {
+void GetOrExtendReservationResponse::Swap(GetOrExtendReservationResponse* other) {
   if (other == this) return;
   InternalSwap(other);
 }
-void GetOrExtendReservationsResponse::InternalSwap(GetOrExtendReservationsResponse* other) {
+void GetOrExtendReservationResponse::InternalSwap(GetOrExtendReservationResponse* other) {
   using std::swap;
   _internal_metadata_.Swap(&other->_internal_metadata_);
-  CastToBase(&reservations_)->InternalSwap(CastToBase(&other->reservations_));
+  swap(reservation_, other->reservation_);
 }
 
-::google::protobuf::Metadata GetOrExtendReservationsResponse::GetMetadata() const {
+::google::protobuf::Metadata GetOrExtendReservationResponse::GetMetadata() const {
   ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
   return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages];
 }
@@ -10361,286 +9389,6 @@ ::google::protobuf::Metadata ReleaseReservationRequest::GetMetadata() const {
 }
 
 
-// ===================================================================
-
-void ReleaseReservationsRequest::InitAsDefaultInstance() {
-}
-class ReleaseReservationsRequest::HasBitSetters {
- public:
-};
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ReleaseReservationsRequest::kReservationsFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ReleaseReservationsRequest::ReleaseReservationsRequest()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:datacatalog.ReleaseReservationsRequest)
-}
-ReleaseReservationsRequest::ReleaseReservationsRequest(const ReleaseReservationsRequest& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr),
-      reservations_(from.reservations_) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:datacatalog.ReleaseReservationsRequest)
-}
-
-void ReleaseReservationsRequest::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-}
-
-ReleaseReservationsRequest::~ReleaseReservationsRequest() {
-  // @@protoc_insertion_point(destructor:datacatalog.ReleaseReservationsRequest)
-  SharedDtor();
-}
-
-void ReleaseReservationsRequest::SharedDtor() {
-}
-
-void ReleaseReservationsRequest::SetCachedSize(int size) const {
-  _cached_size_.Set(size);
-}
-const ReleaseReservationsRequest& ReleaseReservationsRequest::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_ReleaseReservationsRequest_flyteidl_2fdatacatalog_2fdatacatalog_2eproto.base);
-  return *internal_default_instance();
-}
-
-
-void ReleaseReservationsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:datacatalog.ReleaseReservationsRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  reservations_.Clear();
-  _internal_metadata_.Clear();
-}
-
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* ReleaseReservationsRequest::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        do {
-          ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          parser_till_end = ::datacatalog::ReleaseReservationRequest::_InternalParse;
-          object = msg->add_reservations();
-          if (size > end - ptr) goto len_delim_till_end;
-          ptr += size;
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-              {parser_till_end, object}, ptr - size, ptr));
-          if (ptr >= end) break;
-        } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1));
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-bool ReleaseReservationsRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:datacatalog.ReleaseReservationsRequest)
-  for (;;) {
-    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-                input, add_reservations()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:datacatalog.ReleaseReservationsRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:datacatalog.ReleaseReservationsRequest)
-  return false;
-#undef DO_
-}
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-
-void ReleaseReservationsRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:datacatalog.ReleaseReservationsRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->reservations_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1,
-      this->reservations(static_cast(i)),
-      output);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:datacatalog.ReleaseReservationsRequest)
-}
-
-::google::protobuf::uint8* ReleaseReservationsRequest::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:datacatalog.ReleaseReservationsRequest)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-  for (unsigned int i = 0,
-      n = static_cast(this->reservations_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        1, this->reservations(static_cast(i)), target);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:datacatalog.ReleaseReservationsRequest)
-  return target;
-}
-
-size_t ReleaseReservationsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:datacatalog.ReleaseReservationsRequest)
-  size_t total_size = 0;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
-  }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-  {
-    unsigned int count = static_cast(this->reservations_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSize(
-          this->reservations(static_cast(i)));
-    }
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  SetCachedSize(cached_size);
-  return total_size;
-}
-
-void ReleaseReservationsRequest::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:datacatalog.ReleaseReservationsRequest)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ReleaseReservationsRequest* source =
-      ::google::protobuf::DynamicCastToGenerated(
-          &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:datacatalog.ReleaseReservationsRequest)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:datacatalog.ReleaseReservationsRequest)
-    MergeFrom(*source);
-  }
-}
-
-void ReleaseReservationsRequest::MergeFrom(const ReleaseReservationsRequest& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:datacatalog.ReleaseReservationsRequest)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  reservations_.MergeFrom(from.reservations_);
-}
-
-void ReleaseReservationsRequest::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:datacatalog.ReleaseReservationsRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ReleaseReservationsRequest::CopyFrom(const ReleaseReservationsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:datacatalog.ReleaseReservationsRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ReleaseReservationsRequest::IsInitialized() const {
-  return true;
-}
-
-void ReleaseReservationsRequest::Swap(ReleaseReservationsRequest* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void ReleaseReservationsRequest::InternalSwap(ReleaseReservationsRequest* other) {
-  using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  CastToBase(&reservations_)->InternalSwap(CastToBase(&other->reservations_));
-}
-
-::google::protobuf::Metadata ReleaseReservationsRequest::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
-  return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[kIndexInFileMessages];
-}
-
-
 // ===================================================================
 
 void ReleaseReservationResponse::InitAsDefaultInstance() {
@@ -13810,7 +12558,7 @@ void Metadata_KeyMapEntry_DoNotUse::MergeFrom(const Metadata_KeyMapEntry_DoNotUs
 }
 ::google::protobuf::Metadata Metadata_KeyMapEntry_DoNotUse::GetMetadata() const {
   ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fdatacatalog_2fdatacatalog_2eproto);
-  return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[34];
+  return ::file_level_metadata_flyteidl_2fdatacatalog_2fdatacatalog_2eproto[30];
 }
 void Metadata_KeyMapEntry_DoNotUse::MergeFrom(
     const ::google::protobuf::Message& other) {
@@ -17604,9 +16352,6 @@ template<> PROTOBUF_NOINLINE ::datacatalog::UpdateArtifactResponse* Arena::Creat
 template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactRequest* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactRequest >(Arena* arena) {
   return Arena::CreateInternal< ::datacatalog::DeleteArtifactRequest >(arena);
 }
-template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactsRequest* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactsRequest >(Arena* arena) {
-  return Arena::CreateInternal< ::datacatalog::DeleteArtifactsRequest >(arena);
-}
 template<> PROTOBUF_NOINLINE ::datacatalog::DeleteArtifactResponse* Arena::CreateMaybeMessage< ::datacatalog::DeleteArtifactResponse >(Arena* arena) {
   return Arena::CreateInternal< ::datacatalog::DeleteArtifactResponse >(arena);
 }
@@ -17616,24 +16361,15 @@ template<> PROTOBUF_NOINLINE ::datacatalog::ReservationID* Arena::CreateMaybeMes
 template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationRequest* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationRequest >(Arena* arena) {
   return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationRequest >(arena);
 }
-template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationsRequest* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationsRequest >(Arena* arena) {
-  return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationsRequest >(arena);
-}
 template<> PROTOBUF_NOINLINE ::datacatalog::Reservation* Arena::CreateMaybeMessage< ::datacatalog::Reservation >(Arena* arena) {
   return Arena::CreateInternal< ::datacatalog::Reservation >(arena);
 }
 template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationResponse* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationResponse >(Arena* arena) {
   return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationResponse >(arena);
 }
-template<> PROTOBUF_NOINLINE ::datacatalog::GetOrExtendReservationsResponse* Arena::CreateMaybeMessage< ::datacatalog::GetOrExtendReservationsResponse >(Arena* arena) {
-  return Arena::CreateInternal< ::datacatalog::GetOrExtendReservationsResponse >(arena);
-}
 template<> PROTOBUF_NOINLINE ::datacatalog::ReleaseReservationRequest* Arena::CreateMaybeMessage< ::datacatalog::ReleaseReservationRequest >(Arena* arena) {
   return Arena::CreateInternal< ::datacatalog::ReleaseReservationRequest >(arena);
 }
-template<> PROTOBUF_NOINLINE ::datacatalog::ReleaseReservationsRequest* Arena::CreateMaybeMessage< ::datacatalog::ReleaseReservationsRequest >(Arena* arena) {
-  return Arena::CreateInternal< ::datacatalog::ReleaseReservationsRequest >(arena);
-}
 template<> PROTOBUF_NOINLINE ::datacatalog::ReleaseReservationResponse* Arena::CreateMaybeMessage< ::datacatalog::ReleaseReservationResponse >(Arena* arena) {
   return Arena::CreateInternal< ::datacatalog::ReleaseReservationResponse >(arena);
 }
diff --git a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h
index 181c05e802..6fc21f41de 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h
+++ b/flyteidl/gen/pb-cpp/flyteidl/datacatalog/datacatalog.pb.h
@@ -48,7 +48,7 @@ struct TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto {
     PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
     PROTOBUF_SECTION_VARIABLE(protodesc_cold);
-  static const ::google::protobuf::internal::ParseTable schema[44]
+  static const ::google::protobuf::internal::ParseTable schema[40]
     PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
@@ -98,9 +98,6 @@ extern DeleteArtifactRequestDefaultTypeInternal _DeleteArtifactRequest_default_i
 class DeleteArtifactResponse;
 class DeleteArtifactResponseDefaultTypeInternal;
 extern DeleteArtifactResponseDefaultTypeInternal _DeleteArtifactResponse_default_instance_;
-class DeleteArtifactsRequest;
-class DeleteArtifactsRequestDefaultTypeInternal;
-extern DeleteArtifactsRequestDefaultTypeInternal _DeleteArtifactsRequest_default_instance_;
 class FilterExpression;
 class FilterExpressionDefaultTypeInternal;
 extern FilterExpressionDefaultTypeInternal _FilterExpression_default_instance_;
@@ -122,12 +119,6 @@ extern GetOrExtendReservationRequestDefaultTypeInternal _GetOrExtendReservationR
 class GetOrExtendReservationResponse;
 class GetOrExtendReservationResponseDefaultTypeInternal;
 extern GetOrExtendReservationResponseDefaultTypeInternal _GetOrExtendReservationResponse_default_instance_;
-class GetOrExtendReservationsRequest;
-class GetOrExtendReservationsRequestDefaultTypeInternal;
-extern GetOrExtendReservationsRequestDefaultTypeInternal _GetOrExtendReservationsRequest_default_instance_;
-class GetOrExtendReservationsResponse;
-class GetOrExtendReservationsResponseDefaultTypeInternal;
-extern GetOrExtendReservationsResponseDefaultTypeInternal _GetOrExtendReservationsResponse_default_instance_;
 class KeyValuePair;
 class KeyValuePairDefaultTypeInternal;
 extern KeyValuePairDefaultTypeInternal _KeyValuePair_default_instance_;
@@ -164,9 +155,6 @@ extern ReleaseReservationRequestDefaultTypeInternal _ReleaseReservationRequest_d
 class ReleaseReservationResponse;
 class ReleaseReservationResponseDefaultTypeInternal;
 extern ReleaseReservationResponseDefaultTypeInternal _ReleaseReservationResponse_default_instance_;
-class ReleaseReservationsRequest;
-class ReleaseReservationsRequestDefaultTypeInternal;
-extern ReleaseReservationsRequestDefaultTypeInternal _ReleaseReservationsRequest_default_instance_;
 class Reservation;
 class ReservationDefaultTypeInternal;
 extern ReservationDefaultTypeInternal _Reservation_default_instance_;
@@ -205,7 +193,6 @@ template<> ::datacatalog::DatasetID* Arena::CreateMaybeMessage<::datacatalog::Da
 template<> ::datacatalog::DatasetPropertyFilter* Arena::CreateMaybeMessage<::datacatalog::DatasetPropertyFilter>(Arena*);
 template<> ::datacatalog::DeleteArtifactRequest* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactRequest>(Arena*);
 template<> ::datacatalog::DeleteArtifactResponse* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactResponse>(Arena*);
-template<> ::datacatalog::DeleteArtifactsRequest* Arena::CreateMaybeMessage<::datacatalog::DeleteArtifactsRequest>(Arena*);
 template<> ::datacatalog::FilterExpression* Arena::CreateMaybeMessage<::datacatalog::FilterExpression>(Arena*);
 template<> ::datacatalog::GetArtifactRequest* Arena::CreateMaybeMessage<::datacatalog::GetArtifactRequest>(Arena*);
 template<> ::datacatalog::GetArtifactResponse* Arena::CreateMaybeMessage<::datacatalog::GetArtifactResponse>(Arena*);
@@ -213,8 +200,6 @@ template<> ::datacatalog::GetDatasetRequest* Arena::CreateMaybeMessage<::datacat
 template<> ::datacatalog::GetDatasetResponse* Arena::CreateMaybeMessage<::datacatalog::GetDatasetResponse>(Arena*);
 template<> ::datacatalog::GetOrExtendReservationRequest* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationRequest>(Arena*);
 template<> ::datacatalog::GetOrExtendReservationResponse* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationResponse>(Arena*);
-template<> ::datacatalog::GetOrExtendReservationsRequest* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationsRequest>(Arena*);
-template<> ::datacatalog::GetOrExtendReservationsResponse* Arena::CreateMaybeMessage<::datacatalog::GetOrExtendReservationsResponse>(Arena*);
 template<> ::datacatalog::KeyValuePair* Arena::CreateMaybeMessage<::datacatalog::KeyValuePair>(Arena*);
 template<> ::datacatalog::ListArtifactsRequest* Arena::CreateMaybeMessage<::datacatalog::ListArtifactsRequest>(Arena*);
 template<> ::datacatalog::ListArtifactsResponse* Arena::CreateMaybeMessage<::datacatalog::ListArtifactsResponse>(Arena*);
@@ -227,7 +212,6 @@ template<> ::datacatalog::Partition* Arena::CreateMaybeMessage<::datacatalog::Pa
 template<> ::datacatalog::PartitionPropertyFilter* Arena::CreateMaybeMessage<::datacatalog::PartitionPropertyFilter>(Arena*);
 template<> ::datacatalog::ReleaseReservationRequest* Arena::CreateMaybeMessage<::datacatalog::ReleaseReservationRequest>(Arena*);
 template<> ::datacatalog::ReleaseReservationResponse* Arena::CreateMaybeMessage<::datacatalog::ReleaseReservationResponse>(Arena*);
-template<> ::datacatalog::ReleaseReservationsRequest* Arena::CreateMaybeMessage<::datacatalog::ReleaseReservationsRequest>(Arena*);
 template<> ::datacatalog::Reservation* Arena::CreateMaybeMessage<::datacatalog::Reservation>(Arena*);
 template<> ::datacatalog::ReservationID* Arena::CreateMaybeMessage<::datacatalog::ReservationID>(Arena*);
 template<> ::datacatalog::SinglePropertyFilter* Arena::CreateMaybeMessage<::datacatalog::SinglePropertyFilter>(Arena*);
@@ -2483,124 +2467,6 @@ class DeleteArtifactRequest final :
 };
 // -------------------------------------------------------------------
 
-class DeleteArtifactsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.DeleteArtifactsRequest) */ {
- public:
-  DeleteArtifactsRequest();
-  virtual ~DeleteArtifactsRequest();
-
-  DeleteArtifactsRequest(const DeleteArtifactsRequest& from);
-
-  inline DeleteArtifactsRequest& operator=(const DeleteArtifactsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  DeleteArtifactsRequest(DeleteArtifactsRequest&& from) noexcept
-    : DeleteArtifactsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline DeleteArtifactsRequest& operator=(DeleteArtifactsRequest&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
-  static const DeleteArtifactsRequest& default_instance();
-
-  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
-  static inline const DeleteArtifactsRequest* internal_default_instance() {
-    return reinterpret_cast(
-               &_DeleteArtifactsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    17;
-
-  void Swap(DeleteArtifactsRequest* other);
-  friend void swap(DeleteArtifactsRequest& a, DeleteArtifactsRequest& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline DeleteArtifactsRequest* New() const final {
-    return CreateMaybeMessage(nullptr);
-  }
-
-  DeleteArtifactsRequest* New(::google::protobuf::Arena* arena) const final {
-    return CreateMaybeMessage(arena);
-  }
-  void CopyFrom(const ::google::protobuf::Message& from) final;
-  void MergeFrom(const ::google::protobuf::Message& from) final;
-  void CopyFrom(const DeleteArtifactsRequest& from);
-  void MergeFrom(const DeleteArtifactsRequest& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const final;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
-
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(DeleteArtifactsRequest* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
-  }
-  inline void* MaybeArenaPtr() const {
-    return nullptr;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-  int artifacts_size() const;
-  void clear_artifacts();
-  static const int kArtifactsFieldNumber = 1;
-  ::datacatalog::DeleteArtifactRequest* mutable_artifacts(int index);
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >*
-      mutable_artifacts();
-  const ::datacatalog::DeleteArtifactRequest& artifacts(int index) const;
-  ::datacatalog::DeleteArtifactRequest* add_artifacts();
-  const ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >&
-      artifacts() const;
-
-  // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactsRequest)
- private:
-  class HasBitSetters;
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest > artifacts_;
-  mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
-};
-// -------------------------------------------------------------------
-
 class DeleteArtifactResponse final :
     public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.DeleteArtifactResponse) */ {
  public:
@@ -2639,7 +2505,7 @@ class DeleteArtifactResponse final :
                &_DeleteArtifactResponse_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    18;
+    17;
 
   void Swap(DeleteArtifactResponse* other);
   friend void swap(DeleteArtifactResponse& a, DeleteArtifactResponse& b) {
@@ -2744,7 +2610,7 @@ class ReservationID final :
                &_ReservationID_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    19;
+    18;
 
   void Swap(ReservationID* other);
   friend void swap(ReservationID& a, ReservationID& b) {
@@ -2874,7 +2740,7 @@ class GetOrExtendReservationRequest final :
                &_GetOrExtendReservationRequest_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    20;
+    19;
 
   void Swap(GetOrExtendReservationRequest* other);
   friend void swap(GetOrExtendReservationRequest& a, GetOrExtendReservationRequest& b) {
@@ -2976,124 +2842,6 @@ class GetOrExtendReservationRequest final :
 };
 // -------------------------------------------------------------------
 
-class GetOrExtendReservationsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.GetOrExtendReservationsRequest) */ {
- public:
-  GetOrExtendReservationsRequest();
-  virtual ~GetOrExtendReservationsRequest();
-
-  GetOrExtendReservationsRequest(const GetOrExtendReservationsRequest& from);
-
-  inline GetOrExtendReservationsRequest& operator=(const GetOrExtendReservationsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  GetOrExtendReservationsRequest(GetOrExtendReservationsRequest&& from) noexcept
-    : GetOrExtendReservationsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetOrExtendReservationsRequest& operator=(GetOrExtendReservationsRequest&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
-  static const GetOrExtendReservationsRequest& default_instance();
-
-  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
-  static inline const GetOrExtendReservationsRequest* internal_default_instance() {
-    return reinterpret_cast(
-               &_GetOrExtendReservationsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    21;
-
-  void Swap(GetOrExtendReservationsRequest* other);
-  friend void swap(GetOrExtendReservationsRequest& a, GetOrExtendReservationsRequest& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline GetOrExtendReservationsRequest* New() const final {
-    return CreateMaybeMessage(nullptr);
-  }
-
-  GetOrExtendReservationsRequest* New(::google::protobuf::Arena* arena) const final {
-    return CreateMaybeMessage(arena);
-  }
-  void CopyFrom(const ::google::protobuf::Message& from) final;
-  void MergeFrom(const ::google::protobuf::Message& from) final;
-  void CopyFrom(const GetOrExtendReservationsRequest& from);
-  void MergeFrom(const GetOrExtendReservationsRequest& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const final;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
-
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(GetOrExtendReservationsRequest* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
-  }
-  inline void* MaybeArenaPtr() const {
-    return nullptr;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-  int reservations_size() const;
-  void clear_reservations();
-  static const int kReservationsFieldNumber = 1;
-  ::datacatalog::GetOrExtendReservationRequest* mutable_reservations(int index);
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >*
-      mutable_reservations();
-  const ::datacatalog::GetOrExtendReservationRequest& reservations(int index) const;
-  ::datacatalog::GetOrExtendReservationRequest* add_reservations();
-  const ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >&
-      reservations() const;
-
-  // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsRequest)
- private:
-  class HasBitSetters;
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest > reservations_;
-  mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
-};
-// -------------------------------------------------------------------
-
 class Reservation final :
     public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.Reservation) */ {
  public:
@@ -3132,7 +2880,7 @@ class Reservation final :
                &_Reservation_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    22;
+    20;
 
   void Swap(Reservation* other);
   friend void swap(Reservation& a, Reservation& b) {
@@ -3292,7 +3040,7 @@ class GetOrExtendReservationResponse final :
                &_GetOrExtendReservationResponse_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    23;
+    21;
 
   void Swap(GetOrExtendReservationResponse* other);
   friend void swap(GetOrExtendReservationResponse& a, GetOrExtendReservationResponse& b) {
@@ -3369,124 +3117,6 @@ class GetOrExtendReservationResponse final :
 };
 // -------------------------------------------------------------------
 
-class GetOrExtendReservationsResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.GetOrExtendReservationsResponse) */ {
- public:
-  GetOrExtendReservationsResponse();
-  virtual ~GetOrExtendReservationsResponse();
-
-  GetOrExtendReservationsResponse(const GetOrExtendReservationsResponse& from);
-
-  inline GetOrExtendReservationsResponse& operator=(const GetOrExtendReservationsResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  GetOrExtendReservationsResponse(GetOrExtendReservationsResponse&& from) noexcept
-    : GetOrExtendReservationsResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetOrExtendReservationsResponse& operator=(GetOrExtendReservationsResponse&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
-  static const GetOrExtendReservationsResponse& default_instance();
-
-  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
-  static inline const GetOrExtendReservationsResponse* internal_default_instance() {
-    return reinterpret_cast(
-               &_GetOrExtendReservationsResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    24;
-
-  void Swap(GetOrExtendReservationsResponse* other);
-  friend void swap(GetOrExtendReservationsResponse& a, GetOrExtendReservationsResponse& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline GetOrExtendReservationsResponse* New() const final {
-    return CreateMaybeMessage(nullptr);
-  }
-
-  GetOrExtendReservationsResponse* New(::google::protobuf::Arena* arena) const final {
-    return CreateMaybeMessage(arena);
-  }
-  void CopyFrom(const ::google::protobuf::Message& from) final;
-  void MergeFrom(const ::google::protobuf::Message& from) final;
-  void CopyFrom(const GetOrExtendReservationsResponse& from);
-  void MergeFrom(const GetOrExtendReservationsResponse& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const final;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
-
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(GetOrExtendReservationsResponse* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
-  }
-  inline void* MaybeArenaPtr() const {
-    return nullptr;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .datacatalog.Reservation reservations = 1;
-  int reservations_size() const;
-  void clear_reservations();
-  static const int kReservationsFieldNumber = 1;
-  ::datacatalog::Reservation* mutable_reservations(int index);
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >*
-      mutable_reservations();
-  const ::datacatalog::Reservation& reservations(int index) const;
-  ::datacatalog::Reservation* add_reservations();
-  const ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >&
-      reservations() const;
-
-  // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsResponse)
- private:
-  class HasBitSetters;
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation > reservations_;
-  mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
-};
-// -------------------------------------------------------------------
-
 class ReleaseReservationRequest final :
     public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.ReleaseReservationRequest) */ {
  public:
@@ -3525,7 +3155,7 @@ class ReleaseReservationRequest final :
                &_ReleaseReservationRequest_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    25;
+    22;
 
   void Swap(ReleaseReservationRequest* other);
   friend void swap(ReleaseReservationRequest& a, ReleaseReservationRequest& b) {
@@ -3617,124 +3247,6 @@ class ReleaseReservationRequest final :
 };
 // -------------------------------------------------------------------
 
-class ReleaseReservationsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.ReleaseReservationsRequest) */ {
- public:
-  ReleaseReservationsRequest();
-  virtual ~ReleaseReservationsRequest();
-
-  ReleaseReservationsRequest(const ReleaseReservationsRequest& from);
-
-  inline ReleaseReservationsRequest& operator=(const ReleaseReservationsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ReleaseReservationsRequest(ReleaseReservationsRequest&& from) noexcept
-    : ReleaseReservationsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ReleaseReservationsRequest& operator=(ReleaseReservationsRequest&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
-  static const ReleaseReservationsRequest& default_instance();
-
-  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
-  static inline const ReleaseReservationsRequest* internal_default_instance() {
-    return reinterpret_cast(
-               &_ReleaseReservationsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    26;
-
-  void Swap(ReleaseReservationsRequest* other);
-  friend void swap(ReleaseReservationsRequest& a, ReleaseReservationsRequest& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ReleaseReservationsRequest* New() const final {
-    return CreateMaybeMessage(nullptr);
-  }
-
-  ReleaseReservationsRequest* New(::google::protobuf::Arena* arena) const final {
-    return CreateMaybeMessage(arena);
-  }
-  void CopyFrom(const ::google::protobuf::Message& from) final;
-  void MergeFrom(const ::google::protobuf::Message& from) final;
-  void CopyFrom(const ReleaseReservationsRequest& from);
-  void MergeFrom(const ReleaseReservationsRequest& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const final;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
-
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(ReleaseReservationsRequest* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
-  }
-  inline void* MaybeArenaPtr() const {
-    return nullptr;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-  int reservations_size() const;
-  void clear_reservations();
-  static const int kReservationsFieldNumber = 1;
-  ::datacatalog::ReleaseReservationRequest* mutable_reservations(int index);
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >*
-      mutable_reservations();
-  const ::datacatalog::ReleaseReservationRequest& reservations(int index) const;
-  ::datacatalog::ReleaseReservationRequest* add_reservations();
-  const ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >&
-      reservations() const;
-
-  // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationsRequest)
- private:
-  class HasBitSetters;
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest > reservations_;
-  mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_flyteidl_2fdatacatalog_2fdatacatalog_2eproto;
-};
-// -------------------------------------------------------------------
-
 class ReleaseReservationResponse final :
     public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:datacatalog.ReleaseReservationResponse) */ {
  public:
@@ -3773,7 +3285,7 @@ class ReleaseReservationResponse final :
                &_ReleaseReservationResponse_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    27;
+    23;
 
   void Swap(ReleaseReservationResponse* other);
   friend void swap(ReleaseReservationResponse& a, ReleaseReservationResponse& b) {
@@ -3878,7 +3390,7 @@ class Dataset final :
                &_Dataset_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    28;
+    24;
 
   void Swap(Dataset* other);
   friend void swap(Dataset& a, Dataset& b) {
@@ -4026,7 +3538,7 @@ class Partition final :
                &_Partition_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    29;
+    25;
 
   void Swap(Partition* other);
   friend void swap(Partition& a, Partition& b) {
@@ -4161,7 +3673,7 @@ class DatasetID final :
                &_DatasetID_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    30;
+    26;
 
   void Swap(DatasetID* other);
   friend void swap(DatasetID& a, DatasetID& b) {
@@ -4356,7 +3868,7 @@ class Artifact final :
                &_Artifact_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    31;
+    27;
 
   void Swap(Artifact* other);
   friend void swap(Artifact& a, Artifact& b) {
@@ -4545,7 +4057,7 @@ class ArtifactData final :
                &_ArtifactData_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    32;
+    28;
 
   void Swap(ArtifactData* other);
   friend void swap(ArtifactData& a, ArtifactData& b) {
@@ -4675,7 +4187,7 @@ class Tag final :
                &_Tag_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    33;
+    29;
 
   void Swap(Tag* other);
   friend void swap(Tag& a, Tag& b) {
@@ -4844,7 +4356,7 @@ class Metadata final :
                &_Metadata_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    35;
+    31;
 
   void Swap(Metadata* other);
   friend void swap(Metadata& a, Metadata& b) {
@@ -4965,7 +4477,7 @@ class FilterExpression final :
                &_FilterExpression_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    36;
+    32;
 
   void Swap(FilterExpression* other);
   friend void swap(FilterExpression& a, FilterExpression& b) {
@@ -5091,7 +4603,7 @@ class SinglePropertyFilter final :
                &_SinglePropertyFilter_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    37;
+    33;
 
   void Swap(SinglePropertyFilter* other);
   friend void swap(SinglePropertyFilter& a, SinglePropertyFilter& b) {
@@ -5286,7 +4798,7 @@ class ArtifactPropertyFilter final :
                &_ArtifactPropertyFilter_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    38;
+    34;
 
   void Swap(ArtifactPropertyFilter* other);
   friend void swap(ArtifactPropertyFilter& a, ArtifactPropertyFilter& b) {
@@ -5425,7 +4937,7 @@ class TagPropertyFilter final :
                &_TagPropertyFilter_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    39;
+    35;
 
   void Swap(TagPropertyFilter* other);
   friend void swap(TagPropertyFilter& a, TagPropertyFilter& b) {
@@ -5564,7 +5076,7 @@ class PartitionPropertyFilter final :
                &_PartitionPropertyFilter_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    40;
+    36;
 
   void Swap(PartitionPropertyFilter* other);
   friend void swap(PartitionPropertyFilter& a, PartitionPropertyFilter& b) {
@@ -5690,7 +5202,7 @@ class KeyValuePair final :
                &_KeyValuePair_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    41;
+    37;
 
   void Swap(KeyValuePair* other);
   friend void swap(KeyValuePair& a, KeyValuePair& b) {
@@ -5834,7 +5346,7 @@ class DatasetPropertyFilter final :
                &_DatasetPropertyFilter_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    42;
+    38;
 
   void Swap(DatasetPropertyFilter* other);
   friend void swap(DatasetPropertyFilter& a, DatasetPropertyFilter& b) {
@@ -6044,7 +5556,7 @@ class PaginationOptions final :
                &_PaginationOptions_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    43;
+    39;
 
   void Swap(PaginationOptions* other);
   friend void swap(PaginationOptions& a, PaginationOptions& b) {
@@ -7865,40 +7377,6 @@ inline DeleteArtifactRequest::QueryHandleCase DeleteArtifactRequest::query_handl
 }
 // -------------------------------------------------------------------
 
-// DeleteArtifactsRequest
-
-// repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-inline int DeleteArtifactsRequest::artifacts_size() const {
-  return artifacts_.size();
-}
-inline void DeleteArtifactsRequest::clear_artifacts() {
-  artifacts_.Clear();
-}
-inline ::datacatalog::DeleteArtifactRequest* DeleteArtifactsRequest::mutable_artifacts(int index) {
-  // @@protoc_insertion_point(field_mutable:datacatalog.DeleteArtifactsRequest.artifacts)
-  return artifacts_.Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >*
-DeleteArtifactsRequest::mutable_artifacts() {
-  // @@protoc_insertion_point(field_mutable_list:datacatalog.DeleteArtifactsRequest.artifacts)
-  return &artifacts_;
-}
-inline const ::datacatalog::DeleteArtifactRequest& DeleteArtifactsRequest::artifacts(int index) const {
-  // @@protoc_insertion_point(field_get:datacatalog.DeleteArtifactsRequest.artifacts)
-  return artifacts_.Get(index);
-}
-inline ::datacatalog::DeleteArtifactRequest* DeleteArtifactsRequest::add_artifacts() {
-  // @@protoc_insertion_point(field_add:datacatalog.DeleteArtifactsRequest.artifacts)
-  return artifacts_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::DeleteArtifactRequest >&
-DeleteArtifactsRequest::artifacts() const {
-  // @@protoc_insertion_point(field_list:datacatalog.DeleteArtifactsRequest.artifacts)
-  return artifacts_;
-}
-
-// -------------------------------------------------------------------
-
 // DeleteArtifactResponse
 
 // -------------------------------------------------------------------
@@ -8165,40 +7643,6 @@ inline void GetOrExtendReservationRequest::set_allocated_heartbeat_interval(::go
 
 // -------------------------------------------------------------------
 
-// GetOrExtendReservationsRequest
-
-// repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-inline int GetOrExtendReservationsRequest::reservations_size() const {
-  return reservations_.size();
-}
-inline void GetOrExtendReservationsRequest::clear_reservations() {
-  reservations_.Clear();
-}
-inline ::datacatalog::GetOrExtendReservationRequest* GetOrExtendReservationsRequest::mutable_reservations(int index) {
-  // @@protoc_insertion_point(field_mutable:datacatalog.GetOrExtendReservationsRequest.reservations)
-  return reservations_.Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >*
-GetOrExtendReservationsRequest::mutable_reservations() {
-  // @@protoc_insertion_point(field_mutable_list:datacatalog.GetOrExtendReservationsRequest.reservations)
-  return &reservations_;
-}
-inline const ::datacatalog::GetOrExtendReservationRequest& GetOrExtendReservationsRequest::reservations(int index) const {
-  // @@protoc_insertion_point(field_get:datacatalog.GetOrExtendReservationsRequest.reservations)
-  return reservations_.Get(index);
-}
-inline ::datacatalog::GetOrExtendReservationRequest* GetOrExtendReservationsRequest::add_reservations() {
-  // @@protoc_insertion_point(field_add:datacatalog.GetOrExtendReservationsRequest.reservations)
-  return reservations_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::GetOrExtendReservationRequest >&
-GetOrExtendReservationsRequest::reservations() const {
-  // @@protoc_insertion_point(field_list:datacatalog.GetOrExtendReservationsRequest.reservations)
-  return reservations_;
-}
-
-// -------------------------------------------------------------------
-
 // Reservation
 
 // .datacatalog.ReservationID reservation_id = 1;
@@ -8505,40 +7949,6 @@ inline void GetOrExtendReservationResponse::set_allocated_reservation(::datacata
 
 // -------------------------------------------------------------------
 
-// GetOrExtendReservationsResponse
-
-// repeated .datacatalog.Reservation reservations = 1;
-inline int GetOrExtendReservationsResponse::reservations_size() const {
-  return reservations_.size();
-}
-inline void GetOrExtendReservationsResponse::clear_reservations() {
-  reservations_.Clear();
-}
-inline ::datacatalog::Reservation* GetOrExtendReservationsResponse::mutable_reservations(int index) {
-  // @@protoc_insertion_point(field_mutable:datacatalog.GetOrExtendReservationsResponse.reservations)
-  return reservations_.Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >*
-GetOrExtendReservationsResponse::mutable_reservations() {
-  // @@protoc_insertion_point(field_mutable_list:datacatalog.GetOrExtendReservationsResponse.reservations)
-  return &reservations_;
-}
-inline const ::datacatalog::Reservation& GetOrExtendReservationsResponse::reservations(int index) const {
-  // @@protoc_insertion_point(field_get:datacatalog.GetOrExtendReservationsResponse.reservations)
-  return reservations_.Get(index);
-}
-inline ::datacatalog::Reservation* GetOrExtendReservationsResponse::add_reservations() {
-  // @@protoc_insertion_point(field_add:datacatalog.GetOrExtendReservationsResponse.reservations)
-  return reservations_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::Reservation >&
-GetOrExtendReservationsResponse::reservations() const {
-  // @@protoc_insertion_point(field_list:datacatalog.GetOrExtendReservationsResponse.reservations)
-  return reservations_;
-}
-
-// -------------------------------------------------------------------
-
 // ReleaseReservationRequest
 
 // .datacatalog.ReservationID reservation_id = 1;
@@ -8647,40 +8057,6 @@ inline void ReleaseReservationRequest::set_allocated_owner_id(::std::string* own
 
 // -------------------------------------------------------------------
 
-// ReleaseReservationsRequest
-
-// repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-inline int ReleaseReservationsRequest::reservations_size() const {
-  return reservations_.size();
-}
-inline void ReleaseReservationsRequest::clear_reservations() {
-  reservations_.Clear();
-}
-inline ::datacatalog::ReleaseReservationRequest* ReleaseReservationsRequest::mutable_reservations(int index) {
-  // @@protoc_insertion_point(field_mutable:datacatalog.ReleaseReservationsRequest.reservations)
-  return reservations_.Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >*
-ReleaseReservationsRequest::mutable_reservations() {
-  // @@protoc_insertion_point(field_mutable_list:datacatalog.ReleaseReservationsRequest.reservations)
-  return &reservations_;
-}
-inline const ::datacatalog::ReleaseReservationRequest& ReleaseReservationsRequest::reservations(int index) const {
-  // @@protoc_insertion_point(field_get:datacatalog.ReleaseReservationsRequest.reservations)
-  return reservations_.Get(index);
-}
-inline ::datacatalog::ReleaseReservationRequest* ReleaseReservationsRequest::add_reservations() {
-  // @@protoc_insertion_point(field_add:datacatalog.ReleaseReservationsRequest.reservations)
-  return reservations_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::datacatalog::ReleaseReservationRequest >&
-ReleaseReservationsRequest::reservations() const {
-  // @@protoc_insertion_point(field_list:datacatalog.ReleaseReservationsRequest.reservations)
-  return reservations_;
-}
-
-// -------------------------------------------------------------------
-
 // ReleaseReservationResponse
 
 // -------------------------------------------------------------------
@@ -11124,14 +10500,6 @@ inline void PaginationOptions::set_sortorder(::datacatalog::PaginationOptions_So
 
 // -------------------------------------------------------------------
 
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go
index 612083e022..d0c768188f 100644
--- a/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/datacatalog/datacatalog.pb.go
@@ -47,7 +47,7 @@ func (x SinglePropertyFilter_ComparisonOperator) String() string {
 }
 
 func (SinglePropertyFilter_ComparisonOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{36, 0}
+	return fileDescriptor_275951237ff4368a, []int{32, 0}
 }
 
 type PaginationOptions_SortOrder int32
@@ -72,7 +72,7 @@ func (x PaginationOptions_SortOrder) String() string {
 }
 
 func (PaginationOptions_SortOrder) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{42, 0}
+	return fileDescriptor_275951237ff4368a, []int{38, 0}
 }
 
 type PaginationOptions_SortKey int32
@@ -94,7 +94,7 @@ func (x PaginationOptions_SortKey) String() string {
 }
 
 func (PaginationOptions_SortKey) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{42, 1}
+	return fileDescriptor_275951237ff4368a, []int{38, 1}
 }
 
 //
@@ -993,47 +993,6 @@ func (*DeleteArtifactRequest) XXX_OneofWrappers() []interface{} {
 	}
 }
 
-// Request message for deleting multiple Artifacts and their associated ArtifactData.
-type DeleteArtifactsRequest struct {
-	// List of deletion requests for artifacts to remove
-	Artifacts            []*DeleteArtifactRequest `protobuf:"bytes,1,rep,name=artifacts,proto3" json:"artifacts,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     []byte                   `json:"-"`
-	XXX_sizecache        int32                    `json:"-"`
-}
-
-func (m *DeleteArtifactsRequest) Reset()         { *m = DeleteArtifactsRequest{} }
-func (m *DeleteArtifactsRequest) String() string { return proto.CompactTextString(m) }
-func (*DeleteArtifactsRequest) ProtoMessage()    {}
-func (*DeleteArtifactsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{17}
-}
-
-func (m *DeleteArtifactsRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_DeleteArtifactsRequest.Unmarshal(m, b)
-}
-func (m *DeleteArtifactsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_DeleteArtifactsRequest.Marshal(b, m, deterministic)
-}
-func (m *DeleteArtifactsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteArtifactsRequest.Merge(m, src)
-}
-func (m *DeleteArtifactsRequest) XXX_Size() int {
-	return xxx_messageInfo_DeleteArtifactsRequest.Size(m)
-}
-func (m *DeleteArtifactsRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_DeleteArtifactsRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_DeleteArtifactsRequest proto.InternalMessageInfo
-
-func (m *DeleteArtifactsRequest) GetArtifacts() []*DeleteArtifactRequest {
-	if m != nil {
-		return m.Artifacts
-	}
-	return nil
-}
-
 //
 // Response message for deleting an Artifact.
 type DeleteArtifactResponse struct {
@@ -1046,7 +1005,7 @@ func (m *DeleteArtifactResponse) Reset()         { *m = DeleteArtifactResponse{}
 func (m *DeleteArtifactResponse) String() string { return proto.CompactTextString(m) }
 func (*DeleteArtifactResponse) ProtoMessage()    {}
 func (*DeleteArtifactResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{18}
+	return fileDescriptor_275951237ff4368a, []int{17}
 }
 
 func (m *DeleteArtifactResponse) XXX_Unmarshal(b []byte) error {
@@ -1083,7 +1042,7 @@ func (m *ReservationID) Reset()         { *m = ReservationID{} }
 func (m *ReservationID) String() string { return proto.CompactTextString(m) }
 func (*ReservationID) ProtoMessage()    {}
 func (*ReservationID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{19}
+	return fileDescriptor_275951237ff4368a, []int{18}
 }
 
 func (m *ReservationID) XXX_Unmarshal(b []byte) error {
@@ -1135,7 +1094,7 @@ func (m *GetOrExtendReservationRequest) Reset()         { *m = GetOrExtendReserv
 func (m *GetOrExtendReservationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOrExtendReservationRequest) ProtoMessage()    {}
 func (*GetOrExtendReservationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{20}
+	return fileDescriptor_275951237ff4368a, []int{19}
 }
 
 func (m *GetOrExtendReservationRequest) XXX_Unmarshal(b []byte) error {
@@ -1177,47 +1136,6 @@ func (m *GetOrExtendReservationRequest) GetHeartbeatInterval() *duration.Duratio
 	return nil
 }
 
-// Request message for acquiring or extending reservations for multiple artifacts in a single operation.
-type GetOrExtendReservationsRequest struct {
-	// List of reservation requests for artifacts to acquire
-	Reservations         []*GetOrExtendReservationRequest `protobuf:"bytes,1,rep,name=reservations,proto3" json:"reservations,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
-	XXX_unrecognized     []byte                           `json:"-"`
-	XXX_sizecache        int32                            `json:"-"`
-}
-
-func (m *GetOrExtendReservationsRequest) Reset()         { *m = GetOrExtendReservationsRequest{} }
-func (m *GetOrExtendReservationsRequest) String() string { return proto.CompactTextString(m) }
-func (*GetOrExtendReservationsRequest) ProtoMessage()    {}
-func (*GetOrExtendReservationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{21}
-}
-
-func (m *GetOrExtendReservationsRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_GetOrExtendReservationsRequest.Unmarshal(m, b)
-}
-func (m *GetOrExtendReservationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_GetOrExtendReservationsRequest.Marshal(b, m, deterministic)
-}
-func (m *GetOrExtendReservationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOrExtendReservationsRequest.Merge(m, src)
-}
-func (m *GetOrExtendReservationsRequest) XXX_Size() int {
-	return xxx_messageInfo_GetOrExtendReservationsRequest.Size(m)
-}
-func (m *GetOrExtendReservationsRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_GetOrExtendReservationsRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_GetOrExtendReservationsRequest proto.InternalMessageInfo
-
-func (m *GetOrExtendReservationsRequest) GetReservations() []*GetOrExtendReservationRequest {
-	if m != nil {
-		return m.Reservations
-	}
-	return nil
-}
-
 // A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
 type Reservation struct {
 	// The unique ID for the reservation
@@ -1239,7 +1157,7 @@ func (m *Reservation) Reset()         { *m = Reservation{} }
 func (m *Reservation) String() string { return proto.CompactTextString(m) }
 func (*Reservation) ProtoMessage()    {}
 func (*Reservation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{22}
+	return fileDescriptor_275951237ff4368a, []int{20}
 }
 
 func (m *Reservation) XXX_Unmarshal(b []byte) error {
@@ -1308,7 +1226,7 @@ func (m *GetOrExtendReservationResponse) Reset()         { *m = GetOrExtendReser
 func (m *GetOrExtendReservationResponse) String() string { return proto.CompactTextString(m) }
 func (*GetOrExtendReservationResponse) ProtoMessage()    {}
 func (*GetOrExtendReservationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{23}
+	return fileDescriptor_275951237ff4368a, []int{21}
 }
 
 func (m *GetOrExtendReservationResponse) XXX_Unmarshal(b []byte) error {
@@ -1336,47 +1254,6 @@ func (m *GetOrExtendReservationResponse) GetReservation() *Reservation {
 	return nil
 }
 
-// List of reservations acquired for multiple artifacts in a single operation.
-type GetOrExtendReservationsResponse struct {
-	// List of (newly created or existing) reservations for artifacts requested
-	Reservations         []*Reservation `protobuf:"bytes,1,rep,name=reservations,proto3" json:"reservations,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
-}
-
-func (m *GetOrExtendReservationsResponse) Reset()         { *m = GetOrExtendReservationsResponse{} }
-func (m *GetOrExtendReservationsResponse) String() string { return proto.CompactTextString(m) }
-func (*GetOrExtendReservationsResponse) ProtoMessage()    {}
-func (*GetOrExtendReservationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{24}
-}
-
-func (m *GetOrExtendReservationsResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_GetOrExtendReservationsResponse.Unmarshal(m, b)
-}
-func (m *GetOrExtendReservationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_GetOrExtendReservationsResponse.Marshal(b, m, deterministic)
-}
-func (m *GetOrExtendReservationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOrExtendReservationsResponse.Merge(m, src)
-}
-func (m *GetOrExtendReservationsResponse) XXX_Size() int {
-	return xxx_messageInfo_GetOrExtendReservationsResponse.Size(m)
-}
-func (m *GetOrExtendReservationsResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_GetOrExtendReservationsResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_GetOrExtendReservationsResponse proto.InternalMessageInfo
-
-func (m *GetOrExtendReservationsResponse) GetReservations() []*Reservation {
-	if m != nil {
-		return m.Reservations
-	}
-	return nil
-}
-
 // Request to release reservation
 type ReleaseReservationRequest struct {
 	// The unique ID for the reservation
@@ -1392,7 +1269,7 @@ func (m *ReleaseReservationRequest) Reset()         { *m = ReleaseReservationReq
 func (m *ReleaseReservationRequest) String() string { return proto.CompactTextString(m) }
 func (*ReleaseReservationRequest) ProtoMessage()    {}
 func (*ReleaseReservationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{25}
+	return fileDescriptor_275951237ff4368a, []int{22}
 }
 
 func (m *ReleaseReservationRequest) XXX_Unmarshal(b []byte) error {
@@ -1427,47 +1304,6 @@ func (m *ReleaseReservationRequest) GetOwnerId() string {
 	return ""
 }
 
-// Request message for releasing reservations for multiple artifacts in a single operation.
-type ReleaseReservationsRequest struct {
-	// List of reservation requests for artifacts to release
-	Reservations         []*ReleaseReservationRequest `protobuf:"bytes,1,rep,name=reservations,proto3" json:"reservations,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     []byte                       `json:"-"`
-	XXX_sizecache        int32                        `json:"-"`
-}
-
-func (m *ReleaseReservationsRequest) Reset()         { *m = ReleaseReservationsRequest{} }
-func (m *ReleaseReservationsRequest) String() string { return proto.CompactTextString(m) }
-func (*ReleaseReservationsRequest) ProtoMessage()    {}
-func (*ReleaseReservationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{26}
-}
-
-func (m *ReleaseReservationsRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ReleaseReservationsRequest.Unmarshal(m, b)
-}
-func (m *ReleaseReservationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ReleaseReservationsRequest.Marshal(b, m, deterministic)
-}
-func (m *ReleaseReservationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReleaseReservationsRequest.Merge(m, src)
-}
-func (m *ReleaseReservationsRequest) XXX_Size() int {
-	return xxx_messageInfo_ReleaseReservationsRequest.Size(m)
-}
-func (m *ReleaseReservationsRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReleaseReservationsRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ReleaseReservationsRequest proto.InternalMessageInfo
-
-func (m *ReleaseReservationsRequest) GetReservations() []*ReleaseReservationRequest {
-	if m != nil {
-		return m.Reservations
-	}
-	return nil
-}
-
 // Response to release reservation
 type ReleaseReservationResponse struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1479,7 +1315,7 @@ func (m *ReleaseReservationResponse) Reset()         { *m = ReleaseReservationRe
 func (m *ReleaseReservationResponse) String() string { return proto.CompactTextString(m) }
 func (*ReleaseReservationResponse) ProtoMessage()    {}
 func (*ReleaseReservationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{27}
+	return fileDescriptor_275951237ff4368a, []int{23}
 }
 
 func (m *ReleaseReservationResponse) XXX_Unmarshal(b []byte) error {
@@ -1515,7 +1351,7 @@ func (m *Dataset) Reset()         { *m = Dataset{} }
 func (m *Dataset) String() string { return proto.CompactTextString(m) }
 func (*Dataset) ProtoMessage()    {}
 func (*Dataset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{28}
+	return fileDescriptor_275951237ff4368a, []int{24}
 }
 
 func (m *Dataset) XXX_Unmarshal(b []byte) error {
@@ -1571,7 +1407,7 @@ func (m *Partition) Reset()         { *m = Partition{} }
 func (m *Partition) String() string { return proto.CompactTextString(m) }
 func (*Partition) ProtoMessage()    {}
 func (*Partition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{29}
+	return fileDescriptor_275951237ff4368a, []int{25}
 }
 
 func (m *Partition) XXX_Unmarshal(b []byte) error {
@@ -1625,7 +1461,7 @@ func (m *DatasetID) Reset()         { *m = DatasetID{} }
 func (m *DatasetID) String() string { return proto.CompactTextString(m) }
 func (*DatasetID) ProtoMessage()    {}
 func (*DatasetID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{30}
+	return fileDescriptor_275951237ff4368a, []int{26}
 }
 
 func (m *DatasetID) XXX_Unmarshal(b []byte) error {
@@ -1707,7 +1543,7 @@ func (m *Artifact) Reset()         { *m = Artifact{} }
 func (m *Artifact) String() string { return proto.CompactTextString(m) }
 func (*Artifact) ProtoMessage()    {}
 func (*Artifact) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{31}
+	return fileDescriptor_275951237ff4368a, []int{27}
 }
 
 func (m *Artifact) XXX_Unmarshal(b []byte) error {
@@ -1791,7 +1627,7 @@ func (m *ArtifactData) Reset()         { *m = ArtifactData{} }
 func (m *ArtifactData) String() string { return proto.CompactTextString(m) }
 func (*ArtifactData) ProtoMessage()    {}
 func (*ArtifactData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{32}
+	return fileDescriptor_275951237ff4368a, []int{28}
 }
 
 func (m *ArtifactData) XXX_Unmarshal(b []byte) error {
@@ -1842,7 +1678,7 @@ func (m *Tag) Reset()         { *m = Tag{} }
 func (m *Tag) String() string { return proto.CompactTextString(m) }
 func (*Tag) ProtoMessage()    {}
 func (*Tag) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{33}
+	return fileDescriptor_275951237ff4368a, []int{29}
 }
 
 func (m *Tag) XXX_Unmarshal(b []byte) error {
@@ -1897,7 +1733,7 @@ func (m *Metadata) Reset()         { *m = Metadata{} }
 func (m *Metadata) String() string { return proto.CompactTextString(m) }
 func (*Metadata) ProtoMessage()    {}
 func (*Metadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{34}
+	return fileDescriptor_275951237ff4368a, []int{30}
 }
 
 func (m *Metadata) XXX_Unmarshal(b []byte) error {
@@ -1937,7 +1773,7 @@ func (m *FilterExpression) Reset()         { *m = FilterExpression{} }
 func (m *FilterExpression) String() string { return proto.CompactTextString(m) }
 func (*FilterExpression) ProtoMessage()    {}
 func (*FilterExpression) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{35}
+	return fileDescriptor_275951237ff4368a, []int{31}
 }
 
 func (m *FilterExpression) XXX_Unmarshal(b []byte) error {
@@ -1983,7 +1819,7 @@ func (m *SinglePropertyFilter) Reset()         { *m = SinglePropertyFilter{} }
 func (m *SinglePropertyFilter) String() string { return proto.CompactTextString(m) }
 func (*SinglePropertyFilter) ProtoMessage()    {}
 func (*SinglePropertyFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{36}
+	return fileDescriptor_275951237ff4368a, []int{32}
 }
 
 func (m *SinglePropertyFilter) XXX_Unmarshal(b []byte) error {
@@ -2100,7 +1936,7 @@ func (m *ArtifactPropertyFilter) Reset()         { *m = ArtifactPropertyFilter{}
 func (m *ArtifactPropertyFilter) String() string { return proto.CompactTextString(m) }
 func (*ArtifactPropertyFilter) ProtoMessage()    {}
 func (*ArtifactPropertyFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{37}
+	return fileDescriptor_275951237ff4368a, []int{33}
 }
 
 func (m *ArtifactPropertyFilter) XXX_Unmarshal(b []byte) error {
@@ -2166,7 +2002,7 @@ func (m *TagPropertyFilter) Reset()         { *m = TagPropertyFilter{} }
 func (m *TagPropertyFilter) String() string { return proto.CompactTextString(m) }
 func (*TagPropertyFilter) ProtoMessage()    {}
 func (*TagPropertyFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{38}
+	return fileDescriptor_275951237ff4368a, []int{34}
 }
 
 func (m *TagPropertyFilter) XXX_Unmarshal(b []byte) error {
@@ -2232,7 +2068,7 @@ func (m *PartitionPropertyFilter) Reset()         { *m = PartitionPropertyFilter
 func (m *PartitionPropertyFilter) String() string { return proto.CompactTextString(m) }
 func (*PartitionPropertyFilter) ProtoMessage()    {}
 func (*PartitionPropertyFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{39}
+	return fileDescriptor_275951237ff4368a, []int{35}
 }
 
 func (m *PartitionPropertyFilter) XXX_Unmarshal(b []byte) error {
@@ -2296,7 +2132,7 @@ func (m *KeyValuePair) Reset()         { *m = KeyValuePair{} }
 func (m *KeyValuePair) String() string { return proto.CompactTextString(m) }
 func (*KeyValuePair) ProtoMessage()    {}
 func (*KeyValuePair) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{40}
+	return fileDescriptor_275951237ff4368a, []int{36}
 }
 
 func (m *KeyValuePair) XXX_Unmarshal(b []byte) error {
@@ -2349,7 +2185,7 @@ func (m *DatasetPropertyFilter) Reset()         { *m = DatasetPropertyFilter{} }
 func (m *DatasetPropertyFilter) String() string { return proto.CompactTextString(m) }
 func (*DatasetPropertyFilter) ProtoMessage()    {}
 func (*DatasetPropertyFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{41}
+	return fileDescriptor_275951237ff4368a, []int{37}
 }
 
 func (m *DatasetPropertyFilter) XXX_Unmarshal(b []byte) error {
@@ -2476,7 +2312,7 @@ func (m *PaginationOptions) Reset()         { *m = PaginationOptions{} }
 func (m *PaginationOptions) String() string { return proto.CompactTextString(m) }
 func (*PaginationOptions) ProtoMessage()    {}
 func (*PaginationOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_275951237ff4368a, []int{42}
+	return fileDescriptor_275951237ff4368a, []int{38}
 }
 
 func (m *PaginationOptions) XXX_Unmarshal(b []byte) error {
@@ -2546,16 +2382,12 @@ func init() {
 	proto.RegisterType((*UpdateArtifactRequest)(nil), "datacatalog.UpdateArtifactRequest")
 	proto.RegisterType((*UpdateArtifactResponse)(nil), "datacatalog.UpdateArtifactResponse")
 	proto.RegisterType((*DeleteArtifactRequest)(nil), "datacatalog.DeleteArtifactRequest")
-	proto.RegisterType((*DeleteArtifactsRequest)(nil), "datacatalog.DeleteArtifactsRequest")
 	proto.RegisterType((*DeleteArtifactResponse)(nil), "datacatalog.DeleteArtifactResponse")
 	proto.RegisterType((*ReservationID)(nil), "datacatalog.ReservationID")
 	proto.RegisterType((*GetOrExtendReservationRequest)(nil), "datacatalog.GetOrExtendReservationRequest")
-	proto.RegisterType((*GetOrExtendReservationsRequest)(nil), "datacatalog.GetOrExtendReservationsRequest")
 	proto.RegisterType((*Reservation)(nil), "datacatalog.Reservation")
 	proto.RegisterType((*GetOrExtendReservationResponse)(nil), "datacatalog.GetOrExtendReservationResponse")
-	proto.RegisterType((*GetOrExtendReservationsResponse)(nil), "datacatalog.GetOrExtendReservationsResponse")
 	proto.RegisterType((*ReleaseReservationRequest)(nil), "datacatalog.ReleaseReservationRequest")
-	proto.RegisterType((*ReleaseReservationsRequest)(nil), "datacatalog.ReleaseReservationsRequest")
 	proto.RegisterType((*ReleaseReservationResponse)(nil), "datacatalog.ReleaseReservationResponse")
 	proto.RegisterType((*Dataset)(nil), "datacatalog.Dataset")
 	proto.RegisterType((*Partition)(nil), "datacatalog.Partition")
@@ -2580,122 +2412,116 @@ func init() {
 }
 
 var fileDescriptor_275951237ff4368a = []byte{
-	// 1836 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
-	0x15, 0x37, 0x25, 0x5b, 0x32, 0x9f, 0x2c, 0x59, 0x9e, 0xd8, 0x8a, 0xac, 0x4d, 0x6c, 0x85, 0x1b,
-	0xa4, 0xc6, 0x76, 0x57, 0xda, 0xda, 0xbb, 0x8b, 0x26, 0x5d, 0xb4, 0x2b, 0x5b, 0x8a, 0xad, 0x75,
-	0xfc, 0xb1, 0xf4, 0x07, 0xb0, 0x9b, 0x02, 0xc2, 0xd8, 0x1c, 0xd3, 0xac, 0x29, 0x91, 0x21, 0xc7,
-	0xa9, 0x75, 0xec, 0xb5, 0xe8, 0xa5, 0x28, 0x50, 0xa0, 0x87, 0xa2, 0x87, 0xfe, 0x21, 0x3d, 0xe6,
-	0xd6, 0x7f, 0xa8, 0x97, 0x62, 0xc8, 0x21, 0xc5, 0x21, 0x29, 0x5b, 0xf6, 0x21, 0x68, 0x2f, 0x02,
-	0x67, 0xe6, 0xbd, 0xdf, 0xbc, 0x8f, 0x99, 0x37, 0xef, 0x3d, 0xc1, 0x8b, 0x0b, 0x73, 0x48, 0x89,
-	0xa1, 0x99, 0x4d, 0x0d, 0x53, 0x7c, 0x8e, 0x29, 0x36, 0x2d, 0x3d, 0xfa, 0xdd, 0xb0, 0x1d, 0x8b,
-	0x5a, 0xa8, 0x10, 0x99, 0xaa, 0x3d, 0x09, 0x99, 0xce, 0x2d, 0x87, 0x34, 0x4d, 0x83, 0x12, 0x07,
-	0x9b, 0xae, 0x4f, 0x5a, 0x5b, 0xd1, 0x2d, 0x4b, 0x37, 0x49, 0xd3, 0x1b, 0x9d, 0x5d, 0x5f, 0x34,
-	0xb5, 0x6b, 0x07, 0x53, 0xc3, 0x1a, 0xf0, 0xf5, 0xd5, 0xf8, 0x3a, 0x35, 0xfa, 0xc4, 0xa5, 0xb8,
-	0x6f, 0xfb, 0x04, 0xca, 0x6b, 0x58, 0xdc, 0x72, 0x08, 0xa6, 0xa4, 0x8d, 0x29, 0x76, 0x09, 0x55,
-	0xc9, 0xbb, 0x6b, 0xe2, 0x52, 0xd4, 0x80, 0xbc, 0xe6, 0xcf, 0x54, 0xa5, 0xba, 0xb4, 0x56, 0x58,
-	0x5f, 0x6c, 0x44, 0x05, 0x0d, 0xa8, 0x03, 0x22, 0xe5, 0x31, 0x2c, 0xc5, 0x70, 0x5c, 0xdb, 0x1a,
-	0xb8, 0x44, 0xe9, 0xc0, 0xc2, 0x36, 0xa1, 0x31, 0xf4, 0x2f, 0xe3, 0xe8, 0x95, 0x34, 0xf4, 0x6e,
-	0x7b, 0x84, 0xdf, 0x06, 0x14, 0x85, 0xf1, 0xc1, 0xef, 0x2d, 0xe5, 0x5f, 0x25, 0x0f, 0xa6, 0xe5,
-	0x50, 0xe3, 0x02, 0x9f, 0x3f, 0x5c, 0x1c, 0xf4, 0x0c, 0x0a, 0x98, 0x83, 0xf4, 0x0c, 0xad, 0x9a,
-	0xa9, 0x4b, 0x6b, 0xf2, 0xce, 0x94, 0x0a, 0xc1, 0x64, 0x57, 0x43, 0x9f, 0xc0, 0x2c, 0xc5, 0x7a,
-	0x6f, 0x80, 0xfb, 0xa4, 0x9a, 0xe5, 0xeb, 0x79, 0x8a, 0xf5, 0x7d, 0xdc, 0x27, 0x9b, 0x25, 0x98,
-	0x7b, 0x77, 0x4d, 0x9c, 0x61, 0xef, 0x12, 0x0f, 0x34, 0x93, 0x28, 0x3b, 0xf0, 0x48, 0x90, 0x8b,
-	0xeb, 0xf7, 0x0b, 0x98, 0x0d, 0x10, 0xb9, 0x64, 0x4b, 0x82, 0x64, 0x21, 0x43, 0x48, 0xa6, 0x7c,
-	0x1f, 0x38, 0x22, 0xae, 0xe4, 0x03, 0xb0, 0xaa, 0x50, 0x89, 0x63, 0x71, 0xaf, 0x6e, 0x40, 0xb1,
-	0xa5, 0x69, 0xc7, 0x58, 0x0f, 0xd0, 0x15, 0xc8, 0x52, 0xac, 0x73, 0xe0, 0xb2, 0x00, 0xcc, 0xa8,
-	0xd8, 0xa2, 0x52, 0x86, 0x52, 0xc0, 0xc4, 0x61, 0xfe, 0x25, 0xc1, 0xe2, 0x1b, 0xc3, 0x0d, 0x15,
-	0x77, 0x1f, 0xee, 0x91, 0xaf, 0x21, 0x77, 0x61, 0x98, 0x94, 0x38, 0x9e, 0x33, 0x0a, 0xeb, 0x4f,
-	0x05, 0x86, 0xd7, 0xde, 0x52, 0xe7, 0xc6, 0x76, 0x88, 0xeb, 0x1a, 0xd6, 0x40, 0xe5, 0xc4, 0xe8,
-	0xd7, 0x00, 0x36, 0xd6, 0x8d, 0x81, 0x77, 0x69, 0x3c, 0x3f, 0x15, 0xd6, 0x57, 0x04, 0xd6, 0xc3,
-	0x70, 0xf9, 0xc0, 0x66, 0xbf, 0xae, 0x1a, 0xe1, 0x50, 0xae, 0x60, 0x29, 0xa6, 0x00, 0x77, 0xdd,
-	0x06, 0xc8, 0x81, 0x1d, 0xdd, 0xaa, 0x54, 0xcf, 0x8e, 0xb7, 0xf7, 0x88, 0x0e, 0x3d, 0x05, 0x18,
-	0x90, 0x1b, 0xda, 0xa3, 0xd6, 0x15, 0x19, 0xf8, 0xa7, 0x4a, 0x95, 0xd9, 0xcc, 0x31, 0x9b, 0x50,
-	0xfe, 0x24, 0xc1, 0x23, 0xb6, 0x1b, 0x57, 0x3f, 0xb4, 0xd6, 0x48, 0x77, 0xe9, 0xe1, 0xba, 0x67,
-	0xee, 0xad, 0xbb, 0xee, 0x3b, 0x6f, 0x24, 0x0d, 0x57, 0xfd, 0x4b, 0x98, 0xe5, 0x5e, 0x09, 0x34,
-	0x4f, 0xbf, 0x96, 0x21, 0xd5, 0x5d, 0x7a, 0xff, 0x47, 0x82, 0xa5, 0x13, 0x5b, 0x4b, 0x39, 0xd4,
-	0x1f, 0xfd, 0xe6, 0xa2, 0x2f, 0x60, 0x9a, 0x41, 0x55, 0xa7, 0x3d, 0xc5, 0x96, 0x53, 0x5d, 0xca,
-	0xb6, 0x55, 0x3d, 0x32, 0x76, 0xeb, 0xfa, 0x84, 0x62, 0x8f, 0x65, 0x26, 0xe5, 0xd6, 0xed, 0xf1,
-	0x45, 0x35, 0x24, 0x4b, 0xc4, 0x86, 0x97, 0x50, 0x89, 0x2b, 0xcf, 0x0d, 0xbd, 0x2a, 0xea, 0x22,
-	0x79, 0x76, 0x8b, 0x68, 0xa2, 0xfc, 0x4d, 0x82, 0xa5, 0x36, 0x31, 0xc9, 0xff, 0x80, 0xe1, 0x12,
-	0x6a, 0xfd, 0x04, 0x15, 0x51, 0xb4, 0xf0, 0x38, 0x7f, 0x97, 0xbc, 0x3a, 0x8a, 0x28, 0x5d, 0x9a,
-	0x4a, 0x91, 0x7b, 0xc4, 0x02, 0x57, 0x9c, 0x86, 0x47, 0x1c, 0x0c, 0x45, 0x95, 0xb8, 0xc4, 0x79,
-	0xef, 0x1d, 0xe1, 0x6e, 0x1b, 0x7d, 0x0d, 0xc0, 0x35, 0x0c, 0x4c, 0x38, 0xde, 0x16, 0x32, 0xa7,
-	0xec, 0x6a, 0x68, 0x39, 0xa2, 0xaa, 0x7f, 0x5e, 0x03, 0x45, 0x95, 0x0f, 0x12, 0x3c, 0xdd, 0x26,
-	0xf4, 0xc0, 0xe9, 0xdc, 0x50, 0x32, 0xd0, 0x22, 0xdb, 0x05, 0x0a, 0xb6, 0xa0, 0xe4, 0x8c, 0x66,
-	0x47, 0xfb, 0xd6, 0x84, 0x7d, 0x05, 0x39, 0xd5, 0x62, 0x84, 0xc3, 0xdf, 0xdf, 0xfa, 0xfd, 0x80,
-	0x38, 0xa1, 0x2b, 0xd4, 0xbc, 0x37, 0xee, 0x6a, 0x68, 0x07, 0xd0, 0x25, 0xc1, 0x0e, 0x3d, 0x23,
-	0x98, 0xf6, 0x8c, 0x01, 0x65, 0x5c, 0x26, 0x0f, 0x6d, 0xcb, 0x0d, 0x3f, 0x21, 0x68, 0x04, 0x09,
-	0x41, 0xa3, 0xcd, 0x13, 0x06, 0x75, 0x21, 0x64, 0xea, 0x72, 0x1e, 0xc5, 0x86, 0x95, 0x74, 0x45,
-	0x42, 0x57, 0xed, 0xc3, 0x5c, 0x44, 0xae, 0xc0, 0x5b, 0x9f, 0x09, 0x7a, 0xdc, 0x6a, 0x0b, 0x55,
-	0xe0, 0x57, 0xfe, 0x99, 0x81, 0x42, 0x84, 0xe8, 0xff, 0xc5, 0x52, 0xe8, 0x25, 0x00, 0xb9, 0xb1,
-	0x0d, 0x87, 0xb8, 0x3d, 0x4c, 0xab, 0xd3, 0x5c, 0xc6, 0x38, 0xc2, 0x71, 0x90, 0x7c, 0xa9, 0x32,
-	0xa7, 0x6e, 0x51, 0x21, 0x42, 0xe4, 0x26, 0x8a, 0x10, 0xca, 0x6f, 0xc7, 0xf9, 0x25, 0x8c, 0x0c,
-	0xaf, 0xa0, 0x10, 0xb1, 0x02, 0x37, 0x5a, 0x75, 0x9c, 0xd1, 0xd4, 0x28, 0xb1, 0xd2, 0x83, 0xd5,
-	0xb1, 0x5e, 0xe7, 0xf0, 0xdf, 0xa6, 0xba, 0x7d, 0x3c, 0xbe, 0xe8, 0xe4, 0x21, 0x2c, 0xab, 0xc4,
-	0x24, 0xd8, 0x25, 0x1f, 0xfb, 0x6e, 0x28, 0x97, 0x50, 0x4b, 0x6e, 0x1d, 0x9e, 0xe6, 0xef, 0x53,
-	0xd5, 0x7a, 0x11, 0xdb, 0x79, 0x8c, 0xe4, 0x31, 0x25, 0x9f, 0xa4, 0xed, 0x14, 0x86, 0xa1, 0x3f,
-	0x4a, 0x90, 0xe7, 0x71, 0x05, 0xbd, 0x80, 0xcc, 0x9d, 0x91, 0x27, 0x63, 0x68, 0xc2, 0x41, 0xc9,
-	0x4c, 0x74, 0x50, 0xd0, 0x73, 0x28, 0xda, 0x2c, 0x2a, 0xb2, 0xbd, 0x77, 0xc9, 0xd0, 0xad, 0x66,
-	0xeb, 0xd9, 0x35, 0x59, 0x15, 0x27, 0x95, 0x0d, 0x90, 0x0f, 0x83, 0x09, 0x54, 0x86, 0xec, 0x15,
-	0x19, 0xf2, 0xb7, 0x84, 0x7d, 0xa2, 0x45, 0x98, 0x79, 0x8f, 0xcd, 0xeb, 0x20, 0xce, 0xf9, 0x03,
-	0xe5, 0xcf, 0x12, 0xc8, 0xa1, 0x7c, 0xa8, 0x0a, 0x79, 0xdb, 0xb1, 0x7e, 0x47, 0x78, 0x6e, 0x29,
-	0xab, 0xc1, 0x10, 0x21, 0x98, 0x8e, 0x04, 0x49, 0xef, 0x1b, 0x55, 0x20, 0xa7, 0x59, 0x7d, 0x6c,
-	0xf8, 0x09, 0x97, 0xac, 0xf2, 0x11, 0x43, 0x79, 0x4f, 0x1c, 0x96, 0xa3, 0x78, 0x57, 0x48, 0x56,
-	0x83, 0x21, 0x43, 0x39, 0x39, 0xe9, 0xb6, 0xbd, 0x27, 0x54, 0x56, 0xbd, 0x6f, 0x26, 0xa9, 0xe5,
-	0xe8, 0xde, 0x9d, 0x91, 0x55, 0xf6, 0xa9, 0x7c, 0xc8, 0xc0, 0x6c, 0x10, 0xf1, 0x51, 0x29, 0x34,
-	0xab, 0xec, 0x99, 0x2f, 0xf2, 0xe2, 0x65, 0x26, 0x7b, 0xf1, 0x82, 0xa7, 0x3e, 0x7b, 0xff, 0xa7,
-	0x7e, 0x7a, 0x32, 0xff, 0x7c, 0xc3, 0x32, 0x30, 0x6e, 0x79, 0xb7, 0x3a, 0xe3, 0xed, 0x53, 0x89,
-	0x65, 0x60, 0x7c, 0x59, 0x8d, 0x50, 0xa2, 0xe7, 0x30, 0x4d, 0xb1, 0xee, 0x56, 0x73, 0x1e, 0x47,
-	0x32, 0xdd, 0xf6, 0x56, 0x59, 0x50, 0x3a, 0xf7, 0xd2, 0x77, 0x8d, 0x05, 0xa5, 0xfc, 0xdd, 0x41,
-	0x89, 0x53, 0xb7, 0xa8, 0x72, 0x08, 0x73, 0x51, 0x0d, 0x43, 0x2f, 0x4a, 0x11, 0x2f, 0x7e, 0x1e,
-	0x3d, 0x17, 0x4c, 0xee, 0xa0, 0x52, 0x6d, 0xb0, 0x4a, 0xb5, 0xf1, 0xc6, 0xaf, 0x54, 0x83, 0xf3,
-	0x62, 0x42, 0xf6, 0x18, 0xeb, 0xa9, 0x40, 0xab, 0x29, 0x99, 0x85, 0x90, 0x57, 0x44, 0x5c, 0x97,
-	0x9d, 0xac, 0x5c, 0xfc, 0x83, 0x04, 0xb3, 0x81, 0xbd, 0xd1, 0x2b, 0xc8, 0x5f, 0x91, 0x61, 0xaf,
-	0x8f, 0x6d, 0x7e, 0xa3, 0x9f, 0xa5, 0xfa, 0xa5, 0xb1, 0x4b, 0x86, 0x7b, 0xd8, 0xee, 0x0c, 0xa8,
-	0x33, 0x54, 0x73, 0x57, 0xde, 0xa0, 0xf6, 0x12, 0x0a, 0x91, 0xe9, 0x49, 0x6f, 0xc7, 0xab, 0xcc,
-	0x2f, 0x25, 0xe5, 0x00, 0xca, 0xf1, 0xd4, 0x1b, 0xfd, 0x0a, 0xf2, 0x7e, 0xf2, 0xed, 0xa6, 0x8a,
-	0x72, 0x64, 0x0c, 0x74, 0x93, 0x1c, 0x3a, 0x96, 0x4d, 0x1c, 0x3a, 0xf4, 0xb9, 0xd5, 0x80, 0x43,
-	0xf9, 0x77, 0x16, 0x16, 0xd3, 0x28, 0xd0, 0x6f, 0x00, 0x58, 0x32, 0x22, 0xd4, 0x00, 0x2b, 0xf1,
-	0x43, 0x21, 0xf2, 0xec, 0x4c, 0xa9, 0x32, 0xc5, 0x3a, 0x07, 0xf8, 0x01, 0xca, 0xe1, 0xe9, 0xea,
-	0x09, 0x65, 0xd4, 0xf3, 0xf4, 0xd3, 0x98, 0x00, 0x9b, 0x0f, 0xf9, 0x39, 0xe4, 0x3e, 0xcc, 0x87,
-	0x4e, 0xe5, 0x88, 0xbe, 0xef, 0x3e, 0x4d, 0xbd, 0x47, 0x09, 0xc0, 0x52, 0xc0, 0xcd, 0xf1, 0x76,
-	0xa1, 0x14, 0xe4, 0x69, 0x1c, 0xce, 0xbf, 0x63, 0x4a, 0xda, 0x51, 0x48, 0xa0, 0x15, 0x39, 0x2f,
-	0x07, 0x3b, 0x84, 0x59, 0x46, 0x80, 0xa9, 0xe5, 0x54, 0xa1, 0x2e, 0xad, 0x95, 0xd6, 0xbf, 0xba,
-	0xd3, 0x0f, 0x8d, 0x2d, 0xab, 0x6f, 0x63, 0xc7, 0x70, 0x59, 0x31, 0xe4, 0xf3, 0xaa, 0x21, 0x8a,
-	0x52, 0x07, 0x94, 0x5c, 0x47, 0x00, 0xb9, 0xce, 0x0f, 0x27, 0xad, 0x37, 0x47, 0xe5, 0xa9, 0xcd,
-	0x05, 0x98, 0xb7, 0x39, 0x20, 0xd7, 0x40, 0xd9, 0x86, 0x4a, 0xba, 0xfe, 0xf1, 0x64, 0x5b, 0x4a,
-	0x26, 0xdb, 0x9b, 0x00, 0xb3, 0x01, 0x9e, 0xf2, 0x2d, 0x2c, 0x24, 0x3c, 0x2c, 0x64, 0xe3, 0x52,
-	0x3c, 0x1b, 0x8f, 0x72, 0xbf, 0x85, 0xc7, 0x63, 0x1c, 0x8b, 0xbe, 0xf2, 0xaf, 0x0e, 0x4b, 0x8b,
-	0x24, 0x9e, 0x16, 0x45, 0xed, 0xb4, 0x4b, 0x86, 0xa7, 0xec, 0xbc, 0x1f, 0x62, 0x83, 0x59, 0x99,
-	0x5d, 0x9a, 0x53, 0x6c, 0x0a, 0xe0, 0xdf, 0xc0, 0x5c, 0x94, 0x6a, 0xe2, 0xf7, 0xe5, 0x1f, 0xac,
-	0x74, 0x49, 0xf3, 0x26, 0xaa, 0xc5, 0xde, 0x1a, 0xa6, 0x56, 0xf0, 0xda, 0x2c, 0x46, 0x5f, 0x9b,
-	0x9d, 0x29, 0x1e, 0x60, 0xaa, 0xe2, 0x7b, 0xc3, 0x24, 0xe5, 0x2f, 0x4e, 0x2d, 0xf6, 0xe2, 0x30,
-	0xac, 0xd1, 0x9b, 0xe3, 0xbd, 0x2f, 0x33, 0x7c, 0x9e, 0x0d, 0x04, 0xcd, 0xfe, 0x92, 0x81, 0x85,
-	0x44, 0x81, 0xcc, 0xb4, 0x31, 0x8d, 0xbe, 0xe1, 0xcb, 0x56, 0x54, 0xfd, 0x01, 0x9b, 0x8d, 0xd6,
-	0xb6, 0xfe, 0x00, 0x7d, 0x07, 0x79, 0xd7, 0x72, 0xe8, 0x2e, 0x19, 0x7a, 0x82, 0x95, 0x62, 0xa9,
-	0x46, 0x02, 0xbc, 0x71, 0xe4, 0x53, 0xab, 0x01, 0x1b, 0x7a, 0x0d, 0x32, 0xfb, 0x3c, 0x70, 0x34,
-	0x7e, 0x21, 0x4a, 0xeb, 0x6b, 0x13, 0x60, 0x78, 0xf4, 0xea, 0x88, 0x55, 0xf9, 0x0c, 0xe4, 0x70,
-	0x1e, 0x95, 0x00, 0xda, 0x9d, 0xa3, 0xad, 0xce, 0x7e, 0xbb, 0xbb, 0xbf, 0x5d, 0x9e, 0x42, 0x45,
-	0x90, 0x5b, 0xe1, 0x50, 0x52, 0x9e, 0x40, 0x9e, 0xcb, 0x81, 0x16, 0xa0, 0xb8, 0xa5, 0x76, 0x5a,
-	0xc7, 0xdd, 0x83, 0xfd, 0xde, 0x71, 0x77, 0xaf, 0x53, 0x9e, 0x5a, 0xff, 0x3b, 0x40, 0x81, 0xf9,
-	0x6d, 0xcb, 0x17, 0x00, 0x9d, 0x42, 0x51, 0x68, 0x0c, 0x22, 0x31, 0xe2, 0xa5, 0x35, 0x1f, 0x6b,
-	0xca, 0x6d, 0x24, 0x3c, 0x05, 0xdd, 0x03, 0x18, 0x35, 0x04, 0xd1, 0x4a, 0xbc, 0xe2, 0x88, 0x21,
-	0xae, 0x8e, 0x5d, 0xe7, 0x70, 0x3f, 0x42, 0x49, 0x6c, 0x75, 0xa1, 0x34, 0x21, 0x62, 0x25, 0x67,
-	0xed, 0xd3, 0x5b, 0x69, 0x38, 0xf4, 0x21, 0x14, 0x22, 0xbd, 0x3d, 0x94, 0x10, 0x25, 0x0e, 0x5a,
-	0x1f, 0x4f, 0xc0, 0x11, 0x5b, 0x90, 0xf3, 0x1b, 0x69, 0x48, 0xcc, 0x8a, 0x85, 0x96, 0x5c, 0xed,
-	0x93, 0xd4, 0x35, 0x0e, 0x71, 0x0a, 0x45, 0xa1, 0x6f, 0x15, 0x73, 0x4b, 0x5a, 0x53, 0x2e, 0xe6,
-	0x96, 0xf4, 0xb6, 0xd7, 0x11, 0xcc, 0x45, 0x7b, 0x42, 0xa8, 0x9e, 0xe0, 0x89, 0x35, 0xaf, 0x6a,
-	0xcf, 0x6e, 0xa1, 0x18, 0x39, 0x47, 0xec, 0x80, 0xc4, 0x9c, 0x93, 0xda, 0x1b, 0x8a, 0x39, 0x67,
-	0x4c, 0x0b, 0xe5, 0x47, 0x28, 0x89, 0x9d, 0x02, 0x34, 0x41, 0xab, 0x21, 0x06, 0x9d, 0xde, 0x6a,
-	0x40, 0x6f, 0x61, 0x3e, 0xd6, 0xe0, 0x40, 0xb7, 0xf1, 0xb9, 0xf7, 0x02, 0x7f, 0x07, 0x95, 0xf4,
-	0x22, 0x0d, 0xdd, 0xa3, 0xf8, 0xae, 0xfd, 0x7c, 0x22, 0x5a, 0xbe, 0x25, 0x85, 0xc7, 0x63, 0xea,
-	0x42, 0x34, 0x09, 0x4e, 0xa8, 0xdf, 0xe7, 0x93, 0x11, 0xf3, 0x5d, 0x09, 0xa0, 0x64, 0x1d, 0x85,
-	0x26, 0xac, 0xc9, 0x6a, 0x3f, 0xbb, 0x93, 0x8e, 0x6f, 0xa3, 0xc3, 0xa3, 0x94, 0xc2, 0x10, 0xdd,
-	0xc5, 0xef, 0xde, 0x77, 0xa3, 0xcd, 0xad, 0x9f, 0x5a, 0xba, 0x41, 0x2f, 0xaf, 0xcf, 0x1a, 0xe7,
-	0x56, 0xbf, 0xe9, 0xa5, 0xcc, 0x96, 0xa3, 0xfb, 0x1f, 0xcd, 0xf0, 0xbf, 0x1e, 0x9d, 0x0c, 0x9a,
-	0xf6, 0xd9, 0x17, 0xba, 0xd5, 0x4c, 0xfb, 0xcf, 0xe8, 0x2c, 0xe7, 0x65, 0xef, 0x1b, 0xff, 0x0d,
-	0x00, 0x00, 0xff, 0xff, 0x84, 0x71, 0xf6, 0x21, 0x52, 0x1a, 0x00, 0x00,
+	// 1731 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0xdb, 0xc6,
+	0x12, 0x37, 0x25, 0x5b, 0x32, 0x47, 0x96, 0x22, 0x6f, 0x6c, 0x85, 0x56, 0x12, 0x5b, 0x61, 0x02,
+	0x3f, 0x23, 0xef, 0x45, 0xca, 0xb3, 0x93, 0xa0, 0x49, 0x8b, 0xb6, 0xb2, 0xa5, 0xd8, 0xaa, 0xe3,
+	0x3f, 0xa1, 0xff, 0x00, 0x69, 0x0b, 0x08, 0x6b, 0x73, 0xcd, 0xb0, 0xa6, 0x44, 0x86, 0x5c, 0xa7,
+	0xd6, 0xb1, 0xd7, 0xa2, 0x97, 0xa2, 0x40, 0x81, 0x9e, 0x7a, 0xe8, 0x07, 0xe9, 0x31, 0xb7, 0x7e,
+	0x87, 0x7e, 0x8e, 0x5e, 0x8a, 0x25, 0x97, 0x14, 0x49, 0x51, 0xb6, 0xe2, 0x43, 0xd0, 0x5e, 0x08,
+	0xee, 0xee, 0xcc, 0x6f, 0xe7, 0xcf, 0xce, 0xce, 0xcc, 0xc2, 0xe2, 0x89, 0xd1, 0xa3, 0x44, 0x57,
+	0x8d, 0x9a, 0x8a, 0x29, 0x3e, 0xc6, 0x14, 0x1b, 0xa6, 0x16, 0xfe, 0xaf, 0x5a, 0xb6, 0x49, 0x4d,
+	0x94, 0x0b, 0x4d, 0x95, 0x6f, 0x05, 0x4c, 0xc7, 0xa6, 0x4d, 0x6a, 0x86, 0x4e, 0x89, 0x8d, 0x0d,
+	0xc7, 0x23, 0x2d, 0xcf, 0x6b, 0xa6, 0xa9, 0x19, 0xa4, 0xe6, 0x8e, 0x8e, 0xce, 0x4e, 0x6a, 0xea,
+	0x99, 0x8d, 0xa9, 0x6e, 0x76, 0xf9, 0xfa, 0x42, 0x7c, 0x9d, 0xea, 0x1d, 0xe2, 0x50, 0xdc, 0xb1,
+	0x3c, 0x02, 0xf9, 0x39, 0xcc, 0xac, 0xd9, 0x04, 0x53, 0xd2, 0xc0, 0x14, 0x3b, 0x84, 0x2a, 0xe4,
+	0xcd, 0x19, 0x71, 0x28, 0xaa, 0x42, 0x56, 0xf5, 0x66, 0x24, 0xa1, 0x22, 0x2c, 0xe5, 0x96, 0x67,
+	0xaa, 0x61, 0x41, 0x7d, 0x6a, 0x9f, 0x48, 0xbe, 0x01, 0xb3, 0x31, 0x1c, 0xc7, 0x32, 0xbb, 0x0e,
+	0x91, 0x9b, 0x30, 0xbd, 0x4e, 0x68, 0x0c, 0xfd, 0x61, 0x1c, 0xbd, 0x94, 0x84, 0xde, 0x6a, 0xf4,
+	0xf1, 0x1b, 0x80, 0xc2, 0x30, 0x1e, 0xf8, 0x7b, 0x4b, 0xf9, 0xb3, 0xe0, 0xc2, 0xd4, 0x6d, 0xaa,
+	0x9f, 0xe0, 0xe3, 0xab, 0x8b, 0x83, 0xee, 0x40, 0x0e, 0x73, 0x90, 0xb6, 0xae, 0x4a, 0xa9, 0x8a,
+	0xb0, 0x24, 0x6e, 0x8c, 0x29, 0xe0, 0x4f, 0xb6, 0x54, 0x74, 0x13, 0x26, 0x29, 0xd6, 0xda, 0x5d,
+	0xdc, 0x21, 0x52, 0x9a, 0xaf, 0x67, 0x29, 0xd6, 0xb6, 0x71, 0x87, 0xac, 0x16, 0x60, 0xea, 0xcd,
+	0x19, 0xb1, 0x7b, 0xed, 0xd7, 0xb8, 0xab, 0x1a, 0x44, 0xde, 0x80, 0xeb, 0x11, 0xb9, 0xb8, 0x7e,
+	0xff, 0x87, 0x49, 0x1f, 0x91, 0x4b, 0x36, 0x1b, 0x91, 0x2c, 0x60, 0x08, 0xc8, 0xe4, 0x2f, 0x7c,
+	0x47, 0xc4, 0x95, 0xbc, 0x02, 0x96, 0x04, 0xa5, 0x38, 0x16, 0xf7, 0xea, 0x0a, 0xe4, 0xeb, 0xaa,
+	0xba, 0x8f, 0x35, 0x1f, 0x5d, 0x86, 0x34, 0xc5, 0x1a, 0x07, 0x2e, 0x46, 0x80, 0x19, 0x15, 0x5b,
+	0x94, 0x8b, 0x50, 0xf0, 0x99, 0x38, 0xcc, 0xef, 0x02, 0xcc, 0xbc, 0xd0, 0x9d, 0x40, 0x71, 0xe7,
+	0xea, 0x1e, 0x79, 0x0c, 0x99, 0x13, 0xdd, 0xa0, 0xc4, 0x76, 0x9d, 0x91, 0x5b, 0xbe, 0x1d, 0x61,
+	0x78, 0xee, 0x2e, 0x35, 0xcf, 0x2d, 0x9b, 0x38, 0x8e, 0x6e, 0x76, 0x15, 0x4e, 0x8c, 0x3e, 0x05,
+	0xb0, 0xb0, 0xa6, 0x77, 0xdd, 0xa0, 0x71, 0xfd, 0x94, 0x5b, 0x9e, 0x8f, 0xb0, 0xee, 0x06, 0xcb,
+	0x3b, 0x16, 0xfb, 0x3a, 0x4a, 0x88, 0x43, 0x3e, 0x85, 0xd9, 0x98, 0x02, 0xdc, 0x75, 0x2b, 0x20,
+	0xfa, 0x76, 0x74, 0x24, 0xa1, 0x92, 0x1e, 0x6e, 0xef, 0x3e, 0x1d, 0xba, 0x0d, 0xd0, 0x25, 0xe7,
+	0xb4, 0x4d, 0xcd, 0x53, 0xd2, 0xf5, 0x4e, 0x95, 0x22, 0xb2, 0x99, 0x7d, 0x36, 0x21, 0xff, 0x20,
+	0xc0, 0x75, 0xb6, 0x1b, 0x57, 0x3f, 0xb0, 0x56, 0x5f, 0x77, 0xe1, 0xea, 0xba, 0xa7, 0xde, 0x5b,
+	0x77, 0xcd, 0x73, 0x5e, 0x5f, 0x1a, 0xae, 0xfa, 0x43, 0x98, 0xe4, 0x5e, 0xf1, 0x35, 0x4f, 0x0e,
+	0xcb, 0x80, 0xea, 0x32, 0xbd, 0xff, 0x12, 0x60, 0xf6, 0xc0, 0x52, 0x13, 0x0e, 0xf5, 0x07, 0x8f,
+	0x5c, 0xf4, 0x00, 0xc6, 0x19, 0x94, 0x34, 0xee, 0x2a, 0x36, 0x97, 0xe8, 0x52, 0xb6, 0xad, 0xe2,
+	0x92, 0xb1, 0xa8, 0xeb, 0x10, 0x8a, 0x5d, 0x96, 0x89, 0x84, 0xa8, 0xdb, 0xe2, 0x8b, 0x4a, 0x40,
+	0x36, 0x70, 0x37, 0x3c, 0x85, 0x52, 0x5c, 0x79, 0x6e, 0xe8, 0x85, 0xa8, 0x2e, 0x82, 0x6b, 0xb7,
+	0x90, 0x26, 0xf2, 0x2f, 0x02, 0xcc, 0x36, 0x88, 0x41, 0xfe, 0x01, 0x86, 0x1b, 0x50, 0x4b, 0x82,
+	0x52, 0x5c, 0x34, 0x7e, 0x2b, 0x60, 0xc8, 0x2b, 0xc4, 0x21, 0xf6, 0x5b, 0xf7, 0x98, 0xb5, 0x1a,
+	0xe8, 0x31, 0x00, 0x97, 0xc2, 0x57, 0x73, 0xb8, 0xbc, 0x22, 0xa7, 0x6c, 0xa9, 0x68, 0x2e, 0x24,
+	0x8e, 0x77, 0xa6, 0x7c, 0x61, 0xe4, 0x77, 0x02, 0xdc, 0x5e, 0x27, 0x74, 0xc7, 0x6e, 0x9e, 0x53,
+	0xd2, 0x55, 0x43, 0xdb, 0xf9, 0x06, 0xaa, 0x43, 0xc1, 0xee, 0xcf, 0xf6, 0xf7, 0x2d, 0x47, 0xf6,
+	0x8d, 0xc8, 0xa9, 0xe4, 0x43, 0x1c, 0xde, 0xfe, 0xe6, 0xb7, 0x5d, 0x62, 0x07, 0xe6, 0x52, 0xb2,
+	0xee, 0xb8, 0xa5, 0xa2, 0x0d, 0x40, 0xaf, 0x09, 0xb6, 0xe9, 0x11, 0xc1, 0xb4, 0xad, 0x77, 0x29,
+	0xe3, 0x32, 0xf8, 0xf5, 0x33, 0x57, 0xf5, 0x92, 0x76, 0xd5, 0x4f, 0xda, 0xd5, 0x06, 0x4f, 0xea,
+	0xca, 0x74, 0xc0, 0xd4, 0xe2, 0x3c, 0xf2, 0x6f, 0x29, 0xc8, 0x85, 0xa4, 0xf8, 0xb7, 0xc8, 0x8d,
+	0x9e, 0x02, 0x90, 0x73, 0x4b, 0xb7, 0x89, 0xd3, 0xc6, 0x54, 0x1a, 0xe7, 0x32, 0xc6, 0x11, 0xf6,
+	0xfd, 0x72, 0x45, 0x11, 0x39, 0x75, 0x9d, 0x46, 0x62, 0x2a, 0x33, 0x52, 0x4c, 0xc9, 0x5f, 0xc3,
+	0xfc, 0x30, 0x77, 0xf3, 0x58, 0x7a, 0x06, 0xb9, 0x90, 0x15, 0xb8, 0xd1, 0xa4, 0x61, 0x46, 0x53,
+	0xc2, 0xc4, 0x72, 0x0f, 0xe6, 0x14, 0x62, 0x10, 0xec, 0x90, 0x0f, 0x7d, 0x90, 0xe4, 0x5b, 0x50,
+	0x4e, 0xda, 0x9a, 0x47, 0xd2, 0xf7, 0x02, 0x64, 0x79, 0x68, 0xa0, 0x45, 0x48, 0x5d, 0x1a, 0x3c,
+	0x29, 0x5d, 0x8d, 0x58, 0x37, 0x35, 0x92, 0x75, 0xd1, 0x3d, 0xc8, 0x5b, 0xec, 0x1a, 0x60, 0x7b,
+	0x6f, 0x92, 0x9e, 0x23, 0xa5, 0x2b, 0xe9, 0x25, 0x51, 0x89, 0x4e, 0xca, 0x2b, 0x20, 0xee, 0xfa,
+	0x13, 0xa8, 0x08, 0xe9, 0x53, 0xd2, 0xe3, 0x57, 0x16, 0xfb, 0x45, 0x33, 0x30, 0xf1, 0x16, 0x1b,
+	0x67, 0x7e, 0xa8, 0x7a, 0x03, 0xf9, 0x47, 0x01, 0xc4, 0x40, 0x3e, 0x24, 0x41, 0xd6, 0xb2, 0xcd,
+	0x6f, 0x08, 0x2f, 0x61, 0x44, 0xc5, 0x1f, 0x22, 0x04, 0xe3, 0xa1, 0x38, 0x77, 0xff, 0x51, 0x09,
+	0x32, 0xaa, 0xd9, 0xc1, 0xba, 0x97, 0xd7, 0x45, 0x85, 0x8f, 0x18, 0xca, 0x5b, 0x62, 0xb3, 0x54,
+	0xe8, 0x9e, 0x3b, 0x51, 0xf1, 0x87, 0x0c, 0xe5, 0xe0, 0xa0, 0xd5, 0x70, 0x6f, 0x6a, 0x51, 0x71,
+	0xff, 0x99, 0xa4, 0xa6, 0xad, 0xb9, 0x07, 0x4d, 0x54, 0xd8, 0xaf, 0xfc, 0x2e, 0x05, 0x93, 0xfe,
+	0xa5, 0x85, 0x0a, 0x81, 0x59, 0x45, 0xd7, 0x7c, 0xa1, 0x8b, 0x35, 0x35, 0xda, 0xc5, 0xea, 0x67,
+	0x94, 0xf4, 0xfb, 0x67, 0x94, 0xf1, 0xd1, 0xfc, 0xf3, 0x84, 0x25, 0x7a, 0x6e, 0x79, 0x47, 0x9a,
+	0x70, 0xf7, 0x29, 0xc5, 0x12, 0x3d, 0x5f, 0x56, 0x42, 0x94, 0xe8, 0x1e, 0x8c, 0x53, 0xac, 0x39,
+	0x52, 0xc6, 0xe5, 0x18, 0xac, 0xea, 0xdc, 0x55, 0x16, 0xc9, 0xc7, 0x6e, 0x95, 0xa8, 0xb2, 0x48,
+	0xce, 0x5e, 0x1e, 0xc9, 0x9c, 0xba, 0x4e, 0xe5, 0x5d, 0x98, 0x0a, 0x6b, 0x18, 0x78, 0x51, 0x08,
+	0x79, 0xf1, 0x7f, 0xe1, 0x73, 0xc1, 0xe4, 0xf6, 0x1b, 0xa2, 0x2a, 0x6b, 0x88, 0xaa, 0x2f, 0xbc,
+	0x86, 0xc8, 0x3f, 0x2f, 0x06, 0xa4, 0xf7, 0xb1, 0x96, 0x08, 0xb4, 0x90, 0x90, 0xc0, 0x22, 0xe9,
+	0x2b, 0xe4, 0xba, 0xf4, 0x68, 0x5d, 0xc9, 0x77, 0x02, 0x4c, 0xfa, 0xf6, 0x46, 0xcf, 0x20, 0x7b,
+	0x4a, 0x7a, 0xed, 0x0e, 0xb6, 0x78, 0xd5, 0x73, 0x27, 0xd1, 0x2f, 0xd5, 0x4d, 0xd2, 0xdb, 0xc2,
+	0x56, 0xb3, 0x4b, 0xed, 0x9e, 0x92, 0x39, 0x75, 0x07, 0xe5, 0xa7, 0x90, 0x0b, 0x4d, 0x8f, 0x1a,
+	0x1d, 0xcf, 0x52, 0x1f, 0x09, 0xf2, 0x0e, 0x14, 0xe3, 0x15, 0x1e, 0xfa, 0x18, 0xb2, 0x5e, 0x8d,
+	0xe7, 0x24, 0x8a, 0xb2, 0xa7, 0x77, 0x35, 0x83, 0xec, 0xda, 0xa6, 0x45, 0x6c, 0xda, 0xf3, 0xb8,
+	0x15, 0x9f, 0x43, 0xfe, 0x23, 0x0d, 0x33, 0x49, 0x14, 0xe8, 0x33, 0x00, 0x96, 0x4f, 0x23, 0xa5,
+	0xe6, 0x7c, 0xfc, 0x50, 0x44, 0x79, 0x36, 0xc6, 0x14, 0x91, 0x62, 0x8d, 0x03, 0xbc, 0x84, 0x62,
+	0x70, 0xba, 0xda, 0x91, 0x6a, 0xfd, 0x5e, 0xf2, 0x69, 0x1c, 0x00, 0xbb, 0x16, 0xf0, 0x73, 0xc8,
+	0x6d, 0xb8, 0x16, 0x38, 0x95, 0x23, 0x7a, 0xbe, 0xbb, 0x9b, 0x18, 0x47, 0x03, 0x80, 0x05, 0x9f,
+	0x9b, 0xe3, 0x6d, 0x42, 0xc1, 0x2f, 0x35, 0x38, 0x9c, 0x17, 0x63, 0x72, 0xd2, 0x51, 0x18, 0x40,
+	0xcb, 0x73, 0x5e, 0x0e, 0xb6, 0x0b, 0x93, 0x8c, 0x00, 0x53, 0xd3, 0x96, 0xa0, 0x22, 0x2c, 0x15,
+	0x96, 0x1f, 0x5d, 0xea, 0x87, 0xea, 0x9a, 0xd9, 0xb1, 0xb0, 0xad, 0x3b, 0xac, 0xe6, 0xf6, 0x78,
+	0x95, 0x00, 0x45, 0xae, 0x00, 0x1a, 0x5c, 0x47, 0x00, 0x99, 0xe6, 0xcb, 0x83, 0xfa, 0x8b, 0xbd,
+	0xe2, 0xd8, 0xea, 0x34, 0x5c, 0xb3, 0x38, 0x20, 0xd7, 0x40, 0x5e, 0x87, 0x52, 0xb2, 0xfe, 0xf1,
+	0x9a, 0x4e, 0x18, 0xac, 0xe9, 0x56, 0x01, 0x26, 0x7d, 0x3c, 0xf9, 0x13, 0x98, 0x1e, 0xf0, 0x70,
+	0xa4, 0xe8, 0x13, 0xe2, 0x45, 0x5f, 0x98, 0xfb, 0x2b, 0xb8, 0x31, 0xc4, 0xb1, 0xe8, 0x91, 0x17,
+	0x3a, 0xac, 0x96, 0x10, 0x78, 0x2d, 0x11, 0xb6, 0xd3, 0x26, 0xe9, 0x1d, 0xb2, 0xf3, 0xbe, 0x8b,
+	0x75, 0x66, 0x65, 0x16, 0x34, 0x87, 0xd8, 0x88, 0x80, 0x3f, 0x81, 0xa9, 0x30, 0xd5, 0xc8, 0xf9,
+	0xe5, 0x57, 0x56, 0x21, 0x27, 0x79, 0x13, 0x95, 0x63, 0xb9, 0x86, 0xa9, 0xe5, 0x67, 0x9b, 0x99,
+	0x70, 0xb6, 0xd9, 0x18, 0xe3, 0x17, 0x8c, 0x14, 0xcd, 0x37, 0x4c, 0x52, 0x9e, 0x71, 0xca, 0xb1,
+	0x8c, 0xc3, 0xb0, 0xfa, 0x39, 0xc7, 0xcd, 0x2f, 0x13, 0x7c, 0x9e, 0x0d, 0x22, 0x9a, 0xfd, 0x94,
+	0x82, 0xe9, 0x81, 0x3e, 0x8c, 0x69, 0x63, 0xe8, 0x1d, 0xdd, 0x93, 0x2d, 0xaf, 0x78, 0x03, 0x36,
+	0x1b, 0x6e, 0xa1, 0xbc, 0x01, 0xfa, 0x1c, 0xb2, 0x8e, 0x69, 0xd3, 0x4d, 0xd2, 0x73, 0x05, 0x2b,
+	0x2c, 0x2f, 0x5e, 0xdc, 0xe4, 0x55, 0xf7, 0x3c, 0x6a, 0xc5, 0x67, 0x43, 0xcf, 0x41, 0x64, 0xbf,
+	0x3b, 0xb6, 0xca, 0x03, 0xa2, 0xb0, 0xbc, 0x34, 0x02, 0x86, 0x4b, 0xaf, 0xf4, 0x59, 0xe5, 0xfb,
+	0x20, 0x06, 0xf3, 0xa8, 0x00, 0xd0, 0x68, 0xee, 0xad, 0x35, 0xb7, 0x1b, 0xad, 0xed, 0xf5, 0xe2,
+	0x18, 0xca, 0x83, 0x58, 0x0f, 0x86, 0x82, 0x7c, 0x0b, 0xb2, 0x5c, 0x0e, 0x34, 0x0d, 0xf9, 0x35,
+	0xa5, 0x59, 0xdf, 0x6f, 0xed, 0x6c, 0xb7, 0xf7, 0x5b, 0x5b, 0xcd, 0xe2, 0xd8, 0xf2, 0x9f, 0x59,
+	0xc8, 0x31, 0xbf, 0xad, 0x79, 0x02, 0xa0, 0x43, 0xc8, 0x47, 0xde, 0x9f, 0x50, 0xf4, 0xc6, 0x4b,
+	0x7a, 0xe3, 0x2a, 0xcb, 0x17, 0x91, 0xf0, 0xb2, 0x70, 0x0b, 0xa0, 0xff, 0xee, 0x84, 0xa2, 0xb7,
+	0xdd, 0xc0, 0xbb, 0x56, 0x79, 0x61, 0xe8, 0x3a, 0x87, 0x7b, 0x05, 0x85, 0xe8, 0x8b, 0x0a, 0x4a,
+	0x12, 0x22, 0xd6, 0xac, 0x95, 0xef, 0x5e, 0x48, 0xc3, 0xa1, 0x77, 0x21, 0x17, 0x7a, 0x42, 0x42,
+	0x03, 0xa2, 0xc4, 0x41, 0x2b, 0xc3, 0x09, 0x38, 0x62, 0x1d, 0x32, 0xde, 0x7b, 0x0d, 0x8a, 0xd6,
+	0xaa, 0x91, 0x97, 0x9f, 0xf2, 0xcd, 0xc4, 0x35, 0x0e, 0x71, 0x08, 0xf9, 0xc8, 0xf3, 0x48, 0xcc,
+	0x2d, 0x49, 0x6f, 0x3f, 0x31, 0xb7, 0x24, 0xbf, 0xae, 0xec, 0xc1, 0x54, 0xf8, 0xe9, 0x01, 0x55,
+	0x06, 0x78, 0x62, 0x6f, 0x24, 0xe5, 0x3b, 0x17, 0x50, 0xf4, 0x9d, 0x13, 0x6d, 0xb4, 0x63, 0xce,
+	0x49, 0x7c, 0x82, 0x88, 0x39, 0x67, 0x48, 0xa7, 0xfe, 0x0a, 0x0a, 0xd1, 0x66, 0x37, 0x06, 0x9d,
+	0xd8, 0xa4, 0xc7, 0xa0, 0x93, 0xbb, 0x65, 0xf4, 0x06, 0x4a, 0xc9, 0xad, 0x0d, 0xba, 0x1f, 0xf7,
+	0xf0, 0xf0, 0x76, 0xb7, 0xfc, 0xdf, 0x91, 0x68, 0xf9, 0x96, 0x04, 0xd0, 0x60, 0xd3, 0x81, 0x16,
+	0x63, 0x0d, 0xcd, 0x90, 0x86, 0xa8, 0xfc, 0x9f, 0x4b, 0xe9, 0xbc, 0x6d, 0x56, 0xd7, 0xbe, 0xac,
+	0x6b, 0x3a, 0x7d, 0x7d, 0x76, 0x54, 0x3d, 0x36, 0x3b, 0x35, 0xb7, 0xec, 0x33, 0x6d, 0xcd, 0xfb,
+	0xa9, 0x05, 0xcf, 0xe2, 0x1a, 0xe9, 0xd6, 0xac, 0xa3, 0x07, 0x9a, 0x59, 0x4b, 0x7a, 0x5e, 0x3f,
+	0xca, 0xb8, 0x15, 0xe8, 0xca, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x11, 0x93, 0x7a, 0x7d,
+	0x17, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2730,12 +2556,6 @@ type DataCatalogClient interface {
 	UpdateArtifact(ctx context.Context, in *UpdateArtifactRequest, opts ...grpc.CallOption) (*UpdateArtifactResponse, error)
 	// Deletes an existing artifact, removing the stored artifact data from the underlying blob storage.
 	DeleteArtifact(ctx context.Context, in *DeleteArtifactRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error)
-	// Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
-	// This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
-	// will not result in an error.
-	// The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-	// artifacts deleted, however the operation can simply be retried to remove the remaining entries.
-	DeleteArtifacts(ctx context.Context, in *DeleteArtifactsRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error)
 	// Attempts to get or extend a reservation for the corresponding artifact. If one already exists
 	// (ie. another entity owns the reservation) then that reservation is retrieved.
 	// Once you acquire a reservation, you need to  periodically extend the reservation with an
@@ -2748,21 +2568,9 @@ type DataCatalogClient interface {
 	// task B may take over the reservation, resulting in two tasks A and B running in parallel. So
 	// a third task C may get the Artifact from A or B, whichever writes last.
 	GetOrExtendReservation(ctx context.Context, in *GetOrExtendReservationRequest, opts ...grpc.CallOption) (*GetOrExtendReservationResponse, error)
-	// Attempts to get or extend reservations for multiple artifacts in a single operation.
-	// The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
-	// reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
-	// endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
-	GetOrExtendReservations(ctx context.Context, in *GetOrExtendReservationsRequest, opts ...grpc.CallOption) (*GetOrExtendReservationsResponse, error)
 	// Release the reservation when the task holding the spot fails so that the other tasks
 	// can grab the spot.
 	ReleaseReservation(ctx context.Context, in *ReleaseReservationRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error)
-	// Releases reservations for multiple artifacts in a single operation.
-	// This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
-	// times will not result in error.
-	// The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-	// artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
-	// reservations.
-	ReleaseReservations(ctx context.Context, in *ReleaseReservationsRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error)
 }
 
 type dataCatalogClient struct {
@@ -2854,15 +2662,6 @@ func (c *dataCatalogClient) DeleteArtifact(ctx context.Context, in *DeleteArtifa
 	return out, nil
 }
 
-func (c *dataCatalogClient) DeleteArtifacts(ctx context.Context, in *DeleteArtifactsRequest, opts ...grpc.CallOption) (*DeleteArtifactResponse, error) {
-	out := new(DeleteArtifactResponse)
-	err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/DeleteArtifacts", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *dataCatalogClient) GetOrExtendReservation(ctx context.Context, in *GetOrExtendReservationRequest, opts ...grpc.CallOption) (*GetOrExtendReservationResponse, error) {
 	out := new(GetOrExtendReservationResponse)
 	err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/GetOrExtendReservation", in, out, opts...)
@@ -2872,15 +2671,6 @@ func (c *dataCatalogClient) GetOrExtendReservation(ctx context.Context, in *GetO
 	return out, nil
 }
 
-func (c *dataCatalogClient) GetOrExtendReservations(ctx context.Context, in *GetOrExtendReservationsRequest, opts ...grpc.CallOption) (*GetOrExtendReservationsResponse, error) {
-	out := new(GetOrExtendReservationsResponse)
-	err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/GetOrExtendReservations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *dataCatalogClient) ReleaseReservation(ctx context.Context, in *ReleaseReservationRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error) {
 	out := new(ReleaseReservationResponse)
 	err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/ReleaseReservation", in, out, opts...)
@@ -2890,15 +2680,6 @@ func (c *dataCatalogClient) ReleaseReservation(ctx context.Context, in *ReleaseR
 	return out, nil
 }
 
-func (c *dataCatalogClient) ReleaseReservations(ctx context.Context, in *ReleaseReservationsRequest, opts ...grpc.CallOption) (*ReleaseReservationResponse, error) {
-	out := new(ReleaseReservationResponse)
-	err := c.cc.Invoke(ctx, "/datacatalog.DataCatalog/ReleaseReservations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // DataCatalogServer is the server API for DataCatalog service.
 type DataCatalogServer interface {
 	// Create a new Dataset. Datasets are unique based on the DatasetID. Datasets are logical groupings of artifacts.
@@ -2921,12 +2702,6 @@ type DataCatalogServer interface {
 	UpdateArtifact(context.Context, *UpdateArtifactRequest) (*UpdateArtifactResponse, error)
 	// Deletes an existing artifact, removing the stored artifact data from the underlying blob storage.
 	DeleteArtifact(context.Context, *DeleteArtifactRequest) (*DeleteArtifactResponse, error)
-	// Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
-	// This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
-	// will not result in an error.
-	// The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-	// artifacts deleted, however the operation can simply be retried to remove the remaining entries.
-	DeleteArtifacts(context.Context, *DeleteArtifactsRequest) (*DeleteArtifactResponse, error)
 	// Attempts to get or extend a reservation for the corresponding artifact. If one already exists
 	// (ie. another entity owns the reservation) then that reservation is retrieved.
 	// Once you acquire a reservation, you need to  periodically extend the reservation with an
@@ -2939,21 +2714,9 @@ type DataCatalogServer interface {
 	// task B may take over the reservation, resulting in two tasks A and B running in parallel. So
 	// a third task C may get the Artifact from A or B, whichever writes last.
 	GetOrExtendReservation(context.Context, *GetOrExtendReservationRequest) (*GetOrExtendReservationResponse, error)
-	// Attempts to get or extend reservations for multiple artifacts in a single operation.
-	// The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
-	// reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
-	// endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
-	GetOrExtendReservations(context.Context, *GetOrExtendReservationsRequest) (*GetOrExtendReservationsResponse, error)
 	// Release the reservation when the task holding the spot fails so that the other tasks
 	// can grab the spot.
 	ReleaseReservation(context.Context, *ReleaseReservationRequest) (*ReleaseReservationResponse, error)
-	// Releases reservations for multiple artifacts in a single operation.
-	// This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
-	// times will not result in error.
-	// The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-	// artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
-	// reservations.
-	ReleaseReservations(context.Context, *ReleaseReservationsRequest) (*ReleaseReservationResponse, error)
 }
 
 // UnimplementedDataCatalogServer can be embedded to have forward compatible implementations.
@@ -2987,21 +2750,12 @@ func (*UnimplementedDataCatalogServer) UpdateArtifact(ctx context.Context, req *
 func (*UnimplementedDataCatalogServer) DeleteArtifact(ctx context.Context, req *DeleteArtifactRequest) (*DeleteArtifactResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteArtifact not implemented")
 }
-func (*UnimplementedDataCatalogServer) DeleteArtifacts(ctx context.Context, req *DeleteArtifactsRequest) (*DeleteArtifactResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteArtifacts not implemented")
-}
 func (*UnimplementedDataCatalogServer) GetOrExtendReservation(ctx context.Context, req *GetOrExtendReservationRequest) (*GetOrExtendReservationResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetOrExtendReservation not implemented")
 }
-func (*UnimplementedDataCatalogServer) GetOrExtendReservations(ctx context.Context, req *GetOrExtendReservationsRequest) (*GetOrExtendReservationsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetOrExtendReservations not implemented")
-}
 func (*UnimplementedDataCatalogServer) ReleaseReservation(ctx context.Context, req *ReleaseReservationRequest) (*ReleaseReservationResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ReleaseReservation not implemented")
 }
-func (*UnimplementedDataCatalogServer) ReleaseReservations(ctx context.Context, req *ReleaseReservationsRequest) (*ReleaseReservationResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReleaseReservations not implemented")
-}
 
 func RegisterDataCatalogServer(s *grpc.Server, srv DataCatalogServer) {
 	s.RegisterService(&_DataCatalog_serviceDesc, srv)
@@ -3169,24 +2923,6 @@ func _DataCatalog_DeleteArtifact_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
-func _DataCatalog_DeleteArtifacts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteArtifactsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DataCatalogServer).DeleteArtifacts(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/datacatalog.DataCatalog/DeleteArtifacts",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DataCatalogServer).DeleteArtifacts(ctx, req.(*DeleteArtifactsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _DataCatalog_GetOrExtendReservation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetOrExtendReservationRequest)
 	if err := dec(in); err != nil {
@@ -3205,24 +2941,6 @@ func _DataCatalog_GetOrExtendReservation_Handler(srv interface{}, ctx context.Co
 	return interceptor(ctx, in, info, handler)
 }
 
-func _DataCatalog_GetOrExtendReservations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetOrExtendReservationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DataCatalogServer).GetOrExtendReservations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/datacatalog.DataCatalog/GetOrExtendReservations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DataCatalogServer).GetOrExtendReservations(ctx, req.(*GetOrExtendReservationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _DataCatalog_ReleaseReservation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ReleaseReservationRequest)
 	if err := dec(in); err != nil {
@@ -3241,24 +2959,6 @@ func _DataCatalog_ReleaseReservation_Handler(srv interface{}, ctx context.Contex
 	return interceptor(ctx, in, info, handler)
 }
 
-func _DataCatalog_ReleaseReservations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReleaseReservationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DataCatalogServer).ReleaseReservations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/datacatalog.DataCatalog/ReleaseReservations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DataCatalogServer).ReleaseReservations(ctx, req.(*ReleaseReservationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 var _DataCatalog_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "datacatalog.DataCatalog",
 	HandlerType: (*DataCatalogServer)(nil),
@@ -3299,26 +2999,14 @@ var _DataCatalog_serviceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteArtifact",
 			Handler:    _DataCatalog_DeleteArtifact_Handler,
 		},
-		{
-			MethodName: "DeleteArtifacts",
-			Handler:    _DataCatalog_DeleteArtifacts_Handler,
-		},
 		{
 			MethodName: "GetOrExtendReservation",
 			Handler:    _DataCatalog_GetOrExtendReservation_Handler,
 		},
-		{
-			MethodName: "GetOrExtendReservations",
-			Handler:    _DataCatalog_GetOrExtendReservations_Handler,
-		},
 		{
 			MethodName: "ReleaseReservation",
 			Handler:    _DataCatalog_ReleaseReservation_Handler,
 		},
-		{
-			MethodName: "ReleaseReservations",
-			Handler:    _DataCatalog_ReleaseReservations_Handler,
-		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "flyteidl/datacatalog/datacatalog.proto",
diff --git a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java
index 62eb589fcc..80d13abc6b 100644
--- a/flyteidl/gen/pb-java/datacatalog/Datacatalog.java
+++ b/flyteidl/gen/pb-java/datacatalog/Datacatalog.java
@@ -13738,72 +13738,27 @@ public datacatalog.Datacatalog.DeleteArtifactRequest getDefaultInstanceForType()
 
   }
 
-  public interface DeleteArtifactsRequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactsRequest)
+  public interface DeleteArtifactResponseOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactResponse)
       com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    java.util.List 
-        getArtifactsList();
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    datacatalog.Datacatalog.DeleteArtifactRequest getArtifacts(int index);
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    int getArtifactsCount();
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    java.util.List 
-        getArtifactsOrBuilderList();
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder getArtifactsOrBuilder(
-        int index);
   }
   /**
    * 
-   * Request message for deleting multiple Artifacts and their associated ArtifactData.
+   * Response message for deleting an Artifact.
    * 

    *
-   * Protobuf type {@code datacatalog.DeleteArtifactsRequest}
+   * Protobuf type {@code datacatalog.DeleteArtifactResponse}
    */
-  public  static final class DeleteArtifactsRequest extends
+  public  static final class DeleteArtifactResponse extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactsRequest)
-      DeleteArtifactsRequestOrBuilder {
+      // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactResponse)
+      DeleteArtifactResponseOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use DeleteArtifactsRequest.newBuilder() to construct.
-    private DeleteArtifactsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    // Use DeleteArtifactResponse.newBuilder() to construct.
+    private DeleteArtifactResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private DeleteArtifactsRequest() {
-      artifacts_ = java.util.Collections.emptyList();
+    private DeleteArtifactResponse() {
     }
 
     @java.lang.Override
@@ -13811,7 +13766,7 @@ private DeleteArtifactsRequest() {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private DeleteArtifactsRequest(
+    private DeleteArtifactResponse(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -13819,7 +13774,6 @@ private DeleteArtifactsRequest(
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -13830,15 +13784,6 @@ private DeleteArtifactsRequest(
             case 0:
               done = true;
               break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                artifacts_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              artifacts_.add(
-                  input.readMessage(datacatalog.Datacatalog.DeleteArtifactRequest.parser(), extensionRegistry));
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -13854,79 +13799,21 @@ private DeleteArtifactsRequest(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          artifacts_ = java.util.Collections.unmodifiableList(artifacts_);
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_descriptor;
+      return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable
+      return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.DeleteArtifactsRequest.class, datacatalog.Datacatalog.DeleteArtifactsRequest.Builder.class);
-    }
-
-    public static final int ARTIFACTS_FIELD_NUMBER = 1;
-    private java.util.List artifacts_;
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    public java.util.List getArtifactsList() {
-      return artifacts_;
-    }
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    public java.util.List 
-        getArtifactsOrBuilderList() {
-      return artifacts_;
-    }
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    public int getArtifactsCount() {
-      return artifacts_.size();
-    }
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    public datacatalog.Datacatalog.DeleteArtifactRequest getArtifacts(int index) {
-      return artifacts_.get(index);
-    }
-    /**
-     * 
-     * List of deletion requests for artifacts to remove
-     * 

-     *
-     * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-     */
-    public datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder getArtifactsOrBuilder(
-        int index) {
-      return artifacts_.get(index);
+              datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -13943,9 +13830,6 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < artifacts_.size(); i++) {
-        output.writeMessage(1, artifacts_.get(i));
-      }
       unknownFields.writeTo(output);
     }
 
@@ -13955,10 +13839,6 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < artifacts_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, artifacts_.get(i));
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -13969,13 +13849,11 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactsRequest)) {
+      if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactResponse)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.DeleteArtifactsRequest other = (datacatalog.Datacatalog.DeleteArtifactsRequest) obj;
+      datacatalog.Datacatalog.DeleteArtifactResponse other = (datacatalog.Datacatalog.DeleteArtifactResponse) obj;
 
-      if (!getArtifactsList()
-          .equals(other.getArtifactsList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -13987,78 +13865,74 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getArtifactsCount() > 0) {
-        hash = (37 * hash) + ARTIFACTS_FIELD_NUMBER;
-        hash = (53 * hash) + getArtifactsList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseDelimitedFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
+    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -14071,7 +13945,7 @@ public static datacatalog.Datacatalog.DeleteArtifactsRequest parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactsRequest prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -14088,29 +13962,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Request message for deleting multiple Artifacts and their associated ArtifactData.
+     * Response message for deleting an Artifact.
      * 

      *
-     * Protobuf type {@code datacatalog.DeleteArtifactsRequest}
+     * Protobuf type {@code datacatalog.DeleteArtifactResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactsRequest)
-        datacatalog.Datacatalog.DeleteArtifactsRequestOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactResponse)
+        datacatalog.Datacatalog.DeleteArtifactResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.DeleteArtifactsRequest.class, datacatalog.Datacatalog.DeleteArtifactsRequest.Builder.class);
+                datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.DeleteArtifactsRequest.newBuilder()
+      // Construct using datacatalog.Datacatalog.DeleteArtifactResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -14123,35 +13997,28 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getArtifactsFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (artifactsBuilder_ == null) {
-          artifacts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          artifactsBuilder_.clear();
-        }
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactsRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.DeleteArtifactsRequest getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.DeleteArtifactsRequest.getDefaultInstance();
+      public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.DeleteArtifactsRequest build() {
-        datacatalog.Datacatalog.DeleteArtifactsRequest result = buildPartial();
+      public datacatalog.Datacatalog.DeleteArtifactResponse build() {
+        datacatalog.Datacatalog.DeleteArtifactResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14159,18 +14026,8 @@ public datacatalog.Datacatalog.DeleteArtifactsRequest build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.DeleteArtifactsRequest buildPartial() {
-        datacatalog.Datacatalog.DeleteArtifactsRequest result = new datacatalog.Datacatalog.DeleteArtifactsRequest(this);
-        int from_bitField0_ = bitField0_;
-        if (artifactsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            artifacts_ = java.util.Collections.unmodifiableList(artifacts_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.artifacts_ = artifacts_;
-        } else {
-          result.artifacts_ = artifactsBuilder_.build();
-        }
+      public datacatalog.Datacatalog.DeleteArtifactResponse buildPartial() {
+        datacatalog.Datacatalog.DeleteArtifactResponse result = new datacatalog.Datacatalog.DeleteArtifactResponse(this);
         onBuilt();
         return result;
       }
@@ -14209,42 +14066,16 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.DeleteArtifactsRequest) {
-          return mergeFrom((datacatalog.Datacatalog.DeleteArtifactsRequest)other);
+        if (other instanceof datacatalog.Datacatalog.DeleteArtifactResponse) {
+          return mergeFrom((datacatalog.Datacatalog.DeleteArtifactResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactsRequest other) {
-        if (other == datacatalog.Datacatalog.DeleteArtifactsRequest.getDefaultInstance()) return this;
-        if (artifactsBuilder_ == null) {
-          if (!other.artifacts_.isEmpty()) {
-            if (artifacts_.isEmpty()) {
-              artifacts_ = other.artifacts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureArtifactsIsMutable();
-              artifacts_.addAll(other.artifacts_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.artifacts_.isEmpty()) {
-            if (artifactsBuilder_.isEmpty()) {
-              artifactsBuilder_.dispose();
-              artifactsBuilder_ = null;
-              artifacts_ = other.artifacts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              artifactsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getArtifactsFieldBuilder() : null;
-            } else {
-              artifactsBuilder_.addAllMessages(other.artifacts_);
-            }
-          }
-        }
+      public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactResponse other) {
+        if (other == datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -14260,11 +14091,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        datacatalog.Datacatalog.DeleteArtifactsRequest parsedMessage = null;
+        datacatalog.Datacatalog.DeleteArtifactResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.DeleteArtifactsRequest) e.getUnfinishedMessage();
+          parsedMessage = (datacatalog.Datacatalog.DeleteArtifactResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -14273,393 +14104,124 @@ public Builder mergeFrom(
         }
         return this;
       }
-      private int bitField0_;
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
 
-      private java.util.List artifacts_ =
-        java.util.Collections.emptyList();
-      private void ensureArtifactsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          artifacts_ = new java.util.ArrayList(artifacts_);
-          bitField0_ |= 0x00000001;
-         }
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
       }
 
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.DeleteArtifactRequest, datacatalog.Datacatalog.DeleteArtifactRequest.Builder, datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder> artifactsBuilder_;
 
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public java.util.List getArtifactsList() {
-        if (artifactsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(artifacts_);
-        } else {
-          return artifactsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public int getArtifactsCount() {
-        if (artifactsBuilder_ == null) {
-          return artifacts_.size();
-        } else {
-          return artifactsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public datacatalog.Datacatalog.DeleteArtifactRequest getArtifacts(int index) {
-        if (artifactsBuilder_ == null) {
-          return artifacts_.get(index);
-        } else {
-          return artifactsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder setArtifacts(
-          int index, datacatalog.Datacatalog.DeleteArtifactRequest value) {
-        if (artifactsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureArtifactsIsMutable();
-          artifacts_.set(index, value);
-          onChanged();
-        } else {
-          artifactsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder setArtifacts(
-          int index, datacatalog.Datacatalog.DeleteArtifactRequest.Builder builderForValue) {
-        if (artifactsBuilder_ == null) {
-          ensureArtifactsIsMutable();
-          artifacts_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          artifactsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder addArtifacts(datacatalog.Datacatalog.DeleteArtifactRequest value) {
-        if (artifactsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureArtifactsIsMutable();
-          artifacts_.add(value);
-          onChanged();
-        } else {
-          artifactsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder addArtifacts(
-          int index, datacatalog.Datacatalog.DeleteArtifactRequest value) {
-        if (artifactsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureArtifactsIsMutable();
-          artifacts_.add(index, value);
-          onChanged();
-        } else {
-          artifactsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder addArtifacts(
-          datacatalog.Datacatalog.DeleteArtifactRequest.Builder builderForValue) {
-        if (artifactsBuilder_ == null) {
-          ensureArtifactsIsMutable();
-          artifacts_.add(builderForValue.build());
-          onChanged();
-        } else {
-          artifactsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder addArtifacts(
-          int index, datacatalog.Datacatalog.DeleteArtifactRequest.Builder builderForValue) {
-        if (artifactsBuilder_ == null) {
-          ensureArtifactsIsMutable();
-          artifacts_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          artifactsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder addAllArtifacts(
-          java.lang.Iterable values) {
-        if (artifactsBuilder_ == null) {
-          ensureArtifactsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, artifacts_);
-          onChanged();
-        } else {
-          artifactsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder clearArtifacts() {
-        if (artifactsBuilder_ == null) {
-          artifacts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          artifactsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public Builder removeArtifacts(int index) {
-        if (artifactsBuilder_ == null) {
-          ensureArtifactsIsMutable();
-          artifacts_.remove(index);
-          onChanged();
-        } else {
-          artifactsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public datacatalog.Datacatalog.DeleteArtifactRequest.Builder getArtifactsBuilder(
-          int index) {
-        return getArtifactsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder getArtifactsOrBuilder(
-          int index) {
-        if (artifactsBuilder_ == null) {
-          return artifacts_.get(index);  } else {
-          return artifactsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public java.util.List 
-           getArtifactsOrBuilderList() {
-        if (artifactsBuilder_ != null) {
-          return artifactsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(artifacts_);
-        }
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public datacatalog.Datacatalog.DeleteArtifactRequest.Builder addArtifactsBuilder() {
-        return getArtifactsFieldBuilder().addBuilder(
-            datacatalog.Datacatalog.DeleteArtifactRequest.getDefaultInstance());
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public datacatalog.Datacatalog.DeleteArtifactRequest.Builder addArtifactsBuilder(
-          int index) {
-        return getArtifactsFieldBuilder().addBuilder(
-            index, datacatalog.Datacatalog.DeleteArtifactRequest.getDefaultInstance());
-      }
-      /**
-       * 
-       * List of deletion requests for artifacts to remove
-       * 

-       *
-       * repeated .datacatalog.DeleteArtifactRequest artifacts = 1;
-       */
-      public java.util.List 
-           getArtifactsBuilderList() {
-        return getArtifactsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.DeleteArtifactRequest, datacatalog.Datacatalog.DeleteArtifactRequest.Builder, datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder> 
-          getArtifactsFieldBuilder() {
-        if (artifactsBuilder_ == null) {
-          artifactsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              datacatalog.Datacatalog.DeleteArtifactRequest, datacatalog.Datacatalog.DeleteArtifactRequest.Builder, datacatalog.Datacatalog.DeleteArtifactRequestOrBuilder>(
-                  artifacts_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          artifacts_ = null;
-        }
-        return artifactsBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactsRequest)
-    }
-
-    // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactsRequest)
-    private static final datacatalog.Datacatalog.DeleteArtifactsRequest DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactsRequest();
-    }
-
-    public static datacatalog.Datacatalog.DeleteArtifactsRequest getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public DeleteArtifactsRequest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteArtifactsRequest(input, extensionRegistry);
+      // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactResponse)
+    }
+
+    // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactResponse)
+    private static final datacatalog.Datacatalog.DeleteArtifactResponse DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactResponse();
+    }
+
+    public static datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Override
+      public DeleteArtifactResponse parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DeleteArtifactResponse(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.DeleteArtifactsRequest getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface DeleteArtifactResponseOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.DeleteArtifactResponse)
+  public interface ReservationIDOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.ReservationID)
       com.google.protobuf.MessageOrBuilder {
-  }
-  /**
-   * 
-   * Response message for deleting an Artifact.
-   * 

-   *
-   * Protobuf type {@code datacatalog.DeleteArtifactResponse}
-   */
-  public  static final class DeleteArtifactResponse extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.DeleteArtifactResponse)
-      DeleteArtifactResponseOrBuilder {
+
+    /**
+     * 
+     * The unique ID for the reserved dataset
+     * 

+     *
+     * .datacatalog.DatasetID dataset_id = 1;
+     */
+    boolean hasDatasetId();
+    /**
+     * 
+     * The unique ID for the reserved dataset
+     * 

+     *
+     * .datacatalog.DatasetID dataset_id = 1;
+     */
+    datacatalog.Datacatalog.DatasetID getDatasetId();
+    /**
+     * 
+     * The unique ID for the reserved dataset
+     * 

+     *
+     * .datacatalog.DatasetID dataset_id = 1;
+     */
+    datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder();
+
+    /**
+     * 
+     * The specific artifact tag for the reservation
+     * 

+     *
+     * string tag_name = 2;
+     */
+    java.lang.String getTagName();
+    /**
+     * 
+     * The specific artifact tag for the reservation
+     * 

+     *
+     * string tag_name = 2;
+     */
+    com.google.protobuf.ByteString
+        getTagNameBytes();
+  }
+  /**
+   * 
+   * ReservationID message that is composed of several string fields.
+   * 

+   *
+   * Protobuf type {@code datacatalog.ReservationID}
+   */
+  public  static final class ReservationID extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:datacatalog.ReservationID)
+      ReservationIDOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use DeleteArtifactResponse.newBuilder() to construct.
-    private DeleteArtifactResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    // Use ReservationID.newBuilder() to construct.
+    private ReservationID(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private DeleteArtifactResponse() {
+    private ReservationID() {
+      tagName_ = "";
     }
 
     @java.lang.Override
@@ -14667,7 +14229,7 @@ private DeleteArtifactResponse() {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private DeleteArtifactResponse(
+    private ReservationID(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -14675,6 +14237,7 @@ private DeleteArtifactResponse(
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
+      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -14685,6 +14248,25 @@ private DeleteArtifactResponse(
             case 0:
               done = true;
               break;
+            case 10: {
+              datacatalog.Datacatalog.DatasetID.Builder subBuilder = null;
+              if (datasetId_ != null) {
+                subBuilder = datasetId_.toBuilder();
+              }
+              datasetId_ = input.readMessage(datacatalog.Datacatalog.DatasetID.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(datasetId_);
+                datasetId_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 18: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              tagName_ = s;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -14706,15 +14288,90 @@ private DeleteArtifactResponse(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor;
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class);
+              datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class);
+    }
+
+    public static final int DATASET_ID_FIELD_NUMBER = 1;
+    private datacatalog.Datacatalog.DatasetID datasetId_;
+    /**
+     * 
+     * The unique ID for the reserved dataset
+     * 

+     *
+     * .datacatalog.DatasetID dataset_id = 1;
+     */
+    public boolean hasDatasetId() {
+      return datasetId_ != null;
+    }
+    /**
+     * 
+     * The unique ID for the reserved dataset
+     * 

+     *
+     * .datacatalog.DatasetID dataset_id = 1;
+     */
+    public datacatalog.Datacatalog.DatasetID getDatasetId() {
+      return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_;
+    }
+    /**
+     * 
+     * The unique ID for the reserved dataset
+     * 

+     *
+     * .datacatalog.DatasetID dataset_id = 1;
+     */
+    public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() {
+      return getDatasetId();
+    }
+
+    public static final int TAG_NAME_FIELD_NUMBER = 2;
+    private volatile java.lang.Object tagName_;
+    /**
+     * 
+     * The specific artifact tag for the reservation
+     * 

+     *
+     * string tag_name = 2;
+     */
+    public java.lang.String getTagName() {
+      java.lang.Object ref = tagName_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        tagName_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * The specific artifact tag for the reservation
+     * 

+     *
+     * string tag_name = 2;
+     */
+    public com.google.protobuf.ByteString
+        getTagNameBytes() {
+      java.lang.Object ref = tagName_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        tagName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     private byte memoizedIsInitialized = -1;
@@ -14731,6 +14388,12 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (datasetId_ != null) {
+        output.writeMessage(1, getDatasetId());
+      }
+      if (!getTagNameBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, tagName_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -14740,6 +14403,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (datasetId_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, getDatasetId());
+      }
+      if (!getTagNameBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, tagName_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -14750,11 +14420,18 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.DeleteArtifactResponse)) {
+      if (!(obj instanceof datacatalog.Datacatalog.ReservationID)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.DeleteArtifactResponse other = (datacatalog.Datacatalog.DeleteArtifactResponse) obj;
+      datacatalog.Datacatalog.ReservationID other = (datacatalog.Datacatalog.ReservationID) obj;
 
+      if (hasDatasetId() != other.hasDatasetId()) return false;
+      if (hasDatasetId()) {
+        if (!getDatasetId()
+            .equals(other.getDatasetId())) return false;
+      }
+      if (!getTagName()
+          .equals(other.getTagName())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -14766,74 +14443,80 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasDatasetId()) {
+        hash = (37 * hash) + DATASET_ID_FIELD_NUMBER;
+        hash = (53 * hash) + getDatasetId().hashCode();
+      }
+      hash = (37 * hash) + TAG_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getTagName().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.ReservationID parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReservationID parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseDelimitedFrom(
+    public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
+    public static datacatalog.Datacatalog.ReservationID parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -14846,7 +14529,7 @@ public static datacatalog.Datacatalog.DeleteArtifactResponse parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.DeleteArtifactResponse prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.ReservationID prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -14863,29 +14546,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Response message for deleting an Artifact.
+     * ReservationID message that is composed of several string fields.
      * 

      *
-     * Protobuf type {@code datacatalog.DeleteArtifactResponse}
+     * Protobuf type {@code datacatalog.ReservationID}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.DeleteArtifactResponse)
-        datacatalog.Datacatalog.DeleteArtifactResponseOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.ReservationID)
+        datacatalog.Datacatalog.ReservationIDOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.DeleteArtifactResponse.class, datacatalog.Datacatalog.DeleteArtifactResponse.Builder.class);
+                datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.DeleteArtifactResponse.newBuilder()
+      // Construct using datacatalog.Datacatalog.ReservationID.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -14903,23 +14586,31 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        if (datasetIdBuilder_ == null) {
+          datasetId_ = null;
+        } else {
+          datasetId_ = null;
+          datasetIdBuilder_ = null;
+        }
+        tagName_ = "";
+
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_DeleteArtifactResponse_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance();
+      public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.ReservationID.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.DeleteArtifactResponse build() {
-        datacatalog.Datacatalog.DeleteArtifactResponse result = buildPartial();
+      public datacatalog.Datacatalog.ReservationID build() {
+        datacatalog.Datacatalog.ReservationID result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14927,8 +14618,14 @@ public datacatalog.Datacatalog.DeleteArtifactResponse build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.DeleteArtifactResponse buildPartial() {
-        datacatalog.Datacatalog.DeleteArtifactResponse result = new datacatalog.Datacatalog.DeleteArtifactResponse(this);
+      public datacatalog.Datacatalog.ReservationID buildPartial() {
+        datacatalog.Datacatalog.ReservationID result = new datacatalog.Datacatalog.ReservationID(this);
+        if (datasetIdBuilder_ == null) {
+          result.datasetId_ = datasetId_;
+        } else {
+          result.datasetId_ = datasetIdBuilder_.build();
+        }
+        result.tagName_ = tagName_;
         onBuilt();
         return result;
       }
@@ -14967,16 +14664,23 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.DeleteArtifactResponse) {
-          return mergeFrom((datacatalog.Datacatalog.DeleteArtifactResponse)other);
+        if (other instanceof datacatalog.Datacatalog.ReservationID) {
+          return mergeFrom((datacatalog.Datacatalog.ReservationID)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.DeleteArtifactResponse other) {
-        if (other == datacatalog.Datacatalog.DeleteArtifactResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(datacatalog.Datacatalog.ReservationID other) {
+        if (other == datacatalog.Datacatalog.ReservationID.getDefaultInstance()) return this;
+        if (other.hasDatasetId()) {
+          mergeDatasetId(other.getDatasetId());
+        }
+        if (!other.getTagName().isEmpty()) {
+          tagName_ = other.tagName_;
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -14992,11 +14696,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        datacatalog.Datacatalog.DeleteArtifactResponse parsedMessage = null;
+        datacatalog.Datacatalog.ReservationID parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.DeleteArtifactResponse) e.getUnfinishedMessage();
+          parsedMessage = (datacatalog.Datacatalog.ReservationID) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -15005,276 +14709,589 @@ public Builder mergeFrom(
         }
         return this;
       }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
 
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
+      private datacatalog.Datacatalog.DatasetID datasetId_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> datasetIdBuilder_;
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public boolean hasDatasetId() {
+        return datasetIdBuilder_ != null || datasetId_ != null;
       }
-
-
-      // @@protoc_insertion_point(builder_scope:datacatalog.DeleteArtifactResponse)
-    }
-
-    // @@protoc_insertion_point(class_scope:datacatalog.DeleteArtifactResponse)
-    private static final datacatalog.Datacatalog.DeleteArtifactResponse DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.DeleteArtifactResponse();
-    }
-
-    public static datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public DeleteArtifactResponse parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteArtifactResponse(input, extensionRegistry);
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public datacatalog.Datacatalog.DatasetID getDatasetId() {
+        if (datasetIdBuilder_ == null) {
+          return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_;
+        } else {
+          return datasetIdBuilder_.getMessage();
+        }
       }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public datacatalog.Datacatalog.DeleteArtifactResponse getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public Builder setDatasetId(datacatalog.Datacatalog.DatasetID value) {
+        if (datasetIdBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          datasetId_ = value;
+          onChanged();
+        } else {
+          datasetIdBuilder_.setMessage(value);
+        }
 
-  public interface ReservationIDOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.ReservationID)
-      com.google.protobuf.MessageOrBuilder {
+        return this;
+      }
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public Builder setDatasetId(
+          datacatalog.Datacatalog.DatasetID.Builder builderForValue) {
+        if (datasetIdBuilder_ == null) {
+          datasetId_ = builderForValue.build();
+          onChanged();
+        } else {
+          datasetIdBuilder_.setMessage(builderForValue.build());
+        }
 
-    /**
-     * 
-     * The unique ID for the reserved dataset
-     * 

-     *
-     * .datacatalog.DatasetID dataset_id = 1;
-     */
-    boolean hasDatasetId();
-    /**
-     * 
-     * The unique ID for the reserved dataset
-     * 

-     *
-     * .datacatalog.DatasetID dataset_id = 1;
-     */
-    datacatalog.Datacatalog.DatasetID getDatasetId();
-    /**
-     * 
-     * The unique ID for the reserved dataset
-     * 

-     *
-     * .datacatalog.DatasetID dataset_id = 1;
-     */
-    datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder();
+        return this;
+      }
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public Builder mergeDatasetId(datacatalog.Datacatalog.DatasetID value) {
+        if (datasetIdBuilder_ == null) {
+          if (datasetId_ != null) {
+            datasetId_ =
+              datacatalog.Datacatalog.DatasetID.newBuilder(datasetId_).mergeFrom(value).buildPartial();
+          } else {
+            datasetId_ = value;
+          }
+          onChanged();
+        } else {
+          datasetIdBuilder_.mergeFrom(value);
+        }
 
-    /**
-     * 
-     * The specific artifact tag for the reservation
-     * 

-     *
-     * string tag_name = 2;
-     */
-    java.lang.String getTagName();
-    /**
-     * 
-     * The specific artifact tag for the reservation
-     * 

-     *
-     * string tag_name = 2;
-     */
-    com.google.protobuf.ByteString
-        getTagNameBytes();
-  }
-  /**
-   * 
-   * ReservationID message that is composed of several string fields.
-   * 

-   *
-   * Protobuf type {@code datacatalog.ReservationID}
-   */
-  public  static final class ReservationID extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.ReservationID)
-      ReservationIDOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use ReservationID.newBuilder() to construct.
-    private ReservationID(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private ReservationID() {
-      tagName_ = "";
-    }
+        return this;
+      }
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public Builder clearDatasetId() {
+        if (datasetIdBuilder_ == null) {
+          datasetId_ = null;
+          onChanged();
+        } else {
+          datasetId_ = null;
+          datasetIdBuilder_ = null;
+        }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ReservationID(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        return this;
+      }
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public datacatalog.Datacatalog.DatasetID.Builder getDatasetIdBuilder() {
+        
+        onChanged();
+        return getDatasetIdFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() {
+        if (datasetIdBuilder_ != null) {
+          return datasetIdBuilder_.getMessageOrBuilder();
+        } else {
+          return datasetId_ == null ?
+              datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_;
+        }
+      }
+      /**
+       * 
+       * The unique ID for the reserved dataset
+       * 

+       *
+       * .datacatalog.DatasetID dataset_id = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> 
+          getDatasetIdFieldBuilder() {
+        if (datasetIdBuilder_ == null) {
+          datasetIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder>(
+                  getDatasetId(),
+                  getParentForChildren(),
+                  isClean());
+          datasetId_ = null;
+        }
+        return datasetIdBuilder_;
       }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              datacatalog.Datacatalog.DatasetID.Builder subBuilder = null;
-              if (datasetId_ != null) {
-                subBuilder = datasetId_.toBuilder();
-              }
-              datasetId_ = input.readMessage(datacatalog.Datacatalog.DatasetID.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(datasetId_);
-                datasetId_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              tagName_ = s;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
+      private java.lang.Object tagName_ = "";
+      /**
+       * 
+       * The specific artifact tag for the reservation
+       * 

+       *
+       * string tag_name = 2;
+       */
+      public java.lang.String getTagName() {
+        java.lang.Object ref = tagName_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          tagName_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
         }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
       }
+      /**
+       * 
+       * The specific artifact tag for the reservation
+       * 

+       *
+       * string tag_name = 2;
+       */
+      public com.google.protobuf.ByteString
+          getTagNameBytes() {
+        java.lang.Object ref = tagName_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          tagName_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * 
+       * The specific artifact tag for the reservation
+       * 

+       *
+       * string tag_name = 2;
+       */
+      public Builder setTagName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        tagName_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * The specific artifact tag for the reservation
+       * 

+       *
+       * string tag_name = 2;
+       */
+      public Builder clearTagName() {
+        
+        tagName_ = getDefaultInstance().getTagName();
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * The specific artifact tag for the reservation
+       * 

+       *
+       * string tag_name = 2;
+       */
+      public Builder setTagNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        tagName_ = value;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:datacatalog.ReservationID)
     }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor;
+
+    // @@protoc_insertion_point(class_scope:datacatalog.ReservationID)
+    private static final datacatalog.Datacatalog.ReservationID DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReservationID();
+    }
+
+    public static datacatalog.Datacatalog.ReservationID getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Override
+      public ReservationID parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ReservationID(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
     }
 
     @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class);
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
     }
 
-    public static final int DATASET_ID_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.DatasetID datasetId_;
+    @java.lang.Override
+    public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface GetOrExtendReservationRequestOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationRequest)
+      com.google.protobuf.MessageOrBuilder {
+
     /**
      * 
-     * The unique ID for the reserved dataset
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.DatasetID dataset_id = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public boolean hasDatasetId() {
-      return datasetId_ != null;
-    }
+    boolean hasReservationId();
     /**
      * 
-     * The unique ID for the reserved dataset
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.DatasetID dataset_id = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public datacatalog.Datacatalog.DatasetID getDatasetId() {
-      return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_;
-    }
+    datacatalog.Datacatalog.ReservationID getReservationId();
     /**
      * 
-     * The unique ID for the reserved dataset
+     * The unique ID for the reservation
      * 

      *
-     * .datacatalog.DatasetID dataset_id = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() {
-      return getDatasetId();
+    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
+
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    java.lang.String getOwnerId();
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    com.google.protobuf.ByteString
+        getOwnerIdBytes();
+
+    /**
+     * 
+     * Requested reservation extension heartbeat interval
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    boolean hasHeartbeatInterval();
+    /**
+     * 
+     * Requested reservation extension heartbeat interval
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    com.google.protobuf.Duration getHeartbeatInterval();
+    /**
+     * 
+     * Requested reservation extension heartbeat interval
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder();
+  }
+  /**
+   * 
+   * Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance.
+   * 

+   *
+   * Protobuf type {@code datacatalog.GetOrExtendReservationRequest}
+   */
+  public  static final class GetOrExtendReservationRequest extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationRequest)
+      GetOrExtendReservationRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use GetOrExtendReservationRequest.newBuilder() to construct.
+    private GetOrExtendReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+    private GetOrExtendReservationRequest() {
+      ownerId_ = "";
     }
 
-    public static final int TAG_NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object tagName_;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private GetOrExtendReservationRequest(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
+              if (reservationId_ != null) {
+                subBuilder = reservationId_.toBuilder();
+              }
+              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(reservationId_);
+                reservationId_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 18: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              ownerId_ = s;
+              break;
+            }
+            case 26: {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (heartbeatInterval_ != null) {
+                subBuilder = heartbeatInterval_.toBuilder();
+              }
+              heartbeatInterval_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(heartbeatInterval_);
+                heartbeatInterval_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class);
+    }
+
+    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
+    private datacatalog.Datacatalog.ReservationID reservationId_;
     /**
      * 
-     * The specific artifact tag for the reservation
+     * The unique ID for the reservation
      * 

      *
-     * string tag_name = 2;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public java.lang.String getTagName() {
-      java.lang.Object ref = tagName_;
+    public boolean hasReservationId() {
+      return reservationId_ != null;
+    }
+    /**
+     * 
+     * The unique ID for the reservation
+     * 

+     *
+     * .datacatalog.ReservationID reservation_id = 1;
+     */
+    public datacatalog.Datacatalog.ReservationID getReservationId() {
+      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+    }
+    /**
+     * 
+     * The unique ID for the reservation
+     * 

+     *
+     * .datacatalog.ReservationID reservation_id = 1;
+     */
+    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+      return getReservationId();
+    }
+
+    public static final int OWNER_ID_FIELD_NUMBER = 2;
+    private volatile java.lang.Object ownerId_;
+    /**
+     * 
+     * The unique ID of the owner for the reservation
+     * 

+     *
+     * string owner_id = 2;
+     */
+    public java.lang.String getOwnerId() {
+      java.lang.Object ref = ownerId_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        tagName_ = s;
+        ownerId_ = s;
         return s;
       }
     }
     /**
      * 
-     * The specific artifact tag for the reservation
+     * The unique ID of the owner for the reservation
      * 

      *
-     * string tag_name = 2;
+     * string owner_id = 2;
      */
     public com.google.protobuf.ByteString
-        getTagNameBytes() {
-      java.lang.Object ref = tagName_;
+        getOwnerIdBytes() {
+      java.lang.Object ref = ownerId_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        tagName_ = b;
+        ownerId_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
+    public static final int HEARTBEAT_INTERVAL_FIELD_NUMBER = 3;
+    private com.google.protobuf.Duration heartbeatInterval_;
+    /**
+     * 
+     * Requested reservation extension heartbeat interval
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    public boolean hasHeartbeatInterval() {
+      return heartbeatInterval_ != null;
+    }
+    /**
+     * 
+     * Requested reservation extension heartbeat interval
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    public com.google.protobuf.Duration getHeartbeatInterval() {
+      return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+    }
+    /**
+     * 
+     * Requested reservation extension heartbeat interval
+     * 

+     *
+     * .google.protobuf.Duration heartbeat_interval = 3;
+     */
+    public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
+      return getHeartbeatInterval();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -15289,11 +15306,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (datasetId_ != null) {
-        output.writeMessage(1, getDatasetId());
+      if (reservationId_ != null) {
+        output.writeMessage(1, getReservationId());
       }
-      if (!getTagNameBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, tagName_);
+      if (!getOwnerIdBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
+      }
+      if (heartbeatInterval_ != null) {
+        output.writeMessage(3, getHeartbeatInterval());
       }
       unknownFields.writeTo(output);
     }
@@ -15304,12 +15324,16 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (datasetId_ != null) {
+      if (reservationId_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getDatasetId());
+          .computeMessageSize(1, getReservationId());
       }
-      if (!getTagNameBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, tagName_);
+      if (!getOwnerIdBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
+      }
+      if (heartbeatInterval_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getHeartbeatInterval());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -15321,18 +15345,23 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.ReservationID)) {
+      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.ReservationID other = (datacatalog.Datacatalog.ReservationID) obj;
+      datacatalog.Datacatalog.GetOrExtendReservationRequest other = (datacatalog.Datacatalog.GetOrExtendReservationRequest) obj;
 
-      if (hasDatasetId() != other.hasDatasetId()) return false;
-      if (hasDatasetId()) {
-        if (!getDatasetId()
-            .equals(other.getDatasetId())) return false;
+      if (hasReservationId() != other.hasReservationId()) return false;
+      if (hasReservationId()) {
+        if (!getReservationId()
+            .equals(other.getReservationId())) return false;
+      }
+      if (!getOwnerId()
+          .equals(other.getOwnerId())) return false;
+      if (hasHeartbeatInterval() != other.hasHeartbeatInterval()) return false;
+      if (hasHeartbeatInterval()) {
+        if (!getHeartbeatInterval()
+            .equals(other.getHeartbeatInterval())) return false;
       }
-      if (!getTagName()
-          .equals(other.getTagName())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -15344,80 +15373,84 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasDatasetId()) {
-        hash = (37 * hash) + DATASET_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getDatasetId().hashCode();
+      if (hasReservationId()) {
+        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
+        hash = (53 * hash) + getReservationId().hashCode();
+      }
+      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOwnerId().hashCode();
+      if (hasHeartbeatInterval()) {
+        hash = (37 * hash) + HEARTBEAT_INTERVAL_FIELD_NUMBER;
+        hash = (53 * hash) + getHeartbeatInterval().hashCode();
       }
-      hash = (37 * hash) + TAG_NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getTagName().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReservationID parseDelimitedFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReservationID parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -15430,7 +15463,7 @@ public static datacatalog.Datacatalog.ReservationID parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.ReservationID prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -15447,29 +15480,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * ReservationID message that is composed of several string fields.
+     * Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance.
      * 

      *
-     * Protobuf type {@code datacatalog.ReservationID}
+     * Protobuf type {@code datacatalog.GetOrExtendReservationRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.ReservationID)
-        datacatalog.Datacatalog.ReservationIDOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationRequest)
+        datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.ReservationID.class, datacatalog.Datacatalog.ReservationID.Builder.class);
+                datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.ReservationID.newBuilder()
+      // Construct using datacatalog.Datacatalog.GetOrExtendReservationRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -15487,31 +15520,37 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (datasetIdBuilder_ == null) {
-          datasetId_ = null;
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
         } else {
-          datasetId_ = null;
-          datasetIdBuilder_ = null;
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
         }
-        tagName_ = "";
+        ownerId_ = "";
 
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatInterval_ = null;
+        } else {
+          heartbeatInterval_ = null;
+          heartbeatIntervalBuilder_ = null;
+        }
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReservationID_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.ReservationID.getDefaultInstance();
+      public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReservationID build() {
-        datacatalog.Datacatalog.ReservationID result = buildPartial();
+      public datacatalog.Datacatalog.GetOrExtendReservationRequest build() {
+        datacatalog.Datacatalog.GetOrExtendReservationRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -15519,14 +15558,19 @@ public datacatalog.Datacatalog.ReservationID build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReservationID buildPartial() {
-        datacatalog.Datacatalog.ReservationID result = new datacatalog.Datacatalog.ReservationID(this);
-        if (datasetIdBuilder_ == null) {
-          result.datasetId_ = datasetId_;
+      public datacatalog.Datacatalog.GetOrExtendReservationRequest buildPartial() {
+        datacatalog.Datacatalog.GetOrExtendReservationRequest result = new datacatalog.Datacatalog.GetOrExtendReservationRequest(this);
+        if (reservationIdBuilder_ == null) {
+          result.reservationId_ = reservationId_;
         } else {
-          result.datasetId_ = datasetIdBuilder_.build();
+          result.reservationId_ = reservationIdBuilder_.build();
+        }
+        result.ownerId_ = ownerId_;
+        if (heartbeatIntervalBuilder_ == null) {
+          result.heartbeatInterval_ = heartbeatInterval_;
+        } else {
+          result.heartbeatInterval_ = heartbeatIntervalBuilder_.build();
         }
-        result.tagName_ = tagName_;
         onBuilt();
         return result;
       }
@@ -15565,23 +15609,26 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.ReservationID) {
-          return mergeFrom((datacatalog.Datacatalog.ReservationID)other);
+        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest) {
+          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.ReservationID other) {
-        if (other == datacatalog.Datacatalog.ReservationID.getDefaultInstance()) return this;
-        if (other.hasDatasetId()) {
-          mergeDatasetId(other.getDatasetId());
+      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationRequest other) {
+        if (other == datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance()) return this;
+        if (other.hasReservationId()) {
+          mergeReservationId(other.getReservationId());
         }
-        if (!other.getTagName().isEmpty()) {
-          tagName_ = other.tagName_;
+        if (!other.getOwnerId().isEmpty()) {
+          ownerId_ = other.ownerId_;
           onChanged();
         }
+        if (other.hasHeartbeatInterval()) {
+          mergeHeartbeatInterval(other.getHeartbeatInterval());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -15597,11 +15644,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        datacatalog.Datacatalog.ReservationID parsedMessage = null;
+        datacatalog.Datacatalog.GetOrExtendReservationRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.ReservationID) e.getUnfinishedMessage();
+          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -15611,174 +15658,174 @@ public Builder mergeFrom(
         return this;
       }
 
-      private datacatalog.Datacatalog.DatasetID datasetId_;
+      private datacatalog.Datacatalog.ReservationID reservationId_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> datasetIdBuilder_;
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public boolean hasDatasetId() {
-        return datasetIdBuilder_ != null || datasetId_ != null;
+      public boolean hasReservationId() {
+        return reservationIdBuilder_ != null || reservationId_ != null;
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public datacatalog.Datacatalog.DatasetID getDatasetId() {
-        if (datasetIdBuilder_ == null) {
-          return datasetId_ == null ? datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_;
+      public datacatalog.Datacatalog.ReservationID getReservationId() {
+        if (reservationIdBuilder_ == null) {
+          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
         } else {
-          return datasetIdBuilder_.getMessage();
+          return reservationIdBuilder_.getMessage();
         }
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder setDatasetId(datacatalog.Datacatalog.DatasetID value) {
-        if (datasetIdBuilder_ == null) {
+      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          datasetId_ = value;
+          reservationId_ = value;
           onChanged();
         } else {
-          datasetIdBuilder_.setMessage(value);
+          reservationIdBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder setDatasetId(
-          datacatalog.Datacatalog.DatasetID.Builder builderForValue) {
-        if (datasetIdBuilder_ == null) {
-          datasetId_ = builderForValue.build();
+      public Builder setReservationId(
+          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = builderForValue.build();
           onChanged();
         } else {
-          datasetIdBuilder_.setMessage(builderForValue.build());
+          reservationIdBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder mergeDatasetId(datacatalog.Datacatalog.DatasetID value) {
-        if (datasetIdBuilder_ == null) {
-          if (datasetId_ != null) {
-            datasetId_ =
-              datacatalog.Datacatalog.DatasetID.newBuilder(datasetId_).mergeFrom(value).buildPartial();
+      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
+          if (reservationId_ != null) {
+            reservationId_ =
+              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
           } else {
-            datasetId_ = value;
+            reservationId_ = value;
           }
           onChanged();
         } else {
-          datasetIdBuilder_.mergeFrom(value);
+          reservationIdBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder clearDatasetId() {
-        if (datasetIdBuilder_ == null) {
-          datasetId_ = null;
+      public Builder clearReservationId() {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
           onChanged();
         } else {
-          datasetId_ = null;
-          datasetIdBuilder_ = null;
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public datacatalog.Datacatalog.DatasetID.Builder getDatasetIdBuilder() {
+      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
         
         onChanged();
-        return getDatasetIdFieldBuilder().getBuilder();
+        return getReservationIdFieldBuilder().getBuilder();
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public datacatalog.Datacatalog.DatasetIDOrBuilder getDatasetIdOrBuilder() {
-        if (datasetIdBuilder_ != null) {
-          return datasetIdBuilder_.getMessageOrBuilder();
+      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+        if (reservationIdBuilder_ != null) {
+          return reservationIdBuilder_.getMessageOrBuilder();
         } else {
-          return datasetId_ == null ?
-              datacatalog.Datacatalog.DatasetID.getDefaultInstance() : datasetId_;
+          return reservationId_ == null ?
+              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
         }
       }
       /**
        * 
-       * The unique ID for the reserved dataset
+       * The unique ID for the reservation
        * 

        *
-       * .datacatalog.DatasetID dataset_id = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder> 
-          getDatasetIdFieldBuilder() {
-        if (datasetIdBuilder_ == null) {
-          datasetIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.DatasetID, datacatalog.Datacatalog.DatasetID.Builder, datacatalog.Datacatalog.DatasetIDOrBuilder>(
-                  getDatasetId(),
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
+          getReservationIdFieldBuilder() {
+        if (reservationIdBuilder_ == null) {
+          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
+                  getReservationId(),
                   getParentForChildren(),
                   isClean());
-          datasetId_ = null;
+          reservationId_ = null;
         }
-        return datasetIdBuilder_;
+        return reservationIdBuilder_;
       }
 
-      private java.lang.Object tagName_ = "";
+      private java.lang.Object ownerId_ = "";
       /**
        * 
-       * The specific artifact tag for the reservation
+       * The unique ID of the owner for the reservation
        * 

        *
-       * string tag_name = 2;
+       * string owner_id = 2;
        */
-      public java.lang.String getTagName() {
-        java.lang.Object ref = tagName_;
+      public java.lang.String getOwnerId() {
+        java.lang.Object ref = ownerId_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          tagName_ = s;
+          ownerId_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -15786,19 +15833,19 @@ public java.lang.String getTagName() {
       }
       /**
        * 
-       * The specific artifact tag for the reservation
+       * The unique ID of the owner for the reservation
        * 

        *
-       * string tag_name = 2;
+       * string owner_id = 2;
        */
       public com.google.protobuf.ByteString
-          getTagNameBytes() {
-        java.lang.Object ref = tagName_;
+          getOwnerIdBytes() {
+        java.lang.Object ref = ownerId_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          tagName_ = b;
+          ownerId_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
@@ -15806,52 +15853,205 @@ public java.lang.String getTagName() {
       }
       /**
        * 
-       * The specific artifact tag for the reservation
+       * The unique ID of the owner for the reservation
        * 

        *
-       * string tag_name = 2;
+       * string owner_id = 2;
        */
-      public Builder setTagName(
+      public Builder setOwnerId(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        tagName_ = value;
+        ownerId_ = value;
         onChanged();
         return this;
       }
       /**
        * 
-       * The specific artifact tag for the reservation
+       * The unique ID of the owner for the reservation
        * 

        *
-       * string tag_name = 2;
+       * string owner_id = 2;
        */
-      public Builder clearTagName() {
+      public Builder clearOwnerId() {
         
-        tagName_ = getDefaultInstance().getTagName();
+        ownerId_ = getDefaultInstance().getOwnerId();
         onChanged();
         return this;
       }
       /**
        * 
-       * The specific artifact tag for the reservation
+       * The unique ID of the owner for the reservation
        * 

        *
-       * string tag_name = 2;
+       * string owner_id = 2;
        */
-      public Builder setTagNameBytes(
+      public Builder setOwnerIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        tagName_ = value;
+        ownerId_ = value;
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Duration heartbeatInterval_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_;
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public boolean hasHeartbeatInterval() {
+        return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null;
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.Duration getHeartbeatInterval() {
+        if (heartbeatIntervalBuilder_ == null) {
+          return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+        } else {
+          return heartbeatIntervalBuilder_.getMessage();
+        }
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder setHeartbeatInterval(com.google.protobuf.Duration value) {
+        if (heartbeatIntervalBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          heartbeatInterval_ = value;
+          onChanged();
+        } else {
+          heartbeatIntervalBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder setHeartbeatInterval(
+          com.google.protobuf.Duration.Builder builderForValue) {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatInterval_ = builderForValue.build();
+          onChanged();
+        } else {
+          heartbeatIntervalBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) {
+        if (heartbeatIntervalBuilder_ == null) {
+          if (heartbeatInterval_ != null) {
+            heartbeatInterval_ =
+              com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial();
+          } else {
+            heartbeatInterval_ = value;
+          }
+          onChanged();
+        } else {
+          heartbeatIntervalBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder clearHeartbeatInterval() {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatInterval_ = null;
+          onChanged();
+        } else {
+          heartbeatInterval_ = null;
+          heartbeatIntervalBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() {
+        
+        onChanged();
+        return getHeartbeatIntervalFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
+        if (heartbeatIntervalBuilder_ != null) {
+          return heartbeatIntervalBuilder_.getMessageOrBuilder();
+        } else {
+          return heartbeatInterval_ == null ?
+              com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+        }
+      }
+      /**
+       * 
+       * Requested reservation extension heartbeat interval
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
+          getHeartbeatIntervalFieldBuilder() {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
+                  getHeartbeatInterval(),
+                  getParentForChildren(),
+                  isClean());
+          heartbeatInterval_ = null;
+        }
+        return heartbeatIntervalBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -15865,48 +16065,48 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:datacatalog.ReservationID)
+      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationRequest)
     }
 
-    // @@protoc_insertion_point(class_scope:datacatalog.ReservationID)
-    private static final datacatalog.Datacatalog.ReservationID DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationRequest)
+    private static final datacatalog.Datacatalog.GetOrExtendReservationRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReservationID();
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationRequest();
     }
 
-    public static datacatalog.Datacatalog.ReservationID getDefaultInstance() {
+    public static datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public ReservationID parsePartialFrom(
+      public GetOrExtendReservationRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReservationID(input, extensionRegistry);
+        return new GetOrExtendReservationRequest(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.ReservationID getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface GetOrExtendReservationRequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationRequest)
+  public interface ReservationOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.Reservation)
       com.google.protobuf.MessageOrBuilder {
 
     /**
@@ -15954,7 +16154,7 @@ public interface GetOrExtendReservationRequestOrBuilder extends
 
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Recommended heartbeat interval to extend reservation
      * 

      *
      * .google.protobuf.Duration heartbeat_interval = 3;
@@ -15962,7 +16162,7 @@ public interface GetOrExtendReservationRequestOrBuilder extends
     boolean hasHeartbeatInterval();
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Recommended heartbeat interval to extend reservation
      * 

      *
      * .google.protobuf.Duration heartbeat_interval = 3;
@@ -15970,30 +16170,80 @@ public interface GetOrExtendReservationRequestOrBuilder extends
     com.google.protobuf.Duration getHeartbeatInterval();
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Recommended heartbeat interval to extend reservation
      * 

      *
      * .google.protobuf.Duration heartbeat_interval = 3;
      */
     com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder();
-  }
-  /**
-   * 
-   * Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance.
+
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    boolean hasExpiresAt();
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    com.google.protobuf.Timestamp getExpiresAt();
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder();
+
+    /**
+     * 
+     * Free-form metadata associated with the artifact
+     * 

+     *
+     * .datacatalog.Metadata metadata = 6;
+     */
+    boolean hasMetadata();
+    /**
+     * 
+     * Free-form metadata associated with the artifact
+     * 

+     *
+     * .datacatalog.Metadata metadata = 6;
+     */
+    datacatalog.Datacatalog.Metadata getMetadata();
+    /**
+     * 
+     * Free-form metadata associated with the artifact
+     * 

+     *
+     * .datacatalog.Metadata metadata = 6;
+     */
+    datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder();
+  }
+  /**
+   * 
+   * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
    * 

    *
-   * Protobuf type {@code datacatalog.GetOrExtendReservationRequest}
+   * Protobuf type {@code datacatalog.Reservation}
    */
-  public  static final class GetOrExtendReservationRequest extends
+  public  static final class Reservation extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationRequest)
-      GetOrExtendReservationRequestOrBuilder {
+      // @@protoc_insertion_point(message_implements:datacatalog.Reservation)
+      ReservationOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use GetOrExtendReservationRequest.newBuilder() to construct.
-    private GetOrExtendReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    // Use Reservation.newBuilder() to construct.
+    private Reservation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private GetOrExtendReservationRequest() {
+    private Reservation() {
       ownerId_ = "";
     }
 
@@ -16002,7 +16252,7 @@ private GetOrExtendReservationRequest() {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private GetOrExtendReservationRequest(
+    private Reservation(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -16053,6 +16303,32 @@ private GetOrExtendReservationRequest(
 
               break;
             }
+            case 34: {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (expiresAt_ != null) {
+                subBuilder = expiresAt_.toBuilder();
+              }
+              expiresAt_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(expiresAt_);
+                expiresAt_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 50: {
+              datacatalog.Datacatalog.Metadata.Builder subBuilder = null;
+              if (metadata_ != null) {
+                subBuilder = metadata_.toBuilder();
+              }
+              metadata_ = input.readMessage(datacatalog.Datacatalog.Metadata.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(metadata_);
+                metadata_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -16074,15 +16350,15 @@ private GetOrExtendReservationRequest(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
+      return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable
+      return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class);
+              datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class);
     }
 
     public static final int RESERVATION_ID_FIELD_NUMBER = 1;
@@ -16164,7 +16440,7 @@ public java.lang.String getOwnerId() {
     private com.google.protobuf.Duration heartbeatInterval_;
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Recommended heartbeat interval to extend reservation
      * 

      *
      * .google.protobuf.Duration heartbeat_interval = 3;
@@ -16174,7 +16450,7 @@ public boolean hasHeartbeatInterval() {
     }
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Recommended heartbeat interval to extend reservation
      * 

      *
      * .google.protobuf.Duration heartbeat_interval = 3;
@@ -16184,7 +16460,7 @@ public com.google.protobuf.Duration getHeartbeatInterval() {
     }
     /**
      * 
-     * Requested reservation extension heartbeat interval
+     * Recommended heartbeat interval to extend reservation
      * 

      *
      * .google.protobuf.Duration heartbeat_interval = 3;
@@ -16193,6 +16469,72 @@ public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
       return getHeartbeatInterval();
     }
 
+    public static final int EXPIRES_AT_FIELD_NUMBER = 4;
+    private com.google.protobuf.Timestamp expiresAt_;
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    public boolean hasExpiresAt() {
+      return expiresAt_ != null;
+    }
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    public com.google.protobuf.Timestamp getExpiresAt() {
+      return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
+    }
+    /**
+     * 
+     * Expiration timestamp of this reservation
+     * 

+     *
+     * .google.protobuf.Timestamp expires_at = 4;
+     */
+    public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
+      return getExpiresAt();
+    }
+
+    public static final int METADATA_FIELD_NUMBER = 6;
+    private datacatalog.Datacatalog.Metadata metadata_;
+    /**
+     * 
+     * Free-form metadata associated with the artifact
+     * 

+     *
+     * .datacatalog.Metadata metadata = 6;
+     */
+    public boolean hasMetadata() {
+      return metadata_ != null;
+    }
+    /**
+     * 
+     * Free-form metadata associated with the artifact
+     * 

+     *
+     * .datacatalog.Metadata metadata = 6;
+     */
+    public datacatalog.Datacatalog.Metadata getMetadata() {
+      return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
+    }
+    /**
+     * 
+     * Free-form metadata associated with the artifact
+     * 

+     *
+     * .datacatalog.Metadata metadata = 6;
+     */
+    public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
+      return getMetadata();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -16216,6 +16558,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (heartbeatInterval_ != null) {
         output.writeMessage(3, getHeartbeatInterval());
       }
+      if (expiresAt_ != null) {
+        output.writeMessage(4, getExpiresAt());
+      }
+      if (metadata_ != null) {
+        output.writeMessage(6, getMetadata());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -16236,6 +16584,14 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getHeartbeatInterval());
       }
+      if (expiresAt_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getExpiresAt());
+      }
+      if (metadata_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, getMetadata());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -16246,10 +16602,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest)) {
+      if (!(obj instanceof datacatalog.Datacatalog.Reservation)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.GetOrExtendReservationRequest other = (datacatalog.Datacatalog.GetOrExtendReservationRequest) obj;
+      datacatalog.Datacatalog.Reservation other = (datacatalog.Datacatalog.Reservation) obj;
 
       if (hasReservationId() != other.hasReservationId()) return false;
       if (hasReservationId()) {
@@ -16263,6 +16619,16 @@ public boolean equals(final java.lang.Object obj) {
         if (!getHeartbeatInterval()
             .equals(other.getHeartbeatInterval())) return false;
       }
+      if (hasExpiresAt() != other.hasExpiresAt()) return false;
+      if (hasExpiresAt()) {
+        if (!getExpiresAt()
+            .equals(other.getExpiresAt())) return false;
+      }
+      if (hasMetadata() != other.hasMetadata()) return false;
+      if (hasMetadata()) {
+        if (!getMetadata()
+            .equals(other.getMetadata())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -16284,74 +16650,82 @@ public int hashCode() {
         hash = (37 * hash) + HEARTBEAT_INTERVAL_FIELD_NUMBER;
         hash = (53 * hash) + getHeartbeatInterval().hashCode();
       }
+      if (hasExpiresAt()) {
+        hash = (37 * hash) + EXPIRES_AT_FIELD_NUMBER;
+        hash = (53 * hash) + getExpiresAt().hashCode();
+      }
+      if (hasMetadata()) {
+        hash = (37 * hash) + METADATA_FIELD_NUMBER;
+        hash = (53 * hash) + getMetadata().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.Reservation parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.Reservation parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseDelimitedFrom(
+    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.Reservation parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -16364,7 +16738,7 @@ public static datacatalog.Datacatalog.GetOrExtendReservationRequest parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationRequest prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.Reservation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -16381,29 +16755,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Try to acquire or extend an artifact reservation. If an active reservation exists, retrieve that instance.
+     * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
      * 

      *
-     * Protobuf type {@code datacatalog.GetOrExtendReservationRequest}
+     * Protobuf type {@code datacatalog.Reservation}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationRequest)
-        datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.Reservation)
+        datacatalog.Datacatalog.ReservationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.GetOrExtendReservationRequest.class, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder.class);
+                datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.GetOrExtendReservationRequest.newBuilder()
+      // Construct using datacatalog.Datacatalog.Reservation.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -16435,23 +16809,35 @@ public Builder clear() {
           heartbeatInterval_ = null;
           heartbeatIntervalBuilder_ = null;
         }
-        return this;
-      }
-
+        if (expiresAtBuilder_ == null) {
+          expiresAt_ = null;
+        } else {
+          expiresAt_ = null;
+          expiresAtBuilder_ = null;
+        }
+        if (metadataBuilder_ == null) {
+          metadata_ = null;
+        } else {
+          metadata_ = null;
+          metadataBuilder_ = null;
+        }
+        return this;
+      }
+
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance();
+      public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.Reservation.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest build() {
-        datacatalog.Datacatalog.GetOrExtendReservationRequest result = buildPartial();
+      public datacatalog.Datacatalog.Reservation build() {
+        datacatalog.Datacatalog.Reservation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -16459,8 +16845,8 @@ public datacatalog.Datacatalog.GetOrExtendReservationRequest build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest buildPartial() {
-        datacatalog.Datacatalog.GetOrExtendReservationRequest result = new datacatalog.Datacatalog.GetOrExtendReservationRequest(this);
+      public datacatalog.Datacatalog.Reservation buildPartial() {
+        datacatalog.Datacatalog.Reservation result = new datacatalog.Datacatalog.Reservation(this);
         if (reservationIdBuilder_ == null) {
           result.reservationId_ = reservationId_;
         } else {
@@ -16472,6 +16858,16 @@ public datacatalog.Datacatalog.GetOrExtendReservationRequest buildPartial() {
         } else {
           result.heartbeatInterval_ = heartbeatIntervalBuilder_.build();
         }
+        if (expiresAtBuilder_ == null) {
+          result.expiresAt_ = expiresAt_;
+        } else {
+          result.expiresAt_ = expiresAtBuilder_.build();
+        }
+        if (metadataBuilder_ == null) {
+          result.metadata_ = metadata_;
+        } else {
+          result.metadata_ = metadataBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -16510,16 +16906,16 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationRequest) {
-          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationRequest)other);
+        if (other instanceof datacatalog.Datacatalog.Reservation) {
+          return mergeFrom((datacatalog.Datacatalog.Reservation)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationRequest other) {
-        if (other == datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(datacatalog.Datacatalog.Reservation other) {
+        if (other == datacatalog.Datacatalog.Reservation.getDefaultInstance()) return this;
         if (other.hasReservationId()) {
           mergeReservationId(other.getReservationId());
         }
@@ -16530,6 +16926,12 @@ public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationRequest o
         if (other.hasHeartbeatInterval()) {
           mergeHeartbeatInterval(other.getHeartbeatInterval());
         }
+        if (other.hasExpiresAt()) {
+          mergeExpiresAt(other.getExpiresAt());
+        }
+        if (other.hasMetadata()) {
+          mergeMetadata(other.getMetadata());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -16545,11 +16947,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        datacatalog.Datacatalog.GetOrExtendReservationRequest parsedMessage = null;
+        datacatalog.Datacatalog.Reservation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationRequest) e.getUnfinishedMessage();
+          parsedMessage = (datacatalog.Datacatalog.Reservation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -16703,4340 +17105,561 @@ public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder(
           getReservationIdFieldBuilder() {
         if (reservationIdBuilder_ == null) {
           reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
-                  getReservationId(),
-                  getParentForChildren(),
-                  isClean());
-          reservationId_ = null;
-        }
-        return reservationIdBuilder_;
-      }
-
-      private java.lang.Object ownerId_ = "";
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public java.lang.String getOwnerId() {
-        java.lang.Object ref = ownerId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          ownerId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public com.google.protobuf.ByteString
-          getOwnerIdBytes() {
-        java.lang.Object ref = ownerId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          ownerId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        ownerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder clearOwnerId() {
-        
-        ownerId_ = getDefaultInstance().getOwnerId();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        ownerId_ = value;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Duration heartbeatInterval_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_;
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public boolean hasHeartbeatInterval() {
-        return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null;
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration getHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-        } else {
-          return heartbeatIntervalBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          heartbeatInterval_ = value;
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(
-          com.google.protobuf.Duration.Builder builderForValue) {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = builderForValue.build();
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (heartbeatInterval_ != null) {
-            heartbeatInterval_ =
-              com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial();
-          } else {
-            heartbeatInterval_ = value;
-          }
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder clearHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = null;
-          onChanged();
-        } else {
-          heartbeatInterval_ = null;
-          heartbeatIntervalBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() {
-        
-        onChanged();
-        return getHeartbeatIntervalFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
-        if (heartbeatIntervalBuilder_ != null) {
-          return heartbeatIntervalBuilder_.getMessageOrBuilder();
-        } else {
-          return heartbeatInterval_ == null ?
-              com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-        }
-      }
-      /**
-       * 
-       * Requested reservation extension heartbeat interval
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
-          getHeartbeatIntervalFieldBuilder() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
-                  getHeartbeatInterval(),
-                  getParentForChildren(),
-                  isClean());
-          heartbeatInterval_ = null;
-        }
-        return heartbeatIntervalBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationRequest)
-    }
-
-    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationRequest)
-    private static final datacatalog.Datacatalog.GetOrExtendReservationRequest DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationRequest();
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public GetOrExtendReservationRequest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOrExtendReservationRequest(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public datacatalog.Datacatalog.GetOrExtendReservationRequest getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface GetOrExtendReservationsRequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationsRequest)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    java.util.List 
-        getReservationsList();
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    datacatalog.Datacatalog.GetOrExtendReservationRequest getReservations(int index);
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    int getReservationsCount();
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    java.util.List 
-        getReservationsOrBuilderList();
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder getReservationsOrBuilder(
-        int index);
-  }
-  /**
-   * 
-   * Request message for acquiring or extending reservations for multiple artifacts in a single operation.
-   * 

-   *
-   * Protobuf type {@code datacatalog.GetOrExtendReservationsRequest}
-   */
-  public  static final class GetOrExtendReservationsRequest extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationsRequest)
-      GetOrExtendReservationsRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use GetOrExtendReservationsRequest.newBuilder() to construct.
-    private GetOrExtendReservationsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private GetOrExtendReservationsRequest() {
-      reservations_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GetOrExtendReservationsRequest(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                reservations_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              reservations_.add(
-                  input.readMessage(datacatalog.Datacatalog.GetOrExtendReservationRequest.parser(), extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          reservations_ = java.util.Collections.unmodifiableList(reservations_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.GetOrExtendReservationsRequest.class, datacatalog.Datacatalog.GetOrExtendReservationsRequest.Builder.class);
-    }
-
-    public static final int RESERVATIONS_FIELD_NUMBER = 1;
-    private java.util.List reservations_;
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    public java.util.List getReservationsList() {
-      return reservations_;
-    }
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    public java.util.List 
-        getReservationsOrBuilderList() {
-      return reservations_;
-    }
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    public int getReservationsCount() {
-      return reservations_.size();
-    }
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    public datacatalog.Datacatalog.GetOrExtendReservationRequest getReservations(int index) {
-      return reservations_.get(index);
-    }
-    /**
-     * 
-     * List of reservation requests for artifacts to acquire
-     * 

-     *
-     * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-     */
-    public datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder getReservationsOrBuilder(
-        int index) {
-      return reservations_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < reservations_.size(); i++) {
-        output.writeMessage(1, reservations_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < reservations_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, reservations_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationsRequest)) {
-        return super.equals(obj);
-      }
-      datacatalog.Datacatalog.GetOrExtendReservationsRequest other = (datacatalog.Datacatalog.GetOrExtendReservationsRequest) obj;
-
-      if (!getReservationsList()
-          .equals(other.getReservationsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getReservationsCount() > 0) {
-        hash = (37 * hash) + RESERVATIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationsList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationsRequest prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Request message for acquiring or extending reservations for multiple artifacts in a single operation.
-     * 

-     *
-     * Protobuf type {@code datacatalog.GetOrExtendReservationsRequest}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationsRequest)
-        datacatalog.Datacatalog.GetOrExtendReservationsRequestOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.GetOrExtendReservationsRequest.class, datacatalog.Datacatalog.GetOrExtendReservationsRequest.Builder.class);
-      }
-
-      // Construct using datacatalog.Datacatalog.GetOrExtendReservationsRequest.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getReservationsFieldBuilder();
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (reservationsBuilder_ == null) {
-          reservations_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          reservationsBuilder_.clear();
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationsRequest getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.GetOrExtendReservationsRequest.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationsRequest build() {
-        datacatalog.Datacatalog.GetOrExtendReservationsRequest result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationsRequest buildPartial() {
-        datacatalog.Datacatalog.GetOrExtendReservationsRequest result = new datacatalog.Datacatalog.GetOrExtendReservationsRequest(this);
-        int from_bitField0_ = bitField0_;
-        if (reservationsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            reservations_ = java.util.Collections.unmodifiableList(reservations_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.reservations_ = reservations_;
-        } else {
-          result.reservations_ = reservationsBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationsRequest) {
-          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationsRequest)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationsRequest other) {
-        if (other == datacatalog.Datacatalog.GetOrExtendReservationsRequest.getDefaultInstance()) return this;
-        if (reservationsBuilder_ == null) {
-          if (!other.reservations_.isEmpty()) {
-            if (reservations_.isEmpty()) {
-              reservations_ = other.reservations_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureReservationsIsMutable();
-              reservations_.addAll(other.reservations_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.reservations_.isEmpty()) {
-            if (reservationsBuilder_.isEmpty()) {
-              reservationsBuilder_.dispose();
-              reservationsBuilder_ = null;
-              reservations_ = other.reservations_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              reservationsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getReservationsFieldBuilder() : null;
-            } else {
-              reservationsBuilder_.addAllMessages(other.reservations_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        datacatalog.Datacatalog.GetOrExtendReservationsRequest parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationsRequest) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List reservations_ =
-        java.util.Collections.emptyList();
-      private void ensureReservationsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          reservations_ = new java.util.ArrayList(reservations_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.GetOrExtendReservationRequest, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder, datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder> reservationsBuilder_;
-
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public java.util.List getReservationsList() {
-        if (reservationsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(reservations_);
-        } else {
-          return reservationsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public int getReservationsCount() {
-        if (reservationsBuilder_ == null) {
-          return reservations_.size();
-        } else {
-          return reservationsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest getReservations(int index) {
-        if (reservationsBuilder_ == null) {
-          return reservations_.get(index);
-        } else {
-          return reservationsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder setReservations(
-          int index, datacatalog.Datacatalog.GetOrExtendReservationRequest value) {
-        if (reservationsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureReservationsIsMutable();
-          reservations_.set(index, value);
-          onChanged();
-        } else {
-          reservationsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder setReservations(
-          int index, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          reservationsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder addReservations(datacatalog.Datacatalog.GetOrExtendReservationRequest value) {
-        if (reservationsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureReservationsIsMutable();
-          reservations_.add(value);
-          onChanged();
-        } else {
-          reservationsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder addReservations(
-          int index, datacatalog.Datacatalog.GetOrExtendReservationRequest value) {
-        if (reservationsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureReservationsIsMutable();
-          reservations_.add(index, value);
-          onChanged();
-        } else {
-          reservationsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder addReservations(
-          datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.add(builderForValue.build());
-          onChanged();
-        } else {
-          reservationsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder addReservations(
-          int index, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          reservationsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder addAllReservations(
-          java.lang.Iterable values) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, reservations_);
-          onChanged();
-        } else {
-          reservationsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder clearReservations() {
-        if (reservationsBuilder_ == null) {
-          reservations_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          reservationsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public Builder removeReservations(int index) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.remove(index);
-          onChanged();
-        } else {
-          reservationsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder getReservationsBuilder(
-          int index) {
-        return getReservationsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder getReservationsOrBuilder(
-          int index) {
-        if (reservationsBuilder_ == null) {
-          return reservations_.get(index);  } else {
-          return reservationsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public java.util.List 
-           getReservationsOrBuilderList() {
-        if (reservationsBuilder_ != null) {
-          return reservationsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(reservations_);
-        }
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder addReservationsBuilder() {
-        return getReservationsFieldBuilder().addBuilder(
-            datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance());
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder addReservationsBuilder(
-          int index) {
-        return getReservationsFieldBuilder().addBuilder(
-            index, datacatalog.Datacatalog.GetOrExtendReservationRequest.getDefaultInstance());
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to acquire
-       * 

-       *
-       * repeated .datacatalog.GetOrExtendReservationRequest reservations = 1;
-       */
-      public java.util.List 
-           getReservationsBuilderList() {
-        return getReservationsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.GetOrExtendReservationRequest, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder, datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder> 
-          getReservationsFieldBuilder() {
-        if (reservationsBuilder_ == null) {
-          reservationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              datacatalog.Datacatalog.GetOrExtendReservationRequest, datacatalog.Datacatalog.GetOrExtendReservationRequest.Builder, datacatalog.Datacatalog.GetOrExtendReservationRequestOrBuilder>(
-                  reservations_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          reservations_ = null;
-        }
-        return reservationsBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationsRequest)
-    }
-
-    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsRequest)
-    private static final datacatalog.Datacatalog.GetOrExtendReservationsRequest DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationsRequest();
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationsRequest getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public GetOrExtendReservationsRequest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOrExtendReservationsRequest(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public datacatalog.Datacatalog.GetOrExtendReservationsRequest getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface ReservationOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.Reservation)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    boolean hasReservationId();
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    datacatalog.Datacatalog.ReservationID getReservationId();
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
-
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    java.lang.String getOwnerId();
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    com.google.protobuf.ByteString
-        getOwnerIdBytes();
-
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    boolean hasHeartbeatInterval();
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    com.google.protobuf.Duration getHeartbeatInterval();
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder();
-
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    boolean hasExpiresAt();
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    com.google.protobuf.Timestamp getExpiresAt();
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder();
-
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    boolean hasMetadata();
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    datacatalog.Datacatalog.Metadata getMetadata();
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder();
-  }
-  /**
-   * 
-   * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
-   * 

-   *
-   * Protobuf type {@code datacatalog.Reservation}
-   */
-  public  static final class Reservation extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.Reservation)
-      ReservationOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Reservation.newBuilder() to construct.
-    private Reservation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Reservation() {
-      ownerId_ = "";
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Reservation(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
-              if (reservationId_ != null) {
-                subBuilder = reservationId_.toBuilder();
-              }
-              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(reservationId_);
-                reservationId_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              ownerId_ = s;
-              break;
-            }
-            case 26: {
-              com.google.protobuf.Duration.Builder subBuilder = null;
-              if (heartbeatInterval_ != null) {
-                subBuilder = heartbeatInterval_.toBuilder();
-              }
-              heartbeatInterval_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(heartbeatInterval_);
-                heartbeatInterval_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 34: {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (expiresAt_ != null) {
-                subBuilder = expiresAt_.toBuilder();
-              }
-              expiresAt_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(expiresAt_);
-                expiresAt_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 50: {
-              datacatalog.Datacatalog.Metadata.Builder subBuilder = null;
-              if (metadata_ != null) {
-                subBuilder = metadata_.toBuilder();
-              }
-              metadata_ = input.readMessage(datacatalog.Datacatalog.Metadata.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(metadata_);
-                metadata_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class);
-    }
-
-    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.ReservationID reservationId_;
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public boolean hasReservationId() {
-      return reservationId_ != null;
-    }
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public datacatalog.Datacatalog.ReservationID getReservationId() {
-      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
-    }
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-      return getReservationId();
-    }
-
-    public static final int OWNER_ID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object ownerId_;
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    public java.lang.String getOwnerId() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        ownerId_ = s;
-        return s;
-      }
-    }
-    /**
-     * 
-     * The unique ID of the owner for the reservation
-     * 

-     *
-     * string owner_id = 2;
-     */
-    public com.google.protobuf.ByteString
-        getOwnerIdBytes() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        ownerId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int HEARTBEAT_INTERVAL_FIELD_NUMBER = 3;
-    private com.google.protobuf.Duration heartbeatInterval_;
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public boolean hasHeartbeatInterval() {
-      return heartbeatInterval_ != null;
-    }
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public com.google.protobuf.Duration getHeartbeatInterval() {
-      return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-    }
-    /**
-     * 
-     * Recommended heartbeat interval to extend reservation
-     * 

-     *
-     * .google.protobuf.Duration heartbeat_interval = 3;
-     */
-    public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
-      return getHeartbeatInterval();
-    }
-
-    public static final int EXPIRES_AT_FIELD_NUMBER = 4;
-    private com.google.protobuf.Timestamp expiresAt_;
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    public boolean hasExpiresAt() {
-      return expiresAt_ != null;
-    }
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    public com.google.protobuf.Timestamp getExpiresAt() {
-      return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
-    }
-    /**
-     * 
-     * Expiration timestamp of this reservation
-     * 

-     *
-     * .google.protobuf.Timestamp expires_at = 4;
-     */
-    public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
-      return getExpiresAt();
-    }
-
-    public static final int METADATA_FIELD_NUMBER = 6;
-    private datacatalog.Datacatalog.Metadata metadata_;
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    public boolean hasMetadata() {
-      return metadata_ != null;
-    }
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    public datacatalog.Datacatalog.Metadata getMetadata() {
-      return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
-    }
-    /**
-     * 
-     * Free-form metadata associated with the artifact
-     * 

-     *
-     * .datacatalog.Metadata metadata = 6;
-     */
-    public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
-      return getMetadata();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (reservationId_ != null) {
-        output.writeMessage(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
-      }
-      if (heartbeatInterval_ != null) {
-        output.writeMessage(3, getHeartbeatInterval());
-      }
-      if (expiresAt_ != null) {
-        output.writeMessage(4, getExpiresAt());
-      }
-      if (metadata_ != null) {
-        output.writeMessage(6, getMetadata());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (reservationId_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
-      }
-      if (heartbeatInterval_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getHeartbeatInterval());
-      }
-      if (expiresAt_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getExpiresAt());
-      }
-      if (metadata_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getMetadata());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof datacatalog.Datacatalog.Reservation)) {
-        return super.equals(obj);
-      }
-      datacatalog.Datacatalog.Reservation other = (datacatalog.Datacatalog.Reservation) obj;
-
-      if (hasReservationId() != other.hasReservationId()) return false;
-      if (hasReservationId()) {
-        if (!getReservationId()
-            .equals(other.getReservationId())) return false;
-      }
-      if (!getOwnerId()
-          .equals(other.getOwnerId())) return false;
-      if (hasHeartbeatInterval() != other.hasHeartbeatInterval()) return false;
-      if (hasHeartbeatInterval()) {
-        if (!getHeartbeatInterval()
-            .equals(other.getHeartbeatInterval())) return false;
-      }
-      if (hasExpiresAt() != other.hasExpiresAt()) return false;
-      if (hasExpiresAt()) {
-        if (!getExpiresAt()
-            .equals(other.getExpiresAt())) return false;
-      }
-      if (hasMetadata() != other.hasMetadata()) return false;
-      if (hasMetadata()) {
-        if (!getMetadata()
-            .equals(other.getMetadata())) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasReservationId()) {
-        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationId().hashCode();
-      }
-      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerId().hashCode();
-      if (hasHeartbeatInterval()) {
-        hash = (37 * hash) + HEARTBEAT_INTERVAL_FIELD_NUMBER;
-        hash = (53 * hash) + getHeartbeatInterval().hashCode();
-      }
-      if (hasExpiresAt()) {
-        hash = (37 * hash) + EXPIRES_AT_FIELD_NUMBER;
-        hash = (53 * hash) + getExpiresAt().hashCode();
-      }
-      if (hasMetadata()) {
-        hash = (37 * hash) + METADATA_FIELD_NUMBER;
-        hash = (53 * hash) + getMetadata().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.Reservation parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.Reservation parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(datacatalog.Datacatalog.Reservation prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
-     * 

-     *
-     * Protobuf type {@code datacatalog.Reservation}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.Reservation)
-        datacatalog.Datacatalog.ReservationOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.Reservation.class, datacatalog.Datacatalog.Reservation.Builder.class);
-      }
-
-      // Construct using datacatalog.Datacatalog.Reservation.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
-        } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
-        }
-        ownerId_ = "";
-
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = null;
-        } else {
-          heartbeatInterval_ = null;
-          heartbeatIntervalBuilder_ = null;
-        }
-        if (expiresAtBuilder_ == null) {
-          expiresAt_ = null;
-        } else {
-          expiresAt_ = null;
-          expiresAtBuilder_ = null;
-        }
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-        } else {
-          metadata_ = null;
-          metadataBuilder_ = null;
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_Reservation_descriptor;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.Reservation.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.Reservation build() {
-        datacatalog.Datacatalog.Reservation result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.Reservation buildPartial() {
-        datacatalog.Datacatalog.Reservation result = new datacatalog.Datacatalog.Reservation(this);
-        if (reservationIdBuilder_ == null) {
-          result.reservationId_ = reservationId_;
-        } else {
-          result.reservationId_ = reservationIdBuilder_.build();
-        }
-        result.ownerId_ = ownerId_;
-        if (heartbeatIntervalBuilder_ == null) {
-          result.heartbeatInterval_ = heartbeatInterval_;
-        } else {
-          result.heartbeatInterval_ = heartbeatIntervalBuilder_.build();
-        }
-        if (expiresAtBuilder_ == null) {
-          result.expiresAt_ = expiresAt_;
-        } else {
-          result.expiresAt_ = expiresAtBuilder_.build();
-        }
-        if (metadataBuilder_ == null) {
-          result.metadata_ = metadata_;
-        } else {
-          result.metadata_ = metadataBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.Reservation) {
-          return mergeFrom((datacatalog.Datacatalog.Reservation)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(datacatalog.Datacatalog.Reservation other) {
-        if (other == datacatalog.Datacatalog.Reservation.getDefaultInstance()) return this;
-        if (other.hasReservationId()) {
-          mergeReservationId(other.getReservationId());
-        }
-        if (!other.getOwnerId().isEmpty()) {
-          ownerId_ = other.ownerId_;
-          onChanged();
-        }
-        if (other.hasHeartbeatInterval()) {
-          mergeHeartbeatInterval(other.getHeartbeatInterval());
-        }
-        if (other.hasExpiresAt()) {
-          mergeExpiresAt(other.getExpiresAt());
-        }
-        if (other.hasMetadata()) {
-          mergeMetadata(other.getMetadata());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        datacatalog.Datacatalog.Reservation parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.Reservation) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private datacatalog.Datacatalog.ReservationID reservationId_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public boolean hasReservationId() {
-        return reservationIdBuilder_ != null || reservationId_ != null;
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public datacatalog.Datacatalog.ReservationID getReservationId() {
-        if (reservationIdBuilder_ == null) {
-          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
-        } else {
-          return reservationIdBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          reservationId_ = value;
-          onChanged();
-        } else {
-          reservationIdBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder setReservationId(
-          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = builderForValue.build();
-          onChanged();
-        } else {
-          reservationIdBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
-          if (reservationId_ != null) {
-            reservationId_ =
-              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
-          } else {
-            reservationId_ = value;
-          }
-          onChanged();
-        } else {
-          reservationIdBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public Builder clearReservationId() {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
-          onChanged();
-        } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
-        
-        onChanged();
-        return getReservationIdFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-        if (reservationIdBuilder_ != null) {
-          return reservationIdBuilder_.getMessageOrBuilder();
-        } else {
-          return reservationId_ == null ?
-              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
-        }
-      }
-      /**
-       * 
-       * The unique ID for the reservation
-       * 

-       *
-       * .datacatalog.ReservationID reservation_id = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
-          getReservationIdFieldBuilder() {
-        if (reservationIdBuilder_ == null) {
-          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
-                  getReservationId(),
-                  getParentForChildren(),
-                  isClean());
-          reservationId_ = null;
-        }
-        return reservationIdBuilder_;
-      }
-
-      private java.lang.Object ownerId_ = "";
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public java.lang.String getOwnerId() {
-        java.lang.Object ref = ownerId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          ownerId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public com.google.protobuf.ByteString
-          getOwnerIdBytes() {
-        java.lang.Object ref = ownerId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          ownerId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        ownerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder clearOwnerId() {
-        
-        ownerId_ = getDefaultInstance().getOwnerId();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        ownerId_ = value;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Duration heartbeatInterval_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_;
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public boolean hasHeartbeatInterval() {
-        return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null;
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration getHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-        } else {
-          return heartbeatIntervalBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          heartbeatInterval_ = value;
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder setHeartbeatInterval(
-          com.google.protobuf.Duration.Builder builderForValue) {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = builderForValue.build();
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) {
-        if (heartbeatIntervalBuilder_ == null) {
-          if (heartbeatInterval_ != null) {
-            heartbeatInterval_ =
-              com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial();
-          } else {
-            heartbeatInterval_ = value;
-          }
-          onChanged();
-        } else {
-          heartbeatIntervalBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public Builder clearHeartbeatInterval() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatInterval_ = null;
-          onChanged();
-        } else {
-          heartbeatInterval_ = null;
-          heartbeatIntervalBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() {
-        
-        onChanged();
-        return getHeartbeatIntervalFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
-        if (heartbeatIntervalBuilder_ != null) {
-          return heartbeatIntervalBuilder_.getMessageOrBuilder();
-        } else {
-          return heartbeatInterval_ == null ?
-              com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
-        }
-      }
-      /**
-       * 
-       * Recommended heartbeat interval to extend reservation
-       * 

-       *
-       * .google.protobuf.Duration heartbeat_interval = 3;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
-          getHeartbeatIntervalFieldBuilder() {
-        if (heartbeatIntervalBuilder_ == null) {
-          heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
-                  getHeartbeatInterval(),
-                  getParentForChildren(),
-                  isClean());
-          heartbeatInterval_ = null;
-        }
-        return heartbeatIntervalBuilder_;
-      }
-
-      private com.google.protobuf.Timestamp expiresAt_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> expiresAtBuilder_;
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public boolean hasExpiresAt() {
-        return expiresAtBuilder_ != null || expiresAt_ != null;
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public com.google.protobuf.Timestamp getExpiresAt() {
-        if (expiresAtBuilder_ == null) {
-          return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
-        } else {
-          return expiresAtBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public Builder setExpiresAt(com.google.protobuf.Timestamp value) {
-        if (expiresAtBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          expiresAt_ = value;
-          onChanged();
-        } else {
-          expiresAtBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public Builder setExpiresAt(
-          com.google.protobuf.Timestamp.Builder builderForValue) {
-        if (expiresAtBuilder_ == null) {
-          expiresAt_ = builderForValue.build();
-          onChanged();
-        } else {
-          expiresAtBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public Builder mergeExpiresAt(com.google.protobuf.Timestamp value) {
-        if (expiresAtBuilder_ == null) {
-          if (expiresAt_ != null) {
-            expiresAt_ =
-              com.google.protobuf.Timestamp.newBuilder(expiresAt_).mergeFrom(value).buildPartial();
-          } else {
-            expiresAt_ = value;
-          }
-          onChanged();
-        } else {
-          expiresAtBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public Builder clearExpiresAt() {
-        if (expiresAtBuilder_ == null) {
-          expiresAt_ = null;
-          onChanged();
-        } else {
-          expiresAt_ = null;
-          expiresAtBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public com.google.protobuf.Timestamp.Builder getExpiresAtBuilder() {
-        
-        onChanged();
-        return getExpiresAtFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
-        if (expiresAtBuilder_ != null) {
-          return expiresAtBuilder_.getMessageOrBuilder();
-        } else {
-          return expiresAt_ == null ?
-              com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
-        }
-      }
-      /**
-       * 
-       * Expiration timestamp of this reservation
-       * 

-       *
-       * .google.protobuf.Timestamp expires_at = 4;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-          getExpiresAtFieldBuilder() {
-        if (expiresAtBuilder_ == null) {
-          expiresAtBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
-                  getExpiresAt(),
-                  getParentForChildren(),
-                  isClean());
-          expiresAt_ = null;
-        }
-        return expiresAtBuilder_;
-      }
-
-      private datacatalog.Datacatalog.Metadata metadata_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> metadataBuilder_;
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public boolean hasMetadata() {
-        return metadataBuilder_ != null || metadata_ != null;
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public datacatalog.Datacatalog.Metadata getMetadata() {
-        if (metadataBuilder_ == null) {
-          return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
-        } else {
-          return metadataBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public Builder setMetadata(datacatalog.Datacatalog.Metadata value) {
-        if (metadataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          metadata_ = value;
-          onChanged();
-        } else {
-          metadataBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public Builder setMetadata(
-          datacatalog.Datacatalog.Metadata.Builder builderForValue) {
-        if (metadataBuilder_ == null) {
-          metadata_ = builderForValue.build();
-          onChanged();
-        } else {
-          metadataBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public Builder mergeMetadata(datacatalog.Datacatalog.Metadata value) {
-        if (metadataBuilder_ == null) {
-          if (metadata_ != null) {
-            metadata_ =
-              datacatalog.Datacatalog.Metadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
-          } else {
-            metadata_ = value;
-          }
-          onChanged();
-        } else {
-          metadataBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public Builder clearMetadata() {
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-          onChanged();
-        } else {
-          metadata_ = null;
-          metadataBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public datacatalog.Datacatalog.Metadata.Builder getMetadataBuilder() {
-        
-        onChanged();
-        return getMetadataFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
-        if (metadataBuilder_ != null) {
-          return metadataBuilder_.getMessageOrBuilder();
-        } else {
-          return metadata_ == null ?
-              datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
-        }
-      }
-      /**
-       * 
-       * Free-form metadata associated with the artifact
-       * 

-       *
-       * .datacatalog.Metadata metadata = 6;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> 
-          getMetadataFieldBuilder() {
-        if (metadataBuilder_ == null) {
-          metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder>(
-                  getMetadata(),
-                  getParentForChildren(),
-                  isClean());
-          metadata_ = null;
-        }
-        return metadataBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:datacatalog.Reservation)
-    }
-
-    // @@protoc_insertion_point(class_scope:datacatalog.Reservation)
-    private static final datacatalog.Datacatalog.Reservation DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.Reservation();
-    }
-
-    public static datacatalog.Datacatalog.Reservation getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public Reservation parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Reservation(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface GetOrExtendReservationResponseOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationResponse)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * The reservation to be acquired or extended
-     * 

-     *
-     * .datacatalog.Reservation reservation = 1;
-     */
-    boolean hasReservation();
-    /**
-     * 
-     * The reservation to be acquired or extended
-     * 

-     *
-     * .datacatalog.Reservation reservation = 1;
-     */
-    datacatalog.Datacatalog.Reservation getReservation();
-    /**
-     * 
-     * The reservation to be acquired or extended
-     * 

-     *
-     * .datacatalog.Reservation reservation = 1;
-     */
-    datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder();
-  }
-  /**
-   * 
-   * Response including either a newly minted reservation or the existing reservation
-   * 

-   *
-   * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
-   */
-  public  static final class GetOrExtendReservationResponse extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationResponse)
-      GetOrExtendReservationResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use GetOrExtendReservationResponse.newBuilder() to construct.
-    private GetOrExtendReservationResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private GetOrExtendReservationResponse() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GetOrExtendReservationResponse(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              datacatalog.Datacatalog.Reservation.Builder subBuilder = null;
-              if (reservation_ != null) {
-                subBuilder = reservation_.toBuilder();
-              }
-              reservation_ = input.readMessage(datacatalog.Datacatalog.Reservation.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(reservation_);
-                reservation_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
-    }
-
-    public static final int RESERVATION_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.Reservation reservation_;
-    /**
-     * 
-     * The reservation to be acquired or extended
-     * 

-     *
-     * .datacatalog.Reservation reservation = 1;
-     */
-    public boolean hasReservation() {
-      return reservation_ != null;
-    }
-    /**
-     * 
-     * The reservation to be acquired or extended
-     * 

-     *
-     * .datacatalog.Reservation reservation = 1;
-     */
-    public datacatalog.Datacatalog.Reservation getReservation() {
-      return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
-    }
-    /**
-     * 
-     * The reservation to be acquired or extended
-     * 

-     *
-     * .datacatalog.Reservation reservation = 1;
-     */
-    public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
-      return getReservation();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (reservation_ != null) {
-        output.writeMessage(1, getReservation());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (reservation_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getReservation());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse)) {
-        return super.equals(obj);
-      }
-      datacatalog.Datacatalog.GetOrExtendReservationResponse other = (datacatalog.Datacatalog.GetOrExtendReservationResponse) obj;
-
-      if (hasReservation() != other.hasReservation()) return false;
-      if (hasReservation()) {
-        if (!getReservation()
-            .equals(other.getReservation())) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasReservation()) {
-        hash = (37 * hash) + RESERVATION_FIELD_NUMBER;
-        hash = (53 * hash) + getReservation().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationResponse prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Response including either a newly minted reservation or the existing reservation
-     * 

-     *
-     * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationResponse)
-        datacatalog.Datacatalog.GetOrExtendReservationResponseOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
-      }
-
-      // Construct using datacatalog.Datacatalog.GetOrExtendReservationResponse.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (reservationBuilder_ == null) {
-          reservation_ = null;
-        } else {
-          reservation_ = null;
-          reservationBuilder_ = null;
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationResponse build() {
-        datacatalog.Datacatalog.GetOrExtendReservationResponse result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationResponse buildPartial() {
-        datacatalog.Datacatalog.GetOrExtendReservationResponse result = new datacatalog.Datacatalog.GetOrExtendReservationResponse(this);
-        if (reservationBuilder_ == null) {
-          result.reservation_ = reservation_;
-        } else {
-          result.reservation_ = reservationBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse) {
-          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationResponse)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationResponse other) {
-        if (other == datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance()) return this;
-        if (other.hasReservation()) {
-          mergeReservation(other.getReservation());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        datacatalog.Datacatalog.GetOrExtendReservationResponse parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationResponse) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private datacatalog.Datacatalog.Reservation reservation_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> reservationBuilder_;
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public boolean hasReservation() {
-        return reservationBuilder_ != null || reservation_ != null;
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public datacatalog.Datacatalog.Reservation getReservation() {
-        if (reservationBuilder_ == null) {
-          return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
-        } else {
-          return reservationBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public Builder setReservation(datacatalog.Datacatalog.Reservation value) {
-        if (reservationBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          reservation_ = value;
-          onChanged();
-        } else {
-          reservationBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public Builder setReservation(
-          datacatalog.Datacatalog.Reservation.Builder builderForValue) {
-        if (reservationBuilder_ == null) {
-          reservation_ = builderForValue.build();
-          onChanged();
-        } else {
-          reservationBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public Builder mergeReservation(datacatalog.Datacatalog.Reservation value) {
-        if (reservationBuilder_ == null) {
-          if (reservation_ != null) {
-            reservation_ =
-              datacatalog.Datacatalog.Reservation.newBuilder(reservation_).mergeFrom(value).buildPartial();
-          } else {
-            reservation_ = value;
-          }
-          onChanged();
-        } else {
-          reservationBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public Builder clearReservation() {
-        if (reservationBuilder_ == null) {
-          reservation_ = null;
-          onChanged();
-        } else {
-          reservation_ = null;
-          reservationBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public datacatalog.Datacatalog.Reservation.Builder getReservationBuilder() {
-        
-        onChanged();
-        return getReservationFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
-        if (reservationBuilder_ != null) {
-          return reservationBuilder_.getMessageOrBuilder();
-        } else {
-          return reservation_ == null ?
-              datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
-        }
-      }
-      /**
-       * 
-       * The reservation to be acquired or extended
-       * 

-       *
-       * .datacatalog.Reservation reservation = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> 
-          getReservationFieldBuilder() {
-        if (reservationBuilder_ == null) {
-          reservationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder>(
-                  getReservation(),
-                  getParentForChildren(),
-                  isClean());
-          reservation_ = null;
-        }
-        return reservationBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationResponse)
-    }
-
-    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationResponse)
-    private static final datacatalog.Datacatalog.GetOrExtendReservationResponse DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationResponse();
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public GetOrExtendReservationResponse parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOrExtendReservationResponse(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface GetOrExtendReservationsResponseOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationsResponse)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    java.util.List 
-        getReservationsList();
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    datacatalog.Datacatalog.Reservation getReservations(int index);
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    int getReservationsCount();
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    java.util.List 
-        getReservationsOrBuilderList();
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    datacatalog.Datacatalog.ReservationOrBuilder getReservationsOrBuilder(
-        int index);
-  }
-  /**
-   * 
-   * List of reservations acquired for multiple artifacts in a single operation.
-   * 

-   *
-   * Protobuf type {@code datacatalog.GetOrExtendReservationsResponse}
-   */
-  public  static final class GetOrExtendReservationsResponse extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationsResponse)
-      GetOrExtendReservationsResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use GetOrExtendReservationsResponse.newBuilder() to construct.
-    private GetOrExtendReservationsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private GetOrExtendReservationsResponse() {
-      reservations_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GetOrExtendReservationsResponse(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                reservations_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              reservations_.add(
-                  input.readMessage(datacatalog.Datacatalog.Reservation.parser(), extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          reservations_ = java.util.Collections.unmodifiableList(reservations_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.GetOrExtendReservationsResponse.class, datacatalog.Datacatalog.GetOrExtendReservationsResponse.Builder.class);
-    }
-
-    public static final int RESERVATIONS_FIELD_NUMBER = 1;
-    private java.util.List reservations_;
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    public java.util.List getReservationsList() {
-      return reservations_;
-    }
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    public java.util.List 
-        getReservationsOrBuilderList() {
-      return reservations_;
-    }
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    public int getReservationsCount() {
-      return reservations_.size();
-    }
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    public datacatalog.Datacatalog.Reservation getReservations(int index) {
-      return reservations_.get(index);
-    }
-    /**
-     * 
-     * List of (newly created or existing) reservations for artifacts requested
-     * 

-     *
-     * repeated .datacatalog.Reservation reservations = 1;
-     */
-    public datacatalog.Datacatalog.ReservationOrBuilder getReservationsOrBuilder(
-        int index) {
-      return reservations_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < reservations_.size(); i++) {
-        output.writeMessage(1, reservations_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < reservations_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, reservations_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationsResponse)) {
-        return super.equals(obj);
-      }
-      datacatalog.Datacatalog.GetOrExtendReservationsResponse other = (datacatalog.Datacatalog.GetOrExtendReservationsResponse) obj;
-
-      if (!getReservationsList()
-          .equals(other.getReservationsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getReservationsCount() > 0) {
-        hash = (37 * hash) + RESERVATIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationsList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationsResponse prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * List of reservations acquired for multiple artifacts in a single operation.
-     * 

-     *
-     * Protobuf type {@code datacatalog.GetOrExtendReservationsResponse}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationsResponse)
-        datacatalog.Datacatalog.GetOrExtendReservationsResponseOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.GetOrExtendReservationsResponse.class, datacatalog.Datacatalog.GetOrExtendReservationsResponse.Builder.class);
-      }
-
-      // Construct using datacatalog.Datacatalog.GetOrExtendReservationsResponse.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
+              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
+                  getReservationId(),
+                  getParentForChildren(),
+                  isClean());
+          reservationId_ = null;
+        }
+        return reservationIdBuilder_;
       }
 
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getReservationsFieldBuilder();
+      private java.lang.Object ownerId_ = "";
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public java.lang.String getOwnerId() {
+        java.lang.Object ref = ownerId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          ownerId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
         }
       }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (reservationsBuilder_ == null) {
-          reservations_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public com.google.protobuf.ByteString
+          getOwnerIdBytes() {
+        java.lang.Object ref = ownerId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          ownerId_ = b;
+          return b;
         } else {
-          reservationsBuilder_.clear();
+          return (com.google.protobuf.ByteString) ref;
         }
+      }
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder setOwnerId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        ownerId_ = value;
+        onChanged();
         return this;
       }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder clearOwnerId() {
+        
+        ownerId_ = getDefaultInstance().getOwnerId();
+        onChanged();
+        return this;
       }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationsResponse getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.GetOrExtendReservationsResponse.getDefaultInstance();
+      /**
+       * 
+       * The unique ID of the owner for the reservation
+       * 

+       *
+       * string owner_id = 2;
+       */
+      public Builder setOwnerIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        ownerId_ = value;
+        onChanged();
+        return this;
       }
 
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationsResponse build() {
-        datacatalog.Datacatalog.GetOrExtendReservationsResponse result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+      private com.google.protobuf.Duration heartbeatInterval_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> heartbeatIntervalBuilder_;
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public boolean hasHeartbeatInterval() {
+        return heartbeatIntervalBuilder_ != null || heartbeatInterval_ != null;
+      }
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.Duration getHeartbeatInterval() {
+        if (heartbeatIntervalBuilder_ == null) {
+          return heartbeatInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
+        } else {
+          return heartbeatIntervalBuilder_.getMessage();
         }
-        return result;
       }
-
-      @java.lang.Override
-      public datacatalog.Datacatalog.GetOrExtendReservationsResponse buildPartial() {
-        datacatalog.Datacatalog.GetOrExtendReservationsResponse result = new datacatalog.Datacatalog.GetOrExtendReservationsResponse(this);
-        int from_bitField0_ = bitField0_;
-        if (reservationsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            reservations_ = java.util.Collections.unmodifiableList(reservations_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder setHeartbeatInterval(com.google.protobuf.Duration value) {
+        if (heartbeatIntervalBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
-          result.reservations_ = reservations_;
+          heartbeatInterval_ = value;
+          onChanged();
         } else {
-          result.reservations_ = reservationsBuilder_.build();
+          heartbeatIntervalBuilder_.setMessage(value);
         }
-        onBuilt();
-        return result;
-      }
 
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
+        return this;
       }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationsResponse) {
-          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationsResponse)other);
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder setHeartbeatInterval(
+          com.google.protobuf.Duration.Builder builderForValue) {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatInterval_ = builderForValue.build();
+          onChanged();
         } else {
-          super.mergeFrom(other);
-          return this;
+          heartbeatIntervalBuilder_.setMessage(builderForValue.build());
         }
-      }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationsResponse other) {
-        if (other == datacatalog.Datacatalog.GetOrExtendReservationsResponse.getDefaultInstance()) return this;
-        if (reservationsBuilder_ == null) {
-          if (!other.reservations_.isEmpty()) {
-            if (reservations_.isEmpty()) {
-              reservations_ = other.reservations_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureReservationsIsMutable();
-              reservations_.addAll(other.reservations_);
-            }
-            onChanged();
+        return this;
+      }
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder mergeHeartbeatInterval(com.google.protobuf.Duration value) {
+        if (heartbeatIntervalBuilder_ == null) {
+          if (heartbeatInterval_ != null) {
+            heartbeatInterval_ =
+              com.google.protobuf.Duration.newBuilder(heartbeatInterval_).mergeFrom(value).buildPartial();
+          } else {
+            heartbeatInterval_ = value;
           }
+          onChanged();
         } else {
-          if (!other.reservations_.isEmpty()) {
-            if (reservationsBuilder_.isEmpty()) {
-              reservationsBuilder_.dispose();
-              reservationsBuilder_ = null;
-              reservations_ = other.reservations_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              reservationsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getReservationsFieldBuilder() : null;
-            } else {
-              reservationsBuilder_.addAllMessages(other.reservations_);
-            }
-          }
+          heartbeatIntervalBuilder_.mergeFrom(value);
         }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
 
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
+        return this;
       }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        datacatalog.Datacatalog.GetOrExtendReservationsResponse parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationsResponse) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public Builder clearHeartbeatInterval() {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatInterval_ = null;
+          onChanged();
+        } else {
+          heartbeatInterval_ = null;
+          heartbeatIntervalBuilder_ = null;
         }
+
         return this;
       }
-      private int bitField0_;
-
-      private java.util.List reservations_ =
-        java.util.Collections.emptyList();
-      private void ensureReservationsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          reservations_ = new java.util.ArrayList(reservations_);
-          bitField0_ |= 0x00000001;
-         }
+      /**
+       * 
+       * Recommended heartbeat interval to extend reservation
+       * 

+       *
+       * .google.protobuf.Duration heartbeat_interval = 3;
+       */
+      public com.google.protobuf.Duration.Builder getHeartbeatIntervalBuilder() {
+        
+        onChanged();
+        return getHeartbeatIntervalFieldBuilder().getBuilder();
       }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> reservationsBuilder_;
-
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Recommended heartbeat interval to extend reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Duration heartbeat_interval = 3;
        */
-      public java.util.List getReservationsList() {
-        if (reservationsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(reservations_);
+      public com.google.protobuf.DurationOrBuilder getHeartbeatIntervalOrBuilder() {
+        if (heartbeatIntervalBuilder_ != null) {
+          return heartbeatIntervalBuilder_.getMessageOrBuilder();
         } else {
-          return reservationsBuilder_.getMessageList();
+          return heartbeatInterval_ == null ?
+              com.google.protobuf.Duration.getDefaultInstance() : heartbeatInterval_;
         }
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Recommended heartbeat interval to extend reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Duration heartbeat_interval = 3;
        */
-      public int getReservationsCount() {
-        if (reservationsBuilder_ == null) {
-          return reservations_.size();
-        } else {
-          return reservationsBuilder_.getCount();
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
+          getHeartbeatIntervalFieldBuilder() {
+        if (heartbeatIntervalBuilder_ == null) {
+          heartbeatIntervalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
+                  getHeartbeatInterval(),
+                  getParentForChildren(),
+                  isClean());
+          heartbeatInterval_ = null;
         }
+        return heartbeatIntervalBuilder_;
+      }
+
+      private com.google.protobuf.Timestamp expiresAt_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> expiresAtBuilder_;
+      /**
+       * 
+       * Expiration timestamp of this reservation
+       * 

+       *
+       * .google.protobuf.Timestamp expires_at = 4;
+       */
+      public boolean hasExpiresAt() {
+        return expiresAtBuilder_ != null || expiresAt_ != null;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public datacatalog.Datacatalog.Reservation getReservations(int index) {
-        if (reservationsBuilder_ == null) {
-          return reservations_.get(index);
+      public com.google.protobuf.Timestamp getExpiresAt() {
+        if (expiresAtBuilder_ == null) {
+          return expiresAt_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
         } else {
-          return reservationsBuilder_.getMessage(index);
+          return expiresAtBuilder_.getMessage();
         }
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder setReservations(
-          int index, datacatalog.Datacatalog.Reservation value) {
-        if (reservationsBuilder_ == null) {
+      public Builder setExpiresAt(com.google.protobuf.Timestamp value) {
+        if (expiresAtBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureReservationsIsMutable();
-          reservations_.set(index, value);
+          expiresAt_ = value;
           onChanged();
         } else {
-          reservationsBuilder_.setMessage(index, value);
+          expiresAtBuilder_.setMessage(value);
         }
+
         return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder setReservations(
-          int index, datacatalog.Datacatalog.Reservation.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.set(index, builderForValue.build());
+      public Builder setExpiresAt(
+          com.google.protobuf.Timestamp.Builder builderForValue) {
+        if (expiresAtBuilder_ == null) {
+          expiresAt_ = builderForValue.build();
           onChanged();
         } else {
-          reservationsBuilder_.setMessage(index, builderForValue.build());
+          expiresAtBuilder_.setMessage(builderForValue.build());
         }
+
         return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder addReservations(datacatalog.Datacatalog.Reservation value) {
-        if (reservationsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+      public Builder mergeExpiresAt(com.google.protobuf.Timestamp value) {
+        if (expiresAtBuilder_ == null) {
+          if (expiresAt_ != null) {
+            expiresAt_ =
+              com.google.protobuf.Timestamp.newBuilder(expiresAt_).mergeFrom(value).buildPartial();
+          } else {
+            expiresAt_ = value;
           }
-          ensureReservationsIsMutable();
-          reservations_.add(value);
           onChanged();
         } else {
-          reservationsBuilder_.addMessage(value);
+          expiresAtBuilder_.mergeFrom(value);
         }
+
         return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder addReservations(
-          int index, datacatalog.Datacatalog.Reservation value) {
-        if (reservationsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureReservationsIsMutable();
-          reservations_.add(index, value);
+      public Builder clearExpiresAt() {
+        if (expiresAtBuilder_ == null) {
+          expiresAt_ = null;
           onChanged();
         } else {
-          reservationsBuilder_.addMessage(index, value);
+          expiresAt_ = null;
+          expiresAtBuilder_ = null;
         }
+
         return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder addReservations(
-          datacatalog.Datacatalog.Reservation.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.add(builderForValue.build());
-          onChanged();
-        } else {
-          reservationsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
+      public com.google.protobuf.Timestamp.Builder getExpiresAtBuilder() {
+        
+        onChanged();
+        return getExpiresAtFieldBuilder().getBuilder();
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder addReservations(
-          int index, datacatalog.Datacatalog.Reservation.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.add(index, builderForValue.build());
-          onChanged();
+      public com.google.protobuf.TimestampOrBuilder getExpiresAtOrBuilder() {
+        if (expiresAtBuilder_ != null) {
+          return expiresAtBuilder_.getMessageOrBuilder();
         } else {
-          reservationsBuilder_.addMessage(index, builderForValue.build());
+          return expiresAt_ == null ?
+              com.google.protobuf.Timestamp.getDefaultInstance() : expiresAt_;
         }
-        return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Expiration timestamp of this reservation
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .google.protobuf.Timestamp expires_at = 4;
        */
-      public Builder addAllReservations(
-          java.lang.Iterable values) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, reservations_);
-          onChanged();
-        } else {
-          reservationsBuilder_.addAllMessages(values);
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+          getExpiresAtFieldBuilder() {
+        if (expiresAtBuilder_ == null) {
+          expiresAtBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                  getExpiresAt(),
+                  getParentForChildren(),
+                  isClean());
+          expiresAt_ = null;
         }
-        return this;
+        return expiresAtBuilder_;
       }
+
+      private datacatalog.Datacatalog.Metadata metadata_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> metadataBuilder_;
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public Builder clearReservations() {
-        if (reservationsBuilder_ == null) {
-          reservations_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
+      public boolean hasMetadata() {
+        return metadataBuilder_ != null || metadata_ != null;
+      }
+      /**
+       * 
+       * Free-form metadata associated with the artifact
+       * 

+       *
+       * .datacatalog.Metadata metadata = 6;
+       */
+      public datacatalog.Datacatalog.Metadata getMetadata() {
+        if (metadataBuilder_ == null) {
+          return metadata_ == null ? datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
         } else {
-          reservationsBuilder_.clear();
+          return metadataBuilder_.getMessage();
         }
-        return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public Builder removeReservations(int index) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.remove(index);
+      public Builder setMetadata(datacatalog.Datacatalog.Metadata value) {
+        if (metadataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          metadata_ = value;
           onChanged();
         } else {
-          reservationsBuilder_.remove(index);
+          metadataBuilder_.setMessage(value);
         }
+
         return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public datacatalog.Datacatalog.Reservation.Builder getReservationsBuilder(
-          int index) {
-        return getReservationsFieldBuilder().getBuilder(index);
+      public Builder setMetadata(
+          datacatalog.Datacatalog.Metadata.Builder builderForValue) {
+        if (metadataBuilder_ == null) {
+          metadata_ = builderForValue.build();
+          onChanged();
+        } else {
+          metadataBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public datacatalog.Datacatalog.ReservationOrBuilder getReservationsOrBuilder(
-          int index) {
-        if (reservationsBuilder_ == null) {
-          return reservations_.get(index);  } else {
-          return reservationsBuilder_.getMessageOrBuilder(index);
+      public Builder mergeMetadata(datacatalog.Datacatalog.Metadata value) {
+        if (metadataBuilder_ == null) {
+          if (metadata_ != null) {
+            metadata_ =
+              datacatalog.Datacatalog.Metadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
+          } else {
+            metadata_ = value;
+          }
+          onChanged();
+        } else {
+          metadataBuilder_.mergeFrom(value);
         }
+
+        return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public java.util.List 
-           getReservationsOrBuilderList() {
-        if (reservationsBuilder_ != null) {
-          return reservationsBuilder_.getMessageOrBuilderList();
+      public Builder clearMetadata() {
+        if (metadataBuilder_ == null) {
+          metadata_ = null;
+          onChanged();
         } else {
-          return java.util.Collections.unmodifiableList(reservations_);
+          metadata_ = null;
+          metadataBuilder_ = null;
         }
+
+        return this;
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public datacatalog.Datacatalog.Reservation.Builder addReservationsBuilder() {
-        return getReservationsFieldBuilder().addBuilder(
-            datacatalog.Datacatalog.Reservation.getDefaultInstance());
+      public datacatalog.Datacatalog.Metadata.Builder getMetadataBuilder() {
+        
+        onChanged();
+        return getMetadataFieldBuilder().getBuilder();
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public datacatalog.Datacatalog.Reservation.Builder addReservationsBuilder(
-          int index) {
-        return getReservationsFieldBuilder().addBuilder(
-            index, datacatalog.Datacatalog.Reservation.getDefaultInstance());
+      public datacatalog.Datacatalog.MetadataOrBuilder getMetadataOrBuilder() {
+        if (metadataBuilder_ != null) {
+          return metadataBuilder_.getMessageOrBuilder();
+        } else {
+          return metadata_ == null ?
+              datacatalog.Datacatalog.Metadata.getDefaultInstance() : metadata_;
+        }
       }
       /**
        * 
-       * List of (newly created or existing) reservations for artifacts requested
+       * Free-form metadata associated with the artifact
        * 

        *
-       * repeated .datacatalog.Reservation reservations = 1;
+       * .datacatalog.Metadata metadata = 6;
        */
-      public java.util.List 
-           getReservationsBuilderList() {
-        return getReservationsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> 
-          getReservationsFieldBuilder() {
-        if (reservationsBuilder_ == null) {
-          reservationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder>(
-                  reservations_,
-                  ((bitField0_ & 0x00000001) != 0),
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder> 
+          getMetadataFieldBuilder() {
+        if (metadataBuilder_ == null) {
+          metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.Metadata, datacatalog.Datacatalog.Metadata.Builder, datacatalog.Datacatalog.MetadataOrBuilder>(
+                  getMetadata(),
                   getParentForChildren(),
                   isClean());
-          reservations_ = null;
+          metadata_ = null;
         }
-        return reservationsBuilder_;
+        return metadataBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -21051,111 +17674,92 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationsResponse)
+      // @@protoc_insertion_point(builder_scope:datacatalog.Reservation)
     }
 
-    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationsResponse)
-    private static final datacatalog.Datacatalog.GetOrExtendReservationsResponse DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:datacatalog.Reservation)
+    private static final datacatalog.Datacatalog.Reservation DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationsResponse();
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.Reservation();
     }
 
-    public static datacatalog.Datacatalog.GetOrExtendReservationsResponse getDefaultInstance() {
+    public static datacatalog.Datacatalog.Reservation getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public GetOrExtendReservationsResponse parsePartialFrom(
+      public Reservation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOrExtendReservationsResponse(input, extensionRegistry);
+        return new Reservation(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.GetOrExtendReservationsResponse getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.Reservation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface ReleaseReservationRequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.ReleaseReservationRequest)
+  public interface GetOrExtendReservationResponseOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.GetOrExtendReservationResponse)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    boolean hasReservationId();
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    datacatalog.Datacatalog.ReservationID getReservationId();
-    /**
-     * 
-     * The unique ID for the reservation
+     * The reservation to be acquired or extended
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * .datacatalog.Reservation reservation = 1;
      */
-    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
-
+    boolean hasReservation();
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * The reservation to be acquired or extended
      * 

      *
-     * string owner_id = 2;
+     * .datacatalog.Reservation reservation = 1;
      */
-    java.lang.String getOwnerId();
+    datacatalog.Datacatalog.Reservation getReservation();
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * The reservation to be acquired or extended
      * 

      *
-     * string owner_id = 2;
+     * .datacatalog.Reservation reservation = 1;
      */
-    com.google.protobuf.ByteString
-        getOwnerIdBytes();
+    datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder();
   }
   /**
    * 
-   * Request to release reservation
+   * Response including either a newly minted reservation or the existing reservation
    * 

    *
-   * Protobuf type {@code datacatalog.ReleaseReservationRequest}
+   * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
    */
-  public  static final class ReleaseReservationRequest extends
+  public  static final class GetOrExtendReservationResponse extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.ReleaseReservationRequest)
-      ReleaseReservationRequestOrBuilder {
+      // @@protoc_insertion_point(message_implements:datacatalog.GetOrExtendReservationResponse)
+      GetOrExtendReservationResponseOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use ReleaseReservationRequest.newBuilder() to construct.
-    private ReleaseReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    // Use GetOrExtendReservationResponse.newBuilder() to construct.
+    private GetOrExtendReservationResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private ReleaseReservationRequest() {
-      ownerId_ = "";
+    private GetOrExtendReservationResponse() {
     }
 
     @java.lang.Override
@@ -21163,7 +17767,7 @@ private ReleaseReservationRequest() {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private ReleaseReservationRequest(
+    private GetOrExtendReservationResponse(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -21183,24 +17787,18 @@ private ReleaseReservationRequest(
               done = true;
               break;
             case 10: {
-              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
-              if (reservationId_ != null) {
-                subBuilder = reservationId_.toBuilder();
+              datacatalog.Datacatalog.Reservation.Builder subBuilder = null;
+              if (reservation_ != null) {
+                subBuilder = reservation_.toBuilder();
               }
-              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
+              reservation_ = input.readMessage(datacatalog.Datacatalog.Reservation.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(reservationId_);
-                reservationId_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(reservation_);
+                reservation_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              ownerId_ = s;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -21222,90 +17820,48 @@ private ReleaseReservationRequest(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
+      return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
+              datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
     }
 
-    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
-    private datacatalog.Datacatalog.ReservationID reservationId_;
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public boolean hasReservationId() {
-      return reservationId_ != null;
-    }
-    /**
-     * 
-     * The unique ID for the reservation
-     * 

-     *
-     * .datacatalog.ReservationID reservation_id = 1;
-     */
-    public datacatalog.Datacatalog.ReservationID getReservationId() {
-      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
-    }
+    public static final int RESERVATION_FIELD_NUMBER = 1;
+    private datacatalog.Datacatalog.Reservation reservation_;
     /**
      * 
-     * The unique ID for the reservation
+     * The reservation to be acquired or extended
      * 

      *
-     * .datacatalog.ReservationID reservation_id = 1;
+     * .datacatalog.Reservation reservation = 1;
      */
-    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-      return getReservationId();
+    public boolean hasReservation() {
+      return reservation_ != null;
     }
-
-    public static final int OWNER_ID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object ownerId_;
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * The reservation to be acquired or extended
      * 

      *
-     * string owner_id = 2;
+     * .datacatalog.Reservation reservation = 1;
      */
-    public java.lang.String getOwnerId() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        ownerId_ = s;
-        return s;
-      }
+    public datacatalog.Datacatalog.Reservation getReservation() {
+      return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
     }
     /**
      * 
-     * The unique ID of the owner for the reservation
+     * The reservation to be acquired or extended
      * 

      *
-     * string owner_id = 2;
+     * .datacatalog.Reservation reservation = 1;
      */
-    public com.google.protobuf.ByteString
-        getOwnerIdBytes() {
-      java.lang.Object ref = ownerId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        ownerId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
+      return getReservation();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -21322,11 +17878,8 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (reservationId_ != null) {
-        output.writeMessage(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
+      if (reservation_ != null) {
+        output.writeMessage(1, getReservation());
       }
       unknownFields.writeTo(output);
     }
@@ -21337,12 +17890,9 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (reservationId_ != null) {
+      if (reservation_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getReservationId());
-      }
-      if (!getOwnerIdBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
+          .computeMessageSize(1, getReservation());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -21354,18 +17904,16 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.ReleaseReservationRequest)) {
+      if (!(obj instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.ReleaseReservationRequest other = (datacatalog.Datacatalog.ReleaseReservationRequest) obj;
+      datacatalog.Datacatalog.GetOrExtendReservationResponse other = (datacatalog.Datacatalog.GetOrExtendReservationResponse) obj;
 
-      if (hasReservationId() != other.hasReservationId()) return false;
-      if (hasReservationId()) {
-        if (!getReservationId()
-            .equals(other.getReservationId())) return false;
+      if (hasReservation() != other.hasReservation()) return false;
+      if (hasReservation()) {
+        if (!getReservation()
+            .equals(other.getReservation())) return false;
       }
-      if (!getOwnerId()
-          .equals(other.getOwnerId())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -21377,80 +17925,78 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasReservationId()) {
-        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationId().hashCode();
+      if (hasReservation()) {
+        hash = (37 * hash) + RESERVATION_FIELD_NUMBER;
+        hash = (53 * hash) + getReservation().hashCode();
       }
-      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerId().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -21463,7 +18009,7 @@ public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.ReleaseReservationRequest prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.GetOrExtendReservationResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -21480,29 +18026,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Request to release reservation
+     * Response including either a newly minted reservation or the existing reservation
      * 

      *
-     * Protobuf type {@code datacatalog.ReleaseReservationRequest}
+     * Protobuf type {@code datacatalog.GetOrExtendReservationResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.ReleaseReservationRequest)
-        datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.GetOrExtendReservationResponse)
+        datacatalog.Datacatalog.GetOrExtendReservationResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
+                datacatalog.Datacatalog.GetOrExtendReservationResponse.class, datacatalog.Datacatalog.GetOrExtendReservationResponse.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.ReleaseReservationRequest.newBuilder()
+      // Construct using datacatalog.Datacatalog.GetOrExtendReservationResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -21520,31 +18066,29 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
+        if (reservationBuilder_ == null) {
+          reservation_ = null;
         } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
+          reservation_ = null;
+          reservationBuilder_ = null;
         }
-        ownerId_ = "";
-
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_GetOrExtendReservationResponse_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance();
+      public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationRequest build() {
-        datacatalog.Datacatalog.ReleaseReservationRequest result = buildPartial();
+      public datacatalog.Datacatalog.GetOrExtendReservationResponse build() {
+        datacatalog.Datacatalog.GetOrExtendReservationResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -21552,14 +18096,13 @@ public datacatalog.Datacatalog.ReleaseReservationRequest build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationRequest buildPartial() {
-        datacatalog.Datacatalog.ReleaseReservationRequest result = new datacatalog.Datacatalog.ReleaseReservationRequest(this);
-        if (reservationIdBuilder_ == null) {
-          result.reservationId_ = reservationId_;
+      public datacatalog.Datacatalog.GetOrExtendReservationResponse buildPartial() {
+        datacatalog.Datacatalog.GetOrExtendReservationResponse result = new datacatalog.Datacatalog.GetOrExtendReservationResponse(this);
+        if (reservationBuilder_ == null) {
+          result.reservation_ = reservation_;
         } else {
-          result.reservationId_ = reservationIdBuilder_.build();
+          result.reservation_ = reservationBuilder_.build();
         }
-        result.ownerId_ = ownerId_;
         onBuilt();
         return result;
       }
@@ -21598,22 +18141,18 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.ReleaseReservationRequest) {
-          return mergeFrom((datacatalog.Datacatalog.ReleaseReservationRequest)other);
+        if (other instanceof datacatalog.Datacatalog.GetOrExtendReservationResponse) {
+          return mergeFrom((datacatalog.Datacatalog.GetOrExtendReservationResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.ReleaseReservationRequest other) {
-        if (other == datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance()) return this;
-        if (other.hasReservationId()) {
-          mergeReservationId(other.getReservationId());
-        }
-        if (!other.getOwnerId().isEmpty()) {
-          ownerId_ = other.ownerId_;
-          onChanged();
+      public Builder mergeFrom(datacatalog.Datacatalog.GetOrExtendReservationResponse other) {
+        if (other == datacatalog.Datacatalog.GetOrExtendReservationResponse.getDefaultInstance()) return this;
+        if (other.hasReservation()) {
+          mergeReservation(other.getReservation());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -21630,11 +18169,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        datacatalog.Datacatalog.ReleaseReservationRequest parsedMessage = null;
+        datacatalog.Datacatalog.GetOrExtendReservationResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.ReleaseReservationRequest) e.getUnfinishedMessage();
+          parsedMessage = (datacatalog.Datacatalog.GetOrExtendReservationResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -21644,246 +18183,157 @@ public Builder mergeFrom(
         return this;
       }
 
-      private datacatalog.Datacatalog.ReservationID reservationId_;
+      private datacatalog.Datacatalog.Reservation reservation_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
+          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> reservationBuilder_;
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public boolean hasReservationId() {
-        return reservationIdBuilder_ != null || reservationId_ != null;
+      public boolean hasReservation() {
+        return reservationBuilder_ != null || reservation_ != null;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public datacatalog.Datacatalog.ReservationID getReservationId() {
-        if (reservationIdBuilder_ == null) {
-          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+      public datacatalog.Datacatalog.Reservation getReservation() {
+        if (reservationBuilder_ == null) {
+          return reservation_ == null ? datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
         } else {
-          return reservationIdBuilder_.getMessage();
+          return reservationBuilder_.getMessage();
         }
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
+      public Builder setReservation(datacatalog.Datacatalog.Reservation value) {
+        if (reservationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          reservationId_ = value;
+          reservation_ = value;
           onChanged();
         } else {
-          reservationIdBuilder_.setMessage(value);
+          reservationBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public Builder setReservationId(
-          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = builderForValue.build();
+      public Builder setReservation(
+          datacatalog.Datacatalog.Reservation.Builder builderForValue) {
+        if (reservationBuilder_ == null) {
+          reservation_ = builderForValue.build();
           onChanged();
         } else {
-          reservationIdBuilder_.setMessage(builderForValue.build());
+          reservationBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
-        if (reservationIdBuilder_ == null) {
-          if (reservationId_ != null) {
-            reservationId_ =
-              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
+      public Builder mergeReservation(datacatalog.Datacatalog.Reservation value) {
+        if (reservationBuilder_ == null) {
+          if (reservation_ != null) {
+            reservation_ =
+              datacatalog.Datacatalog.Reservation.newBuilder(reservation_).mergeFrom(value).buildPartial();
           } else {
-            reservationId_ = value;
+            reservation_ = value;
           }
           onChanged();
         } else {
-          reservationIdBuilder_.mergeFrom(value);
+          reservationBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public Builder clearReservationId() {
-        if (reservationIdBuilder_ == null) {
-          reservationId_ = null;
+      public Builder clearReservation() {
+        if (reservationBuilder_ == null) {
+          reservation_ = null;
           onChanged();
         } else {
-          reservationId_ = null;
-          reservationIdBuilder_ = null;
+          reservation_ = null;
+          reservationBuilder_ = null;
         }
 
         return this;
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
+      public datacatalog.Datacatalog.Reservation.Builder getReservationBuilder() {
         
         onChanged();
-        return getReservationIdFieldBuilder().getBuilder();
+        return getReservationFieldBuilder().getBuilder();
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
-      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
-        if (reservationIdBuilder_ != null) {
-          return reservationIdBuilder_.getMessageOrBuilder();
+      public datacatalog.Datacatalog.ReservationOrBuilder getReservationOrBuilder() {
+        if (reservationBuilder_ != null) {
+          return reservationBuilder_.getMessageOrBuilder();
         } else {
-          return reservationId_ == null ?
-              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
+          return reservation_ == null ?
+              datacatalog.Datacatalog.Reservation.getDefaultInstance() : reservation_;
         }
       }
       /**
        * 
-       * The unique ID for the reservation
+       * The reservation to be acquired or extended
        * 

        *
-       * .datacatalog.ReservationID reservation_id = 1;
+       * .datacatalog.Reservation reservation = 1;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
-          getReservationIdFieldBuilder() {
-        if (reservationIdBuilder_ == null) {
-          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
-                  getReservationId(),
+          datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder> 
+          getReservationFieldBuilder() {
+        if (reservationBuilder_ == null) {
+          reservationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.Reservation, datacatalog.Datacatalog.Reservation.Builder, datacatalog.Datacatalog.ReservationOrBuilder>(
+                  getReservation(),
                   getParentForChildren(),
                   isClean());
-          reservationId_ = null;
-        }
-        return reservationIdBuilder_;
-      }
-
-      private java.lang.Object ownerId_ = "";
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public java.lang.String getOwnerId() {
-        java.lang.Object ref = ownerId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          ownerId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public com.google.protobuf.ByteString
-          getOwnerIdBytes() {
-        java.lang.Object ref = ownerId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          ownerId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
+          reservation_ = null;
         }
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        ownerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder clearOwnerId() {
-        
-        ownerId_ = getDefaultInstance().getOwnerId();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The unique ID of the owner for the reservation
-       * 

-       *
-       * string owner_id = 2;
-       */
-      public Builder setOwnerIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        ownerId_ = value;
-        onChanged();
-        return this;
+        return reservationBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -21898,112 +18348,111 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:datacatalog.ReleaseReservationRequest)
+      // @@protoc_insertion_point(builder_scope:datacatalog.GetOrExtendReservationResponse)
     }
 
-    // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationRequest)
-    private static final datacatalog.Datacatalog.ReleaseReservationRequest DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:datacatalog.GetOrExtendReservationResponse)
+    private static final datacatalog.Datacatalog.GetOrExtendReservationResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReleaseReservationRequest();
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.GetOrExtendReservationResponse();
     }
 
-    public static datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstance() {
+    public static datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public ReleaseReservationRequest parsePartialFrom(
+      public GetOrExtendReservationResponse parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReleaseReservationRequest(input, extensionRegistry);
+        return new GetOrExtendReservationResponse(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.GetOrExtendReservationResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface ReleaseReservationsRequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:datacatalog.ReleaseReservationsRequest)
+  public interface ReleaseReservationRequestOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:datacatalog.ReleaseReservationRequest)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    java.util.List 
-        getReservationsList();
+    boolean hasReservationId();
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    datacatalog.Datacatalog.ReleaseReservationRequest getReservations(int index);
+    datacatalog.Datacatalog.ReservationID getReservationId();
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    int getReservationsCount();
+    datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder();
+
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID of the owner for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * string owner_id = 2;
      */
-    java.util.List 
-        getReservationsOrBuilderList();
+    java.lang.String getOwnerId();
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID of the owner for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * string owner_id = 2;
      */
-    datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder getReservationsOrBuilder(
-        int index);
+    com.google.protobuf.ByteString
+        getOwnerIdBytes();
   }
   /**
    * 
-   * Request message for releasing reservations for multiple artifacts in a single operation.
+   * Request to release reservation
    * 

    *
-   * Protobuf type {@code datacatalog.ReleaseReservationsRequest}
+   * Protobuf type {@code datacatalog.ReleaseReservationRequest}
    */
-  public  static final class ReleaseReservationsRequest extends
+  public  static final class ReleaseReservationRequest extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:datacatalog.ReleaseReservationsRequest)
-      ReleaseReservationsRequestOrBuilder {
+      // @@protoc_insertion_point(message_implements:datacatalog.ReleaseReservationRequest)
+      ReleaseReservationRequestOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use ReleaseReservationsRequest.newBuilder() to construct.
-    private ReleaseReservationsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    // Use ReleaseReservationRequest.newBuilder() to construct.
+    private ReleaseReservationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private ReleaseReservationsRequest() {
-      reservations_ = java.util.Collections.emptyList();
+    private ReleaseReservationRequest() {
+      ownerId_ = "";
     }
 
     @java.lang.Override
@@ -22011,7 +18460,7 @@ private ReleaseReservationsRequest() {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private ReleaseReservationsRequest(
+    private ReleaseReservationRequest(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -22031,12 +18480,22 @@ private ReleaseReservationsRequest(
               done = true;
               break;
             case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                reservations_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
+              datacatalog.Datacatalog.ReservationID.Builder subBuilder = null;
+              if (reservationId_ != null) {
+                subBuilder = reservationId_.toBuilder();
+              }
+              reservationId_ = input.readMessage(datacatalog.Datacatalog.ReservationID.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(reservationId_);
+                reservationId_ = subBuilder.buildPartial();
               }
-              reservations_.add(
-                  input.readMessage(datacatalog.Datacatalog.ReleaseReservationRequest.parser(), extensionRegistry));
+
+              break;
+            }
+            case 18: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              ownerId_ = s;
               break;
             }
             default: {
@@ -22054,79 +18513,96 @@ private ReleaseReservationsRequest(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          reservations_ = java.util.Collections.unmodifiableList(reservations_);
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable
+      return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              datacatalog.Datacatalog.ReleaseReservationsRequest.class, datacatalog.Datacatalog.ReleaseReservationsRequest.Builder.class);
+              datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
     }
 
-    public static final int RESERVATIONS_FIELD_NUMBER = 1;
-    private java.util.List reservations_;
+    public static final int RESERVATION_ID_FIELD_NUMBER = 1;
+    private datacatalog.Datacatalog.ReservationID reservationId_;
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public java.util.List getReservationsList() {
-      return reservations_;
+    public boolean hasReservationId() {
+      return reservationId_ != null;
     }
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public java.util.List 
-        getReservationsOrBuilderList() {
-      return reservations_;
+    public datacatalog.Datacatalog.ReservationID getReservationId() {
+      return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
     }
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * .datacatalog.ReservationID reservation_id = 1;
      */
-    public int getReservationsCount() {
-      return reservations_.size();
+    public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+      return getReservationId();
     }
+
+    public static final int OWNER_ID_FIELD_NUMBER = 2;
+    private volatile java.lang.Object ownerId_;
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID of the owner for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * string owner_id = 2;
      */
-    public datacatalog.Datacatalog.ReleaseReservationRequest getReservations(int index) {
-      return reservations_.get(index);
+    public java.lang.String getOwnerId() {
+      java.lang.Object ref = ownerId_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        ownerId_ = s;
+        return s;
+      }
     }
     /**
      * 
-     * List of reservation requests for artifacts to release
+     * The unique ID of the owner for the reservation
      * 

      *
-     * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+     * string owner_id = 2;
      */
-    public datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder getReservationsOrBuilder(
-        int index) {
-      return reservations_.get(index);
+    public com.google.protobuf.ByteString
+        getOwnerIdBytes() {
+      java.lang.Object ref = ownerId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        ownerId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     private byte memoizedIsInitialized = -1;
@@ -22143,8 +18619,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < reservations_.size(); i++) {
-        output.writeMessage(1, reservations_.get(i));
+      if (reservationId_ != null) {
+        output.writeMessage(1, getReservationId());
+      }
+      if (!getOwnerIdBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -22155,9 +18634,12 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < reservations_.size(); i++) {
+      if (reservationId_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, reservations_.get(i));
+          .computeMessageSize(1, getReservationId());
+      }
+      if (!getOwnerIdBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -22169,13 +18651,18 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof datacatalog.Datacatalog.ReleaseReservationsRequest)) {
+      if (!(obj instanceof datacatalog.Datacatalog.ReleaseReservationRequest)) {
         return super.equals(obj);
       }
-      datacatalog.Datacatalog.ReleaseReservationsRequest other = (datacatalog.Datacatalog.ReleaseReservationsRequest) obj;
+      datacatalog.Datacatalog.ReleaseReservationRequest other = (datacatalog.Datacatalog.ReleaseReservationRequest) obj;
 
-      if (!getReservationsList()
-          .equals(other.getReservationsList())) return false;
+      if (hasReservationId() != other.hasReservationId()) return false;
+      if (hasReservationId()) {
+        if (!getReservationId()
+            .equals(other.getReservationId())) return false;
+      }
+      if (!getOwnerId()
+          .equals(other.getOwnerId())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -22187,78 +18674,80 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getReservationsCount() > 0) {
-        hash = (37 * hash) + RESERVATIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getReservationsList().hashCode();
+      if (hasReservationId()) {
+        hash = (37 * hash) + RESERVATION_ID_FIELD_NUMBER;
+        hash = (53 * hash) + getReservationId().hashCode();
       }
+      hash = (37 * hash) + OWNER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOwnerId().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(byte[] data)
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseDelimitedFrom(java.io.InputStream input)
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseDelimitedFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
+    public static datacatalog.Datacatalog.ReleaseReservationRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -22271,7 +18760,7 @@ public static datacatalog.Datacatalog.ReleaseReservationsRequest parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(datacatalog.Datacatalog.ReleaseReservationsRequest prototype) {
+    public static Builder newBuilder(datacatalog.Datacatalog.ReleaseReservationRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -22288,29 +18777,29 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Request message for releasing reservations for multiple artifacts in a single operation.
+     * Request to release reservation
      * 

      *
-     * Protobuf type {@code datacatalog.ReleaseReservationsRequest}
+     * Protobuf type {@code datacatalog.ReleaseReservationRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:datacatalog.ReleaseReservationsRequest)
-        datacatalog.Datacatalog.ReleaseReservationsRequestOrBuilder {
+        // @@protoc_insertion_point(builder_implements:datacatalog.ReleaseReservationRequest)
+        datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                datacatalog.Datacatalog.ReleaseReservationsRequest.class, datacatalog.Datacatalog.ReleaseReservationsRequest.Builder.class);
+                datacatalog.Datacatalog.ReleaseReservationRequest.class, datacatalog.Datacatalog.ReleaseReservationRequest.Builder.class);
       }
 
-      // Construct using datacatalog.Datacatalog.ReleaseReservationsRequest.newBuilder()
+      // Construct using datacatalog.Datacatalog.ReleaseReservationRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -22323,35 +18812,36 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getReservationsFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (reservationsBuilder_ == null) {
-          reservations_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
         } else {
-          reservationsBuilder_.clear();
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
         }
+        ownerId_ = "";
+
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
+        return datacatalog.Datacatalog.internal_static_datacatalog_ReleaseReservationRequest_descriptor;
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationsRequest getDefaultInstanceForType() {
-        return datacatalog.Datacatalog.ReleaseReservationsRequest.getDefaultInstance();
+      public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
+        return datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationsRequest build() {
-        datacatalog.Datacatalog.ReleaseReservationsRequest result = buildPartial();
+      public datacatalog.Datacatalog.ReleaseReservationRequest build() {
+        datacatalog.Datacatalog.ReleaseReservationRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -22359,18 +18849,14 @@ public datacatalog.Datacatalog.ReleaseReservationsRequest build() {
       }
 
       @java.lang.Override
-      public datacatalog.Datacatalog.ReleaseReservationsRequest buildPartial() {
-        datacatalog.Datacatalog.ReleaseReservationsRequest result = new datacatalog.Datacatalog.ReleaseReservationsRequest(this);
-        int from_bitField0_ = bitField0_;
-        if (reservationsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            reservations_ = java.util.Collections.unmodifiableList(reservations_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.reservations_ = reservations_;
+      public datacatalog.Datacatalog.ReleaseReservationRequest buildPartial() {
+        datacatalog.Datacatalog.ReleaseReservationRequest result = new datacatalog.Datacatalog.ReleaseReservationRequest(this);
+        if (reservationIdBuilder_ == null) {
+          result.reservationId_ = reservationId_;
         } else {
-          result.reservations_ = reservationsBuilder_.build();
+          result.reservationId_ = reservationIdBuilder_.build();
         }
+        result.ownerId_ = ownerId_;
         onBuilt();
         return result;
       }
@@ -22409,41 +18895,22 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof datacatalog.Datacatalog.ReleaseReservationsRequest) {
-          return mergeFrom((datacatalog.Datacatalog.ReleaseReservationsRequest)other);
+        if (other instanceof datacatalog.Datacatalog.ReleaseReservationRequest) {
+          return mergeFrom((datacatalog.Datacatalog.ReleaseReservationRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(datacatalog.Datacatalog.ReleaseReservationsRequest other) {
-        if (other == datacatalog.Datacatalog.ReleaseReservationsRequest.getDefaultInstance()) return this;
-        if (reservationsBuilder_ == null) {
-          if (!other.reservations_.isEmpty()) {
-            if (reservations_.isEmpty()) {
-              reservations_ = other.reservations_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureReservationsIsMutable();
-              reservations_.addAll(other.reservations_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.reservations_.isEmpty()) {
-            if (reservationsBuilder_.isEmpty()) {
-              reservationsBuilder_.dispose();
-              reservationsBuilder_ = null;
-              reservations_ = other.reservations_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              reservationsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getReservationsFieldBuilder() : null;
-            } else {
-              reservationsBuilder_.addAllMessages(other.reservations_);
-            }
-          }
+      public Builder mergeFrom(datacatalog.Datacatalog.ReleaseReservationRequest other) {
+        if (other == datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance()) return this;
+        if (other.hasReservationId()) {
+          mergeReservationId(other.getReservationId());
+        }
+        if (!other.getOwnerId().isEmpty()) {
+          ownerId_ = other.ownerId_;
+          onChanged();
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -22451,340 +18918,269 @@ public Builder mergeFrom(datacatalog.Datacatalog.ReleaseReservationsRequest othe
       }
 
       @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        datacatalog.Datacatalog.ReleaseReservationsRequest parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (datacatalog.Datacatalog.ReleaseReservationsRequest) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List reservations_ =
-        java.util.Collections.emptyList();
-      private void ensureReservationsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          reservations_ = new java.util.ArrayList(reservations_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.ReleaseReservationRequest, datacatalog.Datacatalog.ReleaseReservationRequest.Builder, datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder> reservationsBuilder_;
-
-      /**
-       * 
-       * List of reservation requests for artifacts to release
-       * 

-       *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-       */
-      public java.util.List getReservationsList() {
-        if (reservationsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(reservations_);
-        } else {
-          return reservationsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to release
-       * 

-       *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-       */
-      public int getReservationsCount() {
-        if (reservationsBuilder_ == null) {
-          return reservations_.size();
-        } else {
-          return reservationsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * List of reservation requests for artifacts to release
-       * 

-       *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-       */
-      public datacatalog.Datacatalog.ReleaseReservationRequest getReservations(int index) {
-        if (reservationsBuilder_ == null) {
-          return reservations_.get(index);
-        } else {
-          return reservationsBuilder_.getMessage(index);
-        }
+      public final boolean isInitialized() {
+        return true;
       }
-      /**
-       * 
-       * List of reservation requests for artifacts to release
-       * 

-       *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
-       */
-      public Builder setReservations(
-          int index, datacatalog.Datacatalog.ReleaseReservationRequest value) {
-        if (reservationsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        datacatalog.Datacatalog.ReleaseReservationRequest parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (datacatalog.Datacatalog.ReleaseReservationRequest) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
-          ensureReservationsIsMutable();
-          reservations_.set(index, value);
-          onChanged();
-        } else {
-          reservationsBuilder_.setMessage(index, value);
         }
         return this;
       }
+
+      private datacatalog.Datacatalog.ReservationID reservationId_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> reservationIdBuilder_;
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder setReservations(
-          int index, datacatalog.Datacatalog.ReleaseReservationRequest.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          reservationsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
+      public boolean hasReservationId() {
+        return reservationIdBuilder_ != null || reservationId_ != null;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder addReservations(datacatalog.Datacatalog.ReleaseReservationRequest value) {
-        if (reservationsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureReservationsIsMutable();
-          reservations_.add(value);
-          onChanged();
+      public datacatalog.Datacatalog.ReservationID getReservationId() {
+        if (reservationIdBuilder_ == null) {
+          return reservationId_ == null ? datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
         } else {
-          reservationsBuilder_.addMessage(value);
+          return reservationIdBuilder_.getMessage();
         }
-        return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder addReservations(
-          int index, datacatalog.Datacatalog.ReleaseReservationRequest value) {
-        if (reservationsBuilder_ == null) {
+      public Builder setReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureReservationsIsMutable();
-          reservations_.add(index, value);
+          reservationId_ = value;
           onChanged();
         } else {
-          reservationsBuilder_.addMessage(index, value);
+          reservationIdBuilder_.setMessage(value);
         }
+
         return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder addReservations(
-          datacatalog.Datacatalog.ReleaseReservationRequest.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.add(builderForValue.build());
+      public Builder setReservationId(
+          datacatalog.Datacatalog.ReservationID.Builder builderForValue) {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = builderForValue.build();
           onChanged();
         } else {
-          reservationsBuilder_.addMessage(builderForValue.build());
+          reservationIdBuilder_.setMessage(builderForValue.build());
         }
+
         return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder addReservations(
-          int index, datacatalog.Datacatalog.ReleaseReservationRequest.Builder builderForValue) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.add(index, builderForValue.build());
+      public Builder mergeReservationId(datacatalog.Datacatalog.ReservationID value) {
+        if (reservationIdBuilder_ == null) {
+          if (reservationId_ != null) {
+            reservationId_ =
+              datacatalog.Datacatalog.ReservationID.newBuilder(reservationId_).mergeFrom(value).buildPartial();
+          } else {
+            reservationId_ = value;
+          }
           onChanged();
         } else {
-          reservationsBuilder_.addMessage(index, builderForValue.build());
+          reservationIdBuilder_.mergeFrom(value);
         }
+
         return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder addAllReservations(
-          java.lang.Iterable values) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, reservations_);
+      public Builder clearReservationId() {
+        if (reservationIdBuilder_ == null) {
+          reservationId_ = null;
           onChanged();
         } else {
-          reservationsBuilder_.addAllMessages(values);
+          reservationId_ = null;
+          reservationIdBuilder_ = null;
         }
+
         return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder clearReservations() {
-        if (reservationsBuilder_ == null) {
-          reservations_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          reservationsBuilder_.clear();
-        }
-        return this;
+      public datacatalog.Datacatalog.ReservationID.Builder getReservationIdBuilder() {
+        
+        onChanged();
+        return getReservationIdFieldBuilder().getBuilder();
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public Builder removeReservations(int index) {
-        if (reservationsBuilder_ == null) {
-          ensureReservationsIsMutable();
-          reservations_.remove(index);
-          onChanged();
+      public datacatalog.Datacatalog.ReservationIDOrBuilder getReservationIdOrBuilder() {
+        if (reservationIdBuilder_ != null) {
+          return reservationIdBuilder_.getMessageOrBuilder();
         } else {
-          reservationsBuilder_.remove(index);
+          return reservationId_ == null ?
+              datacatalog.Datacatalog.ReservationID.getDefaultInstance() : reservationId_;
         }
-        return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * .datacatalog.ReservationID reservation_id = 1;
        */
-      public datacatalog.Datacatalog.ReleaseReservationRequest.Builder getReservationsBuilder(
-          int index) {
-        return getReservationsFieldBuilder().getBuilder(index);
+      private com.google.protobuf.SingleFieldBuilderV3<
+          datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder> 
+          getReservationIdFieldBuilder() {
+        if (reservationIdBuilder_ == null) {
+          reservationIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              datacatalog.Datacatalog.ReservationID, datacatalog.Datacatalog.ReservationID.Builder, datacatalog.Datacatalog.ReservationIDOrBuilder>(
+                  getReservationId(),
+                  getParentForChildren(),
+                  isClean());
+          reservationId_ = null;
+        }
+        return reservationIdBuilder_;
       }
+
+      private java.lang.Object ownerId_ = "";
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID of the owner for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * string owner_id = 2;
        */
-      public datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder getReservationsOrBuilder(
-          int index) {
-        if (reservationsBuilder_ == null) {
-          return reservations_.get(index);  } else {
-          return reservationsBuilder_.getMessageOrBuilder(index);
+      public java.lang.String getOwnerId() {
+        java.lang.Object ref = ownerId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          ownerId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
         }
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID of the owner for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * string owner_id = 2;
        */
-      public java.util.List 
-           getReservationsOrBuilderList() {
-        if (reservationsBuilder_ != null) {
-          return reservationsBuilder_.getMessageOrBuilderList();
+      public com.google.protobuf.ByteString
+          getOwnerIdBytes() {
+        java.lang.Object ref = ownerId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          ownerId_ = b;
+          return b;
         } else {
-          return java.util.Collections.unmodifiableList(reservations_);
+          return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID of the owner for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * string owner_id = 2;
        */
-      public datacatalog.Datacatalog.ReleaseReservationRequest.Builder addReservationsBuilder() {
-        return getReservationsFieldBuilder().addBuilder(
-            datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance());
+      public Builder setOwnerId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        ownerId_ = value;
+        onChanged();
+        return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID of the owner for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * string owner_id = 2;
        */
-      public datacatalog.Datacatalog.ReleaseReservationRequest.Builder addReservationsBuilder(
-          int index) {
-        return getReservationsFieldBuilder().addBuilder(
-            index, datacatalog.Datacatalog.ReleaseReservationRequest.getDefaultInstance());
+      public Builder clearOwnerId() {
+        
+        ownerId_ = getDefaultInstance().getOwnerId();
+        onChanged();
+        return this;
       }
       /**
        * 
-       * List of reservation requests for artifacts to release
+       * The unique ID of the owner for the reservation
        * 

        *
-       * repeated .datacatalog.ReleaseReservationRequest reservations = 1;
+       * string owner_id = 2;
        */
-      public java.util.List 
-           getReservationsBuilderList() {
-        return getReservationsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          datacatalog.Datacatalog.ReleaseReservationRequest, datacatalog.Datacatalog.ReleaseReservationRequest.Builder, datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder> 
-          getReservationsFieldBuilder() {
-        if (reservationsBuilder_ == null) {
-          reservationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              datacatalog.Datacatalog.ReleaseReservationRequest, datacatalog.Datacatalog.ReleaseReservationRequest.Builder, datacatalog.Datacatalog.ReleaseReservationRequestOrBuilder>(
-                  reservations_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          reservations_ = null;
-        }
-        return reservationsBuilder_;
+      public Builder setOwnerIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        ownerId_ = value;
+        onChanged();
+        return this;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -22799,41 +19195,41 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:datacatalog.ReleaseReservationsRequest)
+      // @@protoc_insertion_point(builder_scope:datacatalog.ReleaseReservationRequest)
     }
 
-    // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationsRequest)
-    private static final datacatalog.Datacatalog.ReleaseReservationsRequest DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:datacatalog.ReleaseReservationRequest)
+    private static final datacatalog.Datacatalog.ReleaseReservationRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReleaseReservationsRequest();
+      DEFAULT_INSTANCE = new datacatalog.Datacatalog.ReleaseReservationRequest();
     }
 
-    public static datacatalog.Datacatalog.ReleaseReservationsRequest getDefaultInstance() {
+    public static datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
-      public ReleaseReservationsRequest parsePartialFrom(
+      public ReleaseReservationRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReleaseReservationsRequest(input, extensionRegistry);
+        return new ReleaseReservationRequest(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser parser() {
+    public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
+    public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public datacatalog.Datacatalog.ReleaseReservationsRequest getDefaultInstanceForType() {
+    public datacatalog.Datacatalog.ReleaseReservationRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -39165,11 +35561,6 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_DeleteArtifactRequest_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_datacatalog_DeleteArtifactsRequest_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_DeleteArtifactResponse_descriptor;
   private static final 
@@ -39185,11 +35576,6 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_Reservation_descriptor;
   private static final 
@@ -39200,21 +35586,11 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_ReleaseReservationRequest_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_datacatalog_ReleaseReservationsRequest_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_datacatalog_ReleaseReservationResponse_descriptor;
   private static final 
@@ -39347,115 +35723,98 @@ public datacatalog.Datacatalog.PaginationOptions getDefaultInstanceForType() {
       "rtifact_id\030\001 \001(\t\"{\n\025DeleteArtifactReques" +
       "t\022\'\n\007dataset\030\001 \001(\0132\026.datacatalog.Dataset" +
       "ID\022\025\n\013artifact_id\030\002 \001(\tH\000\022\022\n\010tag_name\030\003 " +
-      "\001(\tH\000B\016\n\014query_handle\"O\n\026DeleteArtifacts" +
-      "Request\0225\n\tartifacts\030\001 \003(\0132\".datacatalog" +
-      ".DeleteArtifactRequest\"\030\n\026DeleteArtifact" +
-      "Response\"M\n\rReservationID\022*\n\ndataset_id\030" +
-      "\001 \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_nam" +
-      "e\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationReques" +
-      "t\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog." +
-      "ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heart" +
-      "beat_interval\030\003 \001(\0132\031.google.protobuf.Du" +
-      "ration\"b\n\036GetOrExtendReservationsRequest" +
-      "\022@\n\014reservations\030\001 \003(\0132*.datacatalog.Get" +
-      "OrExtendReservationRequest\"\343\001\n\013Reservati" +
-      "on\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog" +
-      ".ReservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022hear" +
-      "tbeat_interval\030\003 \001(\0132\031.google.protobuf.D" +
-      "uration\022.\n\nexpires_at\030\004 \001(\0132\032.google.pro" +
-      "tobuf.Timestamp\022\'\n\010metadata\030\006 \001(\0132\025.data" +
-      "catalog.Metadata\"O\n\036GetOrExtendReservati" +
-      "onResponse\022-\n\013reservation\030\001 \001(\0132\030.dataca" +
-      "talog.Reservation\"Q\n\037GetOrExtendReservat" +
-      "ionsResponse\022.\n\014reservations\030\001 \003(\0132\030.dat" +
-      "acatalog.Reservation\"a\n\031ReleaseReservati" +
-      "onRequest\0222\n\016reservation_id\030\001 \001(\0132\032.data" +
-      "catalog.ReservationID\022\020\n\010owner_id\030\002 \001(\t\"" +
-      "Z\n\032ReleaseReservationsRequest\022<\n\014reserva" +
-      "tions\030\001 \003(\0132&.datacatalog.ReleaseReserva" +
-      "tionRequest\"\034\n\032ReleaseReservationRespons" +
-      "e\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatalog.D" +
-      "atasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacatalog" +
-      ".Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\tPart" +
-      "ition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"f\n\tDat" +
-      "asetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n" +
-      "\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UUID\030\005" +
-      " \001(\t\022\013\n\003org\030\006 \001(\t\"\215\002\n\010Artifact\022\n\n\002id\030\001 \001" +
-      "(\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Datase" +
-      "tID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.Artifact" +
-      "Data\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog.Met" +
-      "adata\022*\n\npartitions\030\005 \003(\0132\026.datacatalog." +
-      "Partition\022\036\n\004tags\030\006 \003(\0132\020.datacatalog.Ta" +
-      "g\022.\n\ncreated_at\030\007 \001(\0132\032.google.protobuf." +
-      "Timestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 \001(\t\022" +
-      "%\n\005value\030\002 \001(\0132\026.flyteidl.core.Literal\"Q" +
-      "\n\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002 \001(\t" +
-      "\022\'\n\007dataset\030\003 \001(\0132\026.datacatalog.DatasetI" +
-      "D\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.datacat" +
-      "alog.Metadata.KeyMapEntry\032-\n\013KeyMapEntry" +
-      "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020Filt" +
-      "erExpression\0222\n\007filters\030\001 \003(\0132!.datacata" +
-      "log.SinglePropertyFilter\"\211\003\n\024SinglePrope" +
-      "rtyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.datacata" +
-      "log.TagPropertyFilterH\000\022@\n\020partition_fil" +
-      "ter\030\002 \001(\0132$.datacatalog.PartitionPropert" +
-      "yFilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#.dat" +
-      "acatalog.ArtifactPropertyFilterH\000\022<\n\016dat" +
-      "aset_filter\030\004 \001(\0132\".datacatalog.DatasetP" +
-      "ropertyFilterH\000\022F\n\010operator\030\n \001(\01624.data" +
-      "catalog.SinglePropertyFilter.ComparisonO" +
-      "perator\" \n\022ComparisonOperator\022\n\n\006EQUALS\020" +
-      "\000B\021\n\017property_filter\";\n\026ArtifactProperty" +
-      "Filter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010propert" +
-      "y\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001 \001(\t" +
-      "H\000B\n\n\010property\"S\n\027PartitionPropertyFilte" +
-      "r\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.KeyValu" +
-      "ePairH\000B\n\n\010property\"*\n\014KeyValuePair\022\013\n\003k" +
-      "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"z\n\025DatasetProper" +
-      "tyFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030\002 \001(" +
-      "\tH\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001(\tH\000" +
-      "\022\r\n\003org\030\005 \001(\tH\000B\n\n\010property\"\361\001\n\021Paginati" +
-      "onOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005token\030\002 \001(\t\022" +
-      "7\n\007sortKey\030\003 \001(\0162&.datacatalog.Paginatio" +
-      "nOptions.SortKey\022;\n\tsortOrder\030\004 \001(\0162(.da" +
-      "tacatalog.PaginationOptions.SortOrder\"*\n" +
-      "\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n\tASCENDING\020" +
-      "\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME\020\0002\235\n\n\013Data" +
-      "Catalog\022V\n\rCreateDataset\022!.datacatalog.C" +
-      "reateDatasetRequest\032\".datacatalog.Create" +
-      "DatasetResponse\022M\n\nGetDataset\022\036.datacata" +
-      "log.GetDatasetRequest\032\037.datacatalog.GetD" +
-      "atasetResponse\022Y\n\016CreateArtifact\022\".datac" +
-      "atalog.CreateArtifactRequest\032#.datacatal" +
-      "og.CreateArtifactResponse\022P\n\013GetArtifact" +
-      "\022\037.datacatalog.GetArtifactRequest\032 .data" +
-      "catalog.GetArtifactResponse\022A\n\006AddTag\022\032." +
-      "datacatalog.AddTagRequest\032\033.datacatalog." +
-      "AddTagResponse\022V\n\rListArtifacts\022!.dataca" +
-      "talog.ListArtifactsRequest\032\".datacatalog" +
-      ".ListArtifactsResponse\022S\n\014ListDatasets\022 " +
-      ".datacatalog.ListDatasetsRequest\032!.datac" +
-      "atalog.ListDatasetsResponse\022Y\n\016UpdateArt" +
-      "ifact\022\".datacatalog.UpdateArtifactReques" +
-      "t\032#.datacatalog.UpdateArtifactResponse\022Y" +
-      "\n\016DeleteArtifact\022\".datacatalog.DeleteArt" +
-      "ifactRequest\032#.datacatalog.DeleteArtifac" +
-      "tResponse\022[\n\017DeleteArtifacts\022#.datacatal" +
-      "og.DeleteArtifactsRequest\032#.datacatalog." +
-      "DeleteArtifactResponse\022q\n\026GetOrExtendRes" +
-      "ervation\022*.datacatalog.GetOrExtendReserv" +
-      "ationRequest\032+.datacatalog.GetOrExtendRe" +
-      "servationResponse\022t\n\027GetOrExtendReservat" +
-      "ions\022+.datacatalog.GetOrExtendReservatio" +
-      "nsRequest\032,.datacatalog.GetOrExtendReser" +
-      "vationsResponse\022e\n\022ReleaseReservation\022&." +
-      "datacatalog.ReleaseReservationRequest\032\'." +
-      "datacatalog.ReleaseReservationResponse\022g" +
-      "\n\023ReleaseReservations\022\'.datacatalog.Rele" +
-      "aseReservationsRequest\032\'.datacatalog.Rel" +
-      "easeReservationResponseBCZAgithub.com/fl" +
-      "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" +
-      "/datacatalogb\006proto3"
+      "\001(\tH\000B\016\n\014query_handle\"\030\n\026DeleteArtifactR" +
+      "esponse\"M\n\rReservationID\022*\n\ndataset_id\030\001" +
+      " \001(\0132\026.datacatalog.DatasetID\022\020\n\010tag_name" +
+      "\030\002 \001(\t\"\234\001\n\035GetOrExtendReservationRequest" +
+      "\0222\n\016reservation_id\030\001 \001(\0132\032.datacatalog.R" +
+      "eservationID\022\020\n\010owner_id\030\002 \001(\t\0225\n\022heartb" +
+      "eat_interval\030\003 \001(\0132\031.google.protobuf.Dur" +
+      "ation\"\343\001\n\013Reservation\0222\n\016reservation_id\030" +
+      "\001 \001(\0132\032.datacatalog.ReservationID\022\020\n\010own" +
+      "er_id\030\002 \001(\t\0225\n\022heartbeat_interval\030\003 \001(\0132" +
+      "\031.google.protobuf.Duration\022.\n\nexpires_at" +
+      "\030\004 \001(\0132\032.google.protobuf.Timestamp\022\'\n\010me" +
+      "tadata\030\006 \001(\0132\025.datacatalog.Metadata\"O\n\036G" +
+      "etOrExtendReservationResponse\022-\n\013reserva" +
+      "tion\030\001 \001(\0132\030.datacatalog.Reservation\"a\n\031" +
+      "ReleaseReservationRequest\0222\n\016reservation" +
+      "_id\030\001 \001(\0132\032.datacatalog.ReservationID\022\020\n" +
+      "\010owner_id\030\002 \001(\t\"\034\n\032ReleaseReservationRes" +
+      "ponse\"m\n\007Dataset\022\"\n\002id\030\001 \001(\0132\026.datacatal" +
+      "og.DatasetID\022\'\n\010metadata\030\002 \001(\0132\025.datacat" +
+      "alog.Metadata\022\025\n\rpartitionKeys\030\003 \003(\t\"\'\n\t" +
+      "Partition\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"f\n" +
+      "\tDatasetID\022\017\n\007project\030\001 \001(\t\022\014\n\004name\030\002 \001(" +
+      "\t\022\016\n\006domain\030\003 \001(\t\022\017\n\007version\030\004 \001(\t\022\014\n\004UU" +
+      "ID\030\005 \001(\t\022\013\n\003org\030\006 \001(\t\"\215\002\n\010Artifact\022\n\n\002id" +
+      "\030\001 \001(\t\022\'\n\007dataset\030\002 \001(\0132\026.datacatalog.Da" +
+      "tasetID\022\'\n\004data\030\003 \003(\0132\031.datacatalog.Arti" +
+      "factData\022\'\n\010metadata\030\004 \001(\0132\025.datacatalog" +
+      ".Metadata\022*\n\npartitions\030\005 \003(\0132\026.datacata" +
+      "log.Partition\022\036\n\004tags\030\006 \003(\0132\020.datacatalo" +
+      "g.Tag\022.\n\ncreated_at\030\007 \001(\0132\032.google.proto" +
+      "buf.Timestamp\"C\n\014ArtifactData\022\014\n\004name\030\001 " +
+      "\001(\t\022%\n\005value\030\002 \001(\0132\026.flyteidl.core.Liter" +
+      "al\"Q\n\003Tag\022\014\n\004name\030\001 \001(\t\022\023\n\013artifact_id\030\002" +
+      " \001(\t\022\'\n\007dataset\030\003 \001(\0132\026.datacatalog.Data" +
+      "setID\"m\n\010Metadata\0222\n\007key_map\030\001 \003(\0132!.dat" +
+      "acatalog.Metadata.KeyMapEntry\032-\n\013KeyMapE" +
+      "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"F\n\020" +
+      "FilterExpression\0222\n\007filters\030\001 \003(\0132!.data" +
+      "catalog.SinglePropertyFilter\"\211\003\n\024SingleP" +
+      "ropertyFilter\0224\n\ntag_filter\030\001 \001(\0132\036.data" +
+      "catalog.TagPropertyFilterH\000\022@\n\020partition" +
+      "_filter\030\002 \001(\0132$.datacatalog.PartitionPro" +
+      "pertyFilterH\000\022>\n\017artifact_filter\030\003 \001(\0132#" +
+      ".datacatalog.ArtifactPropertyFilterH\000\022<\n" +
+      "\016dataset_filter\030\004 \001(\0132\".datacatalog.Data" +
+      "setPropertyFilterH\000\022F\n\010operator\030\n \001(\01624." +
+      "datacatalog.SinglePropertyFilter.Compari" +
+      "sonOperator\" \n\022ComparisonOperator\022\n\n\006EQU" +
+      "ALS\020\000B\021\n\017property_filter\";\n\026ArtifactProp" +
+      "ertyFilter\022\025\n\013artifact_id\030\001 \001(\tH\000B\n\n\010pro" +
+      "perty\"3\n\021TagPropertyFilter\022\022\n\010tag_name\030\001" +
+      " \001(\tH\000B\n\n\010property\"S\n\027PartitionPropertyF" +
+      "ilter\022,\n\007key_val\030\001 \001(\0132\031.datacatalog.Key" +
+      "ValuePairH\000B\n\n\010property\"*\n\014KeyValuePair\022" +
+      "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"z\n\025DatasetPr" +
+      "opertyFilter\022\021\n\007project\030\001 \001(\tH\000\022\016\n\004name\030" +
+      "\002 \001(\tH\000\022\020\n\006domain\030\003 \001(\tH\000\022\021\n\007version\030\004 \001" +
+      "(\tH\000\022\r\n\003org\030\005 \001(\tH\000B\n\n\010property\"\361\001\n\021Pagi" +
+      "nationOptions\022\r\n\005limit\030\001 \001(\r\022\r\n\005token\030\002 " +
+      "\001(\t\0227\n\007sortKey\030\003 \001(\0162&.datacatalog.Pagin" +
+      "ationOptions.SortKey\022;\n\tsortOrder\030\004 \001(\0162" +
+      "(.datacatalog.PaginationOptions.SortOrde" +
+      "r\"*\n\tSortOrder\022\016\n\nDESCENDING\020\000\022\r\n\tASCEND" +
+      "ING\020\001\"\034\n\007SortKey\022\021\n\rCREATION_TIME\020\0002\341\007\n\013" +
+      "DataCatalog\022V\n\rCreateDataset\022!.datacatal" +
+      "og.CreateDatasetRequest\032\".datacatalog.Cr" +
+      "eateDatasetResponse\022M\n\nGetDataset\022\036.data" +
+      "catalog.GetDatasetRequest\032\037.datacatalog." +
+      "GetDatasetResponse\022Y\n\016CreateArtifact\022\".d" +
+      "atacatalog.CreateArtifactRequest\032#.datac" +
+      "atalog.CreateArtifactResponse\022P\n\013GetArti" +
+      "fact\022\037.datacatalog.GetArtifactRequest\032 ." +
+      "datacatalog.GetArtifactResponse\022A\n\006AddTa" +
+      "g\022\032.datacatalog.AddTagRequest\032\033.datacata" +
+      "log.AddTagResponse\022V\n\rListArtifacts\022!.da" +
+      "tacatalog.ListArtifactsRequest\032\".datacat" +
+      "alog.ListArtifactsResponse\022S\n\014ListDatase" +
+      "ts\022 .datacatalog.ListDatasetsRequest\032!.d" +
+      "atacatalog.ListDatasetsResponse\022Y\n\016Updat" +
+      "eArtifact\022\".datacatalog.UpdateArtifactRe" +
+      "quest\032#.datacatalog.UpdateArtifactRespon" +
+      "se\022Y\n\016DeleteArtifact\022\".datacatalog.Delet" +
+      "eArtifactRequest\032#.datacatalog.DeleteArt" +
+      "ifactResponse\022q\n\026GetOrExtendReservation\022" +
+      "*.datacatalog.GetOrExtendReservationRequ" +
+      "est\032+.datacatalog.GetOrExtendReservation" +
+      "Response\022e\n\022ReleaseReservation\022&.datacat" +
+      "alog.ReleaseReservationRequest\032\'.datacat" +
+      "alog.ReleaseReservationResponseBCZAgithu" +
+      "b.com/flyteorg/flyte/flyteidl/gen/pb-go/" +
+      "flyteidl/datacatalogb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -39574,110 +35933,86 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DeleteArtifactRequest_descriptor,
         new java.lang.String[] { "Dataset", "ArtifactId", "TagName", "QueryHandle", });
-    internal_static_datacatalog_DeleteArtifactsRequest_descriptor =
-      getDescriptor().getMessageTypes().get(17);
-    internal_static_datacatalog_DeleteArtifactsRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_datacatalog_DeleteArtifactsRequest_descriptor,
-        new java.lang.String[] { "Artifacts", });
     internal_static_datacatalog_DeleteArtifactResponse_descriptor =
-      getDescriptor().getMessageTypes().get(18);
+      getDescriptor().getMessageTypes().get(17);
     internal_static_datacatalog_DeleteArtifactResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DeleteArtifactResponse_descriptor,
         new java.lang.String[] { });
     internal_static_datacatalog_ReservationID_descriptor =
-      getDescriptor().getMessageTypes().get(19);
+      getDescriptor().getMessageTypes().get(18);
     internal_static_datacatalog_ReservationID_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ReservationID_descriptor,
         new java.lang.String[] { "DatasetId", "TagName", });
     internal_static_datacatalog_GetOrExtendReservationRequest_descriptor =
-      getDescriptor().getMessageTypes().get(20);
+      getDescriptor().getMessageTypes().get(19);
     internal_static_datacatalog_GetOrExtendReservationRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_GetOrExtendReservationRequest_descriptor,
         new java.lang.String[] { "ReservationId", "OwnerId", "HeartbeatInterval", });
-    internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor =
-      getDescriptor().getMessageTypes().get(21);
-    internal_static_datacatalog_GetOrExtendReservationsRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_datacatalog_GetOrExtendReservationsRequest_descriptor,
-        new java.lang.String[] { "Reservations", });
     internal_static_datacatalog_Reservation_descriptor =
-      getDescriptor().getMessageTypes().get(22);
+      getDescriptor().getMessageTypes().get(20);
     internal_static_datacatalog_Reservation_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Reservation_descriptor,
         new java.lang.String[] { "ReservationId", "OwnerId", "HeartbeatInterval", "ExpiresAt", "Metadata", });
     internal_static_datacatalog_GetOrExtendReservationResponse_descriptor =
-      getDescriptor().getMessageTypes().get(23);
+      getDescriptor().getMessageTypes().get(21);
     internal_static_datacatalog_GetOrExtendReservationResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_GetOrExtendReservationResponse_descriptor,
         new java.lang.String[] { "Reservation", });
-    internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor =
-      getDescriptor().getMessageTypes().get(24);
-    internal_static_datacatalog_GetOrExtendReservationsResponse_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_datacatalog_GetOrExtendReservationsResponse_descriptor,
-        new java.lang.String[] { "Reservations", });
     internal_static_datacatalog_ReleaseReservationRequest_descriptor =
-      getDescriptor().getMessageTypes().get(25);
+      getDescriptor().getMessageTypes().get(22);
     internal_static_datacatalog_ReleaseReservationRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ReleaseReservationRequest_descriptor,
         new java.lang.String[] { "ReservationId", "OwnerId", });
-    internal_static_datacatalog_ReleaseReservationsRequest_descriptor =
-      getDescriptor().getMessageTypes().get(26);
-    internal_static_datacatalog_ReleaseReservationsRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_datacatalog_ReleaseReservationsRequest_descriptor,
-        new java.lang.String[] { "Reservations", });
     internal_static_datacatalog_ReleaseReservationResponse_descriptor =
-      getDescriptor().getMessageTypes().get(27);
+      getDescriptor().getMessageTypes().get(23);
     internal_static_datacatalog_ReleaseReservationResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ReleaseReservationResponse_descriptor,
         new java.lang.String[] { });
     internal_static_datacatalog_Dataset_descriptor =
-      getDescriptor().getMessageTypes().get(28);
+      getDescriptor().getMessageTypes().get(24);
     internal_static_datacatalog_Dataset_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Dataset_descriptor,
         new java.lang.String[] { "Id", "Metadata", "PartitionKeys", });
     internal_static_datacatalog_Partition_descriptor =
-      getDescriptor().getMessageTypes().get(29);
+      getDescriptor().getMessageTypes().get(25);
     internal_static_datacatalog_Partition_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Partition_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_datacatalog_DatasetID_descriptor =
-      getDescriptor().getMessageTypes().get(30);
+      getDescriptor().getMessageTypes().get(26);
     internal_static_datacatalog_DatasetID_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DatasetID_descriptor,
         new java.lang.String[] { "Project", "Name", "Domain", "Version", "UUID", "Org", });
     internal_static_datacatalog_Artifact_descriptor =
-      getDescriptor().getMessageTypes().get(31);
+      getDescriptor().getMessageTypes().get(27);
     internal_static_datacatalog_Artifact_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Artifact_descriptor,
         new java.lang.String[] { "Id", "Dataset", "Data", "Metadata", "Partitions", "Tags", "CreatedAt", });
     internal_static_datacatalog_ArtifactData_descriptor =
-      getDescriptor().getMessageTypes().get(32);
+      getDescriptor().getMessageTypes().get(28);
     internal_static_datacatalog_ArtifactData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ArtifactData_descriptor,
         new java.lang.String[] { "Name", "Value", });
     internal_static_datacatalog_Tag_descriptor =
-      getDescriptor().getMessageTypes().get(33);
+      getDescriptor().getMessageTypes().get(29);
     internal_static_datacatalog_Tag_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Tag_descriptor,
         new java.lang.String[] { "Name", "ArtifactId", "Dataset", });
     internal_static_datacatalog_Metadata_descriptor =
-      getDescriptor().getMessageTypes().get(34);
+      getDescriptor().getMessageTypes().get(30);
     internal_static_datacatalog_Metadata_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_Metadata_descriptor,
@@ -39689,49 +36024,49 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
         internal_static_datacatalog_Metadata_KeyMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_datacatalog_FilterExpression_descriptor =
-      getDescriptor().getMessageTypes().get(35);
+      getDescriptor().getMessageTypes().get(31);
     internal_static_datacatalog_FilterExpression_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_FilterExpression_descriptor,
         new java.lang.String[] { "Filters", });
     internal_static_datacatalog_SinglePropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(36);
+      getDescriptor().getMessageTypes().get(32);
     internal_static_datacatalog_SinglePropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_SinglePropertyFilter_descriptor,
         new java.lang.String[] { "TagFilter", "PartitionFilter", "ArtifactFilter", "DatasetFilter", "Operator", "PropertyFilter", });
     internal_static_datacatalog_ArtifactPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(37);
+      getDescriptor().getMessageTypes().get(33);
     internal_static_datacatalog_ArtifactPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_ArtifactPropertyFilter_descriptor,
         new java.lang.String[] { "ArtifactId", "Property", });
     internal_static_datacatalog_TagPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(38);
+      getDescriptor().getMessageTypes().get(34);
     internal_static_datacatalog_TagPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_TagPropertyFilter_descriptor,
         new java.lang.String[] { "TagName", "Property", });
     internal_static_datacatalog_PartitionPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(39);
+      getDescriptor().getMessageTypes().get(35);
     internal_static_datacatalog_PartitionPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_PartitionPropertyFilter_descriptor,
         new java.lang.String[] { "KeyVal", "Property", });
     internal_static_datacatalog_KeyValuePair_descriptor =
-      getDescriptor().getMessageTypes().get(40);
+      getDescriptor().getMessageTypes().get(36);
     internal_static_datacatalog_KeyValuePair_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_KeyValuePair_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_datacatalog_DatasetPropertyFilter_descriptor =
-      getDescriptor().getMessageTypes().get(41);
+      getDescriptor().getMessageTypes().get(37);
     internal_static_datacatalog_DatasetPropertyFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_DatasetPropertyFilter_descriptor,
         new java.lang.String[] { "Project", "Name", "Domain", "Version", "Org", "Property", });
     internal_static_datacatalog_PaginationOptions_descriptor =
-      getDescriptor().getMessageTypes().get(42);
+      getDescriptor().getMessageTypes().get(38);
     internal_static_datacatalog_PaginationOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_datacatalog_PaginationOptions_descriptor,
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
index 76b050a6b4..c381d0dbe3 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.py
@@ -16,7 +16,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xfb\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x05 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadataB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"\x99\x01\n\x15\x44\x65leteArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"Z\n\x16\x44\x65leteArtifactsRequest\x12@\n\tartifacts\x18\x01 \x03(\x0b\x32\".datacatalog.DeleteArtifactRequestR\tartifacts\"\x18\n\x16\x44\x65leteArtifactResponse\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"p\n\x1eGetOrExtendReservationsRequest\x12N\n\x0creservations\x18\x01 \x03(\x0b\x32*.datacatalog.GetOrExtendReservationRequestR\x0creservations\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"_\n\x1fGetOrExtendReservationsResponse\x12<\n\x0creservations\x18\x01 \x03(\x0b\x32\x18.datacatalog.ReservationR\x0creservations\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"h\n\x1aReleaseReservationsRequest\x12J\n\x0creservations\x18\x01 \x03(\x0b\x32&.datacatalog.ReleaseReservationRequestR\x0creservations\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x91\x01\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\x12\x10\n\x03org\x18\x06 \x01(\tR\x03org\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x9f\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07version\x12\x12\n\x03org\x18\x05 \x01(\tH\x00R\x03orgB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\x9d\n\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12Y\n\x0e\x44\x65leteArtifact\x12\".datacatalog.DeleteArtifactRequest\x1a#.datacatalog.DeleteArtifactResponse\x12[\n\x0f\x44\x65leteArtifacts\x12#.datacatalog.DeleteArtifactsRequest\x1a#.datacatalog.DeleteArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12t\n\x17GetOrExtendReservations\x12+.datacatalog.GetOrExtendReservationsRequest\x1a,.datacatalog.GetOrExtendReservationsResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponse\x12g\n\x13ReleaseReservations\x12\'.datacatalog.ReleaseReservationsRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xb2\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01ZAgithub.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&flyteidl/datacatalog/datacatalog.proto\x12\x0b\x64\x61tacatalog\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"F\n\x14\x43reateDatasetRequest\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x17\n\x15\x43reateDatasetResponse\"E\n\x11GetDatasetRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"D\n\x12GetDatasetResponse\x12.\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x14.datacatalog.DatasetR\x07\x64\x61taset\"\x96\x01\n\x12GetArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"H\n\x13GetArtifactResponse\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"J\n\x15\x43reateArtifactRequest\x12\x31\n\x08\x61rtifact\x18\x01 \x01(\x0b\x32\x15.datacatalog.ArtifactR\x08\x61rtifact\"\x18\n\x16\x43reateArtifactResponse\"3\n\rAddTagRequest\x12\"\n\x03tag\x18\x01 \x01(\x0b\x32\x10.datacatalog.TagR\x03tag\"\x10\n\x0e\x41\x64\x64TagResponse\"\xbf\x01\n\x14ListArtifactsRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12\x35\n\x06\x66ilter\x18\x02 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x03 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"k\n\x15ListArtifactsResponse\x12\x33\n\tartifacts\x18\x01 \x03(\x0b\x32\x15.datacatalog.ArtifactR\tartifacts\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\x8c\x01\n\x13ListDatasetsRequest\x12\x35\n\x06\x66ilter\x18\x01 \x01(\x0b\x32\x1d.datacatalog.FilterExpressionR\x06\x66ilter\x12>\n\npagination\x18\x02 \x01(\x0b\x32\x1e.datacatalog.PaginationOptionsR\npagination\"g\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datacatalog.DatasetR\x08\x64\x61tasets\x12\x1d\n\nnext_token\x18\x02 \x01(\tR\tnextToken\"\xfb\x01\n\x15UpdateArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagName\x12-\n\x04\x64\x61ta\x18\x04 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x05 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadataB\x0e\n\x0cquery_handle\"9\n\x16UpdateArtifactResponse\x12\x1f\n\x0b\x61rtifact_id\x18\x01 \x01(\tR\nartifactId\"\x99\x01\n\x15\x44\x65leteArtifactRequest\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12!\n\x0b\x61rtifact_id\x18\x02 \x01(\tH\x00R\nartifactId\x12\x1b\n\x08tag_name\x18\x03 \x01(\tH\x00R\x07tagNameB\x0e\n\x0cquery_handle\"\x18\n\x16\x44\x65leteArtifactResponse\"a\n\rReservationID\x12\x35\n\ndataset_id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\tdatasetId\x12\x19\n\x08tag_name\x18\x02 \x01(\tR\x07tagName\"\xc7\x01\n\x1dGetOrExtendReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\"\xa3\x02\n\x0bReservation\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\x12H\n\x12heartbeat_interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x11heartbeatInterval\x12\x39\n\nexpires_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\x12\x31\n\x08metadata\x18\x06 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\"\\\n\x1eGetOrExtendReservationResponse\x12:\n\x0breservation\x18\x01 \x01(\x0b\x32\x18.datacatalog.ReservationR\x0breservation\"y\n\x19ReleaseReservationRequest\x12\x41\n\x0ereservation_id\x18\x01 \x01(\x0b\x32\x1a.datacatalog.ReservationIDR\rreservationId\x12\x19\n\x08owner_id\x18\x02 \x01(\tR\x07ownerId\"\x1c\n\x1aReleaseReservationResponse\"\x8a\x01\n\x07\x44\x61taset\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x02id\x12\x31\n\x08metadata\x18\x02 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12$\n\rpartitionKeys\x18\x03 \x03(\tR\rpartitionKeys\"3\n\tPartition\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x91\x01\n\tDatasetID\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06\x64omain\x18\x03 \x01(\tR\x06\x64omain\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x12\n\x04UUID\x18\x05 \x01(\tR\x04UUID\x12\x10\n\x03org\x18\x06 \x01(\tR\x03org\"\xc7\x02\n\x08\x41rtifact\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x30\n\x07\x64\x61taset\x18\x02 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\x12-\n\x04\x64\x61ta\x18\x03 \x03(\x0b\x32\x19.datacatalog.ArtifactDataR\x04\x64\x61ta\x12\x31\n\x08metadata\x18\x04 \x01(\x0b\x32\x15.datacatalog.MetadataR\x08metadata\x12\x36\n\npartitions\x18\x05 \x03(\x0b\x32\x16.datacatalog.PartitionR\npartitions\x12$\n\x04tags\x18\x06 \x03(\x0b\x32\x10.datacatalog.TagR\x04tags\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\"P\n\x0c\x41rtifactData\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x16.flyteidl.core.LiteralR\x05value\"l\n\x03Tag\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0b\x61rtifact_id\x18\x02 \x01(\tR\nartifactId\x12\x30\n\x07\x64\x61taset\x18\x03 \x01(\x0b\x32\x16.datacatalog.DatasetIDR\x07\x64\x61taset\"\x81\x01\n\x08Metadata\x12:\n\x07key_map\x18\x01 \x03(\x0b\x32!.datacatalog.Metadata.KeyMapEntryR\x06keyMap\x1a\x39\n\x0bKeyMapEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"O\n\x10\x46ilterExpression\x12;\n\x07\x66ilters\x18\x01 \x03(\x0b\x32!.datacatalog.SinglePropertyFilterR\x07\x66ilters\"\xce\x03\n\x14SinglePropertyFilter\x12?\n\ntag_filter\x18\x01 \x01(\x0b\x32\x1e.datacatalog.TagPropertyFilterH\x00R\ttagFilter\x12Q\n\x10partition_filter\x18\x02 \x01(\x0b\x32$.datacatalog.PartitionPropertyFilterH\x00R\x0fpartitionFilter\x12N\n\x0f\x61rtifact_filter\x18\x03 \x01(\x0b\x32#.datacatalog.ArtifactPropertyFilterH\x00R\x0e\x61rtifactFilter\x12K\n\x0e\x64\x61taset_filter\x18\x04 \x01(\x0b\x32\".datacatalog.DatasetPropertyFilterH\x00R\rdatasetFilter\x12P\n\x08operator\x18\n \x01(\x0e\x32\x34.datacatalog.SinglePropertyFilter.ComparisonOperatorR\x08operator\" \n\x12\x43omparisonOperator\x12\n\n\x06\x45QUALS\x10\x00\x42\x11\n\x0fproperty_filter\"G\n\x16\x41rtifactPropertyFilter\x12!\n\x0b\x61rtifact_id\x18\x01 \x01(\tH\x00R\nartifactIdB\n\n\x08property\"<\n\x11TagPropertyFilter\x12\x1b\n\x08tag_name\x18\x01 \x01(\tH\x00R\x07tagNameB\n\n\x08property\"[\n\x17PartitionPropertyFilter\x12\x34\n\x07key_val\x18\x01 \x01(\x0b\x32\x19.datacatalog.KeyValuePairH\x00R\x06keyValB\n\n\x08property\"6\n\x0cKeyValuePair\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"\x9f\x01\n\x15\x44\x61tasetPropertyFilter\x12\x1a\n\x07project\x18\x01 \x01(\tH\x00R\x07project\x12\x14\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x12\x18\n\x06\x64omain\x18\x03 \x01(\tH\x00R\x06\x64omain\x12\x1a\n\x07version\x18\x04 \x01(\tH\x00R\x07version\x12\x12\n\x03org\x18\x05 \x01(\tH\x00R\x03orgB\n\n\x08property\"\x93\x02\n\x11PaginationOptions\x12\x14\n\x05limit\x18\x01 \x01(\rR\x05limit\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token\x12@\n\x07sortKey\x18\x03 \x01(\x0e\x32&.datacatalog.PaginationOptions.SortKeyR\x07sortKey\x12\x46\n\tsortOrder\x18\x04 \x01(\x0e\x32(.datacatalog.PaginationOptions.SortOrderR\tsortOrder\"*\n\tSortOrder\x12\x0e\n\nDESCENDING\x10\x00\x12\r\n\tASCENDING\x10\x01\"\x1c\n\x07SortKey\x12\x11\n\rCREATION_TIME\x10\x00\x32\xe1\x07\n\x0b\x44\x61taCatalog\x12V\n\rCreateDataset\x12!.datacatalog.CreateDatasetRequest\x1a\".datacatalog.CreateDatasetResponse\x12M\n\nGetDataset\x12\x1e.datacatalog.GetDatasetRequest\x1a\x1f.datacatalog.GetDatasetResponse\x12Y\n\x0e\x43reateArtifact\x12\".datacatalog.CreateArtifactRequest\x1a#.datacatalog.CreateArtifactResponse\x12P\n\x0bGetArtifact\x12\x1f.datacatalog.GetArtifactRequest\x1a .datacatalog.GetArtifactResponse\x12\x41\n\x06\x41\x64\x64Tag\x12\x1a.datacatalog.AddTagRequest\x1a\x1b.datacatalog.AddTagResponse\x12V\n\rListArtifacts\x12!.datacatalog.ListArtifactsRequest\x1a\".datacatalog.ListArtifactsResponse\x12S\n\x0cListDatasets\x12 .datacatalog.ListDatasetsRequest\x1a!.datacatalog.ListDatasetsResponse\x12Y\n\x0eUpdateArtifact\x12\".datacatalog.UpdateArtifactRequest\x1a#.datacatalog.UpdateArtifactResponse\x12Y\n\x0e\x44\x65leteArtifact\x12\".datacatalog.DeleteArtifactRequest\x1a#.datacatalog.DeleteArtifactResponse\x12q\n\x16GetOrExtendReservation\x12*.datacatalog.GetOrExtendReservationRequest\x1a+.datacatalog.GetOrExtendReservationResponse\x12\x65\n\x12ReleaseReservation\x12&.datacatalog.ReleaseReservationRequest\x1a\'.datacatalog.ReleaseReservationResponseB\xb2\x01\n\x0f\x63om.datacatalogB\x10\x44\x61tacatalogProtoP\x01ZAgithub.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tacatalog\xca\x02\x0b\x44\x61tacatalog\xe2\x02\x17\x44\x61tacatalog\\GPBMetadata\xea\x02\x0b\x44\x61tacatalogb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -61,66 +61,58 @@
   _globals['_UPDATEARTIFACTRESPONSE']._serialized_end=1650
   _globals['_DELETEARTIFACTREQUEST']._serialized_start=1653
   _globals['_DELETEARTIFACTREQUEST']._serialized_end=1806
-  _globals['_DELETEARTIFACTSREQUEST']._serialized_start=1808
-  _globals['_DELETEARTIFACTSREQUEST']._serialized_end=1898
-  _globals['_DELETEARTIFACTRESPONSE']._serialized_start=1900
-  _globals['_DELETEARTIFACTRESPONSE']._serialized_end=1924
-  _globals['_RESERVATIONID']._serialized_start=1926
-  _globals['_RESERVATIONID']._serialized_end=2023
-  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_start=2026
-  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_end=2225
-  _globals['_GETOREXTENDRESERVATIONSREQUEST']._serialized_start=2227
-  _globals['_GETOREXTENDRESERVATIONSREQUEST']._serialized_end=2339
-  _globals['_RESERVATION']._serialized_start=2342
-  _globals['_RESERVATION']._serialized_end=2633
-  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_start=2635
-  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_end=2727
-  _globals['_GETOREXTENDRESERVATIONSRESPONSE']._serialized_start=2729
-  _globals['_GETOREXTENDRESERVATIONSRESPONSE']._serialized_end=2824
-  _globals['_RELEASERESERVATIONREQUEST']._serialized_start=2826
-  _globals['_RELEASERESERVATIONREQUEST']._serialized_end=2947
-  _globals['_RELEASERESERVATIONSREQUEST']._serialized_start=2949
-  _globals['_RELEASERESERVATIONSREQUEST']._serialized_end=3053
-  _globals['_RELEASERESERVATIONRESPONSE']._serialized_start=3055
-  _globals['_RELEASERESERVATIONRESPONSE']._serialized_end=3083
-  _globals['_DATASET']._serialized_start=3086
-  _globals['_DATASET']._serialized_end=3224
-  _globals['_PARTITION']._serialized_start=3226
-  _globals['_PARTITION']._serialized_end=3277
-  _globals['_DATASETID']._serialized_start=3280
-  _globals['_DATASETID']._serialized_end=3425
-  _globals['_ARTIFACT']._serialized_start=3428
-  _globals['_ARTIFACT']._serialized_end=3755
-  _globals['_ARTIFACTDATA']._serialized_start=3757
-  _globals['_ARTIFACTDATA']._serialized_end=3837
-  _globals['_TAG']._serialized_start=3839
-  _globals['_TAG']._serialized_end=3947
-  _globals['_METADATA']._serialized_start=3950
-  _globals['_METADATA']._serialized_end=4079
-  _globals['_METADATA_KEYMAPENTRY']._serialized_start=4022
-  _globals['_METADATA_KEYMAPENTRY']._serialized_end=4079
-  _globals['_FILTEREXPRESSION']._serialized_start=4081
-  _globals['_FILTEREXPRESSION']._serialized_end=4160
-  _globals['_SINGLEPROPERTYFILTER']._serialized_start=4163
-  _globals['_SINGLEPROPERTYFILTER']._serialized_end=4625
-  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_start=4574
-  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_end=4606
-  _globals['_ARTIFACTPROPERTYFILTER']._serialized_start=4627
-  _globals['_ARTIFACTPROPERTYFILTER']._serialized_end=4698
-  _globals['_TAGPROPERTYFILTER']._serialized_start=4700
-  _globals['_TAGPROPERTYFILTER']._serialized_end=4760
-  _globals['_PARTITIONPROPERTYFILTER']._serialized_start=4762
-  _globals['_PARTITIONPROPERTYFILTER']._serialized_end=4853
-  _globals['_KEYVALUEPAIR']._serialized_start=4855
-  _globals['_KEYVALUEPAIR']._serialized_end=4909
-  _globals['_DATASETPROPERTYFILTER']._serialized_start=4912
-  _globals['_DATASETPROPERTYFILTER']._serialized_end=5071
-  _globals['_PAGINATIONOPTIONS']._serialized_start=5074
-  _globals['_PAGINATIONOPTIONS']._serialized_end=5349
-  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_start=5277
-  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_end=5319
-  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_start=5321
-  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_end=5349
-  _globals['_DATACATALOG']._serialized_start=5352
-  _globals['_DATACATALOG']._serialized_end=6661
+  _globals['_DELETEARTIFACTRESPONSE']._serialized_start=1808
+  _globals['_DELETEARTIFACTRESPONSE']._serialized_end=1832
+  _globals['_RESERVATIONID']._serialized_start=1834
+  _globals['_RESERVATIONID']._serialized_end=1931
+  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_start=1934
+  _globals['_GETOREXTENDRESERVATIONREQUEST']._serialized_end=2133
+  _globals['_RESERVATION']._serialized_start=2136
+  _globals['_RESERVATION']._serialized_end=2427
+  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_start=2429
+  _globals['_GETOREXTENDRESERVATIONRESPONSE']._serialized_end=2521
+  _globals['_RELEASERESERVATIONREQUEST']._serialized_start=2523
+  _globals['_RELEASERESERVATIONREQUEST']._serialized_end=2644
+  _globals['_RELEASERESERVATIONRESPONSE']._serialized_start=2646
+  _globals['_RELEASERESERVATIONRESPONSE']._serialized_end=2674
+  _globals['_DATASET']._serialized_start=2677
+  _globals['_DATASET']._serialized_end=2815
+  _globals['_PARTITION']._serialized_start=2817
+  _globals['_PARTITION']._serialized_end=2868
+  _globals['_DATASETID']._serialized_start=2871
+  _globals['_DATASETID']._serialized_end=3016
+  _globals['_ARTIFACT']._serialized_start=3019
+  _globals['_ARTIFACT']._serialized_end=3346
+  _globals['_ARTIFACTDATA']._serialized_start=3348
+  _globals['_ARTIFACTDATA']._serialized_end=3428
+  _globals['_TAG']._serialized_start=3430
+  _globals['_TAG']._serialized_end=3538
+  _globals['_METADATA']._serialized_start=3541
+  _globals['_METADATA']._serialized_end=3670
+  _globals['_METADATA_KEYMAPENTRY']._serialized_start=3613
+  _globals['_METADATA_KEYMAPENTRY']._serialized_end=3670
+  _globals['_FILTEREXPRESSION']._serialized_start=3672
+  _globals['_FILTEREXPRESSION']._serialized_end=3751
+  _globals['_SINGLEPROPERTYFILTER']._serialized_start=3754
+  _globals['_SINGLEPROPERTYFILTER']._serialized_end=4216
+  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_start=4165
+  _globals['_SINGLEPROPERTYFILTER_COMPARISONOPERATOR']._serialized_end=4197
+  _globals['_ARTIFACTPROPERTYFILTER']._serialized_start=4218
+  _globals['_ARTIFACTPROPERTYFILTER']._serialized_end=4289
+  _globals['_TAGPROPERTYFILTER']._serialized_start=4291
+  _globals['_TAGPROPERTYFILTER']._serialized_end=4351
+  _globals['_PARTITIONPROPERTYFILTER']._serialized_start=4353
+  _globals['_PARTITIONPROPERTYFILTER']._serialized_end=4444
+  _globals['_KEYVALUEPAIR']._serialized_start=4446
+  _globals['_KEYVALUEPAIR']._serialized_end=4500
+  _globals['_DATASETPROPERTYFILTER']._serialized_start=4503
+  _globals['_DATASETPROPERTYFILTER']._serialized_end=4662
+  _globals['_PAGINATIONOPTIONS']._serialized_start=4665
+  _globals['_PAGINATIONOPTIONS']._serialized_end=4940
+  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_start=4868
+  _globals['_PAGINATIONOPTIONS_SORTORDER']._serialized_end=4910
+  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_start=4912
+  _globals['_PAGINATIONOPTIONS_SORTKEY']._serialized_end=4940
+  _globals['_DATACATALOG']._serialized_start=4943
+  _globals['_DATACATALOG']._serialized_end=5936
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
index 31ab4934bc..7c6ea81921 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2.pyi
@@ -131,12 +131,6 @@ class DeleteArtifactRequest(_message.Message):
     tag_name: str
     def __init__(self, dataset: _Optional[_Union[DatasetID, _Mapping]] = ..., artifact_id: _Optional[str] = ..., tag_name: _Optional[str] = ...) -> None: ...
 
-class DeleteArtifactsRequest(_message.Message):
-    __slots__ = ["artifacts"]
-    ARTIFACTS_FIELD_NUMBER: _ClassVar[int]
-    artifacts: _containers.RepeatedCompositeFieldContainer[DeleteArtifactRequest]
-    def __init__(self, artifacts: _Optional[_Iterable[_Union[DeleteArtifactRequest, _Mapping]]] = ...) -> None: ...
-
 class DeleteArtifactResponse(_message.Message):
     __slots__ = []
     def __init__(self) -> None: ...
@@ -159,12 +153,6 @@ class GetOrExtendReservationRequest(_message.Message):
     heartbeat_interval: _duration_pb2.Duration
     def __init__(self, reservation_id: _Optional[_Union[ReservationID, _Mapping]] = ..., owner_id: _Optional[str] = ..., heartbeat_interval: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ...) -> None: ...
 
-class GetOrExtendReservationsRequest(_message.Message):
-    __slots__ = ["reservations"]
-    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
-    reservations: _containers.RepeatedCompositeFieldContainer[GetOrExtendReservationRequest]
-    def __init__(self, reservations: _Optional[_Iterable[_Union[GetOrExtendReservationRequest, _Mapping]]] = ...) -> None: ...
-
 class Reservation(_message.Message):
     __slots__ = ["reservation_id", "owner_id", "heartbeat_interval", "expires_at", "metadata"]
     RESERVATION_ID_FIELD_NUMBER: _ClassVar[int]
@@ -185,12 +173,6 @@ class GetOrExtendReservationResponse(_message.Message):
     reservation: Reservation
     def __init__(self, reservation: _Optional[_Union[Reservation, _Mapping]] = ...) -> None: ...
 
-class GetOrExtendReservationsResponse(_message.Message):
-    __slots__ = ["reservations"]
-    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
-    reservations: _containers.RepeatedCompositeFieldContainer[Reservation]
-    def __init__(self, reservations: _Optional[_Iterable[_Union[Reservation, _Mapping]]] = ...) -> None: ...
-
 class ReleaseReservationRequest(_message.Message):
     __slots__ = ["reservation_id", "owner_id"]
     RESERVATION_ID_FIELD_NUMBER: _ClassVar[int]
@@ -199,12 +181,6 @@ class ReleaseReservationRequest(_message.Message):
     owner_id: str
     def __init__(self, reservation_id: _Optional[_Union[ReservationID, _Mapping]] = ..., owner_id: _Optional[str] = ...) -> None: ...
 
-class ReleaseReservationsRequest(_message.Message):
-    __slots__ = ["reservations"]
-    RESERVATIONS_FIELD_NUMBER: _ClassVar[int]
-    reservations: _containers.RepeatedCompositeFieldContainer[ReleaseReservationRequest]
-    def __init__(self, reservations: _Optional[_Iterable[_Union[ReleaseReservationRequest, _Mapping]]] = ...) -> None: ...
-
 class ReleaseReservationResponse(_message.Message):
     __slots__ = []
     def __init__(self) -> None: ...
diff --git a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py
index 1f4ea13f32..fe4158c7bb 100644
--- a/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py
+++ b/flyteidl/gen/pb_python/flyteidl/datacatalog/datacatalog_pb2_grpc.py
@@ -63,31 +63,16 @@ def __init__(self, channel):
                 request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactRequest.SerializeToString,
                 response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString,
                 )
-        self.DeleteArtifacts = channel.unary_unary(
-                '/datacatalog.DataCatalog/DeleteArtifacts',
-                request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactsRequest.SerializeToString,
-                response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString,
-                )
         self.GetOrExtendReservation = channel.unary_unary(
                 '/datacatalog.DataCatalog/GetOrExtendReservation',
                 request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationRequest.SerializeToString,
                 response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationResponse.FromString,
                 )
-        self.GetOrExtendReservations = channel.unary_unary(
-                '/datacatalog.DataCatalog/GetOrExtendReservations',
-                request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsRequest.SerializeToString,
-                response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsResponse.FromString,
-                )
         self.ReleaseReservation = channel.unary_unary(
                 '/datacatalog.DataCatalog/ReleaseReservation',
                 request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationRequest.SerializeToString,
                 response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
                 )
-        self.ReleaseReservations = channel.unary_unary(
-                '/datacatalog.DataCatalog/ReleaseReservations',
-                request_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationsRequest.SerializeToString,
-                response_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
-                )
 
 
 class DataCatalogServicer(object):
@@ -162,17 +147,6 @@ def DeleteArtifact(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def DeleteArtifacts(self, request, context):
-        """Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
-        This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
-        will not result in an error.
-        The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-        artifacts deleted, however the operation can simply be retried to remove the remaining entries.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def GetOrExtendReservation(self, request, context):
         """Attempts to get or extend a reservation for the corresponding artifact. If one already exists
         (ie. another entity owns the reservation) then that reservation is retrieved.
@@ -190,16 +164,6 @@ def GetOrExtendReservation(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetOrExtendReservations(self, request, context):
-        """Attempts to get or extend reservations for multiple artifacts in a single operation.
-        The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
-        reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
-        endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def ReleaseReservation(self, request, context):
         """Release the reservation when the task holding the spot fails so that the other tasks
         can grab the spot.
@@ -208,18 +172,6 @@ def ReleaseReservation(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def ReleaseReservations(self, request, context):
-        """Releases reservations for multiple artifacts in a single operation.
-        This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
-        times will not result in error.
-        The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-        artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
-        reservations.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
 
 def add_DataCatalogServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -268,31 +220,16 @@ def add_DataCatalogServicer_to_server(servicer, server):
                     request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactRequest.FromString,
                     response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.SerializeToString,
             ),
-            'DeleteArtifacts': grpc.unary_unary_rpc_method_handler(
-                    servicer.DeleteArtifacts,
-                    request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactsRequest.FromString,
-                    response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.SerializeToString,
-            ),
             'GetOrExtendReservation': grpc.unary_unary_rpc_method_handler(
                     servicer.GetOrExtendReservation,
                     request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationRequest.FromString,
                     response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationResponse.SerializeToString,
             ),
-            'GetOrExtendReservations': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetOrExtendReservations,
-                    request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsRequest.FromString,
-                    response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsResponse.SerializeToString,
-            ),
             'ReleaseReservation': grpc.unary_unary_rpc_method_handler(
                     servicer.ReleaseReservation,
                     request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationRequest.FromString,
                     response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.SerializeToString,
             ),
-            'ReleaseReservations': grpc.unary_unary_rpc_method_handler(
-                    servicer.ReleaseReservations,
-                    request_deserializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationsRequest.FromString,
-                    response_serializer=flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.SerializeToString,
-            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'datacatalog.DataCatalog', rpc_method_handlers)
@@ -460,23 +397,6 @@ def DeleteArtifact(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
-    @staticmethod
-    def DeleteArtifacts(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/datacatalog.DataCatalog/DeleteArtifacts',
-            flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactsRequest.SerializeToString,
-            flyteidl_dot_datacatalog_dot_datacatalog__pb2.DeleteArtifactResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
     @staticmethod
     def GetOrExtendReservation(request,
             target,
@@ -494,23 +414,6 @@ def GetOrExtendReservation(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
-    @staticmethod
-    def GetOrExtendReservations(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/datacatalog.DataCatalog/GetOrExtendReservations',
-            flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsRequest.SerializeToString,
-            flyteidl_dot_datacatalog_dot_datacatalog__pb2.GetOrExtendReservationsResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
     @staticmethod
     def ReleaseReservation(request,
             target,
@@ -527,20 +430,3 @@ def ReleaseReservation(request,
             flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
-    @staticmethod
-    def ReleaseReservations(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/datacatalog.DataCatalog/ReleaseReservations',
-            flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationsRequest.SerializeToString,
-            flyteidl_dot_datacatalog_dot_datacatalog__pb2.ReleaseReservationResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/flyteidl/gen/pb_rust/datacatalog.rs b/flyteidl/gen/pb_rust/datacatalog.rs
index ba3a2b8920..cf56271fd6 100644
--- a/flyteidl/gen/pb_rust/datacatalog.rs
+++ b/flyteidl/gen/pb_rust/datacatalog.rs
@@ -202,14 +202,6 @@ pub mod delete_artifact_request {
         TagName(::prost::alloc::string::String),
     }
 }
-/// Request message for deleting multiple Artifacts and their associated ArtifactData.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteArtifactsRequest {
-    /// List of deletion requests for artifacts to remove
-    #[prost(message, repeated, tag="1")]
-    pub artifacts: ::prost::alloc::vec::Vec,
-}
 ///
 /// Response message for deleting an Artifact.
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -242,14 +234,6 @@ pub struct GetOrExtendReservationRequest {
     #[prost(message, optional, tag="3")]
     pub heartbeat_interval: ::core::option::Option<::prost_types::Duration>,
 }
-/// Request message for acquiring or extending reservations for multiple artifacts in a single operation.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetOrExtendReservationsRequest {
-    /// List of reservation requests for artifacts to acquire
-    #[prost(message, repeated, tag="1")]
-    pub reservations: ::prost::alloc::vec::Vec,
-}
 /// A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -278,14 +262,6 @@ pub struct GetOrExtendReservationResponse {
     #[prost(message, optional, tag="1")]
     pub reservation: ::core::option::Option,
 }
-/// List of reservations acquired for multiple artifacts in a single operation.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetOrExtendReservationsResponse {
-    /// List of (newly created or existing) reservations for artifacts requested
-    #[prost(message, repeated, tag="1")]
-    pub reservations: ::prost::alloc::vec::Vec,
-}
 /// Request to release reservation
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -297,14 +273,6 @@ pub struct ReleaseReservationRequest {
     #[prost(string, tag="2")]
     pub owner_id: ::prost::alloc::string::String,
 }
-/// Request message for releasing reservations for multiple artifacts in a single operation.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ReleaseReservationsRequest {
-    /// List of reservation requests for artifacts to release
-    #[prost(message, repeated, tag="1")]
-    pub reservations: ::prost::alloc::vec::Vec,
-}
 /// Response to release reservation
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
diff --git a/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto b/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto
index 89897b6aee..595cce1783 100644
--- a/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto
+++ b/flyteidl/protos/flyteidl/datacatalog/datacatalog.proto
@@ -43,13 +43,6 @@ service DataCatalog {
     // Deletes an existing artifact, removing the stored artifact data from the underlying blob storage.
     rpc DeleteArtifact (DeleteArtifactRequest) returns (DeleteArtifactResponse);
 
-    // Deletes multiple existing artifacts, removing the stored artifact data from the underlying blob storage.
-    // This endpoint is idempotent, trying to delete an unknown artifact or deleting existing artifact multiple times
-    // will not result in an error.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-    // artifacts deleted, however the operation can simply be retried to remove the remaining entries.
-    rpc DeleteArtifacts (DeleteArtifactsRequest) returns (DeleteArtifactResponse);
-
     // Attempts to get or extend a reservation for the corresponding artifact. If one already exists
     // (ie. another entity owns the reservation) then that reservation is retrieved.
     // Once you acquire a reservation, you need to  periodically extend the reservation with an
@@ -63,23 +56,9 @@ service DataCatalog {
     // a third task C may get the Artifact from A or B, whichever writes last.
     rpc GetOrExtendReservation (GetOrExtendReservationRequest) returns (GetOrExtendReservationResponse);
 
-    // Attempts to get or extend reservations for multiple artifacts in a single operation.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some artifacts in a
-    // reserved state if one acquisition fails - retry the operation or release all attempted artifacts (as the release
-    // endpoint is idempotent) to ensure no resources are locked accidentally in case of an error.
-    rpc GetOrExtendReservations (GetOrExtendReservationsRequest) returns (GetOrExtendReservationsResponse);
-
     // Release the reservation when the task holding the spot fails so that the other tasks
     // can grab the spot.
     rpc ReleaseReservation (ReleaseReservationRequest) returns (ReleaseReservationResponse);
-
-    // Releases reservations for multiple artifacts in a single operation.
-    // This endpoint is idempotent, trying to release an unknown reservation or releasing existing reservations multiple
-    // times will not result in error.
-    // The first non-recoverable error encountered will be returned. Note that this might leave some of the requested
-    // artifacts in their previous reserved state, however the operation can simply be retried to remove the remaining
-    // reservations.
-    rpc ReleaseReservations (ReleaseReservationsRequest) returns (ReleaseReservationResponse);
 }
 
 /*
@@ -240,12 +219,6 @@ message DeleteArtifactRequest {
     }
 }
 
-// Request message for deleting multiple Artifacts and their associated ArtifactData.
-message DeleteArtifactsRequest {
-    // List of deletion requests for artifacts to remove
-    repeated DeleteArtifactRequest artifacts = 1;
-}
-
 /*
  * Response message for deleting an Artifact.
  */
@@ -276,12 +249,6 @@ message GetOrExtendReservationRequest {
     google.protobuf.Duration heartbeat_interval = 3;
 }
 
-// Request message for acquiring or extending reservations for multiple artifacts in a single operation.
-message GetOrExtendReservationsRequest {
-    // List of reservation requests for artifacts to acquire
-    repeated GetOrExtendReservationRequest reservations = 1;
-}
-
 // A reservation including owner, heartbeat interval, expiration timestamp, and various metadata.
 message Reservation {
     // The unique ID for the reservation
@@ -306,12 +273,6 @@ message GetOrExtendReservationResponse {
     Reservation reservation = 1;
 }
 
-// List of reservations acquired for multiple artifacts in a single operation.
-message GetOrExtendReservationsResponse {
-    // List of (newly created or existing) reservations for artifacts requested
-    repeated Reservation reservations = 1;
-}
-
 // Request to release reservation
 message ReleaseReservationRequest {
     // The unique ID for the reservation
@@ -321,12 +282,6 @@ message ReleaseReservationRequest {
     string owner_id = 2;
 }
 
-// Request message for releasing reservations for multiple artifacts in a single operation.
-message ReleaseReservationsRequest {
-    // List of reservation requests for artifacts to release
-    repeated ReleaseReservationRequest reservations = 1;
-}
-
 // Response to release reservation
 message ReleaseReservationResponse {
 

From 706dc4ef7da2b024b335dcbb0a0c304a0d3229b9 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Fri, 26 Jan 2024 01:32:30 -0800
Subject: [PATCH 45/57] remove bulk delete counters

Signed-off-by: Paul Dittamo 
---
 datacatalog/pkg/manager/impl/artifact_manager.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/datacatalog/pkg/manager/impl/artifact_manager.go b/datacatalog/pkg/manager/impl/artifact_manager.go
index 655e1f6b25..5a965e249a 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager.go
@@ -48,9 +48,6 @@ type artifactMetrics struct {
 	deleteResponseTime       labeled.StopWatch
 	deleteSuccessCounter     labeled.Counter
 	deleteFailureCounter     labeled.Counter
-	bulkDeleteResponseTime   labeled.StopWatch
-	bulkDeleteSuccessCounter labeled.Counter
-	bulkDeleteFailureCounter labeled.Counter
 }
 
 type artifactManager struct {
@@ -513,9 +510,6 @@ func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.Da
 		deleteResponseTime:       labeled.NewStopWatch("delete_duration", "The duration of the delete artifact calls.", time.Millisecond, artifactScope, labeled.EmitUnlabeledMetric),
 		deleteSuccessCounter:     labeled.NewCounter("delete_success_count", "The number of times delete artifact succeeded", artifactScope, labeled.EmitUnlabeledMetric),
 		deleteFailureCounter:     labeled.NewCounter("delete_failure_count", "The number of times delete artifact failed", artifactScope, labeled.EmitUnlabeledMetric),
-		bulkDeleteResponseTime:   labeled.NewStopWatch("bulk_delete_duration", "The duration of the bulk delete artifacts calls.", time.Millisecond, artifactScope, labeled.EmitUnlabeledMetric),
-		bulkDeleteSuccessCounter: labeled.NewCounter("bulk_delete_success_count", "The number of times bulk delete artifacts succeeded", artifactScope, labeled.EmitUnlabeledMetric),
-		bulkDeleteFailureCounter: labeled.NewCounter("bulk_delete_failure_count", "The number of times bulk delete artifacts failed", artifactScope, labeled.EmitUnlabeledMetric),
 	}
 
 	return &artifactManager{

From 6ec0e88d5b319a905a2fa76b0d8db8819dfd1b1f Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 10:44:37 -0800
Subject: [PATCH 46/57] revert mod tidy chagnes

Signed-off-by: Paul Dittamo 
---
 datacatalog/go.mod    | 16 ++++++-------
 datacatalog/go.sum    | 20 ++++++++---------
 flytecopilot/go.mod   | 18 +++++++--------
 flytecopilot/go.sum   | 26 ++++++++++------------
 flyteidl/go.mod       | 20 ++++++++---------
 flyteidl/go.sum       | 40 ++++++++++++++-------------------
 flyteplugins/go.mod   | 18 +++++++--------
 flyteplugins/go.sum   | 30 ++++++++++++-------------
 flytepropeller/go.mod |  4 ++--
 flytestdlib/go.mod    | 31 ++++++++++----------------
 flytestdlib/go.sum    | 52 ++++++++++++++-----------------------------
 11 files changed, 119 insertions(+), 156 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index 9173304be3..387fcb0b24 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -28,7 +28,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -78,7 +78,7 @@ require (
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -108,7 +108,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -126,13 +126,13 @@ require (
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.3 // indirect
-	k8s.io/apimachinery v0.28.3 // indirect
-	k8s.io/client-go v0.28.3 // indirect
+	k8s.io/api v0.28.2 // indirect
+	k8s.io/apimachinery v0.28.2 // indirect
+	k8s.io/client-go v0.28.1 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.16.3 // indirect
+	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index e964477f61..32cd7cf0b1 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
+cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -99,8 +99,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -324,9 +324,8 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -475,8 +474,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -609,7 +608,6 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
@@ -688,8 +686,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flytecopilot/go.mod b/flytecopilot/go.mod
index 5d1ae87696..254e636513 100644
--- a/flytecopilot/go.mod
+++ b/flytecopilot/go.mod
@@ -14,9 +14,9 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	k8s.io/api v0.28.3
-	k8s.io/apimachinery v0.28.3
-	k8s.io/client-go v0.28.3
+	k8s.io/api v0.28.2
+	k8s.io/apimachinery v0.28.2
+	k8s.io/client-go v0.28.1
 	k8s.io/klog v1.0.0
 )
 
@@ -25,7 +25,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -36,7 +36,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -64,7 +64,7 @@ require (
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -79,7 +79,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.7.0 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -93,7 +93,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -115,7 +115,7 @@ require (
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.16.3 // indirect
+	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/flytecopilot/go.sum b/flytecopilot/go.sum
index b568d2524a..076bd774a8 100644
--- a/flytecopilot/go.sum
+++ b/flytecopilot/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
+cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -91,8 +91,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -256,9 +256,8 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
@@ -303,8 +302,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -382,8 +381,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -473,6 +472,7 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -502,8 +502,6 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -574,8 +572,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flyteidl/go.mod b/flyteidl/go.mod
index 259d2d445e..34466ad69e 100644
--- a/flyteidl/go.mod
+++ b/flyteidl/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/go-test/deep v1.0.7
 	github.com/golang/glog v1.1.0
 	github.com/golang/protobuf v1.5.3
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/jinzhu/copier v0.3.5
@@ -24,7 +24,7 @@ require (
 	google.golang.org/api v0.114.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
 	google.golang.org/grpc v1.56.1
-	k8s.io/apimachinery v0.28.3
+	k8s.io/apimachinery v0.28.2
 )
 
 require (
@@ -32,7 +32,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -44,7 +44,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -70,7 +70,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -81,7 +81,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.7.0 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
@@ -92,7 +92,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/term v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
@@ -105,12 +105,12 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.3 // indirect
-	k8s.io/client-go v0.28.3 // indirect
+	k8s.io/api v0.28.2 // indirect
+	k8s.io/client-go v0.28.1 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.16.3 // indirect
+	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/flyteidl/go.sum b/flyteidl/go.sum
index 65a9793b2f..3da11782cf 100644
--- a/flyteidl/go.sum
+++ b/flyteidl/go.sum
@@ -10,8 +10,8 @@ cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
 cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
 cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
 cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
+cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 h1:LNHhpdK7hzUcx/k1LIcuh5k7k1LGIWLQfCjaneSj7Fc=
@@ -51,8 +51,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -67,8 +67,6 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -83,11 +81,11 @@ github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2Kv
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
@@ -138,8 +136,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg=
+github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
@@ -159,10 +157,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -180,9 +178,8 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -222,8 +219,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
@@ -238,7 +235,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -273,8 +269,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -309,6 +305,7 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -318,8 +315,6 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -333,6 +328,7 @@ golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -341,8 +337,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -359,7 +355,6 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
@@ -372,7 +367,6 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
diff --git a/flyteplugins/go.mod b/flyteplugins/go.mod
index 1ecf6a9208..4992ae6072 100644
--- a/flyteplugins/go.mod
+++ b/flyteplugins/go.mod
@@ -25,18 +25,17 @@ require (
 	github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31
 	golang.org/x/net v0.15.0
 	golang.org/x/oauth2 v0.8.0
 	google.golang.org/api v0.114.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.3
-	k8s.io/apimachinery v0.28.3
-	k8s.io/client-go v0.28.3
+	k8s.io/api v0.28.2
+	k8s.io/apimachinery v0.28.2
+	k8s.io/client-go v0.28.1
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.16.3
+	sigs.k8s.io/controller-runtime v0.12.1
 )
 
 require (
@@ -44,7 +43,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -60,7 +59,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
@@ -90,7 +89,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -103,7 +102,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
@@ -119,6 +118,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/term v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum
index 5d0a702e3f..6cd1d9bf49 100644
--- a/flyteplugins/go.sum
+++ b/flyteplugins/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
+cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -116,8 +116,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -290,9 +290,8 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -339,8 +338,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -418,8 +417,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -443,8 +442,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -511,6 +510,7 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -540,8 +540,6 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -612,8 +610,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flytepropeller/go.mod b/flytepropeller/go.mod
index 4718522389..83f5c60055 100644
--- a/flytepropeller/go.mod
+++ b/flytepropeller/go.mod
@@ -13,6 +13,8 @@ require (
 	github.com/go-redis/redis v6.15.7+incompatible
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.5.3
+	github.com/google/uuid v1.3.1
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/imdario/mergo v0.3.13
 	github.com/magiconair/properties v1.8.6
@@ -83,10 +85,8 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod
index 9c186fc5cd..947fbe4b5c 100644
--- a/flytestdlib/go.mod
+++ b/flytestdlib/go.mod
@@ -9,18 +9,12 @@ require (
 	github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607
 	github.com/fatih/color v1.13.0
 	github.com/fatih/structtag v1.2.0
-	github.com/flyteorg/flyte/flyteidl v0.0.0-00010101000000-000000000000
-	github.com/flyteorg/flyte/flyteplugins v0.0.0-00010101000000-000000000000
-	github.com/flyteorg/flyte/flytepropeller v0.0.0-00010101000000-000000000000
 	github.com/flyteorg/stow v0.3.8
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-gormigrate/gormigrate/v2 v2.1.1
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.5.3
-	github.com/google/uuid v1.3.1
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/jackc/pgconn v1.14.1
 	github.com/jackc/pgx/v5 v5.4.3
@@ -28,29 +22,28 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/sirupsen/logrus v1.9.0
+	github.com/sirupsen/logrus v1.7.0
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.11.0
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0
 	go.opentelemetry.io/otel v1.19.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
 	go.opentelemetry.io/otel/sdk v1.19.0
 	go.opentelemetry.io/otel/trace v1.19.0
 	golang.org/x/time v0.3.0
-	golang.org/x/tools v0.13.0
+	golang.org/x/tools v0.9.3
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gorm.io/driver/postgres v1.5.3
 	gorm.io/driver/sqlite v1.5.4
 	gorm.io/gorm v1.25.4
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.3
-	k8s.io/apimachinery v0.28.3
-	k8s.io/client-go v0.28.3
-	sigs.k8s.io/controller-runtime v0.16.3
+	k8s.io/api v0.28.2
+	k8s.io/apimachinery v0.28.2
+	k8s.io/client-go v0.28.1
+	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
 )
 
 require (
@@ -58,7 +51,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -68,7 +61,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
@@ -82,6 +75,7 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -99,7 +93,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -122,8 +116,8 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
-	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -150,7 +144,6 @@ require (
 replace (
 	github.com/flyteorg/flyte/datacatalog => ../datacatalog
 	github.com/flyteorg/flyte/flyteadmin => ../flyteadmin
-	github.com/flyteorg/flyte/flyteidl => ../flyteidl
 	github.com/flyteorg/flyte/flyteplugins => ../flyteplugins
 	github.com/flyteorg/flyte/flytepropeller => ../flytepropeller
 	github.com/flyteorg/flyte/flytestdlib => ../flytestdlib
diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum
index 4fa4bc6909..baacaca1e5 100644
--- a/flytestdlib/go.sum
+++ b/flytestdlib/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
+cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -84,8 +84,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
-github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc=
 github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY=
@@ -99,16 +97,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
-github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607 h1:cTavhURetDkezJCvxFggiyLeP40Mrk/TtVg2+ycw1Es=
 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4=
 github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
@@ -130,8 +126,6 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gormigrate/gormigrate/v2 v2.1.1 h1:eGS0WTFRV30r103lU8JNXY27KbviRnqqIDobW3EV3iY=
 github.com/go-gormigrate/gormigrate/v2 v2.1.1/go.mod h1:L7nJ620PFDKei9QOhJzqA8kRCk+E3UbV2f5gv+1ndLc=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -234,10 +228,6 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -246,8 +236,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
@@ -311,7 +301,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -337,9 +326,8 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -359,7 +347,6 @@ github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU
 github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0=
@@ -392,8 +379,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -440,8 +427,6 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
 go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
 go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
 go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=
@@ -489,8 +474,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -515,8 +500,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -577,8 +562,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -625,9 +610,7 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
@@ -706,8 +689,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -768,7 +751,6 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=

From 3ce37420835c90d35889d1cad3f6b48117ff9648 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 10:53:03 -0800
Subject: [PATCH 47/57] replace flyteidl source in flytestdlib

Signed-off-by: Paul Dittamo 
---
 flytestdlib/go.mod | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod
index 947fbe4b5c..98454bce6c 100644
--- a/flytestdlib/go.mod
+++ b/flytestdlib/go.mod
@@ -144,6 +144,7 @@ require (
 replace (
 	github.com/flyteorg/flyte/datacatalog => ../datacatalog
 	github.com/flyteorg/flyte/flyteadmin => ../flyteadmin
+	github.com/flyteorg/flyte/flyteidl => ../flyteidl
 	github.com/flyteorg/flyte/flyteplugins => ../flyteplugins
 	github.com/flyteorg/flyte/flytepropeller => ../flytepropeller
 	github.com/flyteorg/flyte/flytestdlib => ../flytestdlib

From 209e2aaee24aec6e83190151cf54995156bb5574 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 11:02:31 -0800
Subject: [PATCH 48/57] add otelgrpc dependency

Signed-off-by: Paul Dittamo 
---
 flytestdlib/go.mod | 1 +
 flytestdlib/go.sum | 1 +
 2 files changed, 2 insertions(+)

diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod
index 98454bce6c..f362d1225c 100644
--- a/flytestdlib/go.mod
+++ b/flytestdlib/go.mod
@@ -27,6 +27,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.11.0
 	github.com/stretchr/testify v1.8.4
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0
 	go.opentelemetry.io/otel v1.19.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum
index baacaca1e5..9c6f015305 100644
--- a/flytestdlib/go.sum
+++ b/flytestdlib/go.sum
@@ -427,6 +427,7 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
 go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
 go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
 go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=

From 007be112a0da6f586c77a89ae390831b5c1a78df Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 11:23:37 -0800
Subject: [PATCH 49/57] fix flytestdlib dependencies

Signed-off-by: Paul Dittamo 
---
 flytestdlib/go.mod | 29 +++++++++++++++++------------
 flytestdlib/go.sum | 16 ++++++++++++++++
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod
index f362d1225c..9c186fc5cd 100644
--- a/flytestdlib/go.mod
+++ b/flytestdlib/go.mod
@@ -9,12 +9,18 @@ require (
 	github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607
 	github.com/fatih/color v1.13.0
 	github.com/fatih/structtag v1.2.0
+	github.com/flyteorg/flyte/flyteidl v0.0.0-00010101000000-000000000000
+	github.com/flyteorg/flyte/flyteplugins v0.0.0-00010101000000-000000000000
+	github.com/flyteorg/flyte/flytepropeller v0.0.0-00010101000000-000000000000
 	github.com/flyteorg/stow v0.3.8
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-gormigrate/gormigrate/v2 v2.1.1
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.5.3
+	github.com/google/uuid v1.3.1
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/jackc/pgconn v1.14.1
 	github.com/jackc/pgx/v5 v5.4.3
@@ -22,7 +28,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/sirupsen/logrus v1.7.0
+	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.11.0
@@ -34,17 +40,17 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0
 	go.opentelemetry.io/otel/trace v1.19.0
 	golang.org/x/time v0.3.0
-	golang.org/x/tools v0.9.3
+	golang.org/x/tools v0.13.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gorm.io/driver/postgres v1.5.3
 	gorm.io/driver/sqlite v1.5.4
 	gorm.io/gorm v1.25.4
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.1
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
+	sigs.k8s.io/controller-runtime v0.16.3
 )
 
 require (
@@ -52,7 +58,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -62,7 +68,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
@@ -76,7 +82,6 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -94,7 +99,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -117,8 +122,8 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
+	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum
index 9c6f015305..3b8425c187 100644
--- a/flytestdlib/go.sum
+++ b/flytestdlib/go.sum
@@ -47,6 +47,7 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
 cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -99,6 +100,7 @@ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
 github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -126,6 +128,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gormigrate/gormigrate/v2 v2.1.1 h1:eGS0WTFRV30r103lU8JNXY27KbviRnqqIDobW3EV3iY=
 github.com/go-gormigrate/gormigrate/v2 v2.1.1/go.mod h1:L7nJ620PFDKei9QOhJzqA8kRCk+E3UbV2f5gv+1ndLc=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -228,6 +232,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -301,6 +307,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -328,6 +335,7 @@ github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -347,6 +355,7 @@ github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU
 github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0=
@@ -381,6 +390,7 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -477,6 +487,7 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -503,6 +514,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -611,7 +623,9 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
@@ -692,6 +706,7 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
 golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -752,6 +767,7 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=

From 13a2f6825cf2c9d8f18cc3d9c7f2714efa665a6a Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 11:28:29 -0800
Subject: [PATCH 50/57] revert release reservation changes to support release
 multiple reservations

Signed-off-by: Paul Dittamo 
---
 datacatalog/go.mod                            | 16 ++++++------
 datacatalog/go.sum                            | 20 ++++++++-------
 .../pkg/manager/impl/reservation_manager.go   | 25 ++++++-------------
 3 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index 387fcb0b24..9173304be3 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -28,7 +28,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -78,7 +78,7 @@ require (
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -108,7 +108,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -126,13 +126,13 @@ require (
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.2 // indirect
-	k8s.io/apimachinery v0.28.2 // indirect
-	k8s.io/client-go v0.28.1 // indirect
+	k8s.io/api v0.28.3 // indirect
+	k8s.io/apimachinery v0.28.3 // indirect
+	k8s.io/client-go v0.28.3 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
+	sigs.k8s.io/controller-runtime v0.16.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index 32cd7cf0b1..e964477f61 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -99,8 +99,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -324,8 +324,9 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -474,8 +475,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -608,6 +609,7 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
@@ -686,8 +688,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/datacatalog/pkg/manager/impl/reservation_manager.go b/datacatalog/pkg/manager/impl/reservation_manager.go
index d63a28f85d..65e0cc25c2 100644
--- a/datacatalog/pkg/manager/impl/reservation_manager.go
+++ b/datacatalog/pkg/manager/impl/reservation_manager.go
@@ -199,33 +199,22 @@ func (r *reservationManager) ReleaseReservation(ctx context.Context, request *da
 		return nil, err
 	}
 
-	if err := r.releaseReservation(ctx, request.ReservationId, request.OwnerId); err != nil {
-		r.systemMetrics.releaseReservationFailure.Inc(ctx)
-		return nil, err
-	}
-
-	return &datacatalog.ReleaseReservationResponse{}, nil
-}
-
-// releaseReservation performs the actual reservation release operation, deleting the respective object from
-// datacatalog's database, thus freeing the associated artifact for other entities. If the specified reservation was not
-// found, no error will be returned.
-func (r *reservationManager) releaseReservation(ctx context.Context, reservationID *datacatalog.ReservationID, ownerID string) error {
 	repo := r.repo.ReservationRepo()
-	reservationKey := transformers.FromReservationID(reservationID)
+	reservationKey := transformers.FromReservationID(request.ReservationId)
 
-	err := repo.Delete(ctx, reservationKey, ownerID)
+	err := repo.Delete(ctx, reservationKey, request.OwnerId)
 	if err != nil {
 		if errors.IsDoesNotExistError(err) {
-			logger.Warnf(ctx, "Reservation does not exist id: %+v, err %v", reservationID, err)
+			logger.Warnf(ctx, "Reservation does not exist id: %+v, err %v", request.ReservationId, err)
 			r.systemMetrics.reservationDoesNotExist.Inc(ctx)
-			return nil
+			return &datacatalog.ReleaseReservationResponse{}, nil
 		}
 
 		logger.Errorf(ctx, "Failed to release reservation: %+v, err: %v", reservationKey, err)
-		return err
+		r.systemMetrics.releaseReservationFailure.Inc(ctx)
+		return nil, err
 	}
 
 	r.systemMetrics.reservationReleased.Inc(ctx)
-	return nil
+	return &datacatalog.ReleaseReservationResponse{}, nil
 }

From 2f9c0b495e6b0eb0d12b4fccce081b7e624dc5d3 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 11:39:10 -0800
Subject: [PATCH 51/57] tidy

Signed-off-by: Paul Dittamo 
---
 flytecopilot/go.mod   | 18 +++++++++---------
 flytecopilot/go.sum   | 26 ++++++++++++++------------
 flyteidl/go.mod       | 20 ++++++++++----------
 flyteidl/go.sum       | 40 +++++++++++++++++++++++-----------------
 flyteplugins/go.mod   | 18 +++++++++---------
 flyteplugins/go.sum   | 30 ++++++++++++++++--------------
 flytepropeller/go.mod |  4 ++--
 flytestdlib/go.sum    | 35 ++++++++++++++++++-----------------
 go.mod                |  2 +-
 9 files changed, 102 insertions(+), 91 deletions(-)

diff --git a/flytecopilot/go.mod b/flytecopilot/go.mod
index 254e636513..5d1ae87696 100644
--- a/flytecopilot/go.mod
+++ b/flytecopilot/go.mod
@@ -14,9 +14,9 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.1
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
 	k8s.io/klog v1.0.0
 )
 
@@ -25,7 +25,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -36,7 +36,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -64,7 +64,7 @@ require (
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -79,7 +79,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.7.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -93,7 +93,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -115,7 +115,7 @@ require (
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
+	sigs.k8s.io/controller-runtime v0.16.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/flytecopilot/go.sum b/flytecopilot/go.sum
index 076bd774a8..b568d2524a 100644
--- a/flytecopilot/go.sum
+++ b/flytecopilot/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -91,8 +91,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -256,8 +256,9 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
@@ -302,8 +303,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -381,8 +382,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -472,7 +473,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -502,6 +502,8 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -572,8 +574,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flyteidl/go.mod b/flyteidl/go.mod
index 34466ad69e..259d2d445e 100644
--- a/flyteidl/go.mod
+++ b/flyteidl/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/go-test/deep v1.0.7
 	github.com/golang/glog v1.1.0
 	github.com/golang/protobuf v1.5.3
-	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/jinzhu/copier v0.3.5
@@ -24,7 +24,7 @@ require (
 	google.golang.org/api v0.114.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
 	google.golang.org/grpc v1.56.1
-	k8s.io/apimachinery v0.28.2
+	k8s.io/apimachinery v0.28.3
 )
 
 require (
@@ -32,7 +32,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -44,7 +44,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/flyteorg/stow v0.3.8 // indirect
@@ -70,7 +70,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -81,7 +81,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.7.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
@@ -92,7 +92,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/term v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
@@ -105,12 +105,12 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.2 // indirect
-	k8s.io/client-go v0.28.1 // indirect
+	k8s.io/api v0.28.3 // indirect
+	k8s.io/client-go v0.28.3 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 // indirect
+	sigs.k8s.io/controller-runtime v0.16.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/flyteidl/go.sum b/flyteidl/go.sum
index 3da11782cf..65a9793b2f 100644
--- a/flyteidl/go.sum
+++ b/flyteidl/go.sum
@@ -10,8 +10,8 @@ cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
 cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
 cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
 cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 h1:LNHhpdK7hzUcx/k1LIcuh5k7k1LGIWLQfCjaneSj7Fc=
@@ -51,8 +51,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -67,6 +67,8 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -81,11 +83,11 @@ github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2Kv
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
@@ -136,8 +138,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
-github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg=
-github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
@@ -157,10 +159,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -178,8 +180,9 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -219,8 +222,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
@@ -235,6 +238,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -269,8 +273,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -305,7 +309,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -315,6 +318,8 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -328,7 +333,6 @@ golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -337,8 +341,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -355,6 +359,7 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
@@ -367,6 +372,7 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
diff --git a/flyteplugins/go.mod b/flyteplugins/go.mod
index 4992ae6072..1ecf6a9208 100644
--- a/flyteplugins/go.mod
+++ b/flyteplugins/go.mod
@@ -25,17 +25,18 @@ require (
 	github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31
 	golang.org/x/net v0.15.0
 	golang.org/x/oauth2 v0.8.0
 	google.golang.org/api v0.114.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.1
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.12.1
+	sigs.k8s.io/controller-runtime v0.16.3
 )
 
 require (
@@ -43,7 +44,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -59,7 +60,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
@@ -89,7 +90,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -102,7 +103,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
@@ -118,7 +119,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/term v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum
index 6cd1d9bf49..5d0a702e3f 100644
--- a/flyteplugins/go.sum
+++ b/flyteplugins/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -116,8 +116,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -290,8 +290,9 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -338,8 +339,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -417,8 +418,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -442,8 +443,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -510,7 +511,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -540,6 +540,8 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -610,8 +612,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flytepropeller/go.mod b/flytepropeller/go.mod
index 83f5c60055..4718522389 100644
--- a/flytepropeller/go.mod
+++ b/flytepropeller/go.mod
@@ -13,8 +13,6 @@ require (
 	github.com/go-redis/redis v6.15.7+incompatible
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.5.3
-	github.com/google/uuid v1.3.1
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/imdario/mergo v0.3.13
 	github.com/magiconair/properties v1.8.6
@@ -85,8 +83,10 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum
index 3b8425c187..4fa4bc6909 100644
--- a/flytestdlib/go.sum
+++ b/flytestdlib/go.sum
@@ -45,8 +45,7 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
 cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
@@ -85,6 +84,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coocood/freecache v1.1.1 h1:uukNF7QKCZEdZ9gAV7WQzvh0SbjwdMF6m3x3rxEkaPc=
 github.com/coocood/freecache v1.1.1/go.mod h1:OKrEjkGVoxZhyWAJoeFi5BMLUJm2Tit0kpGkIr7NGYY=
@@ -98,8 +99,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -107,6 +107,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
+github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607 h1:cTavhURetDkezJCvxFggiyLeP40Mrk/TtVg2+ycw1Es=
 github.com/ernesto-jimenez/gogen v0.0.0-20180125220232-d7d4131e6607/go.mod h1:Cg4fM0vhYWOZdgM7RIOSTRNIc8/VT7CXClC3Ni86lu4=
 github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
@@ -232,7 +234,9 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -242,8 +246,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
@@ -333,8 +337,8 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
@@ -388,8 +392,7 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -437,6 +440,7 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
 go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
 go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
@@ -485,8 +489,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
 golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -512,8 +515,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -575,8 +577,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -704,8 +706,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/go.mod b/go.mod
index 9630132fd8..4169a0c104 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,6 @@ require (
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/sync v0.3.0
 	gorm.io/driver/postgres v1.5.3
-	k8s.io/client-go v0.28.3
 	sigs.k8s.io/controller-runtime v0.16.3
 )
 
@@ -213,6 +212,7 @@ require (
 	k8s.io/api v0.28.3 // indirect
 	k8s.io/apiextensions-apiserver v0.28.0 // indirect
 	k8s.io/apimachinery v0.28.3 // indirect
+	k8s.io/client-go v0.28.3 // indirect
 	k8s.io/component-base v0.28.1 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect

From 91d30e405ff5cf5520ecd44ca531a859bb1817ab Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 12:51:23 -0800
Subject: [PATCH 52/57] revert tidy

Signed-off-by: Paul Dittamo 
---
 flyteplugins/go.mod | 28 +++++++++++++-------------
 flyteplugins/go.sum | 48 ++++++++++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/flyteplugins/go.mod b/flyteplugins/go.mod
index 1ecf6a9208..f05f87e219 100644
--- a/flyteplugins/go.mod
+++ b/flyteplugins/go.mod
@@ -22,21 +22,21 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c
+	github.com/ray-project/kuberay/ray-operator v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31
-	golang.org/x/net v0.15.0
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
+	golang.org/x/net v0.17.0
 	golang.org/x/oauth2 v0.8.0
 	google.golang.org/api v0.114.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.3
-	k8s.io/apimachinery v0.28.3
-	k8s.io/client-go v0.28.3
+	k8s.io/api v0.28.2
+	k8s.io/apimachinery v0.28.2
+	k8s.io/client-go v0.28.1
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.16.3
+	sigs.k8s.io/controller-runtime v0.12.1
 )
 
 require (
@@ -44,7 +44,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -60,7 +60,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
@@ -90,7 +90,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -103,7 +103,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
@@ -118,9 +118,9 @@ require (
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum
index 5d0a702e3f..7b6b73bd79 100644
--- a/flyteplugins/go.sum
+++ b/flyteplugins/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
+cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -116,8 +116,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -290,9 +290,8 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -332,15 +331,15 @@ github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdO
 github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
 github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
 github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
-github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c h1:eEqXhtlsUVt798HNUEbdQsMRZSjHSOF5Ilsywuhlgfc=
-github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c/go.mod h1:uLBlYqsCS2nsKiVlxJxI5EVgq8CrqNeHDP5uq3hde+c=
+github.com/ray-project/kuberay/ray-operator v1.0.0 h1:i69nvbV7az2FG41VHQgxrmhD+SUl8ca+ek4RPbSE2Q0=
+github.com/ray-project/kuberay/ray-operator v1.0.0/go.mod h1:7C7ebIkxtkmOX8w1iiLrKM1j4hkZs/Guzm3WdePk/yg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -406,8 +405,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -418,8 +417,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
-golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -443,8 +442,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -478,8 +477,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -541,14 +540,13 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -612,8 +610,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 30eb267f02ed0b276be00bb1d4544efef28e4957 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 13:04:11 -0800
Subject: [PATCH 53/57] tidy :facepalm:

Signed-off-by: Paul Dittamo 
---
 datacatalog/go.mod    | 10 +++++-----
 datacatalog/go.sum    |  5 +++++
 flyteadmin/go.mod     |  2 +-
 flyteadmin/go.sum     |  4 ++--
 flytecopilot/go.mod   | 10 +++++-----
 flytecopilot/go.sum   | 20 ++++++++++----------
 flyteidl/go.mod       | 10 +++++-----
 flyteidl/go.sum       |  5 +++++
 flyteplugins/go.mod   | 16 ++++++++--------
 flyteplugins/go.sum   | 24 +++++++++++++-----------
 flytepropeller/go.mod | 12 ++++++------
 flytepropeller/go.sum | 24 ++++++++++++------------
 flytestdlib/go.mod    | 10 +++++-----
 flytestdlib/go.sum    | 20 ++++++++++----------
 go.mod                |  4 ++--
 go.sum                |  8 ++++----
 16 files changed, 98 insertions(+), 86 deletions(-)

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index 9173304be3..5da14ecba0 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -94,7 +94,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.9.2 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -107,12 +107,12 @@ require (
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index e964477f61..bb2970acf4 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -380,6 +380,7 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
 github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -465,6 +466,7 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -539,6 +541,7 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -614,12 +617,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/flyteadmin/go.mod b/flyteadmin/go.mod
index 2389a5bcd7..e6e770f8c2 100644
--- a/flyteadmin/go.mod
+++ b/flyteadmin/go.mod
@@ -159,7 +159,7 @@ require (
 	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
 	github.com/sendgrid/rest v2.6.8+incompatible // indirect
-	github.com/sirupsen/logrus v1.9.2 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
diff --git a/flyteadmin/go.sum b/flyteadmin/go.sum
index 0a35d9e7f7..7280df0570 100644
--- a/flyteadmin/go.sum
+++ b/flyteadmin/go.sum
@@ -1196,8 +1196,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
-github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
diff --git a/flytecopilot/go.mod b/flytecopilot/go.mod
index 5d1ae87696..1129d38ea5 100644
--- a/flytecopilot/go.mod
+++ b/flytecopilot/go.mod
@@ -79,7 +79,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -92,12 +92,12 @@ require (
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
diff --git a/flytecopilot/go.sum b/flytecopilot/go.sum
index b568d2524a..136cdedecf 100644
--- a/flytecopilot/go.sum
+++ b/flytecopilot/go.sum
@@ -303,8 +303,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -370,8 +370,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -440,8 +440,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -505,12 +505,12 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/flyteidl/go.mod b/flyteidl/go.mod
index 259d2d445e..d29525881e 100644
--- a/flyteidl/go.mod
+++ b/flyteidl/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/net v0.15.0
+	golang.org/x/net v0.17.0
 	golang.org/x/oauth2 v0.8.0
 	google.golang.org/api v0.114.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
@@ -81,7 +81,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
@@ -91,10 +91,10 @@ require (
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
diff --git a/flyteidl/go.sum b/flyteidl/go.sum
index 65a9793b2f..cf27a26fff 100644
--- a/flyteidl/go.sum
+++ b/flyteidl/go.sum
@@ -224,6 +224,7 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
@@ -272,6 +273,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
 golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
@@ -295,6 +297,7 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
@@ -322,9 +325,11 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff --git a/flyteplugins/go.mod b/flyteplugins/go.mod
index f05f87e219..35b52cf122 100644
--- a/flyteplugins/go.mod
+++ b/flyteplugins/go.mod
@@ -25,18 +25,18 @@ require (
 	github.com/ray-project/kuberay/ray-operator v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
+	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31
 	golang.org/x/net v0.17.0
 	golang.org/x/oauth2 v0.8.0
 	google.golang.org/api v0.114.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.30.0
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.1
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.12.1
+	sigs.k8s.io/controller-runtime v0.16.3
 )
 
 require (
@@ -44,7 +44,7 @@ require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/storage v1.28.1 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -60,7 +60,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
@@ -90,7 +90,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum
index 7b6b73bd79..9ad24226f9 100644
--- a/flyteplugins/go.sum
+++ b/flyteplugins/go.sum
@@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
@@ -116,8 +116,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -290,8 +290,9 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -417,8 +418,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
+golang.org/x/exp v0.0.0-20231005195138-3e424a577f31/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -442,8 +443,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -540,6 +541,7 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -610,8 +612,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/flytepropeller/go.mod b/flytepropeller/go.mod
index 4718522389..bf685fe60c 100644
--- a/flytepropeller/go.mod
+++ b/flytepropeller/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/sirupsen/logrus v1.9.0
+	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
@@ -112,7 +112,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c // indirect
+	github.com/ray-project/kuberay/ray-operator v1.0.0 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -124,11 +124,11 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 // indirect
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
diff --git a/flytepropeller/go.sum b/flytepropeller/go.sum
index ad11190315..2e91bbfcb7 100644
--- a/flytepropeller/go.sum
+++ b/flytepropeller/go.sum
@@ -356,16 +356,16 @@ github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdO
 github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
 github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
 github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
-github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c h1:eEqXhtlsUVt798HNUEbdQsMRZSjHSOF5Ilsywuhlgfc=
-github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c/go.mod h1:uLBlYqsCS2nsKiVlxJxI5EVgq8CrqNeHDP5uq3hde+c=
+github.com/ray-project/kuberay/ray-operator v1.0.0 h1:i69nvbV7az2FG41VHQgxrmhD+SUl8ca+ek4RPbSE2Q0=
+github.com/ray-project/kuberay/ray-operator v1.0.0/go.mod h1:7C7ebIkxtkmOX8w1iiLrKM1j4hkZs/Guzm3WdePk/yg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -439,8 +439,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -509,8 +509,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -577,12 +577,12 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod
index 9c186fc5cd..6ba57dc71a 100644
--- a/flytestdlib/go.mod
+++ b/flytestdlib/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/sirupsen/logrus v1.9.0
+	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.11.0
@@ -121,13 +121,13 @@ require (
 	github.com/subosito/gotenv v1.2.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.114.0 // indirect
diff --git a/flytestdlib/go.sum b/flytestdlib/go.sum
index 4fa4bc6909..8406d5f1f5 100644
--- a/flytestdlib/go.sum
+++ b/flytestdlib/go.sum
@@ -392,8 +392,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
@@ -477,8 +477,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -553,8 +553,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -630,14 +630,14 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/go.mod b/go.mod
index 4169a0c104..d30c1c53cb 100644
--- a/go.mod
+++ b/go.mod
@@ -156,12 +156,12 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c // indirect
+	github.com/ray-project/kuberay/ray-operator v1.0.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
 	github.com/robfig/cron/v3 v3.0.0 // indirect
 	github.com/sendgrid/rest v2.6.8+incompatible // indirect
 	github.com/sendgrid/sendgrid-go v3.10.0+incompatible // indirect
-	github.com/sirupsen/logrus v1.9.2 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
diff --git a/go.sum b/go.sum
index 585e45ec4b..24fb43cff6 100644
--- a/go.sum
+++ b/go.sum
@@ -1170,8 +1170,8 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
 github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c h1:eEqXhtlsUVt798HNUEbdQsMRZSjHSOF5Ilsywuhlgfc=
-github.com/ray-project/kuberay/ray-operator v0.0.0-20220728052838-eaa75fa6707c/go.mod h1:uLBlYqsCS2nsKiVlxJxI5EVgq8CrqNeHDP5uq3hde+c=
+github.com/ray-project/kuberay/ray-operator v1.0.0 h1:i69nvbV7az2FG41VHQgxrmhD+SUl8ca+ek4RPbSE2Q0=
+github.com/ray-project/kuberay/ray-operator v1.0.0/go.mod h1:7C7ebIkxtkmOX8w1iiLrKM1j4hkZs/Guzm3WdePk/yg=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ=
@@ -1234,8 +1234,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
-github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=

From 7e8a19ec327a45bca2731c9cef121a1cbcc35df7 Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Wed, 31 Jan 2024 13:10:51 -0800
Subject: [PATCH 54/57] tidy

Signed-off-by: Paul Dittamo 
---
 datacatalog/go.sum  | 15 +++++----------
 flyteidl/go.sum     | 15 +++++----------
 flyteplugins/go.sum | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index bb2970acf4..e5884aeeb4 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -378,8 +378,7 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
-github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -464,8 +463,7 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -539,8 +537,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -615,15 +612,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/flyteidl/go.sum b/flyteidl/go.sum
index cf27a26fff..2264840807 100644
--- a/flyteidl/go.sum
+++ b/flyteidl/go.sum
@@ -222,8 +222,7 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -271,8 +270,7 @@ go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 h1:9k5exFQKQglLo+RoP+4zMjOFE14P6+vyR0baDAi0Rcs=
@@ -295,8 +293,7 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -323,12 +320,10 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/flyteplugins/go.sum b/flyteplugins/go.sum
index 79695ff275..9ad24226f9 100644
--- a/flyteplugins/go.sum
+++ b/flyteplugins/go.sum
@@ -543,9 +543,11 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -554,10 +556,12 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -608,11 +612,16 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
+gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -632,6 +641,7 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE=
 google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -639,6 +649,7 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -677,8 +688,11 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk=
+google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ=
 google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -697,6 +711,7 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
 google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -710,20 +725,27 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
 gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -732,16 +754,32 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw=
 k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg=
+k8s.io/apiextensions-apiserver v0.28.0 h1:CszgmBL8CizEnj4sj7/PtLGey6Na3YgWyGCPONv7E9E=
+k8s.io/apiextensions-apiserver v0.28.0/go.mod h1:uRdYiwIuu0SyqJKriKmqEN2jThIJPhVmOWETm8ud1VE=
+k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ=
 k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU=
+k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY=
 k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY=
+k8s.io/code-generator v0.24.1 h1:zS+dvmUNaOcvsQ4faV9hXNjsKG9/pQaLnts1Wma4RM8=
+k8s.io/code-generator v0.24.1/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
+k8s.io/component-base v0.28.1 h1:LA4AujMlK2mr0tZbQDZkjWbdhTV5bRyEyAFe0TJxlWg=
+k8s.io/component-base v0.28.1/go.mod h1:jI11OyhbX21Qtbav7JkhehyBsIRfnO8oEgoAR12ArIU=
+k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc=
 k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f h1:eeEUOoGYWhOz7EyXqhlR2zHKNw2mNJ9vzJmub6YN6kk=
 k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
+k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQVuIPU=
 sigs.k8s.io/controller-runtime v0.16.2/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

From 6e8052903542b9bda9dfc7bdaa99844876b8c75d Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Thu, 22 Feb 2024 15:43:50 -0800
Subject: [PATCH 55/57] cleanup

Signed-off-by: Paul Dittamo 
---
 flyteadmin/pkg/server/service.go                        | 2 +-
 flyteidl/go.mod                                         | 1 -
 flyteidl/go.sum                                         | 1 -
 flyteidl/protos/flyteidl/service/cache.proto            | 1 -
 flytepropeller/events/local_eventsink.go                | 3 ++-
 flytepropeller/go.mod                                   | 1 +
 flytepropeller/pkg/controller/controller.go             | 2 +-
 flytepropeller/pkg/controller/nodes/executor_test.go    | 2 +-
 flytepropeller/pkg/controller/workflow/executor_test.go | 2 +-
 9 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/flyteadmin/pkg/server/service.go b/flyteadmin/pkg/server/service.go
index 20d37fd11c..227d1b5d1f 100644
--- a/flyteadmin/pkg/server/service.go
+++ b/flyteadmin/pkg/server/service.go
@@ -148,7 +148,7 @@ func newGRPCServer(ctx context.Context, pluginRegistry *plugins.Registry, cfg *c
 
 	grpcService.RegisterSignalServiceServer(grpcServer, rpc.NewSignalServer(ctx, configuration, scope.NewSubScope("signal")))
 
-	service.RegisterCacheServiceServer(grpcServer, cacheservice.NewCacheServer(ctx, configuration, dataStorageClient, scope.NewSubScope("cache")))
+	grpcService.RegisterCacheServiceServer(grpcServer, cacheservice.NewCacheServer(ctx, configuration, dataStorageClient, scope.NewSubScope("cache")))
 
 	additionalService := plugins.Get[common.RegisterAdditionalGRPCService](pluginRegistry, plugins.PluginIDAdditionalGRPCService)
 	if additionalService != nil {
diff --git a/flyteidl/go.mod b/flyteidl/go.mod
index 53ceb01c83..e4cd041615 100644
--- a/flyteidl/go.mod
+++ b/flyteidl/go.mod
@@ -10,7 +10,6 @@ require (
 	github.com/golang/protobuf v1.5.3
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0
 	github.com/jinzhu/copier v0.3.5
 	github.com/mitchellh/mapstructure v1.5.0
diff --git a/flyteidl/go.sum b/flyteidl/go.sum
index b75153cfdb..661cfc4b3a 100644
--- a/flyteidl/go.sum
+++ b/flyteidl/go.sum
@@ -220,7 +220,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaW
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
diff --git a/flyteidl/protos/flyteidl/service/cache.proto b/flyteidl/protos/flyteidl/service/cache.proto
index 605a34d772..acf0c500c7 100644
--- a/flyteidl/protos/flyteidl/service/cache.proto
+++ b/flyteidl/protos/flyteidl/service/cache.proto
@@ -4,7 +4,6 @@ package flyteidl.service;
 option go_package = "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service";
 
 import "google/api/annotations.proto";
-// import "protoc-gen-swagger/options/annotations.proto";
 
 import "flyteidl/core/errors.proto";
 import "flyteidl/core/identifier.proto";
diff --git a/flytepropeller/events/local_eventsink.go b/flytepropeller/events/local_eventsink.go
index 39e3ff5cac..fdcd5408a4 100644
--- a/flytepropeller/events/local_eventsink.go
+++ b/flytepropeller/events/local_eventsink.go
@@ -7,8 +7,9 @@ import (
 	"os"
 	"sync"
 
-	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event"
 	"github.com/golang/protobuf/proto"
+
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event"
 )
 
 type localSink struct {
diff --git a/flytepropeller/go.mod b/flytepropeller/go.mod
index 8d5d755c21..5cbc5573d0 100644
--- a/flytepropeller/go.mod
+++ b/flytepropeller/go.mod
@@ -86,6 +86,7 @@ require (
 	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
diff --git a/flytepropeller/pkg/controller/controller.go b/flytepropeller/pkg/controller/controller.go
index 407fcdda49..510ccf1365 100644
--- a/flytepropeller/pkg/controller/controller.go
+++ b/flytepropeller/pkg/controller/controller.go
@@ -5,7 +5,6 @@ package controller
 import (
 	"context"
 	"fmt"
-	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"os"
 	"runtime/pprof"
 	"time"
@@ -50,6 +49,7 @@ import (
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflowstore"
 	leader "github.com/flyteorg/flyte/flytepropeller/pkg/leaderelection"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/utils"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	stdErrs "github.com/flyteorg/flyte/flytestdlib/errors"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
diff --git a/flytepropeller/pkg/controller/nodes/executor_test.go b/flytepropeller/pkg/controller/nodes/executor_test.go
index 3ee93663d4..379625899d 100644
--- a/flytepropeller/pkg/controller/nodes/executor_test.go
+++ b/flytepropeller/pkg/controller/nodes/executor_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"reflect"
 	"testing"
 	"time"
@@ -38,6 +37,7 @@ import (
 	recoveryMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery/mocks"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan"
 	flyteassert "github.com/flyteorg/flyte/flytepropeller/pkg/utils/assert"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
diff --git a/flytepropeller/pkg/controller/workflow/executor_test.go b/flytepropeller/pkg/controller/workflow/executor_test.go
index 461396823b..134f47c1ce 100644
--- a/flytepropeller/pkg/controller/workflow/executor_test.go
+++ b/flytepropeller/pkg/controller/workflow/executor_test.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"strconv"
 	"testing"
 	"time"
@@ -42,6 +41,7 @@ import (
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/task/fakeplugins"
 	wfErrors "github.com/flyteorg/flyte/flytepropeller/pkg/controller/workflow/errors"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
 	"github.com/flyteorg/flyte/flytestdlib/promutils"

From d858906e6879832536a2ffdab1d6fe443de0c38a Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Thu, 22 Feb 2024 15:45:52 -0800
Subject: [PATCH 56/57] cleanup

Signed-off-by: Paul Dittamo 
---
 flytepropeller/pkg/controller/nodes/array/handler_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flytepropeller/pkg/controller/nodes/array/handler_test.go b/flytepropeller/pkg/controller/nodes/array/handler_test.go
index a915ab16a4..d65e220221 100644
--- a/flytepropeller/pkg/controller/nodes/array/handler_test.go
+++ b/flytepropeller/pkg/controller/nodes/array/handler_test.go
@@ -3,7 +3,6 @@ package array
 import (
 	"context"
 	"fmt"
-	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -26,6 +25,7 @@ import (
 	recoverymocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/recovery/mocks"
 	"github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/subworkflow/launchplan"
 	"github.com/flyteorg/flyte/flytestdlib/bitarray"
+	"github.com/flyteorg/flyte/flytestdlib/catalog"
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"

From ae652a000a7917df442c9083cfa2b6b63bac623f Mon Sep 17 00:00:00 2001
From: Paul Dittamo 
Date: Thu, 22 Feb 2024 20:40:07 -0800
Subject: [PATCH 57/57] update boiler plate linter

Signed-off-by: Paul Dittamo 
---
 flytestdlib/.golangci.yml                                 | 3 +++
 flytestdlib/boilerplate/flyte/golangci_file/.golangci.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/flytestdlib/.golangci.yml b/flytestdlib/.golangci.yml
index 7f4dbc80e8..6d13f4a3b6 100644
--- a/flytestdlib/.golangci.yml
+++ b/flytestdlib/.golangci.yml
@@ -38,3 +38,6 @@ linters-settings:
       - default
       - prefix(github.com/flyteorg)
     skip-generated: true
+issues:
+  exclude:
+    - copylocks
diff --git a/flytestdlib/boilerplate/flyte/golangci_file/.golangci.yml b/flytestdlib/boilerplate/flyte/golangci_file/.golangci.yml
index 7f4dbc80e8..6d13f4a3b6 100644
--- a/flytestdlib/boilerplate/flyte/golangci_file/.golangci.yml
+++ b/flytestdlib/boilerplate/flyte/golangci_file/.golangci.yml
@@ -38,3 +38,6 @@ linters-settings:
       - default
       - prefix(github.com/flyteorg)
     skip-generated: true
+issues:
+  exclude:
+    - copylocks