From e44b90e345d47bad84fba1487e34d70f69919469 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 20 Jan 2023 17:06:32 -0800 Subject: [PATCH 01/46] Add fastapi plugin Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/config.go | 72 +++++ .../plugins/webapi/fastapi/config_test.go | 17 ++ .../webapi/fastapi/integration_test.go | 123 ++++++++ go/tasks/plugins/webapi/fastapi/plugin.go | 286 ++++++++++++++++++ .../plugins/webapi/fastapi/plugin_test.go | 113 +++++++ 5 files changed, 611 insertions(+) create mode 100644 go/tasks/plugins/webapi/fastapi/config.go create mode 100644 go/tasks/plugins/webapi/fastapi/config_test.go create mode 100644 go/tasks/plugins/webapi/fastapi/integration_test.go create mode 100644 go/tasks/plugins/webapi/fastapi/plugin.go create mode 100644 go/tasks/plugins/webapi/fastapi/plugin_test.go diff --git a/go/tasks/plugins/webapi/fastapi/config.go b/go/tasks/plugins/webapi/fastapi/config.go new file mode 100644 index 000000000..05c2b5a15 --- /dev/null +++ b/go/tasks/plugins/webapi/fastapi/config.go @@ -0,0 +1,72 @@ +package fastapi + +import ( + "time" + + pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flytestdlib/config" +) + +var ( + tokenKey = "FLYTE_FAST_API_TOKEN" // nolint: gosec + + defaultConfig = Config{ + WebAPI: webapi.PluginConfig{ + ResourceQuotas: map[core.ResourceNamespace]int{ + "default": 1000, + }, + ReadRateLimiter: webapi.RateLimiterConfig{ + Burst: 100, + QPS: 10, + }, + WriteRateLimiter: webapi.RateLimiterConfig{ + Burst: 100, + QPS: 10, + }, + Caching: webapi.CachingConfig{ + Size: 500000, + ResyncInterval: config.Duration{Duration: 30 * time.Second}, + Workers: 10, + MaxSystemFailures: 5, + }, + ResourceMeta: nil, + }, + ResourceConstraints: core.ResourceConstraintsSpec{ + ProjectScopeResourceConstraint: &core.ResourceConstraint{ + Value: 100, + }, + NamespaceScopeResourceConstraint: &core.ResourceConstraint{ + Value: 50, + }, + }, + TokenKey: tokenKey, + } + + configSection = pluginsConfig.MustRegisterSubSection("fastapi", &defaultConfig) +) + +// Config is config for 'databricks' plugin +type Config struct { + // WebAPI defines config for the base WebAPI plugin + WebAPI webapi.PluginConfig `json:"webApi" pflag:",Defines config for the base WebAPI plugin."` + + // ResourceConstraints defines resource constraints on how many executions to be created per project/overall at any given time + ResourceConstraints core.ResourceConstraintsSpec `json:"resourceConstraints" pflag:"-,Defines resource constraints on how many executions to be created per project/overall at any given time."` + + TokenKey string `json:"fastApiTokenKey" pflag:",Name of the key where to find Fast API access token in the secret manager."` + + DatabricksInstance string `json:"databricksInstance" pflag:",Databricks workspace instance name."` + + // fastApiEndpoint overrides fastapi server endpoint, only for testing + fastApiEndpoint string +} + +func GetConfig() *Config { + return configSection.GetConfig().(*Config) +} + +func SetConfig(cfg *Config) error { + return configSection.SetConfig(cfg) +} diff --git a/go/tasks/plugins/webapi/fastapi/config_test.go b/go/tasks/plugins/webapi/fastapi/config_test.go new file mode 100644 index 000000000..b6bb9a8b5 --- /dev/null +++ b/go/tasks/plugins/webapi/fastapi/config_test.go @@ -0,0 +1,17 @@ +package fastapi + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestGetAndSetConfig(t *testing.T) { + cfg := defaultConfig + cfg.WebAPI.Caching.Workers = 1 + cfg.WebAPI.Caching.ResyncInterval.Duration = 5 * time.Second + err := SetConfig(&cfg) + assert.NoError(t, err) + assert.Equal(t, &cfg, GetConfig()) +} diff --git a/go/tasks/plugins/webapi/fastapi/integration_test.go b/go/tasks/plugins/webapi/fastapi/integration_test.go new file mode 100644 index 000000000..7a5f6ea62 --- /dev/null +++ b/go/tasks/plugins/webapi/fastapi/integration_test.go @@ -0,0 +1,123 @@ +package fastapi + +// +//import ( +// "context" +// "fmt" +// "net/http" +// "net/http/httptest" +// "testing" +// "time" +// +// "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" +// "github.com/flyteorg/flytestdlib/utils" +// +// "github.com/flyteorg/flyteidl/clients/go/coreutils" +// coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" +// flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" +// "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" +// pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" +// pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" +// "github.com/flyteorg/flyteplugins/tests" +// "github.com/flyteorg/flytestdlib/contextutils" +// "github.com/flyteorg/flytestdlib/promutils" +// "github.com/flyteorg/flytestdlib/promutils/labeled" +// "github.com/stretchr/testify/assert" +// "github.com/stretchr/testify/mock" +//) +// +//func TestEndToEnd(t *testing.T) { +// server := newFakeDatabricksServer() +// defer server.Close() +// +// iter := func(ctx context.Context, tCtx pluginCore.TaskExecutionContext) error { +// return nil +// } +// +// cfg := defaultConfig +// cfg.databricksEndpoint = server.URL +// cfg.WebAPI.Caching.Workers = 1 +// cfg.WebAPI.Caching.ResyncInterval.Duration = 5 * time.Second +// err := SetConfig(&cfg) +// assert.NoError(t, err) +// +// pluginEntry := pluginmachinery.CreateRemotePlugin(newDatabricksJobTaskPlugin()) +// plugin, err := pluginEntry.LoadPlugin(context.TODO(), newFakeSetupContext()) +// assert.NoError(t, err) +// +// t.Run("run a databricks job", func(t *testing.T) { +// databricksConfDict := map[string]interface{}{ +// "name": "flytekit databricks plugin example", +// "new_cluster": map[string]string{ +// "spark_version": "11.0.x-scala2.12", +// "node_type_id": "r3.xlarge", +// "num_workers": "4", +// }, +// "timeout_seconds": 3600, +// "max_retries": 1, +// } +// databricksConfig, err := utils.MarshalObjToStruct(databricksConfDict) +// assert.NoError(t, err) +// sparkJob := plugins.SparkJob{DatabricksConf: databricksConfig, DatabricksToken: "token", SparkConf: map[string]string{"spark.driver.bindAddress": "127.0.0.1"}} +// st, err := utils.MarshalPbToStruct(&sparkJob) +// assert.NoError(t, err) +// inputs, _ := coreutils.MakeLiteralMap(map[string]interface{}{"x": 1}) +// template := flyteIdlCore.TaskTemplate{ +// Type: "databricks", +// Custom: st, +// Target: &coreIdl.TaskTemplate_Container{ +// Container: &coreIdl.Container{ +// Command: []string{"command"}, +// Args: []string{"pyflyte-execute"}, +// }, +// }, +// } +// +// phase := tests.RunPluginEndToEndTest(t, plugin, &template, inputs, nil, nil, iter) +// assert.Equal(t, true, phase.Phase().IsSuccess()) +// }) +//} +// +//func newFakeDatabricksServer() *httptest.Server { +// runID := "065168461" +// jobID := "019e7546" +// return httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { +// if request.URL.Path == fmt.Sprintf("%v/submit", databricksAPI) && request.Method == post { +// writer.WriteHeader(202) +// bytes := []byte(fmt.Sprintf(`{ +// "run_id": "%v" +// }`, runID)) +// _, _ = writer.Write(bytes) +// return +// } +// +// if request.URL.Path == fmt.Sprintf("%v/get", databricksAPI) && request.Method == get { +// writer.WriteHeader(200) +// bytes := []byte(fmt.Sprintf(`{ +// "job_id": "%v", +// "state": {"state_message": "execution in progress.", "life_cycle_state": "TERMINATED", "result_state": "SUCCESS"} +// }`, jobID)) +// _, _ = writer.Write(bytes) +// return +// } +// +// if request.URL.Path == fmt.Sprintf("%v/cancel", databricksAPI) && request.Method == post { +// writer.WriteHeader(200) +// return +// } +// +// writer.WriteHeader(500) +// })) +//} +// +//func newFakeSetupContext() *pluginCoreMocks.SetupContext { +// fakeResourceRegistrar := pluginCoreMocks.ResourceRegistrar{} +// fakeResourceRegistrar.On("RegisterResourceQuota", mock.Anything, mock.Anything, mock.Anything).Return(nil) +// labeled.SetMetricKeys(contextutils.NamespaceKey) +// +// fakeSetupContext := pluginCoreMocks.SetupContext{} +// fakeSetupContext.OnMetricsScope().Return(promutils.NewScope("test")) +// fakeSetupContext.OnResourceRegistrar().Return(&fakeResourceRegistrar) +// +// return &fakeSetupContext +//} diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go new file mode 100644 index 000000000..ee1b650ee --- /dev/null +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -0,0 +1,286 @@ +package fastapi + +import ( + "bytes" + "context" + "encoding/gob" + "encoding/json" + "fmt" + "io/ioutil" + "net/http" + "time" + + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + + flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flytestdlib/logger" + + "github.com/flyteorg/flytestdlib/promutils" + + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" +) + +const ( + ErrSystem errors.ErrorCode = "System" + postMethod string = "POST" + getMethod string = "GET" + deleteMethod string = "DELETE" + pluginAPI string = "/plugins/v1/bigquery/v1" +) + +// for mocking/testing purposes, and we'll override this method +type HTTPClient interface { + Do(req *http.Request) (*http.Response, error) +} + +type Plugin struct { + metricScope promutils.Scope + cfg *Config + client HTTPClient +} + +type ResourceWrapper struct { + StatusCode int + State string + JobID string +} + +type ResourceMetaWrapper struct { + Token string + JobID string +} + +func (p Plugin) GetConfig() webapi.PluginConfig { + return GetConfig().WebAPI +} + +func (p Plugin) ResourceRequirements(_ context.Context, _ webapi.TaskExecutionContextReader) ( + namespace core.ResourceNamespace, constraints core.ResourceConstraintsSpec, err error) { + + // Resource requirements are assumed to be the same. + return "default", p.cfg.ResourceConstraints, nil +} + +func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextReader) (webapi.ResourceMeta, + webapi.Resource, error) { + taskTemplate, err := taskCtx.TaskReader().Read(ctx) + if err != nil { + return nil, nil, err + } + + token, err := taskCtx.SecretManager().Get(ctx, p.cfg.TokenKey) + if err != nil { + return nil, nil, err + } + + mJSON, err := json.Marshal(taskTemplate) + if err != nil { + return nil, nil, fmt.Errorf("failed to marshal post data: %v: %v", taskTemplate, err) + } + + postData := []byte(string(mJSON)) + req, err := buildRequest(postMethod, postData, p.cfg.fastApiEndpoint, token, "") + if err != nil { + return nil, nil, err + } + + resp, err := p.client.Do(req) + if err != nil { + return nil, nil, err + } + defer resp.Body.Close() + + data, err := buildResponse(resp) + if err != nil { + return nil, nil, err + } + if data["job_id"] == "" { + return nil, nil, pluginErrors.Wrapf(pluginErrors.RuntimeFailure, err, + "Unable to extract job_id from http response") + } + + jobID := fmt.Sprintf("%.0f", data["job_id"]) + + return &ResourceMetaWrapper{Token: token, JobID: jobID}, &ResourceWrapper{JobID: jobID}, nil +} + +func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { + exec := taskCtx.ResourceMeta().(*ResourceMetaWrapper) + + req, err := buildRequest(getMethod, nil, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) + if err != nil { + logger.Errorf(ctx, "Failed to build fast api job request [%v]", err) + return nil, err + } + resp, err := p.client.Do(req) + if err != nil { + logger.Errorf(ctx, "Failed to get job status [%v]", resp) + return nil, err + } + defer resp.Body.Close() + data, err := buildResponse(resp) + if err != nil { + return nil, err + } + + jobID := fmt.Sprintf("%.0f", data["job_id"]) + state := fmt.Sprintf("%s", data["state"]) + return &ResourceWrapper{ + StatusCode: resp.StatusCode, + JobID: jobID, + State: state, + }, nil +} + +func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error { + exec := taskCtx.ResourceMeta().(ResourceMetaWrapper) + req, err := buildRequest(deleteMethod, nil, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) + if err != nil { + return err + } + resp, err := p.client.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + logger.Info(ctx, "Deleted query execution [%v]", resp) + + return nil +} + +func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { + resource := taskCtx.Resource().(*ResourceWrapper) + statusCode := resource.StatusCode + state := resource.State + // jobID := resource.JobID + + if statusCode == 0 { + return core.PhaseInfoUndefined, errors.Errorf(ErrSystem, "No Status field set.") + } + + // TODO: Add task link + // taskInfo := createTaskInfo(exec.RunID, jobID, exec.DatabricksInstance) + taskInfo := &core.TaskInfo{} + message := "" + + switch statusCode { + case http.StatusAccepted: + return core.PhaseInfoRunning(pluginsCore.DefaultPhaseVersion, taskInfo), nil + case http.StatusOK: + switch state { + case "succeeded": + return pluginsCore.PhaseInfoSuccess(taskInfo), nil + //case "pending": + // return core.PhaseInfoQueuedWithTaskInfo(pluginsCore.DefaultPhaseVersion, message, taskInfo), nil + default: + return core.PhaseInfoRunning(pluginsCore.DefaultPhaseVersion, taskInfo), nil + } + case http.StatusBadRequest: + fallthrough + case http.StatusInternalServerError: + fallthrough + case http.StatusUnauthorized: + return pluginsCore.PhaseInfoFailure(string(rune(statusCode)), message, taskInfo), nil + } + return core.PhaseInfoUndefined, pluginErrors.Errorf(pluginsCore.SystemErrorCode, "unknown execution phase [%v].", statusCode) +} + +func writeOutput(ctx context.Context, taskCtx webapi.StatusContext) error { + taskTemplate, err := taskCtx.TaskReader().Read(ctx) + if err != nil { + return err + } + if taskTemplate.Interface == nil || taskTemplate.Interface.Outputs == nil || taskTemplate.Interface.Outputs.Variables == nil { + logger.Infof(ctx, "The task declares no outputs. Skipping writing the outputs.") + return nil + } + + outputReader := ioutils.NewRemoteFileOutputReader(ctx, taskCtx.DataStore(), taskCtx.OutputWriter(), taskCtx.MaxDatasetSizeBytes()) + return taskCtx.OutputWriter().Put(ctx, outputReader) +} + +func buildRequest(method string, data []byte, fastAPIEndpoint string, token string, jobID string) (*http.Request, error) { + var fastAPIURL string + // for mocking/testing purposes + if fastAPIEndpoint == "" { + fastAPIURL = fmt.Sprintf("http://backend-plugin-service:8000%v", pluginAPI) + } else { + fastAPIURL = fmt.Sprintf("%v%v", fastAPIEndpoint, pluginAPI) + } + + if method == deleteMethod || method == getMethod { + fastAPIURL = fmt.Sprintf("%v/?job_id=%v", fastAPIURL, jobID) + } + + var req *http.Request + var err error + if data == nil { + req, err = http.NewRequest(method, fastAPIURL, nil) + } else { + req, err = http.NewRequest(method, fastAPIURL, bytes.NewBuffer(data)) + } + if err != nil { + return nil, err + } + + // TODO: authentication support + req.Header.Add("Authorization", "Bearer "+token) + req.Header.Add("Content-Type", "application/json") + return req, nil +} + +func buildResponse(response *http.Response) (map[string]interface{}, error) { + responseBody, err := ioutil.ReadAll(response.Body) + if err != nil { + return nil, err + } + var data map[string]interface{} + err = json.Unmarshal(responseBody, &data) + if err != nil { + return nil, err + } + return data, nil +} + +func createTaskInfo(runID, jobID, databricksInstance string) *core.TaskInfo { + timeNow := time.Now() + + return &core.TaskInfo{ + OccurredAt: &timeNow, + Logs: []*flyteIdlCore.TaskLog{ + { + Uri: fmt.Sprintf("https://%s/#job/%s/run/%s", + databricksInstance, + jobID, + runID), + Name: "FastAPI Console", + }, + }, + } +} + +func newFastAPIPlugin() webapi.PluginEntry { + return webapi.PluginEntry{ + ID: "fastapi", + SupportedTaskTypes: []core.TaskType{"bigquery", "snowflake", "spark"}, + PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { + return &Plugin{ + metricScope: iCtx.MetricsScope(), + cfg: GetConfig(), + client: &http.Client{}, + }, nil + }, + } +} + +func init() { + gob.Register(ResourceMetaWrapper{}) + gob.Register(ResourceWrapper{}) + + pluginmachinery.PluginRegistry().RegisterRemotePlugin(newFastAPIPlugin()) +} diff --git a/go/tasks/plugins/webapi/fastapi/plugin_test.go b/go/tasks/plugins/webapi/fastapi/plugin_test.go new file mode 100644 index 000000000..f263a5eed --- /dev/null +++ b/go/tasks/plugins/webapi/fastapi/plugin_test.go @@ -0,0 +1,113 @@ +package fastapi + +// +//import ( +// "context" +// "encoding/json" +// "io/ioutil" +// "net/http" +// "strings" +// "testing" +// "time" +// +// pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" +// pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" +// "github.com/flyteorg/flytestdlib/promutils" +// "github.com/stretchr/testify/assert" +//) +// +//type MockClient struct { +//} +// +//var ( +// MockDo func(req *http.Request) (*http.Response, error) +// testInstance = "test-account.cloud.databricks.com" +//) +// +//func (m *MockClient) Do(req *http.Request) (*http.Response, error) { +// return MockDo(req) +//} +// +//func TestPlugin(t *testing.T) { +// fakeSetupContext := pluginCoreMocks.SetupContext{} +// fakeSetupContext.OnMetricsScope().Return(promutils.NewScope("test")) +// +// plugin := Plugin{ +// metricScope: fakeSetupContext.MetricsScope(), +// cfg: GetConfig(), +// client: &MockClient{}, +// } +// t.Run("get config", func(t *testing.T) { +// cfg := defaultConfig +// cfg.WebAPI.Caching.Workers = 1 +// cfg.WebAPI.Caching.ResyncInterval.Duration = 5 * time.Second +// err := SetConfig(&cfg) +// assert.NoError(t, err) +// assert.Equal(t, cfg.WebAPI, plugin.GetConfig()) +// }) +// t.Run("get ResourceRequirements", func(t *testing.T) { +// namespace, constraints, err := plugin.ResourceRequirements(context.TODO(), nil) +// assert.NoError(t, err) +// assert.Equal(t, pluginsCore.ResourceNamespace("default"), namespace) +// assert.Equal(t, plugin.cfg.ResourceConstraints, constraints) +// }) +//} +// +//func TestCreateTaskInfo(t *testing.T) { +// t.Run("create task info", func(t *testing.T) { +// taskInfo := createTaskInfo("run-id", "job-id", testInstance) +// +// assert.Equal(t, 1, len(taskInfo.Logs)) +// assert.Equal(t, taskInfo.Logs[0].Uri, "https://test-account.cloud.databricks.com/#job/job-id/run/run-id") +// assert.Equal(t, taskInfo.Logs[0].Name, "Databricks Console") +// }) +//} +// +//func TestBuildRequest(t *testing.T) { +// token := "test-token" +// runID := "019e70eb" +// databricksEndpoint := "" +// databricksURL := "https://" + testInstance + "/api/2.0/jobs/runs" +// t.Run("build http request for submitting a snowflake query", func(t *testing.T) { +// req, err := buildRequest(post, nil, databricksEndpoint, testInstance, token, runID, false) +// header := http.Header{} +// header.Add("Authorization", "Bearer "+token) +// header.Add("Content-Type", "application/json") +// +// assert.NoError(t, err) +// assert.Equal(t, header, req.Header) +// assert.Equal(t, databricksURL+"/submit", req.URL.String()) +// assert.Equal(t, post, req.Method) +// }) +// t.Run("Get a databricks spark job status", func(t *testing.T) { +// req, err := buildRequest(get, nil, databricksEndpoint, testInstance, token, runID, false) +// +// assert.NoError(t, err) +// assert.Equal(t, databricksURL+"/get?run_id="+runID, req.URL.String()) +// assert.Equal(t, get, req.Method) +// }) +// t.Run("Cancel a spark job", func(t *testing.T) { +// req, err := buildRequest(post, nil, databricksEndpoint, testInstance, token, runID, true) +// +// assert.NoError(t, err) +// assert.Equal(t, databricksURL+"/cancel", req.URL.String()) +// assert.Equal(t, post, req.Method) +// }) +//} +// +//func TestBuildResponse(t *testing.T) { +// t.Run("build http response", func(t *testing.T) { +// bodyStr := `{"job_id":"019c06a4-0000", "message":"Statement executed successfully."}` +// responseBody := ioutil.NopCloser(strings.NewReader(bodyStr)) +// response := &http.Response{Body: responseBody} +// actualData, err := buildResponse(response) +// assert.NoError(t, err) +// +// bodyByte, err := ioutil.ReadAll(strings.NewReader(bodyStr)) +// assert.NoError(t, err) +// var expectedData map[string]interface{} +// err = json.Unmarshal(bodyByte, &expectedData) +// assert.NoError(t, err) +// assert.Equal(t, expectedData, actualData) +// }) +//} From 9bf6784ed50836ed4033409eec604d470d7d82c9 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 23 Jan 2023 23:33:52 -0800 Subject: [PATCH 02/46] Add dummy plugin Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/dummy/config.go | 62 ++++++++ go/tasks/plugins/webapi/dummy/plugin.go | 147 ++++++++++++++++++ .../webapi/fastapi/integration_test.go | 123 --------------- go/tasks/plugins/webapi/fastapi/plugin.go | 80 +++++----- .../plugins/webapi/fastapi/plugin_test.go | 113 -------------- 5 files changed, 250 insertions(+), 275 deletions(-) create mode 100644 go/tasks/plugins/webapi/dummy/config.go create mode 100644 go/tasks/plugins/webapi/dummy/plugin.go delete mode 100644 go/tasks/plugins/webapi/fastapi/integration_test.go delete mode 100644 go/tasks/plugins/webapi/fastapi/plugin_test.go diff --git a/go/tasks/plugins/webapi/dummy/config.go b/go/tasks/plugins/webapi/dummy/config.go new file mode 100644 index 000000000..b5c9fe462 --- /dev/null +++ b/go/tasks/plugins/webapi/dummy/config.go @@ -0,0 +1,62 @@ +package databricks + +import ( + "time" + + pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flytestdlib/config" +) + +var ( + defaultConfig = Config{ + WebAPI: webapi.PluginConfig{ + ResourceQuotas: map[core.ResourceNamespace]int{ + "default": 1000, + }, + ReadRateLimiter: webapi.RateLimiterConfig{ + Burst: 100, + QPS: 10, + }, + WriteRateLimiter: webapi.RateLimiterConfig{ + Burst: 100, + QPS: 10, + }, + Caching: webapi.CachingConfig{ + Size: 500000, + ResyncInterval: config.Duration{Duration: 30 * time.Second}, + Workers: 10, + MaxSystemFailures: 5, + }, + ResourceMeta: nil, + }, + ResourceConstraints: core.ResourceConstraintsSpec{ + ProjectScopeResourceConstraint: &core.ResourceConstraint{ + Value: 100, + }, + NamespaceScopeResourceConstraint: &core.ResourceConstraint{ + Value: 50, + }, + }, + } + + configSection = pluginsConfig.MustRegisterSubSection("dummy", &defaultConfig) +) + +// Config is config for 'databricks' plugin +type Config struct { + // WebAPI defines config for the base WebAPI plugin + WebAPI webapi.PluginConfig `json:"webApi" pflag:",Defines config for the base WebAPI plugin."` + + // ResourceConstraints defines resource constraints on how many executions to be created per project/overall at any given time + ResourceConstraints core.ResourceConstraintsSpec `json:"resourceConstraints" pflag:"-,Defines resource constraints on how many executions to be created per project/overall at any given time."` +} + +func GetConfig() *Config { + return configSection.GetConfig().(*Config) +} + +func SetConfig(cfg *Config) error { + return configSection.SetConfig(cfg) +} diff --git a/go/tasks/plugins/webapi/dummy/plugin.go b/go/tasks/plugins/webapi/dummy/plugin.go new file mode 100644 index 000000000..1a8080067 --- /dev/null +++ b/go/tasks/plugins/webapi/dummy/plugin.go @@ -0,0 +1,147 @@ +package databricks + +import ( + "context" + "encoding/gob" + flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "math/rand" + "net/http" + "time" + + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" + + pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flytestdlib/errors" + + "github.com/flyteorg/flytestdlib/promutils" + + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" +) + +const ( + ErrSystem errors.ErrorCode = "System" + post string = "POST" +) + +// for mocking/testing purposes, and we'll override this method +type HTTPClient interface { + Do(req *http.Request) (*http.Response, error) +} + +type Plugin struct { + metricScope promutils.Scope + cfg *Config + client HTTPClient +} + +type ResourceWrapper struct { + StatusCode int + JobID string + Message string +} + +type ResourceMetaWrapper struct { + RunID string + Token string +} + +func (p Plugin) GetConfig() webapi.PluginConfig { + return GetConfig().WebAPI +} + +func (p Plugin) ResourceRequirements(_ context.Context, _ webapi.TaskExecutionContextReader) ( + namespace core.ResourceNamespace, constraints core.ResourceConstraintsSpec, err error) { + + // Resource requirements are assumed to be the same. + return "default", p.cfg.ResourceConstraints, nil +} + +func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextReader) (webapi.ResourceMeta, + webapi.Resource, error) { + _, err := taskCtx.TaskReader().Read(ctx) + if err != nil { + return nil, nil, err + } + + // Sending requests and deserialization times + time.Sleep(10 * time.Millisecond) + + return &ResourceMetaWrapper{RunID: "runID", Token: "token"}, + &ResourceWrapper{StatusCode: 200}, nil +} + +func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { + // Sending requests and deserialization times + time.Sleep(10 * time.Millisecond) + + return &ResourceWrapper{ + StatusCode: 200, + JobID: "jobID", + }, nil +} + +func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error { + return nil +} + +func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { + x := rand.Intn(100) + if x < 50 { + err := writeOutput(ctx, taskCtx, "s3://bucket/key") + if err != nil { + return core.PhaseInfo{}, err + } + return pluginsCore.PhaseInfoSuccess(&core.TaskInfo{}), nil + } + return core.PhaseInfoRunning(pluginsCore.DefaultPhaseVersion, &core.TaskInfo{}), nil +} + +func writeOutput(ctx context.Context, tCtx webapi.StatusContext, OutputLocation string) error { + _, err := tCtx.TaskReader().Read(ctx) + if err != nil { + return err + } + + return tCtx.OutputWriter().Put(ctx, ioutils.NewInMemoryOutputReader( + &flyteIdlCore.LiteralMap{ + Literals: map[string]*flyteIdlCore.Literal{ + "results": { + Value: &flyteIdlCore.Literal_Scalar{ + Scalar: &flyteIdlCore.Scalar{ + Value: &flyteIdlCore.Scalar_StructuredDataset{ + StructuredDataset: &flyteIdlCore.StructuredDataset{ + Uri: OutputLocation, + Metadata: &flyteIdlCore.StructuredDatasetMetadata{ + StructuredDatasetType: &flyteIdlCore.StructuredDatasetType{Format: ""}, + }, + }, + }, + }, + }, + }, + }, + }, nil, nil)) +} + +func newDummyTaskPlugin() webapi.PluginEntry { + return webapi.PluginEntry{ + ID: "dummy", + SupportedTaskTypes: []core.TaskType{"bigquery_query_job_task", "snowflake", "spark"}, + PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { + return &Plugin{ + metricScope: iCtx.MetricsScope(), + cfg: GetConfig(), + client: &http.Client{}, + }, nil + }, + } +} + +func init() { + gob.Register(ResourceMetaWrapper{}) + gob.Register(ResourceWrapper{}) + + pluginmachinery.PluginRegistry().RegisterRemotePlugin(newDummyTaskPlugin()) +} diff --git a/go/tasks/plugins/webapi/fastapi/integration_test.go b/go/tasks/plugins/webapi/fastapi/integration_test.go deleted file mode 100644 index 7a5f6ea62..000000000 --- a/go/tasks/plugins/webapi/fastapi/integration_test.go +++ /dev/null @@ -1,123 +0,0 @@ -package fastapi - -// -//import ( -// "context" -// "fmt" -// "net/http" -// "net/http/httptest" -// "testing" -// "time" -// -// "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins" -// "github.com/flyteorg/flytestdlib/utils" -// -// "github.com/flyteorg/flyteidl/clients/go/coreutils" -// coreIdl "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" -// flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" -// "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" -// pluginCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" -// pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" -// "github.com/flyteorg/flyteplugins/tests" -// "github.com/flyteorg/flytestdlib/contextutils" -// "github.com/flyteorg/flytestdlib/promutils" -// "github.com/flyteorg/flytestdlib/promutils/labeled" -// "github.com/stretchr/testify/assert" -// "github.com/stretchr/testify/mock" -//) -// -//func TestEndToEnd(t *testing.T) { -// server := newFakeDatabricksServer() -// defer server.Close() -// -// iter := func(ctx context.Context, tCtx pluginCore.TaskExecutionContext) error { -// return nil -// } -// -// cfg := defaultConfig -// cfg.databricksEndpoint = server.URL -// cfg.WebAPI.Caching.Workers = 1 -// cfg.WebAPI.Caching.ResyncInterval.Duration = 5 * time.Second -// err := SetConfig(&cfg) -// assert.NoError(t, err) -// -// pluginEntry := pluginmachinery.CreateRemotePlugin(newDatabricksJobTaskPlugin()) -// plugin, err := pluginEntry.LoadPlugin(context.TODO(), newFakeSetupContext()) -// assert.NoError(t, err) -// -// t.Run("run a databricks job", func(t *testing.T) { -// databricksConfDict := map[string]interface{}{ -// "name": "flytekit databricks plugin example", -// "new_cluster": map[string]string{ -// "spark_version": "11.0.x-scala2.12", -// "node_type_id": "r3.xlarge", -// "num_workers": "4", -// }, -// "timeout_seconds": 3600, -// "max_retries": 1, -// } -// databricksConfig, err := utils.MarshalObjToStruct(databricksConfDict) -// assert.NoError(t, err) -// sparkJob := plugins.SparkJob{DatabricksConf: databricksConfig, DatabricksToken: "token", SparkConf: map[string]string{"spark.driver.bindAddress": "127.0.0.1"}} -// st, err := utils.MarshalPbToStruct(&sparkJob) -// assert.NoError(t, err) -// inputs, _ := coreutils.MakeLiteralMap(map[string]interface{}{"x": 1}) -// template := flyteIdlCore.TaskTemplate{ -// Type: "databricks", -// Custom: st, -// Target: &coreIdl.TaskTemplate_Container{ -// Container: &coreIdl.Container{ -// Command: []string{"command"}, -// Args: []string{"pyflyte-execute"}, -// }, -// }, -// } -// -// phase := tests.RunPluginEndToEndTest(t, plugin, &template, inputs, nil, nil, iter) -// assert.Equal(t, true, phase.Phase().IsSuccess()) -// }) -//} -// -//func newFakeDatabricksServer() *httptest.Server { -// runID := "065168461" -// jobID := "019e7546" -// return httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { -// if request.URL.Path == fmt.Sprintf("%v/submit", databricksAPI) && request.Method == post { -// writer.WriteHeader(202) -// bytes := []byte(fmt.Sprintf(`{ -// "run_id": "%v" -// }`, runID)) -// _, _ = writer.Write(bytes) -// return -// } -// -// if request.URL.Path == fmt.Sprintf("%v/get", databricksAPI) && request.Method == get { -// writer.WriteHeader(200) -// bytes := []byte(fmt.Sprintf(`{ -// "job_id": "%v", -// "state": {"state_message": "execution in progress.", "life_cycle_state": "TERMINATED", "result_state": "SUCCESS"} -// }`, jobID)) -// _, _ = writer.Write(bytes) -// return -// } -// -// if request.URL.Path == fmt.Sprintf("%v/cancel", databricksAPI) && request.Method == post { -// writer.WriteHeader(200) -// return -// } -// -// writer.WriteHeader(500) -// })) -//} -// -//func newFakeSetupContext() *pluginCoreMocks.SetupContext { -// fakeResourceRegistrar := pluginCoreMocks.ResourceRegistrar{} -// fakeResourceRegistrar.On("RegisterResourceQuota", mock.Anything, mock.Anything, mock.Anything).Return(nil) -// labeled.SetMetricKeys(contextutils.NamespaceKey) -// -// fakeSetupContext := pluginCoreMocks.SetupContext{} -// fakeSetupContext.OnMetricsScope().Return(promutils.NewScope("test")) -// fakeSetupContext.OnResourceRegistrar().Return(&fakeResourceRegistrar) -// -// return &fakeSetupContext -//} diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index ee1b650ee..0aa32364d 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -10,8 +10,6 @@ import ( "net/http" "time" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" - flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" @@ -30,7 +28,7 @@ const ( postMethod string = "POST" getMethod string = "GET" deleteMethod string = "DELETE" - pluginAPI string = "/plugins/v1/bigquery/v1" + pluginAPI string = "plugins/v1/dummy" ) // for mocking/testing purposes, and we'll override this method @@ -47,12 +45,12 @@ type Plugin struct { type ResourceWrapper struct { StatusCode int State string - JobID string } type ResourceMetaWrapper struct { - Token string - JobID string + OutputPrefix string + Token string + JobID string } func (p Plugin) GetConfig() webapi.PluginConfig { @@ -68,23 +66,29 @@ func (p Plugin) ResourceRequirements(_ context.Context, _ webapi.TaskExecutionCo func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextReader) (webapi.ResourceMeta, webapi.Resource, error) { - taskTemplate, err := taskCtx.TaskReader().Read(ctx) + taskTemplatePath, err := taskCtx.TaskReader().Path(ctx) if err != nil { return nil, nil, err } - token, err := taskCtx.SecretManager().Get(ctx, p.cfg.TokenKey) - if err != nil { - return nil, nil, err + // TODO: Read fast api server access token + //token, err := taskCtx.SecretManager().Get(ctx, p.cfg.TokenKey) + //if err != nil { + // return nil, nil, err + //} + + body := map[string]string{ + "inputs_path": taskCtx.InputReader().GetInputPath().String(), + "task_template_path": taskTemplatePath.String(), } - mJSON, err := json.Marshal(taskTemplate) + mJSON, err := json.Marshal(body) if err != nil { - return nil, nil, fmt.Errorf("failed to marshal post data: %v: %v", taskTemplate, err) + return nil, nil, fmt.Errorf("failed to marshal data: %v: %v", body, err) } - postData := []byte(string(mJSON)) - req, err := buildRequest(postMethod, postData, p.cfg.fastApiEndpoint, token, "") + postDataJson := []byte(string(mJSON)) + req, err := buildRequest(postMethod, postDataJson, p.cfg.fastApiEndpoint, "token", "") if err != nil { return nil, nil, err } @@ -104,15 +108,30 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR "Unable to extract job_id from http response") } - jobID := fmt.Sprintf("%.0f", data["job_id"]) + jobID := fmt.Sprintf("%s", data["job_id"]) - return &ResourceMetaWrapper{Token: token, JobID: jobID}, &ResourceWrapper{JobID: jobID}, nil + return &ResourceMetaWrapper{ + OutputPrefix: taskCtx.OutputWriter().GetOutputPrefixPath().String(), + JobID: jobID, + Token: "", + }, &ResourceWrapper{StatusCode: resp.StatusCode}, nil } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { exec := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - req, err := buildRequest(getMethod, nil, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) + body := map[string]string{ + "output_prefix": exec.OutputPrefix, + "job_id": exec.JobID, + } + + mJSON, err := json.Marshal(body) + if err != nil { + return nil, fmt.Errorf("failed to marshal data: %v: %v", body, err) + } + + getDataJson := []byte(string(mJSON)) + req, err := buildRequest(getMethod, getDataJson, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) if err != nil { logger.Errorf(ctx, "Failed to build fast api job request [%v]", err) return nil, err @@ -128,11 +147,9 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba return nil, err } - jobID := fmt.Sprintf("%.0f", data["job_id"]) state := fmt.Sprintf("%s", data["state"]) return &ResourceWrapper{ StatusCode: resp.StatusCode, - JobID: jobID, State: state, }, nil } @@ -157,7 +174,6 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase resource := taskCtx.Resource().(*ResourceWrapper) statusCode := resource.StatusCode state := resource.State - // jobID := resource.JobID if statusCode == 0 { return core.PhaseInfoUndefined, errors.Errorf(ErrSystem, "No Status field set.") @@ -175,8 +191,8 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase switch state { case "succeeded": return pluginsCore.PhaseInfoSuccess(taskInfo), nil - //case "pending": - // return core.PhaseInfoQueuedWithTaskInfo(pluginsCore.DefaultPhaseVersion, message, taskInfo), nil + case "failed": + return core.PhaseInfoFailure(string(rune(statusCode)), "failed to run the job", taskInfo), nil default: return core.PhaseInfoRunning(pluginsCore.DefaultPhaseVersion, taskInfo), nil } @@ -190,30 +206,16 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase return core.PhaseInfoUndefined, pluginErrors.Errorf(pluginsCore.SystemErrorCode, "unknown execution phase [%v].", statusCode) } -func writeOutput(ctx context.Context, taskCtx webapi.StatusContext) error { - taskTemplate, err := taskCtx.TaskReader().Read(ctx) - if err != nil { - return err - } - if taskTemplate.Interface == nil || taskTemplate.Interface.Outputs == nil || taskTemplate.Interface.Outputs.Variables == nil { - logger.Infof(ctx, "The task declares no outputs. Skipping writing the outputs.") - return nil - } - - outputReader := ioutils.NewRemoteFileOutputReader(ctx, taskCtx.DataStore(), taskCtx.OutputWriter(), taskCtx.MaxDatasetSizeBytes()) - return taskCtx.OutputWriter().Put(ctx, outputReader) -} - func buildRequest(method string, data []byte, fastAPIEndpoint string, token string, jobID string) (*http.Request, error) { var fastAPIURL string // for mocking/testing purposes if fastAPIEndpoint == "" { - fastAPIURL = fmt.Sprintf("http://backend-plugin-service:8000%v", pluginAPI) + fastAPIURL = fmt.Sprintf("http://127.0.0.1:8000/%v", pluginAPI) } else { fastAPIURL = fmt.Sprintf("%v%v", fastAPIEndpoint, pluginAPI) } - if method == deleteMethod || method == getMethod { + if method == deleteMethod { fastAPIURL = fmt.Sprintf("%v/?job_id=%v", fastAPIURL, jobID) } @@ -267,7 +269,7 @@ func createTaskInfo(runID, jobID, databricksInstance string) *core.TaskInfo { func newFastAPIPlugin() webapi.PluginEntry { return webapi.PluginEntry{ ID: "fastapi", - SupportedTaskTypes: []core.TaskType{"bigquery", "snowflake", "spark"}, + SupportedTaskTypes: []core.TaskType{"bigquery_query_job_task", "snowflake", "spark"}, PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &Plugin{ metricScope: iCtx.MetricsScope(), diff --git a/go/tasks/plugins/webapi/fastapi/plugin_test.go b/go/tasks/plugins/webapi/fastapi/plugin_test.go deleted file mode 100644 index f263a5eed..000000000 --- a/go/tasks/plugins/webapi/fastapi/plugin_test.go +++ /dev/null @@ -1,113 +0,0 @@ -package fastapi - -// -//import ( -// "context" -// "encoding/json" -// "io/ioutil" -// "net/http" -// "strings" -// "testing" -// "time" -// -// pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" -// pluginCoreMocks "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core/mocks" -// "github.com/flyteorg/flytestdlib/promutils" -// "github.com/stretchr/testify/assert" -//) -// -//type MockClient struct { -//} -// -//var ( -// MockDo func(req *http.Request) (*http.Response, error) -// testInstance = "test-account.cloud.databricks.com" -//) -// -//func (m *MockClient) Do(req *http.Request) (*http.Response, error) { -// return MockDo(req) -//} -// -//func TestPlugin(t *testing.T) { -// fakeSetupContext := pluginCoreMocks.SetupContext{} -// fakeSetupContext.OnMetricsScope().Return(promutils.NewScope("test")) -// -// plugin := Plugin{ -// metricScope: fakeSetupContext.MetricsScope(), -// cfg: GetConfig(), -// client: &MockClient{}, -// } -// t.Run("get config", func(t *testing.T) { -// cfg := defaultConfig -// cfg.WebAPI.Caching.Workers = 1 -// cfg.WebAPI.Caching.ResyncInterval.Duration = 5 * time.Second -// err := SetConfig(&cfg) -// assert.NoError(t, err) -// assert.Equal(t, cfg.WebAPI, plugin.GetConfig()) -// }) -// t.Run("get ResourceRequirements", func(t *testing.T) { -// namespace, constraints, err := plugin.ResourceRequirements(context.TODO(), nil) -// assert.NoError(t, err) -// assert.Equal(t, pluginsCore.ResourceNamespace("default"), namespace) -// assert.Equal(t, plugin.cfg.ResourceConstraints, constraints) -// }) -//} -// -//func TestCreateTaskInfo(t *testing.T) { -// t.Run("create task info", func(t *testing.T) { -// taskInfo := createTaskInfo("run-id", "job-id", testInstance) -// -// assert.Equal(t, 1, len(taskInfo.Logs)) -// assert.Equal(t, taskInfo.Logs[0].Uri, "https://test-account.cloud.databricks.com/#job/job-id/run/run-id") -// assert.Equal(t, taskInfo.Logs[0].Name, "Databricks Console") -// }) -//} -// -//func TestBuildRequest(t *testing.T) { -// token := "test-token" -// runID := "019e70eb" -// databricksEndpoint := "" -// databricksURL := "https://" + testInstance + "/api/2.0/jobs/runs" -// t.Run("build http request for submitting a snowflake query", func(t *testing.T) { -// req, err := buildRequest(post, nil, databricksEndpoint, testInstance, token, runID, false) -// header := http.Header{} -// header.Add("Authorization", "Bearer "+token) -// header.Add("Content-Type", "application/json") -// -// assert.NoError(t, err) -// assert.Equal(t, header, req.Header) -// assert.Equal(t, databricksURL+"/submit", req.URL.String()) -// assert.Equal(t, post, req.Method) -// }) -// t.Run("Get a databricks spark job status", func(t *testing.T) { -// req, err := buildRequest(get, nil, databricksEndpoint, testInstance, token, runID, false) -// -// assert.NoError(t, err) -// assert.Equal(t, databricksURL+"/get?run_id="+runID, req.URL.String()) -// assert.Equal(t, get, req.Method) -// }) -// t.Run("Cancel a spark job", func(t *testing.T) { -// req, err := buildRequest(post, nil, databricksEndpoint, testInstance, token, runID, true) -// -// assert.NoError(t, err) -// assert.Equal(t, databricksURL+"/cancel", req.URL.String()) -// assert.Equal(t, post, req.Method) -// }) -//} -// -//func TestBuildResponse(t *testing.T) { -// t.Run("build http response", func(t *testing.T) { -// bodyStr := `{"job_id":"019c06a4-0000", "message":"Statement executed successfully."}` -// responseBody := ioutil.NopCloser(strings.NewReader(bodyStr)) -// response := &http.Response{Body: responseBody} -// actualData, err := buildResponse(response) -// assert.NoError(t, err) -// -// bodyByte, err := ioutil.ReadAll(strings.NewReader(bodyStr)) -// assert.NoError(t, err) -// var expectedData map[string]interface{} -// err = json.Unmarshal(bodyByte, &expectedData) -// assert.NoError(t, err) -// assert.Equal(t, expectedData, actualData) -// }) -//} From 2aff416215ced89347a996a771c71edac1daf62e Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 24 Jan 2023 11:36:05 -0800 Subject: [PATCH 03/46] nit Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/config.go | 2 -- go/tasks/plugins/webapi/fastapi/plugin.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/config.go b/go/tasks/plugins/webapi/fastapi/config.go index 05c2b5a15..a2250c043 100644 --- a/go/tasks/plugins/webapi/fastapi/config.go +++ b/go/tasks/plugins/webapi/fastapi/config.go @@ -57,8 +57,6 @@ type Config struct { TokenKey string `json:"fastApiTokenKey" pflag:",Name of the key where to find Fast API access token in the secret manager."` - DatabricksInstance string `json:"databricksInstance" pflag:",Databricks workspace instance name."` - // fastApiEndpoint overrides fastapi server endpoint, only for testing fastApiEndpoint string } diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 0aa32364d..707a1302d 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -210,7 +210,7 @@ func buildRequest(method string, data []byte, fastAPIEndpoint string, token stri var fastAPIURL string // for mocking/testing purposes if fastAPIEndpoint == "" { - fastAPIURL = fmt.Sprintf("http://127.0.0.1:8000/%v", pluginAPI) + fastAPIURL = fmt.Sprintf("http://backend-plugin-system.flyte.svc.cluster.local:8000/%v", pluginAPI) } else { fastAPIURL = fmt.Sprintf("%v%v", fastAPIEndpoint, pluginAPI) } From e0361d2c65c1d15b90fe89fcaa0e52284bd7ee47 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Thu, 16 Feb 2023 14:13:42 -0800 Subject: [PATCH 04/46] test Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/webapi/plugin.go | 1 + go/tasks/plugins/webapi/fastapi/plugin.go | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go/tasks/pluginmachinery/webapi/plugin.go b/go/tasks/pluginmachinery/webapi/plugin.go index 63b6b5e2b..853993834 100644 --- a/go/tasks/pluginmachinery/webapi/plugin.go +++ b/go/tasks/pluginmachinery/webapi/plugin.go @@ -81,6 +81,7 @@ type TaskExecutionContext interface { type GetContext interface { ResourceMeta() ResourceMeta + Resource() Resource } type DeleteContext interface { diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 707a1302d..3a346692e 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -118,11 +118,13 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - exec := taskCtx.ResourceMeta().(*ResourceMetaWrapper) + metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) + resource := taskCtx.Resource().(*ResourceWrapper) body := map[string]string{ - "output_prefix": exec.OutputPrefix, - "job_id": exec.JobID, + "output_prefix": metadata.OutputPrefix, + "job_id": metadata.JobID, + "prev_state": resource.State, } mJSON, err := json.Marshal(body) @@ -131,7 +133,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba } getDataJson := []byte(string(mJSON)) - req, err := buildRequest(getMethod, getDataJson, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) + req, err := buildRequest(getMethod, getDataJson, p.cfg.fastApiEndpoint, metadata.Token, metadata.JobID) if err != nil { logger.Errorf(ctx, "Failed to build fast api job request [%v]", err) return nil, err From c34859b9b1e0dc5e5b82925de7a24253380a6a11 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Thu, 16 Feb 2023 15:40:37 -0800 Subject: [PATCH 05/46] test Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 3a346692e..5a12360f5 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,7 +119,10 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - resource := taskCtx.Resource().(*ResourceWrapper) + var resource ResourceWrapper + if taskCtx.Resource() != nil { + resource = taskCtx.Resource().(ResourceWrapper) + } body := map[string]string{ "output_prefix": metadata.OutputPrefix, From e25bdeafaea12eb0b9ed0703ba2a4ead643b3e64 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Thu, 16 Feb 2023 17:02:36 -0800 Subject: [PATCH 06/46] test Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 5a12360f5..dd022b5c6 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -118,11 +118,8 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - var resource ResourceWrapper - if taskCtx.Resource() != nil { - resource = taskCtx.Resource().(ResourceWrapper) - } + metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) + resource := taskCtx.Resource().(ResourceWrapper) body := map[string]string{ "output_prefix": metadata.OutputPrefix, From 23c4b89f856b9bbe55090434baeae481696cebe1 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 11:38:05 -0800 Subject: [PATCH 07/46] test Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index dd022b5c6..0a3f0f631 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,7 +119,10 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) - resource := taskCtx.Resource().(ResourceWrapper) + var resource ResourceWrapper + if taskCtx.Resource() != nil { + resource = taskCtx.Resource().(ResourceWrapper) + } body := map[string]string{ "output_prefix": metadata.OutputPrefix, @@ -172,7 +175,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error return nil } -func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { +func (p Plugin) Status(_ context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { resource := taskCtx.Resource().(*ResourceWrapper) statusCode := resource.StatusCode state := resource.State From 14c8d1ebf8dd381ebc7e0284531969a5a716808d Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 11:53:03 -0800 Subject: [PATCH 08/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 0a3f0f631..44ec285d2 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -118,7 +118,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) + metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) var resource ResourceWrapper if taskCtx.Resource() != nil { resource = taskCtx.Resource().(ResourceWrapper) @@ -160,7 +160,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba } func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error { - exec := taskCtx.ResourceMeta().(ResourceMetaWrapper) + exec := taskCtx.ResourceMeta().(*ResourceMetaWrapper) req, err := buildRequest(deleteMethod, nil, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) if err != nil { return err From d78e1b8929b02c532a01be5afc450e50bb9b0538 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 12:02:15 -0800 Subject: [PATCH 09/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 44ec285d2..c38ce8817 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,9 +119,9 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - var resource ResourceWrapper + var resource *ResourceWrapper if taskCtx.Resource() != nil { - resource = taskCtx.Resource().(ResourceWrapper) + resource = taskCtx.Resource().(*ResourceWrapper) } body := map[string]string{ From 0a6cc945e1f14b79707c8e65b5055fd277a15d23 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 12:06:59 -0800 Subject: [PATCH 10/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index c38ce8817..1cd157be7 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -160,6 +160,9 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba } func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error { + if taskCtx.ResourceMeta() == nil { + return nil + } exec := taskCtx.ResourceMeta().(*ResourceMetaWrapper) req, err := buildRequest(deleteMethod, nil, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) if err != nil { From fc8a0ac0fd68535c173a5b0609c43b5a27f041c4 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 12:16:54 -0800 Subject: [PATCH 11/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 1cd157be7..c43c14122 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -163,7 +163,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error if taskCtx.ResourceMeta() == nil { return nil } - exec := taskCtx.ResourceMeta().(*ResourceMetaWrapper) + exec := taskCtx.ResourceMeta().(ResourceMetaWrapper) req, err := buildRequest(deleteMethod, nil, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) if err != nil { return err From 71163cbffcada5b026dddfb72b6b96cdc6a4d89b Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 14:07:26 -0800 Subject: [PATCH 12/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index c43c14122..4458c28f9 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -118,7 +118,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) + metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) var resource *ResourceWrapper if taskCtx.Resource() != nil { resource = taskCtx.Resource().(*ResourceWrapper) From c96b6d155fb4d1fe088f4679c4a8c70c2a30ae59 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 14:29:06 -0800 Subject: [PATCH 13/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 4458c28f9..c43c14122 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -118,7 +118,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) + metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) var resource *ResourceWrapper if taskCtx.Resource() != nil { resource = taskCtx.Resource().(*ResourceWrapper) From 3b23bd426b95fde3568da4d5582ec2ab4d4d147e Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 14:41:31 -0800 Subject: [PATCH 14/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index c43c14122..d2fbb811b 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,15 +119,15 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - var resource *ResourceWrapper - if taskCtx.Resource() != nil { - resource = taskCtx.Resource().(*ResourceWrapper) - } + //var resource *ResourceWrapper + //if taskCtx.Resource() != nil { + // resource = taskCtx.Resource().(*ResourceWrapper) + //} body := map[string]string{ "output_prefix": metadata.OutputPrefix, "job_id": metadata.JobID, - "prev_state": resource.State, + "prev_state": "succeeded", } mJSON, err := json.Marshal(body) From cffd3fa1cb274a8db1ecd5160103d4f3bbafb0b5 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 15:28:07 -0800 Subject: [PATCH 15/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index d2fbb811b..c1329dd7d 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,15 +119,15 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - //var resource *ResourceWrapper - //if taskCtx.Resource() != nil { - // resource = taskCtx.Resource().(*ResourceWrapper) - //} + var resource ResourceWrapper + if taskCtx.Resource() != nil { + resource = taskCtx.Resource().(ResourceWrapper) + } body := map[string]string{ "output_prefix": metadata.OutputPrefix, "job_id": metadata.JobID, - "prev_state": "succeeded", + "prev_state": resource.State, } mJSON, err := json.Marshal(body) From 54593b69a0565d064c100959b737f37bee0e0208 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 15:46:06 -0800 Subject: [PATCH 16/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/webapi/plugin.go | 2 +- go/tasks/plugins/webapi/fastapi/plugin.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/tasks/pluginmachinery/webapi/plugin.go b/go/tasks/pluginmachinery/webapi/plugin.go index 853993834..d751f2f0d 100644 --- a/go/tasks/pluginmachinery/webapi/plugin.go +++ b/go/tasks/pluginmachinery/webapi/plugin.go @@ -81,7 +81,7 @@ type TaskExecutionContext interface { type GetContext interface { ResourceMeta() ResourceMeta - Resource() Resource + // Resource() Resource } type DeleteContext interface { diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index c1329dd7d..0bf491f59 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,15 +119,15 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - var resource ResourceWrapper - if taskCtx.Resource() != nil { - resource = taskCtx.Resource().(ResourceWrapper) - } + //var resource ResourceWrapper + //if taskCtx.Resource() != nil { + // resource = taskCtx.Resource().(ResourceWrapper) + //} body := map[string]string{ "output_prefix": metadata.OutputPrefix, "job_id": metadata.JobID, - "prev_state": resource.State, + "prev_state": "succeeded", } mJSON, err := json.Marshal(body) From 212dd17e5122dbda70b2358740d898e941101c14 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 15:54:16 -0800 Subject: [PATCH 17/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 0bf491f59..488b982cf 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -118,7 +118,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) + metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) //var resource ResourceWrapper //if taskCtx.Resource() != nil { // resource = taskCtx.Resource().(ResourceWrapper) From 0499cfd59053b5a10b07d18847689f1ba84bb136 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 16:10:21 -0800 Subject: [PATCH 18/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 488b982cf..0bf491f59 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -118,7 +118,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) + metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) //var resource ResourceWrapper //if taskCtx.Resource() != nil { // resource = taskCtx.Resource().(ResourceWrapper) From 640233ff0709a37d3b8ade8793b0c220ff7d8593 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 16:42:45 -0800 Subject: [PATCH 19/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/webapi/plugin.go | 2 +- go/tasks/plugins/webapi/fastapi/plugin.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/tasks/pluginmachinery/webapi/plugin.go b/go/tasks/pluginmachinery/webapi/plugin.go index d751f2f0d..853993834 100644 --- a/go/tasks/pluginmachinery/webapi/plugin.go +++ b/go/tasks/pluginmachinery/webapi/plugin.go @@ -81,7 +81,7 @@ type TaskExecutionContext interface { type GetContext interface { ResourceMeta() ResourceMeta - // Resource() Resource + Resource() Resource } type DeleteContext interface { diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 0bf491f59..c1329dd7d 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,15 +119,15 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - //var resource ResourceWrapper - //if taskCtx.Resource() != nil { - // resource = taskCtx.Resource().(ResourceWrapper) - //} + var resource ResourceWrapper + if taskCtx.Resource() != nil { + resource = taskCtx.Resource().(ResourceWrapper) + } body := map[string]string{ "output_prefix": metadata.OutputPrefix, "job_id": metadata.JobID, - "prev_state": "succeeded", + "prev_state": resource.State, } mJSON, err := json.Marshal(body) From a1a21320f0cb92a8bf5fd71acb3f5b511a56dc37 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 16:57:58 -0800 Subject: [PATCH 20/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index c1329dd7d..5558d98d1 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,15 +119,16 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - var resource ResourceWrapper + state := "running" if taskCtx.Resource() != nil { - resource = taskCtx.Resource().(ResourceWrapper) + resource := taskCtx.Resource().(*ResourceWrapper) + state = resource.State } body := map[string]string{ "output_prefix": metadata.OutputPrefix, "job_id": metadata.JobID, - "prev_state": resource.State, + "prev_state": state, } mJSON, err := json.Marshal(body) From eb06a3824aad121762a7bcc157c5cebb9e270a49 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 17 Feb 2023 17:05:31 -0800 Subject: [PATCH 21/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 5558d98d1..eeb4c5368 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -119,16 +119,16 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) - state := "running" + prevState := "running" if taskCtx.Resource() != nil { resource := taskCtx.Resource().(*ResourceWrapper) - state = resource.State + prevState = resource.State } body := map[string]string{ "output_prefix": metadata.OutputPrefix, "job_id": metadata.JobID, - "prev_state": state, + "prev_state": prevState, } mJSON, err := json.Marshal(body) From a2881f35dd2572054e8d91f694b7bacda67256a0 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Thu, 23 Feb 2023 18:26:50 -0800 Subject: [PATCH 22/46] grpc plugin Signed-off-by: Kevin Su --- go.mod | 3 + go.sum | 5 +- go/tasks/plugins/webapi/grpc/config.go | 70 ++++++ go/tasks/plugins/webapi/grpc/config_test.go | 17 ++ go/tasks/plugins/webapi/grpc/plugin.go | 241 ++++++++++++++++++++ 5 files changed, 334 insertions(+), 2 deletions(-) create mode 100644 go/tasks/plugins/webapi/grpc/config.go create mode 100644 go/tasks/plugins/webapi/grpc/config_test.go create mode 100644 go/tasks/plugins/webapi/grpc/plugin.go diff --git a/go.mod b/go.mod index 01686634b..429706e2e 100644 --- a/go.mod +++ b/go.mod @@ -86,6 +86,7 @@ require ( 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/grpc-ecosystem/grpc-gateway v1.16.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 @@ -134,3 +135,5 @@ require ( ) replace github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d + +replace github.com/flyteorg/flyteidl => github.com/flyteorg/flyteidl v1.2.8-0.20230224022440-4e2685c99c5e diff --git a/go.sum b/go.sum index 142b57cf9..01173b30e 100644 --- a/go.sum +++ b/go.sum @@ -283,8 +283,8 @@ 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.3.2 h1:s4DC8go2ou5LtZ+CFcS31r0mhv3baelNV81C1KZS26U= -github.com/flyteorg/flyteidl v1.3.2/go.mod h1:OJAq333OpInPnMhvVz93AlEjmlQ+t0FAD4aakIYE4OU= +github.com/flyteorg/flyteidl v1.2.8-0.20230224022440-4e2685c99c5e h1:YzhNk61vK+1wd+RGpYlX3y3y6LsM5y/1aGTtnuZz8ZU= +github.com/flyteorg/flyteidl v1.2.8-0.20230224022440-4e2685c99c5e/go.mod h1:OJAq333OpInPnMhvVz93AlEjmlQ+t0FAD4aakIYE4OU= 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= @@ -514,6 +514,7 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xC 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= diff --git a/go/tasks/plugins/webapi/grpc/config.go b/go/tasks/plugins/webapi/grpc/config.go new file mode 100644 index 000000000..b8e3306d8 --- /dev/null +++ b/go/tasks/plugins/webapi/grpc/config.go @@ -0,0 +1,70 @@ +package grpc + +import ( + "time" + + pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flytestdlib/config" +) + +var ( + tokenKey = "FLYTE_GRPC_TOKEN" // nolint: gosec + + defaultConfig = Config{ + WebAPI: webapi.PluginConfig{ + ResourceQuotas: map[core.ResourceNamespace]int{ + "default": 1000, + }, + ReadRateLimiter: webapi.RateLimiterConfig{ + Burst: 100, + QPS: 10, + }, + WriteRateLimiter: webapi.RateLimiterConfig{ + Burst: 100, + QPS: 10, + }, + Caching: webapi.CachingConfig{ + Size: 500000, + ResyncInterval: config.Duration{Duration: 30 * time.Second}, + Workers: 10, + MaxSystemFailures: 5, + }, + ResourceMeta: nil, + }, + ResourceConstraints: core.ResourceConstraintsSpec{ + ProjectScopeResourceConstraint: &core.ResourceConstraint{ + Value: 100, + }, + NamespaceScopeResourceConstraint: &core.ResourceConstraint{ + Value: 50, + }, + }, + TokenKey: tokenKey, + } + + configSection = pluginsConfig.MustRegisterSubSection("grpc", &defaultConfig) +) + +// Config is config for 'databricks' plugin +type Config struct { + // WebAPI defines config for the base WebAPI plugin + WebAPI webapi.PluginConfig `json:"webApi" pflag:",Defines config for the base WebAPI plugin."` + + // ResourceConstraints defines resource constraints on how many executions to be created per project/overall at any given time + ResourceConstraints core.ResourceConstraintsSpec `json:"resourceConstraints" pflag:"-,Defines resource constraints on how many executions to be created per project/overall at any given time."` + + TokenKey string `json:"grpcTokenKey" pflag:",Name of the key where to find grpc access token in the secret manager."` + + // grpcEndpoint overrides grpc server endpoint, only for testing + grpcEndpoint string +} + +func GetConfig() *Config { + return configSection.GetConfig().(*Config) +} + +func SetConfig(cfg *Config) error { + return configSection.SetConfig(cfg) +} diff --git a/go/tasks/plugins/webapi/grpc/config_test.go b/go/tasks/plugins/webapi/grpc/config_test.go new file mode 100644 index 000000000..9e994f07f --- /dev/null +++ b/go/tasks/plugins/webapi/grpc/config_test.go @@ -0,0 +1,17 @@ +package grpc + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestGetAndSetConfig(t *testing.T) { + cfg := defaultConfig + cfg.WebAPI.Caching.Workers = 1 + cfg.WebAPI.Caching.ResyncInterval.Duration = 5 * time.Second + err := SetConfig(&cfg) + assert.NoError(t, err) + assert.Equal(t, &cfg, GetConfig()) +} diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go new file mode 100644 index 000000000..6a0e1ef2c --- /dev/null +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -0,0 +1,241 @@ +package grpc + +import ( + "bytes" + "context" + "encoding/gob" + "encoding/json" + "fmt" + "google.golang.org/grpc" + "io/ioutil" + "net/http" + "time" + + flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" + pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" + pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flytestdlib/errors" + "github.com/flyteorg/flytestdlib/promutils" + + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" +) + +const ( + ErrSystem errors.ErrorCode = "System" + postMethod string = "POST" + getMethod string = "GET" + deleteMethod string = "DELETE" + pluginAPI string = "plugins/v1/dummy" +) + +// for mocking/testing purposes, and we'll override this method +type HTTPClient interface { + Do(req *http.Request) (*http.Response, error) +} + +type Plugin struct { + metricScope promutils.Scope + cfg *Config + client HTTPClient +} + +type ResourceWrapper struct { + State service.State + Message string +} + +type ResourceMetaWrapper struct { + OutputPrefix string + Token string + JobID string + TaskType string +} + +func (p Plugin) GetConfig() webapi.PluginConfig { + return GetConfig().WebAPI +} + +func (p Plugin) ResourceRequirements(_ context.Context, _ webapi.TaskExecutionContextReader) ( + namespace core.ResourceNamespace, constraints core.ResourceConstraintsSpec, err error) { + + // Resource requirements are assumed to be the same. + return "default", p.cfg.ResourceConstraints, nil +} + +func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextReader) (webapi.ResourceMeta, + webapi.Resource, error) { + taskTemplate, err := taskCtx.TaskReader().Read(ctx) + if err != nil { + return nil, nil, err + } + inputs, err := taskCtx.InputReader().Get(ctx) + if err != nil { + return nil, nil, err + } + + outputPrefix := taskCtx.OutputWriter().GetOutputPrefixPath().String() + + var opts []grpc.DialOption + // conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) + conn, err := grpc.Dial("backend-plugin-system.flyte.svc.cluster.local:8000", opts...) + if err != nil { + return nil, nil, fmt.Errorf("failed to connect backend plugin system") + } + defer conn.Close() + + client := service.NewBackendPluginServiceClient(conn) + res, err := client.CreateTask(ctx, &service.TaskCreateRequest{Inputs: inputs, Template: taskTemplate, OutputPrefix: outputPrefix}) + if err != nil { + return nil, nil, err + } + + return &ResourceMetaWrapper{ + OutputPrefix: outputPrefix, + JobID: res.JobId, + Token: "", + TaskType: taskTemplate.Type, + }, &ResourceWrapper{State: service.State_RUNNING}, nil +} + +func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { + metadata := taskCtx.ResourceMeta().(*ResourceMetaWrapper) + prevState := service.State_RUNNING + if taskCtx.Resource() != nil { + resource := taskCtx.Resource().(*ResourceWrapper) + prevState = resource.State + } + + var opts []grpc.DialOption + conn, err := grpc.Dial("backend-plugin-system.flyte.svc.cluster.local:8000", opts...) + if err != nil { + return nil, fmt.Errorf("failed to connect backend plugin system") + } + defer conn.Close() + + client := service.NewBackendPluginServiceClient(conn) + res, err := client.GetTask(ctx, &service.TaskGetRequest{TaskType: metadata.TaskType, JobId: metadata.JobID, OutputPrefix: metadata.OutputPrefix, PrevState: prevState}) + + return &ResourceWrapper{ + State: res.State, + Message: res.Message, + }, nil +} + +func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error { + if taskCtx.ResourceMeta() == nil { + return nil + } + metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) + + var opts []grpc.DialOption + conn, err := grpc.Dial("backend-plugin-system.flyte.svc.cluster.local:8000", opts...) + if err != nil { + return fmt.Errorf("failed to connect backend plugin system") + } + defer conn.Close() + client := service.NewBackendPluginServiceClient(conn) + _, err = client.DeleteTask(ctx, &service.TaskDeleteRequest{TaskType: metadata.TaskType, JobId: metadata.JobID}) + return err +} + +func (p Plugin) Status(_ context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { + resource := taskCtx.Resource().(*ResourceWrapper) + + // TODO: Add task link + // taskInfo := createTaskInfo(exec.RunID, jobID, exec.DatabricksInstance) + taskInfo := &core.TaskInfo{} + + switch resource.State { + case service.State_RUNNING: + return core.PhaseInfoRunning(pluginsCore.DefaultPhaseVersion, taskInfo), nil + case service.State_FAILED: + return core.PhaseInfoFailure(resource.Message, "failed to run the job", taskInfo), nil + case service.State_SUCCEEDED: + return core.PhaseInfoSuccess(taskInfo), nil + } + return core.PhaseInfoUndefined, pluginErrors.Errorf(pluginsCore.SystemErrorCode, "unknown execution phase [%v].", resource.Message) +} + +func buildRequest(method string, data []byte, fastAPIEndpoint string, token string, jobID string) (*http.Request, error) { + var fastAPIURL string + // for mocking/testing purposes + if fastAPIEndpoint == "" { + fastAPIURL = fmt.Sprintf("http://backend-plugin-system.flyte.svc.cluster.local:8000/%v", pluginAPI) + } else { + fastAPIURL = fmt.Sprintf("%v%v", fastAPIEndpoint, pluginAPI) + } + + if method == deleteMethod { + fastAPIURL = fmt.Sprintf("%v/?job_id=%v", fastAPIURL, jobID) + } + + var req *http.Request + var err error + if data == nil { + req, err = http.NewRequest(method, fastAPIURL, nil) + } else { + req, err = http.NewRequest(method, fastAPIURL, bytes.NewBuffer(data)) + } + if err != nil { + return nil, err + } + + // TODO: authentication support + req.Header.Add("Authorization", "Bearer "+token) + req.Header.Add("Content-Type", "application/json") + return req, nil +} + +func buildResponse(response *http.Response) (map[string]interface{}, error) { + responseBody, err := ioutil.ReadAll(response.Body) + if err != nil { + return nil, err + } + var data map[string]interface{} + err = json.Unmarshal(responseBody, &data) + if err != nil { + return nil, err + } + return data, nil +} + +func createTaskInfo(runID, jobID, databricksInstance string) *core.TaskInfo { + timeNow := time.Now() + + return &core.TaskInfo{ + OccurredAt: &timeNow, + Logs: []*flyteIdlCore.TaskLog{ + { + Uri: fmt.Sprintf("https://%s/#job/%s/run/%s", + databricksInstance, + jobID, + runID), + Name: "FastAPI Console", + }, + }, + } +} + +func newGrpcPlugin() webapi.PluginEntry { + return webapi.PluginEntry{ + ID: "grpc", + SupportedTaskTypes: []core.TaskType{"bigquery_query_job_task", "snowflake", "spark"}, + PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { + return &Plugin{ + metricScope: iCtx.MetricsScope(), + cfg: GetConfig(), + client: &http.Client{}, + }, nil + }, + } +} + +func init() { + gob.Register(ResourceMetaWrapper{}) + gob.Register(ResourceWrapper{}) + + pluginmachinery.PluginRegistry().RegisterRemotePlugin(newGrpcPlugin()) +} From 4342e5f364bfd96b77adcf997a6260a9dc822b09 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 12:03:27 -0800 Subject: [PATCH 23/46] updated idl version Signed-off-by: Kevin Su --- go.mod | 4 +- go.sum | 270 ++------------------------------------------------------- 2 files changed, 8 insertions(+), 266 deletions(-) diff --git a/go.mod b/go.mod index 429706e2e..dc657e552 100644 --- a/go.mod +++ b/go.mod @@ -136,4 +136,6 @@ require ( replace github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d -replace github.com/flyteorg/flyteidl => github.com/flyteorg/flyteidl v1.2.8-0.20230224022440-4e2685c99c5e +replace github.com/flyteorg/flyteplugins => github.com/flyteorg/flyteplugins v1.0.29-0.20230224022650-a2881f35dd25 + +replace github.com/flyteorg/flyteidl => github.com/flyteorg/flyteidl v1.3.9-0.20230224194627-a1df35060476 diff --git a/go.sum b/go.sum index 01173b30e..8ca83b83f 100644 --- a/go.sum +++ b/go.sum @@ -14,7 +14,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= @@ -46,7 +45,6 @@ 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.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= 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= @@ -58,36 +56,27 @@ 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= 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.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/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-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.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.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= @@ -100,9 +89,7 @@ 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.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= @@ -114,7 +101,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20200723154620-6f35a1152625 h1:cQyO5JQ2iuHnEcF3v24kdDMsgh04RjyFPDtuvD6PCE0= 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/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -127,13 +113,9 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt 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/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/adammck/venv v0.0.0-20160819025605-8a9c907a37d3/go.mod h1:3zXR2a/VSQndtpShh783rUTaEA2mpqN2VqZclBARBc0= github.com/adammck/venv v0.0.0-20200610172036-e77789703e7c h1:RoL0r3mR3JSkLur8q8AD59cByJ+kRwJHODNimZBd7GI= github.com/adammck/venv v0.0.0-20200610172036-e77789703e7c/go.mod h1:3zXR2a/VSQndtpShh783rUTaEA2mpqN2VqZclBARBc0= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= 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= @@ -142,26 +124,15 @@ 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/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= 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/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-radix v0.0.0-20180808171621-7fddfc383310/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/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d h1:O+ayl/Vp3bDEXReXItmYHzCnsz/LKusXdRNiJKVxjPs= github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d/go.mod h1:mZUP7GJmjiWtf8v3FD1X/QdK08BqyeH/1Ejt0qhNzCs= -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/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 h1:BS+UYpbsElC82gB+2E2jiCBg36i8HlubTB/dO/moQ9c= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= @@ -180,18 +151,14 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.0.0/go.mod h1:5f+cELGATgill5Pu3/vK3E github.com/aws/smithy-go v1.0.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/aws/smithy-go v1.1.0 h1:D6CSsM3gdxaGaqXnPgOBCeL6Mophqzu7KJOu7zW78sU= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= -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/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bstadlbauer/dask-k8s-operator-go-client v0.1.0 h1:PMUenya6FhDLW6WjWFdJ0l3uRj7eSxAcFfZ8EoEWgs0= github.com/bstadlbauer/dask-k8s-operator-go-client v0.1.0/go.mod h1:QPyKMRVI9NicWoMJqokH7eDGRqo7QR7Lu4931uxcS1Q= -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= @@ -199,11 +166,9 @@ 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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= 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= @@ -215,12 +180,9 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH 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/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/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= @@ -229,10 +191,7 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 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-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= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -240,10 +199,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/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= @@ -251,16 +208,11 @@ 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/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/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/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -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= @@ -271,7 +223,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m 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 v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= 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= @@ -279,22 +230,16 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi 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.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/flyteidl v1.2.8-0.20230224022440-4e2685c99c5e h1:YzhNk61vK+1wd+RGpYlX3y3y6LsM5y/1aGTtnuZz8ZU= -github.com/flyteorg/flyteidl v1.2.8-0.20230224022440-4e2685c99c5e/go.mod h1:OJAq333OpInPnMhvVz93AlEjmlQ+t0FAD4aakIYE4OU= -github.com/flyteorg/flytestdlib v1.0.0/go.mod h1:QSVN5wIM1lM9d60eAEbX7NwweQXW96t5x4jbyftn89c= +github.com/flyteorg/flyteidl v1.3.9-0.20230224194627-a1df35060476 h1:mA3Ry5YjNu5BqjnCTbA+lFRTRFjGKEMDALRhLTtBuuU= +github.com/flyteorg/flyteidl v1.3.9-0.20230224194627-a1df35060476/go.mod h1:Pkt2skI1LiHs/2ZoekBnyPhuGOFMiuul6HHcKGZBsbM= 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/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/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/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 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= @@ -310,7 +255,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-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= @@ -318,7 +262,6 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG 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.2.1/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 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= @@ -374,16 +317,13 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/ 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-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/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= 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 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -429,7 +369,6 @@ 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= @@ -469,7 +408,6 @@ 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= @@ -478,7 +416,6 @@ 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.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -494,56 +431,27 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 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/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-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/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/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-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 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.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/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= @@ -552,12 +460,7 @@ 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/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/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= @@ -575,7 +478,6 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr 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/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= @@ -588,8 +490,6 @@ 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/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/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -600,12 +500,7 @@ github.com/kubeflow/common v0.4.3/go.mod h1:Qb/5aON7/OWVkN8OnjRqqT0i8X/XzMekRIZ8 github.com/kubeflow/training-operator v1.5.0-rc.0 h1:MaxbG80SYpIbDG63tSiwav4OXczrSFA5AFnaQavzgbw= 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/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.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= @@ -618,11 +513,9 @@ 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.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -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= -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.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= @@ -632,16 +525,8 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp 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.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/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/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= @@ -659,153 +544,90 @@ 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/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/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/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/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= 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/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.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= -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/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/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/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/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.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.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.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/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/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/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 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/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/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/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/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.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= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= 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 v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= 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= @@ -817,14 +639,9 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn 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.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/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= @@ -843,12 +660,9 @@ 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/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/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/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -856,42 +670,33 @@ 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.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.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.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= 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/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.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= 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.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= 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.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.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= 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= @@ -900,8 +705,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U 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-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-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 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= @@ -948,19 +751,15 @@ 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.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/net v0.0.0-20170114055629-f2499483f923/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= @@ -990,7 +789,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= @@ -1003,9 +801,6 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= 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/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= @@ -1021,7 +816,6 @@ 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= @@ -1046,14 +840,11 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ 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/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= 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-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= @@ -1076,7 +867,6 @@ golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7w 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= @@ -1096,13 +886,10 @@ 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= @@ -1125,7 +912,6 @@ 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-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= @@ -1155,12 +941,9 @@ 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-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= @@ -1170,7 +953,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= @@ -1185,7 +967,6 @@ golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtn 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= @@ -1193,7 +974,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= @@ -1204,7 +984,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-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -1215,10 +994,7 @@ 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= @@ -1231,7 +1007,6 @@ 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.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= 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= @@ -1242,7 +1017,6 @@ golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz 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= -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= @@ -1259,11 +1033,8 @@ 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/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= @@ -1285,7 +1056,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= @@ -1298,7 +1068,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= @@ -1324,17 +1093,13 @@ 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-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= @@ -1376,13 +1141,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= @@ -1394,7 +1155,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= @@ -1432,26 +1192,20 @@ 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 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/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.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -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/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 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= 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= @@ -1469,10 +1223,8 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C 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/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk= 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-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= @@ -1480,26 +1232,21 @@ 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.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.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.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= 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.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.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= 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/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= @@ -1513,27 +1260,22 @@ k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4I k8s.io/component-base v0.24.1 h1:APv6W/YmfOWZfo+XJ1mZwep/f7g7Tpwvdbo9CQLDuts= 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-20210813121822-485abfe95c7c/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.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.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-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= 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-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/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= @@ -1552,7 +1294,6 @@ sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h6 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.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.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= 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= @@ -1560,4 +1301,3 @@ 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= From 5f4b1ff787b92bad829ee3830be54d42ccf738ac Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 12:14:26 -0800 Subject: [PATCH 24/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index 6a0e1ef2c..31068aa9d 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -80,7 +80,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR var opts []grpc.DialOption // conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) - conn, err := grpc.Dial("backend-plugin-system.flyte.svc.cluster.local:8000", opts...) + conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) if err != nil { return nil, nil, fmt.Errorf("failed to connect backend plugin system") } @@ -109,7 +109,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba } var opts []grpc.DialOption - conn, err := grpc.Dial("backend-plugin-system.flyte.svc.cluster.local:8000", opts...) + conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) if err != nil { return nil, fmt.Errorf("failed to connect backend plugin system") } @@ -131,7 +131,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) var opts []grpc.DialOption - conn, err := grpc.Dial("backend-plugin-system.flyte.svc.cluster.local:8000", opts...) + conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) if err != nil { return fmt.Errorf("failed to connect backend plugin system") } From 8e569f3e8476dca3b5174283db97b631cff8d80e Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 13:17:43 -0800 Subject: [PATCH 25/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/grpc/config.go b/go/tasks/plugins/webapi/grpc/config.go index b8e3306d8..83380d90c 100644 --- a/go/tasks/plugins/webapi/grpc/config.go +++ b/go/tasks/plugins/webapi/grpc/config.go @@ -41,7 +41,8 @@ var ( Value: 50, }, }, - TokenKey: tokenKey, + TokenKey: tokenKey, + grpcEndpoint: "backend-plugin-system-grpc.flyte.svc.cluster.local:8000", } configSection = pluginsConfig.MustRegisterSubSection("grpc", &defaultConfig) From 2f2dd00f098e2dd36660a76bb7645f628ffdc6bd Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 13:42:30 -0800 Subject: [PATCH 26/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index 31068aa9d..c5af93aa1 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -80,6 +80,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR var opts []grpc.DialOption // conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) + opts = append(opts, grpc.WithInsecure()) conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) if err != nil { return nil, nil, fmt.Errorf("failed to connect backend plugin system") @@ -109,6 +110,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba } var opts []grpc.DialOption + opts = append(opts, grpc.WithInsecure()) conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) if err != nil { return nil, fmt.Errorf("failed to connect backend plugin system") @@ -131,6 +133,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) var opts []grpc.DialOption + opts = append(opts, grpc.WithInsecure()) conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) if err != nil { return fmt.Errorf("failed to connect backend plugin system") From 994e67b145ee29ead1ed4fd1380c5eac0fbda18c Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 14:25:27 -0800 Subject: [PATCH 27/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index c5af93aa1..f92291cd4 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -88,6 +88,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR defer conn.Close() client := service.NewBackendPluginServiceClient(conn) + taskTemplate.Type = "dummy" res, err := client.CreateTask(ctx, &service.TaskCreateRequest{Inputs: inputs, Template: taskTemplate, OutputPrefix: outputPrefix}) if err != nil { return nil, nil, err From 2d491c85f60d4220d827556d9b7c2652fd9e6c3f Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 14:41:56 -0800 Subject: [PATCH 28/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index f92291cd4..c6cdc0f31 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -88,8 +88,10 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR defer conn.Close() client := service.NewBackendPluginServiceClient(conn) + t := taskTemplate.Type taskTemplate.Type = "dummy" res, err := client.CreateTask(ctx, &service.TaskCreateRequest{Inputs: inputs, Template: taskTemplate, OutputPrefix: outputPrefix}) + taskTemplate.Type = t if err != nil { return nil, nil, err } @@ -98,7 +100,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR OutputPrefix: outputPrefix, JobID: res.JobId, Token: "", - TaskType: taskTemplate.Type, + TaskType: t, }, &ResourceWrapper{State: service.State_RUNNING}, nil } From f6f20acdd059ce22b97cce786eb6730b8264be04 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 15:23:46 -0800 Subject: [PATCH 29/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index c6cdc0f31..5613d06ed 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -89,7 +89,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR client := service.NewBackendPluginServiceClient(conn) t := taskTemplate.Type - taskTemplate.Type = "dummy" + taskTemplate.Type = "dummy" // Dummy plugin used to test performance res, err := client.CreateTask(ctx, &service.TaskCreateRequest{Inputs: inputs, Template: taskTemplate, OutputPrefix: outputPrefix}) taskTemplate.Type = t if err != nil { @@ -100,7 +100,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR OutputPrefix: outputPrefix, JobID: res.JobId, Token: "", - TaskType: t, + TaskType: "dummy", }, &ResourceWrapper{State: service.State_RUNNING}, nil } From 3db2afb408918044133c70612129c5b048bce5aa Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 24 Feb 2023 16:46:26 -0800 Subject: [PATCH 30/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 3 ++- go/tasks/pluginmachinery/internal/webapi/metrics.go | 2 ++ go/tasks/plugins/webapi/grpc/plugin.go | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 6d506af19..6f96f309b 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -69,6 +69,7 @@ func (c CorePlugin) GetProperties() core.PluginProperties { } func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) (core.Transition, error) { + c.metrics.NumberOfTasks.Inc(ctx) incomingState, err := c.unmarshalState(ctx, tCtx.PluginStateReader()) if err != nil { return core.UnknownTransition, err @@ -96,7 +97,7 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) if err := tCtx.PluginStateWriter().Put(pluginStateVersion, nextState); err != nil { return core.UnknownTransition, err } - + c.metrics.NumberOfTasks.Dec(ctx) return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } diff --git a/go/tasks/pluginmachinery/internal/webapi/metrics.go b/go/tasks/pluginmachinery/internal/webapi/metrics.go index d5f767a58..7e3b82f68 100644 --- a/go/tasks/pluginmachinery/internal/webapi/metrics.go +++ b/go/tasks/pluginmachinery/internal/webapi/metrics.go @@ -17,6 +17,7 @@ type Metrics struct { ResourceWaitTime prometheus.Summary SucceededUnmarshalState labeled.StopWatch FailedUnmarshalState labeled.Counter + NumberOfTasks labeled.Gauge } var ( @@ -40,5 +41,6 @@ func newMetrics(scope promutils.Scope) Metrics { time.Millisecond, scope), FailedUnmarshalState: labeled.NewCounter("unmarshal_state_failed", "Failed to unmarshal state", scope, labeled.EmitUnlabeledMetric), + NumberOfTasks: labeled.NewGauge("number_of_tasks", "number of running tasks", scope, labeled.EmitUnlabeledMetric), } } diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index 5613d06ed..1cf134309 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -89,7 +89,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR client := service.NewBackendPluginServiceClient(conn) t := taskTemplate.Type - taskTemplate.Type = "dummy" // Dummy plugin used to test performance + taskTemplate.Type = "dummy" // Dummy plugin is used to test performance res, err := client.CreateTask(ctx, &service.TaskCreateRequest{Inputs: inputs, Template: taskTemplate, OutputPrefix: outputPrefix}) taskTemplate.Type = t if err != nil { @@ -122,6 +122,9 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba client := service.NewBackendPluginServiceClient(conn) res, err := client.GetTask(ctx, &service.TaskGetRequest{TaskType: metadata.TaskType, JobId: metadata.JobID, OutputPrefix: metadata.OutputPrefix, PrevState: prevState}) + if err != nil { + return nil, err + } return &ResourceWrapper{ State: res.State, From 16f97aa9bd9a56046076b871fb12b69cef72ea7f Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 27 Feb 2023 15:49:27 -0800 Subject: [PATCH 31/46] add grpc plugin Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/dummy/plugin.go | 17 +--- .../plugins/webapi/fastapi/config_test.go | 17 ---- go/tasks/plugins/webapi/fastapi/plugin.go | 32 +----- go/tasks/plugins/webapi/grpc/config.go | 6 +- go/tasks/plugins/webapi/grpc/plugin.go | 99 ++----------------- 5 files changed, 12 insertions(+), 159 deletions(-) delete mode 100644 go/tasks/plugins/webapi/fastapi/config_test.go diff --git a/go/tasks/plugins/webapi/dummy/plugin.go b/go/tasks/plugins/webapi/dummy/plugin.go index 1a8080067..8ddeaa16b 100644 --- a/go/tasks/plugins/webapi/dummy/plugin.go +++ b/go/tasks/plugins/webapi/dummy/plugin.go @@ -4,15 +4,11 @@ import ( "context" "encoding/gob" flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" "math/rand" "net/http" - "time" - - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/ioutils" pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" @@ -20,11 +16,6 @@ import ( "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" ) -const ( - ErrSystem errors.ErrorCode = "System" - post string = "POST" -) - // for mocking/testing purposes, and we'll override this method type HTTPClient interface { Do(req *http.Request) (*http.Response, error) @@ -65,17 +56,11 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR return nil, nil, err } - // Sending requests and deserialization times - time.Sleep(10 * time.Millisecond) - return &ResourceMetaWrapper{RunID: "runID", Token: "token"}, &ResourceWrapper{StatusCode: 200}, nil } func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { - // Sending requests and deserialization times - time.Sleep(10 * time.Millisecond) - return &ResourceWrapper{ StatusCode: 200, JobID: "jobID", diff --git a/go/tasks/plugins/webapi/fastapi/config_test.go b/go/tasks/plugins/webapi/fastapi/config_test.go deleted file mode 100644 index b6bb9a8b5..000000000 --- a/go/tasks/plugins/webapi/fastapi/config_test.go +++ /dev/null @@ -1,17 +0,0 @@ -package fastapi - -import ( - "testing" - "time" - - "github.com/stretchr/testify/assert" -) - -func TestGetAndSetConfig(t *testing.T) { - cfg := defaultConfig - cfg.WebAPI.Caching.Workers = 1 - cfg.WebAPI.Caching.ResyncInterval.Duration = 5 * time.Second - err := SetConfig(&cfg) - assert.NoError(t, err) - assert.Equal(t, &cfg, GetConfig()) -} diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index eeb4c5368..af4aa61cf 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -6,15 +6,12 @@ import ( "encoding/gob" "encoding/json" "fmt" - "io/ioutil" - "net/http" - "time" - - flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flytestdlib/errors" "github.com/flyteorg/flytestdlib/logger" + "io/ioutil" + "net/http" "github.com/flyteorg/flytestdlib/promutils" @@ -71,12 +68,6 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR return nil, nil, err } - // TODO: Read fast api server access token - //token, err := taskCtx.SecretManager().Get(ctx, p.cfg.TokenKey) - //if err != nil { - // return nil, nil, err - //} - body := map[string]string{ "inputs_path": taskCtx.InputReader().GetInputPath().String(), "task_template_path": taskTemplatePath.String(), @@ -188,8 +179,6 @@ func (p Plugin) Status(_ context.Context, taskCtx webapi.StatusContext) (phase c return core.PhaseInfoUndefined, errors.Errorf(ErrSystem, "No Status field set.") } - // TODO: Add task link - // taskInfo := createTaskInfo(exec.RunID, jobID, exec.DatabricksInstance) taskInfo := &core.TaskInfo{} message := "" @@ -258,23 +247,6 @@ func buildResponse(response *http.Response) (map[string]interface{}, error) { return data, nil } -func createTaskInfo(runID, jobID, databricksInstance string) *core.TaskInfo { - timeNow := time.Now() - - return &core.TaskInfo{ - OccurredAt: &timeNow, - Logs: []*flyteIdlCore.TaskLog{ - { - Uri: fmt.Sprintf("https://%s/#job/%s/run/%s", - databricksInstance, - jobID, - runID), - Name: "FastAPI Console", - }, - }, - } -} - func newFastAPIPlugin() webapi.PluginEntry { return webapi.PluginEntry{ ID: "fastapi", diff --git a/go/tasks/plugins/webapi/grpc/config.go b/go/tasks/plugins/webapi/grpc/config.go index 83380d90c..520af4ce0 100644 --- a/go/tasks/plugins/webapi/grpc/config.go +++ b/go/tasks/plugins/webapi/grpc/config.go @@ -10,7 +10,7 @@ import ( ) var ( - tokenKey = "FLYTE_GRPC_TOKEN" // nolint: gosec + grpcTokenKey = "FLYTE_GRPC_TOKEN" // nolint: gosec defaultConfig = Config{ WebAPI: webapi.PluginConfig{ @@ -41,7 +41,7 @@ var ( Value: 50, }, }, - TokenKey: tokenKey, + GrpcTokenKey: grpcTokenKey, grpcEndpoint: "backend-plugin-system-grpc.flyte.svc.cluster.local:8000", } @@ -56,7 +56,7 @@ type Config struct { // ResourceConstraints defines resource constraints on how many executions to be created per project/overall at any given time ResourceConstraints core.ResourceConstraintsSpec `json:"resourceConstraints" pflag:"-,Defines resource constraints on how many executions to be created per project/overall at any given time."` - TokenKey string `json:"grpcTokenKey" pflag:",Name of the key where to find grpc access token in the secret manager."` + GrpcTokenKey string `json:"grpcTokenKey" pflag:",Name of the key where to find grpc access token in the secret manager."` // grpcEndpoint overrides grpc server endpoint, only for testing grpcEndpoint string diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index 1cf134309..9c4939aeb 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -1,45 +1,22 @@ package grpc import ( - "bytes" "context" "encoding/gob" - "encoding/json" "fmt" - "google.golang.org/grpc" - "io/ioutil" - "net/http" - "time" - - flyteIdlCore "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service" pluginErrors "github.com/flyteorg/flyteplugins/go/tasks/errors" - pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" - "github.com/flyteorg/flytestdlib/errors" - "github.com/flyteorg/flytestdlib/promutils" - "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery" "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" + pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flytestdlib/promutils" + "google.golang.org/grpc" ) -const ( - ErrSystem errors.ErrorCode = "System" - postMethod string = "POST" - getMethod string = "GET" - deleteMethod string = "DELETE" - pluginAPI string = "plugins/v1/dummy" -) - -// for mocking/testing purposes, and we'll override this method -type HTTPClient interface { - Do(req *http.Request) (*http.Response, error) -} - type Plugin struct { metricScope promutils.Scope cfg *Config - client HTTPClient } type ResourceWrapper struct { @@ -81,7 +58,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR var opts []grpc.DialOption // conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) opts = append(opts, grpc.WithInsecure()) - conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) + conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) if err != nil { return nil, nil, fmt.Errorf("failed to connect backend plugin system") } @@ -114,7 +91,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba var opts []grpc.DialOption opts = append(opts, grpc.WithInsecure()) - conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) + conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) if err != nil { return nil, fmt.Errorf("failed to connect backend plugin system") } @@ -140,7 +117,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error var opts []grpc.DialOption opts = append(opts, grpc.WithInsecure()) - conn, err := grpc.Dial("backend-plugin-system-grpc.flyte.svc.cluster.local:8000", opts...) + conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) if err != nil { return fmt.Errorf("failed to connect backend plugin system") } @@ -152,9 +129,6 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error func (p Plugin) Status(_ context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { resource := taskCtx.Resource().(*ResourceWrapper) - - // TODO: Add task link - // taskInfo := createTaskInfo(exec.RunID, jobID, exec.DatabricksInstance) taskInfo := &core.TaskInfo{} switch resource.State { @@ -168,66 +142,6 @@ func (p Plugin) Status(_ context.Context, taskCtx webapi.StatusContext) (phase c return core.PhaseInfoUndefined, pluginErrors.Errorf(pluginsCore.SystemErrorCode, "unknown execution phase [%v].", resource.Message) } -func buildRequest(method string, data []byte, fastAPIEndpoint string, token string, jobID string) (*http.Request, error) { - var fastAPIURL string - // for mocking/testing purposes - if fastAPIEndpoint == "" { - fastAPIURL = fmt.Sprintf("http://backend-plugin-system.flyte.svc.cluster.local:8000/%v", pluginAPI) - } else { - fastAPIURL = fmt.Sprintf("%v%v", fastAPIEndpoint, pluginAPI) - } - - if method == deleteMethod { - fastAPIURL = fmt.Sprintf("%v/?job_id=%v", fastAPIURL, jobID) - } - - var req *http.Request - var err error - if data == nil { - req, err = http.NewRequest(method, fastAPIURL, nil) - } else { - req, err = http.NewRequest(method, fastAPIURL, bytes.NewBuffer(data)) - } - if err != nil { - return nil, err - } - - // TODO: authentication support - req.Header.Add("Authorization", "Bearer "+token) - req.Header.Add("Content-Type", "application/json") - return req, nil -} - -func buildResponse(response *http.Response) (map[string]interface{}, error) { - responseBody, err := ioutil.ReadAll(response.Body) - if err != nil { - return nil, err - } - var data map[string]interface{} - err = json.Unmarshal(responseBody, &data) - if err != nil { - return nil, err - } - return data, nil -} - -func createTaskInfo(runID, jobID, databricksInstance string) *core.TaskInfo { - timeNow := time.Now() - - return &core.TaskInfo{ - OccurredAt: &timeNow, - Logs: []*flyteIdlCore.TaskLog{ - { - Uri: fmt.Sprintf("https://%s/#job/%s/run/%s", - databricksInstance, - jobID, - runID), - Name: "FastAPI Console", - }, - }, - } -} - func newGrpcPlugin() webapi.PluginEntry { return webapi.PluginEntry{ ID: "grpc", @@ -236,7 +150,6 @@ func newGrpcPlugin() webapi.PluginEntry { return &Plugin{ metricScope: iCtx.MetricsScope(), cfg: GetConfig(), - client: &http.Client{}, }, nil }, } From f7bf1f51a70b88ce34eed65931d2735f51a49214 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 27 Feb 2023 16:23:51 -0800 Subject: [PATCH 32/46] nit Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/dummy/config.go | 2 +- go/tasks/plugins/webapi/dummy/plugin.go | 2 +- go/tasks/plugins/webapi/fastapi/config.go | 4 ++-- go/tasks/plugins/webapi/fastapi/plugin.go | 8 ++++---- go/tasks/plugins/webapi/grpc/plugin.go | 1 - go/tasks/plugins/webapi/grpc/plugin_test.go | 1 + 6 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 go/tasks/plugins/webapi/grpc/plugin_test.go diff --git a/go/tasks/plugins/webapi/dummy/config.go b/go/tasks/plugins/webapi/dummy/config.go index b5c9fe462..e7f982b33 100644 --- a/go/tasks/plugins/webapi/dummy/config.go +++ b/go/tasks/plugins/webapi/dummy/config.go @@ -1,4 +1,4 @@ -package databricks +package dummy import ( "time" diff --git a/go/tasks/plugins/webapi/dummy/plugin.go b/go/tasks/plugins/webapi/dummy/plugin.go index 8ddeaa16b..cdf90cae0 100644 --- a/go/tasks/plugins/webapi/dummy/plugin.go +++ b/go/tasks/plugins/webapi/dummy/plugin.go @@ -1,4 +1,4 @@ -package databricks +package dummy import ( "context" diff --git a/go/tasks/plugins/webapi/fastapi/config.go b/go/tasks/plugins/webapi/fastapi/config.go index a2250c043..f2638c4af 100644 --- a/go/tasks/plugins/webapi/fastapi/config.go +++ b/go/tasks/plugins/webapi/fastapi/config.go @@ -57,8 +57,8 @@ type Config struct { TokenKey string `json:"fastApiTokenKey" pflag:",Name of the key where to find Fast API access token in the secret manager."` - // fastApiEndpoint overrides fastapi server endpoint, only for testing - fastApiEndpoint string + // fastAPIEndpoint overrides fastapi server endpoint, only for testing + fastAPIEndpoint string } func GetConfig() *Config { diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index af4aa61cf..7d12757cb 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -78,8 +78,8 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR return nil, nil, fmt.Errorf("failed to marshal data: %v: %v", body, err) } - postDataJson := []byte(string(mJSON)) - req, err := buildRequest(postMethod, postDataJson, p.cfg.fastApiEndpoint, "token", "") + postDataJSON := []byte(string(mJSON)) + req, err := buildRequest(postMethod, postDataJSON, p.cfg.fastApiEndpoint, "token", "") if err != nil { return nil, nil, err } @@ -127,8 +127,8 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba return nil, fmt.Errorf("failed to marshal data: %v: %v", body, err) } - getDataJson := []byte(string(mJSON)) - req, err := buildRequest(getMethod, getDataJson, p.cfg.fastApiEndpoint, metadata.Token, metadata.JobID) + getDataJSON := []byte(string(mJSON)) + req, err := buildRequest(getMethod, getDataJSON, p.cfg.fastApiEndpoint, metadata.Token, metadata.JobID) if err != nil { logger.Errorf(ctx, "Failed to build fast api job request [%v]", err) return nil, err diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index 9c4939aeb..50290ee15 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -56,7 +56,6 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR outputPrefix := taskCtx.OutputWriter().GetOutputPrefixPath().String() var opts []grpc.DialOption - // conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) opts = append(opts, grpc.WithInsecure()) conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) if err != nil { diff --git a/go/tasks/plugins/webapi/grpc/plugin_test.go b/go/tasks/plugins/webapi/grpc/plugin_test.go new file mode 100644 index 000000000..21e034e4c --- /dev/null +++ b/go/tasks/plugins/webapi/grpc/plugin_test.go @@ -0,0 +1 @@ +package grpc From ec42cf9c3a1bc7374c8f0dbdf91d02169dc2c861 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 27 Feb 2023 16:34:35 -0800 Subject: [PATCH 33/46] nit Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/fastapi/plugin.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 7d12757cb..5af7ce388 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -79,7 +79,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } postDataJSON := []byte(string(mJSON)) - req, err := buildRequest(postMethod, postDataJSON, p.cfg.fastApiEndpoint, "token", "") + req, err := buildRequest(postMethod, postDataJSON, p.cfg.fastAPIEndpoint, "token", "") if err != nil { return nil, nil, err } @@ -128,7 +128,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba } getDataJSON := []byte(string(mJSON)) - req, err := buildRequest(getMethod, getDataJSON, p.cfg.fastApiEndpoint, metadata.Token, metadata.JobID) + req, err := buildRequest(getMethod, getDataJSON, p.cfg.fastAPIEndpoint, metadata.Token, metadata.JobID) if err != nil { logger.Errorf(ctx, "Failed to build fast api job request [%v]", err) return nil, err @@ -156,7 +156,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error return nil } exec := taskCtx.ResourceMeta().(ResourceMetaWrapper) - req, err := buildRequest(deleteMethod, nil, p.cfg.fastApiEndpoint, exec.Token, exec.JobID) + req, err := buildRequest(deleteMethod, nil, p.cfg.fastAPIEndpoint, exec.Token, exec.JobID) if err != nil { return err } From 5c6957cc0c9ef5c63c5c2b7db822fad372617954 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 11:47:05 -0800 Subject: [PATCH 34/46] nit Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 6f96f309b..e16031020 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -33,6 +33,8 @@ const ( maxQPS = 100000 ) +var totalRequest int + type CorePlugin struct { id string p webapi.AsyncPlugin @@ -70,6 +72,8 @@ func (c CorePlugin) GetProperties() core.PluginProperties { func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) (core.Transition, error) { c.metrics.NumberOfTasks.Inc(ctx) + totalRequest++ + elapsed := time.Since(time.Now()) incomingState, err := c.unmarshalState(ctx, tCtx.PluginStateReader()) if err != nil { return core.UnknownTransition, err @@ -98,6 +102,9 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) return core.UnknownTransition, err } c.metrics.NumberOfTasks.Dec(ctx) + logger.Infof(ctx, "number of request [%v]", totalRequest) + logger.Infof(ctx, "request latency [%v]", elapsed) + totalRequest-- return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } From 0efb30ac00fc75ef34d7bbf739ee2f829ecdbbc3 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 12:48:36 -0800 Subject: [PATCH 35/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index e16031020..49e473d9c 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -33,8 +33,6 @@ const ( maxQPS = 100000 ) -var totalRequest int - type CorePlugin struct { id string p webapi.AsyncPlugin @@ -102,7 +100,7 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) return core.UnknownTransition, err } c.metrics.NumberOfTasks.Dec(ctx) - logger.Infof(ctx, "number of request [%v]", totalRequest) + logger.Infof(ctx, "request latency [%v]", elapsed) totalRequest-- return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil From eb80e5bc745f34ad746e249d52acce313aa7488b Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 12:52:58 -0800 Subject: [PATCH 36/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 1 - 1 file changed, 1 deletion(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 49e473d9c..2bc553184 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -70,7 +70,6 @@ func (c CorePlugin) GetProperties() core.PluginProperties { func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) (core.Transition, error) { c.metrics.NumberOfTasks.Inc(ctx) - totalRequest++ elapsed := time.Since(time.Now()) incomingState, err := c.unmarshalState(ctx, tCtx.PluginStateReader()) if err != nil { From a62cae84f13eda735e5c72bf6e5882152722962d Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 12:55:00 -0800 Subject: [PATCH 37/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 1 - 1 file changed, 1 deletion(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 2bc553184..01da3ee09 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -101,7 +101,6 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) c.metrics.NumberOfTasks.Dec(ctx) logger.Infof(ctx, "request latency [%v]", elapsed) - totalRequest-- return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } From 0025427af4a32ca6df4ddba813cde76f56b0e82e Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 13:18:42 -0800 Subject: [PATCH 38/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 01da3ee09..819c54db1 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -100,7 +100,7 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) } c.metrics.NumberOfTasks.Dec(ctx) - logger.Infof(ctx, "request latency [%v]", elapsed) + logger.Infof(ctx, "request latency [%v]", elapsed.Round(time.Millisecond).String()) return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } From d32692609747856ab549cc19a2b0d5140089c426 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 13:36:09 -0800 Subject: [PATCH 39/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 819c54db1..4409fa17e 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -100,7 +100,7 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) } c.metrics.NumberOfTasks.Dec(ctx) - logger.Infof(ctx, "request latency [%v]", elapsed.Round(time.Millisecond).String()) + logger.Infof(ctx, "request latency [%v]", elapsed.Round(time.Nanosecond).String()) return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } From 5184e623038f90468e0dcaa1bd345791da5463f0 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 14:29:51 -0800 Subject: [PATCH 40/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 4409fa17e..b961b2b85 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -70,7 +70,7 @@ func (c CorePlugin) GetProperties() core.PluginProperties { func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) (core.Transition, error) { c.metrics.NumberOfTasks.Inc(ctx) - elapsed := time.Since(time.Now()) + start := time.Now() incomingState, err := c.unmarshalState(ctx, tCtx.PluginStateReader()) if err != nil { return core.UnknownTransition, err @@ -99,8 +99,8 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) return core.UnknownTransition, err } c.metrics.NumberOfTasks.Dec(ctx) - - logger.Infof(ctx, "request latency [%v]", elapsed.Round(time.Nanosecond).String()) + logger.Infof(ctx, "number of requests [%v]", c.metrics.NumberOfTasks) + logger.Infof(ctx, "request latency [%v]", time.Since(start).Round(time.Millisecond).String()) return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } From 762fd94dff87623ab476ae8174b2a9ffab00058f Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 14:38:21 -0800 Subject: [PATCH 41/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index b961b2b85..14c74415e 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -100,7 +100,7 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) } c.metrics.NumberOfTasks.Dec(ctx) logger.Infof(ctx, "number of requests [%v]", c.metrics.NumberOfTasks) - logger.Infof(ctx, "request latency [%v]", time.Since(start).Round(time.Millisecond).String()) + logger.Infof(ctx, "request latency [%v]", time.Since(start).Round(time.Microsecond).String()) return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } From 8b9429d325eb0d9a68dc4a77dee4f80e3b5568aa Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 15:33:51 -0800 Subject: [PATCH 42/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index 14c74415e..c028d5abd 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -101,6 +101,7 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) c.metrics.NumberOfTasks.Dec(ctx) logger.Infof(ctx, "number of requests [%v]", c.metrics.NumberOfTasks) logger.Infof(ctx, "request latency [%v]", time.Since(start).Round(time.Microsecond).String()) + logger.Infof(ctx, "phaseInfo [%v]", phaseInfo) return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } From d54e691c067e415abb30114afb2b583d43101ce1 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 15:39:53 -0800 Subject: [PATCH 43/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index 50290ee15..c045818ef 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -118,7 +118,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error opts = append(opts, grpc.WithInsecure()) conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) if err != nil { - return fmt.Errorf("failed to connect backend plugin system") + return fmt.Errorf("failed to connect backend plugin system") } defer conn.Close() client := service.NewBackendPluginServiceClient(conn) From 145422f45a3f2d9eb97f94000b666f9262cdc9ac Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 28 Feb 2023 15:45:06 -0800 Subject: [PATCH 44/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index c045818ef..50290ee15 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -118,7 +118,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error opts = append(opts, grpc.WithInsecure()) conn, err := grpc.Dial(p.cfg.grpcEndpoint, opts...) if err != nil { - return fmt.Errorf("failed to connect backend plugin system") + return fmt.Errorf("failed to connect backend plugin system") } defer conn.Close() client := service.NewBackendPluginServiceClient(conn) From c185a89fbe1e4fba5422e624567971e2eb4e730e Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 6 Mar 2023 11:54:45 -0800 Subject: [PATCH 45/46] wip Signed-off-by: Kevin Su --- go/tasks/plugins/webapi/grpc/plugin.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/go/tasks/plugins/webapi/grpc/plugin.go b/go/tasks/plugins/webapi/grpc/plugin.go index 50290ee15..7a3030d88 100644 --- a/go/tasks/plugins/webapi/grpc/plugin.go +++ b/go/tasks/plugins/webapi/grpc/plugin.go @@ -10,8 +10,10 @@ import ( "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" pluginsCore "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/core" "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/webapi" + "github.com/flyteorg/flytestdlib/logger" "github.com/flyteorg/flytestdlib/promutils" "google.golang.org/grpc" + "time" ) type Plugin struct { @@ -62,11 +64,12 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR return nil, nil, fmt.Errorf("failed to connect backend plugin system") } defer conn.Close() - client := service.NewBackendPluginServiceClient(conn) t := taskTemplate.Type taskTemplate.Type = "dummy" // Dummy plugin is used to test performance + start := time.Now() res, err := client.CreateTask(ctx, &service.TaskCreateRequest{Inputs: inputs, Template: taskTemplate, OutputPrefix: outputPrefix}) + logger.Infof(ctx, "grpc create request latency [%v]", time.Since(start).Round(time.Microsecond).String()) taskTemplate.Type = t if err != nil { return nil, nil, err From 1c20b2664b9780a56d1d5267a4f1c9f0c5c5f497 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 6 Mar 2023 12:19:27 -0800 Subject: [PATCH 46/46] wip Signed-off-by: Kevin Su --- go/tasks/pluginmachinery/internal/webapi/core.go | 3 +-- go/tasks/plugins/webapi/fastapi/plugin.go | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go/tasks/pluginmachinery/internal/webapi/core.go b/go/tasks/pluginmachinery/internal/webapi/core.go index c028d5abd..1db839d19 100644 --- a/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/go/tasks/pluginmachinery/internal/webapi/core.go @@ -70,7 +70,6 @@ func (c CorePlugin) GetProperties() core.PluginProperties { func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) (core.Transition, error) { c.metrics.NumberOfTasks.Inc(ctx) - start := time.Now() incomingState, err := c.unmarshalState(ctx, tCtx.PluginStateReader()) if err != nil { return core.UnknownTransition, err @@ -100,7 +99,7 @@ func (c CorePlugin) Handle(ctx context.Context, tCtx core.TaskExecutionContext) } c.metrics.NumberOfTasks.Dec(ctx) logger.Infof(ctx, "number of requests [%v]", c.metrics.NumberOfTasks) - logger.Infof(ctx, "request latency [%v]", time.Since(start).Round(time.Microsecond).String()) + // logger.Infof(ctx, "request latency [%v]", time.Since(start).Round(time.Microsecond).String()) logger.Infof(ctx, "phaseInfo [%v]", phaseInfo) return core.DoTransitionType(core.TransitionTypeBarrier, phaseInfo), nil } diff --git a/go/tasks/plugins/webapi/fastapi/plugin.go b/go/tasks/plugins/webapi/fastapi/plugin.go index 5af7ce388..3b3445f78 100644 --- a/go/tasks/plugins/webapi/fastapi/plugin.go +++ b/go/tasks/plugins/webapi/fastapi/plugin.go @@ -12,6 +12,7 @@ import ( "github.com/flyteorg/flytestdlib/logger" "io/ioutil" "net/http" + "time" "github.com/flyteorg/flytestdlib/promutils" @@ -84,7 +85,9 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR return nil, nil, err } + start := time.Now() resp, err := p.client.Do(req) + logger.Infof(ctx, "fastapi create request latency [%v]", time.Since(start).Round(time.Microsecond).String()) if err != nil { return nil, nil, err }