From d8b89716414286d1c9c983ca6665a7400730c9bd Mon Sep 17 00:00:00 2001 From: pengli Date: Fri, 2 Aug 2019 01:43:41 -0700 Subject: [PATCH] The knative/pkg import path changed to "knative.dev/pkg" folow the https://github.com/tektoncd/pipeline/pull/1117 - change the dependency path - update the import path --- Gopkg.lock | 155 +- Gopkg.toml | 35 +- cmd/controller/main.go | 2 +- cmd/webhook/main.go | 10 +- hack/update-codegen.sh | 2 +- .../triggers/v1alpha1/event_listener_types.go | 2 +- .../v1alpha1/event_listener_validation.go | 2 +- .../v1alpha1/trigger_binding_validation.go | 2 +- .../v1alpha1/trigger_template_validation.go | 2 +- pkg/client/injection/client/client.go | 4 +- pkg/client/injection/client/fake/fake.go | 4 +- .../informers/triggers/factory/fake/fake.go | 4 +- .../triggers/factory/triggersfactory.go | 6 +- .../v1alpha1/eventlistener/eventlistener.go | 6 +- .../v1alpha1/eventlistener/fake/fake.go | 4 +- .../v1alpha1/triggerbinding/fake/fake.go | 4 +- .../v1alpha1/triggerbinding/triggerbinding.go | 6 +- .../v1alpha1/triggertemplate/fake/fake.go | 4 +- .../triggertemplate/triggertemplate.go | 6 +- pkg/reconciler/reconciler.go | 6 +- .../v1alpha1/eventlistener/controller.go | 8 +- .../v1alpha1/eventlistener/eventlistener.go | 2 +- third_party/VENDOR-LICENSE | 1503 ++-- .../container/apiv1/cluster_manager_client.go | 676 ++ .../go/container/apiv1/doc.go | 49 + .../go/internal/version/version.go | 71 + .../exporter/prometheus}/LICENSE | 0 .../exporter/prometheus/prometheus.go | 282 +- .../exporter/prometheus/sanitize.go | 50 + .../exporter/stackdriver/metrics.go | 520 +- .../exporter/stackdriver/metrics_proto.go | 726 ++ .../stackdriver/metrics_test_utils.go | 62 + .../monitoredresource/gcp_metadata_config.go | 27 + .../monitoredresource/monitored_resources.go | 45 +- .../exporter/stackdriver/resource.go | 112 + .../exporter/stackdriver/stackdriver.go | 115 +- .../exporter/stackdriver/stats.go | 97 +- .../exporter/stackdriver/trace_proto.go | 22 +- .../gen-go/agent/common/v1/common.pb.go | 107 +- .../gen-go/metrics/v1/metrics.pb.go | 421 +- .../gen-go/resource/v1/resource.pb.go | 17 +- .../golang/protobuf/proto/decode.go | 1 - .../golang/protobuf/proto/deprecated.go | 63 + .../github.com/golang/protobuf/proto/equal.go | 3 +- .../golang/protobuf/proto/extensions.go | 78 +- .../github.com/golang/protobuf/proto/lib.go | 38 +- .../golang/protobuf/proto/message_set.go | 137 +- .../golang/protobuf/proto/pointer_reflect.go | 5 +- .../golang/protobuf/proto/pointer_unsafe.go | 15 +- .../golang/protobuf/proto/properties.go | 36 +- .../golang/protobuf/proto/table_marshal.go | 45 +- .../golang/protobuf/proto/table_unmarshal.go | 72 +- .../protoc-gen-go/descriptor/descriptor.pb.go | 603 +- .../golang/protobuf/ptypes/any/any.pb.go | 45 +- .../golang/protobuf/ptypes/duration.go | 2 +- .../protobuf/ptypes/duration/duration.pb.go | 26 +- .../golang/protobuf/ptypes/empty/empty.pb.go | 24 +- .../protobuf/ptypes/struct/struct.pb.go | 178 +- .../golang/protobuf/ptypes/timestamp.go | 6 +- .../protobuf/ptypes/timestamp/timestamp.pb.go | 34 +- .../protobuf/ptypes/wrappers/wrappers.pb.go | 90 +- .../google/go-cmp/cmp/cmpopts/equate.go | 89 + .../google/go-cmp/cmp/cmpopts/ignore.go | 207 + .../google/go-cmp/cmp/cmpopts/sort.go | 147 + .../go-cmp/cmp/cmpopts/struct_filter.go | 182 + .../google/go-cmp/cmp/cmpopts/xform.go | 35 + vendor/github.com/knative/caching/Gopkg.lock | 538 -- vendor/github.com/knative/caching/Gopkg.toml | 48 - vendor/github.com/knative/caching/OWNERS | 6 - vendor/github.com/knative/caching/test/OWNERS | 7 - .../pkg/.github/pull-request-template.md | 6 - .../pipeline/config/300-imagecache.yaml | 2 +- .../pipeline/pkg/apis/config/store.go | 2 +- .../v1alpha1/cluster_task_defaults.go | 25 + .../pipeline/v1alpha1/cluster_task_types.go | 32 +- .../v1alpha1/cluster_task_validation.go | 2 +- .../apis/pipeline/v1alpha1/condition_types.go | 99 + .../pipeline/v1alpha1/condition_validation.go | 42 + .../pipeline/v1alpha1/metadata_validation.go | 2 +- .../apis/pipeline/v1alpha1/pipeline_types.go | 17 +- .../pipeline/v1alpha1/pipeline_validation.go | 2 +- .../v1alpha1/pipelineresource_validation.go | 2 +- .../pipeline/v1alpha1/pipelinerun_types.go | 15 +- .../v1alpha1/pipelinerun_validation.go | 2 +- .../apis/pipeline/v1alpha1/resource_types.go | 2 +- .../apis/pipeline/v1alpha1/result_types.go | 2 +- .../pkg/apis/pipeline/v1alpha1/task_types.go | 3 +- .../apis/pipeline/v1alpha1/task_validation.go | 4 +- .../apis/pipeline/v1alpha1/taskrun_types.go | 68 +- .../pipeline/v1alpha1/taskrun_validation.go | 9 +- .../v1alpha1/zz_generated.deepcopy.go | 236 + .../typed/pipeline/v1alpha1/condition.go | 157 + .../pipeline/v1alpha1/generated_expansion.go | 2 + .../pipeline/v1alpha1/pipeline_client.go | 5 + .../pkg/client/injection/client/client.go | 4 +- .../tektoncd/pipeline/pkg/merge/merge.go | 23 +- .../pipeline/pkg/templating/templating.go | 25 +- .../metric/metricdata/exemplar.go | 5 + .../metric/metricdata/label.go | 7 + .../metric/metricdata/metric.go | 10 +- .../metric/metricexport/doc.go | 19 + .../metric/metricexport/export.go | 26 + .../metric/metricexport/reader.go | 187 + vendor/go.opencensus.io/opencensus.go | 2 +- .../go.opencensus.io/plugin/ocgrpc/client.go | 2 +- .../plugin/ocgrpc/client_stats_handler.go | 2 +- .../go.opencensus.io/plugin/ocgrpc/server.go | 2 +- .../plugin/ocgrpc/server_stats_handler.go | 2 +- .../plugin/ocgrpc/stats_common.go | 53 +- .../plugin/ocgrpc/trace_common.go | 2 +- .../go.opencensus.io/plugin/ochttp/server.go | 9 + .../resource/resourcekeys/const.go | 67 + vendor/go.opencensus.io/stats/record.go | 88 +- .../stats/view/view_to_metric.go | 23 +- vendor/go.opencensus.io/stats/view/worker.go | 2 + .../stats/view/worker_commands.go | 4 + vendor/go.opencensus.io/tag/key.go | 10 + vendor/go.opencensus.io/tag/map.go | 66 +- vendor/go.opencensus.io/tag/map_codec.go | 12 +- vendor/go.opencensus.io/tag/metadata.go | 52 + vendor/go.opencensus.io/tag/profile_19.go | 2 +- .../container/v1/cluster_service.pb.go | 7105 +++++++++++++++++ .../caching/.gitattributes | 0 .../caching/.github/issue-template.md | 0 .../caching/.github/pull-request-template.md | 0 .../caching/.gitignore | 0 .../caching/CONTRIBUTING.md | 0 .../caching/DEVELOPMENT.md | 0 vendor/knative.dev/caching/Gopkg.lock | 1000 +++ vendor/knative.dev/caching/Gopkg.toml | 85 + .../pkg => knative.dev/caching}/LICENSE | 0 .../hack => knative.dev/caching}/OWNERS | 2 +- vendor/knative.dev/caching/OWNERS_ALIASES | 21 + .../knative => knative.dev}/caching/README.md | 0 .../caching/code-of-conduct.md | 0 .../caching/config/image.yaml | 3 +- .../pkg => knative.dev/caching}/hack/OWNERS | 0 .../hack/boilerplate/add-boilerplate.sh | 0 .../hack/boilerplate/boilerplate.go.txt | 0 .../hack/boilerplate/boilerplate.sh.txt | 0 .../caching/hack/update-codegen.sh | 9 +- .../caching/hack/update-deps.sh | 0 .../caching/hack/verify-codegen.sh | 0 .../caching/pkg/apis/caching/register.go | 0 .../caching/pkg/apis/caching/v1alpha1/doc.go | 0 .../apis/caching/v1alpha1/image_defaults.go | 0 .../pkg/apis/caching/v1alpha1/image_types.go | 4 +- .../apis/caching/v1alpha1/image_validation.go | 2 +- .../pkg/apis/caching/v1alpha1/register.go | 2 +- .../caching/v1alpha1/zz_generated.deepcopy.go | 0 .../client/clientset/versioned/clientset.go | 2 +- .../pkg/client/clientset/versioned/doc.go | 0 .../versioned/fake/clientset_generated.go | 6 +- .../client/clientset/versioned/fake/doc.go | 0 .../clientset/versioned/fake/register.go | 2 +- .../client/clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 2 +- .../typed/caching/v1alpha1/caching_client.go | 4 +- .../versioned/typed/caching/v1alpha1/doc.go | 0 .../typed/caching/v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_caching_client.go | 2 +- .../typed/caching/v1alpha1/fake/fake_image.go | 2 +- .../caching/v1alpha1/generated_expansion.go | 0 .../versioned/typed/caching/v1alpha1/image.go | 4 +- .../externalversions/caching/interface.go | 4 +- .../caching/v1alpha1/image.go | 8 +- .../caching/v1alpha1/interface.go | 2 +- .../informers/externalversions/factory.go | 6 +- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../pkg/client/injection/client/client.go | 49 + .../pkg/client/injection/client/fake/fake.go | 54 + .../caching/factory/cachingfactory.go | 52 + .../informers/caching/factory/fake/fake.go | 41 + .../caching/v1alpha1/image/fake/fake.go | 40 + .../informers/caching/v1alpha1/image/image.go | 52 + .../caching/v1alpha1/expansion_generated.go | 0 .../client/listers/caching/v1alpha1/image.go | 2 +- .../pkg => knative.dev/caching}/test/OWNERS | 0 .../caching/test/presubmit-tests.sh | 0 .../pkg/.gitattributes | 0 .../PULL_REQUEST_TEMPLATE/breaking-change.md | 22 + .../.github/PULL_REQUEST_TEMPLATE/bug-fix.md | 10 + .../PULL_REQUEST_TEMPLATE/normal-change.md | 8 + .../pkg/.github/issue-template.md | 0 .../knative => knative.dev}/pkg/.gitignore | 0 .../pkg/CONTRIBUTING.md | 0 .../pkg/DEVELOPMENT.md | 9 +- .../knative => knative.dev}/pkg/Gopkg.lock | 307 +- .../knative => knative.dev}/pkg/Gopkg.toml | 16 +- vendor/knative.dev/pkg/LICENSE | 201 + .../knative => knative.dev}/pkg/OWNERS | 0 .../pkg/OWNERS_ALIASES | 2 - .../knative => knative.dev}/pkg/README.md | 0 vendor/knative.dev/pkg/RELEASING.md | 91 + .../knative => knative.dev}/pkg/apis/OWNERS | 0 .../pkg/apis/condition_set.go | 0 .../pkg/apis/condition_types.go | 1 + .../pkg/apis/contexts.go | 0 .../pkg/apis/deprecated.go | 0 .../knative => knative.dev}/pkg/apis/doc.go | 0 .../pkg/apis/duck/OWNERS | 0 .../pkg/apis/duck/cached.go | 0 .../pkg/apis/duck/doc.go | 0 .../pkg/apis/duck/enqueue.go | 0 .../pkg/apis/duck/interface.go | 0 .../pkg/apis/duck/patch.go | 0 .../pkg/apis/duck/proxy.go | 0 .../pkg/apis/duck/register.go | 0 .../pkg/apis/duck/typed.go | 2 +- .../pkg/apis/duck/unstructured.go | 0 .../apis/duck/v1alpha1/addressable_types.go | 6 +- .../pkg/apis/duck/v1alpha1/condition_set.go | 2 +- .../apis/duck/v1alpha1/conditions_types.go | 4 +- .../pkg/apis/duck/v1alpha1/doc.go | 0 .../duck/v1alpha1/legacy_targetable_types.go | 4 +- .../pkg/apis/duck/v1alpha1/register.go | 2 +- .../duck/v1alpha1/retired_targetable_types.go | 4 +- .../duck/v1alpha1/zz_generated.deepcopy.go | 0 .../apis/duck/v1beta1/addressable_types.go | 4 +- .../pkg/apis/duck/v1beta1/doc.go | 0 .../pkg/apis/duck/v1beta1/register.go | 2 +- .../pkg/apis/duck/v1beta1/status_types.go | 5 +- .../duck/v1beta1/zz_generated.deepcopy.go | 2 +- .../pkg/apis/duck/verify.go | 2 +- .../pkg/apis/field_error.go | 2 +- .../pkg/apis/interfaces.go | 7 + .../pkg/apis/istio/OWNERS | 0 .../pkg/apis/istio/authentication/register.go | 0 .../apis/istio/authentication/v1alpha1/doc.go | 0 .../authentication/v1alpha1/policy_types.go | 2 +- .../istio/authentication/v1alpha1/register.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../pkg/apis/istio/common/v1alpha1/string.go | 0 .../pkg/apis/istio/register.go | 0 .../pkg/apis/istio/v1alpha3/README.md | 0 .../istio/v1alpha3/destinationrule_types.go | 0 .../pkg/apis/istio/v1alpha3/doc.go | 0 .../pkg/apis/istio/v1alpha3/gateway_types.go | 0 .../pkg/apis/istio/v1alpha3/register.go | 2 +- .../istio/v1alpha3/virtualservice_types.go | 2 +- .../istio/v1alpha3/zz_generated.deepcopy.go | 2 +- .../pkg/apis/kind2resource.go | 0 .../pkg/apis/metadata_validation.go | 0 .../pkg/apis/testing/conditions.go | 4 +- .../knative => knative.dev}/pkg/apis/url.go | 0 .../pkg/apis/volatile_time.go | 1 + .../pkg/apis/zz_generated.deepcopy.go | 0 .../pkg/changeset/commit.go | 0 .../pkg/changeset/doc.go | 0 .../pkg/changeset/testdata/HEAD | 0 .../pkg/changeset/testdata/noncommitted/HEAD | 0 .../client/clientset/versioned/clientset.go | 4 +- .../pkg/client/clientset/versioned/doc.go | 0 .../versioned/fake/clientset_generated.go | 10 +- .../client/clientset/versioned/fake/doc.go | 0 .../clientset/versioned/fake/register.go | 4 +- .../client/clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 4 +- .../v1alpha1/authentication_client.go | 4 +- .../typed/authentication/v1alpha1/doc.go | 0 .../typed/authentication/v1alpha1/fake/doc.go | 0 .../fake/fake_authentication_client.go | 2 +- .../v1alpha1/fake/fake_policy.go | 2 +- .../v1alpha1/generated_expansion.go | 0 .../typed/authentication/v1alpha1/policy.go | 4 +- .../typed/istio/v1alpha3/destinationrule.go | 4 +- .../versioned/typed/istio/v1alpha3/doc.go | 0 .../typed/istio/v1alpha3/fake/doc.go | 0 .../v1alpha3/fake/fake_destinationrule.go | 2 +- .../typed/istio/v1alpha3/fake/fake_gateway.go | 2 +- .../istio/v1alpha3/fake/fake_istio_client.go | 2 +- .../v1alpha3/fake/fake_virtualservice.go | 2 +- .../versioned/typed/istio/v1alpha3/gateway.go | 4 +- .../istio/v1alpha3/generated_expansion.go | 0 .../typed/istio/v1alpha3/istio_client.go | 4 +- .../typed/istio/v1alpha3/virtualservice.go | 4 +- .../authentication/interface.go | 4 +- .../authentication/v1alpha1/interface.go | 2 +- .../authentication/v1alpha1/policy.go | 8 +- .../informers/externalversions/factory.go | 8 +- .../informers/externalversions/generic.go | 4 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../externalversions/istio/interface.go | 4 +- .../istio/v1alpha3/destinationrule.go | 8 +- .../istio/v1alpha3/gateway.go | 8 +- .../istio/v1alpha3/interface.go | 2 +- .../istio/v1alpha3/virtualservice.go | 8 +- .../pkg/client/injection/client/client.go | 6 +- .../pkg/client/injection/client/fake/fake.go | 8 +- .../factory/authenticationfactory.go | 10 +- .../authentication}/factory/fake/fake.go | 10 +- .../v1alpha1/policy/fake/fake.go | 8 +- .../authentication/v1alpha1/policy/policy.go | 10 +- .../informers/istio}/factory/fake/fake.go | 10 +- .../informers/istio/factory/istiofactory.go | 10 +- .../destinationrule/destinationrule.go | 10 +- .../v1alpha3/destinationrule/fake/fake.go | 8 +- .../istio/v1alpha3/gateway/fake/fake.go | 8 +- .../istio/v1alpha3/gateway/gateway.go | 10 +- .../v1alpha3/virtualservice/fake/fake.go | 8 +- .../v1alpha3/virtualservice/virtualservice.go | 10 +- .../v1alpha1/expansion_generated.go | 0 .../listers/authentication/v1alpha1/policy.go | 2 +- .../listers/istio/v1alpha3/destinationrule.go | 2 +- .../istio/v1alpha3/expansion_generated.go | 0 .../client/listers/istio/v1alpha3/gateway.go | 2 +- .../listers/istio/v1alpha3/virtualservice.go | 2 +- .../pkg/cloudevents/OWNERS | 0 .../pkg/cloudevents/README.md | 4 +- .../pkg/cloudevents/builder.go | 0 .../pkg/cloudevents/client.go | 0 .../pkg/cloudevents/doc.go | 0 .../pkg/cloudevents/encoding_binary.go | 0 .../pkg/cloudevents/encoding_structured.go | 0 .../pkg/cloudevents/event.go | 0 .../pkg/cloudevents/event_v01.go | 0 .../pkg/cloudevents/event_v02.go | 0 .../pkg/cloudevents/handler.go | 0 .../pkg/code-of-conduct.md | 0 .../codegen/cmd/injection-gen/args/args.go | 0 .../cmd/injection-gen/generators/client.go | 4 +- .../cmd/injection-gen/generators/factory.go | 6 +- .../injection-gen/generators/fakeclient.go | 4 +- .../injection-gen/generators/fakefactory.go | 4 +- .../injection-gen/generators/fakeinformer.go | 4 +- .../cmd/injection-gen/generators/informer.go | 6 +- .../injection-gen/generators/namesystems.go | 0 .../cmd/injection-gen/generators/packages.go | 2 +- .../pkg/codegen/cmd/injection-gen/main.go | 4 +- .../pkg/configmap/OWNERS | 0 .../pkg/configmap/doc.go | 0 .../pkg/configmap/filter.go | 0 .../pkg/configmap/informed_watcher.go | 0 .../pkg/configmap/load.go | 0 .../pkg/configmap/manual_watcher.go | 0 .../pkg/configmap/static_watcher.go | 0 .../pkg/configmap/store.go | 3 + .../pkg/configmap/testing/configmap.go | 7 +- .../pkg/configmap/watcher.go | 0 .../pkg/controller/OWNERS | 0 .../pkg/controller/controller.go | 6 +- .../pkg/controller/helper.go | 2 +- .../pkg/controller/stats_reporter.go | 2 +- .../controller/testing/fake_stats_reporter.go | 0 vendor/knative.dev/pkg/hack/OWNERS | 10 + .../pkg/hack/boilerplate/boilerplate.go.txt | 0 .../pkg/hack/generate-knative.sh | 0 .../pkg/hack/update-codegen.sh | 8 +- .../pkg/hack/update-deps.sh | 7 +- .../pkg/hack/verify-codegen.sh | 0 .../pkg/injection/OWNERS | 0 .../pkg/injection/README.md | 36 +- .../pkg/injection/clients.go | 0 .../injection/clients/apiextclient/apiext.go | 4 +- .../clients/apiextclient/fake/fake.go | 6 +- .../clients/dynamicclient/dynamicclient.go | 4 +- .../clients/dynamicclient/fake/fake.go | 6 +- .../injection/clients/kubeclient/fake/fake.go | 6 +- .../clients/kubeclient/kubeclient.go | 4 +- .../pkg/injection/doc.go | 8 +- .../pkg/injection/factories.go | 0 .../pkg/injection/informers.go | 2 +- .../apiextensionsv1beta1/crd/crd.go | 8 +- .../apiextensionsv1beta1/crd/fake/fake.go | 8 +- .../apiextinformers/factory/factory.go | 8 +- .../apiextinformers/factory/fake/fake.go | 8 +- .../appsv1/deployment/deployment.go | 8 +- .../appsv1/deployment/fake/fake.go | 8 +- .../autoscalingv1/hpa/fake/fake.go | 8 +- .../kubeinformers/autoscalingv1/hpa/hpa.go | 8 +- .../autoscalingv2beta1/hpa/fake/fake.go | 8 +- .../autoscalingv2beta1/hpa/hpa.go | 8 +- .../kubeinformers/batchv1/job/fake/fake.go | 8 +- .../kubeinformers/batchv1/job/job.go | 8 +- .../corev1/configmap/configmap.go | 8 +- .../corev1/configmap/fake/fake.go | 8 +- .../corev1/endpoints/endpoints.go | 8 +- .../corev1/endpoints/fake/fake.go | 8 +- .../corev1/limitrange/fake/fake.go | 38 + .../corev1/limitrange/limitrange.go | 52 + .../corev1/namespace/fake/fake.go | 8 +- .../corev1/namespace/namespace.go | 8 +- .../kubeinformers/corev1/pod/fake/fake.go | 8 +- .../informers/kubeinformers/corev1/pod/pod.go | 8 +- .../corev1/resourcequota/fake/fake.go | 38 + .../corev1/resourcequota/resourcequota.go | 52 + .../kubeinformers/corev1/secret/fake/fake.go | 8 +- .../kubeinformers/corev1/secret/secret.go | 8 +- .../kubeinformers/corev1/service/fake/fake.go | 8 +- .../kubeinformers/corev1/service/service.go | 8 +- .../corev1/serviceaccount/fake/fake.go | 8 +- .../corev1/serviceaccount/service.go | 8 +- .../kubeinformers/factory/factory.go | 8 +- .../kubeinformers/factory/fake/fake.go | 8 +- .../kubeinformers/rbacv1/role/fake/fake.go | 38 + .../kubeinformers/rbacv1/role/role.go | 52 + .../rbacv1/rolebinding/fake/fake.go | 8 +- .../rbacv1/rolebinding/rolebinding.go | 8 +- .../pkg/injection/interface.go | 4 +- .../pkg/injection/sharedmain/main.go | 16 +- .../knative => knative.dev}/pkg/kmeta/OWNERS | 0 .../pkg/kmeta/accessor.go | 0 .../knative => knative.dev}/pkg/kmeta/doc.go | 0 .../pkg/kmeta/labels.go | 0 vendor/knative.dev/pkg/kmeta/names.go | 41 + .../pkg/kmeta/owner_references.go | 0 .../pkg/kmeta/ownerrefable_accessor.go | 25 + .../knative => knative.dev}/pkg/kmp/diff.go | 0 .../knative => knative.dev}/pkg/kmp/doc.go | 0 .../pkg/kmp/reporters.go | 20 +- .../pkg/logging/OWNERS | 0 .../pkg/logging/config.go | 4 +- .../pkg/logging/logger.go | 0 .../pkg/logging/logkey/constants.go | 0 .../pkg/logging/testing/util.go | 2 +- .../pkg/logging/zz_generated.deepcopy.go | 0 .../pkg/metrics/OWNERS | 0 .../pkg/metrics/config.go | 2 +- .../pkg/metrics/doc.go | 0 .../pkg/metrics/exporter.go | 0 .../pkg/metrics/gcp_metadata.go | 4 +- .../pkg/metrics/metricskey/constants.go | 0 .../pkg/metrics/metricstest/metricstest.go | 161 + .../pkg/metrics/monitored_resources.go | 2 +- .../pkg/metrics/prometheus_exporter.go | 2 +- .../pkg/metrics/record.go | 13 +- .../pkg/metrics/stackdriver_exporter.go | 2 +- .../pkg/metrics/testing/config.go | 2 +- .../knative => knative.dev}/pkg/ptr/doc.go | 0 .../knative => knative.dev}/pkg/ptr/ptr.go | 14 + .../pkg/reconciler/testing/actions.go | 0 .../pkg/reconciler/testing/clock.go | 0 .../pkg/reconciler/testing/context.go | 6 +- .../pkg/reconciler/testing/events.go | 0 .../testing/generate_name_reactor.go | 0 .../pkg/reconciler/testing/hooks.go | 0 .../pkg/reconciler/testing/reactions.go | 2 +- .../pkg/reconciler/testing/sorter.go | 0 .../pkg/reconciler/testing/stats.go | 0 .../pkg/reconciler/testing/table.go | 6 +- .../pkg/reconciler/testing/tracker.go | 2 +- .../pkg/reconciler/testing/util.go | 0 .../pkg/signals/signal.go | 0 .../pkg/signals/signal_posix.go | 0 .../pkg/signals/signal_windows.go | 0 .../pkg/system/clock.go | 0 .../pkg/system/names.go | 2 +- .../pkg/system/testing/names.go | 2 +- vendor/knative.dev/pkg/test/OWNERS | 10 + .../pkg/test/README.md | 7 +- .../pkg/test/cleanup.go | 2 +- .../pkg/test/clients.go | 4 +- .../knative => knative.dev}/pkg/test/crd.go | 0 .../pkg/test/e2e_flags.go | 0 .../pkg/test/helpers/data.go | 0 vendor/knative.dev/pkg/test/helpers/name.go | 36 + .../pkg/test/ingress/ingress.go | 0 .../pkg/test/kube_checks.go | 2 +- .../pkg/test/logging/logging.go | 2 +- vendor/knative.dev/pkg/test/logstream/doc.go | 21 + .../pkg/test/logstream/interface.go | 52 + .../pkg/test/logstream/kubelogs.go | 177 + vendor/knative.dev/pkg/test/logstream/null.go | 30 + .../pkg/test/monitoring/doc.go | 0 .../pkg/test/monitoring/monitoring.go | 2 +- .../pkg/test/presubmit-tests.sh | 0 .../pkg/test/request.go | 33 +- .../pkg/test/spoof/error_checks.go | 0 .../pkg/test/spoof/spoof.go | 6 +- .../pkg/test/zipkin/doc.go | 0 .../pkg/test/zipkin/util.go | 4 +- .../pkg/testing/doc.go | 0 .../pkg/testing/inner_default_resource.go | 2 +- .../pkg/testing/register.go | 0 .../pkg/testing/resource.go | 55 +- .../pkg/testing/zz_generated.deepcopy.go | 0 .../pkg/tracing/config/doc.go | 0 .../pkg/tracing/config/tracing.go | 0 .../tracing/config/zz_generated.deepcopy.go | 0 .../pkg/tracing/http.go | 0 .../pkg/tracing/opencensus.go | 5 +- .../pkg/tracing/zipkin.go | 2 +- .../pkg/tracker/doc.go | 0 .../pkg/tracker/enqueue.go | 2 +- .../pkg/tracker/interface.go | 0 .../pkg/version/version.go | 0 .../pkg/webhook/OWNERS | 0 .../pkg/webhook/certs.go | 2 +- .../knative.dev/pkg/webhook/stats_reporter.go | 151 + vendor/knative.dev/pkg/webhook/user_info.go | 62 + .../pkg/webhook/webhook.go | 77 +- .../pkg/websocket/connection.go | 0 .../pkg/websocket/hijack.go | 0 494 files changed, 16894 insertions(+), 3790 deletions(-) create mode 100644 vendor/cloud.google.com/go/container/apiv1/cluster_manager_client.go create mode 100644 vendor/cloud.google.com/go/container/apiv1/doc.go create mode 100644 vendor/cloud.google.com/go/internal/version/version.go rename vendor/{github.com/knative/caching => contrib.go.opencensus.io/exporter/prometheus}/LICENSE (100%) rename vendor/{go.opencensus.io => contrib.go.opencensus.io}/exporter/prometheus/prometheus.go (50%) create mode 100644 vendor/contrib.go.opencensus.io/exporter/prometheus/sanitize.go create mode 100644 vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_proto.go create mode 100644 vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_test_utils.go create mode 100644 vendor/contrib.go.opencensus.io/exporter/stackdriver/resource.go create mode 100644 vendor/github.com/golang/protobuf/proto/deprecated.go create mode 100644 vendor/github.com/google/go-cmp/cmp/cmpopts/equate.go create mode 100644 vendor/github.com/google/go-cmp/cmp/cmpopts/ignore.go create mode 100644 vendor/github.com/google/go-cmp/cmp/cmpopts/sort.go create mode 100644 vendor/github.com/google/go-cmp/cmp/cmpopts/struct_filter.go create mode 100644 vendor/github.com/google/go-cmp/cmp/cmpopts/xform.go delete mode 100644 vendor/github.com/knative/caching/Gopkg.lock delete mode 100644 vendor/github.com/knative/caching/Gopkg.toml delete mode 100644 vendor/github.com/knative/caching/OWNERS delete mode 100644 vendor/github.com/knative/caching/test/OWNERS delete mode 100644 vendor/github.com/knative/pkg/.github/pull-request-template.md create mode 100644 vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_defaults.go create mode 100644 vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_types.go create mode 100644 vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_validation.go create mode 100644 vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/condition.go create mode 100644 vendor/go.opencensus.io/metric/metricexport/doc.go create mode 100644 vendor/go.opencensus.io/metric/metricexport/export.go create mode 100644 vendor/go.opencensus.io/metric/metricexport/reader.go create mode 100644 vendor/go.opencensus.io/resource/resourcekeys/const.go create mode 100644 vendor/go.opencensus.io/tag/metadata.go create mode 100644 vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go rename vendor/{github.com/knative => knative.dev}/caching/.gitattributes (100%) rename vendor/{github.com/knative => knative.dev}/caching/.github/issue-template.md (100%) rename vendor/{github.com/knative => knative.dev}/caching/.github/pull-request-template.md (100%) rename vendor/{github.com/knative => knative.dev}/caching/.gitignore (100%) rename vendor/{github.com/knative => knative.dev}/caching/CONTRIBUTING.md (100%) rename vendor/{github.com/knative => knative.dev}/caching/DEVELOPMENT.md (100%) create mode 100644 vendor/knative.dev/caching/Gopkg.lock create mode 100644 vendor/knative.dev/caching/Gopkg.toml rename vendor/{github.com/knative/pkg => knative.dev/caching}/LICENSE (100%) rename vendor/{github.com/knative/caching/hack => knative.dev/caching}/OWNERS (80%) create mode 100644 vendor/knative.dev/caching/OWNERS_ALIASES rename vendor/{github.com/knative => knative.dev}/caching/README.md (100%) rename vendor/{github.com/knative => knative.dev}/caching/code-of-conduct.md (100%) rename vendor/{github.com/knative => knative.dev}/caching/config/image.yaml (95%) rename vendor/{github.com/knative/pkg => knative.dev/caching}/hack/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/caching/hack/boilerplate/add-boilerplate.sh (100%) rename vendor/{github.com/knative => knative.dev}/caching/hack/boilerplate/boilerplate.go.txt (100%) rename vendor/{github.com/knative => knative.dev}/caching/hack/boilerplate/boilerplate.sh.txt (100%) rename vendor/{github.com/knative => knative.dev}/caching/hack/update-codegen.sh (76%) rename vendor/{github.com/knative => knative.dev}/caching/hack/update-deps.sh (100%) rename vendor/{github.com/knative => knative.dev}/caching/hack/verify-codegen.sh (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/apis/caching/register.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/apis/caching/v1alpha1/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/apis/caching/v1alpha1/image_defaults.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/apis/caching/v1alpha1/image_types.go (98%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/apis/caching/v1alpha1/image_validation.go (97%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/apis/caching/v1alpha1/register.go (97%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/apis/caching/v1alpha1/zz_generated.deepcopy.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/clientset.go (96%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/fake/clientset_generated.go (90%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/fake/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/fake/register.go (96%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/scheme/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/scheme/register.go (96%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/caching_client.go (94%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_caching_client.go (92%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_image.go (98%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/generated_expansion.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/image.go (97%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/informers/externalversions/caching/interface.go (87%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/informers/externalversions/caching/v1alpha1/image.go (90%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/informers/externalversions/caching/v1alpha1/interface.go (93%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/informers/externalversions/factory.go (95%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/informers/externalversions/generic.go (96%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go (94%) create mode 100644 vendor/knative.dev/caching/pkg/client/injection/client/client.go create mode 100644 vendor/knative.dev/caching/pkg/client/injection/client/fake/fake.go create mode 100644 vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/cachingfactory.go create mode 100644 vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/fake/fake.go create mode 100644 vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go create mode 100644 vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/image.go rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/listers/caching/v1alpha1/expansion_generated.go (100%) rename vendor/{github.com/knative => knative.dev}/caching/pkg/client/listers/caching/v1alpha1/image.go (97%) rename vendor/{github.com/knative/pkg => knative.dev/caching}/test/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/caching/test/presubmit-tests.sh (100%) rename vendor/{github.com/knative => knative.dev}/pkg/.gitattributes (100%) create mode 100644 vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/breaking-change.md create mode 100644 vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/bug-fix.md create mode 100644 vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/normal-change.md rename vendor/{github.com/knative => knative.dev}/pkg/.github/issue-template.md (100%) rename vendor/{github.com/knative => knative.dev}/pkg/.gitignore (100%) rename vendor/{github.com/knative => knative.dev}/pkg/CONTRIBUTING.md (100%) rename vendor/{github.com/knative => knative.dev}/pkg/DEVELOPMENT.md (89%) rename vendor/{github.com/knative => knative.dev}/pkg/Gopkg.lock (77%) rename vendor/{github.com/knative => knative.dev}/pkg/Gopkg.toml (83%) create mode 100644 vendor/knative.dev/pkg/LICENSE rename vendor/{github.com/knative => knative.dev}/pkg/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/OWNERS_ALIASES (96%) rename vendor/{github.com/knative => knative.dev}/pkg/README.md (100%) create mode 100644 vendor/knative.dev/pkg/RELEASING.md rename vendor/{github.com/knative => knative.dev}/pkg/apis/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/condition_set.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/condition_types.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/contexts.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/deprecated.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/cached.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/enqueue.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/interface.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/patch.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/proxy.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/register.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/typed.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/unstructured.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/addressable_types.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/condition_set.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/conditions_types.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/legacy_targetable_types.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/register.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/retired_targetable_types.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1alpha1/zz_generated.deepcopy.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1beta1/addressable_types.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1beta1/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1beta1/register.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1beta1/status_types.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/v1beta1/zz_generated.deepcopy.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/duck/verify.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/field_error.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/interfaces.go (90%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/authentication/register.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/authentication/v1alpha1/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/authentication/v1alpha1/policy_types.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/authentication/v1alpha1/register.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/authentication/v1alpha1/zz_generated.deepcopy.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/common/v1alpha1/string.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/register.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/v1alpha3/README.md (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/v1alpha3/destinationrule_types.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/v1alpha3/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/v1alpha3/gateway_types.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/v1alpha3/register.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/v1alpha3/virtualservice_types.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/istio/v1alpha3/zz_generated.deepcopy.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/kind2resource.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/metadata_validation.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/testing/conditions.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/url.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/volatile_time.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/apis/zz_generated.deepcopy.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/changeset/commit.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/changeset/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/changeset/testdata/HEAD (100%) rename vendor/{github.com/knative => knative.dev}/pkg/changeset/testdata/noncommitted/HEAD (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/clientset.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/fake/clientset_generated.go (86%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/fake/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/fake/register.go (92%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/scheme/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/scheme/register.go (92%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/authentication/v1alpha1/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go (92%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_policy.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/authentication/v1alpha1/generated_expansion.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/authentication/v1alpha1/policy.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/destinationrule.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_destinationrule.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_gateway.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_istio_client.go (94%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_virtualservice.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/gateway.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/generated_expansion.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/istio_client.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/client/clientset/versioned/typed/istio/v1alpha3/virtualservice.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/authentication/interface.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/authentication/v1alpha1/interface.go (93%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/authentication/v1alpha1/policy.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/factory.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/generic.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go (94%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/istio/interface.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/istio/v1alpha3/destinationrule.go (92%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/istio/v1alpha3/gateway.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/istio/v1alpha3/interface.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/client/informers/externalversions/istio/v1alpha3/virtualservice.go (92%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/client/client.go (89%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/client/fake/fake.go (86%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/authentication/factory/authenticationfactory.go (83%) rename vendor/{github.com/knative/pkg/client/injection/informers/istio => knative.dev/pkg/client/injection/informers/authentication}/factory/fake/fake.go (76%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/authentication/v1alpha1/policy/fake/fake.go (77%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/authentication/v1alpha1/policy/policy.go (81%) rename vendor/{github.com/knative/pkg/client/injection/informers/authentication => knative.dev/pkg/client/injection/informers/istio}/factory/fake/fake.go (75%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/istio/factory/istiofactory.go (83%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/istio/v1alpha3/destinationrule/destinationrule.go (82%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/istio/v1alpha3/destinationrule/fake/fake.go (78%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/istio/v1alpha3/gateway/fake/fake.go (78%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/istio/v1alpha3/gateway/gateway.go (81%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/istio/v1alpha3/virtualservice/fake/fake.go (78%) rename vendor/{github.com/knative => knative.dev}/pkg/client/injection/informers/istio/v1alpha3/virtualservice/virtualservice.go (82%) rename vendor/{github.com/knative => knative.dev}/pkg/client/listers/authentication/v1alpha1/expansion_generated.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/listers/authentication/v1alpha1/policy.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/client/listers/istio/v1alpha3/destinationrule.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/client/listers/istio/v1alpha3/expansion_generated.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/client/listers/istio/v1alpha3/gateway.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/client/listers/istio/v1alpha3/virtualservice.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/README.md (97%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/builder.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/client.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/encoding_binary.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/encoding_structured.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/event.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/event_v01.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/event_v02.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/cloudevents/handler.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/code-of-conduct.md (100%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/args/args.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/client.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/factory.go (93%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/fakeclient.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/fakefactory.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/informer.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/namesystems.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/generators/packages.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/codegen/cmd/injection-gen/main.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/filter.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/informed_watcher.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/load.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/manual_watcher.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/static_watcher.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/store.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/testing/configmap.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/configmap/watcher.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/controller/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/controller/controller.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/controller/helper.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/controller/stats_reporter.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/controller/testing/fake_stats_reporter.go (100%) create mode 100644 vendor/knative.dev/pkg/hack/OWNERS rename vendor/{github.com/knative => knative.dev}/pkg/hack/boilerplate/boilerplate.go.txt (100%) rename vendor/{github.com/knative => knative.dev}/pkg/hack/generate-knative.sh (100%) rename vendor/{github.com/knative => knative.dev}/pkg/hack/update-codegen.sh (88%) rename vendor/{github.com/knative => knative.dev}/pkg/hack/update-deps.sh (86%) rename vendor/{github.com/knative => knative.dev}/pkg/hack/verify-codegen.sh (100%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/README.md (84%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/clients.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/clients/apiextclient/apiext.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/clients/apiextclient/fake/fake.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/clients/dynamicclient/dynamicclient.go (94%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/clients/dynamicclient/fake/fake.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/clients/kubeclient/fake/fake.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/clients/kubeclient/kubeclient.go (94%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/doc.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/factories.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/crd.go (89%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/fake/fake.go (79%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/apiextinformers/factory/factory.go (89%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/apiextinformers/factory/fake/fake.go (82%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/appsv1/deployment/deployment.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/appsv1/deployment/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/hpa.go (89%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/fake/fake.go (79%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/hpa.go (89%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/batchv1/job/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/batchv1/job/job.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/configmap/configmap.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/configmap/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/endpoints/endpoints.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/endpoints/fake/fake.go (80%) create mode 100644 vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/fake/fake.go create mode 100644 vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/limitrange.go rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/namespace/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/namespace/namespace.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/pod/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/pod/pod.go (88%) create mode 100644 vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/fake/fake.go create mode 100644 vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/resourcequota.go rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/secret/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/secret/secret.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/service/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/service/service.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/serviceaccount/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/corev1/serviceaccount/service.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/factory/factory.go (89%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/factory/fake/fake.go (82%) create mode 100644 vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/fake/fake.go create mode 100644 vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/role.go rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/fake/fake.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/rolebinding.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/interface.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/injection/sharedmain/main.go (92%) rename vendor/{github.com/knative => knative.dev}/pkg/kmeta/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/kmeta/accessor.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/kmeta/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/kmeta/labels.go (100%) create mode 100644 vendor/knative.dev/pkg/kmeta/names.go rename vendor/{github.com/knative => knative.dev}/pkg/kmeta/owner_references.go (100%) create mode 100644 vendor/knative.dev/pkg/kmeta/ownerrefable_accessor.go rename vendor/{github.com/knative => knative.dev}/pkg/kmp/diff.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/kmp/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/kmp/reporters.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/logging/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/logging/config.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/logging/logger.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/logging/logkey/constants.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/logging/testing/util.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/logging/zz_generated.deepcopy.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/config.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/exporter.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/gcp_metadata.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/metricskey/constants.go (100%) create mode 100644 vendor/knative.dev/pkg/metrics/metricstest/metricstest.go rename vendor/{github.com/knative => knative.dev}/pkg/metrics/monitored_resources.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/prometheus_exporter.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/record.go (80%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/stackdriver_exporter.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/metrics/testing/config.go (95%) rename vendor/{github.com/knative => knative.dev}/pkg/ptr/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/ptr/ptr.go (76%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/actions.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/clock.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/context.go (88%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/events.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/generate_name_reactor.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/hooks.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/reactions.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/sorter.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/stats.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/table.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/tracker.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/reconciler/testing/util.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/signals/signal.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/signals/signal_posix.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/signals/signal_windows.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/system/clock.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/system/names.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/system/testing/names.go (95%) create mode 100644 vendor/knative.dev/pkg/test/OWNERS rename vendor/{github.com/knative => knative.dev}/pkg/test/README.md (97%) rename vendor/{github.com/knative => knative.dev}/pkg/test/cleanup.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/test/clients.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/test/crd.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/test/e2e_flags.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/test/helpers/data.go (100%) create mode 100644 vendor/knative.dev/pkg/test/helpers/name.go rename vendor/{github.com/knative => knative.dev}/pkg/test/ingress/ingress.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/test/kube_checks.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/test/logging/logging.go (99%) create mode 100644 vendor/knative.dev/pkg/test/logstream/doc.go create mode 100644 vendor/knative.dev/pkg/test/logstream/interface.go create mode 100644 vendor/knative.dev/pkg/test/logstream/kubelogs.go create mode 100644 vendor/knative.dev/pkg/test/logstream/null.go rename vendor/{github.com/knative => knative.dev}/pkg/test/monitoring/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/test/monitoring/monitoring.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/test/presubmit-tests.sh (100%) rename vendor/{github.com/knative => knative.dev}/pkg/test/request.go (87%) rename vendor/{github.com/knative => knative.dev}/pkg/test/spoof/error_checks.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/test/spoof/spoof.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/test/zipkin/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/test/zipkin/util.go (98%) rename vendor/{github.com/knative => knative.dev}/pkg/testing/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/testing/inner_default_resource.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/testing/register.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/testing/resource.go (73%) rename vendor/{github.com/knative => knative.dev}/pkg/testing/zz_generated.deepcopy.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/tracing/config/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/tracing/config/tracing.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/tracing/config/zz_generated.deepcopy.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/tracing/http.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/tracing/opencensus.go (97%) rename vendor/{github.com/knative => knative.dev}/pkg/tracing/zipkin.go (96%) rename vendor/{github.com/knative => knative.dev}/pkg/tracker/doc.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/tracker/enqueue.go (99%) rename vendor/{github.com/knative => knative.dev}/pkg/tracker/interface.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/version/version.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/webhook/OWNERS (100%) rename vendor/{github.com/knative => knative.dev}/pkg/webhook/certs.go (99%) create mode 100644 vendor/knative.dev/pkg/webhook/stats_reporter.go create mode 100644 vendor/knative.dev/pkg/webhook/user_info.go rename vendor/{github.com/knative => knative.dev}/pkg/webhook/webhook.go (91%) rename vendor/{github.com/knative => knative.dev}/pkg/websocket/connection.go (100%) rename vendor/{github.com/knative => knative.dev}/pkg/websocket/hijack.go (100%) diff --git a/Gopkg.lock b/Gopkg.lock index 4ea629cf3..0b4d28fd5 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,10 +2,12 @@ [[projects]] - digest = "1:1160aee87fa390c901b267c5d83eed5691834d800d9131cd12796ef28f942d40" + digest = "1:5f43842d8fe08b43ada82d57e48a844800b4163d1150f7f451e81cb347fccb72" name = "cloud.google.com/go" packages = [ "compute/metadata", + "container/apiv1", + "internal/version", "monitoring/apiv3", "trace/apiv2", ] @@ -14,14 +16,23 @@ version = "v0.41.0" [[projects]] - digest = "1:b6eb7c2538ec2999a072c0e372a18d7b7e3aedac249f26e159586fa5f892909f" + digest = "1:642cf8e80572f9dc0677b0f241c8ab2e715c9dccc215270ea873c86ddca0062c" + name = "contrib.go.opencensus.io/exporter/prometheus" + packages = ["."] + pruneopts = "NUT" + revision = "f4a2c1e53ec45636355d35fb9022b64e4bdd4a91" + version = "v0.1.0" + +[[projects]] + digest = "1:f091d5e3183a972fc45c4279cec2d97e13262bfda5b85cda3280cb41475e1415" name = "contrib.go.opencensus.io/exporter/stackdriver" packages = [ ".", "monitoredresource", ] pruneopts = "NUT" - revision = "c06c82c832edca4eaf7b0241bd655560a1be0346" + revision = "6850d2e00d7dfe4886f7e4773bf9f05e39296d92" + version = "v0.12.4" [[projects]] digest = "1:acf5b7756eca7cd8133461c44771fd318ee2bef31d4cc013551165473a984ba8" @@ -71,7 +82,7 @@ version = "v1.0.0" [[projects]] - digest = "1:fa965c1fd0f17153f608037e109e62104058bc1d08d44849867795fd306fa8b8" + digest = "1:e7d26760c4e7d67a443b082153c4b473ad0b8f7388302a2f788b1360f751abb8" name = "github.com/census-instrumentation/opencensus-proto" packages = [ "gen-go/agent/common/v1", @@ -79,8 +90,8 @@ "gen-go/resource/v1", ] pruneopts = "NUT" - revision = "7f2434bc10da710debe5c4315ed6d4df454b4024" - version = "v0.1.0" + revision = "d89fa54de508111353cb0b06403c00569be780d8" + version = "v0.2.1" [[projects]] digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" @@ -142,7 +153,7 @@ revision = "869f871628b6baa9cfbc11732cdf6546b17c1298" [[projects]] - digest = "1:4dacf728c83400b3e9d1d3025dd3c1e93e9a1b033726d1b193dc209f3fa9cb7a" + digest = "1:f5a98770ab68c1146ee5cc14ed24aafa2bb1a2b3c89cbeadc9eb913b1f9d930a" name = "github.com/golang/protobuf" packages = [ "proto", @@ -156,7 +167,8 @@ "ptypes/wrappers", ] pruneopts = "NUT" - revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" + revision = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7" + version = "v1.3.2" [[projects]] digest = "1:05f95ffdfcf651bdb0f05b40b69e7f5663047f8da75c72d58728acb59b5cc107" @@ -167,10 +179,11 @@ version = "v1.0.0" [[projects]] - digest = "1:bf40199583e5143d1472fc34d10d6f4b69d97572142acf343b3e43136da40823" + digest = "1:010d46ea3c1e730897e53058d1013a963f3f987675dda87df64f891b945281db" name = "github.com/google/go-cmp" packages = [ "cmp", + "cmp/cmpopts", "cmp/internal/diff", "cmp/internal/flags", "cmp/internal/function", @@ -283,48 +296,6 @@ revision = "0ff49de124c6f76f8494e194af75bde0f1a49a29" version = "v1.1.6" -[[projects]] - digest = "1:9a670ce0109361c513e7103c478dbbea261bb81d41d0f9c822707451bce139bb" - name = "github.com/knative/caching" - packages = [ - "pkg/apis/caching", - "pkg/apis/caching/v1alpha1", - "pkg/client/clientset/versioned", - "pkg/client/clientset/versioned/scheme", - "pkg/client/clientset/versioned/typed/caching/v1alpha1", - ] - pruneopts = "T" - revision = "3fc06fd3c9880a9ebb5c401f4b20cf6666cc7bc0" - -[[projects]] - digest = "1:33afd816eb96416e5d7c0a64c1c6412e277720faa03c90739ce1d1fb1764b8de" - name = "github.com/knative/pkg" - packages = [ - "apis", - "apis/duck", - "apis/duck/v1beta1", - "changeset", - "codegen/cmd/injection-gen", - "codegen/cmd/injection-gen/args", - "codegen/cmd/injection-gen/generators", - "configmap", - "controller", - "injection", - "injection/clients/kubeclient", - "injection/sharedmain", - "kmeta", - "kmp", - "logging", - "logging/logkey", - "metrics", - "metrics/metricskey", - "signals", - "system", - "webhook", - ] - pruneopts = "T" - revision = "68737b1b4e03d9a888e89ee2a44714a56eefd539" - [[projects]] digest = "1:dabd27a263906435d198a5fa9237ff2b14383a1e29964b7006e6dc975134f5e6" name = "github.com/knative/test-infra" @@ -468,7 +439,7 @@ version = "v1.0.3" [[projects]] - digest = "1:5d1881b9924f9ea21c95ca53b1a5acd283b21800f7e8cbebaa05a8245d15397a" + digest = "1:d989d111c52b615a102c67797fa0bbcf3763e4949659c2f7418e9e7fcf0cf29e" name = "github.com/tektoncd/pipeline" packages = [ "pkg/apis/config", @@ -485,7 +456,7 @@ "pkg/templating", ] pruneopts = "NUT" - revision = "0ee3b1491aa5b38d48b4547eeb4c87d11852b3a3" + revision = "42bc3fbd5fc3ed35bfad1f371ef585da92b5fdc6" [[projects]] digest = "1:b749c54748b755170cecd0bc4099f527d431a7ecd264f680913ce148ee6ee19c" @@ -519,19 +490,20 @@ version = "v1.0.0" [[projects]] - digest = "1:69a97603fe8952de86ee1e74a065f7974ec7d7d1d2301d3f5da6d342156363f4" + digest = "1:0e3fd52087079d1289983e4fef32268ca965973f5370b69204e2934185527baa" name = "go.opencensus.io" packages = [ ".", - "exporter/prometheus", "internal", "internal/tagencoding", "metric/metricdata", + "metric/metricexport", "metric/metricproducer", "plugin/ocgrpc", "plugin/ochttp", "plugin/ochttp/propagation/b3", "resource", + "resource/resourcekeys", "stats", "stats/internal", "stats/view", @@ -542,8 +514,8 @@ "trace/tracestate", ] pruneopts = "NUT" - revision = "75c0cca22312e51bfd4fafdbe9197ae399e18b38" - version = "v0.20.2" + revision = "9c377598961b706d1542bd2d84d538b5094d596e" + version = "v0.22.0" [[projects]] digest = "1:cc9d86ec4e6e3bdf87e3a421273bfeed003cf8e21351c0302fe8b0eb7b10efe6" @@ -738,7 +710,7 @@ version = "v1.6.1" [[projects]] - digest = "1:f13a21652a31a08931795226c4506ed9fa3be54a53ac09556ffcb74c1a24bc52" + digest = "1:7e4395d42254cb237b50c142598dd465cbd38c8a78e7fab8ae23d964b33ebe9d" name = "google.golang.org/genproto" packages = [ "googleapis/api/annotations", @@ -746,6 +718,7 @@ "googleapis/api/label", "googleapis/api/metric", "googleapis/api/monitoredres", + "googleapis/container/v1", "googleapis/devtools/cloudtrace/v2", "googleapis/monitoring/v3", "googleapis/rpc/status", @@ -1122,22 +1095,52 @@ pruneopts = "NUT" revision = "33be087ad058f99c78e067996202b60230737e49" +[[projects]] + digest = "1:e137525e8c556aad84e7d1ea5b2f77621faaa236313e9ebb76357ee6265c3e32" + name = "knative.dev/caching" + packages = [ + "pkg/apis/caching", + "pkg/apis/caching/v1alpha1", + "pkg/client/clientset/versioned", + "pkg/client/clientset/versioned/scheme", + "pkg/client/clientset/versioned/typed/caching/v1alpha1", + ] + pruneopts = "T" + revision = "2032732871ff807958e045858b462d372eec9587" + +[[projects]] + digest = "1:2f5f32fe8d98f7936a79e575fda9c055b97e52dd78ef2d0b98f4b688383a0831" + name = "knative.dev/pkg" + packages = [ + "apis", + "apis/duck", + "apis/duck/v1beta1", + "changeset", + "codegen/cmd/injection-gen", + "codegen/cmd/injection-gen/args", + "codegen/cmd/injection-gen/generators", + "configmap", + "controller", + "injection", + "injection/clients/kubeclient", + "injection/sharedmain", + "kmeta", + "kmp", + "logging", + "logging/logkey", + "metrics", + "metrics/metricskey", + "signals", + "system", + "webhook", + ] + pruneopts = "T" + revision = "e4bc08cc8deda3eac40a8d53984d09c9d0e1ad48" + [solve-meta] analyzer-name = "dep" analyzer-version = 1 input-imports = [ - "github.com/knative/caching/pkg/client/clientset/versioned", - "github.com/knative/pkg/apis", - "github.com/knative/pkg/codegen/cmd/injection-gen", - "github.com/knative/pkg/configmap", - "github.com/knative/pkg/controller", - "github.com/knative/pkg/injection", - "github.com/knative/pkg/injection/clients/kubeclient", - "github.com/knative/pkg/injection/sharedmain", - "github.com/knative/pkg/logging", - "github.com/knative/pkg/logging/logkey", - "github.com/knative/pkg/signals", - "github.com/knative/pkg/webhook", "github.com/knative/test-infra/tools/dep-collector", "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1", "github.com/tektoncd/pipeline/pkg/client/clientset/versioned", @@ -1172,6 +1175,18 @@ "k8s.io/code-generator/cmd/defaulter-gen", "k8s.io/code-generator/cmd/informer-gen", "k8s.io/code-generator/cmd/lister-gen", + "knative.dev/caching/pkg/client/clientset/versioned", + "knative.dev/pkg/apis", + "knative.dev/pkg/codegen/cmd/injection-gen", + "knative.dev/pkg/configmap", + "knative.dev/pkg/controller", + "knative.dev/pkg/injection", + "knative.dev/pkg/injection/clients/kubeclient", + "knative.dev/pkg/injection/sharedmain", + "knative.dev/pkg/logging", + "knative.dev/pkg/logging/logkey", + "knative.dev/pkg/signals", + "knative.dev/pkg/webhook", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index c082a7687..425fb5dd9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -7,15 +7,15 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/code-generator/cmd/lister-gen", "k8s.io/code-generator/cmd/informer-gen", - "github.com/knative/pkg/codegen/cmd/injection-gen", + "knative.dev/pkg/codegen/cmd/injection-gen", "github.com/tektoncd/plumbing/scripts", "github.com/knative/test-infra/tools/dep-collector", ] [[constraint]] name = "github.com/tektoncd/pipeline" - # HEAD as of 2019-07-15 - revision = "0ee3b1491aa5b38d48b4547eeb4c87d11852b3a3" + # Pipeline trun to knative.dev + revision = "42bc3fbd5fc3ed35bfad1f371ef585da92b5fdc6" [[override]] name = "k8s.io/klog" @@ -47,13 +47,12 @@ required = [ [[override]] name = "github.com/golang/protobuf" - # Lock the version of protobuf to keep things building. - revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" + version = "1.3.2" [[constraint]] - name = "github.com/knative/caching" - # HEAD as of 2019-03-21 - revision = "3fc06fd3c9880a9ebb5c401f4b20cf6666cc7bc0" + name = "knative.dev/caching" + # HEAD as of 2019-07-23 + revision = "2032732871ff807958e045858b462d372eec9587" [[constraint]] name = "github.com/tektoncd/plumbing" @@ -66,19 +65,21 @@ required = [ revision = "69af8af1d3fec861ada88efc72409b3467b0588d" [[override]] - name = "github.com/knative/pkg" - # HEAD as of 2019-06-14 💖 - revision = "68737b1b4e03d9a888e89ee2a44714a56eefd539" + name = "knative.dev/pkg" + # HEAD as of 2019-07-23 💖 + revision = "e4bc08cc8deda3eac40a8d53984d09c9d0e1ad48" [[override]] name = "go.uber.org/zap" revision = "67bc79d13d155c02fd008f721863ff8cc5f30659" +[[override]] + name = "contrib.go.opencensus.io/exporter/prometheus" + version = "0.1.0" + [[override]] name = "contrib.go.opencensus.io/exporter/stackdriver" - # HEAD as of 2019-02-11 - # Needed because this includes a fix to support Stackdriver built-in metrics - revision = "c06c82c832edca4eaf7b0241bd655560a1be0346" + version = "0.12.2" [[override]] name = "google.golang.org/genproto" @@ -88,7 +89,7 @@ required = [ [[override]] name = "github.com/census-instrumentation/opencensus-proto" # Lock the version of proto package to v2 to keep things building. - version = "v0.1.0" + version = "0.2.0" [prune] go-tests = true @@ -101,7 +102,7 @@ required = [ non-go = false [[prune.project]] - name = "github.com/knative/caching" + name = "knative.dev/caching" unused-packages = false non-go = false @@ -110,6 +111,6 @@ required = [ non-go = false [[prune.project]] - name = "github.com/knative/pkg" + name = "knative.dev/pkg" unused-packages = false non-go = false diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 29dcb173b..5ba254fd5 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -16,7 +16,7 @@ limitations under the License. package main import ( - "github.com/knative/pkg/injection/sharedmain" + "knative.dev/pkg/injection/sharedmain" "github.com/tektoncd/triggers/pkg/reconciler/v1alpha1/eventlistener" ) diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index 157d9bd7c..88ba47edb 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -20,17 +20,17 @@ import ( "flag" "log" - "github.com/knative/pkg/configmap" - "github.com/knative/pkg/logging" - "github.com/knative/pkg/logging/logkey" - "github.com/knative/pkg/signals" - "github.com/knative/pkg/webhook" "github.com/tektoncd/pipeline/pkg/system" "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "knative.dev/pkg/configmap" + "knative.dev/pkg/logging" + "knative.dev/pkg/logging/logkey" + "knative.dev/pkg/signals" + "knative.dev/pkg/webhook" ) // WebhookLogKey is the name of the logger for the webhook cmd diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 8283d0a7c..529dda8ce 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -22,7 +22,7 @@ source $(dirname $0)/../vendor/github.com/tektoncd/plumbing/scripts/library.sh CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)} -KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/github.com/knative/pkg 2>/dev/null || echo ../pkg)} +KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/knative.dev/pkg 2>/dev/null || echo ../pkg)} # generate the code with: # --output-base because this script should also be able to run inside the vendor dir of diff --git a/pkg/apis/triggers/v1alpha1/event_listener_types.go b/pkg/apis/triggers/v1alpha1/event_listener_types.go index fd39b6dff..a3e8ff1ce 100644 --- a/pkg/apis/triggers/v1alpha1/event_listener_types.go +++ b/pkg/apis/triggers/v1alpha1/event_listener_types.go @@ -14,9 +14,9 @@ limitations under the License. */ import ( - "github.com/knative/pkg/apis" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/pkg/apis" ) // Check that EventListener may be validated and defaulted. diff --git a/pkg/apis/triggers/v1alpha1/event_listener_validation.go b/pkg/apis/triggers/v1alpha1/event_listener_validation.go index 7ce0697a3..b83f0cc28 100644 --- a/pkg/apis/triggers/v1alpha1/event_listener_validation.go +++ b/pkg/apis/triggers/v1alpha1/event_listener_validation.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "context" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) func (t *EventListener) Validate(ctx context.Context) *apis.FieldError { diff --git a/pkg/apis/triggers/v1alpha1/trigger_binding_validation.go b/pkg/apis/triggers/v1alpha1/trigger_binding_validation.go index 1d5a74156..f3f763893 100644 --- a/pkg/apis/triggers/v1alpha1/trigger_binding_validation.go +++ b/pkg/apis/triggers/v1alpha1/trigger_binding_validation.go @@ -18,7 +18,7 @@ package v1alpha1 import ( "context" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) func (t *TriggerBinding) Validate(ctx context.Context) *apis.FieldError { diff --git a/pkg/apis/triggers/v1alpha1/trigger_template_validation.go b/pkg/apis/triggers/v1alpha1/trigger_template_validation.go index dce6daa1b..e29c62505 100644 --- a/pkg/apis/triggers/v1alpha1/trigger_template_validation.go +++ b/pkg/apis/triggers/v1alpha1/trigger_template_validation.go @@ -18,7 +18,7 @@ package v1alpha1 import ( "context" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) func (t *TriggerTemplate) Validate(ctx context.Context) *apis.FieldError { diff --git a/pkg/client/injection/client/client.go b/pkg/client/injection/client/client.go index 49bcd9760..393c6cb7d 100644 --- a/pkg/client/injection/client/client.go +++ b/pkg/client/injection/client/client.go @@ -21,10 +21,10 @@ package client import ( "context" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" versioned "github.com/tektoncd/triggers/pkg/client/clientset/versioned" rest "k8s.io/client-go/rest" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/pkg/client/injection/client/fake/fake.go b/pkg/client/injection/client/fake/fake.go index f00cdeaec..ababf974e 100644 --- a/pkg/client/injection/client/fake/fake.go +++ b/pkg/client/injection/client/fake/fake.go @@ -21,12 +21,12 @@ package fake import ( "context" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" fake "github.com/tektoncd/triggers/pkg/client/clientset/versioned/fake" client "github.com/tektoncd/triggers/pkg/client/injection/client" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/pkg/client/injection/informers/triggers/factory/fake/fake.go b/pkg/client/injection/informers/triggers/factory/fake/fake.go index 97dd8762c..e86fd430a 100644 --- a/pkg/client/injection/informers/triggers/factory/fake/fake.go +++ b/pkg/client/injection/informers/triggers/factory/fake/fake.go @@ -21,11 +21,11 @@ package fake import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" externalversions "github.com/tektoncd/triggers/pkg/client/informers/externalversions" fake "github.com/tektoncd/triggers/pkg/client/injection/client/fake" factory "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = factory.Get diff --git a/pkg/client/injection/informers/triggers/factory/triggersfactory.go b/pkg/client/injection/informers/triggers/factory/triggersfactory.go index 89bd6ec76..2cc6ceacd 100644 --- a/pkg/client/injection/informers/triggers/factory/triggersfactory.go +++ b/pkg/client/injection/informers/triggers/factory/triggersfactory.go @@ -21,11 +21,11 @@ package triggersfactory import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" externalversions "github.com/tektoncd/triggers/pkg/client/informers/externalversions" client "github.com/tektoncd/triggers/pkg/client/injection/client" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/eventlistener.go b/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/eventlistener.go index 0c6120088..4d34656e8 100644 --- a/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/eventlistener.go +++ b/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/eventlistener.go @@ -21,11 +21,11 @@ package eventlistener import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" v1alpha1 "github.com/tektoncd/triggers/pkg/client/informers/externalversions/triggers/v1alpha1" factory "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/fake/fake.go b/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/fake/fake.go index 68a435a18..421879182 100644 --- a/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/fake/fake.go +++ b/pkg/client/injection/informers/triggers/v1alpha1/eventlistener/fake/fake.go @@ -21,10 +21,10 @@ package fake import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" fake "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/factory/fake" eventlistener "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/v1alpha1/eventlistener" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = eventlistener.Get diff --git a/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/fake/fake.go b/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/fake/fake.go index a1e41e80c..2624ac984 100644 --- a/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/fake/fake.go +++ b/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/fake/fake.go @@ -21,10 +21,10 @@ package fake import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" fake "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/factory/fake" triggerbinding "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = triggerbinding.Get diff --git a/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/triggerbinding.go b/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/triggerbinding.go index e12f1034a..c503a1986 100644 --- a/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/triggerbinding.go +++ b/pkg/client/injection/informers/triggers/v1alpha1/triggerbinding/triggerbinding.go @@ -21,11 +21,11 @@ package triggerbinding import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" v1alpha1 "github.com/tektoncd/triggers/pkg/client/informers/externalversions/triggers/v1alpha1" factory "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/fake/fake.go b/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/fake/fake.go index 37f14a343..15a9b739d 100644 --- a/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/fake/fake.go +++ b/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/fake/fake.go @@ -21,10 +21,10 @@ package fake import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" fake "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/factory/fake" triggertemplate "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = triggertemplate.Get diff --git a/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/triggertemplate.go b/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/triggertemplate.go index c16d87774..6e849ed4c 100644 --- a/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/triggertemplate.go +++ b/pkg/client/injection/informers/triggers/v1alpha1/triggertemplate/triggertemplate.go @@ -21,11 +21,11 @@ package triggertemplate import ( "context" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" v1alpha1 "github.com/tektoncd/triggers/pkg/client/informers/externalversions/triggers/v1alpha1" factory "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/pkg/reconciler/reconciler.go b/pkg/reconciler/reconciler.go index 6553c0ad4..679abbd9d 100644 --- a/pkg/reconciler/reconciler.go +++ b/pkg/reconciler/reconciler.go @@ -19,9 +19,6 @@ package reconciler import ( "time" - cachingclientset "github.com/knative/caching/pkg/client/clientset/versioned" - "github.com/knative/pkg/configmap" - "github.com/knative/pkg/logging/logkey" pipelineclientset "github.com/tektoncd/pipeline/pkg/client/clientset/versioned" triggersclientset "github.com/tektoncd/triggers/pkg/client/clientset/versioned" triggersScheme "github.com/tektoncd/triggers/pkg/client/clientset/versioned/scheme" @@ -31,6 +28,9 @@ import ( "k8s.io/client-go/kubernetes/scheme" typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/record" + cachingclientset "knative.dev/caching/pkg/client/clientset/versioned" + "knative.dev/pkg/configmap" + "knative.dev/pkg/logging/logkey" ) // Options defines the common reconciler options. diff --git a/pkg/reconciler/v1alpha1/eventlistener/controller.go b/pkg/reconciler/v1alpha1/eventlistener/controller.go index 878289ed9..65635814b 100644 --- a/pkg/reconciler/v1alpha1/eventlistener/controller.go +++ b/pkg/reconciler/v1alpha1/eventlistener/controller.go @@ -20,15 +20,15 @@ import ( "context" "time" - "github.com/knative/pkg/configmap" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection/clients/kubeclient" - "github.com/knative/pkg/logging" pipelineclient "github.com/tektoncd/pipeline/pkg/client/injection/client" triggersclient "github.com/tektoncd/triggers/pkg/client/injection/client" eventlistenerinformer "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/v1alpha1/eventlistener" "github.com/tektoncd/triggers/pkg/reconciler" "k8s.io/client-go/tools/cache" + "knative.dev/pkg/configmap" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection/clients/kubeclient" + "knative.dev/pkg/logging" ) const ( diff --git a/pkg/reconciler/v1alpha1/eventlistener/eventlistener.go b/pkg/reconciler/v1alpha1/eventlistener/eventlistener.go index 5e6ef248b..145454434 100644 --- a/pkg/reconciler/v1alpha1/eventlistener/eventlistener.go +++ b/pkg/reconciler/v1alpha1/eventlistener/eventlistener.go @@ -21,7 +21,6 @@ import ( "flag" "reflect" - "github.com/knative/pkg/controller" listers "github.com/tektoncd/triggers/pkg/client/listers/triggers/v1alpha1" "github.com/tektoncd/triggers/pkg/reconciler" appsv1 "k8s.io/api/apps/v1" @@ -29,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" + "knative.dev/pkg/controller" ) const ( diff --git a/third_party/VENDOR-LICENSE b/third_party/VENDOR-LICENSE index 421fcdf59..8c61053ac 100644 --- a/third_party/VENDOR-LICENSE +++ b/third_party/VENDOR-LICENSE @@ -207,6 +207,213 @@ Import: github.com/tektoncd/triggers/vendor/cloud.google.com/go +=========================================================== +Import: github.com/tektoncd/triggers/vendor/contrib.go.opencensus.io/exporter/prometheus + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + =========================================================== Import: github.com/tektoncd/triggers/vendor/contrib.go.opencensus.io/exporter/stackdriver @@ -2662,7 +2869,20 @@ SOFTWARE. =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/knative/caching +Import: github.com/tektoncd/triggers/vendor/github.com/markbates/inflect + +Copyright (c) 2011 Chris Farmiloe + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/github.com/mattbaird/jsonpatch Apache License Version 2.0, January 2004 @@ -2844,7 +3064,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/knative/caching APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -2852,7 +3072,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/knative/caching same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -2868,8 +3088,9 @@ Import: github.com/tektoncd/triggers/vendor/github.com/knative/caching + =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/knative/pkg +Import: github.com/tektoncd/triggers/vendor/github.com/matttproud/golang_protobuf_extensions Apache License Version 2.0, January 2004 @@ -3051,7 +3272,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/knative/pkg APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -3059,7 +3280,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/knative/pkg same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -3076,20 +3297,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/knative/pkg =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/markbates/inflect - -Copyright (c) 2011 Chris Farmiloe - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - -=========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/mattbaird/jsonpatch +Import: github.com/tektoncd/triggers/vendor/github.com/modern-go/concurrent Apache License Version 2.0, January 2004 @@ -3271,7 +3479,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/mattbaird/jsonpatch APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -3279,7 +3487,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/mattbaird/jsonpatch same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -3295,9 +3503,8 @@ Import: github.com/tektoncd/triggers/vendor/github.com/mattbaird/jsonpatch - =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/matttproud/golang_protobuf_extensions +Import: github.com/tektoncd/triggers/vendor/github.com/modern-go/reflect2 Apache License Version 2.0, January 2004 @@ -3479,7 +3686,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/matttproud/golang_protobu APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -3487,7 +3694,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/matttproud/golang_protobu same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -3504,7 +3711,61 @@ Import: github.com/tektoncd/triggers/vendor/github.com/matttproud/golang_protobu =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/modern-go/concurrent +Import: github.com/tektoncd/triggers/vendor/github.com/peterbourgon/diskv + +Copyright (c) 2011-2012 Peter Bourgon + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/github.com/pkg/errors + +Copyright (c) 2015, Dave Cheney +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/client_golang Apache License Version 2.0, January 2004 @@ -3711,7 +3972,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/modern-go/concurrent =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/modern-go/reflect2 +Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/client_model Apache License Version 2.0, January 2004 @@ -3918,61 +4179,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/modern-go/reflect2 =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/peterbourgon/diskv - -Copyright (c) 2011-2012 Peter Bourgon - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - - -=========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/pkg/errors - -Copyright (c) 2015, Dave Cheney -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -=========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/client_golang +Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/common Apache License Version 2.0, January 2004 @@ -4179,7 +4386,7 @@ Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/client_golang =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/client_model +Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/procfs Apache License Version 2.0, January 2004 @@ -4386,7 +4593,75 @@ Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/client_model =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/common +Import: github.com/tektoncd/triggers/vendor/github.com/rogpeppe/go-internal + +Copyright (c) 2018 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/github.com/spf13/pflag + +Copyright (c) 2012 Alex Ogier. All rights reserved. +Copyright (c) 2012 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/github.com/tektoncd/pipeline + Apache License Version 2.0, January 2004 @@ -4593,7 +4868,8 @@ Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/common =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/procfs +Import: github.com/tektoncd/triggers/vendor/go.opencensus.io + Apache License Version 2.0, January 2004 @@ -4798,59 +5074,99 @@ Import: github.com/tektoncd/triggers/vendor/github.com/prometheus/procfs limitations under the License. - =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/rogpeppe/go-internal +Import: github.com/tektoncd/triggers/vendor/go.uber.org/atomic -Copyright (c) 2018 The Go Authors. All rights reserved. +Copyright (c) 2016 Uber Technologies, Inc. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/spf13/pflag - -Copyright (c) 2012 Alex Ogier. All rights reserved. -Copyright (c) 2012 The Go Authors. All rights reserved. +Import: github.com/tektoncd/triggers/vendor/go.uber.org/multierr -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +Copyright (c) 2017 Uber Technologies, Inc. - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/go.uber.org/zap + +Copyright (c) 2016-2017 Uber Technologies, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/golang.org/x/crypto + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -4867,215 +5183,271 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =========================================================== -Import: github.com/tektoncd/triggers/vendor/github.com/tektoncd/pipeline +Import: github.com/tektoncd/triggers/vendor/golang.org/x/net +Copyright (c) 2009 The Go Authors. All rights reserved. - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. - 1. Definitions. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. +=========================================================== +Import: github.com/tektoncd/triggers/vendor/golang.org/x/oauth2 - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. +Copyright (c) 2009 The Go Authors. All rights reserved. - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. +=========================================================== +Import: github.com/tektoncd/triggers/vendor/golang.org/x/sync - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. +Copyright (c) 2009 The Go Authors. All rights reserved. - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. +=========================================================== +Import: github.com/tektoncd/triggers/vendor/golang.org/x/sys - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. +Copyright (c) 2009 The Go Authors. All rights reserved. - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - END OF TERMS AND CONDITIONS +=========================================================== +Import: github.com/tektoncd/triggers/vendor/golang.org/x/text - APPENDIX: How to apply the Apache License to your work. +Copyright (c) 2009 The Go Authors. All rights reserved. - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - Copyright [yyyy] [name of copyright owner] + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/golang.org/x/time + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =========================================================== -Import: github.com/tektoncd/triggers/vendor/go.opencensus.io +Import: github.com/tektoncd/triggers/vendor/golang.org/x/xerrors + +Copyright (c) 2019 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/google.golang.org/api + +Copyright (c) 2011 Google Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +=========================================================== +Import: github.com/tektoncd/triggers/vendor/google.golang.org/genproto Apache License @@ -5281,349 +5653,220 @@ Import: github.com/tektoncd/triggers/vendor/go.opencensus.io limitations under the License. -=========================================================== -Import: github.com/tektoncd/triggers/vendor/go.uber.org/atomic - -Copyright (c) 2016 Uber Technologies, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - - -=========================================================== -Import: github.com/tektoncd/triggers/vendor/go.uber.org/multierr - -Copyright (c) 2017 Uber Technologies, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - - -=========================================================== -Import: github.com/tektoncd/triggers/vendor/go.uber.org/zap - -Copyright (c) 2016-2017 Uber Technologies, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - =========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/crypto - -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -=========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/net - -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -=========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/oauth2 - -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +Import: github.com/tektoncd/triggers/vendor/google.golang.org/grpc -=========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/sync + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Copyright (c) 2009 The Go Authors. All rights reserved. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: + 1. Definitions. - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -=========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/sys + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. -Copyright (c) 2009 The Go Authors. All rights reserved. + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. -=========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/text + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. -Copyright (c) 2009 The Go Authors. All rights reserved. + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. -=========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/time + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. -Copyright (c) 2009 The Go Authors. All rights reserved. + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + END OF TERMS AND CONDITIONS + APPENDIX: How to apply the Apache License to your work. -=========================================================== -Import: github.com/tektoncd/triggers/vendor/golang.org/x/xerrors + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -Copyright (c) 2019 The Go Authors. All rights reserved. + Copyright [yyyy] [name of copyright owner] -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. + http://www.apache.org/licenses/LICENSE-2.0 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. =========================================================== -Import: github.com/tektoncd/triggers/vendor/google.golang.org/api +Import: github.com/tektoncd/triggers/vendor/gopkg.in/inf.v0 -Copyright (c) 2011 Google Inc. All rights reserved. +Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go +Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -5654,8 +5897,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =========================================================== -Import: github.com/tektoncd/triggers/vendor/google.golang.org/genproto - +Import: github.com/tektoncd/triggers/vendor/gopkg.in/yaml.v2 Apache License Version 2.0, January 2004 @@ -5837,7 +6079,7 @@ Import: github.com/tektoncd/triggers/vendor/google.golang.org/genproto APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -5845,7 +6087,7 @@ Import: github.com/tektoncd/triggers/vendor/google.golang.org/genproto same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -5862,7 +6104,7 @@ Import: github.com/tektoncd/triggers/vendor/google.golang.org/genproto =========================================================== -Import: github.com/tektoncd/triggers/vendor/google.golang.org/grpc +Import: github.com/tektoncd/triggers/vendor/k8s.io/api Apache License @@ -6070,41 +6312,8 @@ Import: github.com/tektoncd/triggers/vendor/google.golang.org/grpc =========================================================== -Import: github.com/tektoncd/triggers/vendor/gopkg.in/inf.v0 - -Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go -Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - +Import: github.com/tektoncd/triggers/vendor/k8s.io/apimachinery -=========================================================== -Import: github.com/tektoncd/triggers/vendor/gopkg.in/yaml.v2 Apache License Version 2.0, January 2004 @@ -6286,7 +6495,7 @@ Import: github.com/tektoncd/triggers/vendor/gopkg.in/yaml.v2 APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -6294,7 +6503,7 @@ Import: github.com/tektoncd/triggers/vendor/gopkg.in/yaml.v2 same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -6311,7 +6520,7 @@ Import: github.com/tektoncd/triggers/vendor/gopkg.in/yaml.v2 =========================================================== -Import: github.com/tektoncd/triggers/vendor/k8s.io/api +Import: github.com/tektoncd/triggers/vendor/k8s.io/client-go Apache License @@ -6519,7 +6728,7 @@ Import: github.com/tektoncd/triggers/vendor/k8s.io/api =========================================================== -Import: github.com/tektoncd/triggers/vendor/k8s.io/apimachinery +Import: github.com/tektoncd/triggers/vendor/k8s.io/kube-openapi Apache License @@ -6727,8 +6936,7 @@ Import: github.com/tektoncd/triggers/vendor/k8s.io/apimachinery =========================================================== -Import: github.com/tektoncd/triggers/vendor/k8s.io/client-go - +Import: github.com/tektoncd/triggers/vendor/knative.dev/caching Apache License Version 2.0, January 2004 @@ -6935,8 +7143,7 @@ Import: github.com/tektoncd/triggers/vendor/k8s.io/client-go =========================================================== -Import: github.com/tektoncd/triggers/vendor/k8s.io/kube-openapi - +Import: github.com/tektoncd/triggers/vendor/knative.dev/pkg Apache License Version 2.0, January 2004 diff --git a/vendor/cloud.google.com/go/container/apiv1/cluster_manager_client.go b/vendor/cloud.google.com/go/container/apiv1/cluster_manager_client.go new file mode 100644 index 000000000..22978d377 --- /dev/null +++ b/vendor/cloud.google.com/go/container/apiv1/cluster_manager_client.go @@ -0,0 +1,676 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// AUTO-GENERATED CODE. DO NOT EDIT. + +package container + +import ( + "context" + "time" + + "cloud.google.com/go/internal/version" + gax "github.com/googleapis/gax-go/v2" + "google.golang.org/api/option" + "google.golang.org/api/transport" + containerpb "google.golang.org/genproto/googleapis/container/v1" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/metadata" +) + +// ClusterManagerCallOptions contains the retry settings for each method of ClusterManagerClient. +type ClusterManagerCallOptions struct { + ListClusters []gax.CallOption + GetCluster []gax.CallOption + CreateCluster []gax.CallOption + UpdateCluster []gax.CallOption + UpdateNodePool []gax.CallOption + SetNodePoolAutoscaling []gax.CallOption + SetLoggingService []gax.CallOption + SetMonitoringService []gax.CallOption + SetAddonsConfig []gax.CallOption + SetLocations []gax.CallOption + UpdateMaster []gax.CallOption + SetMasterAuth []gax.CallOption + DeleteCluster []gax.CallOption + ListOperations []gax.CallOption + GetOperation []gax.CallOption + CancelOperation []gax.CallOption + GetServerConfig []gax.CallOption + ListNodePools []gax.CallOption + GetNodePool []gax.CallOption + CreateNodePool []gax.CallOption + DeleteNodePool []gax.CallOption + RollbackNodePoolUpgrade []gax.CallOption + SetNodePoolManagement []gax.CallOption + SetLabels []gax.CallOption + SetLegacyAbac []gax.CallOption + StartIPRotation []gax.CallOption + CompleteIPRotation []gax.CallOption + SetNodePoolSize []gax.CallOption + SetNetworkPolicy []gax.CallOption + SetMaintenancePolicy []gax.CallOption +} + +func defaultClusterManagerClientOptions() []option.ClientOption { + return []option.ClientOption{ + option.WithEndpoint("container.googleapis.com:443"), + option.WithScopes(DefaultAuthScopes()...), + } +} + +func defaultClusterManagerCallOptions() *ClusterManagerCallOptions { + retry := map[[2]string][]gax.CallOption{ + {"default", "idempotent"}: { + gax.WithRetry(func() gax.Retryer { + return gax.OnCodes([]codes.Code{ + codes.DeadlineExceeded, + codes.Unavailable, + }, gax.Backoff{ + Initial: 100 * time.Millisecond, + Max: 60000 * time.Millisecond, + Multiplier: 1.3, + }) + }), + }, + } + return &ClusterManagerCallOptions{ + ListClusters: retry[[2]string{"default", "idempotent"}], + GetCluster: retry[[2]string{"default", "idempotent"}], + CreateCluster: retry[[2]string{"default", "non_idempotent"}], + UpdateCluster: retry[[2]string{"default", "non_idempotent"}], + UpdateNodePool: retry[[2]string{"default", "non_idempotent"}], + SetNodePoolAutoscaling: retry[[2]string{"default", "non_idempotent"}], + SetLoggingService: retry[[2]string{"default", "non_idempotent"}], + SetMonitoringService: retry[[2]string{"default", "non_idempotent"}], + SetAddonsConfig: retry[[2]string{"default", "non_idempotent"}], + SetLocations: retry[[2]string{"default", "non_idempotent"}], + UpdateMaster: retry[[2]string{"default", "non_idempotent"}], + SetMasterAuth: retry[[2]string{"default", "non_idempotent"}], + DeleteCluster: retry[[2]string{"default", "idempotent"}], + ListOperations: retry[[2]string{"default", "idempotent"}], + GetOperation: retry[[2]string{"default", "idempotent"}], + CancelOperation: retry[[2]string{"default", "non_idempotent"}], + GetServerConfig: retry[[2]string{"default", "idempotent"}], + ListNodePools: retry[[2]string{"default", "idempotent"}], + GetNodePool: retry[[2]string{"default", "idempotent"}], + CreateNodePool: retry[[2]string{"default", "non_idempotent"}], + DeleteNodePool: retry[[2]string{"default", "idempotent"}], + RollbackNodePoolUpgrade: retry[[2]string{"default", "non_idempotent"}], + SetNodePoolManagement: retry[[2]string{"default", "non_idempotent"}], + SetLabels: retry[[2]string{"default", "non_idempotent"}], + SetLegacyAbac: retry[[2]string{"default", "non_idempotent"}], + StartIPRotation: retry[[2]string{"default", "non_idempotent"}], + CompleteIPRotation: retry[[2]string{"default", "non_idempotent"}], + SetNodePoolSize: retry[[2]string{"default", "non_idempotent"}], + SetNetworkPolicy: retry[[2]string{"default", "non_idempotent"}], + SetMaintenancePolicy: retry[[2]string{"default", "non_idempotent"}], + } +} + +// ClusterManagerClient is a client for interacting with Google Container Engine API. +// +// Methods, except Close, may be called concurrently. However, fields must not be modified concurrently with method calls. +type ClusterManagerClient struct { + // The connection to the service. + conn *grpc.ClientConn + + // The gRPC API client. + clusterManagerClient containerpb.ClusterManagerClient + + // The call options for this service. + CallOptions *ClusterManagerCallOptions + + // The x-goog-* metadata to be sent with each request. + xGoogMetadata metadata.MD +} + +// NewClusterManagerClient creates a new cluster manager client. +// +// Google Container Engine Cluster Manager v1 +func NewClusterManagerClient(ctx context.Context, opts ...option.ClientOption) (*ClusterManagerClient, error) { + conn, err := transport.DialGRPC(ctx, append(defaultClusterManagerClientOptions(), opts...)...) + if err != nil { + return nil, err + } + c := &ClusterManagerClient{ + conn: conn, + CallOptions: defaultClusterManagerCallOptions(), + + clusterManagerClient: containerpb.NewClusterManagerClient(conn), + } + c.setGoogleClientInfo() + return c, nil +} + +// Connection returns the client's connection to the API service. +func (c *ClusterManagerClient) Connection() *grpc.ClientConn { + return c.conn +} + +// Close closes the connection to the API service. The user should invoke this when +// the client is no longer required. +func (c *ClusterManagerClient) Close() error { + return c.conn.Close() +} + +// setGoogleClientInfo sets the name and version of the application in +// the `x-goog-api-client` header passed on each request. Intended for +// use by Google-written clients. +func (c *ClusterManagerClient) setGoogleClientInfo(keyval ...string) { + kv := append([]string{"gl-go", version.Go()}, keyval...) + kv = append(kv, "gapic", version.Repo, "gax", gax.Version, "grpc", grpc.Version) + c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...)) +} + +// ListClusters lists all clusters owned by a project in either the specified zone or all +// zones. +func (c *ClusterManagerClient) ListClusters(ctx context.Context, req *containerpb.ListClustersRequest, opts ...gax.CallOption) (*containerpb.ListClustersResponse, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.ListClusters[0:len(c.CallOptions.ListClusters):len(c.CallOptions.ListClusters)], opts...) + var resp *containerpb.ListClustersResponse + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.ListClusters(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// GetCluster gets the details of a specific cluster. +func (c *ClusterManagerClient) GetCluster(ctx context.Context, req *containerpb.GetClusterRequest, opts ...gax.CallOption) (*containerpb.Cluster, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.GetCluster[0:len(c.CallOptions.GetCluster):len(c.CallOptions.GetCluster)], opts...) + var resp *containerpb.Cluster + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.GetCluster(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// CreateCluster creates a cluster, consisting of the specified number and type of Google +// Compute Engine instances. +// +// By default, the cluster is created in the project's +// default network (at /compute/docs/networks-and-firewalls#networks). +// +// One firewall is added for the cluster. After cluster creation, +// the cluster creates routes for each node to allow the containers +// on that node to communicate with all other instances in the +// cluster. +// +// Finally, an entry is added to the project's global metadata indicating +// which CIDR range is being used by the cluster. +func (c *ClusterManagerClient) CreateCluster(ctx context.Context, req *containerpb.CreateClusterRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.CreateCluster[0:len(c.CallOptions.CreateCluster):len(c.CallOptions.CreateCluster)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.CreateCluster(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// UpdateCluster updates the settings of a specific cluster. +func (c *ClusterManagerClient) UpdateCluster(ctx context.Context, req *containerpb.UpdateClusterRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.UpdateCluster[0:len(c.CallOptions.UpdateCluster):len(c.CallOptions.UpdateCluster)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.UpdateCluster(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// UpdateNodePool updates the version and/or image type of a specific node pool. +func (c *ClusterManagerClient) UpdateNodePool(ctx context.Context, req *containerpb.UpdateNodePoolRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.UpdateNodePool[0:len(c.CallOptions.UpdateNodePool):len(c.CallOptions.UpdateNodePool)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.UpdateNodePool(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetNodePoolAutoscaling sets the autoscaling settings of a specific node pool. +func (c *ClusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, req *containerpb.SetNodePoolAutoscalingRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetNodePoolAutoscaling[0:len(c.CallOptions.SetNodePoolAutoscaling):len(c.CallOptions.SetNodePoolAutoscaling)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetNodePoolAutoscaling(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetLoggingService sets the logging service of a specific cluster. +func (c *ClusterManagerClient) SetLoggingService(ctx context.Context, req *containerpb.SetLoggingServiceRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetLoggingService[0:len(c.CallOptions.SetLoggingService):len(c.CallOptions.SetLoggingService)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetLoggingService(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetMonitoringService sets the monitoring service of a specific cluster. +func (c *ClusterManagerClient) SetMonitoringService(ctx context.Context, req *containerpb.SetMonitoringServiceRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetMonitoringService[0:len(c.CallOptions.SetMonitoringService):len(c.CallOptions.SetMonitoringService)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetMonitoringService(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetAddonsConfig sets the addons of a specific cluster. +func (c *ClusterManagerClient) SetAddonsConfig(ctx context.Context, req *containerpb.SetAddonsConfigRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetAddonsConfig[0:len(c.CallOptions.SetAddonsConfig):len(c.CallOptions.SetAddonsConfig)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetAddonsConfig(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetLocations sets the locations of a specific cluster. +func (c *ClusterManagerClient) SetLocations(ctx context.Context, req *containerpb.SetLocationsRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetLocations[0:len(c.CallOptions.SetLocations):len(c.CallOptions.SetLocations)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetLocations(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// UpdateMaster updates the master of a specific cluster. +func (c *ClusterManagerClient) UpdateMaster(ctx context.Context, req *containerpb.UpdateMasterRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.UpdateMaster[0:len(c.CallOptions.UpdateMaster):len(c.CallOptions.UpdateMaster)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.UpdateMaster(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetMasterAuth used to set master auth materials. Currently supports :- +// Changing the admin password of a specific cluster. +// This can be either via password generation or explicitly set the password. +func (c *ClusterManagerClient) SetMasterAuth(ctx context.Context, req *containerpb.SetMasterAuthRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetMasterAuth[0:len(c.CallOptions.SetMasterAuth):len(c.CallOptions.SetMasterAuth)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetMasterAuth(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// DeleteCluster deletes the cluster, including the Kubernetes endpoint and all worker +// nodes. +// +// Firewalls and routes that were configured during cluster creation +// are also deleted. +// +// Other Google Compute Engine resources that might be in use by the cluster +// (e.g. load balancer resources) will not be deleted if they weren't present +// at the initial create time. +func (c *ClusterManagerClient) DeleteCluster(ctx context.Context, req *containerpb.DeleteClusterRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.DeleteCluster[0:len(c.CallOptions.DeleteCluster):len(c.CallOptions.DeleteCluster)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.DeleteCluster(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// ListOperations lists all operations in a project in a specific zone or all zones. +func (c *ClusterManagerClient) ListOperations(ctx context.Context, req *containerpb.ListOperationsRequest, opts ...gax.CallOption) (*containerpb.ListOperationsResponse, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.ListOperations[0:len(c.CallOptions.ListOperations):len(c.CallOptions.ListOperations)], opts...) + var resp *containerpb.ListOperationsResponse + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.ListOperations(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// GetOperation gets the specified operation. +func (c *ClusterManagerClient) GetOperation(ctx context.Context, req *containerpb.GetOperationRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.GetOperation[0:len(c.CallOptions.GetOperation):len(c.CallOptions.GetOperation)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.GetOperation(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// CancelOperation cancels the specified operation. +func (c *ClusterManagerClient) CancelOperation(ctx context.Context, req *containerpb.CancelOperationRequest, opts ...gax.CallOption) error { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.CancelOperation[0:len(c.CallOptions.CancelOperation):len(c.CallOptions.CancelOperation)], opts...) + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + _, err = c.clusterManagerClient.CancelOperation(ctx, req, settings.GRPC...) + return err + }, opts...) + return err +} + +// GetServerConfig returns configuration info about the Container Engine service. +func (c *ClusterManagerClient) GetServerConfig(ctx context.Context, req *containerpb.GetServerConfigRequest, opts ...gax.CallOption) (*containerpb.ServerConfig, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.GetServerConfig[0:len(c.CallOptions.GetServerConfig):len(c.CallOptions.GetServerConfig)], opts...) + var resp *containerpb.ServerConfig + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.GetServerConfig(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// ListNodePools lists the node pools for a cluster. +func (c *ClusterManagerClient) ListNodePools(ctx context.Context, req *containerpb.ListNodePoolsRequest, opts ...gax.CallOption) (*containerpb.ListNodePoolsResponse, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.ListNodePools[0:len(c.CallOptions.ListNodePools):len(c.CallOptions.ListNodePools)], opts...) + var resp *containerpb.ListNodePoolsResponse + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.ListNodePools(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// GetNodePool retrieves the node pool requested. +func (c *ClusterManagerClient) GetNodePool(ctx context.Context, req *containerpb.GetNodePoolRequest, opts ...gax.CallOption) (*containerpb.NodePool, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.GetNodePool[0:len(c.CallOptions.GetNodePool):len(c.CallOptions.GetNodePool)], opts...) + var resp *containerpb.NodePool + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.GetNodePool(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// CreateNodePool creates a node pool for a cluster. +func (c *ClusterManagerClient) CreateNodePool(ctx context.Context, req *containerpb.CreateNodePoolRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.CreateNodePool[0:len(c.CallOptions.CreateNodePool):len(c.CallOptions.CreateNodePool)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.CreateNodePool(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// DeleteNodePool deletes a node pool from a cluster. +func (c *ClusterManagerClient) DeleteNodePool(ctx context.Context, req *containerpb.DeleteNodePoolRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.DeleteNodePool[0:len(c.CallOptions.DeleteNodePool):len(c.CallOptions.DeleteNodePool)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.DeleteNodePool(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// RollbackNodePoolUpgrade roll back the previously Aborted or Failed NodePool upgrade. +// This will be an no-op if the last upgrade successfully completed. +func (c *ClusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, req *containerpb.RollbackNodePoolUpgradeRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.RollbackNodePoolUpgrade[0:len(c.CallOptions.RollbackNodePoolUpgrade):len(c.CallOptions.RollbackNodePoolUpgrade)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.RollbackNodePoolUpgrade(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetNodePoolManagement sets the NodeManagement options for a node pool. +func (c *ClusterManagerClient) SetNodePoolManagement(ctx context.Context, req *containerpb.SetNodePoolManagementRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetNodePoolManagement[0:len(c.CallOptions.SetNodePoolManagement):len(c.CallOptions.SetNodePoolManagement)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetNodePoolManagement(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetLabels sets labels on a cluster. +func (c *ClusterManagerClient) SetLabels(ctx context.Context, req *containerpb.SetLabelsRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetLabels[0:len(c.CallOptions.SetLabels):len(c.CallOptions.SetLabels)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetLabels(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetLegacyAbac enables or disables the ABAC authorization mechanism on a cluster. +func (c *ClusterManagerClient) SetLegacyAbac(ctx context.Context, req *containerpb.SetLegacyAbacRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetLegacyAbac[0:len(c.CallOptions.SetLegacyAbac):len(c.CallOptions.SetLegacyAbac)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetLegacyAbac(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// StartIPRotation start master IP rotation. +func (c *ClusterManagerClient) StartIPRotation(ctx context.Context, req *containerpb.StartIPRotationRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.StartIPRotation[0:len(c.CallOptions.StartIPRotation):len(c.CallOptions.StartIPRotation)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.StartIPRotation(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// CompleteIPRotation completes master IP rotation. +func (c *ClusterManagerClient) CompleteIPRotation(ctx context.Context, req *containerpb.CompleteIPRotationRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.CompleteIPRotation[0:len(c.CallOptions.CompleteIPRotation):len(c.CallOptions.CompleteIPRotation)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.CompleteIPRotation(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetNodePoolSize sets the size of a specific node pool. +func (c *ClusterManagerClient) SetNodePoolSize(ctx context.Context, req *containerpb.SetNodePoolSizeRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetNodePoolSize[0:len(c.CallOptions.SetNodePoolSize):len(c.CallOptions.SetNodePoolSize)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetNodePoolSize(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetNetworkPolicy enables/Disables Network Policy for a cluster. +func (c *ClusterManagerClient) SetNetworkPolicy(ctx context.Context, req *containerpb.SetNetworkPolicyRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetNetworkPolicy[0:len(c.CallOptions.SetNetworkPolicy):len(c.CallOptions.SetNetworkPolicy)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetNetworkPolicy(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} + +// SetMaintenancePolicy sets the maintenance policy for a cluster. +func (c *ClusterManagerClient) SetMaintenancePolicy(ctx context.Context, req *containerpb.SetMaintenancePolicyRequest, opts ...gax.CallOption) (*containerpb.Operation, error) { + ctx = insertMetadata(ctx, c.xGoogMetadata) + opts = append(c.CallOptions.SetMaintenancePolicy[0:len(c.CallOptions.SetMaintenancePolicy):len(c.CallOptions.SetMaintenancePolicy)], opts...) + var resp *containerpb.Operation + err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + var err error + resp, err = c.clusterManagerClient.SetMaintenancePolicy(ctx, req, settings.GRPC...) + return err + }, opts...) + if err != nil { + return nil, err + } + return resp, nil +} diff --git a/vendor/cloud.google.com/go/container/apiv1/doc.go b/vendor/cloud.google.com/go/container/apiv1/doc.go new file mode 100644 index 000000000..0f995054c --- /dev/null +++ b/vendor/cloud.google.com/go/container/apiv1/doc.go @@ -0,0 +1,49 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// AUTO-GENERATED CODE. DO NOT EDIT. + +// Package container is an auto-generated package for the +// Google Container Engine API. +// +// NOTE: This package is in alpha. It is not stable, and is likely to change. +// +// The Google Kubernetes Engine API is used for building and managing +// container +// based applications, powered by the open source Kubernetes technology. +package container // import "cloud.google.com/go/container/apiv1" + +import ( + "context" + + "google.golang.org/grpc/metadata" +) + +func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { + out, _ := metadata.FromOutgoingContext(ctx) + out = out.Copy() + for _, md := range mds { + for k, v := range md { + out[k] = append(out[k], v...) + } + } + return metadata.NewOutgoingContext(ctx, out) +} + +// DefaultAuthScopes reports the default set of authentication scopes to use with this package. +func DefaultAuthScopes() []string { + return []string{ + "https://www.googleapis.com/auth/cloud-platform", + } +} diff --git a/vendor/cloud.google.com/go/internal/version/version.go b/vendor/cloud.google.com/go/internal/version/version.go new file mode 100644 index 000000000..4a2a8c19f --- /dev/null +++ b/vendor/cloud.google.com/go/internal/version/version.go @@ -0,0 +1,71 @@ +// Copyright 2016 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:generate ./update_version.sh + +// Package version contains version information for Google Cloud Client +// Libraries for Go, as reported in request headers. +package version + +import ( + "runtime" + "strings" + "unicode" +) + +// Repo is the current version of the client libraries in this +// repo. It should be a date in YYYYMMDD format. +const Repo = "20180226" + +// Go returns the Go runtime version. The returned string +// has no whitespace. +func Go() string { + return goVersion +} + +var goVersion = goVer(runtime.Version()) + +const develPrefix = "devel +" + +func goVer(s string) string { + if strings.HasPrefix(s, develPrefix) { + s = s[len(develPrefix):] + if p := strings.IndexFunc(s, unicode.IsSpace); p >= 0 { + s = s[:p] + } + return s + } + + if strings.HasPrefix(s, "go1") { + s = s[2:] + var prerelease string + if p := strings.IndexFunc(s, notSemverRune); p >= 0 { + s, prerelease = s[:p], s[p:] + } + if strings.HasSuffix(s, ".") { + s += "0" + } else if strings.Count(s, ".") < 2 { + s += ".0" + } + if prerelease != "" { + s += "-" + prerelease + } + return s + } + return "" +} + +func notSemverRune(r rune) bool { + return !strings.ContainsRune("0123456789.", r) +} diff --git a/vendor/github.com/knative/caching/LICENSE b/vendor/contrib.go.opencensus.io/exporter/prometheus/LICENSE similarity index 100% rename from vendor/github.com/knative/caching/LICENSE rename to vendor/contrib.go.opencensus.io/exporter/prometheus/LICENSE diff --git a/vendor/go.opencensus.io/exporter/prometheus/prometheus.go b/vendor/contrib.go.opencensus.io/exporter/prometheus/prometheus.go similarity index 50% rename from vendor/go.opencensus.io/exporter/prometheus/prometheus.go rename to vendor/contrib.go.opencensus.io/exporter/prometheus/prometheus.go index 203bd38ad..59ce1c0a3 100644 --- a/vendor/go.opencensus.io/exporter/prometheus/prometheus.go +++ b/vendor/contrib.go.opencensus.io/exporter/prometheus/prometheus.go @@ -14,21 +14,20 @@ // Package prometheus contains a Prometheus exporter that supports exporting // OpenCensus views as Prometheus metrics. -package prometheus // import "go.opencensus.io/exporter/prometheus" +package prometheus // import "contrib.go.opencensus.io/exporter/prometheus" import ( - "bytes" "fmt" "log" "net/http" "sync" - "go.opencensus.io/internal" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" - + "context" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "go.opencensus.io/metric/metricdata" + "go.opencensus.io/metric/metricexport" + "go.opencensus.io/stats/view" ) // Exporter exports stats to Prometheus, users need @@ -61,39 +60,12 @@ func NewExporter(o Options) (*Exporter, error) { c: collector, handler: promhttp.HandlerFor(o.Registry, promhttp.HandlerOpts{}), } + collector.ensureRegisteredOnce() + return e, nil } var _ http.Handler = (*Exporter)(nil) -var _ view.Exporter = (*Exporter)(nil) - -func (c *collector) registerViews(views ...*view.View) { - count := 0 - for _, view := range views { - sig := viewSignature(c.opts.Namespace, view) - c.registeredViewsMu.Lock() - _, ok := c.registeredViews[sig] - c.registeredViewsMu.Unlock() - - if !ok { - desc := prometheus.NewDesc( - viewName(c.opts.Namespace, view), - view.Description, - tagKeysToLabels(view.TagKeys), - c.opts.ConstLabels, - ) - c.registeredViewsMu.Lock() - c.registeredViews[sig] = desc - c.registeredViewsMu.Unlock() - count++ - } - } - if count == 0 { - return - } - - c.ensureRegisteredOnce() -} // ensureRegisteredOnce invokes reg.Register on the collector itself // exactly once to ensure that we don't get errors such as @@ -123,11 +95,8 @@ func (o *Options) onError(err error) { // corresponding Prometheus Metric: SumData will be converted // to Untyped Metric, CountData will be a Counter Metric, // DistributionData will be a Histogram Metric. +// Deprecated in lieu of metricexport.Reader interface. func (e *Exporter) ExportView(vd *view.Data) { - if len(vd.Rows) == 0 { - return - } - e.c.addViewData(vd) } // ServeHTTP serves the Prometheus endpoint. @@ -145,151 +114,164 @@ type collector struct { // reg helps collector register views dynamically. reg *prometheus.Registry - // viewData are accumulated and atomically - // appended to on every Export invocation, from - // stats. These views are cleared out when - // Collect is invoked and the cycle is repeated. - viewData map[string]*view.Data - - registeredViewsMu sync.Mutex - // registeredViews maps a view to a prometheus desc. - registeredViews map[string]*prometheus.Desc -} - -func (c *collector) addViewData(vd *view.Data) { - c.registerViews(vd.View) - sig := viewSignature(c.opts.Namespace, vd.View) - - c.mu.Lock() - c.viewData[sig] = vd - c.mu.Unlock() + // reader reads metrics from all registered producers. + reader *metricexport.Reader } func (c *collector) Describe(ch chan<- *prometheus.Desc) { - c.registeredViewsMu.Lock() - registered := make(map[string]*prometheus.Desc) - for k, desc := range c.registeredViews { - registered[k] = desc - } - c.registeredViewsMu.Unlock() - - for _, desc := range registered { - ch <- desc - } + de := &descExporter{c: c, descCh: ch} + c.reader.ReadAndExport(de) } // Collect fetches the statistics from OpenCensus // and delivers them as Prometheus Metrics. -// Collect is invoked everytime a prometheus.Gatherer is run +// Collect is invoked every time a prometheus.Gatherer is run // for example when the HTTP endpoint is invoked by Prometheus. func (c *collector) Collect(ch chan<- prometheus.Metric) { - // We need a copy of all the view data up until this point. - viewData := c.cloneViewData() - - for _, vd := range viewData { - sig := viewSignature(c.opts.Namespace, vd.View) - c.registeredViewsMu.Lock() - desc := c.registeredViews[sig] - c.registeredViewsMu.Unlock() - - for _, row := range vd.Rows { - metric, err := c.toMetric(desc, vd.View, row) - if err != nil { - c.opts.onError(err) - } else { - ch <- metric - } - } - } - + me := &metricExporter{c: c, metricCh: ch} + c.reader.ReadAndExport(me) } -func (c *collector) toMetric(desc *prometheus.Desc, v *view.View, row *view.Row) (prometheus.Metric, error) { - switch data := row.Data.(type) { - case *view.CountData: - return prometheus.NewConstMetric(desc, prometheus.CounterValue, float64(data.Value), tagValues(row.Tags, v.TagKeys)...) - - case *view.DistributionData: - points := make(map[float64]uint64) - // Histograms are cumulative in Prometheus. - // Get cumulative bucket counts. - cumCount := uint64(0) - for i, b := range v.Aggregation.Buckets { - cumCount += uint64(data.CountPerBucket[i]) - points[b] = cumCount - } - return prometheus.NewConstHistogram(desc, uint64(data.Count), data.Sum(), points, tagValues(row.Tags, v.TagKeys)...) +func newCollector(opts Options, registrar *prometheus.Registry) *collector { + return &collector{ + reg: registrar, + opts: opts, + reader: metricexport.NewReader()} +} - case *view.SumData: - return prometheus.NewConstMetric(desc, prometheus.UntypedValue, data.Value, tagValues(row.Tags, v.TagKeys)...) +func (c *collector) toDesc(metric *metricdata.Metric) *prometheus.Desc { + return prometheus.NewDesc( + metricName(c.opts.Namespace, metric), + metric.Descriptor.Description, + toPromLabels(metric.Descriptor.LabelKeys), + c.opts.ConstLabels) +} - case *view.LastValueData: - return prometheus.NewConstMetric(desc, prometheus.GaugeValue, data.Value, tagValues(row.Tags, v.TagKeys)...) +type metricExporter struct { + c *collector + metricCh chan<- prometheus.Metric +} - default: - return nil, fmt.Errorf("aggregation %T is not yet supported", v.Aggregation) +// ExportMetrics exports to the Prometheus. +// Each OpenCensus Metric will be converted to +// corresponding Prometheus Metric: +// TypeCumulativeInt64 and TypeCumulativeFloat64 will be a Counter Metric, +// TypeCumulativeDistribution will be a Histogram Metric. +// TypeGaugeFloat64 and TypeGaugeInt64 will be a Gauge Metric +func (me *metricExporter) ExportMetrics(ctx context.Context, metrics []*metricdata.Metric) error { + for _, metric := range metrics { + desc := me.c.toDesc(metric) + for _, ts := range metric.TimeSeries { + tvs := toLabelValues(ts.LabelValues) + for _, point := range ts.Points { + metric, err := toPromMetric(desc, metric, point, tvs) + if err != nil { + me.c.opts.onError(err) + } else if metric != nil { + me.metricCh <- metric + } + } + } } + return nil } -func tagKeysToLabels(keys []tag.Key) (labels []string) { - for _, key := range keys { - labels = append(labels, internal.Sanitize(key.Name())) - } - return labels +type descExporter struct { + c *collector + descCh chan<- *prometheus.Desc } -func newCollector(opts Options, registrar *prometheus.Registry) *collector { - return &collector{ - reg: registrar, - opts: opts, - registeredViews: make(map[string]*prometheus.Desc), - viewData: make(map[string]*view.Data), +// ExportMetrics exports descriptor to the Prometheus. +// It is invoked when request to scrape descriptors is received. +func (me *descExporter) ExportMetrics(ctx context.Context, metrics []*metricdata.Metric) error { + for _, metric := range metrics { + desc := me.c.toDesc(metric) + me.descCh <- desc } + return nil } -func tagValues(t []tag.Tag, expectedKeys []tag.Key) []string { - var values []string - // Add empty string for all missing keys in the tags map. - idx := 0 - for _, t := range t { - for t.Key != expectedKeys[idx] { - idx++ - values = append(values, "") - } - values = append(values, t.Value) - idx++ +func toPromLabels(mls []metricdata.LabelKey) (labels []string) { + for _, ml := range mls { + labels = append(labels, sanitize(ml.Key)) } - for idx < len(expectedKeys) { - idx++ - values = append(values, "") - } - return values + return labels } -func viewName(namespace string, v *view.View) string { +func metricName(namespace string, m *metricdata.Metric) string { var name string if namespace != "" { name = namespace + "_" } - return name + internal.Sanitize(v.Name) + return name + sanitize(m.Descriptor.Name) } -func viewSignature(namespace string, v *view.View) string { - var buf bytes.Buffer - buf.WriteString(viewName(namespace, v)) - for _, k := range v.TagKeys { - buf.WriteString("-" + k.Name()) +func toPromMetric( + desc *prometheus.Desc, + metric *metricdata.Metric, + point metricdata.Point, + labelValues []string) (prometheus.Metric, error) { + switch metric.Descriptor.Type { + case metricdata.TypeCumulativeFloat64, metricdata.TypeCumulativeInt64: + pv, err := toPromValue(point) + if err != nil { + return nil, err + } + return prometheus.NewConstMetric(desc, prometheus.CounterValue, pv, labelValues...) + + case metricdata.TypeGaugeFloat64, metricdata.TypeGaugeInt64: + pv, err := toPromValue(point) + if err != nil { + return nil, err + } + return prometheus.NewConstMetric(desc, prometheus.GaugeValue, pv, labelValues...) + + case metricdata.TypeCumulativeDistribution: + switch v := point.Value.(type) { + case *metricdata.Distribution: + points := make(map[float64]uint64) + // Histograms are cumulative in Prometheus. + // Get cumulative bucket counts. + cumCount := uint64(0) + for i, b := range v.BucketOptions.Bounds { + cumCount += uint64(v.Buckets[i].Count) + points[b] = cumCount + } + return prometheus.NewConstHistogram(desc, uint64(v.Count), v.Sum, points, labelValues...) + default: + return nil, typeMismatchError(point) + } + case metricdata.TypeSummary: + // TODO: [rghetia] add support for TypeSummary. + return nil, nil + default: + return nil, fmt.Errorf("aggregation %T is not yet supported", metric.Descriptor.Type) } - return buf.String() } -func (c *collector) cloneViewData() map[string]*view.Data { - c.mu.Lock() - defer c.mu.Unlock() +func toLabelValues(labelValues []metricdata.LabelValue) (values []string) { + for _, lv := range labelValues { + if lv.Present { + values = append(values, lv.Value) + } else { + values = append(values, "") + } + } + return values +} + +func typeMismatchError(point metricdata.Point) error { + return fmt.Errorf("point type %T does not match metric type", point) - viewDataCopy := make(map[string]*view.Data) - for sig, viewData := range c.viewData { - viewDataCopy[sig] = viewData +} + +func toPromValue(point metricdata.Point) (float64, error) { + switch v := point.Value.(type) { + case float64: + return v, nil + case int64: + return float64(v), nil + default: + return 0.0, typeMismatchError(point) } - return viewDataCopy } diff --git a/vendor/contrib.go.opencensus.io/exporter/prometheus/sanitize.go b/vendor/contrib.go.opencensus.io/exporter/prometheus/sanitize.go new file mode 100644 index 000000000..ed6d8a14d --- /dev/null +++ b/vendor/contrib.go.opencensus.io/exporter/prometheus/sanitize.go @@ -0,0 +1,50 @@ +// Copyright 2017, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package prometheus + +import ( + "strings" + "unicode" +) + +const labelKeySizeLimit = 100 + +// sanitize returns a string that is trunacated to 100 characters if it's too +// long, and replaces non-alphanumeric characters to underscores. +func sanitize(s string) string { + if len(s) == 0 { + return s + } + if len(s) > labelKeySizeLimit { + s = s[:labelKeySizeLimit] + } + s = strings.Map(sanitizeRune, s) + if unicode.IsDigit(rune(s[0])) { + s = "key_" + s + } + if s[0] == '_' { + s = "key" + s + } + return s +} + +// converts anything that is not a letter or digit to an underscore +func sanitizeRune(r rune) rune { + if unicode.IsLetter(r) || unicode.IsDigit(r) { + return r + } + // Everything else turns into an underscore + return '_' +} diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics.go index 9b3b7bf19..0e69eb81b 100644 --- a/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics.go +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2019, OpenCensus Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,49 +23,56 @@ import ( "context" "errors" "fmt" - "path" - + "github.com/golang/protobuf/proto" + "github.com/golang/protobuf/ptypes/any" "github.com/golang/protobuf/ptypes/timestamp" - "go.opencensus.io/stats" "go.opencensus.io/trace" - "cloud.google.com/go/monitoring/apiv3" distributionpb "google.golang.org/genproto/googleapis/api/distribution" labelpb "google.golang.org/genproto/googleapis/api/label" googlemetricpb "google.golang.org/genproto/googleapis/api/metric" monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres" monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" + "go.opencensus.io/metric/metricdata" + "go.opencensus.io/resource" ) -var errNilMetric = errors.New("expecting a non-nil metric") +var ( + errLableExtraction = errors.New("error extracting labels") + errUnspecifiedMetricKind = errors.New("metric kind is unpsecified") +) -type metricPayload struct { - node *commonpb.Node - resource *resourcepb.Resource - metric *metricspb.Metric -} +const ( + exemplarAttachmentTypeString = "type.googleapis.com/google.protobuf.StringValue" + exemplarAttachmentTypeSpanCtx = "type.googleapis.com/google.monitoring.v3.SpanContext" -// ExportMetric exports OpenCensus Metrics to Stackdriver Monitoring. -func (se *statsExporter) ExportMetric(ctx context.Context, node *commonpb.Node, rsc *resourcepb.Resource, metric *metricspb.Metric) error { - if metric == nil { - return errNilMetric + // TODO(songy23): add support for this. + // exemplarAttachmentTypeDroppedLabels = "type.googleapis.com/google.monitoring.v3.DroppedLabels" +) + +// ExportMetrics exports OpenCensus Metrics to Stackdriver Monitoring. +func (se *statsExporter) ExportMetrics(ctx context.Context, metrics []*metricdata.Metric) error { + if len(metrics) == 0 { + return nil } - payload := &metricPayload{ - metric: metric, - resource: rsc, - node: node, + for _, metric := range metrics { + se.metricsBundler.Add(metric, 1) + // TODO: [rghetia] handle errors. } - se.protoMetricsBundler.Add(payload, 1) return nil } -func (se *statsExporter) handleMetricsUpload(payloads []*metricPayload) error { +func (se *statsExporter) handleMetricsUpload(metrics []*metricdata.Metric) { + err := se.uploadMetrics(metrics) + if err != nil { + se.o.handleError(err) + } +} + +func (se *statsExporter) uploadMetrics(metrics []*metricdata.Metric) error { ctx, cancel := se.o.newContextWithTimeout() defer cancel() @@ -76,22 +83,26 @@ func (se *statsExporter) handleMetricsUpload(payloads []*metricPayload) error { ) defer span.End() - for _, payload := range payloads { + for _, metric := range metrics { // Now create the metric descriptor remotely. - if err := se.createMetricDescriptor(ctx, payload.metric); err != nil { - span.SetStatus(trace.Status{Code: 2, Message: err.Error()}) - return err + if err := se.createMetricDescriptorFromMetric(ctx, metric); err != nil { + span.SetStatus(trace.Status{Code: trace.StatusCodeUnknown, Message: err.Error()}) + //TODO: [rghetia] record error metrics. + continue } } var allTimeSeries []*monitoringpb.TimeSeries - for _, payload := range payloads { - tsl, err := se.protoMetricToTimeSeries(ctx, payload.node, payload.resource, payload.metric) + for _, metric := range metrics { + tsl, err := se.metricToMpbTs(ctx, metric) if err != nil { - span.SetStatus(trace.Status{Code: 2, Message: err.Error()}) - return err + span.SetStatus(trace.Status{Code: trace.StatusCodeUnknown, Message: err.Error()}) + //TODO: [rghetia] record error metrics. + continue + } + if tsl != nil { + allTimeSeries = append(allTimeSeries, tsl...) } - allTimeSeries = append(allTimeSeries, tsl...) } // Now batch timeseries up and then export. @@ -105,7 +116,7 @@ func (se *statsExporter) handleMetricsUpload(payloads []*metricPayload) error { for _, ctsreq := range ctsreql { if err := createTimeSeries(ctx, se.c, ctsreq); err != nil { span.SetStatus(trace.Status{Code: trace.StatusCodeUnknown, Message: err.Error()}) - // TODO(@odeke-em): Don't fail fast here, perhaps batch errors? + // TODO(@rghetia): record error metrics // return err } } @@ -114,96 +125,38 @@ func (se *statsExporter) handleMetricsUpload(payloads []*metricPayload) error { return nil } -func (se *statsExporter) combineTimeSeriesToCreateTimeSeriesRequest(ts []*monitoringpb.TimeSeries) (ctsreql []*monitoringpb.CreateTimeSeriesRequest) { - if len(ts) == 0 { - return nil - } - - // Since there are scenarios in which Metrics with the same Type - // can be bunched in the same TimeSeries, we have to ensure that - // we create a unique CreateTimeSeriesRequest with entirely unique Metrics - // per TimeSeries, lest we'll encounter: - // - // err: rpc error: code = InvalidArgument desc = One or more TimeSeries could not be written: - // Field timeSeries[2] had an invalid value: Duplicate TimeSeries encountered. - // Only one point can be written per TimeSeries per request.: timeSeries[2] - // - // This scenario happens when we are using the OpenCensus Agent in which multiple metrics - // are streamed by various client applications. - // See https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/issues/73 - uniqueTimeSeries := make([]*monitoringpb.TimeSeries, 0, len(ts)) - nonUniqueTimeSeries := make([]*monitoringpb.TimeSeries, 0, len(ts)) - seenMetrics := make(map[string]struct{}) - - for _, tti := range ts { - signature := tti.Metric.GetType() - if _, alreadySeen := seenMetrics[signature]; !alreadySeen { - uniqueTimeSeries = append(uniqueTimeSeries, tti) - seenMetrics[signature] = struct{}{} - } else { - nonUniqueTimeSeries = append(nonUniqueTimeSeries, tti) - } - } - - // UniqueTimeSeries can be bunched up together - // While for each nonUniqueTimeSeries, we have - // to make a unique CreateTimeSeriesRequest. - ctsreql = append(ctsreql, &monitoringpb.CreateTimeSeriesRequest{ - Name: monitoring.MetricProjectPath(se.o.ProjectID), - TimeSeries: uniqueTimeSeries, - }) - - // Now recursively also combine the non-unique TimeSeries - // that were singly added to nonUniqueTimeSeries. - // The reason is that we need optimal combinations - // for optimal combinations because: - // * "a/b/c" - // * "a/b/c" - // * "x/y/z" - // * "a/b/c" - // * "x/y/z" - // * "p/y/z" - // * "d/y/z" - // - // should produce: - // CreateTimeSeries(uniqueTimeSeries) :: ["a/b/c", "x/y/z", "p/y/z", "d/y/z"] - // CreateTimeSeries(nonUniqueTimeSeries) :: ["a/b/c"] - // CreateTimeSeries(nonUniqueTimeSeries) :: ["a/b/c", "x/y/z"] - nonUniqueRequests := se.combineTimeSeriesToCreateTimeSeriesRequest(nonUniqueTimeSeries) - ctsreql = append(ctsreql, nonUniqueRequests...) - - return ctsreql -} - -// protoMetricToTimeSeries converts a metric into a Stackdriver Monitoring v3 API CreateTimeSeriesRequest +// metricToMpbTs converts a metric into a list of Stackdriver Monitoring v3 API TimeSeries // but it doesn't invoke any remote API. -func (se *statsExporter) protoMetricToTimeSeries(ctx context.Context, node *commonpb.Node, rsc *resourcepb.Resource, metric *metricspb.Metric) ([]*monitoringpb.TimeSeries, error) { +func (se *statsExporter) metricToMpbTs(ctx context.Context, metric *metricdata.Metric) ([]*monitoringpb.TimeSeries, error) { if metric == nil { return nil, errNilMetric } - var resource = rsc - if metric.Resource != nil { - resource = metric.Resource - } + resource := se.metricRscToMpbRsc(metric.Resource) - metricName, _, _, _ := metricProseFromProto(metric) + metricName := metric.Descriptor.Name metricType, _ := se.metricTypeFromProto(metricName) - metricLabelKeys := metric.GetMetricDescriptor().GetLabelKeys() - metricKind, _ := protoMetricDescriptorTypeToMetricKind(metric) + metricLabelKeys := metric.Descriptor.LabelKeys + metricKind, _ := metricDescriptorTypeToMetricKind(metric) + + if metricKind == googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED { + // ignore these Timeserieses. TODO [rghetia] log errors. + return nil, nil + } - timeSeries := make([]*monitoringpb.TimeSeries, 0, len(metric.Timeseries)) - for _, protoTimeSeries := range metric.Timeseries { - sdPoints, err := se.protoTimeSeriesToMonitoringPoints(protoTimeSeries, metricKind) + timeSeries := make([]*monitoringpb.TimeSeries, 0, len(metric.TimeSeries)) + for _, ts := range metric.TimeSeries { + sdPoints, err := se.metricTsToMpbPoint(ts, metricKind) if err != nil { - return nil, err + // TODO(@rghetia): record error metrics + continue } // Each TimeSeries has labelValues which MUST be correlated // with that from the MetricDescriptor - labels, err := labelsPerTimeSeries(se.defaultLabels, metricLabelKeys, protoTimeSeries.GetLabelValues()) + labels, err := metricLabelsToTsLabels(se.defaultLabels, metricLabelKeys, ts.LabelValues) if err != nil { - // TODO: (@odeke-em) perhaps log this error from labels extraction, if non-nil. + // TODO: (@rghetia) perhaps log this error from labels extraction, if non-nil. continue } timeSeries = append(timeSeries, &monitoringpb.TimeSeries{ @@ -211,7 +164,7 @@ func (se *statsExporter) protoMetricToTimeSeries(ctx context.Context, node *comm Type: metricType, Labels: labels, }, - Resource: protoResourceToMonitoredResource(resource), + Resource: resource, Points: sdPoints, }) } @@ -219,7 +172,7 @@ func (se *statsExporter) protoMetricToTimeSeries(ctx context.Context, node *comm return timeSeries, nil } -func labelsPerTimeSeries(defaults map[string]labelValue, labelKeys []*metricspb.LabelKey, labelValues []*metricspb.LabelValue) (map[string]string, error) { +func metricLabelsToTsLabels(defaults map[string]labelValue, labelKeys []metricdata.LabelKey, labelValues []metricdata.LabelValue) (map[string]string, error) { labels := make(map[string]string) // Fill in the defaults firstly, irrespective of if the labelKeys and labelValues are mismatched. for key, label := range defaults { @@ -233,42 +186,26 @@ func labelsPerTimeSeries(defaults map[string]labelValue, labelKeys []*metricspb. for i, labelKey := range labelKeys { labelValue := labelValues[i] - labels[sanitize(labelKey.GetKey())] = labelValue.GetValue() + labels[sanitize(labelKey.Key)] = labelValue.Value } return labels, nil } -func (se *statsExporter) protoMetricDescriptorToCreateMetricDescriptorRequest(ctx context.Context, metric *metricspb.Metric) (*monitoringpb.CreateMetricDescriptorRequest, error) { - // Otherwise, we encountered a cache-miss and - // should create the metric descriptor remotely. - inMD, err := se.protoToMonitoringMetricDescriptor(metric) - if err != nil { - return nil, err - } - - cmrdesc := &monitoringpb.CreateMetricDescriptorRequest{ - Name: fmt.Sprintf("projects/%s", se.o.ProjectID), - MetricDescriptor: inMD, - } - - return cmrdesc, nil -} - -// createMetricDescriptor creates a metric descriptor from the OpenCensus proto metric +// createMetricDescriptorFromMetric creates a metric descriptor from the OpenCensus metric // and then creates it remotely using Stackdriver's API. -func (se *statsExporter) createMetricDescriptor(ctx context.Context, metric *metricspb.Metric) error { - se.protoMu.Lock() - defer se.protoMu.Unlock() +func (se *statsExporter) createMetricDescriptorFromMetric(ctx context.Context, metric *metricdata.Metric) error { + se.metricMu.Lock() + defer se.metricMu.Unlock() - name := metric.GetMetricDescriptor().GetName() - if _, created := se.protoMetricDescriptors[name]; created { + name := metric.Descriptor.Name + if _, created := se.metricDescriptors[name]; created { return nil } // Otherwise, we encountered a cache-miss and // should create the metric descriptor remotely. - inMD, err := se.protoToMonitoringMetricDescriptor(metric) + inMD, err := se.metricToMpbMetricDescriptor(metric) if err != nil { return err } @@ -290,57 +227,37 @@ func (se *statsExporter) createMetricDescriptor(ctx context.Context, metric *met if err == nil { // Now record the metric as having been created. - se.protoMetricDescriptors[name] = md + se.metricDescriptors[name] = md } return err } -func (se *statsExporter) protoTimeSeriesToMonitoringPoints(ts *metricspb.TimeSeries, metricKind googlemetricpb.MetricDescriptor_MetricKind) (sptl []*monitoringpb.Point, err error) { - for _, pt := range ts.Points { - - // If we have a last value aggregation point i.e. MetricDescriptor_GAUGE - // StartTime should be nil. - startTime := ts.StartTimestamp - if metricKind == googlemetricpb.MetricDescriptor_GAUGE { - startTime = nil - } - - spt, err := fromProtoPoint(startTime, pt) - if err != nil { - return nil, err - } - sptl = append(sptl, spt) - } - return sptl, nil -} - -func (se *statsExporter) protoToMonitoringMetricDescriptor(metric *metricspb.Metric) (*googlemetricpb.MetricDescriptor, error) { +func (se *statsExporter) metricToMpbMetricDescriptor(metric *metricdata.Metric) (*googlemetricpb.MetricDescriptor, error) { if metric == nil { return nil, errNilMetric } - metricName, description, unit, _ := metricProseFromProto(metric) - metricType, _ := se.metricTypeFromProto(metricName) - displayName := se.displayName(metricName) - metricKind, valueType := protoMetricDescriptorTypeToMetricKind(metric) + metricType, _ := se.metricTypeFromProto(metric.Descriptor.Name) + displayName := se.displayName(metric.Descriptor.Name) + metricKind, valueType := metricDescriptorTypeToMetricKind(metric) sdm := &googlemetricpb.MetricDescriptor{ Name: fmt.Sprintf("projects/%s/metricDescriptors/%s", se.o.ProjectID, metricType), DisplayName: displayName, - Description: description, - Unit: unit, + Description: metric.Descriptor.Description, + Unit: string(metric.Descriptor.Unit), Type: metricType, MetricKind: metricKind, ValueType: valueType, - Labels: labelDescriptorsFromProto(se.defaultLabels, metric.GetMetricDescriptor().GetLabelKeys()), + Labels: metricLableKeysToLabels(se.defaultLabels, metric.Descriptor.LabelKeys), } return sdm, nil } -func labelDescriptorsFromProto(defaults map[string]labelValue, protoLabelKeys []*metricspb.LabelKey) []*labelpb.LabelDescriptor { - labelDescriptors := make([]*labelpb.LabelDescriptor, 0, len(defaults)+len(protoLabelKeys)) +func metricLableKeysToLabels(defaults map[string]labelValue, labelKeys []metricdata.LabelKey) []*labelpb.LabelDescriptor { + labelDescriptors := make([]*labelpb.LabelDescriptor, 0, len(defaults)+len(labelKeys)) // Fill in the defaults first. for key, lbl := range defaults { @@ -352,50 +269,102 @@ func labelDescriptorsFromProto(defaults map[string]labelValue, protoLabelKeys [] } // Now fill in those from the metric. - for _, protoKey := range protoLabelKeys { + for _, key := range labelKeys { labelDescriptors = append(labelDescriptors, &labelpb.LabelDescriptor{ - Key: sanitize(protoKey.GetKey()), - Description: protoKey.GetDescription(), + Key: sanitize(key.Key), + Description: key.Description, ValueType: labelpb.LabelDescriptor_STRING, // We only use string tags }) } return labelDescriptors } -func metricProseFromProto(metric *metricspb.Metric) (name, description, unit string, ok bool) { - mname := metric.GetName() - if mname != "" { - name = mname - return +func metricDescriptorTypeToMetricKind(m *metricdata.Metric) (googlemetricpb.MetricDescriptor_MetricKind, googlemetricpb.MetricDescriptor_ValueType) { + if m == nil { + return googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED, googlemetricpb.MetricDescriptor_VALUE_TYPE_UNSPECIFIED } - md := metric.GetMetricDescriptor() + switch m.Descriptor.Type { + case metricdata.TypeCumulativeInt64: + return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_INT64 + + case metricdata.TypeCumulativeFloat64: + return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_DOUBLE - name = md.GetName() - unit = md.GetUnit() - description = md.GetDescription() + case metricdata.TypeCumulativeDistribution: + return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_DISTRIBUTION + + case metricdata.TypeGaugeFloat64: + return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_DOUBLE + + case metricdata.TypeGaugeInt64: + return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_INT64 + + case metricdata.TypeGaugeDistribution: + return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_DISTRIBUTION + + case metricdata.TypeSummary: + // TODO: [rghetia] after upgrading to proto version3, retrun UNRECOGNIZED instead of UNSPECIFIED + return googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED, googlemetricpb.MetricDescriptor_VALUE_TYPE_UNSPECIFIED - if md != nil && md.Type == metricspb.MetricDescriptor_CUMULATIVE_INT64 { - // If the aggregation type is count, which counts the number of recorded measurements, the unit must be "1", - // because this view does not apply to the recorded values. - unit = stats.UnitDimensionless + default: + // TODO: [rghetia] after upgrading to proto version3, retrun UNRECOGNIZED instead of UNSPECIFIED + return googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED, googlemetricpb.MetricDescriptor_VALUE_TYPE_UNSPECIFIED } +} - return +func (se *statsExporter) metricRscToMpbRsc(rs *resource.Resource) *monitoredrespb.MonitoredResource { + if rs == nil { + resource := se.o.Resource + if resource == nil { + resource = &monitoredrespb.MonitoredResource{ + Type: "global", + } + } + return resource + } + typ := rs.Type + if typ == "" { + typ = "global" + } + mrsp := &monitoredrespb.MonitoredResource{ + Type: typ, + } + if rs.Labels != nil { + mrsp.Labels = make(map[string]string, len(rs.Labels)) + for k, v := range rs.Labels { + // TODO: [rghetia] add mapping between OC Labels and SD Labels. + mrsp.Labels[k] = v + } + } + return mrsp } -func (se *statsExporter) metricTypeFromProto(name string) (string, bool) { - // TODO: (@odeke-em) support non-"custom.googleapis.com" metrics names. - name = path.Join("custom.googleapis.com", "opencensus", name) - return name, true +func (se *statsExporter) metricTsToMpbPoint(ts *metricdata.TimeSeries, metricKind googlemetricpb.MetricDescriptor_MetricKind) (sptl []*monitoringpb.Point, err error) { + for _, pt := range ts.Points { + + // If we have a last value aggregation point i.e. MetricDescriptor_GAUGE + // StartTime should be nil. + startTime := timestampProto(ts.StartTime) + if metricKind == googlemetricpb.MetricDescriptor_GAUGE { + startTime = nil + } + + spt, err := metricPointToMpbPoint(startTime, &pt, se.o.ProjectID) + if err != nil { + return nil, err + } + sptl = append(sptl, spt) + } + return sptl, nil } -func fromProtoPoint(startTime *timestamp.Timestamp, pt *metricspb.Point) (*monitoringpb.Point, error) { +func metricPointToMpbPoint(startTime *timestamp.Timestamp, pt *metricdata.Point, projectID string) (*monitoringpb.Point, error) { if pt == nil { return nil, nil } - mptv, err := protoToMetricPoint(pt.Value) + mptv, err := metricPointToMpbValue(pt, projectID) if err != nil { return nil, err } @@ -404,144 +373,127 @@ func fromProtoPoint(startTime *timestamp.Timestamp, pt *metricspb.Point) (*monit Value: mptv, Interval: &monitoringpb.TimeInterval{ StartTime: startTime, - EndTime: pt.Timestamp, + EndTime: timestampProto(pt.Time), }, } return mpt, nil } -func protoToMetricPoint(value interface{}) (*monitoringpb.TypedValue, error) { - if value == nil { +func metricPointToMpbValue(pt *metricdata.Point, projectID string) (*monitoringpb.TypedValue, error) { + if pt == nil { return nil, nil } var err error var tval *monitoringpb.TypedValue - switch v := value.(type) { + switch v := pt.Value.(type) { default: - // All the other types are not yet handled. - // TODO: (@odeke-em, @songy23) talk to the Stackdriver team to determine - // the use cases for: - // - // *TypedValue_BoolValue - // *TypedValue_StringValue - // - // and then file feature requests on OpenCensus-Specs and then OpenCensus-Proto, - // lest we shall error here. - // - // TODO: Add conversion from SummaryValue when - // https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/issues/66 - // has been figured out. - err = fmt.Errorf("protoToMetricPoint: unknown Data type: %T", value) - - case *metricspb.Point_Int64Value: + err = fmt.Errorf("protoToMetricPoint: unknown Data type: %T", pt.Value) + + case int64: tval = &monitoringpb.TypedValue{ Value: &monitoringpb.TypedValue_Int64Value{ - Int64Value: v.Int64Value, + Int64Value: v, }, } - case *metricspb.Point_DoubleValue: + case float64: tval = &monitoringpb.TypedValue{ Value: &monitoringpb.TypedValue_DoubleValue{ - DoubleValue: v.DoubleValue, + DoubleValue: v, }, } - case *metricspb.Point_DistributionValue: - dv := v.DistributionValue + case *metricdata.Distribution: + dv := v var mv *monitoringpb.TypedValue_DistributionValue - if dv != nil { - var mean float64 - if dv.Count > 0 { - mean = float64(dv.Sum) / float64(dv.Count) - } - mv = &monitoringpb.TypedValue_DistributionValue{ - DistributionValue: &distributionpb.Distribution{ - Count: dv.Count, - Mean: mean, - SumOfSquaredDeviation: dv.SumOfSquaredDeviation, - BucketCounts: bucketCounts(dv.Buckets), - }, - } + var mean float64 + if dv.Count > 0 { + mean = float64(dv.Sum) / float64(dv.Count) + } + mv = &monitoringpb.TypedValue_DistributionValue{ + DistributionValue: &distributionpb.Distribution{ + Count: dv.Count, + Mean: mean, + SumOfSquaredDeviation: dv.SumOfSquaredDeviation, + }, + } - if bopts := dv.BucketOptions; bopts != nil && bopts.Type != nil { - bexp, ok := bopts.Type.(*metricspb.DistributionValue_BucketOptions_Explicit_) - if ok && bexp != nil && bexp.Explicit != nil { - mv.DistributionValue.BucketOptions = &distributionpb.Distribution_BucketOptions{ - Options: &distributionpb.Distribution_BucketOptions_ExplicitBuckets{ - ExplicitBuckets: &distributionpb.Distribution_BucketOptions_Explicit{ - Bounds: bexp.Explicit.Bounds[:], - }, - }, - } - } + insertZeroBound := false + if bopts := dv.BucketOptions; bopts != nil { + insertZeroBound = shouldInsertZeroBound(bopts.Bounds...) + mv.DistributionValue.BucketOptions = &distributionpb.Distribution_BucketOptions{ + Options: &distributionpb.Distribution_BucketOptions_ExplicitBuckets{ + ExplicitBuckets: &distributionpb.Distribution_BucketOptions_Explicit{ + // The first bucket bound should be 0.0 because the Metrics first bucket is + // [0, first_bound) but Stackdriver monitoring bucket bounds begin with -infinity + // (first bucket is (-infinity, 0)) + Bounds: addZeroBoundOnCondition(insertZeroBound, bopts.Bounds...), + }, + }, } } + bucketCounts, exemplars := metricBucketToBucketCountsAndExemplars(dv.Buckets, projectID) + mv.DistributionValue.BucketCounts = addZeroBucketCountOnCondition(insertZeroBound, bucketCounts...) + mv.DistributionValue.Exemplars = exemplars + tval = &monitoringpb.TypedValue{Value: mv} } return tval, err } -func bucketCounts(buckets []*metricspb.DistributionValue_Bucket) []int64 { +func metricBucketToBucketCountsAndExemplars(buckets []metricdata.Bucket, projectID string) ([]int64, []*distributionpb.Distribution_Exemplar) { bucketCounts := make([]int64, len(buckets)) + var exemplars []*distributionpb.Distribution_Exemplar for i, bucket := range buckets { - if bucket != nil { - bucketCounts[i] = bucket.Count + bucketCounts[i] = bucket.Count + if bucket.Exemplar != nil { + exemplars = append(exemplars, metricExemplarToPbExemplar(bucket.Exemplar, projectID)) } } - return bucketCounts + return bucketCounts, exemplars } -func protoMetricDescriptorTypeToMetricKind(m *metricspb.Metric) (googlemetricpb.MetricDescriptor_MetricKind, googlemetricpb.MetricDescriptor_ValueType) { - dt := m.GetMetricDescriptor() - if dt == nil { - return googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED, googlemetricpb.MetricDescriptor_VALUE_TYPE_UNSPECIFIED - } - - switch dt.Type { - case metricspb.MetricDescriptor_CUMULATIVE_INT64: - return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_INT64 - - case metricspb.MetricDescriptor_CUMULATIVE_DOUBLE: - return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_DOUBLE - - case metricspb.MetricDescriptor_CUMULATIVE_DISTRIBUTION: - return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_DISTRIBUTION - - case metricspb.MetricDescriptor_GAUGE_DOUBLE: - return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_DOUBLE - - case metricspb.MetricDescriptor_GAUGE_INT64: - return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_INT64 - - case metricspb.MetricDescriptor_GAUGE_DISTRIBUTION: - return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_DISTRIBUTION - - default: - return googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED, googlemetricpb.MetricDescriptor_VALUE_TYPE_UNSPECIFIED +func metricExemplarToPbExemplar(exemplar *metricdata.Exemplar, projectID string) *distributionpb.Distribution_Exemplar { + return &distributionpb.Distribution_Exemplar{ + Value: exemplar.Value, + Timestamp: timestampProto(exemplar.Timestamp), + Attachments: attachmentsToPbAttachments(exemplar.Attachments, projectID), } } -func protoResourceToMonitoredResource(rsp *resourcepb.Resource) *monitoredrespb.MonitoredResource { - if rsp == nil { - return &monitoredrespb.MonitoredResource{ - Type: "global", +func attachmentsToPbAttachments(attachments metricdata.Attachments, projectID string) []*any.Any { + var pbAttachments []*any.Any + for _, v := range attachments { + switch v.(type) { + case trace.SpanContext: + spanCtx, _ := v.(trace.SpanContext) + pbAttachments = append(pbAttachments, toPbSpanCtxAttachment(spanCtx, projectID)) + default: + // Treat everything else as plain string for now. + // TODO(songy23): add support for dropped label attachments. + pbAttachments = append(pbAttachments, toPbStringAttachment(v)) } } - typ := rsp.Type - if typ == "" { - typ = "global" + return pbAttachments +} + +func toPbStringAttachment(v interface{}) *any.Any { + s := fmt.Sprintf("%v", v) + return &any.Any{ + TypeUrl: exemplarAttachmentTypeString, + Value: []byte(s), } - mrsp := &monitoredrespb.MonitoredResource{ - Type: typ, +} + +func toPbSpanCtxAttachment(spanCtx trace.SpanContext, projectID string) *any.Any { + pbSpanCtx := monitoringpb.SpanContext{ + SpanName: fmt.Sprintf("projects/%s/traces/%s/spans/%s", projectID, spanCtx.TraceID.String(), spanCtx.SpanID.String()), } - if rsp.Labels != nil { - mrsp.Labels = make(map[string]string, len(rsp.Labels)) - for k, v := range rsp.Labels { - mrsp.Labels[k] = v - } + bytes, _ := proto.Marshal(&pbSpanCtx) + return &any.Any{ + TypeUrl: exemplarAttachmentTypeSpanCtx, + Value: bytes, } - return mrsp } diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_proto.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_proto.go new file mode 100644 index 000000000..139daad05 --- /dev/null +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_proto.go @@ -0,0 +1,726 @@ +// Copyright 2018, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package stackdriver + +/* +The code in this file is responsible for converting OpenCensus Proto metrics +directly to Stackdriver Metrics. +*/ + +import ( + "context" + "errors" + "fmt" + "path" + "sort" + "strings" + + "github.com/golang/protobuf/ptypes/timestamp" + "go.opencensus.io/stats" + "go.opencensus.io/trace" + + "cloud.google.com/go/monitoring/apiv3" + distributionpb "google.golang.org/genproto/googleapis/api/distribution" + labelpb "google.golang.org/genproto/googleapis/api/label" + googlemetricpb "google.golang.org/genproto/googleapis/api/metric" + monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" + + commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" + metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" + resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" + "go.opencensus.io/resource" +) + +var errNilMetric = errors.New("expecting a non-nil metric") +var errNilMetricDescriptor = errors.New("expecting a non-nil metric descriptor") +var percentileLabelKey = &metricspb.LabelKey{ + Key: "percentile", + Description: "the value at a given percentile of a distribution", +} + +type metricProtoPayload struct { + node *commonpb.Node + resource *resourcepb.Resource + metric *metricspb.Metric + additionalLabels map[string]labelValue +} + +func (se *statsExporter) addPayload(node *commonpb.Node, rsc *resourcepb.Resource, labels map[string]labelValue, metrics ...*metricspb.Metric) { + for _, metric := range metrics { + payload := &metricProtoPayload{ + metric: metric, + resource: rsc, + node: node, + additionalLabels: labels, + } + se.protoMetricsBundler.Add(payload, 1) + } +} + +// ExportMetricsProto exports OpenCensus Metrics Proto to Stackdriver Monitoring. +func (se *statsExporter) ExportMetricsProto(ctx context.Context, node *commonpb.Node, rsc *resourcepb.Resource, metrics []*metricspb.Metric) error { + if len(metrics) == 0 { + return errNilMetric + } + + additionalLabels := se.defaultLabels + if additionalLabels == nil { + // additionalLabels must be stateless because each node is different + additionalLabels = getDefaultLabelsFromNode(node) + } + + for _, metric := range metrics { + if metric.GetMetricDescriptor().GetType() == metricspb.MetricDescriptor_SUMMARY { + se.addPayload(node, rsc, additionalLabels, se.convertSummaryMetrics(metric)...) + } else { + se.addPayload(node, rsc, additionalLabels, metric) + } + } + + return nil +} + +func (se *statsExporter) convertSummaryMetrics(summary *metricspb.Metric) []*metricspb.Metric { + var metrics []*metricspb.Metric + var percentileTss []*metricspb.TimeSeries + var countTss []*metricspb.TimeSeries + var sumTss []*metricspb.TimeSeries + + for _, ts := range summary.Timeseries { + lvs := ts.GetLabelValues() + + startTime := ts.StartTimestamp + for _, pt := range ts.GetPoints() { + ptTimestamp := pt.GetTimestamp() + summaryValue := pt.GetSummaryValue() + if summaryValue.Sum != nil { + sumTs := &metricspb.TimeSeries{ + LabelValues: lvs, + StartTimestamp: startTime, + Points: []*metricspb.Point{ + { + Value: &metricspb.Point_DoubleValue{ + DoubleValue: summaryValue.Sum.Value, + }, + Timestamp: ptTimestamp, + }, + }, + } + sumTss = append(sumTss, sumTs) + } + + if summaryValue.Count != nil { + countTs := &metricspb.TimeSeries{ + LabelValues: lvs, + StartTimestamp: startTime, + Points: []*metricspb.Point{ + { + Value: &metricspb.Point_Int64Value{ + Int64Value: summaryValue.Count.Value, + }, + Timestamp: ptTimestamp, + }, + }, + } + countTss = append(countTss, countTs) + } + + snapshot := summaryValue.GetSnapshot() + for _, percentileValue := range snapshot.GetPercentileValues() { + lvsWithPercentile := lvs[0:] + lvsWithPercentile = append(lvsWithPercentile, &metricspb.LabelValue{ + Value: fmt.Sprintf("%f", percentileValue.Percentile), + }) + percentileTs := &metricspb.TimeSeries{ + LabelValues: lvsWithPercentile, + StartTimestamp: nil, + Points: []*metricspb.Point{ + { + Value: &metricspb.Point_DoubleValue{ + DoubleValue: percentileValue.Value, + }, + Timestamp: ptTimestamp, + }, + }, + } + percentileTss = append(percentileTss, percentileTs) + } + } + + if len(sumTss) > 0 { + metric := &metricspb.Metric{ + MetricDescriptor: &metricspb.MetricDescriptor{ + Name: fmt.Sprintf("%s_summary_sum", summary.GetMetricDescriptor().GetName()), + Description: summary.GetMetricDescriptor().GetDescription(), + Type: metricspb.MetricDescriptor_CUMULATIVE_DOUBLE, + Unit: summary.GetMetricDescriptor().GetUnit(), + LabelKeys: summary.GetMetricDescriptor().GetLabelKeys(), + }, + Timeseries: sumTss, + Resource: summary.Resource, + } + metrics = append(metrics, metric) + } + if len(countTss) > 0 { + metric := &metricspb.Metric{ + MetricDescriptor: &metricspb.MetricDescriptor{ + Name: fmt.Sprintf("%s_summary_count", summary.GetMetricDescriptor().GetName()), + Description: summary.GetMetricDescriptor().GetDescription(), + Type: metricspb.MetricDescriptor_CUMULATIVE_INT64, + Unit: "1", + LabelKeys: summary.GetMetricDescriptor().GetLabelKeys(), + }, + Timeseries: countTss, + Resource: summary.Resource, + } + metrics = append(metrics, metric) + } + if len(percentileTss) > 0 { + lks := summary.GetMetricDescriptor().GetLabelKeys()[0:] + lks = append(lks, percentileLabelKey) + metric := &metricspb.Metric{ + MetricDescriptor: &metricspb.MetricDescriptor{ + Name: fmt.Sprintf("%s_summary_percentile", summary.GetMetricDescriptor().GetName()), + Description: summary.GetMetricDescriptor().GetDescription(), + Type: metricspb.MetricDescriptor_GAUGE_DOUBLE, + Unit: summary.GetMetricDescriptor().GetUnit(), + LabelKeys: lks, + }, + Timeseries: percentileTss, + Resource: summary.Resource, + } + metrics = append(metrics, metric) + } + } + return metrics +} + +func (se *statsExporter) handleMetricsProtoUpload(payloads []*metricProtoPayload) { + err := se.uploadMetricsProto(payloads) + if err != nil { + se.o.handleError(err) + } +} + +func (se *statsExporter) uploadMetricsProto(payloads []*metricProtoPayload) error { + ctx, cancel := se.o.newContextWithTimeout() + defer cancel() + + ctx, span := trace.StartSpan( + ctx, + "contrib.go.opencensus.io/exporter/stackdriver.uploadMetrics", + trace.WithSampler(trace.NeverSample()), + ) + defer span.End() + + for _, payload := range payloads { + // Now create the metric descriptor remotely. + if err := se.createMetricDescriptor(ctx, payload.metric, payload.additionalLabels); err != nil { + span.SetStatus(trace.Status{Code: 2, Message: err.Error()}) + return err + } + } + + var allTimeSeries []*monitoringpb.TimeSeries + for _, payload := range payloads { + tsl, err := se.protoMetricToTimeSeries(ctx, payload.node, payload.resource, payload.metric, payload.additionalLabels) + if err != nil { + span.SetStatus(trace.Status{Code: 2, Message: err.Error()}) + return err + } + allTimeSeries = append(allTimeSeries, tsl...) + } + + // Now batch timeseries up and then export. + for start, end := 0, 0; start < len(allTimeSeries); start = end { + end = start + maxTimeSeriesPerUpload + if end > len(allTimeSeries) { + end = len(allTimeSeries) + } + batch := allTimeSeries[start:end] + ctsreql := se.combineTimeSeriesToCreateTimeSeriesRequest(batch) + for _, ctsreq := range ctsreql { + if err := createTimeSeries(ctx, se.c, ctsreq); err != nil { + span.SetStatus(trace.Status{Code: trace.StatusCodeUnknown, Message: err.Error()}) + // TODO(@odeke-em): Don't fail fast here, perhaps batch errors? + // return err + } + } + } + + return nil +} + +// metricSignature creates a unique signature consisting of a +// metric's type and its lexicographically sorted label values +// See https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/issues/120 +func metricSignature(metric *googlemetricpb.Metric) string { + labels := metric.GetLabels() + labelValues := make([]string, 0, len(labels)) + + for _, labelValue := range labels { + labelValues = append(labelValues, labelValue) + } + sort.Strings(labelValues) + return fmt.Sprintf("%s:%s", metric.GetType(), strings.Join(labelValues, ",")) +} + +func (se *statsExporter) combineTimeSeriesToCreateTimeSeriesRequest(ts []*monitoringpb.TimeSeries) (ctsreql []*monitoringpb.CreateTimeSeriesRequest) { + if len(ts) == 0 { + return nil + } + + // Since there are scenarios in which Metrics with the same Type + // can be bunched in the same TimeSeries, we have to ensure that + // we create a unique CreateTimeSeriesRequest with entirely unique Metrics + // per TimeSeries, lest we'll encounter: + // + // err: rpc error: code = InvalidArgument desc = One or more TimeSeries could not be written: + // Field timeSeries[2] had an invalid value: Duplicate TimeSeries encountered. + // Only one point can be written per TimeSeries per request.: timeSeries[2] + // + // This scenario happens when we are using the OpenCensus Agent in which multiple metrics + // are streamed by various client applications. + // See https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/issues/73 + uniqueTimeSeries := make([]*monitoringpb.TimeSeries, 0, len(ts)) + nonUniqueTimeSeries := make([]*monitoringpb.TimeSeries, 0, len(ts)) + seenMetrics := make(map[string]struct{}) + + for _, tti := range ts { + key := metricSignature(tti.Metric) + if _, alreadySeen := seenMetrics[key]; !alreadySeen { + uniqueTimeSeries = append(uniqueTimeSeries, tti) + seenMetrics[key] = struct{}{} + } else { + nonUniqueTimeSeries = append(nonUniqueTimeSeries, tti) + } + } + + // UniqueTimeSeries can be bunched up together + // While for each nonUniqueTimeSeries, we have + // to make a unique CreateTimeSeriesRequest. + ctsreql = append(ctsreql, &monitoringpb.CreateTimeSeriesRequest{ + Name: monitoring.MetricProjectPath(se.o.ProjectID), + TimeSeries: uniqueTimeSeries, + }) + + // Now recursively also combine the non-unique TimeSeries + // that were singly added to nonUniqueTimeSeries. + // The reason is that we need optimal combinations + // for optimal combinations because: + // * "a/b/c" + // * "a/b/c" + // * "x/y/z" + // * "a/b/c" + // * "x/y/z" + // * "p/y/z" + // * "d/y/z" + // + // should produce: + // CreateTimeSeries(uniqueTimeSeries) :: ["a/b/c", "x/y/z", "p/y/z", "d/y/z"] + // CreateTimeSeries(nonUniqueTimeSeries) :: ["a/b/c"] + // CreateTimeSeries(nonUniqueTimeSeries) :: ["a/b/c", "x/y/z"] + nonUniqueRequests := se.combineTimeSeriesToCreateTimeSeriesRequest(nonUniqueTimeSeries) + ctsreql = append(ctsreql, nonUniqueRequests...) + + return ctsreql +} + +func resourcepbToResource(rsc *resourcepb.Resource) *resource.Resource { + if rsc == nil { + return &resource.Resource{ + Type: "global", + } + } + res := &resource.Resource{ + Type: rsc.Type, + Labels: make(map[string]string, len(rsc.Labels)), + } + + for k, v := range rsc.Labels { + res.Labels[k] = v + } + return res +} + +// protoMetricToTimeSeries converts a metric into a Stackdriver Monitoring v3 API CreateTimeSeriesRequest +// but it doesn't invoke any remote API. +func (se *statsExporter) protoMetricToTimeSeries(ctx context.Context, node *commonpb.Node, rsc *resourcepb.Resource, metric *metricspb.Metric, additionalLabels map[string]labelValue) ([]*monitoringpb.TimeSeries, error) { + if metric == nil { + return nil, errNilMetric + } + + var resource = rsc + if metric.Resource != nil { + resource = metric.Resource + } + + mappedRes := se.o.MapResource(resourcepbToResource(resource)) + + metricName, _, _, err := metricProseFromProto(metric) + if err != nil { + return nil, err + } + metricType, _ := se.metricTypeFromProto(metricName) + metricLabelKeys := metric.GetMetricDescriptor().GetLabelKeys() + metricKind, _ := protoMetricDescriptorTypeToMetricKind(metric) + + timeSeries := make([]*monitoringpb.TimeSeries, 0, len(metric.Timeseries)) + for _, protoTimeSeries := range metric.Timeseries { + sdPoints, err := se.protoTimeSeriesToMonitoringPoints(protoTimeSeries, metricKind) + if err != nil { + return nil, err + } + + // Each TimeSeries has labelValues which MUST be correlated + // with that from the MetricDescriptor + labels, err := labelsPerTimeSeries(additionalLabels, metricLabelKeys, protoTimeSeries.GetLabelValues()) + if err != nil { + // TODO: (@odeke-em) perhaps log this error from labels extraction, if non-nil. + continue + } + timeSeries = append(timeSeries, &monitoringpb.TimeSeries{ + Metric: &googlemetricpb.Metric{ + Type: metricType, + Labels: labels, + }, + Resource: mappedRes, + Points: sdPoints, + }) + } + + return timeSeries, nil +} + +func labelsPerTimeSeries(defaults map[string]labelValue, labelKeys []*metricspb.LabelKey, labelValues []*metricspb.LabelValue) (map[string]string, error) { + labels := make(map[string]string) + // Fill in the defaults firstly, irrespective of if the labelKeys and labelValues are mismatched. + for key, label := range defaults { + labels[sanitize(key)] = label.val + } + + // Perform this sanity check now. + if len(labelKeys) != len(labelValues) { + return labels, fmt.Errorf("Length mismatch: len(labelKeys)=%d len(labelValues)=%d", len(labelKeys), len(labelValues)) + } + + for i, labelKey := range labelKeys { + labelValue := labelValues[i] + labels[sanitize(labelKey.GetKey())] = labelValue.GetValue() + } + + return labels, nil +} + +func (se *statsExporter) protoMetricDescriptorToCreateMetricDescriptorRequest(ctx context.Context, metric *metricspb.Metric, additionalLabels map[string]labelValue) (*monitoringpb.CreateMetricDescriptorRequest, error) { + // Otherwise, we encountered a cache-miss and + // should create the metric descriptor remotely. + inMD, err := se.protoToMonitoringMetricDescriptor(metric, additionalLabels) + if err != nil { + return nil, err + } + + cmrdesc := &monitoringpb.CreateMetricDescriptorRequest{ + Name: fmt.Sprintf("projects/%s", se.o.ProjectID), + MetricDescriptor: inMD, + } + + return cmrdesc, nil +} + +// createMetricDescriptor creates a metric descriptor from the OpenCensus proto metric +// and then creates it remotely using Stackdriver's API. +func (se *statsExporter) createMetricDescriptor(ctx context.Context, metric *metricspb.Metric, additionalLabels map[string]labelValue) error { + se.protoMu.Lock() + defer se.protoMu.Unlock() + + name := metric.GetMetricDescriptor().GetName() + if _, created := se.protoMetricDescriptors[name]; created { + return nil + } + + // Otherwise, we encountered a cache-miss and + // should create the metric descriptor remotely. + inMD, err := se.protoToMonitoringMetricDescriptor(metric, additionalLabels) + if err != nil { + return err + } + + var md *googlemetricpb.MetricDescriptor + if builtinMetric(inMD.Type) { + gmrdesc := &monitoringpb.GetMetricDescriptorRequest{ + Name: inMD.Name, + } + md, err = getMetricDescriptor(ctx, se.c, gmrdesc) + } else { + + cmrdesc := &monitoringpb.CreateMetricDescriptorRequest{ + Name: fmt.Sprintf("projects/%s", se.o.ProjectID), + MetricDescriptor: inMD, + } + md, err = createMetricDescriptor(ctx, se.c, cmrdesc) + } + + if err == nil { + // Now record the metric as having been created. + se.protoMetricDescriptors[name] = md + } + + return err +} + +func (se *statsExporter) protoTimeSeriesToMonitoringPoints(ts *metricspb.TimeSeries, metricKind googlemetricpb.MetricDescriptor_MetricKind) (sptl []*monitoringpb.Point, err error) { + for _, pt := range ts.Points { + + // If we have a last value aggregation point i.e. MetricDescriptor_GAUGE + // StartTime should be nil. + startTime := ts.StartTimestamp + if metricKind == googlemetricpb.MetricDescriptor_GAUGE { + startTime = nil + } + + spt, err := fromProtoPoint(startTime, pt) + if err != nil { + return nil, err + } + sptl = append(sptl, spt) + } + return sptl, nil +} + +func (se *statsExporter) protoToMonitoringMetricDescriptor(metric *metricspb.Metric, additionalLabels map[string]labelValue) (*googlemetricpb.MetricDescriptor, error) { + if metric == nil { + return nil, errNilMetric + } + + metricName, description, unit, err := metricProseFromProto(metric) + if err != nil { + return nil, err + } + metricType, _ := se.metricTypeFromProto(metricName) + displayName := se.displayName(metricName) + metricKind, valueType := protoMetricDescriptorTypeToMetricKind(metric) + + sdm := &googlemetricpb.MetricDescriptor{ + Name: fmt.Sprintf("projects/%s/metricDescriptors/%s", se.o.ProjectID, metricType), + DisplayName: displayName, + Description: description, + Unit: unit, + Type: metricType, + MetricKind: metricKind, + ValueType: valueType, + Labels: labelDescriptorsFromProto(additionalLabels, metric.GetMetricDescriptor().GetLabelKeys()), + } + + return sdm, nil +} + +func labelDescriptorsFromProto(defaults map[string]labelValue, protoLabelKeys []*metricspb.LabelKey) []*labelpb.LabelDescriptor { + labelDescriptors := make([]*labelpb.LabelDescriptor, 0, len(defaults)+len(protoLabelKeys)) + + // Fill in the defaults first. + for key, lbl := range defaults { + labelDescriptors = append(labelDescriptors, &labelpb.LabelDescriptor{ + Key: sanitize(key), + Description: lbl.desc, + ValueType: labelpb.LabelDescriptor_STRING, + }) + } + + // Now fill in those from the metric. + for _, protoKey := range protoLabelKeys { + labelDescriptors = append(labelDescriptors, &labelpb.LabelDescriptor{ + Key: sanitize(protoKey.GetKey()), + Description: protoKey.GetDescription(), + ValueType: labelpb.LabelDescriptor_STRING, // We only use string tags + }) + } + return labelDescriptors +} + +func metricProseFromProto(metric *metricspb.Metric) (name, description, unit string, err error) { + md := metric.GetMetricDescriptor() + if md == nil { + return "", "", "", errNilMetricDescriptor + } + + name = md.GetName() + unit = md.GetUnit() + description = md.GetDescription() + + if md.Type == metricspb.MetricDescriptor_CUMULATIVE_INT64 { + // If the aggregation type is count, which counts the number of recorded measurements, the unit must be "1", + // because this view does not apply to the recorded values. + unit = stats.UnitDimensionless + } + + return name, description, unit, nil +} + +func (se *statsExporter) metricTypeFromProto(name string) (string, bool) { + // TODO: (@odeke-em) support non-"custom.googleapis.com" metrics names. + name = path.Join("custom.googleapis.com", "opencensus", name) + return name, true +} + +func fromProtoPoint(startTime *timestamp.Timestamp, pt *metricspb.Point) (*monitoringpb.Point, error) { + if pt == nil { + return nil, nil + } + + mptv, err := protoToMetricPoint(pt.Value) + if err != nil { + return nil, err + } + + mpt := &monitoringpb.Point{ + Value: mptv, + Interval: &monitoringpb.TimeInterval{ + StartTime: startTime, + EndTime: pt.Timestamp, + }, + } + return mpt, nil +} + +func protoToMetricPoint(value interface{}) (*monitoringpb.TypedValue, error) { + if value == nil { + return nil, nil + } + + var err error + var tval *monitoringpb.TypedValue + switch v := value.(type) { + default: + // All the other types are not yet handled. + // TODO: (@odeke-em, @songy23) talk to the Stackdriver team to determine + // the use cases for: + // + // *TypedValue_BoolValue + // *TypedValue_StringValue + // + // and then file feature requests on OpenCensus-Specs and then OpenCensus-Proto, + // lest we shall error here. + // + // TODO: Add conversion from SummaryValue when + // https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/issues/66 + // has been figured out. + err = fmt.Errorf("protoToMetricPoint: unknown Data type: %T", value) + + case *metricspb.Point_Int64Value: + tval = &monitoringpb.TypedValue{ + Value: &monitoringpb.TypedValue_Int64Value{ + Int64Value: v.Int64Value, + }, + } + + case *metricspb.Point_DoubleValue: + tval = &monitoringpb.TypedValue{ + Value: &monitoringpb.TypedValue_DoubleValue{ + DoubleValue: v.DoubleValue, + }, + } + + case *metricspb.Point_DistributionValue: + dv := v.DistributionValue + var mv *monitoringpb.TypedValue_DistributionValue + if dv != nil { + var mean float64 + if dv.Count > 0 { + mean = float64(dv.Sum) / float64(dv.Count) + } + mv = &monitoringpb.TypedValue_DistributionValue{ + DistributionValue: &distributionpb.Distribution{ + Count: dv.Count, + Mean: mean, + SumOfSquaredDeviation: dv.SumOfSquaredDeviation, + }, + } + + insertZeroBound := false + if bopts := dv.BucketOptions; bopts != nil && bopts.Type != nil { + bexp, ok := bopts.Type.(*metricspb.DistributionValue_BucketOptions_Explicit_) + if ok && bexp != nil && bexp.Explicit != nil { + insertZeroBound = shouldInsertZeroBound(bexp.Explicit.Bounds...) + mv.DistributionValue.BucketOptions = &distributionpb.Distribution_BucketOptions{ + Options: &distributionpb.Distribution_BucketOptions_ExplicitBuckets{ + ExplicitBuckets: &distributionpb.Distribution_BucketOptions_Explicit{ + // The first bucket bound should be 0.0 because the Metrics first bucket is + // [0, first_bound) but Stackdriver monitoring bucket bounds begin with -infinity + // (first bucket is (-infinity, 0)) + Bounds: addZeroBoundOnCondition(insertZeroBound, bexp.Explicit.Bounds...), + }, + }, + } + } + } + mv.DistributionValue.BucketCounts = addZeroBucketCountOnCondition(insertZeroBound, bucketCounts(dv.Buckets)...) + + } + tval = &monitoringpb.TypedValue{Value: mv} + } + + return tval, err +} + +func bucketCounts(buckets []*metricspb.DistributionValue_Bucket) []int64 { + bucketCounts := make([]int64, len(buckets)) + for i, bucket := range buckets { + if bucket != nil { + bucketCounts[i] = bucket.Count + } + } + return bucketCounts +} + +func protoMetricDescriptorTypeToMetricKind(m *metricspb.Metric) (googlemetricpb.MetricDescriptor_MetricKind, googlemetricpb.MetricDescriptor_ValueType) { + dt := m.GetMetricDescriptor() + if dt == nil { + return googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED, googlemetricpb.MetricDescriptor_VALUE_TYPE_UNSPECIFIED + } + + switch dt.Type { + case metricspb.MetricDescriptor_CUMULATIVE_INT64: + return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_INT64 + + case metricspb.MetricDescriptor_CUMULATIVE_DOUBLE: + return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_DOUBLE + + case metricspb.MetricDescriptor_CUMULATIVE_DISTRIBUTION: + return googlemetricpb.MetricDescriptor_CUMULATIVE, googlemetricpb.MetricDescriptor_DISTRIBUTION + + case metricspb.MetricDescriptor_GAUGE_DOUBLE: + return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_DOUBLE + + case metricspb.MetricDescriptor_GAUGE_INT64: + return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_INT64 + + case metricspb.MetricDescriptor_GAUGE_DISTRIBUTION: + return googlemetricpb.MetricDescriptor_GAUGE, googlemetricpb.MetricDescriptor_DISTRIBUTION + + default: + return googlemetricpb.MetricDescriptor_METRIC_KIND_UNSPECIFIED, googlemetricpb.MetricDescriptor_VALUE_TYPE_UNSPECIFIED + } +} + +func getDefaultLabelsFromNode(node *commonpb.Node) map[string]labelValue { + taskValue := fmt.Sprintf("%s-%d@%s", strings.ToLower(node.LibraryInfo.GetLanguage().String()), node.Identifier.Pid, node.Identifier.HostName) + return map[string]labelValue{ + opencensusTaskKey: { + val: taskValue, + desc: opencensusTaskDescription, + }, + } +} diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_test_utils.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_test_utils.go new file mode 100644 index 000000000..bc7a1ff4d --- /dev/null +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics_test_utils.go @@ -0,0 +1,62 @@ +// Copyright 2019, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package stackdriver + +/* +Common test utilities for comparing Stackdriver metrics. +*/ + +import ( + "github.com/golang/protobuf/ptypes/timestamp" + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + + googlemetricpb "google.golang.org/genproto/googleapis/api/metric" + monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres" + monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" + + "time" +) + +func timestampToTime(ts *timestamp.Timestamp) time.Time { + if ts == nil { + return time.Unix(0, 0).UTC() + } + return time.Unix(ts.Seconds, int64(ts.Nanos)).UTC() +} + +func cmpResource(got, want *monitoredrespb.MonitoredResource) string { + return cmp.Diff(got, want, cmpopts.IgnoreUnexported(monitoredrespb.MonitoredResource{})) +} + +func cmpTSReqs(got, want []*monitoringpb.CreateTimeSeriesRequest) string { + return cmp.Diff(got, want, cmpopts.IgnoreUnexported(monitoringpb.CreateTimeSeriesRequest{})) +} + +func cmpMD(got, want *googlemetricpb.MetricDescriptor) string { + return cmp.Diff(got, want, cmpopts.IgnoreUnexported(googlemetricpb.MetricDescriptor{})) +} + +func cmpMDReq(got, want *monitoringpb.CreateMetricDescriptorRequest) string { + return cmp.Diff(got, want, cmpopts.IgnoreUnexported(monitoringpb.CreateMetricDescriptorRequest{})) +} + +func cmpMDReqs(got, want []*monitoringpb.CreateMetricDescriptorRequest) string { + return cmp.Diff(got, want, cmpopts.IgnoreUnexported(monitoringpb.CreateMetricDescriptorRequest{})) +} + +func cmpPoint(got, want *monitoringpb.Point) string { + return cmp.Diff(got, want, cmpopts.IgnoreUnexported(monitoringpb.Point{})) +} diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/gcp_metadata_config.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/gcp_metadata_config.go index ceb754e51..412e34772 100644 --- a/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/gcp_metadata_config.go +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/gcp_metadata_config.go @@ -15,11 +15,15 @@ package monitoredresource import ( + "context" + "fmt" "log" "os" "strings" "cloud.google.com/go/compute/metadata" + "cloud.google.com/go/container/apiv1" + containerpb "google.golang.org/genproto/googleapis/container/v1" ) // gcpMetadata represents metadata retrieved from GCP (GKE and GCE) environment. @@ -45,6 +49,8 @@ type gcpMetadata struct { // zone is the Compute Engine zone in which the VM is running. zone string + + monitoringV2 bool } // retrieveGCPMetadata retrieves value of each Attribute from Metadata Server @@ -70,6 +76,9 @@ func retrieveGCPMetadata() *gcpMetadata { logError(err) gcpMetadata.clusterName = strings.TrimSpace(clusterName) + clusterLocation, err := metadata.InstanceAttributeValue("cluster-location") + logError(err) + // Following attributes are derived from environment variables. They are configured // via yaml file. For details refer to: // https://cloud.google.com/kubernetes-engine/docs/tutorials/custom-metrics-autoscaling#exporting_metrics_from_the_application @@ -77,6 +86,24 @@ func retrieveGCPMetadata() *gcpMetadata { gcpMetadata.containerName = os.Getenv("CONTAINER_NAME") gcpMetadata.podID = os.Getenv("HOSTNAME") + // Monitoring API version can be obtained from cluster info.q + if gcpMetadata.clusterName != "" { + ctx := context.Background() + c, err := container.NewClusterManagerClient(ctx) + logError(err) + if c != nil { + req := &containerpb.GetClusterRequest{ + Name: fmt.Sprintf("projects/%s/locations/%s/clusters/%s", gcpMetadata.projectID, strings.TrimSpace(clusterLocation), gcpMetadata.clusterName), + } + resp, err := c.GetCluster(ctx, req) + logError(err) + if resp != nil && resp.GetMonitoringService() == "monitoring.googleapis.com/kubernetes" && + resp.GetLoggingService() == "logging.googleapis.com/kubernetes" { + gcpMetadata.monitoringV2 = true + } + } + } + return &gcpMetadata } diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/monitored_resources.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/monitored_resources.go index c07e55ce0..86e76002a 100644 --- a/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/monitored_resources.go +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/monitored_resources.go @@ -52,20 +52,32 @@ type GKEContainer struct { // Zone is the Compute Engine zone in which the VM is running. Zone string + + // LoggingMonitoringV2Enabled is the identifier if user enabled V2 logging and monitoring for GKE + LoggingMonitoringV2Enabled bool } // MonitoredResource returns resource type and resource labels for GKEContainer func (gke *GKEContainer) MonitoredResource() (resType string, labels map[string]string) { labels = map[string]string{ "project_id": gke.ProjectID, - "instance_id": gke.InstanceID, - "zone": gke.Zone, "cluster_name": gke.ClusterName, "container_name": gke.ContainerName, - "namespace_id": gke.NamespaceID, - "pod_id": gke.PodID, } - return "gke_container", labels + var typ string + if gke.LoggingMonitoringV2Enabled { + typ = "k8s_container" + labels["pod_name"] = gke.PodID + labels["namespace_name"] = gke.NamespaceID + labels["location"] = gke.Zone + } else { + typ = "gke_container" + labels["pod_id"] = gke.PodID + labels["namespace_id"] = gke.NamespaceID + labels["zone"] = gke.Zone + labels["instance_id"] = gke.InstanceID + } + return typ, labels } // GCEInstance represents gce_instance type monitored resource. @@ -131,10 +143,9 @@ func (aws *AWSEC2Instance) MonitoredResource() (resType string, labels map[strin // For resource definition go to https://cloud.google.com/monitoring/api/resources func Autodetect() Interface { return func() Interface { - var autoDetected Interface - var awsIdentityDoc *awsIdentityDocument - var gcpMetadata *gcpMetadata detectOnce.Do(func() { + var awsIdentityDoc *awsIdentityDocument + var gcpMetadata *gcpMetadata // First attempts to retrieve AWS Identity Doc and GCP metadata. // It then determines the resource type @@ -187,13 +198,14 @@ func createGCEInstanceMonitoredResource(gcpMetadata *gcpMetadata) *GCEInstance { // gcpMetadata contains GCP (GKE or GCE) specific attributes. func createGKEContainerMonitoredResource(gcpMetadata *gcpMetadata) *GKEContainer { gkeContainer := GKEContainer{ - ProjectID: gcpMetadata.projectID, - InstanceID: gcpMetadata.instanceID, - Zone: gcpMetadata.zone, - ContainerName: gcpMetadata.containerName, - ClusterName: gcpMetadata.clusterName, - NamespaceID: gcpMetadata.namespaceID, - PodID: gcpMetadata.podID, + ProjectID: gcpMetadata.projectID, + InstanceID: gcpMetadata.instanceID, + Zone: gcpMetadata.zone, + ContainerName: gcpMetadata.containerName, + ClusterName: gcpMetadata.clusterName, + NamespaceID: gcpMetadata.namespaceID, + PodID: gcpMetadata.podID, + LoggingMonitoringV2Enabled: gcpMetadata.monitoringV2, } return &gkeContainer } @@ -201,6 +213,9 @@ func createGKEContainerMonitoredResource(gcpMetadata *gcpMetadata) *GKEContainer // detectOnce is used to make sure GCP and AWS metadata detect function executes only once. var detectOnce sync.Once +// autoDetected is the metadata detected after the first execution of Autodetect function. +var autoDetected Interface + // detectResourceType determines the resource type. // awsIdentityDoc contains AWS EC2 attributes. nil if it is not AWS EC2 environment // gcpMetadata contains GCP (GKE or GCE) specific attributes. diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/resource.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/resource.go new file mode 100644 index 000000000..5e2fbce58 --- /dev/null +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/resource.go @@ -0,0 +1,112 @@ +// Copyright 2019, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package stackdriver // import "contrib.go.opencensus.io/exporter/stackdriver" + +import ( + "fmt" + + "go.opencensus.io/resource" + "go.opencensus.io/resource/resourcekeys" + monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres" +) + +type resourceMap struct { + // Mapping from the input resource type to the monitored resource type in Stackdriver. + srcType, dstType string + // Mapping from Stackdriver monitored resource label to an OpenCensus resource label. + labels map[string]string +} + +// Resource labels that are generally internal to the exporter. +// Consider exposing these labels and a type identifier in the future to allow +// for customization. +const ( + stackdriverLocation = "contrib.opencensus.io/exporter/stackdriver/location" + stackdriverProjectID = "contrib.opencensus.io/exporter/stackdriver/project_id" + stackdriverGenericTaskNamespace = "contrib.opencensus.io/exporter/stackdriver/generic_task/namespace" + stackdriverGenericTaskJob = "contrib.opencensus.io/exporter/stackdriver/generic_task/job" + stackdriverGenericTaskID = "contrib.opencensus.io/exporter/stackdriver/generic_task/task_id" +) + +// Mappings for the well-known OpenCensus resources to applicable Stackdriver resources. +var k8sResourceMap = map[string]string{ + "project_id": stackdriverProjectID, + "location": resourcekeys.CloudKeyZone, + "cluster_name": resourcekeys.K8SKeyClusterName, + "namespace_name": resourcekeys.K8SKeyNamespaceName, + "pod_name": resourcekeys.K8SKeyPodName, + "container_name": resourcekeys.ContainerKeyName, +} + +var gcpResourceMap = map[string]string{ + "project_id": stackdriverProjectID, + "instance_id": resourcekeys.HostKeyID, + "zone": resourcekeys.CloudKeyZone, +} + +var awsResourceMap = map[string]string{ + "project_id": stackdriverProjectID, + "instance_id": resourcekeys.HostKeyID, + "region": resourcekeys.CloudKeyRegion, + "aws_account": resourcekeys.CloudKeyAccountID, +} + +// Generic task resource. +var genericResourceMap = map[string]string{ + "project_id": stackdriverProjectID, + "location": stackdriverLocation, + "namespace": stackdriverGenericTaskNamespace, + "job": stackdriverGenericTaskJob, + "task_id": stackdriverGenericTaskID, +} + +func transformResource(match, input map[string]string) map[string]string { + output := make(map[string]string, len(input)) + for dst, src := range match { + if v, ok := input[src]; ok { + output[dst] = v + } + } + return output +} + +func defaultMapResource(res *resource.Resource) *monitoredrespb.MonitoredResource { + match := genericResourceMap + result := &monitoredrespb.MonitoredResource{ + Type: "global", + } + if res == nil || res.Labels == nil { + return result + } + if res.Type == resourcekeys.ContainerType { + result.Type = "k8s_container" + match = k8sResourceMap + } else if v, ok := res.Labels[resourcekeys.CloudKeyProvider]; ok { + if v == resourcekeys.CloudProviderGCP { + result.Type = "gce_instance" + match = gcpResourceMap + } else if v == resourcekeys.CloudProviderAWS { + result.Type = "aws_ec2_instance" + match = awsResourceMap + } + } + result.Labels = transformResource(match, res.Labels) + if result.Type == "aws_ec2_instance" { + if v, ok := result.Labels["region"]; ok { + result.Labels["region"] = fmt.Sprintf("aws:%s", v) + } + } + return result +} diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/stackdriver.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/stackdriver.go index 595377368..4ae65f4c0 100644 --- a/vendor/contrib.go.opencensus.io/exporter/stackdriver/stackdriver.go +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/stackdriver.go @@ -52,10 +52,14 @@ import ( "errors" "fmt" "log" + "os" + "path" "time" + metadataapi "cloud.google.com/go/compute/metadata" traceapi "cloud.google.com/go/trace/apiv2" "contrib.go.opencensus.io/exporter/stackdriver/monitoredresource" + "go.opencensus.io/resource" "go.opencensus.io/stats/view" "go.opencensus.io/tag" "go.opencensus.io/trace" @@ -66,6 +70,7 @@ import ( commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" + "go.opencensus.io/metric/metricdata" ) // Options contains options for configuring the exporter. @@ -73,9 +78,22 @@ type Options struct { // ProjectID is the identifier of the Stackdriver // project the user is uploading the stats data to. // If not set, this will default to your "Application Default Credentials". - // For details see: https://developers.google.com/accounts/docs/application-default-credentials + // For details see: https://developers.google.com/accounts/docs/application-default-credentials. + // + // It will be used in the project_id label of a Stackdriver monitored + // resource if the resource does not inherently belong to a specific + // project, e.g. on-premise resource like k8s_container or generic_task. ProjectID string + // Location is the identifier of the GCP or AWS cloud region/zone in which + // the data for a resource is stored. + // If not set, it will default to the location provided by the metadata server. + // + // It will be used in the location label of a Stackdriver monitored resource + // if the resource does not inherently belong to a specific project, e.g. + // on-premise resource like k8s_container or generic_task. + Location string + // OnError is the hook to be called when there is // an error uploading the stats or tracing data. // If no custom hook is set, errors are logged. @@ -153,6 +171,21 @@ type Options struct { // Optional, but encouraged. MonitoredResource monitoredresource.Interface + // ResourceDetector provides a hook to discover arbitrary resource information. + // + // The translation function provided in MapResource must be able to conver the + // the resource information to a Stackdriver monitored resource. + // + // If this field is unset, resource type and tags will automatically be discovered through + // the OC_RESOURCE_TYPE and OC_RESOURCE_LABELS environment variables. + ResourceDetector resource.Detector + + // MapResource converts a OpenCensus resource to a Stackdriver monitored resource. + // + // If this field is unset, defaultMapResource will be used which encodes a set of default + // conversions from auto-detected resources to well-known Stackdriver monitored resources. + MapResource func(*resource.Resource) *monitoredrespb.MonitoredResource + // MetricPrefix overrides the prefix of a Stackdriver metric display names. // Optional. If unset defaults to "OpenCensus/". // Deprecated: Provide GetMetricDisplayName to change the display name of @@ -222,6 +255,10 @@ type Options struct { // The MonitoredResource field is ignored if this field is set to a non-nil // value. GetMonitoredResource func(*view.View, []tag.Tag) ([]tag.Tag, monitoredresource.Interface) + + // ReportingInterval sets the interval between reporting metrics. + // If it is set to zero then default value is used. + ReportingInterval time.Duration } const defaultTimeout = 5 * time.Second @@ -253,10 +290,52 @@ func NewExporter(o Options) (*Exporter, error) { } o.ProjectID = creds.ProjectID } + if o.Location == "" { + if metadataapi.OnGCE() { + ctx := o.Context + if ctx == nil { + ctx = context.Background() + } + zone, err := metadataapi.Zone() + if err != nil { + // This error should be logged with a warning level. + err = fmt.Errorf("setting Stackdriver default location failed: %s", err) + if o.OnError != nil { + o.OnError(err) + } else { + log.Print(err) + } + } else { + o.Location = zone + } + } + } if o.MonitoredResource != nil { o.Resource = convertMonitoredResourceToPB(o.MonitoredResource) } + if o.MapResource == nil { + o.MapResource = defaultMapResource + } + if o.ResourceDetector != nil { + // For backwards-compatibility we still respect the deprecated resource field. + if o.Resource != nil { + return nil, errors.New("stackdriver: ResourceDetector must not be used in combination with deprecated resource fields") + } + res, err := o.ResourceDetector(o.Context) + if err != nil { + return nil, fmt.Errorf("stackdriver: detect resource: %s", err) + } + // Populate internal resource labels for defaulting project_id, location, and + // generic resource labels of applicable monitored resources. + res.Labels[stackdriverProjectID] = o.ProjectID + res.Labels[stackdriverLocation] = o.Location + res.Labels[stackdriverGenericTaskNamespace] = "default" + res.Labels[stackdriverGenericTaskJob] = path.Base(os.Args[0]) + res.Labels[stackdriverGenericTaskID] = getTaskValue() + + o.Resource = o.MapResource(res) + } se, err := newStatsExporter(o) if err != nil { @@ -278,9 +357,37 @@ func (e *Exporter) ExportView(vd *view.Data) { e.statsExporter.ExportView(vd) } -// ExportMetric exports OpenCensus Metrics to Stackdriver Monitoring. -func (e *Exporter) ExportMetric(ctx context.Context, node *commonpb.Node, rsc *resourcepb.Resource, metric *metricspb.Metric) error { - return e.statsExporter.ExportMetric(ctx, node, rsc, metric) +// ExportMetricsProto exports OpenCensus Metrics Proto to Stackdriver Monitoring. +func (e *Exporter) ExportMetricsProto(ctx context.Context, node *commonpb.Node, rsc *resourcepb.Resource, metrics []*metricspb.Metric) error { + return e.statsExporter.ExportMetricsProto(ctx, node, rsc, metrics) +} + +// ExportMetrics exports OpenCensus Metrics to Stackdriver Monitoring +func (e *Exporter) ExportMetrics(ctx context.Context, metrics []*metricdata.Metric) error { + return e.statsExporter.ExportMetrics(ctx, metrics) +} + +// StartMetricsExporter starts exporter by creating an interval reader that reads metrics +// from all registered producers at set interval and exports them. +// Use StopMetricsExporter to stop exporting metrics. +// Previously, it required registering exporter to export stats collected by opencensus. +// exporter := stackdriver.NewExporter(stackdriver.Option{}) +// view.RegisterExporter(exporter) +// Now, it requires to call StartMetricsExporter() to export stats and metrics collected by opencensus. +// exporter := stackdriver.NewExporter(stackdriver.Option{}) +// exporter.StartMetricsExporter() +// defer exporter.StopMetricsExporter() +// +// Both approach should not be used simultaenously. Otherwise it may result into unknown behavior. +// Previous approach continues to work as before but will not report newly define metrics such +// as gauges. +func (e *Exporter) StartMetricsExporter() error { + return e.statsExporter.startMetricsReader() +} + +// StopMetricsExporter stops exporter from exporting metrics. +func (e *Exporter) StopMetricsExporter() { + e.statsExporter.stopMetricsReader() } // ExportSpan exports a SpanData to Stackdriver Trace. diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/stats.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/stats.go index ca82ca71b..a0565f61e 100644 --- a/vendor/contrib.go.opencensus.io/exporter/stackdriver/stats.go +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/stats.go @@ -33,6 +33,8 @@ import ( "cloud.google.com/go/monitoring/apiv3" "github.com/golang/protobuf/ptypes/timestamp" + "go.opencensus.io/metric/metricdata" + "go.opencensus.io/metric/metricexport" "google.golang.org/api/option" "google.golang.org/api/support/bundler" distributionpb "google.golang.org/genproto/googleapis/api/distribution" @@ -59,6 +61,7 @@ type statsExporter struct { viewDataBundler *bundler.Bundler protoMetricsBundler *bundler.Bundler + metricsBundler *bundler.Bundler createdViewsMu sync.Mutex createdViews map[string]*metricpb.MetricDescriptor // Views already created remotely @@ -66,8 +69,14 @@ type statsExporter struct { protoMu sync.Mutex protoMetricDescriptors map[string]*metricpb.MetricDescriptor // Saves the metric descriptors that were already created remotely + metricMu sync.Mutex + metricDescriptors map[string]*metricpb.MetricDescriptor // Saves the metric descriptors that were already created remotely + c *monitoring.MetricClient defaultLabels map[string]labelValue + ir *metricexport.IntervalReader + + initReaderOnce sync.Once } var ( @@ -83,8 +92,10 @@ func newStatsExporter(o Options) (*statsExporter, error) { } opts := append(o.MonitoringClientOptions, option.WithUserAgent(userAgent)) - ctx, cancel := o.newContextWithTimeout() - defer cancel() + ctx := o.Context + if ctx == nil { + ctx = context.Background() + } client, err := monitoring.NewMetricClient(ctx, opts...) if err != nil { return nil, err @@ -94,6 +105,7 @@ func newStatsExporter(o Options) (*statsExporter, error) { o: o, createdViews: make(map[string]*metricpb.MetricDescriptor), protoMetricDescriptors: make(map[string]*metricpb.MetricDescriptor), + metricDescriptors: make(map[string]*metricpb.MetricDescriptor), } if o.DefaultMonitoringLabels != nil { @@ -108,34 +120,53 @@ func newStatsExporter(o Options) (*statsExporter, error) { vds := bundle.([]*view.Data) e.handleUpload(vds...) }) - e.protoMetricsBundler = bundler.NewBundler((*metricPayload)(nil), func(bundle interface{}) { - payloads := bundle.([]*metricPayload) - e.handleMetricsUpload(payloads) + e.protoMetricsBundler = bundler.NewBundler((*metricProtoPayload)(nil), func(bundle interface{}) { + payloads := bundle.([]*metricProtoPayload) + e.handleMetricsProtoUpload(payloads) + }) + e.metricsBundler = bundler.NewBundler((*metricdata.Metric)(nil), func(bundle interface{}) { + metrics := bundle.([]*metricdata.Metric) + e.handleMetricsUpload(metrics) }) if delayThreshold := e.o.BundleDelayThreshold; delayThreshold > 0 { e.viewDataBundler.DelayThreshold = delayThreshold e.protoMetricsBundler.DelayThreshold = delayThreshold + e.metricsBundler.DelayThreshold = delayThreshold } if countThreshold := e.o.BundleCountThreshold; countThreshold > 0 { e.viewDataBundler.BundleCountThreshold = countThreshold e.protoMetricsBundler.BundleCountThreshold = countThreshold + e.metricsBundler.BundleCountThreshold = countThreshold } return e, nil } +func (e *statsExporter) startMetricsReader() error { + e.initReaderOnce.Do(func() { + e.ir, _ = metricexport.NewIntervalReader(&metricexport.Reader{}, e) + }) + e.ir.ReportingInterval = e.o.ReportingInterval + return e.ir.Start() +} + +func (e *statsExporter) stopMetricsReader() { + if e.ir != nil { + e.ir.Stop() + } +} + func (e *statsExporter) getMonitoredResource(v *view.View, tags []tag.Tag) ([]tag.Tag, *monitoredrespb.MonitoredResource) { if get := e.o.GetMonitoredResource; get != nil { newTags, mr := get(v, tags) return newTags, convertMonitoredResourceToPB(mr) - } else { - resource := e.o.Resource - if resource == nil { - resource = &monitoredrespb.MonitoredResource{ - Type: "global", - } + } + resource := e.o.Resource + if resource == nil { + resource = &monitoredrespb.MonitoredResource{ + Type: "global", } - return tags, resource } + return tags, resource } // ExportView exports to the Stackdriver Monitoring if view data @@ -180,6 +211,7 @@ func (e *statsExporter) handleUpload(vds ...*view.Data) { func (e *statsExporter) Flush() { e.viewDataBundler.Flush() e.protoMetricsBundler.Flush() + e.metricsBundler.Flush() } func (e *statsExporter) uploadStats(vds []*view.Data) error { @@ -208,17 +240,17 @@ func (e *statsExporter) uploadStats(vds []*view.Data) error { return nil } -func (se *statsExporter) makeReq(vds []*view.Data, limit int) []*monitoringpb.CreateTimeSeriesRequest { +func (e *statsExporter) makeReq(vds []*view.Data, limit int) []*monitoringpb.CreateTimeSeriesRequest { var reqs []*monitoringpb.CreateTimeSeriesRequest var allTimeSeries []*monitoringpb.TimeSeries for _, vd := range vds { for _, row := range vd.Rows { - tags, resource := se.getMonitoredResource(vd.View, append([]tag.Tag(nil), row.Tags...)) + tags, resource := e.getMonitoredResource(vd.View, append([]tag.Tag(nil), row.Tags...)) ts := &monitoringpb.TimeSeries{ Metric: &metricpb.Metric{ - Type: se.metricType(vd.View), - Labels: newLabels(se.defaultLabels, tags), + Type: e.metricType(vd.View), + Labels: newLabels(e.defaultLabels, tags), }, Resource: resource, Points: []*monitoringpb.Point{newPoint(vd.View, row, vd.Start, vd.End)}, @@ -231,14 +263,14 @@ func (se *statsExporter) makeReq(vds []*view.Data, limit int) []*monitoringpb.Cr for _, ts := range allTimeSeries { timeSeries = append(timeSeries, ts) if len(timeSeries) == limit { - ctsreql := se.combineTimeSeriesToCreateTimeSeriesRequest(timeSeries) + ctsreql := e.combineTimeSeriesToCreateTimeSeriesRequest(timeSeries) reqs = append(reqs, ctsreql...) timeSeries = timeSeries[:0] } } if len(timeSeries) > 0 { - ctsreql := se.combineTimeSeriesToCreateTimeSeriesRequest(timeSeries) + ctsreql := e.combineTimeSeriesToCreateTimeSeriesRequest(timeSeries) reqs = append(reqs, ctsreql...) } return reqs @@ -423,6 +455,7 @@ func newTypedValue(vd *view.View, r *view.Row) *monitoringpb.TypedValue { }} } case *view.DistributionData: + insertZeroBound := shouldInsertZeroBound(vd.Aggregation.Buckets...) return &monitoringpb.TypedValue{Value: &monitoringpb.TypedValue_DistributionValue{ DistributionValue: &distributionpb.Distribution{ Count: v.Count, @@ -436,11 +469,11 @@ func newTypedValue(vd *view.View, r *view.Row) *monitoringpb.TypedValue { BucketOptions: &distributionpb.Distribution_BucketOptions{ Options: &distributionpb.Distribution_BucketOptions_ExplicitBuckets{ ExplicitBuckets: &distributionpb.Distribution_BucketOptions_Explicit{ - Bounds: vd.Aggregation.Buckets, + Bounds: addZeroBoundOnCondition(insertZeroBound, vd.Aggregation.Buckets...), }, }, }, - BucketCounts: v.CountPerBucket, + BucketCounts: addZeroBucketCountOnCondition(insertZeroBound, v.CountPerBucket...), }, }} case *view.LastValueData: @@ -458,12 +491,32 @@ func newTypedValue(vd *view.View, r *view.Row) *monitoringpb.TypedValue { return nil } +func shouldInsertZeroBound(bounds ...float64) bool { + if len(bounds) > 0 && bounds[0] != 0.0 { + return true + } + return false +} + +func addZeroBucketCountOnCondition(insert bool, counts ...int64) []int64 { + if insert { + return append([]int64{0}, counts...) + } + return counts +} + +func addZeroBoundOnCondition(insert bool, bounds ...float64) []float64 { + if insert { + return append([]float64{0.0}, bounds...) + } + return bounds +} + func (e *statsExporter) metricType(v *view.View) string { if formatter := e.o.GetMetricType; formatter != nil { return formatter(v) - } else { - return path.Join("custom.googleapis.com", "opencensus", v.Name) } + return path.Join("custom.googleapis.com", "opencensus", v.Name) } func newLabels(defaults map[string]labelValue, tags []tag.Tag) map[string]string { diff --git a/vendor/contrib.go.opencensus.io/exporter/stackdriver/trace_proto.go b/vendor/contrib.go.opencensus.io/exporter/stackdriver/trace_proto.go index 2d259cf3c..422a98026 100644 --- a/vendor/contrib.go.opencensus.io/exporter/stackdriver/trace_proto.go +++ b/vendor/contrib.go.opencensus.io/exporter/stackdriver/trace_proto.go @@ -17,6 +17,7 @@ package stackdriver import ( "fmt" "math" + "strconv" "time" "unicode/utf8" @@ -104,10 +105,16 @@ func protoFromSpanData(s *trace.SpanData, projectID string, mr *monitoredrespb.M AttributeMap: make(map[string]*tracepb.AttributeValue), } } - sp.Attributes.AttributeMap[agentLabel] = &tracepb.AttributeValue{ - Value: &tracepb.AttributeValue_StringValue{ - StringValue: trunc(userAgent, maxAttributeStringValue), - }, + + // Only set the agent label if it is not already set. That enables the + // OpenCensus agent/collector to set the agent label based on the library that + // sent the span to the agent. + if _, hasAgent := sp.Attributes.AttributeMap[agentLabel]; !hasAgent { + sp.Attributes.AttributeMap[agentLabel] = &tracepb.AttributeValue{ + Value: &tracepb.AttributeValue_StringValue{ + StringValue: trunc(userAgent, maxAttributeStringValue), + }, + } } es := s.MessageEvents @@ -234,6 +241,13 @@ func attributeValue(v interface{}) *tracepb.AttributeValue { return &tracepb.AttributeValue{ Value: &tracepb.AttributeValue_IntValue{IntValue: value}, } + case float64: + // TODO: set double value if Stackdriver Trace support it in the future. + return &tracepb.AttributeValue{ + Value: &tracepb.AttributeValue_StringValue{ + StringValue: trunc(strconv.FormatFloat(value, 'f', -1, 64), + maxAttributeStringValue)}, + } case string: return &tracepb.AttributeValue{ Value: &tracepb.AttributeValue_StringValue{StringValue: trunc(value, maxAttributeStringValue)}, diff --git a/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1/common.pb.go b/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1/common.pb.go index 2f12e428e..a6f0febe2 100644 --- a/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1/common.pb.go +++ b/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1/common.pb.go @@ -19,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type LibraryInfo_Language int32 @@ -34,19 +34,21 @@ const ( LibraryInfo_PHP LibraryInfo_Language = 7 LibraryInfo_PYTHON LibraryInfo_Language = 8 LibraryInfo_RUBY LibraryInfo_Language = 9 + LibraryInfo_WEB_JS LibraryInfo_Language = 10 ) var LibraryInfo_Language_name = map[int32]string{ - 0: "LANGUAGE_UNSPECIFIED", - 1: "CPP", - 2: "C_SHARP", - 3: "ERLANG", - 4: "GO_LANG", - 5: "JAVA", - 6: "NODE_JS", - 7: "PHP", - 8: "PYTHON", - 9: "RUBY", + 0: "LANGUAGE_UNSPECIFIED", + 1: "CPP", + 2: "C_SHARP", + 3: "ERLANG", + 4: "GO_LANG", + 5: "JAVA", + 6: "NODE_JS", + 7: "PHP", + 8: "PYTHON", + 9: "RUBY", + 10: "WEB_JS", } var LibraryInfo_Language_value = map[string]int32{ @@ -60,6 +62,7 @@ var LibraryInfo_Language_value = map[string]int32{ "PHP": 7, "PYTHON": 8, "RUBY": 9, + "WEB_JS": 10, } func (x LibraryInfo_Language) String() string { @@ -70,8 +73,8 @@ func (LibraryInfo_Language) EnumDescriptor() ([]byte, []int) { return fileDescriptor_126c72ed8a252c84, []int{2, 0} } -// Identifier metadata of the Node (Application instrumented with OpenCensus) -// that connects to OpenCensus Agent. +// Identifier metadata of the Node that produces the span or tracing data. +// Note, this is not the metadata about the Node or service that is described by associated spans. // In the future we plan to extend the identifier proto definition to support // additional information (e.g cloud id, etc.) type Node struct { @@ -315,42 +318,44 @@ func init() { } var fileDescriptor_126c72ed8a252c84 = []byte{ - // 590 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4f, 0x4f, 0xdb, 0x3e, - 0x1c, 0xc6, 0x7f, 0x69, 0x0a, 0xb4, 0xdf, 0xfc, 0x06, 0x99, 0xc5, 0xa1, 0x62, 0x87, 0xb1, 0xee, - 0xc2, 0x0e, 0x4d, 0x06, 0x48, 0xd3, 0x34, 0x69, 0x87, 0x52, 0x3a, 0x28, 0x42, 0x25, 0x72, 0x01, - 0x89, 0x5d, 0xa2, 0xb4, 0xb8, 0xc1, 0x5a, 0x63, 0x57, 0xb6, 0x53, 0x8d, 0xd3, 0x8e, 0xd3, 0xde, - 0xc0, 0x5e, 0xd4, 0x5e, 0xd5, 0x64, 0x3b, 0x69, 0xa3, 0x71, 0x28, 0xb7, 0xef, 0x9f, 0xe7, 0xf9, - 0x38, 0x7a, 0x6c, 0x05, 0x3a, 0x7c, 0x4e, 0xd8, 0x84, 0x30, 0x99, 0xcb, 0x70, 0x2e, 0xb8, 0xe2, - 0x61, 0x92, 0x12, 0xa6, 0xc2, 0x09, 0xcf, 0x32, 0xce, 0xc2, 0xc5, 0x61, 0x51, 0x05, 0x66, 0x89, - 0xf6, 0x57, 0x72, 0x3b, 0x09, 0x8c, 0x3c, 0x28, 0x44, 0x8b, 0xc3, 0xbd, 0xd7, 0x29, 0xe7, 0xe9, - 0x8c, 0x58, 0xd8, 0x38, 0x9f, 0x86, 0x8a, 0x66, 0x44, 0xaa, 0x24, 0x9b, 0x5b, 0x43, 0xfb, 0xb7, - 0x0b, 0xf5, 0x21, 0xbf, 0x27, 0x68, 0x04, 0x40, 0xef, 0x09, 0x53, 0x74, 0x4a, 0x89, 0x68, 0x39, - 0xfb, 0xce, 0x81, 0x77, 0x74, 0x1c, 0xac, 0x3b, 0x20, 0x88, 0x04, 0x9f, 0x10, 0x29, 0x07, 0x4b, - 0x2b, 0xae, 0x60, 0x50, 0x04, 0xff, 0xcf, 0xe8, 0x58, 0x24, 0xe2, 0x31, 0xa6, 0x6c, 0xca, 0x5b, - 0x35, 0x83, 0xed, 0xac, 0xc7, 0x5e, 0x5a, 0xd7, 0x80, 0x4d, 0x39, 0xf6, 0x66, 0xab, 0x46, 0x13, - 0x25, 0x11, 0x0b, 0x3a, 0x21, 0x96, 0xe8, 0x3e, 0x97, 0x38, 0xb2, 0x2e, 0x4b, 0x94, 0xab, 0x06, - 0xdd, 0x02, 0x24, 0x4a, 0x09, 0x3a, 0xce, 0x15, 0x91, 0xad, 0xfa, 0xbe, 0x7b, 0xe0, 0x1d, 0x7d, - 0x58, 0xcf, 0xd3, 0xa1, 0x05, 0xdd, 0xa5, 0xb1, 0xcf, 0x94, 0x78, 0xc4, 0x15, 0xd2, 0xde, 0x67, - 0xd8, 0xf9, 0x67, 0x8d, 0x7c, 0x70, 0xbf, 0x91, 0x47, 0x13, 0x6e, 0x13, 0xeb, 0x12, 0xed, 0xc2, - 0xc6, 0x22, 0x99, 0xe5, 0xc4, 0x24, 0xd3, 0xc4, 0xb6, 0xf9, 0x54, 0xfb, 0xe8, 0xb4, 0x7f, 0x3a, - 0xf0, 0xf2, 0x49, 0xb8, 0xe8, 0x15, 0x34, 0x1f, 0xb8, 0x54, 0x31, 0x4b, 0x32, 0x52, 0x70, 0x1a, - 0x7a, 0x30, 0x4c, 0x32, 0xa2, 0xf1, 0x73, 0x7a, 0x6f, 0x50, 0x2f, 0xb0, 0x2e, 0x51, 0x0f, 0x76, - 0xa4, 0x4a, 0x84, 0x8a, 0x97, 0xd7, 0x5e, 0x04, 0xb6, 0x17, 0xd8, 0x87, 0x11, 0x94, 0x0f, 0x23, - 0xb8, 0x2e, 0x15, 0x78, 0xdb, 0x58, 0x96, 0x7d, 0xfb, 0x4f, 0x0d, 0xbc, 0xca, 0x7d, 0x20, 0x0c, - 0x8d, 0x59, 0xc2, 0xd2, 0x3c, 0x49, 0xed, 0x27, 0x6c, 0x3f, 0x27, 0xae, 0x0a, 0x20, 0xb8, 0x2c, - 0xdc, 0x78, 0xc9, 0x41, 0xef, 0xc0, 0x27, 0xdf, 0xe7, 0x5c, 0x28, 0x22, 0xe2, 0x05, 0x11, 0x92, - 0x72, 0x56, 0x44, 0xb2, 0x53, 0xce, 0x6f, 0xed, 0x18, 0xbd, 0x87, 0xdd, 0x09, 0x17, 0x24, 0x2e, - 0x1f, 0x56, 0x29, 0x77, 0x8d, 0x1c, 0xe9, 0x5d, 0x71, 0x58, 0xe1, 0x68, 0xff, 0x72, 0xa0, 0x51, - 0x9e, 0x89, 0x5a, 0xb0, 0x7b, 0xd9, 0x1d, 0x9e, 0xdd, 0x74, 0xcf, 0xfa, 0xf1, 0xcd, 0x70, 0x14, - 0xf5, 0x7b, 0x83, 0x2f, 0x83, 0xfe, 0xa9, 0xff, 0x1f, 0xda, 0x02, 0xb7, 0x17, 0x45, 0xbe, 0x83, - 0x3c, 0xd8, 0xea, 0xc5, 0xa3, 0xf3, 0x2e, 0x8e, 0xfc, 0x1a, 0x02, 0xd8, 0xec, 0x63, 0xed, 0xf0, - 0x5d, 0xbd, 0x38, 0xbb, 0x8a, 0x4d, 0x53, 0x47, 0x0d, 0xa8, 0x5f, 0x74, 0x6f, 0xbb, 0xfe, 0x86, - 0x1e, 0x0f, 0xaf, 0x4e, 0xfb, 0xf1, 0xc5, 0xc8, 0xdf, 0xd4, 0x94, 0xe8, 0x3c, 0xf2, 0xb7, 0xb4, - 0x31, 0xba, 0xbb, 0x3e, 0xbf, 0x1a, 0xfa, 0x0d, 0xad, 0xc5, 0x37, 0x27, 0x77, 0x7e, 0xb3, 0xfd, - 0x06, 0xbc, 0xca, 0x4b, 0x44, 0x08, 0xea, 0x95, 0xab, 0x34, 0xf5, 0xc9, 0x0f, 0x78, 0x4b, 0xf9, - 0xda, 0x44, 0x4f, 0xbc, 0x9e, 0x29, 0x23, 0xbd, 0x8c, 0x9c, 0xaf, 0x83, 0x94, 0xaa, 0x87, 0x7c, - 0xac, 0x05, 0xa1, 0xf5, 0x75, 0x28, 0x93, 0x4a, 0xe4, 0x19, 0x61, 0x2a, 0x51, 0x94, 0xb3, 0x70, - 0x85, 0xec, 0xd8, 0x9f, 0x4b, 0x4a, 0x58, 0x27, 0x7d, 0xf2, 0x8f, 0x19, 0x6f, 0x9a, 0xed, 0xf1, - 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0xe5, 0x77, 0x76, 0x8e, 0x04, 0x00, 0x00, + // 618 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4f, 0x6e, 0xda, 0x4e, + 0x14, 0xc7, 0x7f, 0xc6, 0x24, 0x81, 0xe7, 0x5f, 0x13, 0x77, 0x94, 0x05, 0x4a, 0x17, 0xa5, 0x74, + 0x93, 0x2e, 0xb0, 0x9b, 0x44, 0xaa, 0xaa, 0x4a, 0x5d, 0x18, 0xe2, 0x26, 0x44, 0x11, 0x58, 0x26, + 0xa1, 0x4a, 0x37, 0x96, 0x21, 0x83, 0x33, 0x2a, 0x9e, 0x41, 0xe3, 0x31, 0x2a, 0x27, 0xe8, 0x09, + 0xda, 0x03, 0xf4, 0x50, 0x3d, 0x44, 0x4f, 0x51, 0xcd, 0x8c, 0x01, 0xab, 0x59, 0x90, 0xdd, 0xfb, + 0xf3, 0xfd, 0x7e, 0x9e, 0xf5, 0xe6, 0xc9, 0xd0, 0x66, 0x73, 0x4c, 0x27, 0x98, 0x66, 0x79, 0xe6, + 0xce, 0x39, 0x13, 0xcc, 0x8d, 0x13, 0x4c, 0x85, 0x3b, 0x61, 0x69, 0xca, 0xa8, 0xbb, 0x38, 0x29, + 0x22, 0x47, 0x35, 0x51, 0x73, 0x23, 0xd7, 0x15, 0x47, 0xc9, 0x9d, 0x42, 0xb4, 0x38, 0x39, 0x7a, + 0x99, 0x30, 0x96, 0xcc, 0xb0, 0x86, 0x8d, 0xf3, 0xa9, 0x2b, 0x48, 0x8a, 0x33, 0x11, 0xa7, 0x73, + 0x6d, 0x68, 0xfd, 0x34, 0xa1, 0xda, 0x67, 0xf7, 0x18, 0x0d, 0x01, 0xc8, 0x3d, 0xa6, 0x82, 0x4c, + 0x09, 0xe6, 0x0d, 0xa3, 0x69, 0x1c, 0x5b, 0xa7, 0x67, 0xce, 0xb6, 0x01, 0x4e, 0xc0, 0xd9, 0x04, + 0x67, 0x59, 0x6f, 0x6d, 0x0d, 0x4b, 0x18, 0x14, 0xc0, 0xff, 0x33, 0x32, 0xe6, 0x31, 0x5f, 0x46, + 0x84, 0x4e, 0x59, 0xa3, 0xa2, 0xb0, 0xed, 0xed, 0xd8, 0x6b, 0xed, 0xea, 0xd1, 0x29, 0x0b, 0xad, + 0xd9, 0x26, 0x91, 0xc4, 0x0c, 0xf3, 0x05, 0x99, 0x60, 0x4d, 0x34, 0x9f, 0x4a, 0x1c, 0x6a, 0x97, + 0x26, 0x66, 0x9b, 0x04, 0x8d, 0x00, 0x62, 0x21, 0x38, 0x19, 0xe7, 0x02, 0x67, 0x8d, 0x6a, 0xd3, + 0x3c, 0xb6, 0x4e, 0xdf, 0x6d, 0xe7, 0xc9, 0xa5, 0x39, 0xde, 0xda, 0xe8, 0x53, 0xc1, 0x97, 0x61, + 0x89, 0x74, 0xf4, 0x11, 0x0e, 0xfe, 0x69, 0x23, 0x1b, 0xcc, 0xaf, 0x78, 0xa9, 0x96, 0x5b, 0x0f, + 0x65, 0x88, 0x0e, 0x61, 0x67, 0x11, 0xcf, 0x72, 0xac, 0x36, 0x53, 0x0f, 0x75, 0xf2, 0xa1, 0xf2, + 0xde, 0x68, 0x7d, 0x37, 0xe0, 0xf9, 0xa3, 0xe5, 0xa2, 0x17, 0x50, 0x7f, 0x60, 0x99, 0x88, 0x68, + 0x9c, 0xe2, 0x82, 0x53, 0x93, 0x85, 0x7e, 0x9c, 0x62, 0x89, 0x9f, 0x93, 0x7b, 0x85, 0x7a, 0x16, + 0xca, 0x10, 0x75, 0xe1, 0x20, 0x13, 0x31, 0x17, 0xd1, 0xfa, 0xd9, 0x8b, 0x85, 0x1d, 0x39, 0xfa, + 0x30, 0x9c, 0xd5, 0x61, 0x38, 0x37, 0x2b, 0x45, 0xb8, 0xaf, 0x2c, 0xeb, 0xbc, 0xf5, 0xbb, 0x02, + 0x56, 0xe9, 0x3d, 0x50, 0x08, 0xb5, 0x59, 0x4c, 0x93, 0x3c, 0x4e, 0xf4, 0x27, 0xec, 0x3f, 0x65, + 0x5d, 0x25, 0x80, 0x73, 0x5d, 0xb8, 0xc3, 0x35, 0x07, 0xbd, 0x01, 0x1b, 0x7f, 0x9b, 0x33, 0x2e, + 0x30, 0x8f, 0x16, 0x98, 0x67, 0x84, 0xd1, 0x62, 0x25, 0x07, 0xab, 0xfa, 0x48, 0x97, 0xd1, 0x5b, + 0x38, 0x9c, 0x30, 0x8e, 0xa3, 0xd5, 0x61, 0xad, 0xe4, 0xa6, 0x92, 0x23, 0xd9, 0x2b, 0x86, 0x15, + 0x8e, 0xd6, 0x0f, 0x03, 0x6a, 0xab, 0x99, 0xa8, 0x01, 0x87, 0xd7, 0x5e, 0xff, 0xe2, 0xd6, 0xbb, + 0xf0, 0xa3, 0xdb, 0xfe, 0x30, 0xf0, 0xbb, 0xbd, 0x4f, 0x3d, 0xff, 0xdc, 0xfe, 0x0f, 0xed, 0x81, + 0xd9, 0x0d, 0x02, 0xdb, 0x40, 0x16, 0xec, 0x75, 0xa3, 0xe1, 0xa5, 0x17, 0x06, 0x76, 0x05, 0x01, + 0xec, 0xfa, 0xa1, 0x74, 0xd8, 0xa6, 0x6c, 0x5c, 0x0c, 0x22, 0x95, 0x54, 0x51, 0x0d, 0xaa, 0x57, + 0xde, 0xc8, 0xb3, 0x77, 0x64, 0xb9, 0x3f, 0x38, 0xf7, 0xa3, 0xab, 0xa1, 0xbd, 0x2b, 0x29, 0xc1, + 0x65, 0x60, 0xef, 0x49, 0x63, 0x70, 0x77, 0x73, 0x39, 0xe8, 0xdb, 0x35, 0xa9, 0x0d, 0x6f, 0x3b, + 0x77, 0x76, 0x5d, 0x56, 0x3f, 0xfb, 0x1d, 0x29, 0x85, 0xd6, 0x2b, 0xb0, 0x4a, 0x57, 0x89, 0x10, + 0x54, 0x4b, 0xcf, 0xaa, 0xe2, 0xce, 0x2f, 0x03, 0x5e, 0x13, 0xb6, 0x75, 0xbd, 0x1d, 0xab, 0xab, + 0xc2, 0x40, 0x36, 0x03, 0xe3, 0x4b, 0x2f, 0x21, 0xe2, 0x21, 0x1f, 0x4b, 0x81, 0xab, 0x7d, 0x6d, + 0x42, 0x33, 0xc1, 0xf3, 0x14, 0x53, 0x11, 0x0b, 0xc2, 0xa8, 0xbb, 0x41, 0xb6, 0xf5, 0x9f, 0x26, + 0xc1, 0xb4, 0x9d, 0x3c, 0xfa, 0xe1, 0xfc, 0xa9, 0x34, 0x07, 0x73, 0x4c, 0xbb, 0x7a, 0xb8, 0xe2, + 0x3b, 0x9e, 0x1a, 0xae, 0x27, 0x3a, 0xa3, 0x93, 0xf1, 0xae, 0x02, 0x9c, 0xfd, 0x0d, 0x00, 0x00, + 0xff, 0xff, 0xe3, 0x53, 0x74, 0x5e, 0xbe, 0x04, 0x00, 0x00, } diff --git a/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1/metrics.pb.go b/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1/metrics.pb.go index 6759ced88..466b23428 100644 --- a/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1/metrics.pb.go +++ b/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1/metrics.pb.go @@ -21,7 +21,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The kind of metric. It describes how the data is reported. // @@ -96,20 +96,16 @@ func (MetricDescriptor_Type) EnumDescriptor() ([]byte, []int) { // Defines a Metric which has one or more timeseries. type Metric struct { - // The descriptor of the Metric. This is an optimization for network wire - // size, from data-model perspective a Metric contains always a - // MetricDescriptor. - // - // Types that are valid to be assigned to Descriptor_: - // *Metric_MetricDescriptor - // *Metric_Name - Descriptor_ isMetric_Descriptor_ `protobuf_oneof:"descriptor"` + // The descriptor of the Metric. + // TODO(issue #152): consider only sending the name of descriptor for + // optimization. + MetricDescriptor *MetricDescriptor `protobuf:"bytes,1,opt,name=metric_descriptor,json=metricDescriptor,proto3" json:"metric_descriptor,omitempty"` // One or more timeseries for a single metric, where each timeseries has // one or more points. - Timeseries []*TimeSeries `protobuf:"bytes,3,rep,name=timeseries,proto3" json:"timeseries,omitempty"` + Timeseries []*TimeSeries `protobuf:"bytes,2,rep,name=timeseries,proto3" json:"timeseries,omitempty"` // The resource for the metric. If unset, it may be set to a default value // provided for a sequence of messages in an RPC stream. - Resource *v1.Resource `protobuf:"bytes,4,opt,name=resource,proto3" json:"resource,omitempty"` + Resource *v1.Resource `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -140,43 +136,13 @@ func (m *Metric) XXX_DiscardUnknown() { var xxx_messageInfo_Metric proto.InternalMessageInfo -type isMetric_Descriptor_ interface { - isMetric_Descriptor_() -} - -type Metric_MetricDescriptor struct { - MetricDescriptor *MetricDescriptor `protobuf:"bytes,1,opt,name=metric_descriptor,json=metricDescriptor,proto3,oneof"` -} - -type Metric_Name struct { - Name string `protobuf:"bytes,2,opt,name=name,proto3,oneof"` -} - -func (*Metric_MetricDescriptor) isMetric_Descriptor_() {} - -func (*Metric_Name) isMetric_Descriptor_() {} - -func (m *Metric) GetDescriptor_() isMetric_Descriptor_ { - if m != nil { - return m.Descriptor_ - } - return nil -} - func (m *Metric) GetMetricDescriptor() *MetricDescriptor { - if x, ok := m.GetDescriptor_().(*Metric_MetricDescriptor); ok { - return x.MetricDescriptor + if m != nil { + return m.MetricDescriptor } return nil } -func (m *Metric) GetName() string { - if x, ok := m.GetDescriptor_().(*Metric_Name); ok { - return x.Name - } - return "" -} - func (m *Metric) GetTimeseries() []*TimeSeries { if m != nil { return m.Timeseries @@ -191,76 +157,6 @@ func (m *Metric) GetResource() *v1.Resource { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Metric) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Metric_OneofMarshaler, _Metric_OneofUnmarshaler, _Metric_OneofSizer, []interface{}{ - (*Metric_MetricDescriptor)(nil), - (*Metric_Name)(nil), - } -} - -func _Metric_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Metric) - // descriptor - switch x := m.Descriptor_.(type) { - case *Metric_MetricDescriptor: - b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.MetricDescriptor); err != nil { - return err - } - case *Metric_Name: - b.EncodeVarint(2<<3 | proto.WireBytes) - b.EncodeStringBytes(x.Name) - case nil: - default: - return fmt.Errorf("Metric.Descriptor_ has unexpected type %T", x) - } - return nil -} - -func _Metric_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Metric) - switch tag { - case 1: // descriptor.metric_descriptor - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(MetricDescriptor) - err := b.DecodeMessage(msg) - m.Descriptor_ = &Metric_MetricDescriptor{msg} - return true, err - case 2: // descriptor.name - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Descriptor_ = &Metric_Name{x} - return true, err - default: - return false, nil - } -} - -func _Metric_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Metric) - // descriptor - switch x := m.Descriptor_.(type) { - case *Metric_MetricDescriptor: - s := proto.Size(x.MetricDescriptor) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Metric_Name: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Name))) - n += len(x.Name) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // Defines a metric type and its schema. type MetricDescriptor struct { // The metric type, including its DNS name prefix. It must be unique. @@ -617,9 +513,9 @@ func (m *Point) GetSummaryValue() *SummaryValue { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Point) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Point_OneofMarshaler, _Point_OneofUnmarshaler, _Point_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Point) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Point_Int64Value)(nil), (*Point_DoubleValue)(nil), (*Point_DistributionValue)(nil), @@ -627,98 +523,6 @@ func (*Point) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, } } -func _Point_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Point) - // value - switch x := m.Value.(type) { - case *Point_Int64Value: - b.EncodeVarint(2<<3 | proto.WireVarint) - b.EncodeVarint(uint64(x.Int64Value)) - case *Point_DoubleValue: - b.EncodeVarint(3<<3 | proto.WireFixed64) - b.EncodeFixed64(math.Float64bits(x.DoubleValue)) - case *Point_DistributionValue: - b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.DistributionValue); err != nil { - return err - } - case *Point_SummaryValue: - b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SummaryValue); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Point.Value has unexpected type %T", x) - } - return nil -} - -func _Point_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Point) - switch tag { - case 2: // value.int64_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Value = &Point_Int64Value{int64(x)} - return true, err - case 3: // value.double_value - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Value = &Point_DoubleValue{math.Float64frombits(x)} - return true, err - case 4: // value.distribution_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(DistributionValue) - err := b.DecodeMessage(msg) - m.Value = &Point_DistributionValue{msg} - return true, err - case 5: // value.summary_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(SummaryValue) - err := b.DecodeMessage(msg) - m.Value = &Point_SummaryValue{msg} - return true, err - default: - return false, nil - } -} - -func _Point_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Point) - // value - switch x := m.Value.(type) { - case *Point_Int64Value: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Int64Value)) - case *Point_DoubleValue: - n += 1 // tag and wire - n += 8 - case *Point_DistributionValue: - s := proto.Size(x.DistributionValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Point_SummaryValue: - s := proto.Size(x.SummaryValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // Distribution contains summary statistics for a population of values. It // optionally contains a histogram representing the distribution of those // values across a set of buckets. @@ -741,8 +545,9 @@ type DistributionValue struct { // If count is zero then this field must be zero. SumOfSquaredDeviation float64 `protobuf:"fixed64,3,opt,name=sum_of_squared_deviation,json=sumOfSquaredDeviation,proto3" json:"sum_of_squared_deviation,omitempty"` // Don't change bucket boundaries within a TimeSeries if your backend doesn't - // support this. To save network bandwidth this field can be sent only the - // first time a metric is sent when using a streaming RPC. + // support this. + // TODO(issue #152): consider not required to send bucket options for + // optimization. BucketOptions *DistributionValue_BucketOptions `protobuf:"bytes,4,opt,name=bucket_options,json=bucketOptions,proto3" json:"bucket_options,omitempty"` // If the distribution does not have a histogram, then omit this field. // If there is a histogram, then the sum of the values in the Bucket counts @@ -877,68 +682,20 @@ func (m *DistributionValue_BucketOptions) GetExplicit() *DistributionValue_Bucke return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*DistributionValue_BucketOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _DistributionValue_BucketOptions_OneofMarshaler, _DistributionValue_BucketOptions_OneofUnmarshaler, _DistributionValue_BucketOptions_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*DistributionValue_BucketOptions) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*DistributionValue_BucketOptions_Explicit_)(nil), } } -func _DistributionValue_BucketOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*DistributionValue_BucketOptions) - // type - switch x := m.Type.(type) { - case *DistributionValue_BucketOptions_Explicit_: - b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Explicit); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("DistributionValue_BucketOptions.Type has unexpected type %T", x) - } - return nil -} - -func _DistributionValue_BucketOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*DistributionValue_BucketOptions) - switch tag { - case 1: // type.explicit - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(DistributionValue_BucketOptions_Explicit) - err := b.DecodeMessage(msg) - m.Type = &DistributionValue_BucketOptions_Explicit_{msg} - return true, err - default: - return false, nil - } -} - -func _DistributionValue_BucketOptions_OneofSizer(msg proto.Message) (n int) { - m := msg.(*DistributionValue_BucketOptions) - // type - switch x := m.Type.(type) { - case *DistributionValue_BucketOptions_Explicit_: - s := proto.Size(x.Explicit) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // Specifies a set of buckets with arbitrary upper-bounds. // This defines size(bounds) + 1 (= N) buckets. The boundaries for bucket // index i are: // // [0, bucket_bounds[i]) for i == 0 // [bucket_bounds[i-1], bucket_bounds[i]) for 0 < i < N-1 -// [bucket_bounds[i-1], +infinity) for i == N-1 +// [bucket_bounds[i], +infinity) for i == N-1 type DistributionValue_BucketOptions_Explicit struct { // The values must be strictly increasing and > 0. Bounds []float64 `protobuf:"fixed64,1,rep,packed,name=bounds,proto3" json:"bounds,omitempty"` @@ -1296,75 +1053,75 @@ func init() { } var fileDescriptor_0ee3deb72053811a = []byte{ - // 1114 bytes of a gzipped FileDescriptorProto + // 1118 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0x1b, 0xc5, - 0x17, 0xf7, 0xda, 0x89, 0xe3, 0x9c, 0x75, 0xd3, 0xf5, 0x28, 0xed, 0xdf, 0x72, 0xfe, 0x0a, 0x61, - 0x11, 0x90, 0x0a, 0x65, 0xad, 0x98, 0xd2, 0x56, 0x15, 0x2a, 0x8a, 0x63, 0x37, 0x36, 0xe4, 0xc3, - 0x1a, 0xdb, 0x95, 0x40, 0x48, 0xd6, 0x7a, 0x3d, 0x49, 0x96, 0x78, 0x3f, 0xba, 0x33, 0x6b, 0xf0, - 0x0b, 0xf0, 0x08, 0x70, 0xcb, 0x2d, 0xe2, 0x39, 0xb8, 0xe2, 0x09, 0x78, 0x0a, 0x5e, 0x01, 0xed, - 0xcc, 0xec, 0x47, 0x62, 0x70, 0x71, 0x91, 0xb8, 0x9b, 0x73, 0xe6, 0xfc, 0x7e, 0x73, 0xbe, 0x77, - 0xe1, 0x91, 0xe7, 0x13, 0xd7, 0x22, 0x2e, 0x0d, 0x69, 0xdd, 0x0f, 0x3c, 0xe6, 0xd5, 0x1d, 0xc2, - 0x02, 0xdb, 0xa2, 0xf5, 0xd9, 0x61, 0x7c, 0x34, 0xf8, 0x05, 0xda, 0x49, 0x4d, 0x85, 0xc6, 0x88, - 0xef, 0x67, 0x87, 0xb5, 0x77, 0xae, 0x3c, 0xef, 0x6a, 0x4a, 0x04, 0xc7, 0x38, 0xbc, 0xac, 0x33, - 0xdb, 0x21, 0x94, 0x99, 0x8e, 0x2f, 0x6c, 0x6b, 0xbb, 0x77, 0x0d, 0xbe, 0x0d, 0x4c, 0xdf, 0x27, - 0x81, 0xe4, 0xaa, 0x7d, 0xb4, 0xe0, 0x48, 0x40, 0xa8, 0x17, 0x06, 0x16, 0x89, 0x3c, 0x89, 0xcf, - 0xc2, 0x58, 0xff, 0x31, 0x0f, 0xc5, 0x33, 0xfe, 0x38, 0xfa, 0x1a, 0x2a, 0xc2, 0x8d, 0xd1, 0x84, - 0x50, 0x2b, 0xb0, 0x7d, 0xe6, 0x05, 0x55, 0x65, 0x4f, 0xd9, 0x57, 0x1b, 0x07, 0xc6, 0x12, 0x8f, - 0x0d, 0x81, 0x6f, 0x25, 0xa0, 0x4e, 0x0e, 0x6b, 0xce, 0x1d, 0x1d, 0xda, 0x86, 0x35, 0xd7, 0x74, - 0x48, 0x35, 0xbf, 0xa7, 0xec, 0x6f, 0x76, 0x72, 0x98, 0x4b, 0xe8, 0x04, 0x80, 0x87, 0x47, 0x02, - 0x9b, 0xd0, 0x6a, 0x61, 0xaf, 0xb0, 0xaf, 0x36, 0x3e, 0x5c, 0xfa, 0xd8, 0xc0, 0x76, 0x48, 0x9f, - 0x9b, 0xe3, 0x0c, 0x14, 0x35, 0xa1, 0x14, 0x47, 0x56, 0x5d, 0xe3, 0x3e, 0x7f, 0xb0, 0x48, 0x93, - 0xc4, 0x3e, 0x3b, 0x34, 0xb0, 0x3c, 0xe3, 0x04, 0xd7, 0x2c, 0x03, 0xa4, 0x91, 0xeb, 0x3f, 0x14, - 0x40, 0xbb, 0x1b, 0x19, 0x42, 0x32, 0x8a, 0x28, 0x2d, 0x9b, 0x32, 0x86, 0x3d, 0x50, 0x63, 0x98, - 0xed, 0xb9, 0x22, 0x40, 0x9c, 0x55, 0x45, 0xa8, 0xd0, 0xb5, 0x59, 0xb5, 0x20, 0x50, 0xd1, 0x19, - 0xbd, 0x84, 0x35, 0x36, 0xf7, 0x85, 0xb3, 0x5b, 0x8d, 0xc6, 0x4a, 0x09, 0x36, 0x06, 0x73, 0x9f, - 0x60, 0x8e, 0x47, 0x2d, 0x80, 0xa9, 0x39, 0x26, 0xd3, 0xd1, 0x0d, 0x99, 0xd3, 0xea, 0x3a, 0xcf, - 0xe0, 0xfb, 0x4b, 0xd9, 0x4e, 0x23, 0xf3, 0x2f, 0xc8, 0x1c, 0x6f, 0x4e, 0xe5, 0x89, 0xea, 0x3f, - 0x2b, 0xb0, 0x16, 0x91, 0xa2, 0xfb, 0xa0, 0x0e, 0xcf, 0xfb, 0xbd, 0xf6, 0x71, 0xf7, 0x65, 0xb7, - 0xdd, 0xd2, 0x72, 0x91, 0xe2, 0xe4, 0x68, 0x78, 0xd2, 0x1e, 0x75, 0xcf, 0x07, 0x4f, 0x1e, 0x6b, - 0x0a, 0xd2, 0xa0, 0x2c, 0x14, 0xad, 0x8b, 0x61, 0xf3, 0xb4, 0xad, 0xe5, 0xd1, 0x43, 0x40, 0x52, - 0xd3, 0xed, 0x0f, 0x70, 0xb7, 0x39, 0x1c, 0x74, 0x2f, 0xce, 0xb5, 0x02, 0xda, 0x06, 0xed, 0x78, - 0x78, 0x36, 0x3c, 0x3d, 0x1a, 0x74, 0x5f, 0xc5, 0xf8, 0x35, 0xf4, 0x00, 0x2a, 0x19, 0xad, 0x24, - 0x59, 0x47, 0x3b, 0xf0, 0xbf, 0xac, 0x3a, 0xcb, 0x54, 0x44, 0x2a, 0x6c, 0xf4, 0x87, 0x67, 0x67, - 0x47, 0xf8, 0x4b, 0x6d, 0x43, 0x7f, 0x01, 0xa5, 0x38, 0x04, 0xa4, 0x41, 0xe1, 0x86, 0xcc, 0x65, - 0x39, 0xa2, 0xe3, 0x9b, 0xab, 0xa1, 0xff, 0xae, 0x00, 0xa4, 0x5d, 0x84, 0x8e, 0xe1, 0x3e, 0x65, - 0x66, 0xc0, 0x46, 0xc9, 0x9c, 0xc9, 0xa6, 0xaf, 0x19, 0x62, 0xd0, 0x8c, 0x78, 0xd0, 0x78, 0xef, - 0x71, 0x0b, 0xbc, 0xc5, 0x21, 0x89, 0x8c, 0x3e, 0x87, 0xb2, 0xa8, 0xc2, 0xcc, 0x9c, 0x86, 0x84, - 0x56, 0xf3, 0xff, 0xa0, 0x93, 0x79, 0x10, 0xaf, 0x22, 0x7b, 0xac, 0x4e, 0x93, 0x33, 0x45, 0xcf, - 0xa1, 0xe8, 0x7b, 0xb6, 0xcb, 0xe2, 0x79, 0xd0, 0x97, 0xb2, 0xf4, 0x22, 0x53, 0x2c, 0x11, 0xfa, - 0x67, 0x00, 0x29, 0x2d, 0xda, 0x86, 0x75, 0xee, 0x8f, 0xcc, 0x8f, 0x10, 0xd0, 0x0e, 0x6c, 0x5e, - 0x9b, 0x54, 0x78, 0xca, 0xf3, 0x53, 0xc2, 0xa5, 0x6b, 0x93, 0x72, 0x88, 0xfe, 0x6b, 0x1e, 0xd6, - 0x39, 0x25, 0x7a, 0x06, 0x9b, 0xab, 0x64, 0x24, 0x35, 0x46, 0xef, 0x82, 0x6a, 0xbb, 0xec, 0xc9, - 0xe3, 0xcc, 0x13, 0x85, 0x4e, 0x0e, 0x03, 0x57, 0x0a, 0xcf, 0xde, 0x83, 0xf2, 0xc4, 0x0b, 0xc7, - 0x53, 0x22, 0x6d, 0xa2, 0xc9, 0x50, 0x3a, 0x39, 0xac, 0x0a, 0xad, 0x30, 0x1a, 0x01, 0x9a, 0xd8, - 0x94, 0x05, 0xf6, 0x38, 0x8c, 0x0a, 0x27, 0x4d, 0xc5, 0x74, 0x1b, 0x4b, 0x93, 0xd2, 0xca, 0xc0, - 0x38, 0x57, 0x27, 0x87, 0x2b, 0x93, 0xbb, 0x4a, 0xd4, 0x83, 0x7b, 0x34, 0x74, 0x1c, 0x33, 0x98, - 0x4b, 0xee, 0x75, 0xce, 0xfd, 0x68, 0x29, 0x77, 0x5f, 0x20, 0x62, 0xda, 0x32, 0xcd, 0xc8, 0xcd, - 0x0d, 0x99, 0x71, 0xfd, 0xb7, 0x22, 0x54, 0x16, 0xbc, 0x88, 0x0a, 0x62, 0x79, 0xa1, 0xcb, 0x78, - 0x3e, 0x0b, 0x58, 0x08, 0x51, 0x13, 0xd3, 0xd0, 0xe1, 0x79, 0x52, 0x70, 0x74, 0x44, 0x4f, 0xa1, - 0x4a, 0x43, 0x67, 0xe4, 0x5d, 0x8e, 0xe8, 0xeb, 0xd0, 0x0c, 0xc8, 0x64, 0x34, 0x21, 0x33, 0xdb, - 0xe4, 0x1d, 0xcd, 0x53, 0x85, 0x1f, 0xd0, 0xd0, 0xb9, 0xb8, 0xec, 0x8b, 0xdb, 0x56, 0x7c, 0x89, - 0x2c, 0xd8, 0x1a, 0x87, 0xd6, 0x0d, 0x61, 0x23, 0x8f, 0x37, 0x3b, 0x95, 0xe9, 0xfa, 0x74, 0xb5, - 0x74, 0x19, 0x4d, 0x4e, 0x72, 0x21, 0x38, 0xf0, 0xbd, 0x71, 0x56, 0x44, 0x17, 0xb0, 0x21, 0x14, - 0xf1, 0xbe, 0xf9, 0xe4, 0xad, 0xd8, 0x71, 0xcc, 0x52, 0xfb, 0x49, 0x81, 0x7b, 0xb7, 0x5e, 0x44, - 0x16, 0x94, 0xc8, 0x77, 0xfe, 0xd4, 0xb6, 0x6c, 0x26, 0x7b, 0xaf, 0xfd, 0x6f, 0x22, 0x30, 0xda, - 0x92, 0xac, 0x93, 0xc3, 0x09, 0x71, 0x4d, 0x87, 0x52, 0xac, 0x47, 0x0f, 0xa1, 0x38, 0xf6, 0x42, - 0x77, 0x42, 0xab, 0xca, 0x5e, 0x61, 0x5f, 0xc1, 0x52, 0x6a, 0x16, 0xc5, 0x9a, 0xae, 0x51, 0x28, - 0x0a, 0xc6, 0xbf, 0xa9, 0x61, 0x3f, 0x72, 0x98, 0x38, 0xfe, 0xd4, 0x0c, 0x78, 0x21, 0xd5, 0xc6, - 0xd3, 0x15, 0x1d, 0x6e, 0x4b, 0x38, 0x4e, 0x88, 0x6a, 0xdf, 0xe7, 0x23, 0x0f, 0x85, 0x70, 0x7b, - 0x98, 0x95, 0x78, 0x98, 0x6f, 0x4d, 0x69, 0x7e, 0x95, 0x29, 0xfd, 0x06, 0x54, 0x93, 0x31, 0xd3, - 0xba, 0x76, 0x48, 0xba, 0x6b, 0x3a, 0x6f, 0xe9, 0xb4, 0x71, 0x94, 0x52, 0xb5, 0x5d, 0x16, 0xcc, - 0x71, 0x96, 0xbc, 0xf6, 0x02, 0xb4, 0xbb, 0x06, 0x7f, 0xb1, 0xba, 0x93, 0x08, 0xf3, 0x99, 0x75, - 0xf5, 0x3c, 0xff, 0x4c, 0xd1, 0xff, 0x28, 0x40, 0x39, 0x3b, 0x77, 0xe8, 0x30, 0x5b, 0x04, 0xb5, - 0xb1, 0xb3, 0x10, 0x72, 0x37, 0xd9, 0x35, 0x71, 0x85, 0x8c, 0x74, 0xca, 0xd4, 0xc6, 0xff, 0x17, - 0x00, 0xad, 0x74, 0xf1, 0x88, 0x19, 0x3c, 0x87, 0x12, 0x75, 0x4d, 0x9f, 0x5e, 0x7b, 0xe2, 0xc3, - 0xad, 0xbe, 0xe1, 0x23, 0x9d, 0xf5, 0xcf, 0xe8, 0x4b, 0x24, 0x4e, 0x38, 0x6a, 0xbf, 0xe4, 0xa1, - 0x14, 0xab, 0xff, 0x0b, 0xff, 0x5f, 0x43, 0xc5, 0x27, 0x81, 0x45, 0x5c, 0x66, 0xc7, 0x6b, 0x36, - 0xae, 0x72, 0x6b, 0xf5, 0x40, 0x0c, 0x2e, 0x1e, 0xb1, 0x5e, 0x42, 0x89, 0xb5, 0x94, 0x5e, 0x7c, - 0xb9, 0x6a, 0x5d, 0xa8, 0x2c, 0x98, 0xa1, 0x5d, 0x80, 0xd4, 0x50, 0x36, 0x6f, 0x46, 0x73, 0xbb, - 0xea, 0x71, 0x5f, 0x37, 0x67, 0xb0, 0x6b, 0x7b, 0xcb, 0xdc, 0x6c, 0x96, 0xc5, 0x5f, 0x11, 0xed, - 0x45, 0x17, 0x3d, 0xe5, 0xab, 0xd6, 0x95, 0xcd, 0xae, 0xc3, 0xb1, 0x61, 0x79, 0x4e, 0x5d, 0x60, - 0x0e, 0x6c, 0x97, 0xb2, 0x20, 0x8c, 0x7a, 0x8e, 0x6f, 0xc7, 0x7a, 0x4a, 0x77, 0x20, 0x7e, 0x8c, - 0xaf, 0x88, 0x7b, 0x70, 0x95, 0xfd, 0x51, 0x1f, 0x17, 0xf9, 0xc5, 0xc7, 0x7f, 0x06, 0x00, 0x00, - 0xff, 0xff, 0x24, 0xa6, 0x3d, 0x2b, 0xce, 0x0b, 0x00, 0x00, + 0x17, 0xcf, 0xda, 0x8e, 0xe3, 0x9c, 0x75, 0xd2, 0xf5, 0xa8, 0xed, 0xdf, 0x72, 0xfe, 0x0a, 0x61, + 0x11, 0x90, 0x0a, 0x65, 0xad, 0x98, 0xd2, 0x56, 0x15, 0x2a, 0x8a, 0x63, 0x37, 0x31, 0x24, 0xb1, + 0x35, 0xb6, 0x23, 0xd1, 0x1b, 0x6b, 0xbd, 0x9e, 0x24, 0x4b, 0xbc, 0x1f, 0xdd, 0x99, 0x0d, 0xf8, + 0x05, 0x78, 0x02, 0xc4, 0x35, 0xb7, 0x88, 0xe7, 0xe0, 0x8a, 0x27, 0xe0, 0x15, 0xb8, 0x41, 0xbc, + 0x01, 0xda, 0x99, 0xd9, 0x8f, 0xc4, 0x60, 0xea, 0x22, 0x71, 0x77, 0xe6, 0xcc, 0x39, 0xbf, 0xfd, + 0x9d, 0xcf, 0x1d, 0x78, 0xe4, 0xf9, 0xc4, 0xb5, 0x88, 0x4b, 0x43, 0x5a, 0xf7, 0x03, 0x8f, 0x79, + 0x75, 0x87, 0xb0, 0xc0, 0xb6, 0x68, 0xfd, 0x66, 0x3f, 0x16, 0x0d, 0x7e, 0x81, 0xb6, 0x52, 0x53, + 0xa1, 0x31, 0xe2, 0xfb, 0x9b, 0xfd, 0xda, 0x3b, 0x97, 0x9e, 0x77, 0x39, 0x25, 0x02, 0x63, 0x1c, + 0x5e, 0xd4, 0x99, 0xed, 0x10, 0xca, 0x4c, 0xc7, 0x17, 0xb6, 0xb5, 0xed, 0xbb, 0x06, 0x5f, 0x07, + 0xa6, 0xef, 0x93, 0x40, 0x62, 0xd5, 0x3e, 0x9a, 0x23, 0x12, 0x10, 0xea, 0x85, 0x81, 0x45, 0x22, + 0x26, 0xb1, 0x2c, 0x8c, 0xf5, 0x3f, 0x14, 0x28, 0x9e, 0xf2, 0x8f, 0xa3, 0x57, 0x50, 0x11, 0x34, + 0x46, 0x13, 0x42, 0xad, 0xc0, 0xf6, 0x99, 0x17, 0x54, 0x95, 0x1d, 0x65, 0x57, 0x6d, 0xec, 0x19, + 0x0b, 0x18, 0x1b, 0xc2, 0xbf, 0x95, 0x38, 0x61, 0xcd, 0xb9, 0xa3, 0x41, 0x47, 0x00, 0x3c, 0x0c, + 0x12, 0xd8, 0x84, 0x56, 0x73, 0x3b, 0xf9, 0x5d, 0xb5, 0xf1, 0xe1, 0x42, 0xd0, 0x81, 0xed, 0x90, + 0x3e, 0x37, 0xc7, 0x19, 0x57, 0xd4, 0x84, 0x52, 0x1c, 0x41, 0x35, 0xcf, 0xb9, 0x7d, 0x30, 0x0f, + 0x93, 0xc4, 0x78, 0xb3, 0x6f, 0x60, 0x29, 0xe3, 0xc4, 0x4f, 0xff, 0x3e, 0x0f, 0xda, 0x5d, 0xce, + 0x08, 0x41, 0xc1, 0x35, 0x1d, 0xc2, 0x03, 0x5e, 0xc7, 0x5c, 0x46, 0x3b, 0xa0, 0xc6, 0xa9, 0xb0, + 0x3d, 0xb7, 0x9a, 0xe3, 0x57, 0x59, 0x55, 0xe4, 0x15, 0xba, 0x36, 0xe3, 0x54, 0xd6, 0x31, 0x97, + 0xd1, 0x4b, 0x28, 0xb0, 0x99, 0x4f, 0xaa, 0x85, 0x1d, 0x65, 0x77, 0xb3, 0xd1, 0x58, 0x2a, 0x75, + 0xc6, 0x60, 0xe6, 0x13, 0xcc, 0xfd, 0x51, 0x0b, 0x60, 0x6a, 0x8e, 0xc9, 0x74, 0x74, 0x4d, 0x66, + 0xb4, 0xba, 0xca, 0x73, 0xf6, 0xfe, 0x42, 0xb4, 0x93, 0xc8, 0xfc, 0x0b, 0x32, 0xc3, 0xeb, 0x53, + 0x29, 0x51, 0xfd, 0x47, 0x05, 0x0a, 0x11, 0x28, 0xba, 0x07, 0xea, 0xf0, 0xac, 0xdf, 0x6b, 0x1f, + 0x76, 0x5e, 0x76, 0xda, 0x2d, 0x6d, 0x25, 0x52, 0x1c, 0x1d, 0x0c, 0x8f, 0xda, 0xa3, 0xce, 0xd9, + 0xe0, 0xc9, 0x63, 0x4d, 0x41, 0x1a, 0x94, 0x85, 0xa2, 0xd5, 0x1d, 0x36, 0x4f, 0xda, 0x5a, 0x0e, + 0x3d, 0x04, 0x24, 0x35, 0x9d, 0xfe, 0x00, 0x77, 0x9a, 0xc3, 0x41, 0xa7, 0x7b, 0xa6, 0xe5, 0xd1, + 0x7d, 0xd0, 0x0e, 0x87, 0xa7, 0xc3, 0x93, 0x83, 0x41, 0xe7, 0x3c, 0xf6, 0x2f, 0xa0, 0x07, 0x50, + 0xc9, 0x68, 0x25, 0xc8, 0x2a, 0xda, 0x82, 0xff, 0x65, 0xd5, 0x59, 0xa4, 0x22, 0x52, 0x61, 0xad, + 0x3f, 0x3c, 0x3d, 0x3d, 0xc0, 0x5f, 0x6a, 0x6b, 0xfa, 0x0b, 0x28, 0xc5, 0x21, 0x20, 0x0d, 0xf2, + 0xd7, 0x64, 0x26, 0xcb, 0x11, 0x89, 0xff, 0x5c, 0x0d, 0xfd, 0x57, 0x05, 0x20, 0xed, 0x1b, 0x74, + 0x08, 0xf7, 0x28, 0x33, 0x03, 0x36, 0x4a, 0x26, 0x48, 0xb6, 0x73, 0xcd, 0x10, 0x23, 0x64, 0xc4, + 0x23, 0xc4, 0xbb, 0x8d, 0x5b, 0xe0, 0x4d, 0xee, 0x92, 0x9c, 0xd1, 0xe7, 0x50, 0x16, 0x55, 0xb8, + 0x31, 0xa7, 0xe1, 0x1b, 0xf6, 0x2e, 0x0f, 0xe2, 0x3c, 0xb2, 0xc7, 0xea, 0x34, 0x91, 0x29, 0x7a, + 0x0e, 0x45, 0xdf, 0xb3, 0x5d, 0x46, 0xab, 0x79, 0x8e, 0xa2, 0x2f, 0x44, 0xe9, 0x45, 0xa6, 0x58, + 0x7a, 0xe8, 0x9f, 0x01, 0xa4, 0xb0, 0xe8, 0x3e, 0xac, 0x72, 0x3e, 0x32, 0x3f, 0xe2, 0x80, 0xb6, + 0x60, 0xfd, 0xca, 0xa4, 0x82, 0x29, 0xcf, 0x4f, 0x09, 0x97, 0xae, 0x4c, 0xca, 0x5d, 0xf4, 0x9f, + 0x73, 0xb0, 0xca, 0x21, 0xd1, 0x33, 0x58, 0x5f, 0x26, 0x23, 0xa9, 0x31, 0x7a, 0x17, 0x54, 0xdb, + 0x65, 0x4f, 0x1e, 0x67, 0x3e, 0x91, 0x3f, 0x5e, 0xc1, 0xc0, 0x95, 0x82, 0xd9, 0x7b, 0x50, 0x9e, + 0x78, 0xe1, 0x78, 0x4a, 0xa4, 0x4d, 0x34, 0x19, 0xca, 0xf1, 0x0a, 0x56, 0x85, 0x56, 0x18, 0x8d, + 0x00, 0x4d, 0x6c, 0xca, 0x02, 0x7b, 0x1c, 0x46, 0x85, 0x93, 0xa6, 0x05, 0x4e, 0xc5, 0x58, 0x98, + 0x94, 0x56, 0xc6, 0x8d, 0x63, 0x1d, 0xaf, 0xe0, 0xca, 0xe4, 0xae, 0x12, 0xf5, 0x60, 0x83, 0x86, + 0x8e, 0x63, 0x06, 0x33, 0x89, 0xbd, 0xca, 0xb1, 0x1f, 0x2d, 0xc4, 0xee, 0x0b, 0x8f, 0x18, 0xb6, + 0x4c, 0x33, 0xe7, 0xe6, 0x9a, 0xcc, 0xb8, 0xfe, 0x4b, 0x11, 0x2a, 0x73, 0x2c, 0xa2, 0x82, 0x58, + 0x5e, 0xe8, 0x32, 0x9e, 0xcf, 0x3c, 0x16, 0x87, 0xa8, 0x89, 0x69, 0xe8, 0xf0, 0x3c, 0x29, 0x38, + 0x12, 0xd1, 0x53, 0xa8, 0xd2, 0xd0, 0x19, 0x79, 0x17, 0x23, 0xfa, 0x3a, 0x34, 0x03, 0x32, 0x19, + 0x4d, 0xc8, 0x8d, 0x6d, 0xf2, 0x8e, 0xe6, 0xa9, 0xc2, 0x0f, 0x68, 0xe8, 0x74, 0x2f, 0xfa, 0xe2, + 0xb6, 0x15, 0x5f, 0x22, 0x0b, 0x36, 0xc7, 0xa1, 0x75, 0x4d, 0xd8, 0xc8, 0xe3, 0xcd, 0x4e, 0x65, + 0xba, 0x3e, 0x5d, 0x2e, 0x5d, 0x46, 0x93, 0x83, 0x74, 0x05, 0x06, 0xde, 0x18, 0x67, 0x8f, 0xa8, + 0x0b, 0x6b, 0x42, 0x11, 0xef, 0x9b, 0x4f, 0xde, 0x0a, 0x1d, 0xc7, 0x28, 0xb5, 0x1f, 0x14, 0xd8, + 0xb8, 0xf5, 0x45, 0x64, 0x41, 0x89, 0x7c, 0xe3, 0x4f, 0x6d, 0xcb, 0x66, 0xb2, 0xf7, 0xda, 0xff, + 0x26, 0x02, 0xa3, 0x2d, 0xc1, 0x8e, 0x57, 0x70, 0x02, 0x5c, 0xd3, 0xa1, 0x14, 0xeb, 0xd1, 0x43, + 0x28, 0x8e, 0xbd, 0xd0, 0x9d, 0xd0, 0xaa, 0xb2, 0x93, 0xdf, 0x55, 0xb0, 0x3c, 0x35, 0x8b, 0x62, + 0x4d, 0xd7, 0x28, 0x14, 0x05, 0xe2, 0xdf, 0xd4, 0xb0, 0x1f, 0x11, 0x26, 0x8e, 0x3f, 0x35, 0x03, + 0x5e, 0x48, 0xb5, 0xf1, 0x74, 0x49, 0xc2, 0x6d, 0xe9, 0x8e, 0x13, 0xa0, 0xda, 0xb7, 0xb9, 0x88, + 0xa1, 0x38, 0xdc, 0x1e, 0x66, 0x25, 0x1e, 0xe6, 0x5b, 0x53, 0x9a, 0x5b, 0x66, 0x4a, 0xbf, 0x02, + 0xd5, 0x64, 0xcc, 0xb4, 0xae, 0x1c, 0x92, 0xee, 0x9a, 0xe3, 0xb7, 0x24, 0x6d, 0x1c, 0xa4, 0x50, + 0x6d, 0x97, 0x05, 0x33, 0x9c, 0x05, 0xaf, 0xbd, 0x00, 0xed, 0xae, 0xc1, 0x5f, 0xac, 0xee, 0x24, + 0xc2, 0x5c, 0x66, 0x5d, 0x3d, 0xcf, 0x3d, 0x53, 0xf4, 0xdf, 0xf3, 0x50, 0xce, 0xce, 0x1d, 0xda, + 0xcf, 0x16, 0x41, 0x6d, 0x6c, 0xcd, 0x85, 0xdc, 0x49, 0x76, 0x4d, 0x5c, 0x21, 0x23, 0x9d, 0x32, + 0xb5, 0xf1, 0xff, 0x39, 0x87, 0x56, 0xba, 0x78, 0xc4, 0x0c, 0x9e, 0x41, 0x89, 0xba, 0xa6, 0x4f, + 0xaf, 0x3c, 0x26, 0xdf, 0x10, 0x8d, 0x37, 0xde, 0x0b, 0x46, 0x5f, 0x7a, 0xe2, 0x04, 0xa3, 0xf6, + 0x53, 0x0e, 0x4a, 0xb1, 0xfa, 0xbf, 0xe0, 0xff, 0x1a, 0x2a, 0x3e, 0x09, 0x2c, 0xe2, 0x32, 0x3b, + 0x5e, 0xb3, 0x71, 0x95, 0x5b, 0xcb, 0x07, 0x62, 0xf0, 0xe3, 0x01, 0xeb, 0x25, 0x90, 0x58, 0x4b, + 0xe1, 0xc5, 0x9f, 0xab, 0xd6, 0x81, 0xca, 0x9c, 0x19, 0xda, 0x06, 0x48, 0x0d, 0x65, 0xf3, 0x66, + 0x34, 0xb7, 0xab, 0x1e, 0xf7, 0x75, 0xf3, 0x3b, 0x05, 0xb6, 0x6d, 0x6f, 0x11, 0xcf, 0x66, 0x59, + 0x3c, 0x8b, 0x68, 0x2f, 0xba, 0xe8, 0x29, 0xaf, 0x5a, 0x97, 0x36, 0xbb, 0x0a, 0xc7, 0x86, 0xe5, + 0x39, 0x75, 0xe1, 0xb3, 0x67, 0xbb, 0x94, 0x05, 0x61, 0xd4, 0x74, 0x7c, 0x3d, 0xd6, 0x53, 0xb8, + 0x3d, 0xf1, 0xe6, 0xbd, 0x24, 0xee, 0xde, 0x65, 0xf6, 0x0d, 0xfe, 0x5b, 0x6e, 0xab, 0xeb, 0x13, + 0xf7, 0x50, 0x7c, 0x93, 0x43, 0xcb, 0xe7, 0x17, 0x35, 0xce, 0xf7, 0xc7, 0x45, 0xee, 0xf6, 0xf1, + 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xd0, 0xb4, 0x8d, 0xc7, 0x0b, 0x00, 0x00, } diff --git a/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1/resource.pb.go b/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1/resource.pb.go index 560dbd94a..5dba6a2a0 100644 --- a/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1/resource.pb.go +++ b/vendor/github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1/resource.pb.go @@ -18,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Resource information. type Resource struct { @@ -80,7 +80,7 @@ func init() { } var fileDescriptor_584700775a2fc762 = []byte{ - // 234 bytes of a gzipped FileDescriptorProto + // 251 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xce, 0x2f, 0x48, 0xcd, 0x4b, 0x4e, 0xcd, 0x2b, 0x2e, 0x2d, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x2f, 0x4a, 0x2d, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0xd5, 0x2f, 0x33, 0x84, 0xb3, 0xf5, 0xc0, 0x52, 0x42, 0x32, 0x08, @@ -90,10 +90,11 @@ var fileDescriptor_584700775a2fc762 = []byte{ 0x6d, 0x64, 0xa4, 0x87, 0xcf, 0x3c, 0x3d, 0x98, 0x59, 0x7a, 0x3e, 0x60, 0x4d, 0xae, 0x79, 0x25, 0x45, 0x95, 0x41, 0x50, 0x13, 0xa4, 0x2c, 0xb9, 0xb8, 0x91, 0x84, 0x85, 0x04, 0xb8, 0x98, 0xb3, 0x53, 0x2b, 0xa1, 0xb6, 0x81, 0x98, 0x42, 0x22, 0x5c, 0xac, 0x65, 0x89, 0x39, 0xa5, 0xa9, 0x12, - 0x4c, 0x60, 0x31, 0x08, 0xc7, 0x8a, 0xc9, 0x82, 0xd1, 0xa9, 0x92, 0x4b, 0x3e, 0x33, 0x1f, 0xaf, - 0xd5, 0x4e, 0xbc, 0x30, 0xbb, 0x03, 0x40, 0x52, 0x01, 0x8c, 0x51, 0xae, 0xe9, 0x99, 0x25, 0x19, - 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x10, 0x5d, 0xba, 0x99, 0x79, 0xc5, 0x25, 0x45, 0xa5, - 0xb9, 0xa9, 0x79, 0x25, 0x89, 0x25, 0x99, 0xf9, 0x79, 0xfa, 0x08, 0x03, 0x75, 0x21, 0x01, 0x99, - 0x9e, 0x9a, 0xa7, 0x9b, 0x8e, 0x12, 0x9e, 0x49, 0x6c, 0x60, 0x19, 0x63, 0x40, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x8e, 0x11, 0xaf, 0xda, 0x76, 0x01, 0x00, 0x00, + 0x4c, 0x60, 0x31, 0x08, 0xc7, 0x8a, 0xc9, 0x82, 0xd1, 0x69, 0x06, 0x23, 0x97, 0x7c, 0x66, 0x3e, + 0x5e, 0xbb, 0x9d, 0x78, 0x61, 0x96, 0x07, 0x80, 0xa4, 0x02, 0x18, 0xa3, 0x5c, 0xd3, 0x33, 0x4b, + 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x21, 0xba, 0x74, 0x33, 0xf3, 0x8a, 0x4b, 0x8a, + 0x4a, 0x73, 0x53, 0xf3, 0x4a, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0xf4, 0x11, 0x06, 0xea, 0x42, 0x42, + 0x32, 0x3d, 0x35, 0x4f, 0x37, 0x1d, 0x25, 0x40, 0x5f, 0x31, 0xc9, 0xf8, 0x17, 0xa4, 0xe6, 0x39, + 0x43, 0xac, 0x05, 0x9b, 0x8d, 0xf0, 0x66, 0x98, 0x61, 0x12, 0x1b, 0x58, 0xa3, 0x31, 0x20, 0x00, + 0x00, 0xff, 0xff, 0xcf, 0x32, 0xff, 0x46, 0x96, 0x01, 0x00, 0x00, } diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go index d9aa3c42d..63b0f08be 100644 --- a/vendor/github.com/golang/protobuf/proto/decode.go +++ b/vendor/github.com/golang/protobuf/proto/decode.go @@ -186,7 +186,6 @@ func (p *Buffer) DecodeVarint() (x uint64, err error) { if b&0x80 == 0 { goto done } - // x -= 0x80 << 63 // Always zero. return 0, errOverflow diff --git a/vendor/github.com/golang/protobuf/proto/deprecated.go b/vendor/github.com/golang/protobuf/proto/deprecated.go new file mode 100644 index 000000000..35b882c09 --- /dev/null +++ b/vendor/github.com/golang/protobuf/proto/deprecated.go @@ -0,0 +1,63 @@ +// Go support for Protocol Buffers - Google's data interchange format +// +// Copyright 2018 The Go Authors. All rights reserved. +// https://github.com/golang/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package proto + +import "errors" + +// Deprecated: do not use. +type Stats struct{ Emalloc, Dmalloc, Encode, Decode, Chit, Cmiss, Size uint64 } + +// Deprecated: do not use. +func GetStats() Stats { return Stats{} } + +// Deprecated: do not use. +func MarshalMessageSet(interface{}) ([]byte, error) { + return nil, errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func UnmarshalMessageSet([]byte, interface{}) error { + return errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func MarshalMessageSetJSON(interface{}) ([]byte, error) { + return nil, errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func UnmarshalMessageSetJSON([]byte, interface{}) error { + return errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func RegisterMessageSetType(Message, int32, string) {} diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go index d4db5a1c1..f9b6e41b3 100644 --- a/vendor/github.com/golang/protobuf/proto/equal.go +++ b/vendor/github.com/golang/protobuf/proto/equal.go @@ -246,7 +246,8 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool { return false } - m1, m2 := e1.value, e2.value + m1 := extensionAsLegacyType(e1.value) + m2 := extensionAsLegacyType(e2.value) if m1 == nil && m2 == nil { // Both have only encoded form. diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go index 816a3b9d6..fa88add30 100644 --- a/vendor/github.com/golang/protobuf/proto/extensions.go +++ b/vendor/github.com/golang/protobuf/proto/extensions.go @@ -185,9 +185,25 @@ type Extension struct { // extension will have only enc set. When such an extension is // accessed using GetExtension (or GetExtensions) desc and value // will be set. - desc *ExtensionDesc + desc *ExtensionDesc + + // value is a concrete value for the extension field. Let the type of + // desc.ExtensionType be the "API type" and the type of Extension.value + // be the "storage type". The API type and storage type are the same except: + // * For scalars (except []byte), the API type uses *T, + // while the storage type uses T. + // * For repeated fields, the API type uses []T, while the storage type + // uses *[]T. + // + // The reason for the divergence is so that the storage type more naturally + // matches what is expected of when retrieving the values through the + // protobuf reflection APIs. + // + // The value may only be populated if desc is also populated. value interface{} - enc []byte + + // enc is the raw bytes for the extension field. + enc []byte } // SetRawExtension is for testing only. @@ -334,7 +350,7 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) { // descriptors with the same field number. return nil, errors.New("proto: descriptor conflict") } - return e.value, nil + return extensionAsLegacyType(e.value), nil } if extension.ExtensionType == nil { @@ -349,11 +365,11 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) { // Remember the decoded version and drop the encoded version. // That way it is safe to mutate what we return. - e.value = v + e.value = extensionAsStorageType(v) e.desc = extension e.enc = nil emap[extension.Field] = e - return e.value, nil + return extensionAsLegacyType(e.value), nil } // defaultExtensionValue returns the default value for extension. @@ -488,7 +504,7 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error } typ := reflect.TypeOf(extension.ExtensionType) if typ != reflect.TypeOf(value) { - return errors.New("proto: bad extension value type") + return fmt.Errorf("proto: bad extension value type. got: %T, want: %T", value, extension.ExtensionType) } // nil extension values need to be caught early, because the // encoder can't distinguish an ErrNil due to a nil extension @@ -500,7 +516,7 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error } extmap := epb.extensionsWrite() - extmap[extension.Field] = Extension{desc: extension, value: value} + extmap[extension.Field] = Extension{desc: extension, value: extensionAsStorageType(value)} return nil } @@ -541,3 +557,51 @@ func RegisterExtension(desc *ExtensionDesc) { func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc { return extensionMaps[reflect.TypeOf(pb).Elem()] } + +// extensionAsLegacyType converts an value in the storage type as the API type. +// See Extension.value. +func extensionAsLegacyType(v interface{}) interface{} { + switch rv := reflect.ValueOf(v); rv.Kind() { + case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String: + // Represent primitive types as a pointer to the value. + rv2 := reflect.New(rv.Type()) + rv2.Elem().Set(rv) + v = rv2.Interface() + case reflect.Ptr: + // Represent slice types as the value itself. + switch rv.Type().Elem().Kind() { + case reflect.Slice: + if rv.IsNil() { + v = reflect.Zero(rv.Type().Elem()).Interface() + } else { + v = rv.Elem().Interface() + } + } + } + return v +} + +// extensionAsStorageType converts an value in the API type as the storage type. +// See Extension.value. +func extensionAsStorageType(v interface{}) interface{} { + switch rv := reflect.ValueOf(v); rv.Kind() { + case reflect.Ptr: + // Represent slice types as the value itself. + switch rv.Type().Elem().Kind() { + case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String: + if rv.IsNil() { + v = reflect.Zero(rv.Type().Elem()).Interface() + } else { + v = rv.Elem().Interface() + } + } + case reflect.Slice: + // Represent slice types as a pointer to the value. + if rv.Type().Elem().Kind() != reflect.Uint8 { + rv2 := reflect.New(rv.Type()) + rv2.Elem().Set(rv) + v = rv2.Interface() + } + } + return v +} diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go index 75565cc6d..fdd328bb7 100644 --- a/vendor/github.com/golang/protobuf/proto/lib.go +++ b/vendor/github.com/golang/protobuf/proto/lib.go @@ -341,26 +341,6 @@ type Message interface { ProtoMessage() } -// Stats records allocation details about the protocol buffer encoders -// and decoders. Useful for tuning the library itself. -type Stats struct { - Emalloc uint64 // mallocs in encode - Dmalloc uint64 // mallocs in decode - Encode uint64 // number of encodes - Decode uint64 // number of decodes - Chit uint64 // number of cache hits - Cmiss uint64 // number of cache misses - Size uint64 // number of sizes -} - -// Set to true to enable stats collection. -const collectStats = false - -var stats Stats - -// GetStats returns a copy of the global Stats structure. -func GetStats() Stats { return stats } - // A Buffer is a buffer manager for marshaling and unmarshaling // protocol buffers. It may be reused between invocations to // reduce memory usage. It is not necessary to use a Buffer; @@ -960,13 +940,19 @@ func isProto3Zero(v reflect.Value) bool { return false } -// ProtoPackageIsVersion2 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const ProtoPackageIsVersion2 = true +const ( + // ProtoPackageIsVersion3 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + ProtoPackageIsVersion3 = true + + // ProtoPackageIsVersion2 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + ProtoPackageIsVersion2 = true -// ProtoPackageIsVersion1 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const ProtoPackageIsVersion1 = true + // ProtoPackageIsVersion1 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + ProtoPackageIsVersion1 = true +) // InternalMessageInfo is a type used internally by generated .pb.go files. // This type is not intended to be used by non-generated code. diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go index 3b6ca41d5..f48a75676 100644 --- a/vendor/github.com/golang/protobuf/proto/message_set.go +++ b/vendor/github.com/golang/protobuf/proto/message_set.go @@ -36,13 +36,7 @@ package proto */ import ( - "bytes" - "encoding/json" "errors" - "fmt" - "reflect" - "sort" - "sync" ) // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID. @@ -145,46 +139,9 @@ func skipVarint(buf []byte) []byte { return buf[i+1:] } -// MarshalMessageSet encodes the extension map represented by m in the message set wire format. -// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option. -func MarshalMessageSet(exts interface{}) ([]byte, error) { - return marshalMessageSet(exts, false) -} - -// marshaMessageSet implements above function, with the opt to turn on / off deterministic during Marshal. -func marshalMessageSet(exts interface{}, deterministic bool) ([]byte, error) { - switch exts := exts.(type) { - case *XXX_InternalExtensions: - var u marshalInfo - siz := u.sizeMessageSet(exts) - b := make([]byte, 0, siz) - return u.appendMessageSet(b, exts, deterministic) - - case map[int32]Extension: - // This is an old-style extension map. - // Wrap it in a new-style XXX_InternalExtensions. - ie := XXX_InternalExtensions{ - p: &struct { - mu sync.Mutex - extensionMap map[int32]Extension - }{ - extensionMap: exts, - }, - } - - var u marshalInfo - siz := u.sizeMessageSet(&ie) - b := make([]byte, 0, siz) - return u.appendMessageSet(b, &ie, deterministic) - - default: - return nil, errors.New("proto: not an extension map") - } -} - -// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format. +// unmarshalMessageSet decodes the extension map encoded in buf in the message set wire format. // It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option. -func UnmarshalMessageSet(buf []byte, exts interface{}) error { +func unmarshalMessageSet(buf []byte, exts interface{}) error { var m map[int32]Extension switch exts := exts.(type) { case *XXX_InternalExtensions: @@ -222,93 +179,3 @@ func UnmarshalMessageSet(buf []byte, exts interface{}) error { } return nil } - -// MarshalMessageSetJSON encodes the extension map represented by m in JSON format. -// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option. -func MarshalMessageSetJSON(exts interface{}) ([]byte, error) { - var m map[int32]Extension - switch exts := exts.(type) { - case *XXX_InternalExtensions: - var mu sync.Locker - m, mu = exts.extensionsRead() - if m != nil { - // Keep the extensions map locked until we're done marshaling to prevent - // races between marshaling and unmarshaling the lazily-{en,de}coded - // values. - mu.Lock() - defer mu.Unlock() - } - case map[int32]Extension: - m = exts - default: - return nil, errors.New("proto: not an extension map") - } - var b bytes.Buffer - b.WriteByte('{') - - // Process the map in key order for deterministic output. - ids := make([]int32, 0, len(m)) - for id := range m { - ids = append(ids, id) - } - sort.Sort(int32Slice(ids)) // int32Slice defined in text.go - - for i, id := range ids { - ext := m[id] - msd, ok := messageSetMap[id] - if !ok { - // Unknown type; we can't render it, so skip it. - continue - } - - if i > 0 && b.Len() > 1 { - b.WriteByte(',') - } - - fmt.Fprintf(&b, `"[%s]":`, msd.name) - - x := ext.value - if x == nil { - x = reflect.New(msd.t.Elem()).Interface() - if err := Unmarshal(ext.enc, x.(Message)); err != nil { - return nil, err - } - } - d, err := json.Marshal(x) - if err != nil { - return nil, err - } - b.Write(d) - } - b.WriteByte('}') - return b.Bytes(), nil -} - -// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format. -// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option. -func UnmarshalMessageSetJSON(buf []byte, exts interface{}) error { - // Common-case fast path. - if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) { - return nil - } - - // This is fairly tricky, and it's not clear that it is needed. - return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented") -} - -// A global registry of types that can be used in a MessageSet. - -var messageSetMap = make(map[int32]messageSetDesc) - -type messageSetDesc struct { - t reflect.Type // pointer to struct - name string -} - -// RegisterMessageSetType is called from the generated code. -func RegisterMessageSetType(m Message, fieldNum int32, name string) { - messageSetMap[fieldNum] = messageSetDesc{ - t: reflect.TypeOf(m), - name: name, - } -} diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go index b6cad9083..94fa9194a 100644 --- a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go +++ b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go @@ -79,10 +79,13 @@ func toPointer(i *Message) pointer { // toAddrPointer converts an interface to a pointer that points to // the interface data. -func toAddrPointer(i *interface{}, isptr bool) pointer { +func toAddrPointer(i *interface{}, isptr, deref bool) pointer { v := reflect.ValueOf(*i) u := reflect.New(v.Type()) u.Elem().Set(v) + if deref { + u = u.Elem() + } return pointer{v: u} } diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go index d55a335d9..dbfffe071 100644 --- a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go +++ b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go @@ -85,16 +85,21 @@ func toPointer(i *Message) pointer { // toAddrPointer converts an interface to a pointer that points to // the interface data. -func toAddrPointer(i *interface{}, isptr bool) pointer { +func toAddrPointer(i *interface{}, isptr, deref bool) (p pointer) { // Super-tricky - read or get the address of data word of interface value. if isptr { // The interface is of pointer type, thus it is a direct interface. // The data word is the pointer data itself. We take its address. - return pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)} + p = pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)} + } else { + // The interface is not of pointer type. The data word is the pointer + // to the data. + p = pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]} } - // The interface is not of pointer type. The data word is the pointer - // to the data. - return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]} + if deref { + p.p = *(*unsafe.Pointer)(p.p) + } + return p } // valToPointer converts v to a pointer. v must be of pointer type. diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go index 50b99b83a..a4b8c0cd3 100644 --- a/vendor/github.com/golang/protobuf/proto/properties.go +++ b/vendor/github.com/golang/protobuf/proto/properties.go @@ -38,7 +38,6 @@ package proto import ( "fmt" "log" - "os" "reflect" "sort" "strconv" @@ -194,7 +193,7 @@ func (p *Properties) Parse(s string) { // "bytes,49,opt,name=foo,def=hello!" fields := strings.Split(s, ",") // breaks def=, but handled below. if len(fields) < 2 { - fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s) + log.Printf("proto: tag has too few fields: %q", s) return } @@ -214,7 +213,7 @@ func (p *Properties) Parse(s string) { p.WireType = WireBytes // no numeric converter for non-numeric types default: - fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s) + log.Printf("proto: tag has unknown wire type: %q", s) return } @@ -334,9 +333,6 @@ func GetProperties(t reflect.Type) *StructProperties { sprop, ok := propertiesMap[t] propertiesMu.RUnlock() if ok { - if collectStats { - stats.Chit++ - } return sprop } @@ -346,17 +342,20 @@ func GetProperties(t reflect.Type) *StructProperties { return sprop } +type ( + oneofFuncsIface interface { + XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) + } + oneofWrappersIface interface { + XXX_OneofWrappers() []interface{} + } +) + // getPropertiesLocked requires that propertiesMu is held. func getPropertiesLocked(t reflect.Type) *StructProperties { if prop, ok := propertiesMap[t]; ok { - if collectStats { - stats.Chit++ - } return prop } - if collectStats { - stats.Cmiss++ - } prop := new(StructProperties) // in case of recursive protos, fill this in now. @@ -391,13 +390,14 @@ func getPropertiesLocked(t reflect.Type) *StructProperties { // Re-order prop.order. sort.Sort(prop) - type oneofMessage interface { - XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) + var oots []interface{} + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: + _, _, _, oots = m.XXX_OneofFuncs() + case oneofWrappersIface: + oots = m.XXX_OneofWrappers() } - if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok { - var oots []interface{} - _, _, _, oots = om.XXX_OneofFuncs() - + if len(oots) > 0 { // Interpret oneof metadata. prop.OneofTypes = make(map[string]*OneofProperties) for _, oot := range oots { diff --git a/vendor/github.com/golang/protobuf/proto/table_marshal.go b/vendor/github.com/golang/protobuf/proto/table_marshal.go index b16794496..5cb11fa95 100644 --- a/vendor/github.com/golang/protobuf/proto/table_marshal.go +++ b/vendor/github.com/golang/protobuf/proto/table_marshal.go @@ -87,6 +87,7 @@ type marshalElemInfo struct { sizer sizer marshaler marshaler isptr bool // elem is pointer typed, thus interface of this type is a direct interface (extension only) + deref bool // dereference the pointer before operating on it; implies isptr } var ( @@ -320,8 +321,11 @@ func (u *marshalInfo) computeMarshalInfo() { // get oneof implementers var oneofImplementers []interface{} - if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok { + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: _, _, _, oneofImplementers = m.XXX_OneofFuncs() + case oneofWrappersIface: + oneofImplementers = m.XXX_OneofWrappers() } n := t.NumField() @@ -407,13 +411,22 @@ func (u *marshalInfo) getExtElemInfo(desc *ExtensionDesc) *marshalElemInfo { panic("tag is not an integer") } wt := wiretype(tags[0]) + if t.Kind() == reflect.Ptr && t.Elem().Kind() != reflect.Struct { + t = t.Elem() + } sizer, marshaler := typeMarshaler(t, tags, false, false) + var deref bool + if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 { + t = reflect.PtrTo(t) + deref = true + } e = &marshalElemInfo{ wiretag: uint64(tag)<<3 | wt, tagsize: SizeVarint(uint64(tag) << 3), sizer: sizer, marshaler: marshaler, isptr: t.Kind() == reflect.Ptr, + deref: deref, } // update cache @@ -448,7 +461,7 @@ func (fi *marshalFieldInfo) computeMarshalFieldInfo(f *reflect.StructField) { func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofImplementers []interface{}) { fi.field = toField(f) - fi.wiretag = 1<<31 - 1 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire. + fi.wiretag = math.MaxInt32 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire. fi.isPointer = true fi.sizer, fi.marshaler = makeOneOfMarshaler(fi, f) fi.oneofElems = make(map[reflect.Type]*marshalElemInfo) @@ -476,10 +489,6 @@ func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofI } } -type oneofMessage interface { - XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) -} - // wiretype returns the wire encoding of the type. func wiretype(encoding string) uint64 { switch encoding { @@ -2310,8 +2319,8 @@ func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) { for _, k := range m.MapKeys() { ki := k.Interface() vi := m.MapIndex(k).Interface() - kaddr := toAddrPointer(&ki, false) // pointer to key - vaddr := toAddrPointer(&vi, valIsPtr) // pointer to value + kaddr := toAddrPointer(&ki, false, false) // pointer to key + vaddr := toAddrPointer(&vi, valIsPtr, false) // pointer to value siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1) n += siz + SizeVarint(uint64(siz)) + tagsize } @@ -2329,8 +2338,8 @@ func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) { for _, k := range keys { ki := k.Interface() vi := m.MapIndex(k).Interface() - kaddr := toAddrPointer(&ki, false) // pointer to key - vaddr := toAddrPointer(&vi, valIsPtr) // pointer to value + kaddr := toAddrPointer(&ki, false, false) // pointer to key + vaddr := toAddrPointer(&vi, valIsPtr, false) // pointer to value b = appendVarint(b, tag) siz := keySizer(kaddr, 1) + valCachedSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1) b = appendVarint(b, uint64(siz)) @@ -2399,7 +2408,7 @@ func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int { // the last time this function was called. ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) n += ei.sizer(p, ei.tagsize) } mu.Unlock() @@ -2434,7 +2443,7 @@ func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, ei.wiretag, deterministic) if !nerr.Merge(err) { return b, err @@ -2465,7 +2474,7 @@ func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, ei.wiretag, deterministic) if !nerr.Merge(err) { return b, err @@ -2510,7 +2519,7 @@ func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int { ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) n += ei.sizer(p, 1) // message, tag = 3 (size=1) } mu.Unlock() @@ -2553,7 +2562,7 @@ func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic) if !nerr.Merge(err) { return b, err @@ -2591,7 +2600,7 @@ func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic) b = append(b, 1<<3|WireEndGroup) if !nerr.Merge(err) { @@ -2621,7 +2630,7 @@ func (u *marshalInfo) sizeV1Extensions(m map[int32]Extension) int { ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) n += ei.sizer(p, ei.tagsize) } return n @@ -2656,7 +2665,7 @@ func (u *marshalInfo) appendV1Extensions(b []byte, m map[int32]Extension, determ ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, ei.wiretag, deterministic) if !nerr.Merge(err) { return b, err diff --git a/vendor/github.com/golang/protobuf/proto/table_unmarshal.go b/vendor/github.com/golang/protobuf/proto/table_unmarshal.go index ebf1caa56..acee2fc52 100644 --- a/vendor/github.com/golang/protobuf/proto/table_unmarshal.go +++ b/vendor/github.com/golang/protobuf/proto/table_unmarshal.go @@ -136,7 +136,7 @@ func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error { u.computeUnmarshalInfo() } if u.isMessageSet { - return UnmarshalMessageSet(b, m.offset(u.extensions).toExtensions()) + return unmarshalMessageSet(b, m.offset(u.extensions).toExtensions()) } var reqMask uint64 // bitmask of required fields we've seen. var errLater error @@ -362,46 +362,48 @@ func (u *unmarshalInfo) computeUnmarshalInfo() { } // Find any types associated with oneof fields. - // TODO: XXX_OneofFuncs returns more info than we need. Get rid of some of it? - fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs") - if fn.IsValid() { - res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{} - for i := res.Len() - 1; i >= 0; i-- { - v := res.Index(i) // interface{} - tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X - typ := tptr.Elem() // Msg_X - - f := typ.Field(0) // oneof implementers have one field - baseUnmarshal := fieldUnmarshaler(&f) - tags := strings.Split(f.Tag.Get("protobuf"), ",") - fieldNum, err := strconv.Atoi(tags[1]) - if err != nil { - panic("protobuf tag field not an integer: " + tags[1]) - } - var name string - for _, tag := range tags { - if strings.HasPrefix(tag, "name=") { - name = strings.TrimPrefix(tag, "name=") - break - } + var oneofImplementers []interface{} + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: + _, _, _, oneofImplementers = m.XXX_OneofFuncs() + case oneofWrappersIface: + oneofImplementers = m.XXX_OneofWrappers() + } + for _, v := range oneofImplementers { + tptr := reflect.TypeOf(v) // *Msg_X + typ := tptr.Elem() // Msg_X + + f := typ.Field(0) // oneof implementers have one field + baseUnmarshal := fieldUnmarshaler(&f) + tags := strings.Split(f.Tag.Get("protobuf"), ",") + fieldNum, err := strconv.Atoi(tags[1]) + if err != nil { + panic("protobuf tag field not an integer: " + tags[1]) + } + var name string + for _, tag := range tags { + if strings.HasPrefix(tag, "name=") { + name = strings.TrimPrefix(tag, "name=") + break } + } - // Find the oneof field that this struct implements. - // Might take O(n^2) to process all of the oneofs, but who cares. - for _, of := range oneofFields { - if tptr.Implements(of.ityp) { - // We have found the corresponding interface for this struct. - // That lets us know where this struct should be stored - // when we encounter it during unmarshaling. - unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal) - u.setTag(fieldNum, of.field, unmarshal, 0, name) - } + // Find the oneof field that this struct implements. + // Might take O(n^2) to process all of the oneofs, but who cares. + for _, of := range oneofFields { + if tptr.Implements(of.ityp) { + // We have found the corresponding interface for this struct. + // That lets us know where this struct should be stored + // when we encounter it during unmarshaling. + unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal) + u.setTag(fieldNum, of.field, unmarshal, 0, name) } } + } // Get extension ranges, if any. - fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray") + fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray") if fn.IsValid() { if !u.extensions.IsValid() && !u.oldExtensions.IsValid() { panic("a message with extensions, but no extensions field in " + t.Name()) @@ -1948,7 +1950,7 @@ func encodeVarint(b []byte, x uint64) []byte { // If there is an error, it returns 0,0. func decodeVarint(b []byte) (uint64, int) { var x, y uint64 - if len(b) <= 0 { + if len(b) == 0 { goto bad } x = uint64(b[0]) diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go index e855b1f5c..1ded05bbe 100644 --- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go +++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/descriptor.proto -package descriptor // import "github.com/golang/protobuf/protoc-gen-go/descriptor" +package descriptor -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type FieldDescriptorProto_Type int32 @@ -72,6 +74,7 @@ var FieldDescriptorProto_Type_name = map[int32]string{ 17: "TYPE_SINT32", 18: "TYPE_SINT64", } + var FieldDescriptorProto_Type_value = map[string]int32{ "TYPE_DOUBLE": 1, "TYPE_FLOAT": 2, @@ -98,9 +101,11 @@ func (x FieldDescriptorProto_Type) Enum() *FieldDescriptorProto_Type { *p = x return p } + func (x FieldDescriptorProto_Type) String() string { return proto.EnumName(FieldDescriptorProto_Type_name, int32(x)) } + func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Type_value, data, "FieldDescriptorProto_Type") if err != nil { @@ -109,8 +114,9 @@ func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error { *x = FieldDescriptorProto_Type(value) return nil } + func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4, 0} + return fileDescriptor_e5baabe45344a177, []int{4, 0} } type FieldDescriptorProto_Label int32 @@ -127,6 +133,7 @@ var FieldDescriptorProto_Label_name = map[int32]string{ 2: "LABEL_REQUIRED", 3: "LABEL_REPEATED", } + var FieldDescriptorProto_Label_value = map[string]int32{ "LABEL_OPTIONAL": 1, "LABEL_REQUIRED": 2, @@ -138,9 +145,11 @@ func (x FieldDescriptorProto_Label) Enum() *FieldDescriptorProto_Label { *p = x return p } + func (x FieldDescriptorProto_Label) String() string { return proto.EnumName(FieldDescriptorProto_Label_name, int32(x)) } + func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Label_value, data, "FieldDescriptorProto_Label") if err != nil { @@ -149,8 +158,9 @@ func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error { *x = FieldDescriptorProto_Label(value) return nil } + func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4, 1} + return fileDescriptor_e5baabe45344a177, []int{4, 1} } // Generated classes can be optimized for speed or code size. @@ -168,6 +178,7 @@ var FileOptions_OptimizeMode_name = map[int32]string{ 2: "CODE_SIZE", 3: "LITE_RUNTIME", } + var FileOptions_OptimizeMode_value = map[string]int32{ "SPEED": 1, "CODE_SIZE": 2, @@ -179,9 +190,11 @@ func (x FileOptions_OptimizeMode) Enum() *FileOptions_OptimizeMode { *p = x return p } + func (x FileOptions_OptimizeMode) String() string { return proto.EnumName(FileOptions_OptimizeMode_name, int32(x)) } + func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FileOptions_OptimizeMode_value, data, "FileOptions_OptimizeMode") if err != nil { @@ -190,8 +203,9 @@ func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error { *x = FileOptions_OptimizeMode(value) return nil } + func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{10, 0} + return fileDescriptor_e5baabe45344a177, []int{10, 0} } type FieldOptions_CType int32 @@ -208,6 +222,7 @@ var FieldOptions_CType_name = map[int32]string{ 1: "CORD", 2: "STRING_PIECE", } + var FieldOptions_CType_value = map[string]int32{ "STRING": 0, "CORD": 1, @@ -219,9 +234,11 @@ func (x FieldOptions_CType) Enum() *FieldOptions_CType { *p = x return p } + func (x FieldOptions_CType) String() string { return proto.EnumName(FieldOptions_CType_name, int32(x)) } + func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldOptions_CType_value, data, "FieldOptions_CType") if err != nil { @@ -230,8 +247,9 @@ func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error { *x = FieldOptions_CType(value) return nil } + func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12, 0} + return fileDescriptor_e5baabe45344a177, []int{12, 0} } type FieldOptions_JSType int32 @@ -250,6 +268,7 @@ var FieldOptions_JSType_name = map[int32]string{ 1: "JS_STRING", 2: "JS_NUMBER", } + var FieldOptions_JSType_value = map[string]int32{ "JS_NORMAL": 0, "JS_STRING": 1, @@ -261,9 +280,11 @@ func (x FieldOptions_JSType) Enum() *FieldOptions_JSType { *p = x return p } + func (x FieldOptions_JSType) String() string { return proto.EnumName(FieldOptions_JSType_name, int32(x)) } + func (x *FieldOptions_JSType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldOptions_JSType_value, data, "FieldOptions_JSType") if err != nil { @@ -272,8 +293,9 @@ func (x *FieldOptions_JSType) UnmarshalJSON(data []byte) error { *x = FieldOptions_JSType(value) return nil } + func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12, 1} + return fileDescriptor_e5baabe45344a177, []int{12, 1} } // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, @@ -292,6 +314,7 @@ var MethodOptions_IdempotencyLevel_name = map[int32]string{ 1: "NO_SIDE_EFFECTS", 2: "IDEMPOTENT", } + var MethodOptions_IdempotencyLevel_value = map[string]int32{ "IDEMPOTENCY_UNKNOWN": 0, "NO_SIDE_EFFECTS": 1, @@ -303,9 +326,11 @@ func (x MethodOptions_IdempotencyLevel) Enum() *MethodOptions_IdempotencyLevel { *p = x return p } + func (x MethodOptions_IdempotencyLevel) String() string { return proto.EnumName(MethodOptions_IdempotencyLevel_name, int32(x)) } + func (x *MethodOptions_IdempotencyLevel) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(MethodOptions_IdempotencyLevel_value, data, "MethodOptions_IdempotencyLevel") if err != nil { @@ -314,8 +339,9 @@ func (x *MethodOptions_IdempotencyLevel) UnmarshalJSON(data []byte) error { *x = MethodOptions_IdempotencyLevel(value) return nil } + func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{17, 0} + return fileDescriptor_e5baabe45344a177, []int{17, 0} } // The protocol compiler can output a FileDescriptorSet containing the .proto @@ -331,16 +357,17 @@ func (m *FileDescriptorSet) Reset() { *m = FileDescriptorSet{} } func (m *FileDescriptorSet) String() string { return proto.CompactTextString(m) } func (*FileDescriptorSet) ProtoMessage() {} func (*FileDescriptorSet) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{0} + return fileDescriptor_e5baabe45344a177, []int{0} } + func (m *FileDescriptorSet) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FileDescriptorSet.Unmarshal(m, b) } func (m *FileDescriptorSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FileDescriptorSet.Marshal(b, m, deterministic) } -func (dst *FileDescriptorSet) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileDescriptorSet.Merge(dst, src) +func (m *FileDescriptorSet) XXX_Merge(src proto.Message) { + xxx_messageInfo_FileDescriptorSet.Merge(m, src) } func (m *FileDescriptorSet) XXX_Size() int { return xxx_messageInfo_FileDescriptorSet.Size(m) @@ -392,16 +419,17 @@ func (m *FileDescriptorProto) Reset() { *m = FileDescriptorProto{} } func (m *FileDescriptorProto) String() string { return proto.CompactTextString(m) } func (*FileDescriptorProto) ProtoMessage() {} func (*FileDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{1} + return fileDescriptor_e5baabe45344a177, []int{1} } + func (m *FileDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FileDescriptorProto.Unmarshal(m, b) } func (m *FileDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FileDescriptorProto.Marshal(b, m, deterministic) } -func (dst *FileDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileDescriptorProto.Merge(dst, src) +func (m *FileDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_FileDescriptorProto.Merge(m, src) } func (m *FileDescriptorProto) XXX_Size() int { return xxx_messageInfo_FileDescriptorProto.Size(m) @@ -519,16 +547,17 @@ func (m *DescriptorProto) Reset() { *m = DescriptorProto{} } func (m *DescriptorProto) String() string { return proto.CompactTextString(m) } func (*DescriptorProto) ProtoMessage() {} func (*DescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2} + return fileDescriptor_e5baabe45344a177, []int{2} } + func (m *DescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DescriptorProto.Unmarshal(m, b) } func (m *DescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DescriptorProto.Marshal(b, m, deterministic) } -func (dst *DescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_DescriptorProto.Merge(dst, src) +func (m *DescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_DescriptorProto.Merge(m, src) } func (m *DescriptorProto) XXX_Size() int { return xxx_messageInfo_DescriptorProto.Size(m) @@ -622,16 +651,17 @@ func (m *DescriptorProto_ExtensionRange) Reset() { *m = DescriptorProto_ func (m *DescriptorProto_ExtensionRange) String() string { return proto.CompactTextString(m) } func (*DescriptorProto_ExtensionRange) ProtoMessage() {} func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2, 0} + return fileDescriptor_e5baabe45344a177, []int{2, 0} } + func (m *DescriptorProto_ExtensionRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DescriptorProto_ExtensionRange.Unmarshal(m, b) } func (m *DescriptorProto_ExtensionRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DescriptorProto_ExtensionRange.Marshal(b, m, deterministic) } -func (dst *DescriptorProto_ExtensionRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_DescriptorProto_ExtensionRange.Merge(dst, src) +func (m *DescriptorProto_ExtensionRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_DescriptorProto_ExtensionRange.Merge(m, src) } func (m *DescriptorProto_ExtensionRange) XXX_Size() int { return xxx_messageInfo_DescriptorProto_ExtensionRange.Size(m) @@ -678,16 +708,17 @@ func (m *DescriptorProto_ReservedRange) Reset() { *m = DescriptorProto_R func (m *DescriptorProto_ReservedRange) String() string { return proto.CompactTextString(m) } func (*DescriptorProto_ReservedRange) ProtoMessage() {} func (*DescriptorProto_ReservedRange) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2, 1} + return fileDescriptor_e5baabe45344a177, []int{2, 1} } + func (m *DescriptorProto_ReservedRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DescriptorProto_ReservedRange.Unmarshal(m, b) } func (m *DescriptorProto_ReservedRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DescriptorProto_ReservedRange.Marshal(b, m, deterministic) } -func (dst *DescriptorProto_ReservedRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_DescriptorProto_ReservedRange.Merge(dst, src) +func (m *DescriptorProto_ReservedRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_DescriptorProto_ReservedRange.Merge(m, src) } func (m *DescriptorProto_ReservedRange) XXX_Size() int { return xxx_messageInfo_DescriptorProto_ReservedRange.Size(m) @@ -725,7 +756,7 @@ func (m *ExtensionRangeOptions) Reset() { *m = ExtensionRangeOptions{} } func (m *ExtensionRangeOptions) String() string { return proto.CompactTextString(m) } func (*ExtensionRangeOptions) ProtoMessage() {} func (*ExtensionRangeOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{3} + return fileDescriptor_e5baabe45344a177, []int{3} } var extRange_ExtensionRangeOptions = []proto.ExtensionRange{ @@ -735,14 +766,15 @@ var extRange_ExtensionRangeOptions = []proto.ExtensionRange{ func (*ExtensionRangeOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_ExtensionRangeOptions } + func (m *ExtensionRangeOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExtensionRangeOptions.Unmarshal(m, b) } func (m *ExtensionRangeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExtensionRangeOptions.Marshal(b, m, deterministic) } -func (dst *ExtensionRangeOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExtensionRangeOptions.Merge(dst, src) +func (m *ExtensionRangeOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExtensionRangeOptions.Merge(m, src) } func (m *ExtensionRangeOptions) XXX_Size() int { return xxx_messageInfo_ExtensionRangeOptions.Size(m) @@ -801,16 +833,17 @@ func (m *FieldDescriptorProto) Reset() { *m = FieldDescriptorProto{} } func (m *FieldDescriptorProto) String() string { return proto.CompactTextString(m) } func (*FieldDescriptorProto) ProtoMessage() {} func (*FieldDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4} + return fileDescriptor_e5baabe45344a177, []int{4} } + func (m *FieldDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FieldDescriptorProto.Unmarshal(m, b) } func (m *FieldDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FieldDescriptorProto.Marshal(b, m, deterministic) } -func (dst *FieldDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_FieldDescriptorProto.Merge(dst, src) +func (m *FieldDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_FieldDescriptorProto.Merge(m, src) } func (m *FieldDescriptorProto) XXX_Size() int { return xxx_messageInfo_FieldDescriptorProto.Size(m) @@ -904,16 +937,17 @@ func (m *OneofDescriptorProto) Reset() { *m = OneofDescriptorProto{} } func (m *OneofDescriptorProto) String() string { return proto.CompactTextString(m) } func (*OneofDescriptorProto) ProtoMessage() {} func (*OneofDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{5} + return fileDescriptor_e5baabe45344a177, []int{5} } + func (m *OneofDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OneofDescriptorProto.Unmarshal(m, b) } func (m *OneofDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_OneofDescriptorProto.Marshal(b, m, deterministic) } -func (dst *OneofDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_OneofDescriptorProto.Merge(dst, src) +func (m *OneofDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_OneofDescriptorProto.Merge(m, src) } func (m *OneofDescriptorProto) XXX_Size() int { return xxx_messageInfo_OneofDescriptorProto.Size(m) @@ -959,16 +993,17 @@ func (m *EnumDescriptorProto) Reset() { *m = EnumDescriptorProto{} } func (m *EnumDescriptorProto) String() string { return proto.CompactTextString(m) } func (*EnumDescriptorProto) ProtoMessage() {} func (*EnumDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{6} + return fileDescriptor_e5baabe45344a177, []int{6} } + func (m *EnumDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumDescriptorProto.Unmarshal(m, b) } func (m *EnumDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumDescriptorProto.Marshal(b, m, deterministic) } -func (dst *EnumDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumDescriptorProto.Merge(dst, src) +func (m *EnumDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumDescriptorProto.Merge(m, src) } func (m *EnumDescriptorProto) XXX_Size() int { return xxx_messageInfo_EnumDescriptorProto.Size(m) @@ -1032,16 +1067,17 @@ func (m *EnumDescriptorProto_EnumReservedRange) Reset() { *m = EnumDescr func (m *EnumDescriptorProto_EnumReservedRange) String() string { return proto.CompactTextString(m) } func (*EnumDescriptorProto_EnumReservedRange) ProtoMessage() {} func (*EnumDescriptorProto_EnumReservedRange) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{6, 0} + return fileDescriptor_e5baabe45344a177, []int{6, 0} } + func (m *EnumDescriptorProto_EnumReservedRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Unmarshal(m, b) } func (m *EnumDescriptorProto_EnumReservedRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Marshal(b, m, deterministic) } -func (dst *EnumDescriptorProto_EnumReservedRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Merge(dst, src) +func (m *EnumDescriptorProto_EnumReservedRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Merge(m, src) } func (m *EnumDescriptorProto_EnumReservedRange) XXX_Size() int { return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Size(m) @@ -1080,16 +1116,17 @@ func (m *EnumValueDescriptorProto) Reset() { *m = EnumValueDescriptorPro func (m *EnumValueDescriptorProto) String() string { return proto.CompactTextString(m) } func (*EnumValueDescriptorProto) ProtoMessage() {} func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{7} + return fileDescriptor_e5baabe45344a177, []int{7} } + func (m *EnumValueDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumValueDescriptorProto.Unmarshal(m, b) } func (m *EnumValueDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumValueDescriptorProto.Marshal(b, m, deterministic) } -func (dst *EnumValueDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumValueDescriptorProto.Merge(dst, src) +func (m *EnumValueDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumValueDescriptorProto.Merge(m, src) } func (m *EnumValueDescriptorProto) XXX_Size() int { return xxx_messageInfo_EnumValueDescriptorProto.Size(m) @@ -1135,16 +1172,17 @@ func (m *ServiceDescriptorProto) Reset() { *m = ServiceDescriptorProto{} func (m *ServiceDescriptorProto) String() string { return proto.CompactTextString(m) } func (*ServiceDescriptorProto) ProtoMessage() {} func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{8} + return fileDescriptor_e5baabe45344a177, []int{8} } + func (m *ServiceDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceDescriptorProto.Unmarshal(m, b) } func (m *ServiceDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServiceDescriptorProto.Marshal(b, m, deterministic) } -func (dst *ServiceDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServiceDescriptorProto.Merge(dst, src) +func (m *ServiceDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceDescriptorProto.Merge(m, src) } func (m *ServiceDescriptorProto) XXX_Size() int { return xxx_messageInfo_ServiceDescriptorProto.Size(m) @@ -1197,16 +1235,17 @@ func (m *MethodDescriptorProto) Reset() { *m = MethodDescriptorProto{} } func (m *MethodDescriptorProto) String() string { return proto.CompactTextString(m) } func (*MethodDescriptorProto) ProtoMessage() {} func (*MethodDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{9} + return fileDescriptor_e5baabe45344a177, []int{9} } + func (m *MethodDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MethodDescriptorProto.Unmarshal(m, b) } func (m *MethodDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MethodDescriptorProto.Marshal(b, m, deterministic) } -func (dst *MethodDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_MethodDescriptorProto.Merge(dst, src) +func (m *MethodDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_MethodDescriptorProto.Merge(m, src) } func (m *MethodDescriptorProto) XXX_Size() int { return xxx_messageInfo_MethodDescriptorProto.Size(m) @@ -1336,6 +1375,14 @@ type FileOptions struct { // is empty. When this option is empty, the package name will be used for // determining the namespace. PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"` + // Use this option to change the namespace of php generated metadata classes. + // Default is empty. When this option is empty, the proto file name will be used + // for determining the namespace. + PhpMetadataNamespace *string `protobuf:"bytes,44,opt,name=php_metadata_namespace,json=phpMetadataNamespace" json:"php_metadata_namespace,omitempty"` + // Use this option to change the package of ruby generated classes. Default + // is empty. When this option is not set, the package name will be used for + // determining the ruby package. + RubyPackage *string `protobuf:"bytes,45,opt,name=ruby_package,json=rubyPackage" json:"ruby_package,omitempty"` // The parser stores options it doesn't recognize here. // See the documentation for the "Options" section above. UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` @@ -1349,7 +1396,7 @@ func (m *FileOptions) Reset() { *m = FileOptions{} } func (m *FileOptions) String() string { return proto.CompactTextString(m) } func (*FileOptions) ProtoMessage() {} func (*FileOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{10} + return fileDescriptor_e5baabe45344a177, []int{10} } var extRange_FileOptions = []proto.ExtensionRange{ @@ -1359,14 +1406,15 @@ var extRange_FileOptions = []proto.ExtensionRange{ func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_FileOptions } + func (m *FileOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FileOptions.Unmarshal(m, b) } func (m *FileOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FileOptions.Marshal(b, m, deterministic) } -func (dst *FileOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileOptions.Merge(dst, src) +func (m *FileOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_FileOptions.Merge(m, src) } func (m *FileOptions) XXX_Size() int { return xxx_messageInfo_FileOptions.Size(m) @@ -1514,6 +1562,20 @@ func (m *FileOptions) GetPhpNamespace() string { return "" } +func (m *FileOptions) GetPhpMetadataNamespace() string { + if m != nil && m.PhpMetadataNamespace != nil { + return *m.PhpMetadataNamespace + } + return "" +} + +func (m *FileOptions) GetRubyPackage() string { + if m != nil && m.RubyPackage != nil { + return *m.RubyPackage + } + return "" +} + func (m *FileOptions) GetUninterpretedOption() []*UninterpretedOption { if m != nil { return m.UninterpretedOption @@ -1584,7 +1646,7 @@ func (m *MessageOptions) Reset() { *m = MessageOptions{} } func (m *MessageOptions) String() string { return proto.CompactTextString(m) } func (*MessageOptions) ProtoMessage() {} func (*MessageOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{11} + return fileDescriptor_e5baabe45344a177, []int{11} } var extRange_MessageOptions = []proto.ExtensionRange{ @@ -1594,14 +1656,15 @@ var extRange_MessageOptions = []proto.ExtensionRange{ func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_MessageOptions } + func (m *MessageOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageOptions.Unmarshal(m, b) } func (m *MessageOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageOptions.Marshal(b, m, deterministic) } -func (dst *MessageOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageOptions.Merge(dst, src) +func (m *MessageOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageOptions.Merge(m, src) } func (m *MessageOptions) XXX_Size() int { return xxx_messageInfo_MessageOptions.Size(m) @@ -1723,7 +1786,7 @@ func (m *FieldOptions) Reset() { *m = FieldOptions{} } func (m *FieldOptions) String() string { return proto.CompactTextString(m) } func (*FieldOptions) ProtoMessage() {} func (*FieldOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12} + return fileDescriptor_e5baabe45344a177, []int{12} } var extRange_FieldOptions = []proto.ExtensionRange{ @@ -1733,14 +1796,15 @@ var extRange_FieldOptions = []proto.ExtensionRange{ func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_FieldOptions } + func (m *FieldOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FieldOptions.Unmarshal(m, b) } func (m *FieldOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FieldOptions.Marshal(b, m, deterministic) } -func (dst *FieldOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_FieldOptions.Merge(dst, src) +func (m *FieldOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_FieldOptions.Merge(m, src) } func (m *FieldOptions) XXX_Size() int { return xxx_messageInfo_FieldOptions.Size(m) @@ -1819,7 +1883,7 @@ func (m *OneofOptions) Reset() { *m = OneofOptions{} } func (m *OneofOptions) String() string { return proto.CompactTextString(m) } func (*OneofOptions) ProtoMessage() {} func (*OneofOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{13} + return fileDescriptor_e5baabe45344a177, []int{13} } var extRange_OneofOptions = []proto.ExtensionRange{ @@ -1829,14 +1893,15 @@ var extRange_OneofOptions = []proto.ExtensionRange{ func (*OneofOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_OneofOptions } + func (m *OneofOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OneofOptions.Unmarshal(m, b) } func (m *OneofOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_OneofOptions.Marshal(b, m, deterministic) } -func (dst *OneofOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_OneofOptions.Merge(dst, src) +func (m *OneofOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_OneofOptions.Merge(m, src) } func (m *OneofOptions) XXX_Size() int { return xxx_messageInfo_OneofOptions.Size(m) @@ -1875,7 +1940,7 @@ func (m *EnumOptions) Reset() { *m = EnumOptions{} } func (m *EnumOptions) String() string { return proto.CompactTextString(m) } func (*EnumOptions) ProtoMessage() {} func (*EnumOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{14} + return fileDescriptor_e5baabe45344a177, []int{14} } var extRange_EnumOptions = []proto.ExtensionRange{ @@ -1885,14 +1950,15 @@ var extRange_EnumOptions = []proto.ExtensionRange{ func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_EnumOptions } + func (m *EnumOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumOptions.Unmarshal(m, b) } func (m *EnumOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumOptions.Marshal(b, m, deterministic) } -func (dst *EnumOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumOptions.Merge(dst, src) +func (m *EnumOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumOptions.Merge(m, src) } func (m *EnumOptions) XXX_Size() int { return xxx_messageInfo_EnumOptions.Size(m) @@ -1944,7 +2010,7 @@ func (m *EnumValueOptions) Reset() { *m = EnumValueOptions{} } func (m *EnumValueOptions) String() string { return proto.CompactTextString(m) } func (*EnumValueOptions) ProtoMessage() {} func (*EnumValueOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{15} + return fileDescriptor_e5baabe45344a177, []int{15} } var extRange_EnumValueOptions = []proto.ExtensionRange{ @@ -1954,14 +2020,15 @@ var extRange_EnumValueOptions = []proto.ExtensionRange{ func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_EnumValueOptions } + func (m *EnumValueOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumValueOptions.Unmarshal(m, b) } func (m *EnumValueOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumValueOptions.Marshal(b, m, deterministic) } -func (dst *EnumValueOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumValueOptions.Merge(dst, src) +func (m *EnumValueOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumValueOptions.Merge(m, src) } func (m *EnumValueOptions) XXX_Size() int { return xxx_messageInfo_EnumValueOptions.Size(m) @@ -2006,7 +2073,7 @@ func (m *ServiceOptions) Reset() { *m = ServiceOptions{} } func (m *ServiceOptions) String() string { return proto.CompactTextString(m) } func (*ServiceOptions) ProtoMessage() {} func (*ServiceOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{16} + return fileDescriptor_e5baabe45344a177, []int{16} } var extRange_ServiceOptions = []proto.ExtensionRange{ @@ -2016,14 +2083,15 @@ var extRange_ServiceOptions = []proto.ExtensionRange{ func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_ServiceOptions } + func (m *ServiceOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceOptions.Unmarshal(m, b) } func (m *ServiceOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServiceOptions.Marshal(b, m, deterministic) } -func (dst *ServiceOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServiceOptions.Merge(dst, src) +func (m *ServiceOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceOptions.Merge(m, src) } func (m *ServiceOptions) XXX_Size() int { return xxx_messageInfo_ServiceOptions.Size(m) @@ -2069,7 +2137,7 @@ func (m *MethodOptions) Reset() { *m = MethodOptions{} } func (m *MethodOptions) String() string { return proto.CompactTextString(m) } func (*MethodOptions) ProtoMessage() {} func (*MethodOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{17} + return fileDescriptor_e5baabe45344a177, []int{17} } var extRange_MethodOptions = []proto.ExtensionRange{ @@ -2079,14 +2147,15 @@ var extRange_MethodOptions = []proto.ExtensionRange{ func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_MethodOptions } + func (m *MethodOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MethodOptions.Unmarshal(m, b) } func (m *MethodOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MethodOptions.Marshal(b, m, deterministic) } -func (dst *MethodOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_MethodOptions.Merge(dst, src) +func (m *MethodOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_MethodOptions.Merge(m, src) } func (m *MethodOptions) XXX_Size() int { return xxx_messageInfo_MethodOptions.Size(m) @@ -2146,16 +2215,17 @@ func (m *UninterpretedOption) Reset() { *m = UninterpretedOption{} } func (m *UninterpretedOption) String() string { return proto.CompactTextString(m) } func (*UninterpretedOption) ProtoMessage() {} func (*UninterpretedOption) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{18} + return fileDescriptor_e5baabe45344a177, []int{18} } + func (m *UninterpretedOption) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UninterpretedOption.Unmarshal(m, b) } func (m *UninterpretedOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UninterpretedOption.Marshal(b, m, deterministic) } -func (dst *UninterpretedOption) XXX_Merge(src proto.Message) { - xxx_messageInfo_UninterpretedOption.Merge(dst, src) +func (m *UninterpretedOption) XXX_Merge(src proto.Message) { + xxx_messageInfo_UninterpretedOption.Merge(m, src) } func (m *UninterpretedOption) XXX_Size() int { return xxx_messageInfo_UninterpretedOption.Size(m) @@ -2232,16 +2302,17 @@ func (m *UninterpretedOption_NamePart) Reset() { *m = UninterpretedOptio func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) } func (*UninterpretedOption_NamePart) ProtoMessage() {} func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{18, 0} + return fileDescriptor_e5baabe45344a177, []int{18, 0} } + func (m *UninterpretedOption_NamePart) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UninterpretedOption_NamePart.Unmarshal(m, b) } func (m *UninterpretedOption_NamePart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UninterpretedOption_NamePart.Marshal(b, m, deterministic) } -func (dst *UninterpretedOption_NamePart) XXX_Merge(src proto.Message) { - xxx_messageInfo_UninterpretedOption_NamePart.Merge(dst, src) +func (m *UninterpretedOption_NamePart) XXX_Merge(src proto.Message) { + xxx_messageInfo_UninterpretedOption_NamePart.Merge(m, src) } func (m *UninterpretedOption_NamePart) XXX_Size() int { return xxx_messageInfo_UninterpretedOption_NamePart.Size(m) @@ -2322,16 +2393,17 @@ func (m *SourceCodeInfo) Reset() { *m = SourceCodeInfo{} } func (m *SourceCodeInfo) String() string { return proto.CompactTextString(m) } func (*SourceCodeInfo) ProtoMessage() {} func (*SourceCodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{19} + return fileDescriptor_e5baabe45344a177, []int{19} } + func (m *SourceCodeInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SourceCodeInfo.Unmarshal(m, b) } func (m *SourceCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SourceCodeInfo.Marshal(b, m, deterministic) } -func (dst *SourceCodeInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_SourceCodeInfo.Merge(dst, src) +func (m *SourceCodeInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_SourceCodeInfo.Merge(m, src) } func (m *SourceCodeInfo) XXX_Size() int { return xxx_messageInfo_SourceCodeInfo.Size(m) @@ -2439,16 +2511,17 @@ func (m *SourceCodeInfo_Location) Reset() { *m = SourceCodeInfo_Location func (m *SourceCodeInfo_Location) String() string { return proto.CompactTextString(m) } func (*SourceCodeInfo_Location) ProtoMessage() {} func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{19, 0} + return fileDescriptor_e5baabe45344a177, []int{19, 0} } + func (m *SourceCodeInfo_Location) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SourceCodeInfo_Location.Unmarshal(m, b) } func (m *SourceCodeInfo_Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SourceCodeInfo_Location.Marshal(b, m, deterministic) } -func (dst *SourceCodeInfo_Location) XXX_Merge(src proto.Message) { - xxx_messageInfo_SourceCodeInfo_Location.Merge(dst, src) +func (m *SourceCodeInfo_Location) XXX_Merge(src proto.Message) { + xxx_messageInfo_SourceCodeInfo_Location.Merge(m, src) } func (m *SourceCodeInfo_Location) XXX_Size() int { return xxx_messageInfo_SourceCodeInfo_Location.Size(m) @@ -2510,16 +2583,17 @@ func (m *GeneratedCodeInfo) Reset() { *m = GeneratedCodeInfo{} } func (m *GeneratedCodeInfo) String() string { return proto.CompactTextString(m) } func (*GeneratedCodeInfo) ProtoMessage() {} func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{20} + return fileDescriptor_e5baabe45344a177, []int{20} } + func (m *GeneratedCodeInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GeneratedCodeInfo.Unmarshal(m, b) } func (m *GeneratedCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GeneratedCodeInfo.Marshal(b, m, deterministic) } -func (dst *GeneratedCodeInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_GeneratedCodeInfo.Merge(dst, src) +func (m *GeneratedCodeInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_GeneratedCodeInfo.Merge(m, src) } func (m *GeneratedCodeInfo) XXX_Size() int { return xxx_messageInfo_GeneratedCodeInfo.Size(m) @@ -2559,16 +2633,17 @@ func (m *GeneratedCodeInfo_Annotation) Reset() { *m = GeneratedCodeInfo_ func (m *GeneratedCodeInfo_Annotation) String() string { return proto.CompactTextString(m) } func (*GeneratedCodeInfo_Annotation) ProtoMessage() {} func (*GeneratedCodeInfo_Annotation) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{20, 0} + return fileDescriptor_e5baabe45344a177, []int{20, 0} } + func (m *GeneratedCodeInfo_Annotation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GeneratedCodeInfo_Annotation.Unmarshal(m, b) } func (m *GeneratedCodeInfo_Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GeneratedCodeInfo_Annotation.Marshal(b, m, deterministic) } -func (dst *GeneratedCodeInfo_Annotation) XXX_Merge(src proto.Message) { - xxx_messageInfo_GeneratedCodeInfo_Annotation.Merge(dst, src) +func (m *GeneratedCodeInfo_Annotation) XXX_Merge(src proto.Message) { + xxx_messageInfo_GeneratedCodeInfo_Annotation.Merge(m, src) } func (m *GeneratedCodeInfo_Annotation) XXX_Size() int { return xxx_messageInfo_GeneratedCodeInfo_Annotation.Size(m) @@ -2608,6 +2683,12 @@ func (m *GeneratedCodeInfo_Annotation) GetEnd() int32 { } func init() { + proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value) + proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value) + proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value) + proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value) + proto.RegisterEnum("google.protobuf.FieldOptions_JSType", FieldOptions_JSType_name, FieldOptions_JSType_value) + proto.RegisterEnum("google.protobuf.MethodOptions_IdempotencyLevel", MethodOptions_IdempotencyLevel_name, MethodOptions_IdempotencyLevel_value) proto.RegisterType((*FileDescriptorSet)(nil), "google.protobuf.FileDescriptorSet") proto.RegisterType((*FileDescriptorProto)(nil), "google.protobuf.FileDescriptorProto") proto.RegisterType((*DescriptorProto)(nil), "google.protobuf.DescriptorProto") @@ -2635,178 +2716,172 @@ func init() { proto.RegisterType((*SourceCodeInfo_Location)(nil), "google.protobuf.SourceCodeInfo.Location") proto.RegisterType((*GeneratedCodeInfo)(nil), "google.protobuf.GeneratedCodeInfo") proto.RegisterType((*GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation") - proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value) - proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value) - proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value) - proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value) - proto.RegisterEnum("google.protobuf.FieldOptions_JSType", FieldOptions_JSType_name, FieldOptions_JSType_value) - proto.RegisterEnum("google.protobuf.MethodOptions_IdempotencyLevel", MethodOptions_IdempotencyLevel_name, MethodOptions_IdempotencyLevel_value) } -func init() { - proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_descriptor_4df4cb5f42392df6) -} - -var fileDescriptor_descriptor_4df4cb5f42392df6 = []byte{ - // 2555 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6e, 0x1b, 0xc7, - 0xf5, 0xcf, 0xf2, 0x4b, 0xe4, 0x21, 0x45, 0x8d, 0x46, 0x8a, 0xbd, 0x56, 0x3e, 0x2c, 0x33, 0x1f, - 0x96, 0x9d, 0x7f, 0xa8, 0xc0, 0xb1, 0x1d, 0x47, 0xfe, 0x23, 0x2d, 0x45, 0xae, 0x15, 0xaa, 0x12, - 0xc9, 0x2e, 0xa9, 0xe6, 0x03, 0x28, 0x16, 0xa3, 0xdd, 0x21, 0xb9, 0xf6, 0x72, 0x77, 0xb3, 0xbb, - 0xb4, 0xad, 0xa0, 0x17, 0x06, 0x7a, 0xd5, 0xab, 0xde, 0x16, 0x45, 0xd1, 0x8b, 0xde, 0x04, 0xe8, - 0x03, 0x14, 0xc8, 0x5d, 0x9f, 0xa0, 0x40, 0xde, 0xa0, 0x68, 0x0b, 0xb4, 0x8f, 0xd0, 0xcb, 0x62, - 0x66, 0x76, 0x97, 0xbb, 0x24, 0x15, 0x2b, 0x01, 0xe2, 0x5c, 0x91, 0xf3, 0x9b, 0xdf, 0x39, 0x73, - 0xe6, 0xcc, 0x99, 0x33, 0x67, 0x66, 0x61, 0x7b, 0xe4, 0x38, 0x23, 0x8b, 0xee, 0xba, 0x9e, 0x13, - 0x38, 0xa7, 0xd3, 0xe1, 0xae, 0x41, 0x7d, 0xdd, 0x33, 0xdd, 0xc0, 0xf1, 0xea, 0x1c, 0xc3, 0x6b, - 0x82, 0x51, 0x8f, 0x18, 0xb5, 0x63, 0x58, 0x7f, 0x60, 0x5a, 0xb4, 0x15, 0x13, 0xfb, 0x34, 0xc0, - 0xf7, 0x20, 0x37, 0x34, 0x2d, 0x2a, 0x4b, 0xdb, 0xd9, 0x9d, 0xf2, 0xad, 0x37, 0xeb, 0x73, 0x42, - 0xf5, 0xb4, 0x44, 0x8f, 0xc1, 0x2a, 0x97, 0xa8, 0xfd, 0x2b, 0x07, 0x1b, 0x4b, 0x7a, 0x31, 0x86, - 0x9c, 0x4d, 0x26, 0x4c, 0xa3, 0xb4, 0x53, 0x52, 0xf9, 0x7f, 0x2c, 0xc3, 0x8a, 0x4b, 0xf4, 0x47, - 0x64, 0x44, 0xe5, 0x0c, 0x87, 0xa3, 0x26, 0x7e, 0x1d, 0xc0, 0xa0, 0x2e, 0xb5, 0x0d, 0x6a, 0xeb, - 0x67, 0x72, 0x76, 0x3b, 0xbb, 0x53, 0x52, 0x13, 0x08, 0x7e, 0x07, 0xd6, 0xdd, 0xe9, 0xa9, 0x65, - 0xea, 0x5a, 0x82, 0x06, 0xdb, 0xd9, 0x9d, 0xbc, 0x8a, 0x44, 0x47, 0x6b, 0x46, 0xbe, 0x0e, 0x6b, - 0x4f, 0x28, 0x79, 0x94, 0xa4, 0x96, 0x39, 0xb5, 0xca, 0xe0, 0x04, 0xb1, 0x09, 0x95, 0x09, 0xf5, - 0x7d, 0x32, 0xa2, 0x5a, 0x70, 0xe6, 0x52, 0x39, 0xc7, 0x67, 0xbf, 0xbd, 0x30, 0xfb, 0xf9, 0x99, - 0x97, 0x43, 0xa9, 0xc1, 0x99, 0x4b, 0x71, 0x03, 0x4a, 0xd4, 0x9e, 0x4e, 0x84, 0x86, 0xfc, 0x39, - 0xfe, 0x53, 0xec, 0xe9, 0x64, 0x5e, 0x4b, 0x91, 0x89, 0x85, 0x2a, 0x56, 0x7c, 0xea, 0x3d, 0x36, - 0x75, 0x2a, 0x17, 0xb8, 0x82, 0xeb, 0x0b, 0x0a, 0xfa, 0xa2, 0x7f, 0x5e, 0x47, 0x24, 0x87, 0x9b, - 0x50, 0xa2, 0x4f, 0x03, 0x6a, 0xfb, 0xa6, 0x63, 0xcb, 0x2b, 0x5c, 0xc9, 0x5b, 0x4b, 0x56, 0x91, - 0x5a, 0xc6, 0xbc, 0x8a, 0x99, 0x1c, 0xbe, 0x0b, 0x2b, 0x8e, 0x1b, 0x98, 0x8e, 0xed, 0xcb, 0xc5, - 0x6d, 0x69, 0xa7, 0x7c, 0xeb, 0xd5, 0xa5, 0x81, 0xd0, 0x15, 0x1c, 0x35, 0x22, 0xe3, 0x36, 0x20, - 0xdf, 0x99, 0x7a, 0x3a, 0xd5, 0x74, 0xc7, 0xa0, 0x9a, 0x69, 0x0f, 0x1d, 0xb9, 0xc4, 0x15, 0x5c, - 0x5d, 0x9c, 0x08, 0x27, 0x36, 0x1d, 0x83, 0xb6, 0xed, 0xa1, 0xa3, 0x56, 0xfd, 0x54, 0x1b, 0x5f, - 0x82, 0x82, 0x7f, 0x66, 0x07, 0xe4, 0xa9, 0x5c, 0xe1, 0x11, 0x12, 0xb6, 0x6a, 0x5f, 0x17, 0x60, - 0xed, 0x22, 0x21, 0x76, 0x1f, 0xf2, 0x43, 0x36, 0x4b, 0x39, 0xf3, 0x5d, 0x7c, 0x20, 0x64, 0xd2, - 0x4e, 0x2c, 0x7c, 0x4f, 0x27, 0x36, 0xa0, 0x6c, 0x53, 0x3f, 0xa0, 0x86, 0x88, 0x88, 0xec, 0x05, - 0x63, 0x0a, 0x84, 0xd0, 0x62, 0x48, 0xe5, 0xbe, 0x57, 0x48, 0x7d, 0x0a, 0x6b, 0xb1, 0x49, 0x9a, - 0x47, 0xec, 0x51, 0x14, 0x9b, 0xbb, 0xcf, 0xb3, 0xa4, 0xae, 0x44, 0x72, 0x2a, 0x13, 0x53, 0xab, - 0x34, 0xd5, 0xc6, 0x2d, 0x00, 0xc7, 0xa6, 0xce, 0x50, 0x33, 0xa8, 0x6e, 0xc9, 0xc5, 0x73, 0xbc, - 0xd4, 0x65, 0x94, 0x05, 0x2f, 0x39, 0x02, 0xd5, 0x2d, 0xfc, 0xe1, 0x2c, 0xd4, 0x56, 0xce, 0x89, - 0x94, 0x63, 0xb1, 0xc9, 0x16, 0xa2, 0xed, 0x04, 0xaa, 0x1e, 0x65, 0x71, 0x4f, 0x8d, 0x70, 0x66, - 0x25, 0x6e, 0x44, 0xfd, 0xb9, 0x33, 0x53, 0x43, 0x31, 0x31, 0xb1, 0x55, 0x2f, 0xd9, 0xc4, 0x6f, - 0x40, 0x0c, 0x68, 0x3c, 0xac, 0x80, 0x67, 0xa1, 0x4a, 0x04, 0x76, 0xc8, 0x84, 0x6e, 0x7d, 0x09, - 0xd5, 0xb4, 0x7b, 0xf0, 0x26, 0xe4, 0xfd, 0x80, 0x78, 0x01, 0x8f, 0xc2, 0xbc, 0x2a, 0x1a, 0x18, - 0x41, 0x96, 0xda, 0x06, 0xcf, 0x72, 0x79, 0x95, 0xfd, 0xc5, 0x3f, 0x9d, 0x4d, 0x38, 0xcb, 0x27, - 0xfc, 0xf6, 0xe2, 0x8a, 0xa6, 0x34, 0xcf, 0xcf, 0x7b, 0xeb, 0x03, 0x58, 0x4d, 0x4d, 0xe0, 0xa2, - 0x43, 0xd7, 0x7e, 0x05, 0x2f, 0x2f, 0x55, 0x8d, 0x3f, 0x85, 0xcd, 0xa9, 0x6d, 0xda, 0x01, 0xf5, - 0x5c, 0x8f, 0xb2, 0x88, 0x15, 0x43, 0xc9, 0xff, 0x5e, 0x39, 0x27, 0xe6, 0x4e, 0x92, 0x6c, 0xa1, - 0x45, 0xdd, 0x98, 0x2e, 0x82, 0x37, 0x4b, 0xc5, 0xff, 0xac, 0xa0, 0x67, 0xcf, 0x9e, 0x3d, 0xcb, - 0xd4, 0x7e, 0x57, 0x80, 0xcd, 0x65, 0x7b, 0x66, 0xe9, 0xf6, 0xbd, 0x04, 0x05, 0x7b, 0x3a, 0x39, - 0xa5, 0x1e, 0x77, 0x52, 0x5e, 0x0d, 0x5b, 0xb8, 0x01, 0x79, 0x8b, 0x9c, 0x52, 0x4b, 0xce, 0x6d, - 0x4b, 0x3b, 0xd5, 0x5b, 0xef, 0x5c, 0x68, 0x57, 0xd6, 0x8f, 0x98, 0x88, 0x2a, 0x24, 0xf1, 0x47, - 0x90, 0x0b, 0x53, 0x34, 0xd3, 0x70, 0xf3, 0x62, 0x1a, 0xd8, 0x5e, 0x52, 0xb9, 0x1c, 0x7e, 0x05, - 0x4a, 0xec, 0x57, 0xc4, 0x46, 0x81, 0xdb, 0x5c, 0x64, 0x00, 0x8b, 0x0b, 0xbc, 0x05, 0x45, 0xbe, - 0x4d, 0x0c, 0x1a, 0x1d, 0x6d, 0x71, 0x9b, 0x05, 0x96, 0x41, 0x87, 0x64, 0x6a, 0x05, 0xda, 0x63, - 0x62, 0x4d, 0x29, 0x0f, 0xf8, 0x92, 0x5a, 0x09, 0xc1, 0x5f, 0x30, 0x0c, 0x5f, 0x85, 0xb2, 0xd8, - 0x55, 0xa6, 0x6d, 0xd0, 0xa7, 0x3c, 0x7b, 0xe6, 0x55, 0xb1, 0xd1, 0xda, 0x0c, 0x61, 0xc3, 0x3f, - 0xf4, 0x1d, 0x3b, 0x0a, 0x4d, 0x3e, 0x04, 0x03, 0xf8, 0xf0, 0x1f, 0xcc, 0x27, 0xee, 0xd7, 0x96, - 0x4f, 0x6f, 0x3e, 0xa6, 0x6a, 0x7f, 0xc9, 0x40, 0x8e, 0xe7, 0x8b, 0x35, 0x28, 0x0f, 0x3e, 0xeb, - 0x29, 0x5a, 0xab, 0x7b, 0xb2, 0x7f, 0xa4, 0x20, 0x09, 0x57, 0x01, 0x38, 0xf0, 0xe0, 0xa8, 0xdb, - 0x18, 0xa0, 0x4c, 0xdc, 0x6e, 0x77, 0x06, 0x77, 0x6f, 0xa3, 0x6c, 0x2c, 0x70, 0x22, 0x80, 0x5c, - 0x92, 0xf0, 0xfe, 0x2d, 0x94, 0xc7, 0x08, 0x2a, 0x42, 0x41, 0xfb, 0x53, 0xa5, 0x75, 0xf7, 0x36, - 0x2a, 0xa4, 0x91, 0xf7, 0x6f, 0xa1, 0x15, 0xbc, 0x0a, 0x25, 0x8e, 0xec, 0x77, 0xbb, 0x47, 0xa8, - 0x18, 0xeb, 0xec, 0x0f, 0xd4, 0x76, 0xe7, 0x00, 0x95, 0x62, 0x9d, 0x07, 0x6a, 0xf7, 0xa4, 0x87, - 0x20, 0xd6, 0x70, 0xac, 0xf4, 0xfb, 0x8d, 0x03, 0x05, 0x95, 0x63, 0xc6, 0xfe, 0x67, 0x03, 0xa5, - 0x8f, 0x2a, 0x29, 0xb3, 0xde, 0xbf, 0x85, 0x56, 0xe3, 0x21, 0x94, 0xce, 0xc9, 0x31, 0xaa, 0xe2, - 0x75, 0x58, 0x15, 0x43, 0x44, 0x46, 0xac, 0xcd, 0x41, 0x77, 0x6f, 0x23, 0x34, 0x33, 0x44, 0x68, - 0x59, 0x4f, 0x01, 0x77, 0x6f, 0x23, 0x5c, 0x6b, 0x42, 0x9e, 0x47, 0x17, 0xc6, 0x50, 0x3d, 0x6a, - 0xec, 0x2b, 0x47, 0x5a, 0xb7, 0x37, 0x68, 0x77, 0x3b, 0x8d, 0x23, 0x24, 0xcd, 0x30, 0x55, 0xf9, - 0xf9, 0x49, 0x5b, 0x55, 0x5a, 0x28, 0x93, 0xc4, 0x7a, 0x4a, 0x63, 0xa0, 0xb4, 0x50, 0xb6, 0xa6, - 0xc3, 0xe6, 0xb2, 0x3c, 0xb9, 0x74, 0x67, 0x24, 0x96, 0x38, 0x73, 0xce, 0x12, 0x73, 0x5d, 0x0b, - 0x4b, 0xfc, 0xcf, 0x0c, 0x6c, 0x2c, 0x39, 0x2b, 0x96, 0x0e, 0xf2, 0x13, 0xc8, 0x8b, 0x10, 0x15, - 0xa7, 0xe7, 0x8d, 0xa5, 0x87, 0x0e, 0x0f, 0xd8, 0x85, 0x13, 0x94, 0xcb, 0x25, 0x2b, 0x88, 0xec, - 0x39, 0x15, 0x04, 0x53, 0xb1, 0x90, 0xd3, 0x7f, 0xb9, 0x90, 0xd3, 0xc5, 0xb1, 0x77, 0xf7, 0x22, - 0xc7, 0x1e, 0xc7, 0xbe, 0x5b, 0x6e, 0xcf, 0x2f, 0xc9, 0xed, 0xf7, 0x61, 0x7d, 0x41, 0xd1, 0x85, - 0x73, 0xec, 0xaf, 0x25, 0x90, 0xcf, 0x73, 0xce, 0x73, 0x32, 0x5d, 0x26, 0x95, 0xe9, 0xee, 0xcf, - 0x7b, 0xf0, 0xda, 0xf9, 0x8b, 0xb0, 0xb0, 0xd6, 0x5f, 0x49, 0x70, 0x69, 0x79, 0xa5, 0xb8, 0xd4, - 0x86, 0x8f, 0xa0, 0x30, 0xa1, 0xc1, 0xd8, 0x89, 0xaa, 0xa5, 0xb7, 0x97, 0x9c, 0xc1, 0xac, 0x7b, - 0x7e, 0xb1, 0x43, 0xa9, 0xe4, 0x21, 0x9e, 0x3d, 0xaf, 0xdc, 0x13, 0xd6, 0x2c, 0x58, 0xfa, 0x9b, - 0x0c, 0xbc, 0xbc, 0x54, 0xf9, 0x52, 0x43, 0x5f, 0x03, 0x30, 0x6d, 0x77, 0x1a, 0x88, 0x8a, 0x48, - 0x24, 0xd8, 0x12, 0x47, 0x78, 0xf2, 0x62, 0xc9, 0x73, 0x1a, 0xc4, 0xfd, 0x59, 0xde, 0x0f, 0x02, - 0xe2, 0x84, 0x7b, 0x33, 0x43, 0x73, 0xdc, 0xd0, 0xd7, 0xcf, 0x99, 0xe9, 0x42, 0x60, 0xbe, 0x07, - 0x48, 0xb7, 0x4c, 0x6a, 0x07, 0x9a, 0x1f, 0x78, 0x94, 0x4c, 0x4c, 0x7b, 0xc4, 0x4f, 0x90, 0xe2, - 0x5e, 0x7e, 0x48, 0x2c, 0x9f, 0xaa, 0x6b, 0xa2, 0xbb, 0x1f, 0xf5, 0x32, 0x09, 0x1e, 0x40, 0x5e, - 0x42, 0xa2, 0x90, 0x92, 0x10, 0xdd, 0xb1, 0x44, 0xed, 0xeb, 0x22, 0x94, 0x13, 0x75, 0x35, 0xbe, - 0x06, 0x95, 0x87, 0xe4, 0x31, 0xd1, 0xa2, 0xbb, 0x92, 0xf0, 0x44, 0x99, 0x61, 0xbd, 0xf0, 0xbe, - 0xf4, 0x1e, 0x6c, 0x72, 0x8a, 0x33, 0x0d, 0xa8, 0xa7, 0xe9, 0x16, 0xf1, 0x7d, 0xee, 0xb4, 0x22, - 0xa7, 0x62, 0xd6, 0xd7, 0x65, 0x5d, 0xcd, 0xa8, 0x07, 0xdf, 0x81, 0x0d, 0x2e, 0x31, 0x99, 0x5a, - 0x81, 0xe9, 0x5a, 0x54, 0x63, 0xb7, 0x37, 0x9f, 0x9f, 0x24, 0xb1, 0x65, 0xeb, 0x8c, 0x71, 0x1c, - 0x12, 0x98, 0x45, 0x3e, 0x6e, 0xc1, 0x6b, 0x5c, 0x6c, 0x44, 0x6d, 0xea, 0x91, 0x80, 0x6a, 0xf4, - 0x8b, 0x29, 0xb1, 0x7c, 0x8d, 0xd8, 0x86, 0x36, 0x26, 0xfe, 0x58, 0xde, 0x64, 0x0a, 0xf6, 0x33, - 0xb2, 0xa4, 0x5e, 0x61, 0xc4, 0x83, 0x90, 0xa7, 0x70, 0x5a, 0xc3, 0x36, 0x3e, 0x26, 0xfe, 0x18, - 0xef, 0xc1, 0x25, 0xae, 0xc5, 0x0f, 0x3c, 0xd3, 0x1e, 0x69, 0xfa, 0x98, 0xea, 0x8f, 0xb4, 0x69, - 0x30, 0xbc, 0x27, 0xbf, 0x92, 0x1c, 0x9f, 0x5b, 0xd8, 0xe7, 0x9c, 0x26, 0xa3, 0x9c, 0x04, 0xc3, - 0x7b, 0xb8, 0x0f, 0x15, 0xb6, 0x18, 0x13, 0xf3, 0x4b, 0xaa, 0x0d, 0x1d, 0x8f, 0x1f, 0x8d, 0xd5, - 0x25, 0xa9, 0x29, 0xe1, 0xc1, 0x7a, 0x37, 0x14, 0x38, 0x76, 0x0c, 0xba, 0x97, 0xef, 0xf7, 0x14, - 0xa5, 0xa5, 0x96, 0x23, 0x2d, 0x0f, 0x1c, 0x8f, 0x05, 0xd4, 0xc8, 0x89, 0x1d, 0x5c, 0x16, 0x01, - 0x35, 0x72, 0x22, 0xf7, 0xde, 0x81, 0x0d, 0x5d, 0x17, 0x73, 0x36, 0x75, 0x2d, 0xbc, 0x63, 0xf9, - 0x32, 0x4a, 0x39, 0x4b, 0xd7, 0x0f, 0x04, 0x21, 0x8c, 0x71, 0x1f, 0x7f, 0x08, 0x2f, 0xcf, 0x9c, - 0x95, 0x14, 0x5c, 0x5f, 0x98, 0xe5, 0xbc, 0xe8, 0x1d, 0xd8, 0x70, 0xcf, 0x16, 0x05, 0x71, 0x6a, - 0x44, 0xf7, 0x6c, 0x5e, 0xec, 0x03, 0xd8, 0x74, 0xc7, 0xee, 0xa2, 0xdc, 0xcd, 0xa4, 0x1c, 0x76, - 0xc7, 0xee, 0xbc, 0xe0, 0x5b, 0xfc, 0xc2, 0xed, 0x51, 0x9d, 0x04, 0xd4, 0x90, 0x2f, 0x27, 0xe9, - 0x89, 0x0e, 0xbc, 0x0b, 0x48, 0xd7, 0x35, 0x6a, 0x93, 0x53, 0x8b, 0x6a, 0xc4, 0xa3, 0x36, 0xf1, - 0xe5, 0xab, 0x49, 0x72, 0x55, 0xd7, 0x15, 0xde, 0xdb, 0xe0, 0x9d, 0xf8, 0x26, 0xac, 0x3b, 0xa7, - 0x0f, 0x75, 0x11, 0x92, 0x9a, 0xeb, 0xd1, 0xa1, 0xf9, 0x54, 0x7e, 0x93, 0xfb, 0x77, 0x8d, 0x75, - 0xf0, 0x80, 0xec, 0x71, 0x18, 0xdf, 0x00, 0xa4, 0xfb, 0x63, 0xe2, 0xb9, 0x3c, 0x27, 0xfb, 0x2e, - 0xd1, 0xa9, 0xfc, 0x96, 0xa0, 0x0a, 0xbc, 0x13, 0xc1, 0x6c, 0x4b, 0xf8, 0x4f, 0xcc, 0x61, 0x10, - 0x69, 0xbc, 0x2e, 0xb6, 0x04, 0xc7, 0x42, 0x6d, 0x3b, 0x80, 0x98, 0x2b, 0x52, 0x03, 0xef, 0x70, - 0x5a, 0xd5, 0x1d, 0xbb, 0xc9, 0x71, 0xdf, 0x80, 0x55, 0xc6, 0x9c, 0x0d, 0x7a, 0x43, 0x14, 0x64, - 0xee, 0x38, 0x31, 0xe2, 0x0f, 0x56, 0x1b, 0xd7, 0xf6, 0xa0, 0x92, 0x8c, 0x4f, 0x5c, 0x02, 0x11, - 0xa1, 0x48, 0x62, 0xc5, 0x4a, 0xb3, 0xdb, 0x62, 0x65, 0xc6, 0xe7, 0x0a, 0xca, 0xb0, 0x72, 0xe7, - 0xa8, 0x3d, 0x50, 0x34, 0xf5, 0xa4, 0x33, 0x68, 0x1f, 0x2b, 0x28, 0x9b, 0xa8, 0xab, 0x0f, 0x73, - 0xc5, 0xb7, 0xd1, 0xf5, 0xda, 0x37, 0x19, 0xa8, 0xa6, 0x2f, 0x4a, 0xf8, 0xff, 0xe1, 0x72, 0xf4, - 0xaa, 0xe1, 0xd3, 0x40, 0x7b, 0x62, 0x7a, 0x7c, 0xe3, 0x4c, 0x88, 0x38, 0xc4, 0xe2, 0xa5, 0xdb, - 0x0c, 0x59, 0x7d, 0x1a, 0x7c, 0x62, 0x7a, 0x6c, 0x5b, 0x4c, 0x48, 0x80, 0x8f, 0xe0, 0xaa, 0xed, - 0x68, 0x7e, 0x40, 0x6c, 0x83, 0x78, 0x86, 0x36, 0x7b, 0x4f, 0xd2, 0x88, 0xae, 0x53, 0xdf, 0x77, - 0xc4, 0x81, 0x15, 0x6b, 0x79, 0xd5, 0x76, 0xfa, 0x21, 0x79, 0x96, 0xc9, 0x1b, 0x21, 0x75, 0x2e, - 0xcc, 0xb2, 0xe7, 0x85, 0xd9, 0x2b, 0x50, 0x9a, 0x10, 0x57, 0xa3, 0x76, 0xe0, 0x9d, 0xf1, 0xf2, - 0xb8, 0xa8, 0x16, 0x27, 0xc4, 0x55, 0x58, 0xfb, 0x85, 0xdc, 0x52, 0x0e, 0x73, 0xc5, 0x22, 0x2a, - 0x1d, 0xe6, 0x8a, 0x25, 0x04, 0xb5, 0x7f, 0x64, 0xa1, 0x92, 0x2c, 0x97, 0xd9, 0xed, 0x43, 0xe7, - 0x27, 0x8b, 0xc4, 0x73, 0xcf, 0x1b, 0xdf, 0x5a, 0x5c, 0xd7, 0x9b, 0xec, 0xc8, 0xd9, 0x2b, 0x88, - 0x22, 0x56, 0x15, 0x92, 0xec, 0xb8, 0x67, 0xd9, 0x86, 0x8a, 0xa2, 0xa1, 0xa8, 0x86, 0x2d, 0x7c, - 0x00, 0x85, 0x87, 0x3e, 0xd7, 0x5d, 0xe0, 0xba, 0xdf, 0xfc, 0x76, 0xdd, 0x87, 0x7d, 0xae, 0xbc, - 0x74, 0xd8, 0xd7, 0x3a, 0x5d, 0xf5, 0xb8, 0x71, 0xa4, 0x86, 0xe2, 0xf8, 0x0a, 0xe4, 0x2c, 0xf2, - 0xe5, 0x59, 0xfa, 0x70, 0xe2, 0xd0, 0x45, 0x17, 0xe1, 0x0a, 0xe4, 0x9e, 0x50, 0xf2, 0x28, 0x7d, - 0x24, 0x70, 0xe8, 0x07, 0xdc, 0x0c, 0xbb, 0x90, 0xe7, 0xfe, 0xc2, 0x00, 0xa1, 0xc7, 0xd0, 0x4b, - 0xb8, 0x08, 0xb9, 0x66, 0x57, 0x65, 0x1b, 0x02, 0x41, 0x45, 0xa0, 0x5a, 0xaf, 0xad, 0x34, 0x15, - 0x94, 0xa9, 0xdd, 0x81, 0x82, 0x70, 0x02, 0xdb, 0x2c, 0xb1, 0x1b, 0xd0, 0x4b, 0x61, 0x33, 0xd4, - 0x21, 0x45, 0xbd, 0x27, 0xc7, 0xfb, 0x8a, 0x8a, 0x32, 0xe9, 0xa5, 0xce, 0xa1, 0x7c, 0xcd, 0x87, - 0x4a, 0xb2, 0x5e, 0x7e, 0x31, 0x77, 0xe1, 0xbf, 0x4a, 0x50, 0x4e, 0xd4, 0xbf, 0xac, 0x70, 0x21, - 0x96, 0xe5, 0x3c, 0xd1, 0x88, 0x65, 0x12, 0x3f, 0x0c, 0x0d, 0xe0, 0x50, 0x83, 0x21, 0x17, 0x5d, - 0xba, 0x17, 0xb4, 0x45, 0xf2, 0xa8, 0x50, 0xfb, 0xa3, 0x04, 0x68, 0xbe, 0x00, 0x9d, 0x33, 0x53, - 0xfa, 0x31, 0xcd, 0xac, 0xfd, 0x41, 0x82, 0x6a, 0xba, 0xea, 0x9c, 0x33, 0xef, 0xda, 0x8f, 0x6a, - 0xde, 0xdf, 0x33, 0xb0, 0x9a, 0xaa, 0x35, 0x2f, 0x6a, 0xdd, 0x17, 0xb0, 0x6e, 0x1a, 0x74, 0xe2, - 0x3a, 0x01, 0xb5, 0xf5, 0x33, 0xcd, 0xa2, 0x8f, 0xa9, 0x25, 0xd7, 0x78, 0xd2, 0xd8, 0xfd, 0xf6, - 0x6a, 0xb6, 0xde, 0x9e, 0xc9, 0x1d, 0x31, 0xb1, 0xbd, 0x8d, 0x76, 0x4b, 0x39, 0xee, 0x75, 0x07, - 0x4a, 0xa7, 0xf9, 0x99, 0x76, 0xd2, 0xf9, 0x59, 0xa7, 0xfb, 0x49, 0x47, 0x45, 0xe6, 0x1c, 0xed, - 0x07, 0xdc, 0xf6, 0x3d, 0x40, 0xf3, 0x46, 0xe1, 0xcb, 0xb0, 0xcc, 0x2c, 0xf4, 0x12, 0xde, 0x80, - 0xb5, 0x4e, 0x57, 0xeb, 0xb7, 0x5b, 0x8a, 0xa6, 0x3c, 0x78, 0xa0, 0x34, 0x07, 0x7d, 0xf1, 0x3e, - 0x11, 0xb3, 0x07, 0xa9, 0x0d, 0x5e, 0xfb, 0x7d, 0x16, 0x36, 0x96, 0x58, 0x82, 0x1b, 0xe1, 0xcd, - 0x42, 0x5c, 0x76, 0xde, 0xbd, 0x88, 0xf5, 0x75, 0x56, 0x10, 0xf4, 0x88, 0x17, 0x84, 0x17, 0x91, - 0x1b, 0xc0, 0xbc, 0x64, 0x07, 0xe6, 0xd0, 0xa4, 0x5e, 0xf8, 0x9c, 0x23, 0xae, 0x1b, 0x6b, 0x33, - 0x5c, 0xbc, 0xe8, 0xfc, 0x1f, 0x60, 0xd7, 0xf1, 0xcd, 0xc0, 0x7c, 0x4c, 0x35, 0xd3, 0x8e, 0xde, - 0x7e, 0xd8, 0xf5, 0x23, 0xa7, 0xa2, 0xa8, 0xa7, 0x6d, 0x07, 0x31, 0xdb, 0xa6, 0x23, 0x32, 0xc7, - 0x66, 0xc9, 0x3c, 0xab, 0xa2, 0xa8, 0x27, 0x66, 0x5f, 0x83, 0x8a, 0xe1, 0x4c, 0x59, 0x4d, 0x26, - 0x78, 0xec, 0xec, 0x90, 0xd4, 0xb2, 0xc0, 0x62, 0x4a, 0x58, 0x6d, 0xcf, 0x1e, 0x9d, 0x2a, 0x6a, - 0x59, 0x60, 0x82, 0x72, 0x1d, 0xd6, 0xc8, 0x68, 0xe4, 0x31, 0xe5, 0x91, 0x22, 0x71, 0x7f, 0xa8, - 0xc6, 0x30, 0x27, 0x6e, 0x1d, 0x42, 0x31, 0xf2, 0x03, 0x3b, 0xaa, 0x99, 0x27, 0x34, 0x57, 0x5c, - 0x8a, 0x33, 0x3b, 0x25, 0xb5, 0x68, 0x47, 0x9d, 0xd7, 0xa0, 0x62, 0xfa, 0xda, 0xec, 0x0d, 0x3d, - 0xb3, 0x9d, 0xd9, 0x29, 0xaa, 0x65, 0xd3, 0x8f, 0xdf, 0x1f, 0x6b, 0x5f, 0x65, 0xa0, 0x9a, 0xfe, - 0x06, 0x80, 0x5b, 0x50, 0xb4, 0x1c, 0x9d, 0xf0, 0xd0, 0x12, 0x1f, 0xa0, 0x76, 0x9e, 0xf3, 0xd9, - 0xa0, 0x7e, 0x14, 0xf2, 0xd5, 0x58, 0x72, 0xeb, 0x6f, 0x12, 0x14, 0x23, 0x18, 0x5f, 0x82, 0x9c, - 0x4b, 0x82, 0x31, 0x57, 0x97, 0xdf, 0xcf, 0x20, 0x49, 0xe5, 0x6d, 0x86, 0xfb, 0x2e, 0xb1, 0x79, - 0x08, 0x84, 0x38, 0x6b, 0xb3, 0x75, 0xb5, 0x28, 0x31, 0xf8, 0xe5, 0xc4, 0x99, 0x4c, 0xa8, 0x1d, - 0xf8, 0xd1, 0xba, 0x86, 0x78, 0x33, 0x84, 0xf1, 0x3b, 0xb0, 0x1e, 0x78, 0xc4, 0xb4, 0x52, 0xdc, - 0x1c, 0xe7, 0xa2, 0xa8, 0x23, 0x26, 0xef, 0xc1, 0x95, 0x48, 0xaf, 0x41, 0x03, 0xa2, 0x8f, 0xa9, - 0x31, 0x13, 0x2a, 0xf0, 0x47, 0x88, 0xcb, 0x21, 0xa1, 0x15, 0xf6, 0x47, 0xb2, 0xb5, 0x6f, 0x24, - 0x58, 0x8f, 0xae, 0x53, 0x46, 0xec, 0xac, 0x63, 0x00, 0x62, 0xdb, 0x4e, 0x90, 0x74, 0xd7, 0x62, - 0x28, 0x2f, 0xc8, 0xd5, 0x1b, 0xb1, 0x90, 0x9a, 0x50, 0xb0, 0x35, 0x01, 0x98, 0xf5, 0x9c, 0xeb, - 0xb6, 0xab, 0x50, 0x0e, 0x3f, 0xf0, 0xf0, 0xaf, 0x84, 0xe2, 0x02, 0x0e, 0x02, 0x62, 0xf7, 0x2e, - 0xbc, 0x09, 0xf9, 0x53, 0x3a, 0x32, 0xed, 0xf0, 0xd9, 0x56, 0x34, 0xa2, 0x67, 0x92, 0x5c, 0xfc, - 0x4c, 0xb2, 0xff, 0x5b, 0x09, 0x36, 0x74, 0x67, 0x32, 0x6f, 0xef, 0x3e, 0x9a, 0x7b, 0x05, 0xf0, - 0x3f, 0x96, 0x3e, 0xff, 0x68, 0x64, 0x06, 0xe3, 0xe9, 0x69, 0x5d, 0x77, 0x26, 0xbb, 0x23, 0xc7, - 0x22, 0xf6, 0x68, 0xf6, 0x99, 0x93, 0xff, 0xd1, 0xdf, 0x1d, 0x51, 0xfb, 0xdd, 0x91, 0x93, 0xf8, - 0xe8, 0x79, 0x7f, 0xf6, 0xf7, 0xbf, 0x92, 0xf4, 0xa7, 0x4c, 0xf6, 0xa0, 0xb7, 0xff, 0xe7, 0xcc, - 0xd6, 0x81, 0x18, 0xae, 0x17, 0xb9, 0x47, 0xa5, 0x43, 0x8b, 0xea, 0x6c, 0xca, 0xff, 0x0b, 0x00, - 0x00, 0xff, 0xff, 0x1a, 0x28, 0x25, 0x79, 0x42, 0x1d, 0x00, 0x00, +func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_e5baabe45344a177) } + +var fileDescriptor_e5baabe45344a177 = []byte{ + // 2589 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x8e, 0xdb, 0xc6, + 0x15, 0x0e, 0xf5, 0xb7, 0xd2, 0x91, 0x56, 0x3b, 0x3b, 0xbb, 0xb1, 0xe9, 0xcd, 0x8f, 0xd7, 0xca, + 0x8f, 0xd7, 0x4e, 0xac, 0x0d, 0x1c, 0xdb, 0x71, 0xd6, 0x45, 0x5a, 0xad, 0x44, 0x6f, 0xe4, 0xee, + 0x4a, 0x2a, 0xa5, 0x6d, 0x7e, 0x80, 0x82, 0x98, 0x25, 0x47, 0x12, 0x6d, 0x8a, 0x64, 0x48, 0xca, + 0xf6, 0x06, 0xbd, 0x30, 0xd0, 0xab, 0x5e, 0x15, 0xe8, 0x55, 0x51, 0x14, 0xbd, 0xe8, 0x4d, 0x80, + 0x3e, 0x40, 0x81, 0xde, 0xf5, 0x09, 0x0a, 0xe4, 0x0d, 0x8a, 0xb6, 0x40, 0xfb, 0x08, 0xbd, 0x2c, + 0x66, 0x86, 0xa4, 0x48, 0x49, 0x1b, 0x6f, 0x02, 0xc4, 0xb9, 0x92, 0xe6, 0x3b, 0xdf, 0x39, 0x73, + 0xe6, 0xcc, 0x99, 0x99, 0x33, 0x43, 0xd8, 0x1e, 0x39, 0xce, 0xc8, 0xa2, 0xbb, 0xae, 0xe7, 0x04, + 0xce, 0xc9, 0x74, 0xb8, 0x6b, 0x50, 0x5f, 0xf7, 0x4c, 0x37, 0x70, 0xbc, 0x3a, 0xc7, 0xf0, 0x9a, + 0x60, 0xd4, 0x23, 0x46, 0xed, 0x08, 0xd6, 0xef, 0x9b, 0x16, 0x6d, 0xc5, 0xc4, 0x3e, 0x0d, 0xf0, + 0x5d, 0xc8, 0x0d, 0x4d, 0x8b, 0xca, 0xd2, 0x76, 0x76, 0xa7, 0x7c, 0xf3, 0xcd, 0xfa, 0x9c, 0x52, + 0x3d, 0xad, 0xd1, 0x63, 0xb0, 0xca, 0x35, 0x6a, 0xff, 0xce, 0xc1, 0xc6, 0x12, 0x29, 0xc6, 0x90, + 0xb3, 0xc9, 0x84, 0x59, 0x94, 0x76, 0x4a, 0x2a, 0xff, 0x8f, 0x65, 0x58, 0x71, 0x89, 0xfe, 0x88, + 0x8c, 0xa8, 0x9c, 0xe1, 0x70, 0xd4, 0xc4, 0xaf, 0x03, 0x18, 0xd4, 0xa5, 0xb6, 0x41, 0x6d, 0xfd, + 0x54, 0xce, 0x6e, 0x67, 0x77, 0x4a, 0x6a, 0x02, 0xc1, 0xef, 0xc0, 0xba, 0x3b, 0x3d, 0xb1, 0x4c, + 0x5d, 0x4b, 0xd0, 0x60, 0x3b, 0xbb, 0x93, 0x57, 0x91, 0x10, 0xb4, 0x66, 0xe4, 0xab, 0xb0, 0xf6, + 0x84, 0x92, 0x47, 0x49, 0x6a, 0x99, 0x53, 0xab, 0x0c, 0x4e, 0x10, 0x9b, 0x50, 0x99, 0x50, 0xdf, + 0x27, 0x23, 0xaa, 0x05, 0xa7, 0x2e, 0x95, 0x73, 0x7c, 0xf4, 0xdb, 0x0b, 0xa3, 0x9f, 0x1f, 0x79, + 0x39, 0xd4, 0x1a, 0x9c, 0xba, 0x14, 0x37, 0xa0, 0x44, 0xed, 0xe9, 0x44, 0x58, 0xc8, 0x9f, 0x11, + 0x3f, 0xc5, 0x9e, 0x4e, 0xe6, 0xad, 0x14, 0x99, 0x5a, 0x68, 0x62, 0xc5, 0xa7, 0xde, 0x63, 0x53, + 0xa7, 0x72, 0x81, 0x1b, 0xb8, 0xba, 0x60, 0xa0, 0x2f, 0xe4, 0xf3, 0x36, 0x22, 0x3d, 0xdc, 0x84, + 0x12, 0x7d, 0x1a, 0x50, 0xdb, 0x37, 0x1d, 0x5b, 0x5e, 0xe1, 0x46, 0xde, 0x5a, 0x32, 0x8b, 0xd4, + 0x32, 0xe6, 0x4d, 0xcc, 0xf4, 0xf0, 0x1d, 0x58, 0x71, 0xdc, 0xc0, 0x74, 0x6c, 0x5f, 0x2e, 0x6e, + 0x4b, 0x3b, 0xe5, 0x9b, 0xaf, 0x2e, 0x4d, 0x84, 0xae, 0xe0, 0xa8, 0x11, 0x19, 0xb7, 0x01, 0xf9, + 0xce, 0xd4, 0xd3, 0xa9, 0xa6, 0x3b, 0x06, 0xd5, 0x4c, 0x7b, 0xe8, 0xc8, 0x25, 0x6e, 0xe0, 0xf2, + 0xe2, 0x40, 0x38, 0xb1, 0xe9, 0x18, 0xb4, 0x6d, 0x0f, 0x1d, 0xb5, 0xea, 0xa7, 0xda, 0xf8, 0x02, + 0x14, 0xfc, 0x53, 0x3b, 0x20, 0x4f, 0xe5, 0x0a, 0xcf, 0x90, 0xb0, 0x55, 0xfb, 0x6b, 0x01, 0xd6, + 0xce, 0x93, 0x62, 0xf7, 0x20, 0x3f, 0x64, 0xa3, 0x94, 0x33, 0xdf, 0x26, 0x06, 0x42, 0x27, 0x1d, + 0xc4, 0xc2, 0x77, 0x0c, 0x62, 0x03, 0xca, 0x36, 0xf5, 0x03, 0x6a, 0x88, 0x8c, 0xc8, 0x9e, 0x33, + 0xa7, 0x40, 0x28, 0x2d, 0xa6, 0x54, 0xee, 0x3b, 0xa5, 0xd4, 0xa7, 0xb0, 0x16, 0xbb, 0xa4, 0x79, + 0xc4, 0x1e, 0x45, 0xb9, 0xb9, 0xfb, 0x3c, 0x4f, 0xea, 0x4a, 0xa4, 0xa7, 0x32, 0x35, 0xb5, 0x4a, + 0x53, 0x6d, 0xdc, 0x02, 0x70, 0x6c, 0xea, 0x0c, 0x35, 0x83, 0xea, 0x96, 0x5c, 0x3c, 0x23, 0x4a, + 0x5d, 0x46, 0x59, 0x88, 0x92, 0x23, 0x50, 0xdd, 0xc2, 0x1f, 0xce, 0x52, 0x6d, 0xe5, 0x8c, 0x4c, + 0x39, 0x12, 0x8b, 0x6c, 0x21, 0xdb, 0x8e, 0xa1, 0xea, 0x51, 0x96, 0xf7, 0xd4, 0x08, 0x47, 0x56, + 0xe2, 0x4e, 0xd4, 0x9f, 0x3b, 0x32, 0x35, 0x54, 0x13, 0x03, 0x5b, 0xf5, 0x92, 0x4d, 0xfc, 0x06, + 0xc4, 0x80, 0xc6, 0xd3, 0x0a, 0xf8, 0x2e, 0x54, 0x89, 0xc0, 0x0e, 0x99, 0xd0, 0xad, 0x2f, 0xa1, + 0x9a, 0x0e, 0x0f, 0xde, 0x84, 0xbc, 0x1f, 0x10, 0x2f, 0xe0, 0x59, 0x98, 0x57, 0x45, 0x03, 0x23, + 0xc8, 0x52, 0xdb, 0xe0, 0xbb, 0x5c, 0x5e, 0x65, 0x7f, 0xf1, 0x4f, 0x66, 0x03, 0xce, 0xf2, 0x01, + 0xbf, 0xbd, 0x38, 0xa3, 0x29, 0xcb, 0xf3, 0xe3, 0xde, 0xfa, 0x00, 0x56, 0x53, 0x03, 0x38, 0x6f, + 0xd7, 0xb5, 0x5f, 0xc2, 0xcb, 0x4b, 0x4d, 0xe3, 0x4f, 0x61, 0x73, 0x6a, 0x9b, 0x76, 0x40, 0x3d, + 0xd7, 0xa3, 0x2c, 0x63, 0x45, 0x57, 0xf2, 0x7f, 0x56, 0xce, 0xc8, 0xb9, 0xe3, 0x24, 0x5b, 0x58, + 0x51, 0x37, 0xa6, 0x8b, 0xe0, 0xf5, 0x52, 0xf1, 0xbf, 0x2b, 0xe8, 0xd9, 0xb3, 0x67, 0xcf, 0x32, + 0xb5, 0xdf, 0x15, 0x60, 0x73, 0xd9, 0x9a, 0x59, 0xba, 0x7c, 0x2f, 0x40, 0xc1, 0x9e, 0x4e, 0x4e, + 0xa8, 0xc7, 0x83, 0x94, 0x57, 0xc3, 0x16, 0x6e, 0x40, 0xde, 0x22, 0x27, 0xd4, 0x92, 0x73, 0xdb, + 0xd2, 0x4e, 0xf5, 0xe6, 0x3b, 0xe7, 0x5a, 0x95, 0xf5, 0x43, 0xa6, 0xa2, 0x0a, 0x4d, 0xfc, 0x11, + 0xe4, 0xc2, 0x2d, 0x9a, 0x59, 0xb8, 0x7e, 0x3e, 0x0b, 0x6c, 0x2d, 0xa9, 0x5c, 0x0f, 0xbf, 0x02, + 0x25, 0xf6, 0x2b, 0x72, 0xa3, 0xc0, 0x7d, 0x2e, 0x32, 0x80, 0xe5, 0x05, 0xde, 0x82, 0x22, 0x5f, + 0x26, 0x06, 0x8d, 0x8e, 0xb6, 0xb8, 0xcd, 0x12, 0xcb, 0xa0, 0x43, 0x32, 0xb5, 0x02, 0xed, 0x31, + 0xb1, 0xa6, 0x94, 0x27, 0x7c, 0x49, 0xad, 0x84, 0xe0, 0xcf, 0x19, 0x86, 0x2f, 0x43, 0x59, 0xac, + 0x2a, 0xd3, 0x36, 0xe8, 0x53, 0xbe, 0x7b, 0xe6, 0x55, 0xb1, 0xd0, 0xda, 0x0c, 0x61, 0xdd, 0x3f, + 0xf4, 0x1d, 0x3b, 0x4a, 0x4d, 0xde, 0x05, 0x03, 0x78, 0xf7, 0x1f, 0xcc, 0x6f, 0xdc, 0xaf, 0x2d, + 0x1f, 0xde, 0x7c, 0x4e, 0xd5, 0xfe, 0x92, 0x81, 0x1c, 0xdf, 0x2f, 0xd6, 0xa0, 0x3c, 0xf8, 0xac, + 0xa7, 0x68, 0xad, 0xee, 0xf1, 0xfe, 0xa1, 0x82, 0x24, 0x5c, 0x05, 0xe0, 0xc0, 0xfd, 0xc3, 0x6e, + 0x63, 0x80, 0x32, 0x71, 0xbb, 0xdd, 0x19, 0xdc, 0xb9, 0x85, 0xb2, 0xb1, 0xc2, 0xb1, 0x00, 0x72, + 0x49, 0xc2, 0xfb, 0x37, 0x51, 0x1e, 0x23, 0xa8, 0x08, 0x03, 0xed, 0x4f, 0x95, 0xd6, 0x9d, 0x5b, + 0xa8, 0x90, 0x46, 0xde, 0xbf, 0x89, 0x56, 0xf0, 0x2a, 0x94, 0x38, 0xb2, 0xdf, 0xed, 0x1e, 0xa2, + 0x62, 0x6c, 0xb3, 0x3f, 0x50, 0xdb, 0x9d, 0x03, 0x54, 0x8a, 0x6d, 0x1e, 0xa8, 0xdd, 0xe3, 0x1e, + 0x82, 0xd8, 0xc2, 0x91, 0xd2, 0xef, 0x37, 0x0e, 0x14, 0x54, 0x8e, 0x19, 0xfb, 0x9f, 0x0d, 0x94, + 0x3e, 0xaa, 0xa4, 0xdc, 0x7a, 0xff, 0x26, 0x5a, 0x8d, 0xbb, 0x50, 0x3a, 0xc7, 0x47, 0xa8, 0x8a, + 0xd7, 0x61, 0x55, 0x74, 0x11, 0x39, 0xb1, 0x36, 0x07, 0xdd, 0xb9, 0x85, 0xd0, 0xcc, 0x11, 0x61, + 0x65, 0x3d, 0x05, 0xdc, 0xb9, 0x85, 0x70, 0xad, 0x09, 0x79, 0x9e, 0x5d, 0x18, 0x43, 0xf5, 0xb0, + 0xb1, 0xaf, 0x1c, 0x6a, 0xdd, 0xde, 0xa0, 0xdd, 0xed, 0x34, 0x0e, 0x91, 0x34, 0xc3, 0x54, 0xe5, + 0x67, 0xc7, 0x6d, 0x55, 0x69, 0xa1, 0x4c, 0x12, 0xeb, 0x29, 0x8d, 0x81, 0xd2, 0x42, 0xd9, 0x9a, + 0x0e, 0x9b, 0xcb, 0xf6, 0xc9, 0xa5, 0x2b, 0x23, 0x31, 0xc5, 0x99, 0x33, 0xa6, 0x98, 0xdb, 0x5a, + 0x98, 0xe2, 0x7f, 0x65, 0x60, 0x63, 0xc9, 0x59, 0xb1, 0xb4, 0x93, 0x1f, 0x43, 0x5e, 0xa4, 0xa8, + 0x38, 0x3d, 0xaf, 0x2d, 0x3d, 0x74, 0x78, 0xc2, 0x2e, 0x9c, 0xa0, 0x5c, 0x2f, 0x59, 0x41, 0x64, + 0xcf, 0xa8, 0x20, 0x98, 0x89, 0x85, 0x3d, 0xfd, 0x17, 0x0b, 0x7b, 0xba, 0x38, 0xf6, 0xee, 0x9c, + 0xe7, 0xd8, 0xe3, 0xd8, 0xb7, 0xdb, 0xdb, 0xf3, 0x4b, 0xf6, 0xf6, 0x7b, 0xb0, 0xbe, 0x60, 0xe8, + 0xdc, 0x7b, 0xec, 0xaf, 0x24, 0x90, 0xcf, 0x0a, 0xce, 0x73, 0x76, 0xba, 0x4c, 0x6a, 0xa7, 0xbb, + 0x37, 0x1f, 0xc1, 0x2b, 0x67, 0x4f, 0xc2, 0xc2, 0x5c, 0x7f, 0x25, 0xc1, 0x85, 0xe5, 0x95, 0xe2, + 0x52, 0x1f, 0x3e, 0x82, 0xc2, 0x84, 0x06, 0x63, 0x27, 0xaa, 0x96, 0xde, 0x5e, 0x72, 0x06, 0x33, + 0xf1, 0xfc, 0x64, 0x87, 0x5a, 0xc9, 0x43, 0x3c, 0x7b, 0x56, 0xb9, 0x27, 0xbc, 0x59, 0xf0, 0xf4, + 0xd7, 0x19, 0x78, 0x79, 0xa9, 0xf1, 0xa5, 0x8e, 0xbe, 0x06, 0x60, 0xda, 0xee, 0x34, 0x10, 0x15, + 0x91, 0xd8, 0x60, 0x4b, 0x1c, 0xe1, 0x9b, 0x17, 0xdb, 0x3c, 0xa7, 0x41, 0x2c, 0xcf, 0x72, 0x39, + 0x08, 0x88, 0x13, 0xee, 0xce, 0x1c, 0xcd, 0x71, 0x47, 0x5f, 0x3f, 0x63, 0xa4, 0x0b, 0x89, 0xf9, + 0x1e, 0x20, 0xdd, 0x32, 0xa9, 0x1d, 0x68, 0x7e, 0xe0, 0x51, 0x32, 0x31, 0xed, 0x11, 0x3f, 0x41, + 0x8a, 0x7b, 0xf9, 0x21, 0xb1, 0x7c, 0xaa, 0xae, 0x09, 0x71, 0x3f, 0x92, 0x32, 0x0d, 0x9e, 0x40, + 0x5e, 0x42, 0xa3, 0x90, 0xd2, 0x10, 0xe2, 0x58, 0xa3, 0xf6, 0xdb, 0x12, 0x94, 0x13, 0x75, 0x35, + 0xbe, 0x02, 0x95, 0x87, 0xe4, 0x31, 0xd1, 0xa2, 0xbb, 0x92, 0x88, 0x44, 0x99, 0x61, 0xbd, 0xf0, + 0xbe, 0xf4, 0x1e, 0x6c, 0x72, 0x8a, 0x33, 0x0d, 0xa8, 0xa7, 0xe9, 0x16, 0xf1, 0x7d, 0x1e, 0xb4, + 0x22, 0xa7, 0x62, 0x26, 0xeb, 0x32, 0x51, 0x33, 0x92, 0xe0, 0xdb, 0xb0, 0xc1, 0x35, 0x26, 0x53, + 0x2b, 0x30, 0x5d, 0x8b, 0x6a, 0xec, 0xf6, 0xe6, 0xf3, 0x93, 0x24, 0xf6, 0x6c, 0x9d, 0x31, 0x8e, + 0x42, 0x02, 0xf3, 0xc8, 0xc7, 0x2d, 0x78, 0x8d, 0xab, 0x8d, 0xa8, 0x4d, 0x3d, 0x12, 0x50, 0x8d, + 0x7e, 0x31, 0x25, 0x96, 0xaf, 0x11, 0xdb, 0xd0, 0xc6, 0xc4, 0x1f, 0xcb, 0x9b, 0xcc, 0xc0, 0x7e, + 0x46, 0x96, 0xd4, 0x4b, 0x8c, 0x78, 0x10, 0xf2, 0x14, 0x4e, 0x6b, 0xd8, 0xc6, 0xc7, 0xc4, 0x1f, + 0xe3, 0x3d, 0xb8, 0xc0, 0xad, 0xf8, 0x81, 0x67, 0xda, 0x23, 0x4d, 0x1f, 0x53, 0xfd, 0x91, 0x36, + 0x0d, 0x86, 0x77, 0xe5, 0x57, 0x92, 0xfd, 0x73, 0x0f, 0xfb, 0x9c, 0xd3, 0x64, 0x94, 0xe3, 0x60, + 0x78, 0x17, 0xf7, 0xa1, 0xc2, 0x26, 0x63, 0x62, 0x7e, 0x49, 0xb5, 0xa1, 0xe3, 0xf1, 0xa3, 0xb1, + 0xba, 0x64, 0x6b, 0x4a, 0x44, 0xb0, 0xde, 0x0d, 0x15, 0x8e, 0x1c, 0x83, 0xee, 0xe5, 0xfb, 0x3d, + 0x45, 0x69, 0xa9, 0xe5, 0xc8, 0xca, 0x7d, 0xc7, 0x63, 0x09, 0x35, 0x72, 0xe2, 0x00, 0x97, 0x45, + 0x42, 0x8d, 0x9c, 0x28, 0xbc, 0xb7, 0x61, 0x43, 0xd7, 0xc5, 0x98, 0x4d, 0x5d, 0x0b, 0xef, 0x58, + 0xbe, 0x8c, 0x52, 0xc1, 0xd2, 0xf5, 0x03, 0x41, 0x08, 0x73, 0xdc, 0xc7, 0x1f, 0xc2, 0xcb, 0xb3, + 0x60, 0x25, 0x15, 0xd7, 0x17, 0x46, 0x39, 0xaf, 0x7a, 0x1b, 0x36, 0xdc, 0xd3, 0x45, 0x45, 0x9c, + 0xea, 0xd1, 0x3d, 0x9d, 0x57, 0xfb, 0x00, 0x36, 0xdd, 0xb1, 0xbb, 0xa8, 0x77, 0x3d, 0xa9, 0x87, + 0xdd, 0xb1, 0x3b, 0xaf, 0xf8, 0x16, 0xbf, 0x70, 0x7b, 0x54, 0x27, 0x01, 0x35, 0xe4, 0x8b, 0x49, + 0x7a, 0x42, 0x80, 0x77, 0x01, 0xe9, 0xba, 0x46, 0x6d, 0x72, 0x62, 0x51, 0x8d, 0x78, 0xd4, 0x26, + 0xbe, 0x7c, 0x39, 0x49, 0xae, 0xea, 0xba, 0xc2, 0xa5, 0x0d, 0x2e, 0xc4, 0xd7, 0x61, 0xdd, 0x39, + 0x79, 0xa8, 0x8b, 0x94, 0xd4, 0x5c, 0x8f, 0x0e, 0xcd, 0xa7, 0xf2, 0x9b, 0x3c, 0xbe, 0x6b, 0x4c, + 0xc0, 0x13, 0xb2, 0xc7, 0x61, 0x7c, 0x0d, 0x90, 0xee, 0x8f, 0x89, 0xe7, 0xf2, 0x3d, 0xd9, 0x77, + 0x89, 0x4e, 0xe5, 0xb7, 0x04, 0x55, 0xe0, 0x9d, 0x08, 0x66, 0x4b, 0xc2, 0x7f, 0x62, 0x0e, 0x83, + 0xc8, 0xe2, 0x55, 0xb1, 0x24, 0x38, 0x16, 0x5a, 0xdb, 0x01, 0xc4, 0x42, 0x91, 0xea, 0x78, 0x87, + 0xd3, 0xaa, 0xee, 0xd8, 0x4d, 0xf6, 0xfb, 0x06, 0xac, 0x32, 0xe6, 0xac, 0xd3, 0x6b, 0xa2, 0x20, + 0x73, 0xc7, 0x89, 0x1e, 0x6f, 0xc1, 0x05, 0x46, 0x9a, 0xd0, 0x80, 0x18, 0x24, 0x20, 0x09, 0xf6, + 0xbb, 0x9c, 0xcd, 0xe2, 0x7e, 0x14, 0x0a, 0x53, 0x7e, 0x7a, 0xd3, 0x93, 0xd3, 0x38, 0xb3, 0x6e, + 0x08, 0x3f, 0x19, 0x16, 0xe5, 0xd6, 0xf7, 0x56, 0x74, 0xd7, 0xf6, 0xa0, 0x92, 0x4c, 0x7c, 0x5c, + 0x02, 0x91, 0xfa, 0x48, 0x62, 0x55, 0x50, 0xb3, 0xdb, 0x62, 0xf5, 0xcb, 0xe7, 0x0a, 0xca, 0xb0, + 0x3a, 0xea, 0xb0, 0x3d, 0x50, 0x34, 0xf5, 0xb8, 0x33, 0x68, 0x1f, 0x29, 0x28, 0x9b, 0x28, 0xd8, + 0x1f, 0xe4, 0x8a, 0x6f, 0xa3, 0xab, 0xb5, 0xaf, 0x33, 0x50, 0x4d, 0xdf, 0xc0, 0xf0, 0x8f, 0xe0, + 0x62, 0xf4, 0x5c, 0xe2, 0xd3, 0x40, 0x7b, 0x62, 0x7a, 0x7c, 0x45, 0x4e, 0x88, 0x38, 0x1d, 0xe3, + 0x9c, 0xd8, 0x0c, 0x59, 0x7d, 0x1a, 0x7c, 0x62, 0x7a, 0x6c, 0xbd, 0x4d, 0x48, 0x80, 0x0f, 0xe1, + 0xb2, 0xed, 0x68, 0x7e, 0x40, 0x6c, 0x83, 0x78, 0x86, 0x36, 0x7b, 0xa8, 0xd2, 0x88, 0xae, 0x53, + 0xdf, 0x77, 0xc4, 0x49, 0x18, 0x5b, 0x79, 0xd5, 0x76, 0xfa, 0x21, 0x79, 0x76, 0x44, 0x34, 0x42, + 0xea, 0x5c, 0xfe, 0x66, 0xcf, 0xca, 0xdf, 0x57, 0xa0, 0x34, 0x21, 0xae, 0x46, 0xed, 0xc0, 0x3b, + 0xe5, 0x75, 0x77, 0x51, 0x2d, 0x4e, 0x88, 0xab, 0xb0, 0xf6, 0x0b, 0xb9, 0xfe, 0x3c, 0xc8, 0x15, + 0x8b, 0xa8, 0xf4, 0x20, 0x57, 0x2c, 0x21, 0xa8, 0xfd, 0x33, 0x0b, 0x95, 0x64, 0x1d, 0xce, 0xae, + 0x35, 0x3a, 0x3f, 0xb2, 0x24, 0xbe, 0xa9, 0xbd, 0xf1, 0x8d, 0x55, 0x7b, 0xbd, 0xc9, 0xce, 0xb2, + 0xbd, 0x82, 0xa8, 0x8e, 0x55, 0xa1, 0xc9, 0xea, 0x08, 0x96, 0x6c, 0x54, 0x54, 0x23, 0x45, 0x35, + 0x6c, 0xe1, 0x03, 0x28, 0x3c, 0xf4, 0xb9, 0xed, 0x02, 0xb7, 0xfd, 0xe6, 0x37, 0xdb, 0x7e, 0xd0, + 0xe7, 0xc6, 0x4b, 0x0f, 0xfa, 0x5a, 0xa7, 0xab, 0x1e, 0x35, 0x0e, 0xd5, 0x50, 0x1d, 0x5f, 0x82, + 0x9c, 0x45, 0xbe, 0x3c, 0x4d, 0x9f, 0x7a, 0x1c, 0x3a, 0xef, 0x24, 0x5c, 0x82, 0xdc, 0x13, 0x4a, + 0x1e, 0xa5, 0xcf, 0x1a, 0x0e, 0x7d, 0x8f, 0x8b, 0x61, 0x17, 0xf2, 0x3c, 0x5e, 0x18, 0x20, 0x8c, + 0x18, 0x7a, 0x09, 0x17, 0x21, 0xd7, 0xec, 0xaa, 0x6c, 0x41, 0x20, 0xa8, 0x08, 0x54, 0xeb, 0xb5, + 0x95, 0xa6, 0x82, 0x32, 0xb5, 0xdb, 0x50, 0x10, 0x41, 0x60, 0x8b, 0x25, 0x0e, 0x03, 0x7a, 0x29, + 0x6c, 0x86, 0x36, 0xa4, 0x48, 0x7a, 0x7c, 0xb4, 0xaf, 0xa8, 0x28, 0x93, 0x9e, 0xea, 0x1c, 0xca, + 0xd7, 0x7c, 0xa8, 0x24, 0x0b, 0xf1, 0x17, 0x73, 0xc9, 0xfe, 0x9b, 0x04, 0xe5, 0x44, 0x61, 0xcd, + 0x2a, 0x22, 0x62, 0x59, 0xce, 0x13, 0x8d, 0x58, 0x26, 0xf1, 0xc3, 0xd4, 0x00, 0x0e, 0x35, 0x18, + 0x72, 0xde, 0xa9, 0x7b, 0x41, 0x4b, 0x24, 0x8f, 0x0a, 0xb5, 0x3f, 0x4a, 0x80, 0xe6, 0x2b, 0xdb, + 0x39, 0x37, 0xa5, 0x1f, 0xd2, 0xcd, 0xda, 0x1f, 0x24, 0xa8, 0xa6, 0xcb, 0xd9, 0x39, 0xf7, 0xae, + 0xfc, 0xa0, 0xee, 0xfd, 0x23, 0x03, 0xab, 0xa9, 0x22, 0xf6, 0xbc, 0xde, 0x7d, 0x01, 0xeb, 0xa6, + 0x41, 0x27, 0xae, 0x13, 0x50, 0x5b, 0x3f, 0xd5, 0x2c, 0xfa, 0x98, 0x5a, 0x72, 0x8d, 0x6f, 0x1a, + 0xbb, 0xdf, 0x5c, 0x26, 0xd7, 0xdb, 0x33, 0xbd, 0x43, 0xa6, 0xb6, 0xb7, 0xd1, 0x6e, 0x29, 0x47, + 0xbd, 0xee, 0x40, 0xe9, 0x34, 0x3f, 0xd3, 0x8e, 0x3b, 0x3f, 0xed, 0x74, 0x3f, 0xe9, 0xa8, 0xc8, + 0x9c, 0xa3, 0x7d, 0x8f, 0xcb, 0xbe, 0x07, 0x68, 0xde, 0x29, 0x7c, 0x11, 0x96, 0xb9, 0x85, 0x5e, + 0xc2, 0x1b, 0xb0, 0xd6, 0xe9, 0x6a, 0xfd, 0x76, 0x4b, 0xd1, 0x94, 0xfb, 0xf7, 0x95, 0xe6, 0xa0, + 0x2f, 0x1e, 0x3e, 0x62, 0xf6, 0x20, 0xb5, 0xc0, 0x6b, 0xbf, 0xcf, 0xc2, 0xc6, 0x12, 0x4f, 0x70, + 0x23, 0xbc, 0xb2, 0x88, 0x5b, 0xd4, 0x8d, 0xf3, 0x78, 0x5f, 0x67, 0x35, 0x43, 0x8f, 0x78, 0x41, + 0x78, 0xc3, 0xb9, 0x06, 0x2c, 0x4a, 0x76, 0x60, 0x0e, 0x4d, 0xea, 0x85, 0xef, 0x44, 0xe2, 0x1e, + 0xb3, 0x36, 0xc3, 0xc5, 0x53, 0xd1, 0xbb, 0x80, 0x5d, 0xc7, 0x37, 0x03, 0xf3, 0x31, 0xd5, 0x4c, + 0x3b, 0x7a, 0x54, 0x62, 0xf7, 0x9a, 0x9c, 0x8a, 0x22, 0x49, 0xdb, 0x0e, 0x62, 0xb6, 0x4d, 0x47, + 0x64, 0x8e, 0xcd, 0x36, 0xf3, 0xac, 0x8a, 0x22, 0x49, 0xcc, 0xbe, 0x02, 0x15, 0xc3, 0x99, 0xb2, + 0x62, 0x4f, 0xf0, 0xd8, 0xd9, 0x21, 0xa9, 0x65, 0x81, 0xc5, 0x94, 0xb0, 0x8c, 0x9f, 0xbd, 0x66, + 0x55, 0xd4, 0xb2, 0xc0, 0x04, 0xe5, 0x2a, 0xac, 0x91, 0xd1, 0xc8, 0x63, 0xc6, 0x23, 0x43, 0xe2, + 0x62, 0x52, 0x8d, 0x61, 0x4e, 0xdc, 0x7a, 0x00, 0xc5, 0x28, 0x0e, 0xec, 0xa8, 0x66, 0x91, 0xd0, + 0x5c, 0x71, 0xdb, 0xce, 0xec, 0x94, 0xd4, 0xa2, 0x1d, 0x09, 0xaf, 0x40, 0xc5, 0xf4, 0xb5, 0xd9, + 0xe3, 0x7c, 0x66, 0x3b, 0xb3, 0x53, 0x54, 0xcb, 0xa6, 0x1f, 0x3f, 0x6c, 0xd6, 0xbe, 0xca, 0x40, + 0x35, 0xfd, 0x71, 0x01, 0xb7, 0xa0, 0x68, 0x39, 0x3a, 0xe1, 0xa9, 0x25, 0xbe, 0x6c, 0xed, 0x3c, + 0xe7, 0x7b, 0x44, 0xfd, 0x30, 0xe4, 0xab, 0xb1, 0xe6, 0xd6, 0xdf, 0x25, 0x28, 0x46, 0x30, 0xbe, + 0x00, 0x39, 0x97, 0x04, 0x63, 0x6e, 0x2e, 0xbf, 0x9f, 0x41, 0x92, 0xca, 0xdb, 0x0c, 0xf7, 0x5d, + 0x62, 0xf3, 0x14, 0x08, 0x71, 0xd6, 0x66, 0xf3, 0x6a, 0x51, 0x62, 0xf0, 0x5b, 0x8f, 0x33, 0x99, + 0x50, 0x3b, 0xf0, 0xa3, 0x79, 0x0d, 0xf1, 0x66, 0x08, 0xe3, 0x77, 0x60, 0x3d, 0xf0, 0x88, 0x69, + 0xa5, 0xb8, 0x39, 0xce, 0x45, 0x91, 0x20, 0x26, 0xef, 0xc1, 0xa5, 0xc8, 0xae, 0x41, 0x03, 0xa2, + 0x8f, 0xa9, 0x31, 0x53, 0x2a, 0xf0, 0xd7, 0x8d, 0x8b, 0x21, 0xa1, 0x15, 0xca, 0x23, 0xdd, 0xda, + 0xd7, 0x12, 0xac, 0x47, 0xf7, 0x34, 0x23, 0x0e, 0xd6, 0x11, 0x00, 0xb1, 0x6d, 0x27, 0x48, 0x86, + 0x6b, 0x31, 0x95, 0x17, 0xf4, 0xea, 0x8d, 0x58, 0x49, 0x4d, 0x18, 0xd8, 0x9a, 0x00, 0xcc, 0x24, + 0x67, 0x86, 0xed, 0x32, 0x94, 0xc3, 0x2f, 0x47, 0xfc, 0xf3, 0xa3, 0xb8, 0xd9, 0x83, 0x80, 0xd8, + 0x85, 0x0e, 0x6f, 0x42, 0xfe, 0x84, 0x8e, 0x4c, 0x3b, 0x7c, 0x0f, 0x16, 0x8d, 0xe8, 0xfd, 0x25, + 0x17, 0xbf, 0xbf, 0xec, 0xff, 0x46, 0x82, 0x0d, 0xdd, 0x99, 0xcc, 0xfb, 0xbb, 0x8f, 0xe6, 0x9e, + 0x17, 0xfc, 0x8f, 0xa5, 0xcf, 0x3f, 0x1a, 0x99, 0xc1, 0x78, 0x7a, 0x52, 0xd7, 0x9d, 0xc9, 0xee, + 0xc8, 0xb1, 0x88, 0x3d, 0x9a, 0x7d, 0x3f, 0xe5, 0x7f, 0xf4, 0x1b, 0x23, 0x6a, 0xdf, 0x18, 0x39, + 0x89, 0xaf, 0xa9, 0xf7, 0x66, 0x7f, 0xff, 0x27, 0x49, 0x7f, 0xca, 0x64, 0x0f, 0x7a, 0xfb, 0x7f, + 0xce, 0x6c, 0x1d, 0x88, 0xee, 0x7a, 0x51, 0x78, 0x54, 0x3a, 0xb4, 0xa8, 0xce, 0x86, 0xfc, 0xff, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xe8, 0xef, 0xc4, 0x9b, 0x1d, 0x00, 0x00, } diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go index e3c56d3ff..78ee52334 100644 --- a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/any.proto -package any // import "github.com/golang/protobuf/ptypes/any" +package any -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // `Any` contains an arbitrary serialized protocol buffer message along with a // URL that describes the type of the serialized message. @@ -99,17 +101,18 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // } // type Any struct { - // A URL/resource name whose content describes the type of the - // serialized protocol buffer message. + // A URL/resource name that uniquely identifies the type of the serialized + // protocol buffer message. The last segment of the URL's path must represent + // the fully qualified name of the type (as in + // `path/google.protobuf.Duration`). The name should be in a canonical form + // (e.g., leading "." is not accepted). // - // For URLs which use the scheme `http`, `https`, or no scheme, the - // following restrictions and interpretations apply: + // In practice, teams usually precompile into the binary all types that they + // expect it to use in the context of Any. However, for URLs which use the + // scheme `http`, `https`, or no scheme, one can optionally set up a type + // server that maps type URLs to message definitions as follows: // // * If no scheme is provided, `https` is assumed. - // * The last segment of the URL's path must represent the fully - // qualified name of the type (as in `path/google.protobuf.Duration`). - // The name should be in a canonical form (e.g., leading "." is - // not accepted). // * An HTTP GET on the URL must yield a [google.protobuf.Type][] // value in binary format, or produce an error. // * Applications are allowed to cache lookup results based on the @@ -118,6 +121,10 @@ type Any struct { // on changes to types. (Use versioned type names to manage // breaking changes.) // + // Note: this functionality is not currently available in the official + // protobuf release, and it is not used for type URLs beginning with + // type.googleapis.com. + // // Schemes other than `http`, `https` (or the empty scheme) might be // used with implementation specific semantics. // @@ -133,17 +140,19 @@ func (m *Any) Reset() { *m = Any{} } func (m *Any) String() string { return proto.CompactTextString(m) } func (*Any) ProtoMessage() {} func (*Any) Descriptor() ([]byte, []int) { - return fileDescriptor_any_744b9ca530f228db, []int{0} + return fileDescriptor_b53526c13ae22eb4, []int{0} } + func (*Any) XXX_WellKnownType() string { return "Any" } + func (m *Any) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Any.Unmarshal(m, b) } func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Any.Marshal(b, m, deterministic) } -func (dst *Any) XXX_Merge(src proto.Message) { - xxx_messageInfo_Any.Merge(dst, src) +func (m *Any) XXX_Merge(src proto.Message) { + xxx_messageInfo_Any.Merge(m, src) } func (m *Any) XXX_Size() int { return xxx_messageInfo_Any.Size(m) @@ -172,9 +181,9 @@ func init() { proto.RegisterType((*Any)(nil), "google.protobuf.Any") } -func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_any_744b9ca530f228db) } +func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) } -var fileDescriptor_any_744b9ca530f228db = []byte{ +var fileDescriptor_b53526c13ae22eb4 = []byte{ // 185 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4, diff --git a/vendor/github.com/golang/protobuf/ptypes/duration.go b/vendor/github.com/golang/protobuf/ptypes/duration.go index 65cb0f8eb..26d1ca2fb 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration.go +++ b/vendor/github.com/golang/protobuf/ptypes/duration.go @@ -82,7 +82,7 @@ func Duration(p *durpb.Duration) (time.Duration, error) { return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) } if p.Nanos != 0 { - d += time.Duration(p.Nanos) + d += time.Duration(p.Nanos) * time.Nanosecond if (d < 0) != (p.Nanos < 0) { return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) } diff --git a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go index a7beb2c41..0d681ee21 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/duration.proto -package duration // import "github.com/golang/protobuf/ptypes/duration" +package duration -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A Duration represents a signed, fixed-length span of time represented // as a count of seconds and fractions of seconds at nanosecond @@ -99,17 +101,19 @@ func (m *Duration) Reset() { *m = Duration{} } func (m *Duration) String() string { return proto.CompactTextString(m) } func (*Duration) ProtoMessage() {} func (*Duration) Descriptor() ([]byte, []int) { - return fileDescriptor_duration_e7d612259e3f0613, []int{0} + return fileDescriptor_23597b2ebd7ac6c5, []int{0} } + func (*Duration) XXX_WellKnownType() string { return "Duration" } + func (m *Duration) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Duration.Unmarshal(m, b) } func (m *Duration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Duration.Marshal(b, m, deterministic) } -func (dst *Duration) XXX_Merge(src proto.Message) { - xxx_messageInfo_Duration.Merge(dst, src) +func (m *Duration) XXX_Merge(src proto.Message) { + xxx_messageInfo_Duration.Merge(m, src) } func (m *Duration) XXX_Size() int { return xxx_messageInfo_Duration.Size(m) @@ -138,11 +142,9 @@ func init() { proto.RegisterType((*Duration)(nil), "google.protobuf.Duration") } -func init() { - proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_duration_e7d612259e3f0613) -} +func init() { proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_23597b2ebd7ac6c5) } -var fileDescriptor_duration_e7d612259e3f0613 = []byte{ +var fileDescriptor_23597b2ebd7ac6c5 = []byte{ // 190 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0x29, 0x2d, 0x4a, diff --git a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go index a69b403ce..b4eb03ecc 100644 --- a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/empty.proto -package empty // import "github.com/golang/protobuf/ptypes/empty" +package empty -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A generic empty message that you can re-use to avoid defining duplicated // empty messages in your APIs. A typical example is to use it as the request @@ -37,17 +39,19 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_empty_39e6d6db0632e5b2, []int{0} + return fileDescriptor_900544acb223d5b8, []int{0} } + func (*Empty) XXX_WellKnownType() string { return "Empty" } + func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) } func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Empty.Marshal(b, m, deterministic) } -func (dst *Empty) XXX_Merge(src proto.Message) { - xxx_messageInfo_Empty.Merge(dst, src) +func (m *Empty) XXX_Merge(src proto.Message) { + xxx_messageInfo_Empty.Merge(m, src) } func (m *Empty) XXX_Size() int { return xxx_messageInfo_Empty.Size(m) @@ -62,9 +66,9 @@ func init() { proto.RegisterType((*Empty)(nil), "google.protobuf.Empty") } -func init() { proto.RegisterFile("google/protobuf/empty.proto", fileDescriptor_empty_39e6d6db0632e5b2) } +func init() { proto.RegisterFile("google/protobuf/empty.proto", fileDescriptor_900544acb223d5b8) } -var fileDescriptor_empty_39e6d6db0632e5b2 = []byte{ +var fileDescriptor_900544acb223d5b8 = []byte{ // 148 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcd, 0x2d, 0x28, diff --git a/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go b/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go index ee6382e14..33daa73dd 100644 --- a/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/struct.proto -package structpb // import "github.com/golang/protobuf/ptypes/struct" +package structpb -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // `NullValue` is a singleton enumeration to represent the null value for the // `Value` type union. @@ -32,6 +34,7 @@ const ( var NullValue_name = map[int32]string{ 0: "NULL_VALUE", } + var NullValue_value = map[string]int32{ "NULL_VALUE": 0, } @@ -39,9 +42,11 @@ var NullValue_value = map[string]int32{ func (x NullValue) String() string { return proto.EnumName(NullValue_name, int32(x)) } + func (NullValue) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{0} + return fileDescriptor_df322afd6c9fb402, []int{0} } + func (NullValue) XXX_WellKnownType() string { return "NullValue" } // `Struct` represents a structured data value, consisting of fields @@ -64,17 +69,19 @@ func (m *Struct) Reset() { *m = Struct{} } func (m *Struct) String() string { return proto.CompactTextString(m) } func (*Struct) ProtoMessage() {} func (*Struct) Descriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{0} + return fileDescriptor_df322afd6c9fb402, []int{0} } + func (*Struct) XXX_WellKnownType() string { return "Struct" } + func (m *Struct) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Struct.Unmarshal(m, b) } func (m *Struct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Struct.Marshal(b, m, deterministic) } -func (dst *Struct) XXX_Merge(src proto.Message) { - xxx_messageInfo_Struct.Merge(dst, src) +func (m *Struct) XXX_Merge(src proto.Message) { + xxx_messageInfo_Struct.Merge(m, src) } func (m *Struct) XXX_Size() int { return xxx_messageInfo_Struct.Size(m) @@ -118,17 +125,19 @@ func (m *Value) Reset() { *m = Value{} } func (m *Value) String() string { return proto.CompactTextString(m) } func (*Value) ProtoMessage() {} func (*Value) Descriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{1} + return fileDescriptor_df322afd6c9fb402, []int{1} } + func (*Value) XXX_WellKnownType() string { return "Value" } + func (m *Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Value.Unmarshal(m, b) } func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Value.Marshal(b, m, deterministic) } -func (dst *Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_Value.Merge(dst, src) +func (m *Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Value.Merge(m, src) } func (m *Value) XXX_Size() int { return xxx_messageInfo_Value.Size(m) @@ -228,9 +237,9 @@ func (m *Value) GetListValue() *ListValue { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Value) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Value_NullValue)(nil), (*Value_NumberValue)(nil), (*Value_StringValue)(nil), @@ -240,129 +249,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, } } -func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Value) - // kind - switch x := m.Kind.(type) { - case *Value_NullValue: - b.EncodeVarint(1<<3 | proto.WireVarint) - b.EncodeVarint(uint64(x.NullValue)) - case *Value_NumberValue: - b.EncodeVarint(2<<3 | proto.WireFixed64) - b.EncodeFixed64(math.Float64bits(x.NumberValue)) - case *Value_StringValue: - b.EncodeVarint(3<<3 | proto.WireBytes) - b.EncodeStringBytes(x.StringValue) - case *Value_BoolValue: - t := uint64(0) - if x.BoolValue { - t = 1 - } - b.EncodeVarint(4<<3 | proto.WireVarint) - b.EncodeVarint(t) - case *Value_StructValue: - b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.StructValue); err != nil { - return err - } - case *Value_ListValue: - b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ListValue); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Value.Kind has unexpected type %T", x) - } - return nil -} - -func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Value) - switch tag { - case 1: // kind.null_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Kind = &Value_NullValue{NullValue(x)} - return true, err - case 2: // kind.number_value - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Kind = &Value_NumberValue{math.Float64frombits(x)} - return true, err - case 3: // kind.string_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Kind = &Value_StringValue{x} - return true, err - case 4: // kind.bool_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Kind = &Value_BoolValue{x != 0} - return true, err - case 5: // kind.struct_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Struct) - err := b.DecodeMessage(msg) - m.Kind = &Value_StructValue{msg} - return true, err - case 6: // kind.list_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(ListValue) - err := b.DecodeMessage(msg) - m.Kind = &Value_ListValue{msg} - return true, err - default: - return false, nil - } -} - -func _Value_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Value) - // kind - switch x := m.Kind.(type) { - case *Value_NullValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.NullValue)) - case *Value_NumberValue: - n += 1 // tag and wire - n += 8 - case *Value_StringValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.StringValue))) - n += len(x.StringValue) - case *Value_BoolValue: - n += 1 // tag and wire - n += 1 - case *Value_StructValue: - s := proto.Size(x.StructValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Value_ListValue: - s := proto.Size(x.ListValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // `ListValue` is a wrapper around a repeated field of values. // // The JSON representation for `ListValue` is JSON array. @@ -378,17 +264,19 @@ func (m *ListValue) Reset() { *m = ListValue{} } func (m *ListValue) String() string { return proto.CompactTextString(m) } func (*ListValue) ProtoMessage() {} func (*ListValue) Descriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{2} + return fileDescriptor_df322afd6c9fb402, []int{2} } + func (*ListValue) XXX_WellKnownType() string { return "ListValue" } + func (m *ListValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListValue.Unmarshal(m, b) } func (m *ListValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListValue.Marshal(b, m, deterministic) } -func (dst *ListValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListValue.Merge(dst, src) +func (m *ListValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListValue.Merge(m, src) } func (m *ListValue) XXX_Size() int { return xxx_messageInfo_ListValue.Size(m) @@ -407,18 +295,16 @@ func (m *ListValue) GetValues() []*Value { } func init() { + proto.RegisterEnum("google.protobuf.NullValue", NullValue_name, NullValue_value) proto.RegisterType((*Struct)(nil), "google.protobuf.Struct") proto.RegisterMapType((map[string]*Value)(nil), "google.protobuf.Struct.FieldsEntry") proto.RegisterType((*Value)(nil), "google.protobuf.Value") proto.RegisterType((*ListValue)(nil), "google.protobuf.ListValue") - proto.RegisterEnum("google.protobuf.NullValue", NullValue_name, NullValue_value) } -func init() { - proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor_struct_3a5a94e0c7801b27) -} +func init() { proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor_df322afd6c9fb402) } -var fileDescriptor_struct_3a5a94e0c7801b27 = []byte{ +var fileDescriptor_df322afd6c9fb402 = []byte{ // 417 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x8b, 0xd3, 0x40, 0x14, 0xc7, 0x3b, 0xc9, 0x36, 0x98, 0x17, 0x59, 0x97, 0x11, 0xb4, 0xac, 0xa2, 0xa1, 0x7b, 0x09, diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp.go b/vendor/github.com/golang/protobuf/ptypes/timestamp.go index 47f10dbc2..8da0df01a 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp.go +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp.go @@ -111,11 +111,9 @@ func TimestampNow() *tspb.Timestamp { // TimestampProto converts the time.Time to a google.protobuf.Timestamp proto. // It returns an error if the resulting Timestamp is invalid. func TimestampProto(t time.Time) (*tspb.Timestamp, error) { - seconds := t.Unix() - nanos := int32(t.Sub(time.Unix(seconds, 0))) ts := &tspb.Timestamp{ - Seconds: seconds, - Nanos: nanos, + Seconds: t.Unix(), + Nanos: int32(t.Nanosecond()), } if err := validateTimestamp(ts); err != nil { return nil, err diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go index 8e76ae976..31cd846de 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/timestamp.proto -package timestamp // import "github.com/golang/protobuf/ptypes/timestamp" +package timestamp -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A Timestamp represents a point in time independent of any time zone // or calendar, represented as seconds and fractions of seconds at @@ -81,7 +83,9 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone -// is required, though only UTC (as indicated by "Z") is presently supported. +// is required. A proto3 JSON serializer should always use UTC (as indicated by +// "Z") when printing the Timestamp type and a proto3 JSON parser should be +// able to accept both UTC and other timezones (as indicated by an offset). // // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past // 01:30 UTC on January 15, 2017. @@ -92,8 +96,8 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one // can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) -// to obtain a formatter capable of generating timestamps in this format. +// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- +// ) to obtain a formatter capable of generating timestamps in this format. // // type Timestamp struct { @@ -115,17 +119,19 @@ func (m *Timestamp) Reset() { *m = Timestamp{} } func (m *Timestamp) String() string { return proto.CompactTextString(m) } func (*Timestamp) ProtoMessage() {} func (*Timestamp) Descriptor() ([]byte, []int) { - return fileDescriptor_timestamp_b826e8e5fba671a8, []int{0} + return fileDescriptor_292007bbfe81227e, []int{0} } + func (*Timestamp) XXX_WellKnownType() string { return "Timestamp" } + func (m *Timestamp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Timestamp.Unmarshal(m, b) } func (m *Timestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Timestamp.Marshal(b, m, deterministic) } -func (dst *Timestamp) XXX_Merge(src proto.Message) { - xxx_messageInfo_Timestamp.Merge(dst, src) +func (m *Timestamp) XXX_Merge(src proto.Message) { + xxx_messageInfo_Timestamp.Merge(m, src) } func (m *Timestamp) XXX_Size() int { return xxx_messageInfo_Timestamp.Size(m) @@ -154,11 +160,9 @@ func init() { proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp") } -func init() { - proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_timestamp_b826e8e5fba671a8) -} +func init() { proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_292007bbfe81227e) } -var fileDescriptor_timestamp_b826e8e5fba671a8 = []byte{ +var fileDescriptor_292007bbfe81227e = []byte{ // 191 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xc9, 0xcc, 0x4d, diff --git a/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go b/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go index 0f0fa837f..add19a1ad 100644 --- a/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/wrappers.proto -package wrappers // import "github.com/golang/protobuf/ptypes/wrappers" +package wrappers -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Wrapper message for `double`. // @@ -33,17 +35,19 @@ func (m *DoubleValue) Reset() { *m = DoubleValue{} } func (m *DoubleValue) String() string { return proto.CompactTextString(m) } func (*DoubleValue) ProtoMessage() {} func (*DoubleValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{0} + return fileDescriptor_5377b62bda767935, []int{0} } + func (*DoubleValue) XXX_WellKnownType() string { return "DoubleValue" } + func (m *DoubleValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DoubleValue.Unmarshal(m, b) } func (m *DoubleValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DoubleValue.Marshal(b, m, deterministic) } -func (dst *DoubleValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_DoubleValue.Merge(dst, src) +func (m *DoubleValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_DoubleValue.Merge(m, src) } func (m *DoubleValue) XXX_Size() int { return xxx_messageInfo_DoubleValue.Size(m) @@ -76,17 +80,19 @@ func (m *FloatValue) Reset() { *m = FloatValue{} } func (m *FloatValue) String() string { return proto.CompactTextString(m) } func (*FloatValue) ProtoMessage() {} func (*FloatValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{1} + return fileDescriptor_5377b62bda767935, []int{1} } + func (*FloatValue) XXX_WellKnownType() string { return "FloatValue" } + func (m *FloatValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FloatValue.Unmarshal(m, b) } func (m *FloatValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FloatValue.Marshal(b, m, deterministic) } -func (dst *FloatValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_FloatValue.Merge(dst, src) +func (m *FloatValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_FloatValue.Merge(m, src) } func (m *FloatValue) XXX_Size() int { return xxx_messageInfo_FloatValue.Size(m) @@ -119,17 +125,19 @@ func (m *Int64Value) Reset() { *m = Int64Value{} } func (m *Int64Value) String() string { return proto.CompactTextString(m) } func (*Int64Value) ProtoMessage() {} func (*Int64Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{2} + return fileDescriptor_5377b62bda767935, []int{2} } + func (*Int64Value) XXX_WellKnownType() string { return "Int64Value" } + func (m *Int64Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Int64Value.Unmarshal(m, b) } func (m *Int64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Int64Value.Marshal(b, m, deterministic) } -func (dst *Int64Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_Int64Value.Merge(dst, src) +func (m *Int64Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Int64Value.Merge(m, src) } func (m *Int64Value) XXX_Size() int { return xxx_messageInfo_Int64Value.Size(m) @@ -162,17 +170,19 @@ func (m *UInt64Value) Reset() { *m = UInt64Value{} } func (m *UInt64Value) String() string { return proto.CompactTextString(m) } func (*UInt64Value) ProtoMessage() {} func (*UInt64Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{3} + return fileDescriptor_5377b62bda767935, []int{3} } + func (*UInt64Value) XXX_WellKnownType() string { return "UInt64Value" } + func (m *UInt64Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UInt64Value.Unmarshal(m, b) } func (m *UInt64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UInt64Value.Marshal(b, m, deterministic) } -func (dst *UInt64Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_UInt64Value.Merge(dst, src) +func (m *UInt64Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_UInt64Value.Merge(m, src) } func (m *UInt64Value) XXX_Size() int { return xxx_messageInfo_UInt64Value.Size(m) @@ -205,17 +215,19 @@ func (m *Int32Value) Reset() { *m = Int32Value{} } func (m *Int32Value) String() string { return proto.CompactTextString(m) } func (*Int32Value) ProtoMessage() {} func (*Int32Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{4} + return fileDescriptor_5377b62bda767935, []int{4} } + func (*Int32Value) XXX_WellKnownType() string { return "Int32Value" } + func (m *Int32Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Int32Value.Unmarshal(m, b) } func (m *Int32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Int32Value.Marshal(b, m, deterministic) } -func (dst *Int32Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_Int32Value.Merge(dst, src) +func (m *Int32Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Int32Value.Merge(m, src) } func (m *Int32Value) XXX_Size() int { return xxx_messageInfo_Int32Value.Size(m) @@ -248,17 +260,19 @@ func (m *UInt32Value) Reset() { *m = UInt32Value{} } func (m *UInt32Value) String() string { return proto.CompactTextString(m) } func (*UInt32Value) ProtoMessage() {} func (*UInt32Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{5} + return fileDescriptor_5377b62bda767935, []int{5} } + func (*UInt32Value) XXX_WellKnownType() string { return "UInt32Value" } + func (m *UInt32Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UInt32Value.Unmarshal(m, b) } func (m *UInt32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UInt32Value.Marshal(b, m, deterministic) } -func (dst *UInt32Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_UInt32Value.Merge(dst, src) +func (m *UInt32Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_UInt32Value.Merge(m, src) } func (m *UInt32Value) XXX_Size() int { return xxx_messageInfo_UInt32Value.Size(m) @@ -291,17 +305,19 @@ func (m *BoolValue) Reset() { *m = BoolValue{} } func (m *BoolValue) String() string { return proto.CompactTextString(m) } func (*BoolValue) ProtoMessage() {} func (*BoolValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{6} + return fileDescriptor_5377b62bda767935, []int{6} } + func (*BoolValue) XXX_WellKnownType() string { return "BoolValue" } + func (m *BoolValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BoolValue.Unmarshal(m, b) } func (m *BoolValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BoolValue.Marshal(b, m, deterministic) } -func (dst *BoolValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_BoolValue.Merge(dst, src) +func (m *BoolValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_BoolValue.Merge(m, src) } func (m *BoolValue) XXX_Size() int { return xxx_messageInfo_BoolValue.Size(m) @@ -334,17 +350,19 @@ func (m *StringValue) Reset() { *m = StringValue{} } func (m *StringValue) String() string { return proto.CompactTextString(m) } func (*StringValue) ProtoMessage() {} func (*StringValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{7} + return fileDescriptor_5377b62bda767935, []int{7} } + func (*StringValue) XXX_WellKnownType() string { return "StringValue" } + func (m *StringValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StringValue.Unmarshal(m, b) } func (m *StringValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StringValue.Marshal(b, m, deterministic) } -func (dst *StringValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_StringValue.Merge(dst, src) +func (m *StringValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_StringValue.Merge(m, src) } func (m *StringValue) XXX_Size() int { return xxx_messageInfo_StringValue.Size(m) @@ -377,17 +395,19 @@ func (m *BytesValue) Reset() { *m = BytesValue{} } func (m *BytesValue) String() string { return proto.CompactTextString(m) } func (*BytesValue) ProtoMessage() {} func (*BytesValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{8} + return fileDescriptor_5377b62bda767935, []int{8} } + func (*BytesValue) XXX_WellKnownType() string { return "BytesValue" } + func (m *BytesValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BytesValue.Unmarshal(m, b) } func (m *BytesValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BytesValue.Marshal(b, m, deterministic) } -func (dst *BytesValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_BytesValue.Merge(dst, src) +func (m *BytesValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_BytesValue.Merge(m, src) } func (m *BytesValue) XXX_Size() int { return xxx_messageInfo_BytesValue.Size(m) @@ -417,11 +437,9 @@ func init() { proto.RegisterType((*BytesValue)(nil), "google.protobuf.BytesValue") } -func init() { - proto.RegisterFile("google/protobuf/wrappers.proto", fileDescriptor_wrappers_16c7c35c009f3253) -} +func init() { proto.RegisterFile("google/protobuf/wrappers.proto", fileDescriptor_5377b62bda767935) } -var fileDescriptor_wrappers_16c7c35c009f3253 = []byte{ +var fileDescriptor_5377b62bda767935 = []byte{ // 259 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x2f, 0x4a, 0x2c, diff --git a/vendor/github.com/google/go-cmp/cmp/cmpopts/equate.go b/vendor/github.com/google/go-cmp/cmp/cmpopts/equate.go new file mode 100644 index 000000000..41bbddc61 --- /dev/null +++ b/vendor/github.com/google/go-cmp/cmp/cmpopts/equate.go @@ -0,0 +1,89 @@ +// Copyright 2017, The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE.md file. + +// Package cmpopts provides common options for the cmp package. +package cmpopts + +import ( + "math" + "reflect" + + "github.com/google/go-cmp/cmp" +) + +func equateAlways(_, _ interface{}) bool { return true } + +// EquateEmpty returns a Comparer option that determines all maps and slices +// with a length of zero to be equal, regardless of whether they are nil. +// +// EquateEmpty can be used in conjunction with SortSlices and SortMaps. +func EquateEmpty() cmp.Option { + return cmp.FilterValues(isEmpty, cmp.Comparer(equateAlways)) +} + +func isEmpty(x, y interface{}) bool { + vx, vy := reflect.ValueOf(x), reflect.ValueOf(y) + return (x != nil && y != nil && vx.Type() == vy.Type()) && + (vx.Kind() == reflect.Slice || vx.Kind() == reflect.Map) && + (vx.Len() == 0 && vy.Len() == 0) +} + +// EquateApprox returns a Comparer option that determines float32 or float64 +// values to be equal if they are within a relative fraction or absolute margin. +// This option is not used when either x or y is NaN or infinite. +// +// The fraction determines that the difference of two values must be within the +// smaller fraction of the two values, while the margin determines that the two +// values must be within some absolute margin. +// To express only a fraction or only a margin, use 0 for the other parameter. +// The fraction and margin must be non-negative. +// +// The mathematical expression used is equivalent to: +// |x-y| ≤ max(fraction*min(|x|, |y|), margin) +// +// EquateApprox can be used in conjunction with EquateNaNs. +func EquateApprox(fraction, margin float64) cmp.Option { + if margin < 0 || fraction < 0 || math.IsNaN(margin) || math.IsNaN(fraction) { + panic("margin or fraction must be a non-negative number") + } + a := approximator{fraction, margin} + return cmp.Options{ + cmp.FilterValues(areRealF64s, cmp.Comparer(a.compareF64)), + cmp.FilterValues(areRealF32s, cmp.Comparer(a.compareF32)), + } +} + +type approximator struct{ frac, marg float64 } + +func areRealF64s(x, y float64) bool { + return !math.IsNaN(x) && !math.IsNaN(y) && !math.IsInf(x, 0) && !math.IsInf(y, 0) +} +func areRealF32s(x, y float32) bool { + return areRealF64s(float64(x), float64(y)) +} +func (a approximator) compareF64(x, y float64) bool { + relMarg := a.frac * math.Min(math.Abs(x), math.Abs(y)) + return math.Abs(x-y) <= math.Max(a.marg, relMarg) +} +func (a approximator) compareF32(x, y float32) bool { + return a.compareF64(float64(x), float64(y)) +} + +// EquateNaNs returns a Comparer option that determines float32 and float64 +// NaN values to be equal. +// +// EquateNaNs can be used in conjunction with EquateApprox. +func EquateNaNs() cmp.Option { + return cmp.Options{ + cmp.FilterValues(areNaNsF64s, cmp.Comparer(equateAlways)), + cmp.FilterValues(areNaNsF32s, cmp.Comparer(equateAlways)), + } +} + +func areNaNsF64s(x, y float64) bool { + return math.IsNaN(x) && math.IsNaN(y) +} +func areNaNsF32s(x, y float32) bool { + return areNaNsF64s(float64(x), float64(y)) +} diff --git a/vendor/github.com/google/go-cmp/cmp/cmpopts/ignore.go b/vendor/github.com/google/go-cmp/cmp/cmpopts/ignore.go new file mode 100644 index 000000000..ff8e785d4 --- /dev/null +++ b/vendor/github.com/google/go-cmp/cmp/cmpopts/ignore.go @@ -0,0 +1,207 @@ +// Copyright 2017, The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE.md file. + +package cmpopts + +import ( + "fmt" + "reflect" + "unicode" + "unicode/utf8" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/internal/function" +) + +// IgnoreFields returns an Option that ignores exported fields of the +// given names on a single struct type. +// The struct type is specified by passing in a value of that type. +// +// The name may be a dot-delimited string (e.g., "Foo.Bar") to ignore a +// specific sub-field that is embedded or nested within the parent struct. +// +// This does not handle unexported fields; use IgnoreUnexported instead. +func IgnoreFields(typ interface{}, names ...string) cmp.Option { + sf := newStructFilter(typ, names...) + return cmp.FilterPath(sf.filter, cmp.Ignore()) +} + +// IgnoreTypes returns an Option that ignores all values assignable to +// certain types, which are specified by passing in a value of each type. +func IgnoreTypes(typs ...interface{}) cmp.Option { + tf := newTypeFilter(typs...) + return cmp.FilterPath(tf.filter, cmp.Ignore()) +} + +type typeFilter []reflect.Type + +func newTypeFilter(typs ...interface{}) (tf typeFilter) { + for _, typ := range typs { + t := reflect.TypeOf(typ) + if t == nil { + // This occurs if someone tries to pass in sync.Locker(nil) + panic("cannot determine type; consider using IgnoreInterfaces") + } + tf = append(tf, t) + } + return tf +} +func (tf typeFilter) filter(p cmp.Path) bool { + if len(p) < 1 { + return false + } + t := p.Last().Type() + for _, ti := range tf { + if t.AssignableTo(ti) { + return true + } + } + return false +} + +// IgnoreInterfaces returns an Option that ignores all values or references of +// values assignable to certain interface types. These interfaces are specified +// by passing in an anonymous struct with the interface types embedded in it. +// For example, to ignore sync.Locker, pass in struct{sync.Locker}{}. +func IgnoreInterfaces(ifaces interface{}) cmp.Option { + tf := newIfaceFilter(ifaces) + return cmp.FilterPath(tf.filter, cmp.Ignore()) +} + +type ifaceFilter []reflect.Type + +func newIfaceFilter(ifaces interface{}) (tf ifaceFilter) { + t := reflect.TypeOf(ifaces) + if ifaces == nil || t.Name() != "" || t.Kind() != reflect.Struct { + panic("input must be an anonymous struct") + } + for i := 0; i < t.NumField(); i++ { + fi := t.Field(i) + switch { + case !fi.Anonymous: + panic("struct cannot have named fields") + case fi.Type.Kind() != reflect.Interface: + panic("embedded field must be an interface type") + case fi.Type.NumMethod() == 0: + // This matches everything; why would you ever want this? + panic("cannot ignore empty interface") + default: + tf = append(tf, fi.Type) + } + } + return tf +} +func (tf ifaceFilter) filter(p cmp.Path) bool { + if len(p) < 1 { + return false + } + t := p.Last().Type() + for _, ti := range tf { + if t.AssignableTo(ti) { + return true + } + if t.Kind() != reflect.Ptr && reflect.PtrTo(t).AssignableTo(ti) { + return true + } + } + return false +} + +// IgnoreUnexported returns an Option that only ignores the immediate unexported +// fields of a struct, including anonymous fields of unexported types. +// In particular, unexported fields within the struct's exported fields +// of struct types, including anonymous fields, will not be ignored unless the +// type of the field itself is also passed to IgnoreUnexported. +// +// Avoid ignoring unexported fields of a type which you do not control (i.e. a +// type from another repository), as changes to the implementation of such types +// may change how the comparison behaves. Prefer a custom Comparer instead. +func IgnoreUnexported(typs ...interface{}) cmp.Option { + ux := newUnexportedFilter(typs...) + return cmp.FilterPath(ux.filter, cmp.Ignore()) +} + +type unexportedFilter struct{ m map[reflect.Type]bool } + +func newUnexportedFilter(typs ...interface{}) unexportedFilter { + ux := unexportedFilter{m: make(map[reflect.Type]bool)} + for _, typ := range typs { + t := reflect.TypeOf(typ) + if t == nil || t.Kind() != reflect.Struct { + panic(fmt.Sprintf("invalid struct type: %T", typ)) + } + ux.m[t] = true + } + return ux +} +func (xf unexportedFilter) filter(p cmp.Path) bool { + sf, ok := p.Index(-1).(cmp.StructField) + if !ok { + return false + } + return xf.m[p.Index(-2).Type()] && !isExported(sf.Name()) +} + +// isExported reports whether the identifier is exported. +func isExported(id string) bool { + r, _ := utf8.DecodeRuneInString(id) + return unicode.IsUpper(r) +} + +// IgnoreSliceElements returns an Option that ignores elements of []V. +// The discard function must be of the form "func(T) bool" which is used to +// ignore slice elements of type V, where V is assignable to T. +// Elements are ignored if the function reports true. +func IgnoreSliceElements(discardFunc interface{}) cmp.Option { + vf := reflect.ValueOf(discardFunc) + if !function.IsType(vf.Type(), function.ValuePredicate) || vf.IsNil() { + panic(fmt.Sprintf("invalid discard function: %T", discardFunc)) + } + return cmp.FilterPath(func(p cmp.Path) bool { + si, ok := p.Index(-1).(cmp.SliceIndex) + if !ok { + return false + } + if !si.Type().AssignableTo(vf.Type().In(0)) { + return false + } + vx, vy := si.Values() + if vx.IsValid() && vf.Call([]reflect.Value{vx})[0].Bool() { + return true + } + if vy.IsValid() && vf.Call([]reflect.Value{vy})[0].Bool() { + return true + } + return false + }, cmp.Ignore()) +} + +// IgnoreMapEntries returns an Option that ignores entries of map[K]V. +// The discard function must be of the form "func(T, R) bool" which is used to +// ignore map entries of type K and V, where K and V are assignable to T and R. +// Entries are ignored if the function reports true. +func IgnoreMapEntries(discardFunc interface{}) cmp.Option { + vf := reflect.ValueOf(discardFunc) + if !function.IsType(vf.Type(), function.KeyValuePredicate) || vf.IsNil() { + panic(fmt.Sprintf("invalid discard function: %T", discardFunc)) + } + return cmp.FilterPath(func(p cmp.Path) bool { + mi, ok := p.Index(-1).(cmp.MapIndex) + if !ok { + return false + } + if !mi.Key().Type().AssignableTo(vf.Type().In(0)) || !mi.Type().AssignableTo(vf.Type().In(1)) { + return false + } + k := mi.Key() + vx, vy := mi.Values() + if vx.IsValid() && vf.Call([]reflect.Value{k, vx})[0].Bool() { + return true + } + if vy.IsValid() && vf.Call([]reflect.Value{k, vy})[0].Bool() { + return true + } + return false + }, cmp.Ignore()) +} diff --git a/vendor/github.com/google/go-cmp/cmp/cmpopts/sort.go b/vendor/github.com/google/go-cmp/cmp/cmpopts/sort.go new file mode 100644 index 000000000..3a4804621 --- /dev/null +++ b/vendor/github.com/google/go-cmp/cmp/cmpopts/sort.go @@ -0,0 +1,147 @@ +// Copyright 2017, The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE.md file. + +package cmpopts + +import ( + "fmt" + "reflect" + "sort" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/internal/function" +) + +// SortSlices returns a Transformer option that sorts all []V. +// The less function must be of the form "func(T, T) bool" which is used to +// sort any slice with element type V that is assignable to T. +// +// The less function must be: +// • Deterministic: less(x, y) == less(x, y) +// • Irreflexive: !less(x, x) +// • Transitive: if !less(x, y) and !less(y, z), then !less(x, z) +// +// The less function does not have to be "total". That is, if !less(x, y) and +// !less(y, x) for two elements x and y, their relative order is maintained. +// +// SortSlices can be used in conjunction with EquateEmpty. +func SortSlices(lessFunc interface{}) cmp.Option { + vf := reflect.ValueOf(lessFunc) + if !function.IsType(vf.Type(), function.Less) || vf.IsNil() { + panic(fmt.Sprintf("invalid less function: %T", lessFunc)) + } + ss := sliceSorter{vf.Type().In(0), vf} + return cmp.FilterValues(ss.filter, cmp.Transformer("cmpopts.SortSlices", ss.sort)) +} + +type sliceSorter struct { + in reflect.Type // T + fnc reflect.Value // func(T, T) bool +} + +func (ss sliceSorter) filter(x, y interface{}) bool { + vx, vy := reflect.ValueOf(x), reflect.ValueOf(y) + if !(x != nil && y != nil && vx.Type() == vy.Type()) || + !(vx.Kind() == reflect.Slice && vx.Type().Elem().AssignableTo(ss.in)) || + (vx.Len() <= 1 && vy.Len() <= 1) { + return false + } + // Check whether the slices are already sorted to avoid an infinite + // recursion cycle applying the same transform to itself. + ok1 := sort.SliceIsSorted(x, func(i, j int) bool { return ss.less(vx, i, j) }) + ok2 := sort.SliceIsSorted(y, func(i, j int) bool { return ss.less(vy, i, j) }) + return !ok1 || !ok2 +} +func (ss sliceSorter) sort(x interface{}) interface{} { + src := reflect.ValueOf(x) + dst := reflect.MakeSlice(src.Type(), src.Len(), src.Len()) + for i := 0; i < src.Len(); i++ { + dst.Index(i).Set(src.Index(i)) + } + sort.SliceStable(dst.Interface(), func(i, j int) bool { return ss.less(dst, i, j) }) + ss.checkSort(dst) + return dst.Interface() +} +func (ss sliceSorter) checkSort(v reflect.Value) { + start := -1 // Start of a sequence of equal elements. + for i := 1; i < v.Len(); i++ { + if ss.less(v, i-1, i) { + // Check that first and last elements in v[start:i] are equal. + if start >= 0 && (ss.less(v, start, i-1) || ss.less(v, i-1, start)) { + panic(fmt.Sprintf("incomparable values detected: want equal elements: %v", v.Slice(start, i))) + } + start = -1 + } else if start == -1 { + start = i + } + } +} +func (ss sliceSorter) less(v reflect.Value, i, j int) bool { + vx, vy := v.Index(i), v.Index(j) + return ss.fnc.Call([]reflect.Value{vx, vy})[0].Bool() +} + +// SortMaps returns a Transformer option that flattens map[K]V types to be a +// sorted []struct{K, V}. The less function must be of the form +// "func(T, T) bool" which is used to sort any map with key K that is +// assignable to T. +// +// Flattening the map into a slice has the property that cmp.Equal is able to +// use Comparers on K or the K.Equal method if it exists. +// +// The less function must be: +// • Deterministic: less(x, y) == less(x, y) +// • Irreflexive: !less(x, x) +// • Transitive: if !less(x, y) and !less(y, z), then !less(x, z) +// • Total: if x != y, then either less(x, y) or less(y, x) +// +// SortMaps can be used in conjunction with EquateEmpty. +func SortMaps(lessFunc interface{}) cmp.Option { + vf := reflect.ValueOf(lessFunc) + if !function.IsType(vf.Type(), function.Less) || vf.IsNil() { + panic(fmt.Sprintf("invalid less function: %T", lessFunc)) + } + ms := mapSorter{vf.Type().In(0), vf} + return cmp.FilterValues(ms.filter, cmp.Transformer("cmpopts.SortMaps", ms.sort)) +} + +type mapSorter struct { + in reflect.Type // T + fnc reflect.Value // func(T, T) bool +} + +func (ms mapSorter) filter(x, y interface{}) bool { + vx, vy := reflect.ValueOf(x), reflect.ValueOf(y) + return (x != nil && y != nil && vx.Type() == vy.Type()) && + (vx.Kind() == reflect.Map && vx.Type().Key().AssignableTo(ms.in)) && + (vx.Len() != 0 || vy.Len() != 0) +} +func (ms mapSorter) sort(x interface{}) interface{} { + src := reflect.ValueOf(x) + outType := reflect.StructOf([]reflect.StructField{ + {Name: "K", Type: src.Type().Key()}, + {Name: "V", Type: src.Type().Elem()}, + }) + dst := reflect.MakeSlice(reflect.SliceOf(outType), src.Len(), src.Len()) + for i, k := range src.MapKeys() { + v := reflect.New(outType).Elem() + v.Field(0).Set(k) + v.Field(1).Set(src.MapIndex(k)) + dst.Index(i).Set(v) + } + sort.Slice(dst.Interface(), func(i, j int) bool { return ms.less(dst, i, j) }) + ms.checkSort(dst) + return dst.Interface() +} +func (ms mapSorter) checkSort(v reflect.Value) { + for i := 1; i < v.Len(); i++ { + if !ms.less(v, i-1, i) { + panic(fmt.Sprintf("partial order detected: want %v < %v", v.Index(i-1), v.Index(i))) + } + } +} +func (ms mapSorter) less(v reflect.Value, i, j int) bool { + vx, vy := v.Index(i).Field(0), v.Index(j).Field(0) + return ms.fnc.Call([]reflect.Value{vx, vy})[0].Bool() +} diff --git a/vendor/github.com/google/go-cmp/cmp/cmpopts/struct_filter.go b/vendor/github.com/google/go-cmp/cmp/cmpopts/struct_filter.go new file mode 100644 index 000000000..97f707983 --- /dev/null +++ b/vendor/github.com/google/go-cmp/cmp/cmpopts/struct_filter.go @@ -0,0 +1,182 @@ +// Copyright 2017, The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE.md file. + +package cmpopts + +import ( + "fmt" + "reflect" + "strings" + + "github.com/google/go-cmp/cmp" +) + +// filterField returns a new Option where opt is only evaluated on paths that +// include a specific exported field on a single struct type. +// The struct type is specified by passing in a value of that type. +// +// The name may be a dot-delimited string (e.g., "Foo.Bar") to select a +// specific sub-field that is embedded or nested within the parent struct. +func filterField(typ interface{}, name string, opt cmp.Option) cmp.Option { + // TODO: This is currently unexported over concerns of how helper filters + // can be composed together easily. + // TODO: Add tests for FilterField. + + sf := newStructFilter(typ, name) + return cmp.FilterPath(sf.filter, opt) +} + +type structFilter struct { + t reflect.Type // The root struct type to match on + ft fieldTree // Tree of fields to match on +} + +func newStructFilter(typ interface{}, names ...string) structFilter { + // TODO: Perhaps allow * as a special identifier to allow ignoring any + // number of path steps until the next field match? + // This could be useful when a concrete struct gets transformed into + // an anonymous struct where it is not possible to specify that by type, + // but the transformer happens to provide guarantees about the names of + // the transformed fields. + + t := reflect.TypeOf(typ) + if t == nil || t.Kind() != reflect.Struct { + panic(fmt.Sprintf("%T must be a struct", typ)) + } + var ft fieldTree + for _, name := range names { + cname, err := canonicalName(t, name) + if err != nil { + panic(fmt.Sprintf("%s: %v", strings.Join(cname, "."), err)) + } + ft.insert(cname) + } + return structFilter{t, ft} +} + +func (sf structFilter) filter(p cmp.Path) bool { + for i, ps := range p { + if ps.Type().AssignableTo(sf.t) && sf.ft.matchPrefix(p[i+1:]) { + return true + } + } + return false +} + +// fieldTree represents a set of dot-separated identifiers. +// +// For example, inserting the following selectors: +// Foo +// Foo.Bar.Baz +// Foo.Buzz +// Nuka.Cola.Quantum +// +// Results in a tree of the form: +// {sub: { +// "Foo": {ok: true, sub: { +// "Bar": {sub: { +// "Baz": {ok: true}, +// }}, +// "Buzz": {ok: true}, +// }}, +// "Nuka": {sub: { +// "Cola": {sub: { +// "Quantum": {ok: true}, +// }}, +// }}, +// }} +type fieldTree struct { + ok bool // Whether this is a specified node + sub map[string]fieldTree // The sub-tree of fields under this node +} + +// insert inserts a sequence of field accesses into the tree. +func (ft *fieldTree) insert(cname []string) { + if ft.sub == nil { + ft.sub = make(map[string]fieldTree) + } + if len(cname) == 0 { + ft.ok = true + return + } + sub := ft.sub[cname[0]] + sub.insert(cname[1:]) + ft.sub[cname[0]] = sub +} + +// matchPrefix reports whether any selector in the fieldTree matches +// the start of path p. +func (ft fieldTree) matchPrefix(p cmp.Path) bool { + for _, ps := range p { + switch ps := ps.(type) { + case cmp.StructField: + ft = ft.sub[ps.Name()] + if ft.ok { + return true + } + if len(ft.sub) == 0 { + return false + } + case cmp.Indirect: + default: + return false + } + } + return false +} + +// canonicalName returns a list of identifiers where any struct field access +// through an embedded field is expanded to include the names of the embedded +// types themselves. +// +// For example, suppose field "Foo" is not directly in the parent struct, +// but actually from an embedded struct of type "Bar". Then, the canonical name +// of "Foo" is actually "Bar.Foo". +// +// Suppose field "Foo" is not directly in the parent struct, but actually +// a field in two different embedded structs of types "Bar" and "Baz". +// Then the selector "Foo" causes a panic since it is ambiguous which one it +// refers to. The user must specify either "Bar.Foo" or "Baz.Foo". +func canonicalName(t reflect.Type, sel string) ([]string, error) { + var name string + sel = strings.TrimPrefix(sel, ".") + if sel == "" { + return nil, fmt.Errorf("name must not be empty") + } + if i := strings.IndexByte(sel, '.'); i < 0 { + name, sel = sel, "" + } else { + name, sel = sel[:i], sel[i:] + } + + // Type must be a struct or pointer to struct. + if t.Kind() == reflect.Ptr { + t = t.Elem() + } + if t.Kind() != reflect.Struct { + return nil, fmt.Errorf("%v must be a struct", t) + } + + // Find the canonical name for this current field name. + // If the field exists in an embedded struct, then it will be expanded. + if !isExported(name) { + // Disallow unexported fields: + // * To discourage people from actually touching unexported fields + // * FieldByName is buggy (https://golang.org/issue/4876) + return []string{name}, fmt.Errorf("name must be exported") + } + sf, ok := t.FieldByName(name) + if !ok { + return []string{name}, fmt.Errorf("does not exist") + } + var ss []string + for i := range sf.Index { + ss = append(ss, t.FieldByIndex(sf.Index[:i+1]).Name) + } + if sel == "" { + return ss, nil + } + ssPost, err := canonicalName(sf.Type, sel) + return append(ss, ssPost...), err +} diff --git a/vendor/github.com/google/go-cmp/cmp/cmpopts/xform.go b/vendor/github.com/google/go-cmp/cmp/cmpopts/xform.go new file mode 100644 index 000000000..9d651553d --- /dev/null +++ b/vendor/github.com/google/go-cmp/cmp/cmpopts/xform.go @@ -0,0 +1,35 @@ +// Copyright 2018, The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE.md file. + +package cmpopts + +import ( + "github.com/google/go-cmp/cmp" +) + +type xformFilter struct{ xform cmp.Option } + +func (xf xformFilter) filter(p cmp.Path) bool { + for _, ps := range p { + if t, ok := ps.(cmp.Transform); ok && t.Option() == xf.xform { + return false + } + } + return true +} + +// AcyclicTransformer returns a Transformer with a filter applied that ensures +// that the transformer cannot be recursively applied upon its own output. +// +// An example use case is a transformer that splits a string by lines: +// AcyclicTransformer("SplitLines", func(s string) []string{ +// return strings.Split(s, "\n") +// }) +// +// Had this been an unfiltered Transformer instead, this would result in an +// infinite cycle converting a string to []string to [][]string and so on. +func AcyclicTransformer(name string, xformFunc interface{}) cmp.Option { + xf := xformFilter{cmp.Transformer(name, xformFunc)} + return cmp.FilterPath(xf.filter, xf.xform) +} diff --git a/vendor/github.com/knative/caching/Gopkg.lock b/vendor/github.com/knative/caching/Gopkg.lock deleted file mode 100644 index cfe7125c3..000000000 --- a/vendor/github.com/knative/caching/Gopkg.lock +++ /dev/null @@ -1,538 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "NUT" - revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" - version = "v1.1.1" - -[[projects]] - digest = "1:81466b4218bf6adddac2572a30ac733a9255919bc2f470b4827a317bd4ee1756" - name = "github.com/ghodss/yaml" - packages = ["."] - pruneopts = "NUT" - revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" - version = "v1.0.0" - -[[projects]] - digest = "1:abea725bcf0210887f5da19d804fffa1dd45a42a56bdf5f02322345e3fee4f0d" - name = "github.com/gogo/protobuf" - packages = [ - "proto", - "sortkeys", - ] - pruneopts = "NUT" - revision = "4cbf7e384e768b4e01799441fdf2a706a5635ae7" - version = "v1.2.0" - -[[projects]] - branch = "master" - digest = "1:e2b86e41f3d669fc36b50d31d32d22c8ac656c75aa5ea89717ce7177e134ff2a" - name = "github.com/golang/glog" - packages = ["."] - pruneopts = "NUT" - revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" - -[[projects]] - digest = "1:63ccdfbd20f7ccd2399d0647a7d100b122f79c13bb83da9660b1598396fd9f62" - name = "github.com/golang/protobuf" - packages = [ - "proto", - "ptypes", - "ptypes/any", - "ptypes/duration", - "ptypes/timestamp", - ] - pruneopts = "NUT" - revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" - version = "v1.2.0" - -[[projects]] - branch = "master" - digest = "1:05f95ffdfcf651bdb0f05b40b69e7f5663047f8da75c72d58728acb59b5cc107" - name = "github.com/google/btree" - packages = ["."] - pruneopts = "NUT" - revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" - -[[projects]] - digest = "1:2e3c336fc7fde5c984d2841455a658a6d626450b1754a854b3b32e7a8f49a07a" - name = "github.com/google/go-cmp" - packages = [ - "cmp", - "cmp/internal/diff", - "cmp/internal/function", - "cmp/internal/value", - ] - pruneopts = "NUT" - revision = "3af367b6b30c263d47e8895973edcca9a49cf029" - version = "v0.2.0" - -[[projects]] - branch = "master" - digest = "1:52c5834e2bebac9030c97cc0798ac11c3aa8a39f098aeb419f142533da6cd3cc" - name = "github.com/google/gofuzz" - packages = ["."] - pruneopts = "NUT" - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" - -[[projects]] - branch = "master" - digest = "1:b6b3bd1c08338cb397623d1b9dedde711eccc2d3408fe9017a495d815065d869" - name = "github.com/google/licenseclassifier" - packages = [ - ".", - "internal/sets", - "stringclassifier", - "stringclassifier/internal/pq", - "stringclassifier/searchset", - "stringclassifier/searchset/tokenizer", - ] - pruneopts = "NUT" - revision = "c2a262e3078ad90718f59866f1ec18601b2fee1b" - -[[projects]] - digest = "1:06a7dadb7b760767341ffb6c8d377238d68a1226f2b21b5d497d2e3f6ecf6b4e" - name = "github.com/googleapis/gnostic" - packages = [ - "OpenAPIv2", - "compiler", - "extensions", - ] - pruneopts = "NUT" - revision = "7c663266750e7d82587642f65e60bc4083f1f84e" - version = "v0.2.0" - -[[projects]] - branch = "master" - digest = "1:7fdf3223c7372d1ced0b98bf53457c5e89d89aecbad9a77ba9fcc6e01f9e5621" - name = "github.com/gregjones/httpcache" - packages = [ - ".", - "diskcache", - ] - pruneopts = "NUT" - revision = "9cad4c3443a7200dd6400aef47183728de563a38" - -[[projects]] - digest = "1:b42cde0e1f3c816dd57f57f7bbcf05ca40263ad96f168714c130c611fc0856a6" - name = "github.com/hashicorp/golang-lru" - packages = [ - ".", - "simplelru", - ] - pruneopts = "NUT" - revision = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768" - version = "v0.5.0" - -[[projects]] - digest = "1:0243cffa4a3410f161ee613dfdd903a636d07e838a42d341da95d81f42cd1d41" - name = "github.com/json-iterator/go" - packages = ["."] - pruneopts = "NUT" - revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682" - -[[projects]] - digest = "1:fa6e19b10f3088d6f290e32ba2f9735d2810dd8e6544028d4d0c842c162b83ef" - name = "github.com/knative/pkg" - packages = [ - "apis", - "kmeta", - ] - pruneopts = "NUT" - revision = "60fdcbcabd2faeb34328d8b2725dc76c59189453" - -[[projects]] - branch = "master" - digest = "1:da39b58557275d30a9340c2e1e13e16691461f9859d3230f59cceed411c04b49" - name = "github.com/knative/test-infra" - packages = [ - "scripts", - "tools/dep-collector", - ] - pruneopts = "UT" - revision = "89e4aae358be056ee70b595c20106a4a5c70fdc1" - -[[projects]] - digest = "1:2f42fa12d6911c7b7659738758631bec870b7e9b4c6be5444f963cdcfccc191f" - name = "github.com/modern-go/concurrent" - packages = ["."] - pruneopts = "NUT" - revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" - version = "1.0.3" - -[[projects]] - digest = "1:c6aca19413b13dc59c220ad7430329e2ec454cc310bc6d8de2c7e2b93c18a0f6" - name = "github.com/modern-go/reflect2" - packages = ["."] - pruneopts = "NUT" - revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" - version = "1.0.1" - -[[projects]] - branch = "master" - digest = "1:3bf17a6e6eaa6ad24152148a631d18662f7212e21637c2699bff3369b7f00fa2" - name = "github.com/petar/GoLLRB" - packages = ["llrb"] - pruneopts = "NUT" - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" - -[[projects]] - digest = "1:6c6d91dc326ed6778783cff869c49fb2f61303cdd2ebbcf90abe53505793f3b6" - name = "github.com/peterbourgon/diskv" - packages = ["."] - pruneopts = "NUT" - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" - -[[projects]] - digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04" - name = "github.com/sergi/go-diff" - packages = ["diffmatchpatch"] - pruneopts = "NUT" - revision = "1744e2970ca51c86172c8190fadad617561ed6e7" - version = "v1.0.0" - -[[projects]] - digest = "1:9d8420bbf131d1618bde6530af37c3799340d3762cc47210c1d9532a4c3a2779" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "NUT" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" - -[[projects]] - branch = "master" - digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8" - name = "golang.org/x/crypto" - packages = ["ssh/terminal"] - pruneopts = "NUT" - revision = "182538f80094b6a8efaade63a8fd8e0d9d5843dd" - -[[projects]] - branch = "master" - digest = "1:1400b8e87c2c9bd486ea1a13155f59f8f02d385761206df05c0b7db007a53b2c" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - "http/httpguts", - "http2", - "http2/hpack", - "idna", - ] - pruneopts = "NUT" - revision = "8a410e7b638dca158bf9e766925842f6651ff828" - -[[projects]] - branch = "master" - digest = "1:13d575ad6576f56693a410e77830da614005f87955e7cd2ac6afbf9b54afd651" - name = "golang.org/x/oauth2" - packages = [ - ".", - "internal", - ] - pruneopts = "NUT" - revision = "e64efc72b421e893cbf63f17ba2221e7d6d0b0f3" - -[[projects]] - branch = "master" - digest = "1:8270f14d85e8d36e852e018872ac923f7a2067648bfe8428d01be288818aa337" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - ] - pruneopts = "NUT" - revision = "fa5fdf94c78965f1aa8423f0cc50b8b8d728b05a" - -[[projects]] - digest = "1:e7071ed636b5422cc51c0e3a6cebc229d6c9fffc528814b519a980641422d619" - name = "golang.org/x/text" - packages = [ - "collate", - "collate/build", - "internal/colltab", - "internal/gen", - "internal/tag", - "internal/triegen", - "internal/ucd", - "language", - "secure/bidirule", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable", - ] - pruneopts = "NUT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - branch = "master" - digest = "1:c9e7a4b4d47c0ed205d257648b0e5b0440880cb728506e318f8ac7cd36270bc4" - name = "golang.org/x/time" - packages = ["rate"] - pruneopts = "NUT" - revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" - -[[projects]] - branch = "master" - digest = "1:a05bd2d296bc727082abcb63ff52615b4dcc6219d8b61e99fd83d605dc779a18" - name = "golang.org/x/tools" - packages = [ - "go/ast/astutil", - "imports", - "internal/fastwalk", - ] - pruneopts = "NUT" - revision = "7ca132754999accbaa5c1735eda29e7ce0f3bf03" - -[[projects]] - digest = "1:34c10243da5972105edd1b4b883e2bd918fbb3f73fbe14d6af6929e547173494" - name = "google.golang.org/appengine" - packages = [ - "internal", - "internal/base", - "internal/datastore", - "internal/log", - "internal/remote_api", - "internal/urlfetch", - "urlfetch", - ] - pruneopts = "NUT" - revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1" - version = "v1.4.0" - -[[projects]] - digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" - name = "gopkg.in/inf.v0" - packages = ["."] - pruneopts = "NUT" - revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf" - version = "v0.9.1" - -[[projects]] - digest = "1:18108594151654e9e696b27b181b953f9a90b16bf14d253dd1b397b025a1487f" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "NUT" - revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" - version = "v2.2.2" - -[[projects]] - digest = "1:4485f6050feae6844efd79bce3f5b35e5ed4a21dd79ef6a2dbbee263531cea09" - name = "k8s.io/api" - packages = [ - "admissionregistration/v1alpha1", - "admissionregistration/v1beta1", - "apps/v1", - "apps/v1beta1", - "apps/v1beta2", - "authentication/v1", - "authentication/v1beta1", - "authorization/v1", - "authorization/v1beta1", - "autoscaling/v1", - "autoscaling/v2beta1", - "autoscaling/v2beta2", - "batch/v1", - "batch/v1beta1", - "batch/v2alpha1", - "certificates/v1beta1", - "coordination/v1beta1", - "core/v1", - "events/v1beta1", - "extensions/v1beta1", - "networking/v1", - "policy/v1beta1", - "rbac/v1", - "rbac/v1alpha1", - "rbac/v1beta1", - "scheduling/v1alpha1", - "scheduling/v1beta1", - "settings/v1alpha1", - "storage/v1", - "storage/v1alpha1", - "storage/v1beta1", - ] - pruneopts = "NUT" - revision = "145d52631d00cbfe68490d19ae4f0f501fd31a95" - version = "kubernetes-1.12.6" - -[[projects]] - digest = "1:b172899fc4b03d2bda3c223706822b3cf801b2a63ce4740dda0fe8206db97017" - name = "k8s.io/apimachinery" - packages = [ - "pkg/api/equality", - "pkg/api/errors", - "pkg/api/meta", - "pkg/api/resource", - "pkg/apis/meta/internalversion", - "pkg/apis/meta/v1", - "pkg/apis/meta/v1/unstructured", - "pkg/apis/meta/v1beta1", - "pkg/conversion", - "pkg/conversion/queryparams", - "pkg/fields", - "pkg/labels", - "pkg/runtime", - "pkg/runtime/schema", - "pkg/runtime/serializer", - "pkg/runtime/serializer/json", - "pkg/runtime/serializer/protobuf", - "pkg/runtime/serializer/recognizer", - "pkg/runtime/serializer/streaming", - "pkg/runtime/serializer/versioning", - "pkg/selection", - "pkg/types", - "pkg/util/cache", - "pkg/util/clock", - "pkg/util/diff", - "pkg/util/errors", - "pkg/util/framer", - "pkg/util/intstr", - "pkg/util/json", - "pkg/util/mergepatch", - "pkg/util/naming", - "pkg/util/net", - "pkg/util/runtime", - "pkg/util/sets", - "pkg/util/sets/types", - "pkg/util/strategicpatch", - "pkg/util/validation", - "pkg/util/validation/field", - "pkg/util/wait", - "pkg/util/yaml", - "pkg/version", - "pkg/watch", - "third_party/forked/golang/json", - "third_party/forked/golang/reflect", - ] - pruneopts = "NUT" - revision = "01f179d85dbce0f2e0e4351a92394b38694b7cae" - version = "kubernetes-1.12.6" - -[[projects]] - digest = "1:2d8d57c8bd9075e441307d242f4a1a56510c19cbce082b434150ad9b94409c25" - name = "k8s.io/client-go" - packages = [ - "discovery", - "discovery/fake", - "kubernetes/scheme", - "pkg/apis/clientauthentication", - "pkg/apis/clientauthentication/v1alpha1", - "pkg/apis/clientauthentication/v1beta1", - "pkg/version", - "plugin/pkg/client/auth/exec", - "rest", - "rest/watch", - "testing", - "tools/cache", - "tools/clientcmd/api", - "tools/metrics", - "tools/pager", - "transport", - "util/buffer", - "util/cert", - "util/connrotation", - "util/flowcontrol", - "util/integer", - "util/retry", - ] - pruneopts = "NUT" - revision = "78295b709ec6fa5be12e35892477a326dea2b5d3" - version = "kubernetes-1.12.6" - -[[projects]] - digest = "1:26b81b5e76e3f84ea5140da4f74649576e470f79091d2ef8e0d1b5000bc636ca" - name = "k8s.io/code-generator" - packages = [ - "cmd/client-gen", - "cmd/client-gen/args", - "cmd/client-gen/generators", - "cmd/client-gen/generators/fake", - "cmd/client-gen/generators/scheme", - "cmd/client-gen/generators/util", - "cmd/client-gen/path", - "cmd/client-gen/types", - "cmd/deepcopy-gen", - "cmd/deepcopy-gen/args", - "cmd/defaulter-gen", - "cmd/defaulter-gen/args", - "cmd/informer-gen", - "cmd/informer-gen/args", - "cmd/informer-gen/generators", - "cmd/lister-gen", - "cmd/lister-gen/args", - "cmd/lister-gen/generators", - "pkg/util", - ] - pruneopts = "T" - revision = "b1289fc74931d4b6b04bd1a259acfc88a2cb0a66" - version = "kubernetes-1.12.6" - -[[projects]] - branch = "master" - digest = "1:5249c83f0fb9e277b2d28c19eca814feac7ef05dc762e4deaf0a2e4b1a7c5df3" - name = "k8s.io/gengo" - packages = [ - "args", - "examples/deepcopy-gen/generators", - "examples/defaulter-gen/generators", - "examples/set-gen/sets", - "generator", - "namer", - "parser", - "types", - ] - pruneopts = "NUT" - revision = "4242d8e6c5dba56827bb7bcf14ad11cda38f3991" - -[[projects]] - branch = "master" - digest = "1:a2c842a1e0aed96fd732b535514556323a6f5edfded3b63e5e0ab1bce188aa54" - name = "k8s.io/kube-openapi" - packages = ["pkg/util/proto"] - pruneopts = "NUT" - revision = "e3762e86a74c878ffed47484592986685639c2cd" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/google/go-cmp/cmp", - "github.com/knative/pkg/apis", - "github.com/knative/pkg/kmeta", - "github.com/knative/test-infra/scripts", - "github.com/knative/test-infra/tools/dep-collector", - "k8s.io/api/core/v1", - "k8s.io/apimachinery/pkg/api/equality", - "k8s.io/apimachinery/pkg/api/errors", - "k8s.io/apimachinery/pkg/apis/meta/v1", - "k8s.io/apimachinery/pkg/labels", - "k8s.io/apimachinery/pkg/runtime", - "k8s.io/apimachinery/pkg/runtime/schema", - "k8s.io/apimachinery/pkg/runtime/serializer", - "k8s.io/apimachinery/pkg/types", - "k8s.io/apimachinery/pkg/util/runtime", - "k8s.io/apimachinery/pkg/util/sets/types", - "k8s.io/apimachinery/pkg/watch", - "k8s.io/client-go/discovery", - "k8s.io/client-go/discovery/fake", - "k8s.io/client-go/rest", - "k8s.io/client-go/testing", - "k8s.io/client-go/tools/cache", - "k8s.io/client-go/util/flowcontrol", - "k8s.io/code-generator/cmd/client-gen", - "k8s.io/code-generator/cmd/deepcopy-gen", - "k8s.io/code-generator/cmd/defaulter-gen", - "k8s.io/code-generator/cmd/informer-gen", - "k8s.io/code-generator/cmd/lister-gen", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/vendor/github.com/knative/caching/Gopkg.toml b/vendor/github.com/knative/caching/Gopkg.toml deleted file mode 100644 index 4378ba90b..000000000 --- a/vendor/github.com/knative/caching/Gopkg.toml +++ /dev/null @@ -1,48 +0,0 @@ -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. - -required = [ - "k8s.io/apimachinery/pkg/util/sets/types", - "k8s.io/code-generator/cmd/deepcopy-gen", - "k8s.io/code-generator/cmd/defaulter-gen", - "k8s.io/code-generator/cmd/client-gen", - "k8s.io/code-generator/cmd/lister-gen", - "k8s.io/code-generator/cmd/informer-gen", - "github.com/knative/test-infra/scripts", - "github.com/knative/test-infra/tools/dep-collector", -] - -[[override]] - name = "k8s.io/api" - version = "kubernetes-1.12.6" - -[[override]] - name = "k8s.io/apimachinery" - version = "kubernetes-1.12.6" - -[[override]] - name = "k8s.io/code-generator" - version = "kubernetes-1.12.6" - -[[override]] - name = "k8s.io/client-go" - version = "kubernetes-1.12.6" - -[[override]] - name = "github.com/knative/pkg" - # HEAD as of 2019-03-21 - revision = "60fdcbcabd2faeb34328d8b2725dc76c59189453" - -[prune] - go-tests = true - unused-packages = true - non-go = true - -[[prune.project]] - name = "k8s.io/code-generator" - unused-packages = false - non-go = false - -[[prune.project]] - name = "github.com/knative/test-infra" - non-go = false diff --git a/vendor/github.com/knative/caching/OWNERS b/vendor/github.com/knative/caching/OWNERS deleted file mode 100644 index e5d053381..000000000 --- a/vendor/github.com/knative/caching/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- evankanderson -- mattmoor -- vaikas-google diff --git a/vendor/github.com/knative/caching/test/OWNERS b/vendor/github.com/knative/caching/test/OWNERS deleted file mode 100644 index ed29d4015..000000000 --- a/vendor/github.com/knative/caching/test/OWNERS +++ /dev/null @@ -1,7 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- adrcunha -- jessiezcc -- srinivashegde86 -- steuhs diff --git a/vendor/github.com/knative/pkg/.github/pull-request-template.md b/vendor/github.com/knative/pkg/.github/pull-request-template.md deleted file mode 100644 index 033ec443c..000000000 --- a/vendor/github.com/knative/pkg/.github/pull-request-template.md +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/vendor/github.com/tektoncd/pipeline/config/300-imagecache.yaml b/vendor/github.com/tektoncd/pipeline/config/300-imagecache.yaml index f10d6dacf..70e20bf27 120000 --- a/vendor/github.com/tektoncd/pipeline/config/300-imagecache.yaml +++ b/vendor/github.com/tektoncd/pipeline/config/300-imagecache.yaml @@ -1 +1 @@ -../vendor/github.com/knative/caching/config/image.yaml \ No newline at end of file +../vendor/knative.dev/caching/config/image.yaml \ No newline at end of file diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/config/store.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/config/store.go index d0e0e0c7e..a9eae3e3c 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/config/store.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/config/store.go @@ -19,7 +19,7 @@ package config import ( "context" - "github.com/knative/pkg/configmap" + "knative.dev/pkg/configmap" ) type cfgKey struct{} diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_defaults.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_defaults.go new file mode 100644 index 000000000..3a22ae50e --- /dev/null +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_defaults.go @@ -0,0 +1,25 @@ +/* +Copyright 2019 The Tekton Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + "context" +) + +func (t *ClusterTask) SetDefaults(ctx context.Context) { + t.Spec.SetDefaults(ctx) +} diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_types.go index 6eee3d769..c0581f5b8 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_types.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_types.go @@ -17,28 +17,10 @@ limitations under the License. package v1alpha1 import ( - "context" - - "github.com/knative/pkg/apis" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" ) -func (t *ClusterTask) TaskSpec() TaskSpec { - return t.Spec -} - -func (t *ClusterTask) TaskMetadata() metav1.ObjectMeta { - return t.ObjectMeta -} - -func (t *ClusterTask) Copy() TaskInterface { - return t.DeepCopy() -} - -func (t *ClusterTask) SetDefaults(ctx context.Context) { - t.Spec.SetDefaults(ctx) -} - // Check that Task may be validated and defaulted. var _ apis.Validatable = (*ClusterTask)(nil) var _ apis.Defaultable = (*ClusterTask)(nil) @@ -70,3 +52,15 @@ type ClusterTaskList struct { metav1.ListMeta `json:"metadata,omitempty"` Items []ClusterTask `json:"items"` } + +func (t *ClusterTask) TaskSpec() TaskSpec { + return t.Spec +} + +func (t *ClusterTask) TaskMetadata() metav1.ObjectMeta { + return t.ObjectMeta +} + +func (t *ClusterTask) Copy() TaskInterface { + return t.DeepCopy() +} diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_validation.go index bd64271c3..f6a2bd88d 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/cluster_task_validation.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "context" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) func (t *ClusterTask) Validate(ctx context.Context) *apis.FieldError { diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_types.go new file mode 100644 index 000000000..53e23c8ef --- /dev/null +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_types.go @@ -0,0 +1,99 @@ +/* + * + * Copyright 2019 The Tekton Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * / + */ + +package v1alpha1 + +import ( + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" + duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1" +) + +// Check that Task may be validated and defaulted. +var _ apis.Validatable = (*Condition)(nil) + +// +genclient +// +genclient:noStatus +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// Condition declares a step that is used to gate the execution of a Task in a Pipeline. +// A condition execution (ConditionCheck) evaluates to either true or false +// +k8s:openapi-gen=true +type Condition struct { + metav1.TypeMeta `json:",inline"` + // +optional + metav1.ObjectMeta `json:"metadata"` + + // Spec holds the desired state of the Condition from the client + // +optional + Spec ConditionSpec `json:"spec"` +} + +// ConditionCheckStatus defines the observed state of ConditionCheck +type ConditionCheckStatus struct { + duckv1beta1.Status `json:",inline"` + + // PodName is the name of the pod responsible for executing this condition check. + PodName string `json:"podName"` + + // StartTime is the time the check is actually started. + // +optional + StartTime *metav1.Time `json:"startTime,omitempty"` + + // CompletionTime is the time the check pod completed. + // +optional + CompletionTime *metav1.Time `json:"completionTime,omitempty"` + + // Check describes the state of the check container. + // +optional + Check corev1.ContainerState `json:"check,omitempty"` +} + +// ConditionSpec defines the desired state of the Condition +type ConditionSpec struct { + // Check declares container whose exit code determines where a condition is true or false + Check corev1.Container `json:"check,omitempty"` + + // Params is an optional set of parameters which must be supplied by the user when a Condition + // is evaluated + // +optional + Params []ParamSpec `json:"params,omitempty"` +} + +// ConditionCheck represents a single evaluation of a Condition step. +type ConditionCheck TaskRun + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// ConditionList contains a list of Conditions +type ConditionList struct { + metav1.TypeMeta `json:",inline"` + // +optional + metav1.ListMeta `json:"metadata,omitempty"` + Items []Condition `json:"items"` +} + +func NewConditionCheck(tr *TaskRun) *ConditionCheck { + if tr == nil { + return nil + } + + cc := ConditionCheck(*tr) + return &cc +} diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_validation.go new file mode 100644 index 000000000..acb965cf4 --- /dev/null +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/condition_validation.go @@ -0,0 +1,42 @@ +/* +Copyright 2019 The Tekton Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + "context" + + "k8s.io/apimachinery/pkg/api/equality" + "knative.dev/pkg/apis" +) + +func (c Condition) Validate(ctx context.Context) *apis.FieldError { + if err := validateObjectMetadata(c.GetObjectMeta()); err != nil { + return err.ViaField("metadata") + } + return c.Spec.Validate(ctx).ViaField("Spec") +} + +func (cs *ConditionSpec) Validate(ctx context.Context) *apis.FieldError { + if equality.Semantic.DeepEqual(cs, ConditionSpec{}) { + return apis.ErrMissingField(apis.CurrentField) + } + + if cs.Check.Image == "" { + return apis.ErrMissingField("Check.Image") + } + return nil +} diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/metadata_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/metadata_validation.go index 3ac3ea234..3f6c0355e 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/metadata_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/metadata_validation.go @@ -16,8 +16,8 @@ package v1alpha1 import ( "strings" - "github.com/knative/pkg/apis" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" ) const maxLength = 63 diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_types.go index 59d1f83cd..e1d2bd374 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_types.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - "github.com/knative/pkg/apis" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" ) // PipelineSpec defines the desired state of Pipeline. @@ -83,6 +83,10 @@ type PipelineTask struct { // TaskRef is a reference to a task definition. TaskRef TaskRef `json:"taskRef"` + // Conditions is a list of conditions that need to be true for the task to run + // +optional + Conditions []PipelineTaskCondition `json:"conditions,omitempty"` + // Retries represents how many times this task should be retried in case of task failure: ConditionSucceeded set to False // +optional Retries int `json:"retries,omitempty"` @@ -107,6 +111,17 @@ type PipelineTaskParam struct { Value string `json:"value"` } +// PipelineTaskCondition allows a PipelineTask to declare a Condition to be evaluated before +// the Task is run. +type PipelineTaskCondition struct { + // ConditionRef is the name of the Condition to use for the conditionCheck + ConditionRef string `json:"conditionRef"` + + // Params declare parameters passed to this Condition + // +optional + Params []Param `json:"params,omitempty"` +} + // PipelineDeclaredResource is used by a Pipeline to declare the types of the // PipelineResources that it will required to run and names which can be used to // refer to these PipelineResources in PipelineTaskResourceBindings. diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_validation.go index 2f9ad98b8..001a7de44 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipeline_validation.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - "github.com/knative/pkg/apis" "github.com/tektoncd/pipeline/pkg/list" "github.com/tektoncd/pipeline/pkg/templating" "golang.org/x/xerrors" "k8s.io/apimachinery/pkg/api/equality" + "knative.dev/pkg/apis" ) // Validate checks that the Pipeline structure is valid but does not validate diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelineresource_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelineresource_validation.go index 147f28c2e..ead5b72cc 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelineresource_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelineresource_validation.go @@ -20,8 +20,8 @@ import ( "context" "strings" - "github.com/knative/pkg/apis" "k8s.io/apimachinery/pkg/api/equality" + "knative.dev/pkg/apis" ) func (r *PipelineResource) Validate(ctx context.Context) *apis.FieldError { diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go index f59113cef..59382023a 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go @@ -20,11 +20,11 @@ import ( "fmt" "time" - "github.com/knative/pkg/apis" - duckv1beta1 "github.com/knative/pkg/apis/duck/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/pkg/apis" + duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1" ) var ( @@ -136,6 +136,17 @@ type PipelineRunTaskRunStatus struct { // Status is the TaskRunStatus for the corresponding TaskRun // +optional Status *TaskRunStatus `json:"status,omitempty"` + // ConditionChecks maps the name of a condition check to its Status + // +optional + ConditionChecks map[string]*PipelineRunConditionCheckStatus `json:"conditionChecks,omitempty"` +} + +type PipelineRunConditionCheckStatus struct { + // ConditionName is the name of the Condition + ConditionName string `json:"conditionName,omitempty"` + // Status is the ConditionCheckStatus for the corresponding ConditionCheck + // +optional + Status *ConditionCheckStatus `json:"status,omitempty"` } var pipelineRunCondSet = apis.NewBatchConditionSet() diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_validation.go index 0a64d38b8..5305f20a2 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/pipelinerun_validation.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/knative/pkg/apis" "k8s.io/apimachinery/pkg/api/equality" + "knative.dev/pkg/apis" ) // Validate pipelinerun diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/resource_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/resource_types.go index 15620a36d..680a4fb82 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/resource_types.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/resource_types.go @@ -17,10 +17,10 @@ limitations under the License. package v1alpha1 import ( - "github.com/knative/pkg/apis" "golang.org/x/xerrors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" ) // PipelineResourceType represents the type of endpoint the pipelineResource is, so that the diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/result_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/result_types.go index d15415deb..6cce8f872 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/result_types.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/result_types.go @@ -21,7 +21,7 @@ import ( "fmt" "net/url" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) // AllResultTargetTypes is a list of all ResultTargetTypes, used for validation diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_types.go index 00a0dc874..f9ad95f89 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_types.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_types.go @@ -18,9 +18,8 @@ package v1alpha1 import ( corev1 "k8s.io/api/core/v1" - - "github.com/knative/pkg/apis" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" ) func (t *Task) TaskSpec() TaskSpec { diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_validation.go index 8e9a3afea..73fe9c24c 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/task_validation.go @@ -21,12 +21,12 @@ import ( "fmt" "strings" - "github.com/knative/pkg/apis" "github.com/tektoncd/pipeline/pkg/merge" "github.com/tektoncd/pipeline/pkg/templating" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/util/validation" + "knative.dev/pkg/apis" ) func (t *Task) Validate(ctx context.Context) *apis.FieldError { @@ -94,7 +94,7 @@ func (ts *TaskSpec) Validate(ctx context.Context) *apis.FieldError { // Validate task step names for _, step := range ts.Steps { - if errs := validation.IsDNS1123Label(step.Name); len(errs) > 0 { + if errs := validation.IsDNS1123Label(step.Name); step.Name != "" && len(errs) > 0 { return &apis.FieldError{ Message: fmt.Sprintf("invalid value %q", step.Name), Paths: []string{"taskspec.steps.name"}, diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_types.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_types.go index dc51212ff..a3e52040f 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_types.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_types.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/knative/pkg/apis" - duckv1beta1 "github.com/knative/pkg/apis/duck/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" + duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1" ) // Check that TaskRun may be validated and defaulted. @@ -133,6 +133,12 @@ type TaskRunStatus struct { // Steps describes the state of each build step container. // +optional Steps []StepState `json:"steps,omitempty"` + + // CloudEvents describe the state of each cloud event requested via a + // CloudEventResource. + // +optional + CloudEvents []CloudEventDelivery `json:"cloudEvents,omitempty"` + // RetriesStatus contains the history of TaskRunStatus in case of a retry in order to keep record of failures. // All TaskRunStatus stored in RetriesStatus will have no date within the RetriesStatus as is redundant. // +optional @@ -165,10 +171,66 @@ func (tr *TaskRunStatus) SetCondition(newCond *apis.Condition) { } } +// InitializeCloudEvents initializes the CloudEvents part of the TaskRunStatus +// from a list of event targets +func (tr *TaskRunStatus) InitializeCloudEvents(targets []string) { + // len(nil slice) is 0 + if len(targets) > 0 { + initialState := CloudEventDeliveryState{ + Condition: CloudEventConditionUnknown, + RetryCount: 0, + } + events := make([]CloudEventDelivery, len(targets)) + for idx, target := range targets { + events[idx] = CloudEventDelivery{ + Target: target, + Status: initialState, + } + } + tr.CloudEvents = events + } +} + // StepState reports the results of running a step in the Task. type StepState struct { corev1.ContainerState - Name string `json:"name,omitempty"` + Name string `json:"name,omitempty"` + ContainerName string `json:"container,omitempty"` +} + +// CloudEventDelivery is the target of a cloud event along with the state of +// delivery. +type CloudEventDelivery struct { + // Target points to an addressable + Target string `json:"target,omitempty"` + Status CloudEventDeliveryState `json:"status,omitempty"` +} + +// CloudEventCondition is a string that represents the condition of the event. +type CloudEventCondition string + +const ( + // CloudEventConditionUnknown means that the condition for the event to be + // triggered was not met yet, or we don't know the state yet. + CloudEventConditionUnknown CloudEventCondition = "Unknown" + // CloudEventConditionSent means that the event was sent successfully + CloudEventConditionSent CloudEventCondition = "Sent" + // CloudEventConditionFailed means that there was one or more attempts to + // send the event, and none was successful so far. + CloudEventConditionFailed CloudEventCondition = "Failed" +) + +// CloudEventDeliveryState reports the state of a cloud event to be sent. +type CloudEventDeliveryState struct { + // Current status + Condition CloudEventCondition `json:"condition,omitempty"` + // SentAt is the time at which the last attempt to send the event was made + // +optional + SentAt *metav1.Time `json:"sentAt,omitempty"` + // Error is the text of error (if any) + Error string `json:"message"` + // RetryCount is the number of attempts of sending the cloud event + RetryCount int32 `json:"retryCount"` } // +genclient diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_validation.go index 755a281d6..10ddb5be8 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/taskrun_validation.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/knative/pkg/apis" "k8s.io/apimachinery/pkg/api/equality" + "knative.dev/pkg/apis" ) // Validate taskrun @@ -49,6 +49,13 @@ func (ts *TaskRunSpec) Validate(ctx context.Context) *apis.FieldError { return apis.ErrMissingField("spec.taskref.name", "spec.taskspec") } + // Validate TaskSpec if it's present + if ts.TaskSpec != nil { + if err := ts.TaskSpec.Validate(ctx); err != nil { + return err + } + } + // check for input resources if err := ts.Inputs.Validate(ctx, "spec.Inputs"); err != nil { return err diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/zz_generated.deepcopy.go index e3866d797..ea936b780 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1/zz_generated.deepcopy.go @@ -84,6 +84,43 @@ func (in *BuildGCSResource) DeepCopy() *BuildGCSResource { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CloudEventDelivery) DeepCopyInto(out *CloudEventDelivery) { + *out = *in + in.Status.DeepCopyInto(&out.Status) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CloudEventDelivery. +func (in *CloudEventDelivery) DeepCopy() *CloudEventDelivery { + if in == nil { + return nil + } + out := new(CloudEventDelivery) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CloudEventDeliveryState) DeepCopyInto(out *CloudEventDeliveryState) { + *out = *in + if in.SentAt != nil { + in, out := &in.SentAt, &out.SentAt + *out = (*in).DeepCopy() + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CloudEventDeliveryState. +func (in *CloudEventDeliveryState) DeepCopy() *CloudEventDeliveryState { + if in == nil { + return nil + } + out := new(CloudEventDeliveryState) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterResource) DeepCopyInto(out *ClusterResource) { *out = *in @@ -170,6 +207,134 @@ func (in *ClusterTaskList) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Condition) DeepCopyInto(out *Condition) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Condition. +func (in *Condition) DeepCopy() *Condition { + if in == nil { + return nil + } + out := new(Condition) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Condition) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConditionCheck) DeepCopyInto(out *ConditionCheck) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConditionCheck. +func (in *ConditionCheck) DeepCopy() *ConditionCheck { + if in == nil { + return nil + } + out := new(ConditionCheck) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConditionCheckStatus) DeepCopyInto(out *ConditionCheckStatus) { + *out = *in + in.Status.DeepCopyInto(&out.Status) + if in.StartTime != nil { + in, out := &in.StartTime, &out.StartTime + *out = (*in).DeepCopy() + } + if in.CompletionTime != nil { + in, out := &in.CompletionTime, &out.CompletionTime + *out = (*in).DeepCopy() + } + in.Check.DeepCopyInto(&out.Check) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConditionCheckStatus. +func (in *ConditionCheckStatus) DeepCopy() *ConditionCheckStatus { + if in == nil { + return nil + } + out := new(ConditionCheckStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConditionList) DeepCopyInto(out *ConditionList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConditionList. +func (in *ConditionList) DeepCopy() *ConditionList { + if in == nil { + return nil + } + out := new(ConditionList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ConditionList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConditionSpec) DeepCopyInto(out *ConditionSpec) { + *out = *in + in.Check.DeepCopyInto(&out.Check) + if in.Params != nil { + in, out := &in.Params, &out.Params + *out = make([]ParamSpec, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConditionSpec. +func (in *ConditionSpec) DeepCopy() *ConditionSpec { + if in == nil { + return nil + } + out := new(ConditionSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DAG) DeepCopyInto(out *DAG) { *out = *in @@ -650,6 +815,27 @@ func (in *PipelineRun) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PipelineRunConditionCheckStatus) DeepCopyInto(out *PipelineRunConditionCheckStatus) { + *out = *in + if in.Status != nil { + in, out := &in.Status, &out.Status + *out = new(ConditionCheckStatus) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineRunConditionCheckStatus. +func (in *PipelineRunConditionCheckStatus) DeepCopy() *PipelineRunConditionCheckStatus { + if in == nil { + return nil + } + out := new(PipelineRunConditionCheckStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PipelineRunList) DeepCopyInto(out *PipelineRunList) { *out = *in @@ -814,6 +1000,21 @@ func (in *PipelineRunTaskRunStatus) DeepCopyInto(out *PipelineRunTaskRunStatus) *out = new(TaskRunStatus) (*in).DeepCopyInto(*out) } + if in.ConditionChecks != nil { + in, out := &in.ConditionChecks, &out.ConditionChecks + *out = make(map[string]*PipelineRunConditionCheckStatus, len(*in)) + for key, val := range *in { + var outVal *PipelineRunConditionCheckStatus + if val == nil { + (*out)[key] = nil + } else { + in, out := &val, &outVal + *out = new(PipelineRunConditionCheckStatus) + (*in).DeepCopyInto(*out) + } + (*out)[key] = outVal + } + } return } @@ -880,6 +1081,13 @@ func (in *PipelineStatus) DeepCopy() *PipelineStatus { func (in *PipelineTask) DeepCopyInto(out *PipelineTask) { *out = *in out.TaskRef = in.TaskRef + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]PipelineTaskCondition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.RunAfter != nil { in, out := &in.RunAfter, &out.RunAfter *out = make([]string, len(*in)) @@ -908,6 +1116,27 @@ func (in *PipelineTask) DeepCopy() *PipelineTask { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PipelineTaskCondition) DeepCopyInto(out *PipelineTaskCondition) { + *out = *in + if in.Params != nil { + in, out := &in.Params, &out.Params + *out = make([]Param, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineTaskCondition. +func (in *PipelineTaskCondition) DeepCopy() *PipelineTaskCondition { + if in == nil { + return nil + } + out := new(PipelineTaskCondition) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PipelineTaskInputResource) DeepCopyInto(out *PipelineTaskInputResource) { *out = *in @@ -1435,6 +1664,13 @@ func (in *TaskRunStatus) DeepCopyInto(out *TaskRunStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.CloudEvents != nil { + in, out := &in.CloudEvents, &out.CloudEvents + *out = make([]CloudEventDelivery, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.RetriesStatus != nil { in, out := &in.RetriesStatus, &out.RetriesStatus *out = make([]TaskRunStatus, len(*in)) diff --git a/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/condition.go b/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/condition.go new file mode 100644 index 000000000..0ff7825b1 --- /dev/null +++ b/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/condition.go @@ -0,0 +1,157 @@ +/* +Copyright 2019 The Tekton Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1" + scheme "github.com/tektoncd/pipeline/pkg/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" +) + +// ConditionsGetter has a method to return a ConditionInterface. +// A group's client should implement this interface. +type ConditionsGetter interface { + Conditions(namespace string) ConditionInterface +} + +// ConditionInterface has methods to work with Condition resources. +type ConditionInterface interface { + Create(*v1alpha1.Condition) (*v1alpha1.Condition, error) + Update(*v1alpha1.Condition) (*v1alpha1.Condition, error) + Delete(name string, options *v1.DeleteOptions) error + DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error + Get(name string, options v1.GetOptions) (*v1alpha1.Condition, error) + List(opts v1.ListOptions) (*v1alpha1.ConditionList, error) + Watch(opts v1.ListOptions) (watch.Interface, error) + Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Condition, err error) + ConditionExpansion +} + +// conditions implements ConditionInterface +type conditions struct { + client rest.Interface + ns string +} + +// newConditions returns a Conditions +func newConditions(c *TektonV1alpha1Client, namespace string) *conditions { + return &conditions{ + client: c.RESTClient(), + ns: namespace, + } +} + +// Get takes name of the condition, and returns the corresponding condition object, and an error if there is any. +func (c *conditions) Get(name string, options v1.GetOptions) (result *v1alpha1.Condition, err error) { + result = &v1alpha1.Condition{} + err = c.client.Get(). + Namespace(c.ns). + Resource("conditions"). + Name(name). + VersionedParams(&options, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Conditions that match those selectors. +func (c *conditions) List(opts v1.ListOptions) (result *v1alpha1.ConditionList, err error) { + result = &v1alpha1.ConditionList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("conditions"). + VersionedParams(&opts, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested conditions. +func (c *conditions) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true + return c.client.Get(). + Namespace(c.ns). + Resource("conditions"). + VersionedParams(&opts, scheme.ParameterCodec). + Watch() +} + +// Create takes the representation of a condition and creates it. Returns the server's representation of the condition, and an error, if there is any. +func (c *conditions) Create(condition *v1alpha1.Condition) (result *v1alpha1.Condition, err error) { + result = &v1alpha1.Condition{} + err = c.client.Post(). + Namespace(c.ns). + Resource("conditions"). + Body(condition). + Do(). + Into(result) + return +} + +// Update takes the representation of a condition and updates it. Returns the server's representation of the condition, and an error, if there is any. +func (c *conditions) Update(condition *v1alpha1.Condition) (result *v1alpha1.Condition, err error) { + result = &v1alpha1.Condition{} + err = c.client.Put(). + Namespace(c.ns). + Resource("conditions"). + Name(condition.Name). + Body(condition). + Do(). + Into(result) + return +} + +// Delete takes name of the condition and deletes it. Returns an error if one occurs. +func (c *conditions) Delete(name string, options *v1.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("conditions"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *conditions) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("conditions"). + VersionedParams(&listOptions, scheme.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Patch applies the patch and returns the patched condition. +func (c *conditions) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Condition, err error) { + result = &v1alpha1.Condition{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("conditions"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/generated_expansion.go b/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/generated_expansion.go index 915b82f91..1270fa3ab 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/generated_expansion.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/generated_expansion.go @@ -20,6 +20,8 @@ package v1alpha1 type ClusterTaskExpansion interface{} +type ConditionExpansion interface{} + type PipelineExpansion interface{} type PipelineResourceExpansion interface{} diff --git a/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/pipeline_client.go b/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/pipeline_client.go index e8202b4da..8efca8540 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/pipeline_client.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1alpha1/pipeline_client.go @@ -28,6 +28,7 @@ import ( type TektonV1alpha1Interface interface { RESTClient() rest.Interface ClusterTasksGetter + ConditionsGetter PipelinesGetter PipelineResourcesGetter PipelineRunsGetter @@ -44,6 +45,10 @@ func (c *TektonV1alpha1Client) ClusterTasks() ClusterTaskInterface { return newClusterTasks(c) } +func (c *TektonV1alpha1Client) Conditions(namespace string) ConditionInterface { + return newConditions(c, namespace) +} + func (c *TektonV1alpha1Client) Pipelines(namespace string) PipelineInterface { return newPipelines(c, namespace) } diff --git a/vendor/github.com/tektoncd/pipeline/pkg/client/injection/client/client.go b/vendor/github.com/tektoncd/pipeline/pkg/client/injection/client/client.go index 5d9fa69ff..40ae956fe 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/client/injection/client/client.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/client/injection/client/client.go @@ -21,10 +21,10 @@ package client import ( "context" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" versioned "github.com/tektoncd/pipeline/pkg/client/clientset/versioned" rest "k8s.io/client-go/rest" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/tektoncd/pipeline/pkg/merge/merge.go b/vendor/github.com/tektoncd/pipeline/pkg/merge/merge.go index 04ece1f22..98b3c6732 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/merge/merge.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/merge/merge.go @@ -1,14 +1,17 @@ /* - Copyright 2019 Knative Authors LLC - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019 The Tekton Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. */ package merge diff --git a/vendor/github.com/tektoncd/pipeline/pkg/templating/templating.go b/vendor/github.com/tektoncd/pipeline/pkg/templating/templating.go index c2ccb0c95..120650527 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/templating/templating.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/templating/templating.go @@ -1,14 +1,17 @@ /* - Copyright 2019 Knative Authors LLC - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019 The Tekton Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. */ package templating @@ -18,7 +21,7 @@ import ( "regexp" "strings" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) const parameterSubstitution = "[_a-zA-Z][_a-zA-Z0-9.-]*" diff --git a/vendor/go.opencensus.io/metric/metricdata/exemplar.go b/vendor/go.opencensus.io/metric/metricdata/exemplar.go index cdbeef058..12695ce2d 100644 --- a/vendor/go.opencensus.io/metric/metricdata/exemplar.go +++ b/vendor/go.opencensus.io/metric/metricdata/exemplar.go @@ -18,6 +18,11 @@ import ( "time" ) +// Exemplars keys. +const ( + AttachmentKeySpanContext = "SpanContext" +) + // Exemplar is an example data point associated with each bucket of a // distribution type aggregation. // diff --git a/vendor/go.opencensus.io/metric/metricdata/label.go b/vendor/go.opencensus.io/metric/metricdata/label.go index 87c55b9c8..aadae41e6 100644 --- a/vendor/go.opencensus.io/metric/metricdata/label.go +++ b/vendor/go.opencensus.io/metric/metricdata/label.go @@ -14,6 +14,13 @@ package metricdata +// LabelKey represents key of a label. It has optional +// description attribute. +type LabelKey struct { + Key string + Description string +} + // LabelValue represents the value of a label. // The zero value represents a missing label value, which may be treated // differently to an empty string value by some back ends. diff --git a/vendor/go.opencensus.io/metric/metricdata/metric.go b/vendor/go.opencensus.io/metric/metricdata/metric.go index 6ccdec583..8293712c7 100644 --- a/vendor/go.opencensus.io/metric/metricdata/metric.go +++ b/vendor/go.opencensus.io/metric/metricdata/metric.go @@ -22,11 +22,11 @@ import ( // Descriptor holds metadata about a metric. type Descriptor struct { - Name string // full name of the metric - Description string // human-readable description - Unit Unit // units for the measure - Type Type // type of measure - LabelKeys []string // label keys + Name string // full name of the metric + Description string // human-readable description + Unit Unit // units for the measure + Type Type // type of measure + LabelKeys []LabelKey // label keys } // Metric represents a quantity measured against a resource with different diff --git a/vendor/go.opencensus.io/metric/metricexport/doc.go b/vendor/go.opencensus.io/metric/metricexport/doc.go new file mode 100644 index 000000000..df632a792 --- /dev/null +++ b/vendor/go.opencensus.io/metric/metricexport/doc.go @@ -0,0 +1,19 @@ +// Copyright 2018, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package metricexport contains support for exporting metric data. +// +// This is an EXPERIMENTAL package, and may change in arbitrary ways without +// notice. +package metricexport // import "go.opencensus.io/metric/metricexport" diff --git a/vendor/go.opencensus.io/metric/metricexport/export.go b/vendor/go.opencensus.io/metric/metricexport/export.go new file mode 100644 index 000000000..23f4a864a --- /dev/null +++ b/vendor/go.opencensus.io/metric/metricexport/export.go @@ -0,0 +1,26 @@ +// Copyright 2019, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package metricexport + +import ( + "context" + + "go.opencensus.io/metric/metricdata" +) + +// Exporter is an interface that exporters implement to export the metric data. +type Exporter interface { + ExportMetrics(ctx context.Context, data []*metricdata.Metric) error +} diff --git a/vendor/go.opencensus.io/metric/metricexport/reader.go b/vendor/go.opencensus.io/metric/metricexport/reader.go new file mode 100644 index 000000000..b920bacd8 --- /dev/null +++ b/vendor/go.opencensus.io/metric/metricexport/reader.go @@ -0,0 +1,187 @@ +// Copyright 2019, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package metricexport + +import ( + "context" + "fmt" + "sync" + "time" + + "go.opencensus.io/metric/metricdata" + "go.opencensus.io/metric/metricproducer" + "go.opencensus.io/trace" +) + +var ( + defaultSampler = trace.ProbabilitySampler(0.0001) + errReportingIntervalTooLow = fmt.Errorf("reporting interval less than %d", minimumReportingDuration) + errAlreadyStarted = fmt.Errorf("already started") + errIntervalReaderNil = fmt.Errorf("interval reader is nil") + errExporterNil = fmt.Errorf("exporter is nil") + errReaderNil = fmt.Errorf("reader is nil") +) + +const ( + defaultReportingDuration = 60 * time.Second + minimumReportingDuration = 1 * time.Second + defaultSpanName = "ExportMetrics" +) + +// ReaderOptions contains options pertaining to metrics reader. +type ReaderOptions struct { + // SpanName is the name used for span created to export metrics. + SpanName string +} + +// Reader reads metrics from all producers registered +// with producer manager and exports those metrics using provided +// exporter. +type Reader struct { + sampler trace.Sampler + + spanName string +} + +// IntervalReader periodically reads metrics from all producers registered +// with producer manager and exports those metrics using provided +// exporter. Call Reader.Stop() to stop the reader. +type IntervalReader struct { + // ReportingInterval it the time duration between two consecutive + // metrics reporting. defaultReportingDuration is used if it is not set. + // It cannot be set lower than minimumReportingDuration. + ReportingInterval time.Duration + + exporter Exporter + timer *time.Ticker + quit, done chan bool + mu sync.RWMutex + reader *Reader +} + +// ReaderOption apply changes to ReaderOptions. +type ReaderOption func(*ReaderOptions) + +// WithSpanName makes new reader to use given span name when exporting metrics. +func WithSpanName(spanName string) ReaderOption { + return func(o *ReaderOptions) { + o.SpanName = spanName + } +} + +// NewReader returns a reader configured with specified options. +func NewReader(o ...ReaderOption) *Reader { + var opts ReaderOptions + for _, op := range o { + op(&opts) + } + reader := &Reader{defaultSampler, defaultSpanName} + if opts.SpanName != "" { + reader.spanName = opts.SpanName + } + return reader +} + +// NewIntervalReader creates a reader. Once started it periodically +// reads metrics from all producers and exports them using provided exporter. +func NewIntervalReader(reader *Reader, exporter Exporter) (*IntervalReader, error) { + if exporter == nil { + return nil, errExporterNil + } + if reader == nil { + return nil, errReaderNil + } + + r := &IntervalReader{ + exporter: exporter, + reader: reader, + } + return r, nil +} + +// Start starts the IntervalReader which periodically reads metrics from all +// producers registered with global producer manager. If the reporting interval +// is not set prior to calling this function then default reporting interval +// is used. +func (ir *IntervalReader) Start() error { + if ir == nil { + return errIntervalReaderNil + } + ir.mu.Lock() + defer ir.mu.Unlock() + var reportingInterval = defaultReportingDuration + if ir.ReportingInterval != 0 { + if ir.ReportingInterval < minimumReportingDuration { + return errReportingIntervalTooLow + } + reportingInterval = ir.ReportingInterval + } + + if ir.done != nil { + return errAlreadyStarted + } + ir.timer = time.NewTicker(reportingInterval) + ir.quit = make(chan bool) + ir.done = make(chan bool) + + go ir.startInternal() + return nil +} + +func (ir *IntervalReader) startInternal() { + for { + select { + case <-ir.timer.C: + ir.reader.ReadAndExport(ir.exporter) + case <-ir.quit: + ir.timer.Stop() + ir.done <- true + return + } + } +} + +// Stop stops the reader from reading and exporting metrics. +// Additional call to Stop are no-ops. +func (ir *IntervalReader) Stop() { + if ir == nil { + return + } + ir.mu.Lock() + defer ir.mu.Unlock() + if ir.quit == nil { + return + } + ir.quit <- true + <-ir.done + close(ir.quit) + close(ir.done) + ir.quit = nil +} + +// ReadAndExport reads metrics from all producer registered with +// producer manager and then exports them using provided exporter. +func (r *Reader) ReadAndExport(exporter Exporter) { + ctx, span := trace.StartSpan(context.Background(), r.spanName, trace.WithSampler(r.sampler)) + defer span.End() + producers := metricproducer.GlobalManager().GetAll() + data := []*metricdata.Metric{} + for _, producer := range producers { + data = append(data, producer.Read()...) + } + // TODO: [rghetia] add metrics for errors. + exporter.ExportMetrics(ctx, data) +} diff --git a/vendor/go.opencensus.io/opencensus.go b/vendor/go.opencensus.io/opencensus.go index d2565f1e2..626d73645 100644 --- a/vendor/go.opencensus.io/opencensus.go +++ b/vendor/go.opencensus.io/opencensus.go @@ -17,5 +17,5 @@ package opencensus // import "go.opencensus.io" // Version is the current release version of OpenCensus in use. func Version() string { - return "0.21.0" + return "0.22.0" } diff --git a/vendor/go.opencensus.io/plugin/ocgrpc/client.go b/vendor/go.opencensus.io/plugin/ocgrpc/client.go index a6c466ae8..28fddb844 100644 --- a/vendor/go.opencensus.io/plugin/ocgrpc/client.go +++ b/vendor/go.opencensus.io/plugin/ocgrpc/client.go @@ -15,8 +15,8 @@ package ocgrpc import ( + "context" "go.opencensus.io/trace" - "golang.org/x/net/context" "google.golang.org/grpc/stats" ) diff --git a/vendor/go.opencensus.io/plugin/ocgrpc/client_stats_handler.go b/vendor/go.opencensus.io/plugin/ocgrpc/client_stats_handler.go index 303c607f6..18821c7f5 100644 --- a/vendor/go.opencensus.io/plugin/ocgrpc/client_stats_handler.go +++ b/vendor/go.opencensus.io/plugin/ocgrpc/client_stats_handler.go @@ -18,8 +18,8 @@ package ocgrpc import ( "time" + "context" "go.opencensus.io/tag" - "golang.org/x/net/context" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/stats" ) diff --git a/vendor/go.opencensus.io/plugin/ocgrpc/server.go b/vendor/go.opencensus.io/plugin/ocgrpc/server.go index b67b3e2be..15ada839d 100644 --- a/vendor/go.opencensus.io/plugin/ocgrpc/server.go +++ b/vendor/go.opencensus.io/plugin/ocgrpc/server.go @@ -15,8 +15,8 @@ package ocgrpc import ( + "context" "go.opencensus.io/trace" - "golang.org/x/net/context" "google.golang.org/grpc/stats" ) diff --git a/vendor/go.opencensus.io/plugin/ocgrpc/server_stats_handler.go b/vendor/go.opencensus.io/plugin/ocgrpc/server_stats_handler.go index 7847c1a91..afcef023a 100644 --- a/vendor/go.opencensus.io/plugin/ocgrpc/server_stats_handler.go +++ b/vendor/go.opencensus.io/plugin/ocgrpc/server_stats_handler.go @@ -18,7 +18,7 @@ package ocgrpc import ( "time" - "golang.org/x/net/context" + "context" "go.opencensus.io/tag" "google.golang.org/grpc/grpclog" diff --git a/vendor/go.opencensus.io/plugin/ocgrpc/stats_common.go b/vendor/go.opencensus.io/plugin/ocgrpc/stats_common.go index e9991fe0f..0ae569182 100644 --- a/vendor/go.opencensus.io/plugin/ocgrpc/stats_common.go +++ b/vendor/go.opencensus.io/plugin/ocgrpc/stats_common.go @@ -22,9 +22,11 @@ import ( "sync/atomic" "time" + "go.opencensus.io/metric/metricdata" ocstats "go.opencensus.io/stats" "go.opencensus.io/stats/view" "go.opencensus.io/tag" + "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/stats" @@ -141,27 +143,31 @@ func handleRPCEnd(ctx context.Context, s *stats.End) { } latencyMillis := float64(elapsedTime) / float64(time.Millisecond) + attachments := getSpanCtxAttachment(ctx) if s.Client { - ocstats.RecordWithTags(ctx, - []tag.Mutator{ + ocstats.RecordWithOptions(ctx, + ocstats.WithTags( tag.Upsert(KeyClientMethod, methodName(d.method)), - tag.Upsert(KeyClientStatus, st), - }, - ClientSentBytesPerRPC.M(atomic.LoadInt64(&d.sentBytes)), - ClientSentMessagesPerRPC.M(atomic.LoadInt64(&d.sentCount)), - ClientReceivedMessagesPerRPC.M(atomic.LoadInt64(&d.recvCount)), - ClientReceivedBytesPerRPC.M(atomic.LoadInt64(&d.recvBytes)), - ClientRoundtripLatency.M(latencyMillis)) + tag.Upsert(KeyClientStatus, st)), + ocstats.WithAttachments(attachments), + ocstats.WithMeasurements( + ClientSentBytesPerRPC.M(atomic.LoadInt64(&d.sentBytes)), + ClientSentMessagesPerRPC.M(atomic.LoadInt64(&d.sentCount)), + ClientReceivedMessagesPerRPC.M(atomic.LoadInt64(&d.recvCount)), + ClientReceivedBytesPerRPC.M(atomic.LoadInt64(&d.recvBytes)), + ClientRoundtripLatency.M(latencyMillis))) } else { - ocstats.RecordWithTags(ctx, - []tag.Mutator{ + ocstats.RecordWithOptions(ctx, + ocstats.WithTags( tag.Upsert(KeyServerStatus, st), - }, - ServerSentBytesPerRPC.M(atomic.LoadInt64(&d.sentBytes)), - ServerSentMessagesPerRPC.M(atomic.LoadInt64(&d.sentCount)), - ServerReceivedMessagesPerRPC.M(atomic.LoadInt64(&d.recvCount)), - ServerReceivedBytesPerRPC.M(atomic.LoadInt64(&d.recvBytes)), - ServerLatency.M(latencyMillis)) + ), + ocstats.WithAttachments(attachments), + ocstats.WithMeasurements( + ServerSentBytesPerRPC.M(atomic.LoadInt64(&d.sentBytes)), + ServerSentMessagesPerRPC.M(atomic.LoadInt64(&d.sentCount)), + ServerReceivedMessagesPerRPC.M(atomic.LoadInt64(&d.recvCount)), + ServerReceivedBytesPerRPC.M(atomic.LoadInt64(&d.recvBytes)), + ServerLatency.M(latencyMillis))) } } @@ -206,3 +212,16 @@ func statusCodeToString(s *status.Status) string { return "CODE_" + strconv.FormatInt(int64(c), 10) } } + +func getSpanCtxAttachment(ctx context.Context) metricdata.Attachments { + attachments := map[string]interface{}{} + span := trace.FromContext(ctx) + if span == nil { + return attachments + } + spanCtx := span.SpanContext() + if spanCtx.IsSampled() { + attachments[metricdata.AttachmentKeySpanContext] = spanCtx + } + return attachments +} diff --git a/vendor/go.opencensus.io/plugin/ocgrpc/trace_common.go b/vendor/go.opencensus.io/plugin/ocgrpc/trace_common.go index 720f381c2..fef582756 100644 --- a/vendor/go.opencensus.io/plugin/ocgrpc/trace_common.go +++ b/vendor/go.opencensus.io/plugin/ocgrpc/trace_common.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc/codes" + "context" "go.opencensus.io/trace" "go.opencensus.io/trace/propagation" - "golang.org/x/net/context" "google.golang.org/grpc/metadata" "google.golang.org/grpc/stats" "google.golang.org/grpc/status" diff --git a/vendor/go.opencensus.io/plugin/ochttp/server.go b/vendor/go.opencensus.io/plugin/ochttp/server.go index 5fe15e89f..4f6404fa7 100644 --- a/vendor/go.opencensus.io/plugin/ochttp/server.go +++ b/vendor/go.opencensus.io/plugin/ochttp/server.go @@ -124,6 +124,12 @@ func (h *Handler) startTrace(w http.ResponseWriter, r *http.Request) (*http.Requ } } span.AddAttributes(requestAttrs(r)...) + if r.Body == nil { + // TODO: Handle cases where ContentLength is not set. + } else if r.ContentLength > 0 { + span.AddMessageReceiveEvent(0, /* TODO: messageID */ + int64(r.ContentLength), -1) + } return r.WithContext(ctx), span.End } @@ -201,6 +207,9 @@ func (t *trackingResponseWriter) Header() http.Header { func (t *trackingResponseWriter) Write(data []byte) (int, error) { n, err := t.writer.Write(data) t.respSize += int64(n) + // Add message event for request bytes sent. + span := trace.FromContext(t.ctx) + span.AddMessageSendEvent(0 /* TODO: messageID */, int64(n), -1) return n, err } diff --git a/vendor/go.opencensus.io/resource/resourcekeys/const.go b/vendor/go.opencensus.io/resource/resourcekeys/const.go new file mode 100644 index 000000000..c8b7b2938 --- /dev/null +++ b/vendor/go.opencensus.io/resource/resourcekeys/const.go @@ -0,0 +1,67 @@ +// Copyright 2019, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package resourcekeys contains well known type and label keys for resources. +package resourcekeys // import "go.opencensus.io/resource/resourcekeys" + +// Constants for Kubernetes resources. +const ( + K8SType = "k8s" + + // A uniquely identifying name for the Kubernetes cluster. Kubernetes + // does not have cluster names as an internal concept so this may be + // set to any meaningful value within the environment. For example, + // GKE clusters have a name which can be used for this label. + K8SKeyClusterName = "k8s.cluster.name" + K8SKeyNamespaceName = "k8s.namespace.name" + K8SKeyPodName = "k8s.pod.name" +) + +// Constants for Container resources. +const ( + ContainerType = "container" + + // A uniquely identifying name for the Container. + ContainerKeyName = "container.name" + ContainerKeyImageName = "container.image.name" + ContainerKeyImageTag = "container.image.tag" +) + +// Constants for Cloud resources. +const ( + CloudType = "cloud" + + CloudKeyProvider = "cloud.provider" + CloudKeyAccountID = "cloud.account.id" + CloudKeyRegion = "cloud.region" + CloudKeyZone = "cloud.zone" + + // Cloud Providers + CloudProviderAWS = "aws" + CloudProviderGCP = "gcp" + CloudProviderAZURE = "azure" +) + +// Constants for Host resources. +const ( + HostType = "host" + + // A uniquely identifying name for the host. + HostKeyName = "host.name" + + // A hostname as returned by the 'hostname' command on host machine. + HostKeyHostName = "host.hostname" + HostKeyID = "host.id" + HostKeyType = "host.type" +) diff --git a/vendor/go.opencensus.io/stats/record.go b/vendor/go.opencensus.io/stats/record.go index d2af0a60d..ad4691184 100644 --- a/vendor/go.opencensus.io/stats/record.go +++ b/vendor/go.opencensus.io/stats/record.go @@ -18,6 +18,7 @@ package stats import ( "context" + "go.opencensus.io/metric/metricdata" "go.opencensus.io/stats/internal" "go.opencensus.io/tag" ) @@ -30,40 +31,87 @@ func init() { } } +type recordOptions struct { + attachments metricdata.Attachments + mutators []tag.Mutator + measurements []Measurement +} + +// WithAttachments applies provided exemplar attachments. +func WithAttachments(attachments metricdata.Attachments) Options { + return func(ro *recordOptions) { + ro.attachments = attachments + } +} + +// WithTags applies provided tag mutators. +func WithTags(mutators ...tag.Mutator) Options { + return func(ro *recordOptions) { + ro.mutators = mutators + } +} + +// WithMeasurements applies provided measurements. +func WithMeasurements(measurements ...Measurement) Options { + return func(ro *recordOptions) { + ro.measurements = measurements + } +} + +// Options apply changes to recordOptions. +type Options func(*recordOptions) + +func createRecordOption(ros ...Options) *recordOptions { + o := &recordOptions{} + for _, ro := range ros { + ro(o) + } + return o +} + // Record records one or multiple measurements with the same context at once. // If there are any tags in the context, measurements will be tagged with them. func Record(ctx context.Context, ms ...Measurement) { + RecordWithOptions(ctx, WithMeasurements(ms...)) +} + +// RecordWithTags records one or multiple measurements at once. +// +// Measurements will be tagged with the tags in the context mutated by the mutators. +// RecordWithTags is useful if you want to record with tag mutations but don't want +// to propagate the mutations in the context. +func RecordWithTags(ctx context.Context, mutators []tag.Mutator, ms ...Measurement) error { + return RecordWithOptions(ctx, WithTags(mutators...), WithMeasurements(ms...)) +} + +// RecordWithOptions records measurements from the given options (if any) against context +// and tags and attachments in the options (if any). +// If there are any tags in the context, measurements will be tagged with them. +func RecordWithOptions(ctx context.Context, ros ...Options) error { + o := createRecordOption(ros...) + if len(o.measurements) == 0 { + return nil + } recorder := internal.DefaultRecorder if recorder == nil { - return - } - if len(ms) == 0 { - return + return nil } record := false - for _, m := range ms { + for _, m := range o.measurements { if m.desc.subscribed() { record = true break } } if !record { - return + return nil } - // TODO(songy23): fix attachments. - recorder(tag.FromContext(ctx), ms, map[string]interface{}{}) -} - -// RecordWithTags records one or multiple measurements at once. -// -// Measurements will be tagged with the tags in the context mutated by the mutators. -// RecordWithTags is useful if you want to record with tag mutations but don't want -// to propagate the mutations in the context. -func RecordWithTags(ctx context.Context, mutators []tag.Mutator, ms ...Measurement) error { - ctx, err := tag.New(ctx, mutators...) - if err != nil { - return err + if len(o.mutators) > 0 { + var err error + if ctx, err = tag.New(ctx, o.mutators...); err != nil { + return err + } } - Record(ctx, ms...) + recorder(tag.FromContext(ctx), o.measurements, o.attachments) return nil } diff --git a/vendor/go.opencensus.io/stats/view/view_to_metric.go b/vendor/go.opencensus.io/stats/view/view_to_metric.go index 284299faf..f67b5c464 100644 --- a/vendor/go.opencensus.io/stats/view/view_to_metric.go +++ b/vendor/go.opencensus.io/stats/view/view_to_metric.go @@ -73,10 +73,10 @@ func getType(v *View) metricdata.Type { } } -func getLableKeys(v *View) []string { - labelKeys := []string{} +func getLabelKeys(v *View) []metricdata.LabelKey { + labelKeys := []metricdata.LabelKey{} for _, k := range v.TagKeys { - labelKeys = append(labelKeys, k.Name()) + labelKeys = append(labelKeys, metricdata.LabelKey{Key: k.Name()}) } return labelKeys } @@ -87,14 +87,23 @@ func viewToMetricDescriptor(v *View) *metricdata.Descriptor { Description: v.Description, Unit: getUnit(v.Measure.Unit()), Type: getType(v), - LabelKeys: getLableKeys(v), + LabelKeys: getLabelKeys(v), } } -func toLabelValues(row *Row) []metricdata.LabelValue { +func toLabelValues(row *Row, expectedKeys []metricdata.LabelKey) []metricdata.LabelValue { labelValues := []metricdata.LabelValue{} + tagMap := make(map[string]string) for _, tag := range row.Tags { - labelValues = append(labelValues, metricdata.NewLabelValue(tag.Value)) + tagMap[tag.Key.Name()] = tag.Value + } + + for _, key := range expectedKeys { + if val, ok := tagMap[key.Key]; ok { + labelValues = append(labelValues, metricdata.NewLabelValue(val)) + } else { + labelValues = append(labelValues, metricdata.LabelValue{}) + } } return labelValues } @@ -102,7 +111,7 @@ func toLabelValues(row *Row) []metricdata.LabelValue { func rowToTimeseries(v *viewInternal, row *Row, now time.Time, startTime time.Time) *metricdata.TimeSeries { return &metricdata.TimeSeries{ Points: []metricdata.Point{row.Data.toPoint(v.metricDescriptor.Type, now)}, - LabelValues: toLabelValues(row), + LabelValues: toLabelValues(row, v.metricDescriptor.LabelKeys), StartTime: startTime, } } diff --git a/vendor/go.opencensus.io/stats/view/worker.go b/vendor/go.opencensus.io/stats/view/worker.go index 37279b39e..2f3c018af 100644 --- a/vendor/go.opencensus.io/stats/view/worker.go +++ b/vendor/go.opencensus.io/stats/view/worker.go @@ -236,6 +236,8 @@ func (w *worker) reportView(v *viewInternal, now time.Time) { } func (w *worker) reportUsage(now time.Time) { + w.mu.Lock() + defer w.mu.Unlock() for _, v := range w.views { w.reportView(v, now) } diff --git a/vendor/go.opencensus.io/stats/view/worker_commands.go b/vendor/go.opencensus.io/stats/view/worker_commands.go index ba6203a50..0267e179a 100644 --- a/vendor/go.opencensus.io/stats/view/worker_commands.go +++ b/vendor/go.opencensus.io/stats/view/worker_commands.go @@ -121,6 +121,8 @@ type retrieveDataResp struct { } func (cmd *retrieveDataReq) handleCommand(w *worker) { + w.mu.Lock() + defer w.mu.Unlock() vi, ok := w.views[cmd.v] if !ok { cmd.c <- &retrieveDataResp{ @@ -153,6 +155,8 @@ type recordReq struct { } func (cmd *recordReq) handleCommand(w *worker) { + w.mu.Lock() + defer w.mu.Unlock() for _, m := range cmd.ms { if (m == stats.Measurement{}) { // not registered continue diff --git a/vendor/go.opencensus.io/tag/key.go b/vendor/go.opencensus.io/tag/key.go index ebbed9500..4e63d08c9 100644 --- a/vendor/go.opencensus.io/tag/key.go +++ b/vendor/go.opencensus.io/tag/key.go @@ -29,6 +29,16 @@ func NewKey(name string) (Key, error) { return Key{name: name}, nil } +// MustNewKey creates or retrieves a string key identified by name. +// An invalid key name raises a panic. +func MustNewKey(name string) Key { + k, err := NewKey(name) + if err != nil { + panic(err) + } + return k +} + // Name returns the name of the key. func (k Key) Name() string { return k.name diff --git a/vendor/go.opencensus.io/tag/map.go b/vendor/go.opencensus.io/tag/map.go index 5b72ba6ad..0272ef85a 100644 --- a/vendor/go.opencensus.io/tag/map.go +++ b/vendor/go.opencensus.io/tag/map.go @@ -28,10 +28,15 @@ type Tag struct { Value string } +type tagContent struct { + value string + m metadatas +} + // Map is a map of tags. Use New to create a context containing // a new Map. type Map struct { - m map[Key]string + m map[Key]tagContent } // Value returns the value for the key if a value for the key exists. @@ -40,7 +45,7 @@ func (m *Map) Value(k Key) (string, bool) { return "", false } v, ok := m.m[k] - return v, ok + return v.value, ok } func (m *Map) String() string { @@ -62,21 +67,21 @@ func (m *Map) String() string { return buffer.String() } -func (m *Map) insert(k Key, v string) { +func (m *Map) insert(k Key, v string, md metadatas) { if _, ok := m.m[k]; ok { return } - m.m[k] = v + m.m[k] = tagContent{value: v, m: md} } -func (m *Map) update(k Key, v string) { +func (m *Map) update(k Key, v string, md metadatas) { if _, ok := m.m[k]; ok { - m.m[k] = v + m.m[k] = tagContent{value: v, m: md} } } -func (m *Map) upsert(k Key, v string) { - m.m[k] = v +func (m *Map) upsert(k Key, v string, md metadatas) { + m.m[k] = tagContent{value: v, m: md} } func (m *Map) delete(k Key) { @@ -84,7 +89,7 @@ func (m *Map) delete(k Key) { } func newMap() *Map { - return &Map{m: make(map[Key]string)} + return &Map{m: make(map[Key]tagContent)} } // Mutator modifies a tag map. @@ -95,13 +100,17 @@ type Mutator interface { // Insert returns a mutator that inserts a // value associated with k. If k already exists in the tag map, // mutator doesn't update the value. -func Insert(k Key, v string) Mutator { +// Metadata applies metadata to the tag. It is optional. +// Metadatas are applied in the order in which it is provided. +// If more than one metadata updates the same attribute then +// the update from the last metadata prevails. +func Insert(k Key, v string, mds ...Metadata) Mutator { return &mutator{ fn: func(m *Map) (*Map, error) { if !checkValue(v) { return nil, errInvalidValue } - m.insert(k, v) + m.insert(k, v, createMetadatas(mds...)) return m, nil }, } @@ -110,13 +119,17 @@ func Insert(k Key, v string) Mutator { // Update returns a mutator that updates the // value of the tag associated with k with v. If k doesn't // exists in the tag map, the mutator doesn't insert the value. -func Update(k Key, v string) Mutator { +// Metadata applies metadata to the tag. It is optional. +// Metadatas are applied in the order in which it is provided. +// If more than one metadata updates the same attribute then +// the update from the last metadata prevails. +func Update(k Key, v string, mds ...Metadata) Mutator { return &mutator{ fn: func(m *Map) (*Map, error) { if !checkValue(v) { return nil, errInvalidValue } - m.update(k, v) + m.update(k, v, createMetadatas(mds...)) return m, nil }, } @@ -126,18 +139,37 @@ func Update(k Key, v string) Mutator { // value of the tag associated with k with v. It inserts the // value if k doesn't exist already. It mutates the value // if k already exists. -func Upsert(k Key, v string) Mutator { +// Metadata applies metadata to the tag. It is optional. +// Metadatas are applied in the order in which it is provided. +// If more than one metadata updates the same attribute then +// the update from the last metadata prevails. +func Upsert(k Key, v string, mds ...Metadata) Mutator { return &mutator{ fn: func(m *Map) (*Map, error) { if !checkValue(v) { return nil, errInvalidValue } - m.upsert(k, v) + m.upsert(k, v, createMetadatas(mds...)) return m, nil }, } } +func createMetadatas(mds ...Metadata) metadatas { + var metas metadatas + if len(mds) > 0 { + for _, md := range mds { + if md != nil { + md(&metas) + } + } + } else { + WithTTL(TTLUnlimitedPropagation)(&metas) + } + return metas + +} + // Delete returns a mutator that deletes // the value associated with k. func Delete(k Key) Mutator { @@ -160,10 +192,10 @@ func New(ctx context.Context, mutator ...Mutator) (context.Context, error) { if !checkKeyName(k.Name()) { return ctx, fmt.Errorf("key:%q: %v", k, errInvalidKeyName) } - if !checkValue(v) { + if !checkValue(v.value) { return ctx, fmt.Errorf("key:%q value:%q: %v", k.Name(), v, errInvalidValue) } - m.insert(k, v) + m.insert(k, v.value, v.m) } } var err error diff --git a/vendor/go.opencensus.io/tag/map_codec.go b/vendor/go.opencensus.io/tag/map_codec.go index e88e72777..f8b582761 100644 --- a/vendor/go.opencensus.io/tag/map_codec.go +++ b/vendor/go.opencensus.io/tag/map_codec.go @@ -170,9 +170,11 @@ func Encode(m *Map) []byte { } eg.writeByte(byte(tagsVersionID)) for k, v := range m.m { - eg.writeByte(byte(keyTypeString)) - eg.writeStringWithVarintLen(k.name) - eg.writeBytesWithVarintLen([]byte(v)) + if v.m.ttl.ttl == valueTTLUnlimitedPropagation { + eg.writeByte(byte(keyTypeString)) + eg.writeStringWithVarintLen(k.name) + eg.writeBytesWithVarintLen([]byte(v.value)) + } } return eg.bytes() } @@ -190,7 +192,7 @@ func Decode(bytes []byte) (*Map, error) { // DecodeEach decodes the given serialized tag map, calling handler for each // tag key and value decoded. -func DecodeEach(bytes []byte, fn func(key Key, val string)) error { +func DecodeEach(bytes []byte, fn func(key Key, val string, md metadatas)) error { eg := &encoderGRPC{ buf: bytes, } @@ -228,7 +230,7 @@ func DecodeEach(bytes []byte, fn func(key Key, val string)) error { if !checkValue(val) { return errInvalidValue } - fn(key, val) + fn(key, val, createMetadatas(WithTTL(TTLUnlimitedPropagation))) if err != nil { return err } diff --git a/vendor/go.opencensus.io/tag/metadata.go b/vendor/go.opencensus.io/tag/metadata.go new file mode 100644 index 000000000..6571a583e --- /dev/null +++ b/vendor/go.opencensus.io/tag/metadata.go @@ -0,0 +1,52 @@ +// Copyright 2019, OpenCensus Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package tag + +const ( + // valueTTLNoPropagation prevents tag from propagating. + valueTTLNoPropagation = 0 + + // valueTTLUnlimitedPropagation allows tag to propagate without any limits on number of hops. + valueTTLUnlimitedPropagation = -1 +) + +// TTL is metadata that specifies number of hops a tag can propagate. +// Details about TTL metadata is specified at https://github.com/census-instrumentation/opencensus-specs/blob/master/tags/TagMap.md#tagmetadata +type TTL struct { + ttl int +} + +var ( + // TTLUnlimitedPropagation is TTL metadata that allows tag to propagate without any limits on number of hops. + TTLUnlimitedPropagation = TTL{ttl: valueTTLUnlimitedPropagation} + + // TTLNoPropagation is TTL metadata that prevents tag from propagating. + TTLNoPropagation = TTL{ttl: valueTTLNoPropagation} +) + +type metadatas struct { + ttl TTL +} + +// Metadata applies metadatas specified by the function. +type Metadata func(*metadatas) + +// WithTTL applies metadata with provided ttl. +func WithTTL(ttl TTL) Metadata { + return func(m *metadatas) { + m.ttl = ttl + } +} diff --git a/vendor/go.opencensus.io/tag/profile_19.go b/vendor/go.opencensus.io/tag/profile_19.go index f81cd0b4a..b34d95e34 100644 --- a/vendor/go.opencensus.io/tag/profile_19.go +++ b/vendor/go.opencensus.io/tag/profile_19.go @@ -25,7 +25,7 @@ func do(ctx context.Context, f func(ctx context.Context)) { m := FromContext(ctx) keyvals := make([]string, 0, 2*len(m.m)) for k, v := range m.m { - keyvals = append(keyvals, k.Name(), v) + keyvals = append(keyvals, k.Name(), v.value) } pprof.Do(ctx, pprof.Labels(keyvals...), f) } diff --git a/vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go b/vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go new file mode 100644 index 000000000..c5a8950c8 --- /dev/null +++ b/vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go @@ -0,0 +1,7105 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: google/container/v1/cluster_service.proto + +package container // import "google.golang.org/genproto/googleapis/container/v1" + +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" +import empty "github.com/golang/protobuf/ptypes/empty" +import _ "google.golang.org/genproto/googleapis/api/annotations" + +import ( + context "golang.org/x/net/context" + grpc "google.golang.org/grpc" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + +// Allowed Network Policy providers. +type NetworkPolicy_Provider int32 + +const ( + // Not set + NetworkPolicy_PROVIDER_UNSPECIFIED NetworkPolicy_Provider = 0 + // Tigera (Calico Felix). + NetworkPolicy_CALICO NetworkPolicy_Provider = 1 +) + +var NetworkPolicy_Provider_name = map[int32]string{ + 0: "PROVIDER_UNSPECIFIED", + 1: "CALICO", +} +var NetworkPolicy_Provider_value = map[string]int32{ + "PROVIDER_UNSPECIFIED": 0, + "CALICO": 1, +} + +func (x NetworkPolicy_Provider) String() string { + return proto.EnumName(NetworkPolicy_Provider_name, int32(x)) +} +func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{11, 0} +} + +// The current status of the cluster. +type Cluster_Status int32 + +const ( + // Not set. + Cluster_STATUS_UNSPECIFIED Cluster_Status = 0 + // The PROVISIONING state indicates the cluster is being created. + Cluster_PROVISIONING Cluster_Status = 1 + // The RUNNING state indicates the cluster has been created and is fully + // usable. + Cluster_RUNNING Cluster_Status = 2 + // The RECONCILING state indicates that some work is actively being done on + // the cluster, such as upgrading the master or node software. Details can + // be found in the `statusMessage` field. + Cluster_RECONCILING Cluster_Status = 3 + // The STOPPING state indicates the cluster is being deleted. + Cluster_STOPPING Cluster_Status = 4 + // The ERROR state indicates the cluster may be unusable. Details + // can be found in the `statusMessage` field. + Cluster_ERROR Cluster_Status = 5 + // The DEGRADED state indicates the cluster requires user action to restore + // full functionality. Details can be found in the `statusMessage` field. + Cluster_DEGRADED Cluster_Status = 6 +) + +var Cluster_Status_name = map[int32]string{ + 0: "STATUS_UNSPECIFIED", + 1: "PROVISIONING", + 2: "RUNNING", + 3: "RECONCILING", + 4: "STOPPING", + 5: "ERROR", + 6: "DEGRADED", +} +var Cluster_Status_value = map[string]int32{ + "STATUS_UNSPECIFIED": 0, + "PROVISIONING": 1, + "RUNNING": 2, + "RECONCILING": 3, + "STOPPING": 4, + "ERROR": 5, + "DEGRADED": 6, +} + +func (x Cluster_Status) String() string { + return proto.EnumName(Cluster_Status_name, int32(x)) +} +func (Cluster_Status) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{13, 0} +} + +// Current status of the operation. +type Operation_Status int32 + +const ( + // Not set. + Operation_STATUS_UNSPECIFIED Operation_Status = 0 + // The operation has been created. + Operation_PENDING Operation_Status = 1 + // The operation is currently running. + Operation_RUNNING Operation_Status = 2 + // The operation is done, either cancelled or completed. + Operation_DONE Operation_Status = 3 + // The operation is aborting. + Operation_ABORTING Operation_Status = 4 +) + +var Operation_Status_name = map[int32]string{ + 0: "STATUS_UNSPECIFIED", + 1: "PENDING", + 2: "RUNNING", + 3: "DONE", + 4: "ABORTING", +} +var Operation_Status_value = map[string]int32{ + "STATUS_UNSPECIFIED": 0, + "PENDING": 1, + "RUNNING": 2, + "DONE": 3, + "ABORTING": 4, +} + +func (x Operation_Status) String() string { + return proto.EnumName(Operation_Status_name, int32(x)) +} +func (Operation_Status) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{15, 0} +} + +// Operation type. +type Operation_Type int32 + +const ( + // Not set. + Operation_TYPE_UNSPECIFIED Operation_Type = 0 + // Cluster create. + Operation_CREATE_CLUSTER Operation_Type = 1 + // Cluster delete. + Operation_DELETE_CLUSTER Operation_Type = 2 + // A master upgrade. + Operation_UPGRADE_MASTER Operation_Type = 3 + // A node upgrade. + Operation_UPGRADE_NODES Operation_Type = 4 + // Cluster repair. + Operation_REPAIR_CLUSTER Operation_Type = 5 + // Cluster update. + Operation_UPDATE_CLUSTER Operation_Type = 6 + // Node pool create. + Operation_CREATE_NODE_POOL Operation_Type = 7 + // Node pool delete. + Operation_DELETE_NODE_POOL Operation_Type = 8 + // Set node pool management. + Operation_SET_NODE_POOL_MANAGEMENT Operation_Type = 9 + // Automatic node pool repair. + Operation_AUTO_REPAIR_NODES Operation_Type = 10 + // Automatic node upgrade. + Operation_AUTO_UPGRADE_NODES Operation_Type = 11 + // Set labels. + Operation_SET_LABELS Operation_Type = 12 + // Set/generate master auth materials + Operation_SET_MASTER_AUTH Operation_Type = 13 + // Set node pool size. + Operation_SET_NODE_POOL_SIZE Operation_Type = 14 + // Updates network policy for a cluster. + Operation_SET_NETWORK_POLICY Operation_Type = 15 + // Set the maintenance policy. + Operation_SET_MAINTENANCE_POLICY Operation_Type = 16 +) + +var Operation_Type_name = map[int32]string{ + 0: "TYPE_UNSPECIFIED", + 1: "CREATE_CLUSTER", + 2: "DELETE_CLUSTER", + 3: "UPGRADE_MASTER", + 4: "UPGRADE_NODES", + 5: "REPAIR_CLUSTER", + 6: "UPDATE_CLUSTER", + 7: "CREATE_NODE_POOL", + 8: "DELETE_NODE_POOL", + 9: "SET_NODE_POOL_MANAGEMENT", + 10: "AUTO_REPAIR_NODES", + 11: "AUTO_UPGRADE_NODES", + 12: "SET_LABELS", + 13: "SET_MASTER_AUTH", + 14: "SET_NODE_POOL_SIZE", + 15: "SET_NETWORK_POLICY", + 16: "SET_MAINTENANCE_POLICY", +} +var Operation_Type_value = map[string]int32{ + "TYPE_UNSPECIFIED": 0, + "CREATE_CLUSTER": 1, + "DELETE_CLUSTER": 2, + "UPGRADE_MASTER": 3, + "UPGRADE_NODES": 4, + "REPAIR_CLUSTER": 5, + "UPDATE_CLUSTER": 6, + "CREATE_NODE_POOL": 7, + "DELETE_NODE_POOL": 8, + "SET_NODE_POOL_MANAGEMENT": 9, + "AUTO_REPAIR_NODES": 10, + "AUTO_UPGRADE_NODES": 11, + "SET_LABELS": 12, + "SET_MASTER_AUTH": 13, + "SET_NODE_POOL_SIZE": 14, + "SET_NETWORK_POLICY": 15, + "SET_MAINTENANCE_POLICY": 16, +} + +func (x Operation_Type) String() string { + return proto.EnumName(Operation_Type_name, int32(x)) +} +func (Operation_Type) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{15, 1} +} + +// Operation type: what type update to perform. +type SetMasterAuthRequest_Action int32 + +const ( + // Operation is unknown and will error out. + SetMasterAuthRequest_UNKNOWN SetMasterAuthRequest_Action = 0 + // Set the password to a user generated value. + SetMasterAuthRequest_SET_PASSWORD SetMasterAuthRequest_Action = 1 + // Generate a new password and set it to that. + SetMasterAuthRequest_GENERATE_PASSWORD SetMasterAuthRequest_Action = 2 + // Set the username. If an empty username is provided, basic authentication + // is disabled for the cluster. If a non-empty username is provided, basic + // authentication is enabled, with either a provided password or a generated + // one. + SetMasterAuthRequest_SET_USERNAME SetMasterAuthRequest_Action = 3 +) + +var SetMasterAuthRequest_Action_name = map[int32]string{ + 0: "UNKNOWN", + 1: "SET_PASSWORD", + 2: "GENERATE_PASSWORD", + 3: "SET_USERNAME", +} +var SetMasterAuthRequest_Action_value = map[string]int32{ + "UNKNOWN": 0, + "SET_PASSWORD": 1, + "GENERATE_PASSWORD": 2, + "SET_USERNAME": 3, +} + +func (x SetMasterAuthRequest_Action) String() string { + return proto.EnumName(SetMasterAuthRequest_Action_name, int32(x)) +} +func (SetMasterAuthRequest_Action) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{26, 0} +} + +// The current status of the node pool instance. +type NodePool_Status int32 + +const ( + // Not set. + NodePool_STATUS_UNSPECIFIED NodePool_Status = 0 + // The PROVISIONING state indicates the node pool is being created. + NodePool_PROVISIONING NodePool_Status = 1 + // The RUNNING state indicates the node pool has been created + // and is fully usable. + NodePool_RUNNING NodePool_Status = 2 + // The RUNNING_WITH_ERROR state indicates the node pool has been created + // and is partially usable. Some error state has occurred and some + // functionality may be impaired. Customer may need to reissue a request + // or trigger a new update. + NodePool_RUNNING_WITH_ERROR NodePool_Status = 3 + // The RECONCILING state indicates that some work is actively being done on + // the node pool, such as upgrading node software. Details can + // be found in the `statusMessage` field. + NodePool_RECONCILING NodePool_Status = 4 + // The STOPPING state indicates the node pool is being deleted. + NodePool_STOPPING NodePool_Status = 5 + // The ERROR state indicates the node pool may be unusable. Details + // can be found in the `statusMessage` field. + NodePool_ERROR NodePool_Status = 6 +) + +var NodePool_Status_name = map[int32]string{ + 0: "STATUS_UNSPECIFIED", + 1: "PROVISIONING", + 2: "RUNNING", + 3: "RUNNING_WITH_ERROR", + 4: "RECONCILING", + 5: "STOPPING", + 6: "ERROR", +} +var NodePool_Status_value = map[string]int32{ + "STATUS_UNSPECIFIED": 0, + "PROVISIONING": 1, + "RUNNING": 2, + "RUNNING_WITH_ERROR": 3, + "RECONCILING": 4, + "STOPPING": 5, + "ERROR": 6, +} + +func (x NodePool_Status) String() string { + return proto.EnumName(NodePool_Status_name, int32(x)) +} +func (NodePool_Status) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{40, 0} +} + +// Parameters that describe the nodes in a cluster. +type NodeConfig struct { + // The name of a Google Compute Engine [machine + // type](/compute/docs/machine-types) (e.g. + // `n1-standard-1`). + // + // If unspecified, the default machine type is + // `n1-standard-1`. + MachineType string `protobuf:"bytes,1,opt,name=machine_type,json=machineType,proto3" json:"machine_type,omitempty"` + // Size of the disk attached to each node, specified in GB. + // The smallest allowed disk size is 10GB. + // + // If unspecified, the default disk size is 100GB. + DiskSizeGb int32 `protobuf:"varint,2,opt,name=disk_size_gb,json=diskSizeGb,proto3" json:"disk_size_gb,omitempty"` + // The set of Google API scopes to be made available on all of the + // node VMs under the "default" service account. + // + // The following scopes are recommended, but not required, and by default are + // not included: + // + // * `https://www.googleapis.com/auth/compute` is required for mounting + // persistent storage on your nodes. + // * `https://www.googleapis.com/auth/devstorage.read_only` is required for + // communicating with **gcr.io** + // (the [Google Container Registry](/container-registry/)). + // + // If unspecified, no scopes are added, unless Cloud Logging or Cloud + // Monitoring are enabled, in which case their required scopes will be added. + OauthScopes []string `protobuf:"bytes,3,rep,name=oauth_scopes,json=oauthScopes,proto3" json:"oauth_scopes,omitempty"` + // The Google Cloud Platform Service Account to be used by the node VMs. If + // no Service Account is specified, the "default" service account is used. + ServiceAccount string `protobuf:"bytes,9,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"` + // The metadata key/value pairs assigned to instances in the cluster. + // + // Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes + // in length. These are reflected as part of a URL in the metadata server. + // Additionally, to avoid ambiguity, keys must not conflict with any other + // metadata keys for the project or be one of the reserved keys: + // "cluster-location" + // "cluster-name" + // "cluster-uid" + // "configure-sh" + // "enable-os-login" + // "gci-update-strategy" + // "gci-ensure-gke-docker" + // "instance-template" + // "kube-env" + // "startup-script" + // "user-data" + // + // Values are free-form strings, and only have meaning as interpreted by + // the image running in the instance. The only restriction placed on them is + // that each value's size must be less than or equal to 32 KB. + // + // The total size of all keys and values must be less than 512 KB. + Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // The image type to use for this node. Note that for a given image type, + // the latest version of it will be used. + ImageType string `protobuf:"bytes,5,opt,name=image_type,json=imageType,proto3" json:"image_type,omitempty"` + // The map of Kubernetes labels (key/value pairs) to be applied to each node. + // These will added in addition to any default label(s) that + // Kubernetes may apply to the node. + // In case of conflict in label keys, the applied set may differ depending on + // the Kubernetes version -- it's best to assume the behavior is undefined + // and conflicts should be avoided. + // For more information, including usage and the valid values, see: + // https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // The number of local SSD disks to be attached to the node. + // + // The limit for this value is dependant upon the maximum number of + // disks available on a machine per zone. See: + // https://cloud.google.com/compute/docs/disks/local-ssd#local_ssd_limits + // for more information. + LocalSsdCount int32 `protobuf:"varint,7,opt,name=local_ssd_count,json=localSsdCount,proto3" json:"local_ssd_count,omitempty"` + // The list of instance tags applied to all nodes. Tags are used to identify + // valid sources or targets for network firewalls and are specified by + // the client during cluster or node pool creation. Each tag within the list + // must comply with RFC1035. + Tags []string `protobuf:"bytes,8,rep,name=tags,proto3" json:"tags,omitempty"` + // Whether the nodes are created as preemptible VM instances. See: + // https://cloud.google.com/compute/docs/instances/preemptible for more + // information about preemptible VM instances. + Preemptible bool `protobuf:"varint,10,opt,name=preemptible,proto3" json:"preemptible,omitempty"` + // A list of hardware accelerators to be attached to each node. + // See https://cloud.google.com/compute/docs/gpus for more information about + // support for GPUs. + Accelerators []*AcceleratorConfig `protobuf:"bytes,11,rep,name=accelerators,proto3" json:"accelerators,omitempty"` + // Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') + // + // If unspecified, the default disk type is 'pd-standard' + DiskType string `protobuf:"bytes,12,opt,name=disk_type,json=diskType,proto3" json:"disk_type,omitempty"` + // Minimum CPU platform to be used by this instance. The instance may be + // scheduled on the specified or newer CPU platform. Applicable values are the + // friendly names of CPU platforms, such as + // minCpuPlatform: "Intel Haswell" or + // minCpuPlatform: "Intel Sandy Bridge". For more + // information, read [how to specify min CPU + // platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) + MinCpuPlatform string `protobuf:"bytes,13,opt,name=min_cpu_platform,json=minCpuPlatform,proto3" json:"min_cpu_platform,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NodeConfig) Reset() { *m = NodeConfig{} } +func (m *NodeConfig) String() string { return proto.CompactTextString(m) } +func (*NodeConfig) ProtoMessage() {} +func (*NodeConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{0} +} +func (m *NodeConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NodeConfig.Unmarshal(m, b) +} +func (m *NodeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NodeConfig.Marshal(b, m, deterministic) +} +func (dst *NodeConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_NodeConfig.Merge(dst, src) +} +func (m *NodeConfig) XXX_Size() int { + return xxx_messageInfo_NodeConfig.Size(m) +} +func (m *NodeConfig) XXX_DiscardUnknown() { + xxx_messageInfo_NodeConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_NodeConfig proto.InternalMessageInfo + +func (m *NodeConfig) GetMachineType() string { + if m != nil { + return m.MachineType + } + return "" +} + +func (m *NodeConfig) GetDiskSizeGb() int32 { + if m != nil { + return m.DiskSizeGb + } + return 0 +} + +func (m *NodeConfig) GetOauthScopes() []string { + if m != nil { + return m.OauthScopes + } + return nil +} + +func (m *NodeConfig) GetServiceAccount() string { + if m != nil { + return m.ServiceAccount + } + return "" +} + +func (m *NodeConfig) GetMetadata() map[string]string { + if m != nil { + return m.Metadata + } + return nil +} + +func (m *NodeConfig) GetImageType() string { + if m != nil { + return m.ImageType + } + return "" +} + +func (m *NodeConfig) GetLabels() map[string]string { + if m != nil { + return m.Labels + } + return nil +} + +func (m *NodeConfig) GetLocalSsdCount() int32 { + if m != nil { + return m.LocalSsdCount + } + return 0 +} + +func (m *NodeConfig) GetTags() []string { + if m != nil { + return m.Tags + } + return nil +} + +func (m *NodeConfig) GetPreemptible() bool { + if m != nil { + return m.Preemptible + } + return false +} + +func (m *NodeConfig) GetAccelerators() []*AcceleratorConfig { + if m != nil { + return m.Accelerators + } + return nil +} + +func (m *NodeConfig) GetDiskType() string { + if m != nil { + return m.DiskType + } + return "" +} + +func (m *NodeConfig) GetMinCpuPlatform() string { + if m != nil { + return m.MinCpuPlatform + } + return "" +} + +// The authentication information for accessing the master endpoint. +// Authentication can be done using HTTP basic auth or using client +// certificates. +type MasterAuth struct { + // The username to use for HTTP basic authentication to the master endpoint. + // For clusters v1.6.0 and later, you can disable basic authentication by + // providing an empty username. + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + // The password to use for HTTP basic authentication to the master endpoint. + // Because the master endpoint is open to the Internet, you should create a + // strong password. If a password is provided for cluster creation, username + // must be non-empty. + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + // Configuration for client certificate authentication on the cluster. For + // clusters before v1.12, if no configuration is specified, a client + // certificate is issued. + ClientCertificateConfig *ClientCertificateConfig `protobuf:"bytes,3,opt,name=client_certificate_config,json=clientCertificateConfig,proto3" json:"client_certificate_config,omitempty"` + // [Output only] Base64-encoded public certificate that is the root of + // trust for the cluster. + ClusterCaCertificate string `protobuf:"bytes,100,opt,name=cluster_ca_certificate,json=clusterCaCertificate,proto3" json:"cluster_ca_certificate,omitempty"` + // [Output only] Base64-encoded public certificate used by clients to + // authenticate to the cluster endpoint. + ClientCertificate string `protobuf:"bytes,101,opt,name=client_certificate,json=clientCertificate,proto3" json:"client_certificate,omitempty"` + // [Output only] Base64-encoded private key used by clients to authenticate + // to the cluster endpoint. + ClientKey string `protobuf:"bytes,102,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MasterAuth) Reset() { *m = MasterAuth{} } +func (m *MasterAuth) String() string { return proto.CompactTextString(m) } +func (*MasterAuth) ProtoMessage() {} +func (*MasterAuth) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{1} +} +func (m *MasterAuth) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MasterAuth.Unmarshal(m, b) +} +func (m *MasterAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MasterAuth.Marshal(b, m, deterministic) +} +func (dst *MasterAuth) XXX_Merge(src proto.Message) { + xxx_messageInfo_MasterAuth.Merge(dst, src) +} +func (m *MasterAuth) XXX_Size() int { + return xxx_messageInfo_MasterAuth.Size(m) +} +func (m *MasterAuth) XXX_DiscardUnknown() { + xxx_messageInfo_MasterAuth.DiscardUnknown(m) +} + +var xxx_messageInfo_MasterAuth proto.InternalMessageInfo + +func (m *MasterAuth) GetUsername() string { + if m != nil { + return m.Username + } + return "" +} + +func (m *MasterAuth) GetPassword() string { + if m != nil { + return m.Password + } + return "" +} + +func (m *MasterAuth) GetClientCertificateConfig() *ClientCertificateConfig { + if m != nil { + return m.ClientCertificateConfig + } + return nil +} + +func (m *MasterAuth) GetClusterCaCertificate() string { + if m != nil { + return m.ClusterCaCertificate + } + return "" +} + +func (m *MasterAuth) GetClientCertificate() string { + if m != nil { + return m.ClientCertificate + } + return "" +} + +func (m *MasterAuth) GetClientKey() string { + if m != nil { + return m.ClientKey + } + return "" +} + +// Configuration for client certificates on the cluster. +type ClientCertificateConfig struct { + // Issue a client certificate. + IssueClientCertificate bool `protobuf:"varint,1,opt,name=issue_client_certificate,json=issueClientCertificate,proto3" json:"issue_client_certificate,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ClientCertificateConfig) Reset() { *m = ClientCertificateConfig{} } +func (m *ClientCertificateConfig) String() string { return proto.CompactTextString(m) } +func (*ClientCertificateConfig) ProtoMessage() {} +func (*ClientCertificateConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{2} +} +func (m *ClientCertificateConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ClientCertificateConfig.Unmarshal(m, b) +} +func (m *ClientCertificateConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ClientCertificateConfig.Marshal(b, m, deterministic) +} +func (dst *ClientCertificateConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClientCertificateConfig.Merge(dst, src) +} +func (m *ClientCertificateConfig) XXX_Size() int { + return xxx_messageInfo_ClientCertificateConfig.Size(m) +} +func (m *ClientCertificateConfig) XXX_DiscardUnknown() { + xxx_messageInfo_ClientCertificateConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_ClientCertificateConfig proto.InternalMessageInfo + +func (m *ClientCertificateConfig) GetIssueClientCertificate() bool { + if m != nil { + return m.IssueClientCertificate + } + return false +} + +// Configuration for the addons that can be automatically spun up in the +// cluster, enabling additional functionality. +type AddonsConfig struct { + // Configuration for the HTTP (L7) load balancing controller addon, which + // makes it easy to set up HTTP load balancers for services in a cluster. + HttpLoadBalancing *HttpLoadBalancing `protobuf:"bytes,1,opt,name=http_load_balancing,json=httpLoadBalancing,proto3" json:"http_load_balancing,omitempty"` + // Configuration for the horizontal pod autoscaling feature, which + // increases or decreases the number of replica pods a replication controller + // has based on the resource usage of the existing pods. + HorizontalPodAutoscaling *HorizontalPodAutoscaling `protobuf:"bytes,2,opt,name=horizontal_pod_autoscaling,json=horizontalPodAutoscaling,proto3" json:"horizontal_pod_autoscaling,omitempty"` + // Configuration for the Kubernetes Dashboard. + KubernetesDashboard *KubernetesDashboard `protobuf:"bytes,3,opt,name=kubernetes_dashboard,json=kubernetesDashboard,proto3" json:"kubernetes_dashboard,omitempty"` + // Configuration for NetworkPolicy. This only tracks whether the addon + // is enabled or not on the Master, it does not track whether network policy + // is enabled for the nodes. + NetworkPolicyConfig *NetworkPolicyConfig `protobuf:"bytes,4,opt,name=network_policy_config,json=networkPolicyConfig,proto3" json:"network_policy_config,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AddonsConfig) Reset() { *m = AddonsConfig{} } +func (m *AddonsConfig) String() string { return proto.CompactTextString(m) } +func (*AddonsConfig) ProtoMessage() {} +func (*AddonsConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{3} +} +func (m *AddonsConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_AddonsConfig.Unmarshal(m, b) +} +func (m *AddonsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_AddonsConfig.Marshal(b, m, deterministic) +} +func (dst *AddonsConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_AddonsConfig.Merge(dst, src) +} +func (m *AddonsConfig) XXX_Size() int { + return xxx_messageInfo_AddonsConfig.Size(m) +} +func (m *AddonsConfig) XXX_DiscardUnknown() { + xxx_messageInfo_AddonsConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_AddonsConfig proto.InternalMessageInfo + +func (m *AddonsConfig) GetHttpLoadBalancing() *HttpLoadBalancing { + if m != nil { + return m.HttpLoadBalancing + } + return nil +} + +func (m *AddonsConfig) GetHorizontalPodAutoscaling() *HorizontalPodAutoscaling { + if m != nil { + return m.HorizontalPodAutoscaling + } + return nil +} + +func (m *AddonsConfig) GetKubernetesDashboard() *KubernetesDashboard { + if m != nil { + return m.KubernetesDashboard + } + return nil +} + +func (m *AddonsConfig) GetNetworkPolicyConfig() *NetworkPolicyConfig { + if m != nil { + return m.NetworkPolicyConfig + } + return nil +} + +// Configuration options for the HTTP (L7) load balancing controller addon, +// which makes it easy to set up HTTP load balancers for services in a cluster. +type HttpLoadBalancing struct { + // Whether the HTTP Load Balancing controller is enabled in the cluster. + // When enabled, it runs a small pod in the cluster that manages the load + // balancers. + Disabled bool `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HttpLoadBalancing) Reset() { *m = HttpLoadBalancing{} } +func (m *HttpLoadBalancing) String() string { return proto.CompactTextString(m) } +func (*HttpLoadBalancing) ProtoMessage() {} +func (*HttpLoadBalancing) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{4} +} +func (m *HttpLoadBalancing) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_HttpLoadBalancing.Unmarshal(m, b) +} +func (m *HttpLoadBalancing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_HttpLoadBalancing.Marshal(b, m, deterministic) +} +func (dst *HttpLoadBalancing) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpLoadBalancing.Merge(dst, src) +} +func (m *HttpLoadBalancing) XXX_Size() int { + return xxx_messageInfo_HttpLoadBalancing.Size(m) +} +func (m *HttpLoadBalancing) XXX_DiscardUnknown() { + xxx_messageInfo_HttpLoadBalancing.DiscardUnknown(m) +} + +var xxx_messageInfo_HttpLoadBalancing proto.InternalMessageInfo + +func (m *HttpLoadBalancing) GetDisabled() bool { + if m != nil { + return m.Disabled + } + return false +} + +// Configuration options for the horizontal pod autoscaling feature, which +// increases or decreases the number of replica pods a replication controller +// has based on the resource usage of the existing pods. +type HorizontalPodAutoscaling struct { + // Whether the Horizontal Pod Autoscaling feature is enabled in the cluster. + // When enabled, it ensures that a Heapster pod is running in the cluster, + // which is also used by the Cloud Monitoring service. + Disabled bool `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HorizontalPodAutoscaling) Reset() { *m = HorizontalPodAutoscaling{} } +func (m *HorizontalPodAutoscaling) String() string { return proto.CompactTextString(m) } +func (*HorizontalPodAutoscaling) ProtoMessage() {} +func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{5} +} +func (m *HorizontalPodAutoscaling) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_HorizontalPodAutoscaling.Unmarshal(m, b) +} +func (m *HorizontalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_HorizontalPodAutoscaling.Marshal(b, m, deterministic) +} +func (dst *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) { + xxx_messageInfo_HorizontalPodAutoscaling.Merge(dst, src) +} +func (m *HorizontalPodAutoscaling) XXX_Size() int { + return xxx_messageInfo_HorizontalPodAutoscaling.Size(m) +} +func (m *HorizontalPodAutoscaling) XXX_DiscardUnknown() { + xxx_messageInfo_HorizontalPodAutoscaling.DiscardUnknown(m) +} + +var xxx_messageInfo_HorizontalPodAutoscaling proto.InternalMessageInfo + +func (m *HorizontalPodAutoscaling) GetDisabled() bool { + if m != nil { + return m.Disabled + } + return false +} + +// Configuration for the Kubernetes Dashboard. +type KubernetesDashboard struct { + // Whether the Kubernetes Dashboard is enabled for this cluster. + Disabled bool `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *KubernetesDashboard) Reset() { *m = KubernetesDashboard{} } +func (m *KubernetesDashboard) String() string { return proto.CompactTextString(m) } +func (*KubernetesDashboard) ProtoMessage() {} +func (*KubernetesDashboard) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{6} +} +func (m *KubernetesDashboard) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_KubernetesDashboard.Unmarshal(m, b) +} +func (m *KubernetesDashboard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_KubernetesDashboard.Marshal(b, m, deterministic) +} +func (dst *KubernetesDashboard) XXX_Merge(src proto.Message) { + xxx_messageInfo_KubernetesDashboard.Merge(dst, src) +} +func (m *KubernetesDashboard) XXX_Size() int { + return xxx_messageInfo_KubernetesDashboard.Size(m) +} +func (m *KubernetesDashboard) XXX_DiscardUnknown() { + xxx_messageInfo_KubernetesDashboard.DiscardUnknown(m) +} + +var xxx_messageInfo_KubernetesDashboard proto.InternalMessageInfo + +func (m *KubernetesDashboard) GetDisabled() bool { + if m != nil { + return m.Disabled + } + return false +} + +// Configuration for NetworkPolicy. This only tracks whether the addon +// is enabled or not on the Master, it does not track whether network policy +// is enabled for the nodes. +type NetworkPolicyConfig struct { + // Whether NetworkPolicy is enabled for this cluster. + Disabled bool `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NetworkPolicyConfig) Reset() { *m = NetworkPolicyConfig{} } +func (m *NetworkPolicyConfig) String() string { return proto.CompactTextString(m) } +func (*NetworkPolicyConfig) ProtoMessage() {} +func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{7} +} +func (m *NetworkPolicyConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NetworkPolicyConfig.Unmarshal(m, b) +} +func (m *NetworkPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NetworkPolicyConfig.Marshal(b, m, deterministic) +} +func (dst *NetworkPolicyConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkPolicyConfig.Merge(dst, src) +} +func (m *NetworkPolicyConfig) XXX_Size() int { + return xxx_messageInfo_NetworkPolicyConfig.Size(m) +} +func (m *NetworkPolicyConfig) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkPolicyConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_NetworkPolicyConfig proto.InternalMessageInfo + +func (m *NetworkPolicyConfig) GetDisabled() bool { + if m != nil { + return m.Disabled + } + return false +} + +// Configuration options for private clusters. +type PrivateClusterConfig struct { + // Whether nodes have internal IP addresses only. If enabled, all nodes are + // given only RFC 1918 private addresses and communicate with the master via + // private networking. + EnablePrivateNodes bool `protobuf:"varint,1,opt,name=enable_private_nodes,json=enablePrivateNodes,proto3" json:"enable_private_nodes,omitempty"` + // Whether the master's internal IP address is used as the cluster endpoint. + EnablePrivateEndpoint bool `protobuf:"varint,2,opt,name=enable_private_endpoint,json=enablePrivateEndpoint,proto3" json:"enable_private_endpoint,omitempty"` + // The IP range in CIDR notation to use for the hosted master network. This + // range will be used for assigning internal IP addresses to the master or + // set of masters, as well as the ILB VIP. This range must not overlap with + // any other ranges in use within the cluster's network. + MasterIpv4CidrBlock string `protobuf:"bytes,3,opt,name=master_ipv4_cidr_block,json=masterIpv4CidrBlock,proto3" json:"master_ipv4_cidr_block,omitempty"` + // Output only. The internal IP address of this cluster's master endpoint. + PrivateEndpoint string `protobuf:"bytes,4,opt,name=private_endpoint,json=privateEndpoint,proto3" json:"private_endpoint,omitempty"` + // Output only. The external IP address of this cluster's master endpoint. + PublicEndpoint string `protobuf:"bytes,5,opt,name=public_endpoint,json=publicEndpoint,proto3" json:"public_endpoint,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PrivateClusterConfig) Reset() { *m = PrivateClusterConfig{} } +func (m *PrivateClusterConfig) String() string { return proto.CompactTextString(m) } +func (*PrivateClusterConfig) ProtoMessage() {} +func (*PrivateClusterConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{8} +} +func (m *PrivateClusterConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PrivateClusterConfig.Unmarshal(m, b) +} +func (m *PrivateClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PrivateClusterConfig.Marshal(b, m, deterministic) +} +func (dst *PrivateClusterConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_PrivateClusterConfig.Merge(dst, src) +} +func (m *PrivateClusterConfig) XXX_Size() int { + return xxx_messageInfo_PrivateClusterConfig.Size(m) +} +func (m *PrivateClusterConfig) XXX_DiscardUnknown() { + xxx_messageInfo_PrivateClusterConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_PrivateClusterConfig proto.InternalMessageInfo + +func (m *PrivateClusterConfig) GetEnablePrivateNodes() bool { + if m != nil { + return m.EnablePrivateNodes + } + return false +} + +func (m *PrivateClusterConfig) GetEnablePrivateEndpoint() bool { + if m != nil { + return m.EnablePrivateEndpoint + } + return false +} + +func (m *PrivateClusterConfig) GetMasterIpv4CidrBlock() string { + if m != nil { + return m.MasterIpv4CidrBlock + } + return "" +} + +func (m *PrivateClusterConfig) GetPrivateEndpoint() string { + if m != nil { + return m.PrivateEndpoint + } + return "" +} + +func (m *PrivateClusterConfig) GetPublicEndpoint() string { + if m != nil { + return m.PublicEndpoint + } + return "" +} + +// Configuration options for the master authorized networks feature. Enabled +// master authorized networks will disallow all external traffic to access +// Kubernetes master through HTTPS except traffic from the given CIDR blocks, +// Google Compute Engine Public IPs and Google Prod IPs. +type MasterAuthorizedNetworksConfig struct { + // Whether or not master authorized networks is enabled. + Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"` + // cidr_blocks define up to 10 external networks that could access + // Kubernetes master through HTTPS. + CidrBlocks []*MasterAuthorizedNetworksConfig_CidrBlock `protobuf:"bytes,2,rep,name=cidr_blocks,json=cidrBlocks,proto3" json:"cidr_blocks,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MasterAuthorizedNetworksConfig) Reset() { *m = MasterAuthorizedNetworksConfig{} } +func (m *MasterAuthorizedNetworksConfig) String() string { return proto.CompactTextString(m) } +func (*MasterAuthorizedNetworksConfig) ProtoMessage() {} +func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{9} +} +func (m *MasterAuthorizedNetworksConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MasterAuthorizedNetworksConfig.Unmarshal(m, b) +} +func (m *MasterAuthorizedNetworksConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MasterAuthorizedNetworksConfig.Marshal(b, m, deterministic) +} +func (dst *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(dst, src) +} +func (m *MasterAuthorizedNetworksConfig) XXX_Size() int { + return xxx_messageInfo_MasterAuthorizedNetworksConfig.Size(m) +} +func (m *MasterAuthorizedNetworksConfig) XXX_DiscardUnknown() { + xxx_messageInfo_MasterAuthorizedNetworksConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_MasterAuthorizedNetworksConfig proto.InternalMessageInfo + +func (m *MasterAuthorizedNetworksConfig) GetEnabled() bool { + if m != nil { + return m.Enabled + } + return false +} + +func (m *MasterAuthorizedNetworksConfig) GetCidrBlocks() []*MasterAuthorizedNetworksConfig_CidrBlock { + if m != nil { + return m.CidrBlocks + } + return nil +} + +// CidrBlock contains an optional name and one CIDR block. +type MasterAuthorizedNetworksConfig_CidrBlock struct { + // display_name is an optional field for users to identify CIDR blocks. + DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` + // cidr_block must be specified in CIDR notation. + CidrBlock string `protobuf:"bytes,2,opt,name=cidr_block,json=cidrBlock,proto3" json:"cidr_block,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() { + *m = MasterAuthorizedNetworksConfig_CidrBlock{} +} +func (m *MasterAuthorizedNetworksConfig_CidrBlock) String() string { return proto.CompactTextString(m) } +func (*MasterAuthorizedNetworksConfig_CidrBlock) ProtoMessage() {} +func (*MasterAuthorizedNetworksConfig_CidrBlock) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{9, 0} +} +func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Unmarshal(m, b) +} +func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Marshal(b, m, deterministic) +} +func (dst *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) { + xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(dst, src) +} +func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Size() int { + return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Size(m) +} +func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_DiscardUnknown() { + xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.DiscardUnknown(m) +} + +var xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock proto.InternalMessageInfo + +func (m *MasterAuthorizedNetworksConfig_CidrBlock) GetDisplayName() string { + if m != nil { + return m.DisplayName + } + return "" +} + +func (m *MasterAuthorizedNetworksConfig_CidrBlock) GetCidrBlock() string { + if m != nil { + return m.CidrBlock + } + return "" +} + +// Configuration for the legacy Attribute Based Access Control authorization +// mode. +type LegacyAbac struct { + // Whether the ABAC authorizer is enabled for this cluster. When enabled, + // identities in the system, including service accounts, nodes, and + // controllers, will have statically granted permissions beyond those + // provided by the RBAC configuration or IAM. + Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *LegacyAbac) Reset() { *m = LegacyAbac{} } +func (m *LegacyAbac) String() string { return proto.CompactTextString(m) } +func (*LegacyAbac) ProtoMessage() {} +func (*LegacyAbac) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{10} +} +func (m *LegacyAbac) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_LegacyAbac.Unmarshal(m, b) +} +func (m *LegacyAbac) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_LegacyAbac.Marshal(b, m, deterministic) +} +func (dst *LegacyAbac) XXX_Merge(src proto.Message) { + xxx_messageInfo_LegacyAbac.Merge(dst, src) +} +func (m *LegacyAbac) XXX_Size() int { + return xxx_messageInfo_LegacyAbac.Size(m) +} +func (m *LegacyAbac) XXX_DiscardUnknown() { + xxx_messageInfo_LegacyAbac.DiscardUnknown(m) +} + +var xxx_messageInfo_LegacyAbac proto.InternalMessageInfo + +func (m *LegacyAbac) GetEnabled() bool { + if m != nil { + return m.Enabled + } + return false +} + +// Configuration options for the NetworkPolicy feature. +// https://kubernetes.io/docs/concepts/services-networking/networkpolicies/ +type NetworkPolicy struct { + // The selected network policy provider. + Provider NetworkPolicy_Provider `protobuf:"varint,1,opt,name=provider,proto3,enum=google.container.v1.NetworkPolicy_Provider" json:"provider,omitempty"` + // Whether network policy is enabled on the cluster. + Enabled bool `protobuf:"varint,2,opt,name=enabled,proto3" json:"enabled,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NetworkPolicy) Reset() { *m = NetworkPolicy{} } +func (m *NetworkPolicy) String() string { return proto.CompactTextString(m) } +func (*NetworkPolicy) ProtoMessage() {} +func (*NetworkPolicy) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{11} +} +func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NetworkPolicy.Unmarshal(m, b) +} +func (m *NetworkPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NetworkPolicy.Marshal(b, m, deterministic) +} +func (dst *NetworkPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkPolicy.Merge(dst, src) +} +func (m *NetworkPolicy) XXX_Size() int { + return xxx_messageInfo_NetworkPolicy.Size(m) +} +func (m *NetworkPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkPolicy.DiscardUnknown(m) +} + +var xxx_messageInfo_NetworkPolicy proto.InternalMessageInfo + +func (m *NetworkPolicy) GetProvider() NetworkPolicy_Provider { + if m != nil { + return m.Provider + } + return NetworkPolicy_PROVIDER_UNSPECIFIED +} + +func (m *NetworkPolicy) GetEnabled() bool { + if m != nil { + return m.Enabled + } + return false +} + +// Configuration for controlling how IPs are allocated in the cluster. +type IPAllocationPolicy struct { + // Whether alias IPs will be used for pod IPs in the cluster. + UseIpAliases bool `protobuf:"varint,1,opt,name=use_ip_aliases,json=useIpAliases,proto3" json:"use_ip_aliases,omitempty"` + // Whether a new subnetwork will be created automatically for the cluster. + // + // This field is only applicable when `use_ip_aliases` is true. + CreateSubnetwork bool `protobuf:"varint,2,opt,name=create_subnetwork,json=createSubnetwork,proto3" json:"create_subnetwork,omitempty"` + // A custom subnetwork name to be used if `create_subnetwork` is true. If + // this field is empty, then an automatic name will be chosen for the new + // subnetwork. + SubnetworkName string `protobuf:"bytes,3,opt,name=subnetwork_name,json=subnetworkName,proto3" json:"subnetwork_name,omitempty"` + // This field is deprecated, use cluster_ipv4_cidr_block. + ClusterIpv4Cidr string `protobuf:"bytes,4,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"` // Deprecated: Do not use. + // This field is deprecated, use node_ipv4_cidr_block. + NodeIpv4Cidr string `protobuf:"bytes,5,opt,name=node_ipv4_cidr,json=nodeIpv4Cidr,proto3" json:"node_ipv4_cidr,omitempty"` // Deprecated: Do not use. + // This field is deprecated, use services_ipv4_cidr_block. + ServicesIpv4Cidr string `protobuf:"bytes,6,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"` // Deprecated: Do not use. + // The name of the secondary range to be used for the cluster CIDR + // block. The secondary range will be used for pod IP + // addresses. This must be an existing secondary range associated + // with the cluster subnetwork. + // + // This field is only applicable with use_ip_aliases is true and + // create_subnetwork is false. + ClusterSecondaryRangeName string `protobuf:"bytes,7,opt,name=cluster_secondary_range_name,json=clusterSecondaryRangeName,proto3" json:"cluster_secondary_range_name,omitempty"` + // The name of the secondary range to be used as for the services + // CIDR block. The secondary range will be used for service + // ClusterIPs. This must be an existing secondary range associated + // with the cluster subnetwork. + // + // This field is only applicable with use_ip_aliases is true and + // create_subnetwork is false. + ServicesSecondaryRangeName string `protobuf:"bytes,8,opt,name=services_secondary_range_name,json=servicesSecondaryRangeName,proto3" json:"services_secondary_range_name,omitempty"` + // The IP address range for the cluster pod IPs. If this field is set, then + // `cluster.cluster_ipv4_cidr` must be left blank. + // + // This field is only applicable when `use_ip_aliases` is true. + // + // Set to blank to have a range chosen with the default size. + // + // Set to /netmask (e.g. `/14`) to have a range chosen with a specific + // netmask. + // + // Set to a + // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) + // notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g. + // `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range + // to use. + ClusterIpv4CidrBlock string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr_block,json=clusterIpv4CidrBlock,proto3" json:"cluster_ipv4_cidr_block,omitempty"` + // The IP address range of the instance IPs in this cluster. + // + // This is applicable only if `create_subnetwork` is true. + // + // Set to blank to have a range chosen with the default size. + // + // Set to /netmask (e.g. `/14`) to have a range chosen with a specific + // netmask. + // + // Set to a + // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) + // notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g. + // `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range + // to use. + NodeIpv4CidrBlock string `protobuf:"bytes,10,opt,name=node_ipv4_cidr_block,json=nodeIpv4CidrBlock,proto3" json:"node_ipv4_cidr_block,omitempty"` + // The IP address range of the services IPs in this cluster. If blank, a range + // will be automatically chosen with the default size. + // + // This field is only applicable when `use_ip_aliases` is true. + // + // Set to blank to have a range chosen with the default size. + // + // Set to /netmask (e.g. `/14`) to have a range chosen with a specific + // netmask. + // + // Set to a + // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) + // notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g. + // `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range + // to use. + ServicesIpv4CidrBlock string `protobuf:"bytes,11,opt,name=services_ipv4_cidr_block,json=servicesIpv4CidrBlock,proto3" json:"services_ipv4_cidr_block,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *IPAllocationPolicy) Reset() { *m = IPAllocationPolicy{} } +func (m *IPAllocationPolicy) String() string { return proto.CompactTextString(m) } +func (*IPAllocationPolicy) ProtoMessage() {} +func (*IPAllocationPolicy) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{12} +} +func (m *IPAllocationPolicy) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_IPAllocationPolicy.Unmarshal(m, b) +} +func (m *IPAllocationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_IPAllocationPolicy.Marshal(b, m, deterministic) +} +func (dst *IPAllocationPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_IPAllocationPolicy.Merge(dst, src) +} +func (m *IPAllocationPolicy) XXX_Size() int { + return xxx_messageInfo_IPAllocationPolicy.Size(m) +} +func (m *IPAllocationPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_IPAllocationPolicy.DiscardUnknown(m) +} + +var xxx_messageInfo_IPAllocationPolicy proto.InternalMessageInfo + +func (m *IPAllocationPolicy) GetUseIpAliases() bool { + if m != nil { + return m.UseIpAliases + } + return false +} + +func (m *IPAllocationPolicy) GetCreateSubnetwork() bool { + if m != nil { + return m.CreateSubnetwork + } + return false +} + +func (m *IPAllocationPolicy) GetSubnetworkName() string { + if m != nil { + return m.SubnetworkName + } + return "" +} + +// Deprecated: Do not use. +func (m *IPAllocationPolicy) GetClusterIpv4Cidr() string { + if m != nil { + return m.ClusterIpv4Cidr + } + return "" +} + +// Deprecated: Do not use. +func (m *IPAllocationPolicy) GetNodeIpv4Cidr() string { + if m != nil { + return m.NodeIpv4Cidr + } + return "" +} + +// Deprecated: Do not use. +func (m *IPAllocationPolicy) GetServicesIpv4Cidr() string { + if m != nil { + return m.ServicesIpv4Cidr + } + return "" +} + +func (m *IPAllocationPolicy) GetClusterSecondaryRangeName() string { + if m != nil { + return m.ClusterSecondaryRangeName + } + return "" +} + +func (m *IPAllocationPolicy) GetServicesSecondaryRangeName() string { + if m != nil { + return m.ServicesSecondaryRangeName + } + return "" +} + +func (m *IPAllocationPolicy) GetClusterIpv4CidrBlock() string { + if m != nil { + return m.ClusterIpv4CidrBlock + } + return "" +} + +func (m *IPAllocationPolicy) GetNodeIpv4CidrBlock() string { + if m != nil { + return m.NodeIpv4CidrBlock + } + return "" +} + +func (m *IPAllocationPolicy) GetServicesIpv4CidrBlock() string { + if m != nil { + return m.ServicesIpv4CidrBlock + } + return "" +} + +// A Google Kubernetes Engine cluster. +type Cluster struct { + // The name of this cluster. The name must be unique within this project + // and zone, and can be up to 40 characters with the following restrictions: + // + // * Lowercase letters, numbers, and hyphens only. + // * Must start with a letter. + // * Must end with a number or a letter. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // An optional description of this cluster. + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + // The number of nodes to create in this cluster. You must ensure that your + // Compute Engine resource quota + // is sufficient for this number of instances. You must also have available + // firewall and routes quota. + // For requests, this field should only be used in lieu of a + // "node_pool" object, since this configuration (along with the + // "node_config") will be used to create a "NodePool" object with an + // auto-generated name. Do not use this and a node_pool at the same time. + InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"` + // Parameters used in creating the cluster's nodes. + // See `nodeConfig` for the description of its properties. + // For requests, this field should only be used in lieu of a + // "node_pool" object, since this configuration (along with the + // "initial_node_count") will be used to create a "NodePool" object with an + // auto-generated name. Do not use this and a node_pool at the same time. + // For responses, this field will be populated with the node configuration of + // the first node pool. + // + // If unspecified, the defaults are used. + NodeConfig *NodeConfig `protobuf:"bytes,4,opt,name=node_config,json=nodeConfig,proto3" json:"node_config,omitempty"` + // The authentication information for accessing the master endpoint. + MasterAuth *MasterAuth `protobuf:"bytes,5,opt,name=master_auth,json=masterAuth,proto3" json:"master_auth,omitempty"` + // The logging service the cluster should use to write logs. + // Currently available options: + // + // * `logging.googleapis.com` - the Google Cloud Logging service. + // * `none` - no logs will be exported from the cluster. + // * if left as an empty string,`logging.googleapis.com` will be used. + LoggingService string `protobuf:"bytes,6,opt,name=logging_service,json=loggingService,proto3" json:"logging_service,omitempty"` + // The monitoring service the cluster should use to write metrics. + // Currently available options: + // + // * `monitoring.googleapis.com` - the Google Cloud Monitoring service. + // * `none` - no metrics will be exported from the cluster. + // * if left as an empty string, `monitoring.googleapis.com` will be used. + MonitoringService string `protobuf:"bytes,7,opt,name=monitoring_service,json=monitoringService,proto3" json:"monitoring_service,omitempty"` + // The name of the Google Compute Engine + // [network](/compute/docs/networks-and-firewalls#networks) to which the + // cluster is connected. If left unspecified, the `default` network + // will be used. + Network string `protobuf:"bytes,8,opt,name=network,proto3" json:"network,omitempty"` + // The IP address range of the container pods in this cluster, in + // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) + // notation (e.g. `10.96.0.0/14`). Leave blank to have + // one automatically chosen or specify a `/14` block in `10.0.0.0/8`. + ClusterIpv4Cidr string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"` + // Configurations for the various addons available to run in the cluster. + AddonsConfig *AddonsConfig `protobuf:"bytes,10,opt,name=addons_config,json=addonsConfig,proto3" json:"addons_config,omitempty"` + // The name of the Google Compute Engine + // [subnetwork](/compute/docs/subnetworks) to which the + // cluster is connected. + Subnetwork string `protobuf:"bytes,11,opt,name=subnetwork,proto3" json:"subnetwork,omitempty"` + // The node pools associated with this cluster. + // This field should not be set if "node_config" or "initial_node_count" are + // specified. + NodePools []*NodePool `protobuf:"bytes,12,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"` + // The list of Google Compute Engine + // [locations](/compute/docs/zones#available) in which the cluster's nodes + // should be located. + Locations []string `protobuf:"bytes,13,rep,name=locations,proto3" json:"locations,omitempty"` + // Kubernetes alpha features are enabled on this cluster. This includes alpha + // API groups (e.g. v1alpha1) and features that may not be production ready in + // the kubernetes version of the master and nodes. + // The cluster has no SLA for uptime and master/node upgrades are disabled. + // Alpha enabled clusters are automatically deleted thirty days after + // creation. + EnableKubernetesAlpha bool `protobuf:"varint,14,opt,name=enable_kubernetes_alpha,json=enableKubernetesAlpha,proto3" json:"enable_kubernetes_alpha,omitempty"` + // The resource labels for the cluster to use to annotate any related + // Google Compute Engine resources. + ResourceLabels map[string]string `protobuf:"bytes,15,rep,name=resource_labels,json=resourceLabels,proto3" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // The fingerprint of the set of labels for this cluster. + LabelFingerprint string `protobuf:"bytes,16,opt,name=label_fingerprint,json=labelFingerprint,proto3" json:"label_fingerprint,omitempty"` + // Configuration for the legacy ABAC authorization mode. + LegacyAbac *LegacyAbac `protobuf:"bytes,18,opt,name=legacy_abac,json=legacyAbac,proto3" json:"legacy_abac,omitempty"` + // Configuration options for the NetworkPolicy feature. + NetworkPolicy *NetworkPolicy `protobuf:"bytes,19,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"` + // Configuration for cluster IP allocation. + IpAllocationPolicy *IPAllocationPolicy `protobuf:"bytes,20,opt,name=ip_allocation_policy,json=ipAllocationPolicy,proto3" json:"ip_allocation_policy,omitempty"` + // The configuration options for master authorized networks feature. + MasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,22,opt,name=master_authorized_networks_config,json=masterAuthorizedNetworksConfig,proto3" json:"master_authorized_networks_config,omitempty"` + // Configure the maintenance policy for this cluster. + MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,23,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"` + // Configuration for cluster networking. + NetworkConfig *NetworkConfig `protobuf:"bytes,27,opt,name=network_config,json=networkConfig,proto3" json:"network_config,omitempty"` + // Configuration for private cluster. + PrivateClusterConfig *PrivateClusterConfig `protobuf:"bytes,37,opt,name=private_cluster_config,json=privateClusterConfig,proto3" json:"private_cluster_config,omitempty"` + // [Output only] Server-defined URL for the resource. + SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"` + // [Output only] The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field is deprecated, use location instead. + Zone string `protobuf:"bytes,101,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // [Output only] The IP address of this cluster's master endpoint. + // The endpoint can be accessed from the internet at + // `https://username:password@endpoint/`. + // + // See the `masterAuth` property of this resource for username and + // password information. + Endpoint string `protobuf:"bytes,102,opt,name=endpoint,proto3" json:"endpoint,omitempty"` + // The initial Kubernetes version for this cluster. Valid versions are those + // found in validMasterVersions returned by getServerConfig. The version can + // be upgraded over time; such upgrades are reflected in + // currentMasterVersion and currentNodeVersion. + // + // Users may specify either explicit versions offered by + // Kubernetes Engine or version aliases, which have the following behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "","-": picks the default Kubernetes version + InitialClusterVersion string `protobuf:"bytes,103,opt,name=initial_cluster_version,json=initialClusterVersion,proto3" json:"initial_cluster_version,omitempty"` + // [Output only] The current software version of the master endpoint. + CurrentMasterVersion string `protobuf:"bytes,104,opt,name=current_master_version,json=currentMasterVersion,proto3" json:"current_master_version,omitempty"` + // [Output only] Deprecated, use + // [NodePool.version](/kubernetes-engine/docs/reference/rest/v1/projects.zones.clusters.nodePool) + // instead. The current version of the node software components. If they are + // currently at multiple versions because they're in the process of being + // upgraded, this reflects the minimum version of all nodes. + CurrentNodeVersion string `protobuf:"bytes,105,opt,name=current_node_version,json=currentNodeVersion,proto3" json:"current_node_version,omitempty"` // Deprecated: Do not use. + // [Output only] The time the cluster was created, in + // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. + CreateTime string `protobuf:"bytes,106,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` + // [Output only] The current status of this cluster. + Status Cluster_Status `protobuf:"varint,107,opt,name=status,proto3,enum=google.container.v1.Cluster_Status" json:"status,omitempty"` + // [Output only] Additional information about the current status of this + // cluster, if available. + StatusMessage string `protobuf:"bytes,108,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"` + // [Output only] The size of the address space on each node for hosting + // containers. This is provisioned from within the `container_ipv4_cidr` + // range. + NodeIpv4CidrSize int32 `protobuf:"varint,109,opt,name=node_ipv4_cidr_size,json=nodeIpv4CidrSize,proto3" json:"node_ipv4_cidr_size,omitempty"` + // [Output only] The IP address range of the Kubernetes services in + // this cluster, in + // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) + // notation (e.g. `1.2.3.4/29`). Service addresses are + // typically put in the last `/16` from the container CIDR. + ServicesIpv4Cidr string `protobuf:"bytes,110,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"` + // Deprecated. Use node_pools.instance_group_urls. + InstanceGroupUrls []string `protobuf:"bytes,111,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"` // Deprecated: Do not use. + // [Output only] The number of nodes currently in the cluster. + CurrentNodeCount int32 `protobuf:"varint,112,opt,name=current_node_count,json=currentNodeCount,proto3" json:"current_node_count,omitempty"` + // [Output only] The time the cluster will be automatically + // deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. + ExpireTime string `protobuf:"bytes,113,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"` + // [Output only] The name of the Google Compute Engine + // [zone](/compute/docs/regions-zones/regions-zones#available) or + // [region](/compute/docs/regions-zones/regions-zones#available) in which + // the cluster resides. + Location string `protobuf:"bytes,114,opt,name=location,proto3" json:"location,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Cluster) Reset() { *m = Cluster{} } +func (m *Cluster) String() string { return proto.CompactTextString(m) } +func (*Cluster) ProtoMessage() {} +func (*Cluster) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{13} +} +func (m *Cluster) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Cluster.Unmarshal(m, b) +} +func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Cluster.Marshal(b, m, deterministic) +} +func (dst *Cluster) XXX_Merge(src proto.Message) { + xxx_messageInfo_Cluster.Merge(dst, src) +} +func (m *Cluster) XXX_Size() int { + return xxx_messageInfo_Cluster.Size(m) +} +func (m *Cluster) XXX_DiscardUnknown() { + xxx_messageInfo_Cluster.DiscardUnknown(m) +} + +var xxx_messageInfo_Cluster proto.InternalMessageInfo + +func (m *Cluster) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Cluster) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *Cluster) GetInitialNodeCount() int32 { + if m != nil { + return m.InitialNodeCount + } + return 0 +} + +func (m *Cluster) GetNodeConfig() *NodeConfig { + if m != nil { + return m.NodeConfig + } + return nil +} + +func (m *Cluster) GetMasterAuth() *MasterAuth { + if m != nil { + return m.MasterAuth + } + return nil +} + +func (m *Cluster) GetLoggingService() string { + if m != nil { + return m.LoggingService + } + return "" +} + +func (m *Cluster) GetMonitoringService() string { + if m != nil { + return m.MonitoringService + } + return "" +} + +func (m *Cluster) GetNetwork() string { + if m != nil { + return m.Network + } + return "" +} + +func (m *Cluster) GetClusterIpv4Cidr() string { + if m != nil { + return m.ClusterIpv4Cidr + } + return "" +} + +func (m *Cluster) GetAddonsConfig() *AddonsConfig { + if m != nil { + return m.AddonsConfig + } + return nil +} + +func (m *Cluster) GetSubnetwork() string { + if m != nil { + return m.Subnetwork + } + return "" +} + +func (m *Cluster) GetNodePools() []*NodePool { + if m != nil { + return m.NodePools + } + return nil +} + +func (m *Cluster) GetLocations() []string { + if m != nil { + return m.Locations + } + return nil +} + +func (m *Cluster) GetEnableKubernetesAlpha() bool { + if m != nil { + return m.EnableKubernetesAlpha + } + return false +} + +func (m *Cluster) GetResourceLabels() map[string]string { + if m != nil { + return m.ResourceLabels + } + return nil +} + +func (m *Cluster) GetLabelFingerprint() string { + if m != nil { + return m.LabelFingerprint + } + return "" +} + +func (m *Cluster) GetLegacyAbac() *LegacyAbac { + if m != nil { + return m.LegacyAbac + } + return nil +} + +func (m *Cluster) GetNetworkPolicy() *NetworkPolicy { + if m != nil { + return m.NetworkPolicy + } + return nil +} + +func (m *Cluster) GetIpAllocationPolicy() *IPAllocationPolicy { + if m != nil { + return m.IpAllocationPolicy + } + return nil +} + +func (m *Cluster) GetMasterAuthorizedNetworksConfig() *MasterAuthorizedNetworksConfig { + if m != nil { + return m.MasterAuthorizedNetworksConfig + } + return nil +} + +func (m *Cluster) GetMaintenancePolicy() *MaintenancePolicy { + if m != nil { + return m.MaintenancePolicy + } + return nil +} + +func (m *Cluster) GetNetworkConfig() *NetworkConfig { + if m != nil { + return m.NetworkConfig + } + return nil +} + +func (m *Cluster) GetPrivateClusterConfig() *PrivateClusterConfig { + if m != nil { + return m.PrivateClusterConfig + } + return nil +} + +func (m *Cluster) GetSelfLink() string { + if m != nil { + return m.SelfLink + } + return "" +} + +// Deprecated: Do not use. +func (m *Cluster) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +func (m *Cluster) GetEndpoint() string { + if m != nil { + return m.Endpoint + } + return "" +} + +func (m *Cluster) GetInitialClusterVersion() string { + if m != nil { + return m.InitialClusterVersion + } + return "" +} + +func (m *Cluster) GetCurrentMasterVersion() string { + if m != nil { + return m.CurrentMasterVersion + } + return "" +} + +// Deprecated: Do not use. +func (m *Cluster) GetCurrentNodeVersion() string { + if m != nil { + return m.CurrentNodeVersion + } + return "" +} + +func (m *Cluster) GetCreateTime() string { + if m != nil { + return m.CreateTime + } + return "" +} + +func (m *Cluster) GetStatus() Cluster_Status { + if m != nil { + return m.Status + } + return Cluster_STATUS_UNSPECIFIED +} + +func (m *Cluster) GetStatusMessage() string { + if m != nil { + return m.StatusMessage + } + return "" +} + +func (m *Cluster) GetNodeIpv4CidrSize() int32 { + if m != nil { + return m.NodeIpv4CidrSize + } + return 0 +} + +func (m *Cluster) GetServicesIpv4Cidr() string { + if m != nil { + return m.ServicesIpv4Cidr + } + return "" +} + +// Deprecated: Do not use. +func (m *Cluster) GetInstanceGroupUrls() []string { + if m != nil { + return m.InstanceGroupUrls + } + return nil +} + +func (m *Cluster) GetCurrentNodeCount() int32 { + if m != nil { + return m.CurrentNodeCount + } + return 0 +} + +func (m *Cluster) GetExpireTime() string { + if m != nil { + return m.ExpireTime + } + return "" +} + +func (m *Cluster) GetLocation() string { + if m != nil { + return m.Location + } + return "" +} + +// ClusterUpdate describes an update to the cluster. Exactly one update can +// be applied to a cluster with each request, so at most one field can be +// provided. +type ClusterUpdate struct { + // The Kubernetes version to change the nodes to (typically an + // upgrade). + // + // Users may specify either explicit versions offered by + // Kubernetes Engine or version aliases, which have the following behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the Kubernetes master version + DesiredNodeVersion string `protobuf:"bytes,4,opt,name=desired_node_version,json=desiredNodeVersion,proto3" json:"desired_node_version,omitempty"` + // The monitoring service the cluster should use to write metrics. + // Currently available options: + // + // * "monitoring.googleapis.com" - the Google Cloud Monitoring service + // * "none" - no metrics will be exported from the cluster + DesiredMonitoringService string `protobuf:"bytes,5,opt,name=desired_monitoring_service,json=desiredMonitoringService,proto3" json:"desired_monitoring_service,omitempty"` + // Configurations for the various addons available to run in the cluster. + DesiredAddonsConfig *AddonsConfig `protobuf:"bytes,6,opt,name=desired_addons_config,json=desiredAddonsConfig,proto3" json:"desired_addons_config,omitempty"` + // The node pool to be upgraded. This field is mandatory if + // "desired_node_version", "desired_image_family" or + // "desired_node_pool_autoscaling" is specified and there is more than one + // node pool on the cluster. + DesiredNodePoolId string `protobuf:"bytes,7,opt,name=desired_node_pool_id,json=desiredNodePoolId,proto3" json:"desired_node_pool_id,omitempty"` + // The desired image type for the node pool. + // NOTE: Set the "desired_node_pool" field as well. + DesiredImageType string `protobuf:"bytes,8,opt,name=desired_image_type,json=desiredImageType,proto3" json:"desired_image_type,omitempty"` + // Autoscaler configuration for the node pool specified in + // desired_node_pool_id. If there is only one pool in the + // cluster and desired_node_pool_id is not provided then + // the change applies to that single node pool. + DesiredNodePoolAutoscaling *NodePoolAutoscaling `protobuf:"bytes,9,opt,name=desired_node_pool_autoscaling,json=desiredNodePoolAutoscaling,proto3" json:"desired_node_pool_autoscaling,omitempty"` + // The desired list of Google Compute Engine + // [locations](/compute/docs/zones#available) in which the cluster's nodes + // should be located. Changing the locations a cluster is in will result + // in nodes being either created or removed from the cluster, depending on + // whether locations are being added or removed. + // + // This list must always include the cluster's primary zone. + DesiredLocations []string `protobuf:"bytes,10,rep,name=desired_locations,json=desiredLocations,proto3" json:"desired_locations,omitempty"` + // The desired configuration options for master authorized networks feature. + DesiredMasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,12,opt,name=desired_master_authorized_networks_config,json=desiredMasterAuthorizedNetworksConfig,proto3" json:"desired_master_authorized_networks_config,omitempty"` + // The Kubernetes version to change the master to. + // + // Users may specify either explicit versions offered by + // Kubernetes Engine or version aliases, which have the following behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the default Kubernetes version + DesiredMasterVersion string `protobuf:"bytes,100,opt,name=desired_master_version,json=desiredMasterVersion,proto3" json:"desired_master_version,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ClusterUpdate) Reset() { *m = ClusterUpdate{} } +func (m *ClusterUpdate) String() string { return proto.CompactTextString(m) } +func (*ClusterUpdate) ProtoMessage() {} +func (*ClusterUpdate) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{14} +} +func (m *ClusterUpdate) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ClusterUpdate.Unmarshal(m, b) +} +func (m *ClusterUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ClusterUpdate.Marshal(b, m, deterministic) +} +func (dst *ClusterUpdate) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClusterUpdate.Merge(dst, src) +} +func (m *ClusterUpdate) XXX_Size() int { + return xxx_messageInfo_ClusterUpdate.Size(m) +} +func (m *ClusterUpdate) XXX_DiscardUnknown() { + xxx_messageInfo_ClusterUpdate.DiscardUnknown(m) +} + +var xxx_messageInfo_ClusterUpdate proto.InternalMessageInfo + +func (m *ClusterUpdate) GetDesiredNodeVersion() string { + if m != nil { + return m.DesiredNodeVersion + } + return "" +} + +func (m *ClusterUpdate) GetDesiredMonitoringService() string { + if m != nil { + return m.DesiredMonitoringService + } + return "" +} + +func (m *ClusterUpdate) GetDesiredAddonsConfig() *AddonsConfig { + if m != nil { + return m.DesiredAddonsConfig + } + return nil +} + +func (m *ClusterUpdate) GetDesiredNodePoolId() string { + if m != nil { + return m.DesiredNodePoolId + } + return "" +} + +func (m *ClusterUpdate) GetDesiredImageType() string { + if m != nil { + return m.DesiredImageType + } + return "" +} + +func (m *ClusterUpdate) GetDesiredNodePoolAutoscaling() *NodePoolAutoscaling { + if m != nil { + return m.DesiredNodePoolAutoscaling + } + return nil +} + +func (m *ClusterUpdate) GetDesiredLocations() []string { + if m != nil { + return m.DesiredLocations + } + return nil +} + +func (m *ClusterUpdate) GetDesiredMasterAuthorizedNetworksConfig() *MasterAuthorizedNetworksConfig { + if m != nil { + return m.DesiredMasterAuthorizedNetworksConfig + } + return nil +} + +func (m *ClusterUpdate) GetDesiredMasterVersion() string { + if m != nil { + return m.DesiredMasterVersion + } + return "" +} + +// This operation resource represents operations that may have happened or are +// happening on the cluster. All fields are output only. +type Operation struct { + // The server-assigned ID for the operation. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the operation + // is taking place. + // This field is deprecated, use location instead. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // The operation type. + OperationType Operation_Type `protobuf:"varint,3,opt,name=operation_type,json=operationType,proto3,enum=google.container.v1.Operation_Type" json:"operation_type,omitempty"` + // The current status of the operation. + Status Operation_Status `protobuf:"varint,4,opt,name=status,proto3,enum=google.container.v1.Operation_Status" json:"status,omitempty"` + // Detailed operation progress, if available. + Detail string `protobuf:"bytes,8,opt,name=detail,proto3" json:"detail,omitempty"` + // If an error has occurred, a textual description of the error. + StatusMessage string `protobuf:"bytes,5,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"` + // Server-defined URL for the resource. + SelfLink string `protobuf:"bytes,6,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"` + // Server-defined URL for the target of the operation. + TargetLink string `protobuf:"bytes,7,opt,name=target_link,json=targetLink,proto3" json:"target_link,omitempty"` + // [Output only] The name of the Google Compute Engine + // [zone](/compute/docs/regions-zones/regions-zones#available) or + // [region](/compute/docs/regions-zones/regions-zones#available) in which + // the cluster resides. + Location string `protobuf:"bytes,9,opt,name=location,proto3" json:"location,omitempty"` + // [Output only] The time the operation started, in + // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. + StartTime string `protobuf:"bytes,10,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + // [Output only] The time the operation completed, in + // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. + EndTime string `protobuf:"bytes,11,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Operation) Reset() { *m = Operation{} } +func (m *Operation) String() string { return proto.CompactTextString(m) } +func (*Operation) ProtoMessage() {} +func (*Operation) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{15} +} +func (m *Operation) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Operation.Unmarshal(m, b) +} +func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Operation.Marshal(b, m, deterministic) +} +func (dst *Operation) XXX_Merge(src proto.Message) { + xxx_messageInfo_Operation.Merge(dst, src) +} +func (m *Operation) XXX_Size() int { + return xxx_messageInfo_Operation.Size(m) +} +func (m *Operation) XXX_DiscardUnknown() { + xxx_messageInfo_Operation.DiscardUnknown(m) +} + +var xxx_messageInfo_Operation proto.InternalMessageInfo + +func (m *Operation) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// Deprecated: Do not use. +func (m *Operation) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +func (m *Operation) GetOperationType() Operation_Type { + if m != nil { + return m.OperationType + } + return Operation_TYPE_UNSPECIFIED +} + +func (m *Operation) GetStatus() Operation_Status { + if m != nil { + return m.Status + } + return Operation_STATUS_UNSPECIFIED +} + +func (m *Operation) GetDetail() string { + if m != nil { + return m.Detail + } + return "" +} + +func (m *Operation) GetStatusMessage() string { + if m != nil { + return m.StatusMessage + } + return "" +} + +func (m *Operation) GetSelfLink() string { + if m != nil { + return m.SelfLink + } + return "" +} + +func (m *Operation) GetTargetLink() string { + if m != nil { + return m.TargetLink + } + return "" +} + +func (m *Operation) GetLocation() string { + if m != nil { + return m.Location + } + return "" +} + +func (m *Operation) GetStartTime() string { + if m != nil { + return m.StartTime + } + return "" +} + +func (m *Operation) GetEndTime() string { + if m != nil { + return m.EndTime + } + return "" +} + +// CreateClusterRequest creates a cluster. +type CreateClusterRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the parent field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the parent field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // A [cluster + // resource](/container-engine/reference/rest/v1/projects.zones.clusters) + Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"` + // The parent (project and location) where the cluster will be created. + // Specified in the format 'projects/*/locations/*'. + Parent string `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateClusterRequest) Reset() { *m = CreateClusterRequest{} } +func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) } +func (*CreateClusterRequest) ProtoMessage() {} +func (*CreateClusterRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{16} +} +func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b) +} +func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic) +} +func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateClusterRequest.Merge(dst, src) +} +func (m *CreateClusterRequest) XXX_Size() int { + return xxx_messageInfo_CreateClusterRequest.Size(m) +} +func (m *CreateClusterRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *CreateClusterRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *CreateClusterRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +func (m *CreateClusterRequest) GetCluster() *Cluster { + if m != nil { + return m.Cluster + } + return nil +} + +func (m *CreateClusterRequest) GetParent() string { + if m != nil { + return m.Parent + } + return "" +} + +// GetClusterRequest gets the settings of a cluster. +type GetClusterRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to retrieve. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, cluster) of the cluster to retrieve. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetClusterRequest) Reset() { *m = GetClusterRequest{} } +func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) } +func (*GetClusterRequest) ProtoMessage() {} +func (*GetClusterRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{17} +} +func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b) +} +func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic) +} +func (dst *GetClusterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetClusterRequest.Merge(dst, src) +} +func (m *GetClusterRequest) XXX_Size() int { + return xxx_messageInfo_GetClusterRequest.Size(m) +} +func (m *GetClusterRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetClusterRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *GetClusterRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *GetClusterRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *GetClusterRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *GetClusterRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// UpdateClusterRequest updates the settings of a cluster. +type UpdateClusterRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // A description of the update. + Update *ClusterUpdate `protobuf:"bytes,4,opt,name=update,proto3" json:"update,omitempty"` + // The name (project, location, cluster) of the cluster to update. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateClusterRequest) Reset() { *m = UpdateClusterRequest{} } +func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) } +func (*UpdateClusterRequest) ProtoMessage() {} +func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{18} +} +func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b) +} +func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic) +} +func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateClusterRequest.Merge(dst, src) +} +func (m *UpdateClusterRequest) XXX_Size() int { + return xxx_messageInfo_UpdateClusterRequest.Size(m) +} +func (m *UpdateClusterRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateClusterRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateClusterRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *UpdateClusterRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *UpdateClusterRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *UpdateClusterRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *UpdateClusterRequest) GetUpdate() *ClusterUpdate { + if m != nil { + return m.Update + } + return nil +} + +func (m *UpdateClusterRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// UpdateNodePoolRequests update a node pool's image and/or version. +type UpdateNodePoolRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the node pool to upgrade. + // This field has been deprecated and replaced by the name field. + NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"` // Deprecated: Do not use. + // The Kubernetes version to change the nodes to (typically an + // upgrade). + // + // Users may specify either explicit versions offered by Kubernetes Engine or + // version aliases, which have the following behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the Kubernetes master version + NodeVersion string `protobuf:"bytes,5,opt,name=node_version,json=nodeVersion,proto3" json:"node_version,omitempty"` + // The desired image type for the node pool. + ImageType string `protobuf:"bytes,6,opt,name=image_type,json=imageType,proto3" json:"image_type,omitempty"` + // The name (project, location, cluster, node pool) of the node pool to + // update. Specified in the format + // 'projects/*/locations/*/clusters/*/nodePools/*'. + Name string `protobuf:"bytes,8,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateNodePoolRequest) Reset() { *m = UpdateNodePoolRequest{} } +func (m *UpdateNodePoolRequest) String() string { return proto.CompactTextString(m) } +func (*UpdateNodePoolRequest) ProtoMessage() {} +func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{19} +} +func (m *UpdateNodePoolRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateNodePoolRequest.Unmarshal(m, b) +} +func (m *UpdateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateNodePoolRequest.Marshal(b, m, deterministic) +} +func (dst *UpdateNodePoolRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateNodePoolRequest.Merge(dst, src) +} +func (m *UpdateNodePoolRequest) XXX_Size() int { + return xxx_messageInfo_UpdateNodePoolRequest.Size(m) +} +func (m *UpdateNodePoolRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateNodePoolRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateNodePoolRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *UpdateNodePoolRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *UpdateNodePoolRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *UpdateNodePoolRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +// Deprecated: Do not use. +func (m *UpdateNodePoolRequest) GetNodePoolId() string { + if m != nil { + return m.NodePoolId + } + return "" +} + +func (m *UpdateNodePoolRequest) GetNodeVersion() string { + if m != nil { + return m.NodeVersion + } + return "" +} + +func (m *UpdateNodePoolRequest) GetImageType() string { + if m != nil { + return m.ImageType + } + return "" +} + +func (m *UpdateNodePoolRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetNodePoolAutoscalingRequest sets the autoscaler settings of a node pool. +type SetNodePoolAutoscalingRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the node pool to upgrade. + // This field has been deprecated and replaced by the name field. + NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"` // Deprecated: Do not use. + // Autoscaling configuration for the node pool. + Autoscaling *NodePoolAutoscaling `protobuf:"bytes,5,opt,name=autoscaling,proto3" json:"autoscaling,omitempty"` + // The name (project, location, cluster, node pool) of the node pool to set + // autoscaler settings. Specified in the format + // 'projects/*/locations/*/clusters/*/nodePools/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetNodePoolAutoscalingRequest) Reset() { *m = SetNodePoolAutoscalingRequest{} } +func (m *SetNodePoolAutoscalingRequest) String() string { return proto.CompactTextString(m) } +func (*SetNodePoolAutoscalingRequest) ProtoMessage() {} +func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{20} +} +func (m *SetNodePoolAutoscalingRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetNodePoolAutoscalingRequest.Unmarshal(m, b) +} +func (m *SetNodePoolAutoscalingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetNodePoolAutoscalingRequest.Marshal(b, m, deterministic) +} +func (dst *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(dst, src) +} +func (m *SetNodePoolAutoscalingRequest) XXX_Size() int { + return xxx_messageInfo_SetNodePoolAutoscalingRequest.Size(m) +} +func (m *SetNodePoolAutoscalingRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetNodePoolAutoscalingRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetNodePoolAutoscalingRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetNodePoolAutoscalingRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolAutoscalingRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolAutoscalingRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolAutoscalingRequest) GetNodePoolId() string { + if m != nil { + return m.NodePoolId + } + return "" +} + +func (m *SetNodePoolAutoscalingRequest) GetAutoscaling() *NodePoolAutoscaling { + if m != nil { + return m.Autoscaling + } + return nil +} + +func (m *SetNodePoolAutoscalingRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetLoggingServiceRequest sets the logging service of a cluster. +type SetLoggingServiceRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The logging service the cluster should use to write metrics. + // Currently available options: + // + // * "logging.googleapis.com" - the Google Cloud Logging service + // * "none" - no metrics will be exported from the cluster + LoggingService string `protobuf:"bytes,4,opt,name=logging_service,json=loggingService,proto3" json:"logging_service,omitempty"` + // The name (project, location, cluster) of the cluster to set logging. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetLoggingServiceRequest) Reset() { *m = SetLoggingServiceRequest{} } +func (m *SetLoggingServiceRequest) String() string { return proto.CompactTextString(m) } +func (*SetLoggingServiceRequest) ProtoMessage() {} +func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{21} +} +func (m *SetLoggingServiceRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetLoggingServiceRequest.Unmarshal(m, b) +} +func (m *SetLoggingServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetLoggingServiceRequest.Marshal(b, m, deterministic) +} +func (dst *SetLoggingServiceRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetLoggingServiceRequest.Merge(dst, src) +} +func (m *SetLoggingServiceRequest) XXX_Size() int { + return xxx_messageInfo_SetLoggingServiceRequest.Size(m) +} +func (m *SetLoggingServiceRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetLoggingServiceRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetLoggingServiceRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetLoggingServiceRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +func (m *SetLoggingServiceRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetLoggingServiceRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetLoggingServiceRequest) GetLoggingService() string { + if m != nil { + return m.LoggingService + } + return "" +} + +func (m *SetLoggingServiceRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetMonitoringServiceRequest sets the monitoring service of a cluster. +type SetMonitoringServiceRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The monitoring service the cluster should use to write metrics. + // Currently available options: + // + // * "monitoring.googleapis.com" - the Google Cloud Monitoring service + // * "none" - no metrics will be exported from the cluster + MonitoringService string `protobuf:"bytes,4,opt,name=monitoring_service,json=monitoringService,proto3" json:"monitoring_service,omitempty"` + // The name (project, location, cluster) of the cluster to set monitoring. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetMonitoringServiceRequest) Reset() { *m = SetMonitoringServiceRequest{} } +func (m *SetMonitoringServiceRequest) String() string { return proto.CompactTextString(m) } +func (*SetMonitoringServiceRequest) ProtoMessage() {} +func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{22} +} +func (m *SetMonitoringServiceRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetMonitoringServiceRequest.Unmarshal(m, b) +} +func (m *SetMonitoringServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetMonitoringServiceRequest.Marshal(b, m, deterministic) +} +func (dst *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetMonitoringServiceRequest.Merge(dst, src) +} +func (m *SetMonitoringServiceRequest) XXX_Size() int { + return xxx_messageInfo_SetMonitoringServiceRequest.Size(m) +} +func (m *SetMonitoringServiceRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetMonitoringServiceRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetMonitoringServiceRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetMonitoringServiceRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetMonitoringServiceRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetMonitoringServiceRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetMonitoringServiceRequest) GetMonitoringService() string { + if m != nil { + return m.MonitoringService + } + return "" +} + +func (m *SetMonitoringServiceRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetAddonsConfigRequest sets the addons associated with the cluster. +type SetAddonsConfigRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The desired configurations for the various addons available to run in the + // cluster. + AddonsConfig *AddonsConfig `protobuf:"bytes,4,opt,name=addons_config,json=addonsConfig,proto3" json:"addons_config,omitempty"` + // The name (project, location, cluster) of the cluster to set addons. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetAddonsConfigRequest) Reset() { *m = SetAddonsConfigRequest{} } +func (m *SetAddonsConfigRequest) String() string { return proto.CompactTextString(m) } +func (*SetAddonsConfigRequest) ProtoMessage() {} +func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{23} +} +func (m *SetAddonsConfigRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetAddonsConfigRequest.Unmarshal(m, b) +} +func (m *SetAddonsConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetAddonsConfigRequest.Marshal(b, m, deterministic) +} +func (dst *SetAddonsConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetAddonsConfigRequest.Merge(dst, src) +} +func (m *SetAddonsConfigRequest) XXX_Size() int { + return xxx_messageInfo_SetAddonsConfigRequest.Size(m) +} +func (m *SetAddonsConfigRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetAddonsConfigRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetAddonsConfigRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetAddonsConfigRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetAddonsConfigRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetAddonsConfigRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetAddonsConfigRequest) GetAddonsConfig() *AddonsConfig { + if m != nil { + return m.AddonsConfig + } + return nil +} + +func (m *SetAddonsConfigRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetLocationsRequest sets the locations of the cluster. +type SetLocationsRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The desired list of Google Compute Engine + // [locations](/compute/docs/zones#available) in which the cluster's nodes + // should be located. Changing the locations a cluster is in will result + // in nodes being either created or removed from the cluster, depending on + // whether locations are being added or removed. + // + // This list must always include the cluster's primary zone. + Locations []string `protobuf:"bytes,4,rep,name=locations,proto3" json:"locations,omitempty"` + // The name (project, location, cluster) of the cluster to set locations. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetLocationsRequest) Reset() { *m = SetLocationsRequest{} } +func (m *SetLocationsRequest) String() string { return proto.CompactTextString(m) } +func (*SetLocationsRequest) ProtoMessage() {} +func (*SetLocationsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{24} +} +func (m *SetLocationsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetLocationsRequest.Unmarshal(m, b) +} +func (m *SetLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetLocationsRequest.Marshal(b, m, deterministic) +} +func (dst *SetLocationsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetLocationsRequest.Merge(dst, src) +} +func (m *SetLocationsRequest) XXX_Size() int { + return xxx_messageInfo_SetLocationsRequest.Size(m) +} +func (m *SetLocationsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetLocationsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetLocationsRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetLocationsRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetLocationsRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetLocationsRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetLocationsRequest) GetLocations() []string { + if m != nil { + return m.Locations + } + return nil +} + +func (m *SetLocationsRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// UpdateMasterRequest updates the master of the cluster. +type UpdateMasterRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The Kubernetes version to change the master to. + // + // Users may specify either explicit versions offered by Kubernetes Engine or + // version aliases, which have the following behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the default Kubernetes version + MasterVersion string `protobuf:"bytes,4,opt,name=master_version,json=masterVersion,proto3" json:"master_version,omitempty"` + // The name (project, location, cluster) of the cluster to update. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateMasterRequest) Reset() { *m = UpdateMasterRequest{} } +func (m *UpdateMasterRequest) String() string { return proto.CompactTextString(m) } +func (*UpdateMasterRequest) ProtoMessage() {} +func (*UpdateMasterRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{25} +} +func (m *UpdateMasterRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateMasterRequest.Unmarshal(m, b) +} +func (m *UpdateMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateMasterRequest.Marshal(b, m, deterministic) +} +func (dst *UpdateMasterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateMasterRequest.Merge(dst, src) +} +func (m *UpdateMasterRequest) XXX_Size() int { + return xxx_messageInfo_UpdateMasterRequest.Size(m) +} +func (m *UpdateMasterRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateMasterRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateMasterRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *UpdateMasterRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *UpdateMasterRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *UpdateMasterRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *UpdateMasterRequest) GetMasterVersion() string { + if m != nil { + return m.MasterVersion + } + return "" +} + +func (m *UpdateMasterRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetMasterAuthRequest updates the admin password of a cluster. +type SetMasterAuthRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to upgrade. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The exact form of action to be taken on the master auth. + Action SetMasterAuthRequest_Action `protobuf:"varint,4,opt,name=action,proto3,enum=google.container.v1.SetMasterAuthRequest_Action" json:"action,omitempty"` + // A description of the update. + Update *MasterAuth `protobuf:"bytes,5,opt,name=update,proto3" json:"update,omitempty"` + // The name (project, location, cluster) of the cluster to set auth. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetMasterAuthRequest) Reset() { *m = SetMasterAuthRequest{} } +func (m *SetMasterAuthRequest) String() string { return proto.CompactTextString(m) } +func (*SetMasterAuthRequest) ProtoMessage() {} +func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{26} +} +func (m *SetMasterAuthRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetMasterAuthRequest.Unmarshal(m, b) +} +func (m *SetMasterAuthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetMasterAuthRequest.Marshal(b, m, deterministic) +} +func (dst *SetMasterAuthRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetMasterAuthRequest.Merge(dst, src) +} +func (m *SetMasterAuthRequest) XXX_Size() int { + return xxx_messageInfo_SetMasterAuthRequest.Size(m) +} +func (m *SetMasterAuthRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetMasterAuthRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetMasterAuthRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetMasterAuthRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetMasterAuthRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetMasterAuthRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetMasterAuthRequest) GetAction() SetMasterAuthRequest_Action { + if m != nil { + return m.Action + } + return SetMasterAuthRequest_UNKNOWN +} + +func (m *SetMasterAuthRequest) GetUpdate() *MasterAuth { + if m != nil { + return m.Update + } + return nil +} + +func (m *SetMasterAuthRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// DeleteClusterRequest deletes a cluster. +type DeleteClusterRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to delete. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, cluster) of the cluster to delete. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteClusterRequest) Reset() { *m = DeleteClusterRequest{} } +func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) } +func (*DeleteClusterRequest) ProtoMessage() {} +func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{27} +} +func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b) +} +func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic) +} +func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteClusterRequest.Merge(dst, src) +} +func (m *DeleteClusterRequest) XXX_Size() int { + return xxx_messageInfo_DeleteClusterRequest.Size(m) +} +func (m *DeleteClusterRequest) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *DeleteClusterRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *DeleteClusterRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *DeleteClusterRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *DeleteClusterRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// ListClustersRequest lists clusters. +type ListClustersRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the parent field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides, or "-" for all zones. + // This field has been deprecated and replaced by the parent field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // The parent (project and location) where the clusters will be listed. + // Specified in the format 'projects/*/locations/*'. + // Location "-" matches all zones and all regions. + Parent string `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListClustersRequest) Reset() { *m = ListClustersRequest{} } +func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) } +func (*ListClustersRequest) ProtoMessage() {} +func (*ListClustersRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{28} +} +func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b) +} +func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic) +} +func (dst *ListClustersRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListClustersRequest.Merge(dst, src) +} +func (m *ListClustersRequest) XXX_Size() int { + return xxx_messageInfo_ListClustersRequest.Size(m) +} +func (m *ListClustersRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ListClustersRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *ListClustersRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *ListClustersRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +func (m *ListClustersRequest) GetParent() string { + if m != nil { + return m.Parent + } + return "" +} + +// ListClustersResponse is the result of ListClustersRequest. +type ListClustersResponse struct { + // A list of clusters in the project in the specified zone, or + // across all ones. + Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"` + // If any zones are listed here, the list of clusters returned + // may be missing those zones. + MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListClustersResponse) Reset() { *m = ListClustersResponse{} } +func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) } +func (*ListClustersResponse) ProtoMessage() {} +func (*ListClustersResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{29} +} +func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b) +} +func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic) +} +func (dst *ListClustersResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListClustersResponse.Merge(dst, src) +} +func (m *ListClustersResponse) XXX_Size() int { + return xxx_messageInfo_ListClustersResponse.Size(m) +} +func (m *ListClustersResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ListClustersResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo + +func (m *ListClustersResponse) GetClusters() []*Cluster { + if m != nil { + return m.Clusters + } + return nil +} + +func (m *ListClustersResponse) GetMissingZones() []string { + if m != nil { + return m.MissingZones + } + return nil +} + +// GetOperationRequest gets a single operation. +type GetOperationRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The server-assigned `name` of the operation. + // This field has been deprecated and replaced by the name field. + OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, operation id) of the operation to get. + // Specified in the format 'projects/*/locations/*/operations/*'. + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetOperationRequest) Reset() { *m = GetOperationRequest{} } +func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) } +func (*GetOperationRequest) ProtoMessage() {} +func (*GetOperationRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{30} +} +func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b) +} +func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic) +} +func (dst *GetOperationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetOperationRequest.Merge(dst, src) +} +func (m *GetOperationRequest) XXX_Size() int { + return xxx_messageInfo_GetOperationRequest.Size(m) +} +func (m *GetOperationRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetOperationRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetOperationRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *GetOperationRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *GetOperationRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *GetOperationRequest) GetOperationId() string { + if m != nil { + return m.OperationId + } + return "" +} + +func (m *GetOperationRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// ListOperationsRequest lists operations. +type ListOperationsRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the parent field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) to return operations for, or `-` for + // all zones. This field has been deprecated and replaced by the parent field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // The parent (project and location) where the operations will be listed. + // Specified in the format 'projects/*/locations/*'. + // Location "-" matches all zones and all regions. + Parent string `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListOperationsRequest) Reset() { *m = ListOperationsRequest{} } +func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) } +func (*ListOperationsRequest) ProtoMessage() {} +func (*ListOperationsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{31} +} +func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b) +} +func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic) +} +func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListOperationsRequest.Merge(dst, src) +} +func (m *ListOperationsRequest) XXX_Size() int { + return xxx_messageInfo_ListOperationsRequest.Size(m) +} +func (m *ListOperationsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ListOperationsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ListOperationsRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *ListOperationsRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *ListOperationsRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +func (m *ListOperationsRequest) GetParent() string { + if m != nil { + return m.Parent + } + return "" +} + +// CancelOperationRequest cancels a single operation. +type CancelOperationRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the operation resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The server-assigned `name` of the operation. + // This field has been deprecated and replaced by the name field. + OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, operation id) of the operation to cancel. + // Specified in the format 'projects/*/locations/*/operations/*'. + Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CancelOperationRequest) Reset() { *m = CancelOperationRequest{} } +func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) } +func (*CancelOperationRequest) ProtoMessage() {} +func (*CancelOperationRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{32} +} +func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b) +} +func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic) +} +func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CancelOperationRequest.Merge(dst, src) +} +func (m *CancelOperationRequest) XXX_Size() int { + return xxx_messageInfo_CancelOperationRequest.Size(m) +} +func (m *CancelOperationRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CancelOperationRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_CancelOperationRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *CancelOperationRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *CancelOperationRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *CancelOperationRequest) GetOperationId() string { + if m != nil { + return m.OperationId + } + return "" +} + +func (m *CancelOperationRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// ListOperationsResponse is the result of ListOperationsRequest. +type ListOperationsResponse struct { + // A list of operations in the project in the specified zone. + Operations []*Operation `protobuf:"bytes,1,rep,name=operations,proto3" json:"operations,omitempty"` + // If any zones are listed here, the list of operations returned + // may be missing the operations from those zones. + MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListOperationsResponse) Reset() { *m = ListOperationsResponse{} } +func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) } +func (*ListOperationsResponse) ProtoMessage() {} +func (*ListOperationsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{33} +} +func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b) +} +func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic) +} +func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListOperationsResponse.Merge(dst, src) +} +func (m *ListOperationsResponse) XXX_Size() int { + return xxx_messageInfo_ListOperationsResponse.Size(m) +} +func (m *ListOperationsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ListOperationsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ListOperationsResponse proto.InternalMessageInfo + +func (m *ListOperationsResponse) GetOperations() []*Operation { + if m != nil { + return m.Operations + } + return nil +} + +func (m *ListOperationsResponse) GetMissingZones() []string { + if m != nil { + return m.MissingZones + } + return nil +} + +// Gets the current Kubernetes Engine service configuration. +type GetServerConfigRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) to return operations for. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // The name (project and location) of the server config to get + // Specified in the format 'projects/*/locations/*'. + Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetServerConfigRequest) Reset() { *m = GetServerConfigRequest{} } +func (m *GetServerConfigRequest) String() string { return proto.CompactTextString(m) } +func (*GetServerConfigRequest) ProtoMessage() {} +func (*GetServerConfigRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{34} +} +func (m *GetServerConfigRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetServerConfigRequest.Unmarshal(m, b) +} +func (m *GetServerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetServerConfigRequest.Marshal(b, m, deterministic) +} +func (dst *GetServerConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetServerConfigRequest.Merge(dst, src) +} +func (m *GetServerConfigRequest) XXX_Size() int { + return xxx_messageInfo_GetServerConfigRequest.Size(m) +} +func (m *GetServerConfigRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetServerConfigRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetServerConfigRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *GetServerConfigRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *GetServerConfigRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +func (m *GetServerConfigRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// Kubernetes Engine service configuration. +type ServerConfig struct { + // Version of Kubernetes the service deploys by default. + DefaultClusterVersion string `protobuf:"bytes,1,opt,name=default_cluster_version,json=defaultClusterVersion,proto3" json:"default_cluster_version,omitempty"` + // List of valid node upgrade target versions. + ValidNodeVersions []string `protobuf:"bytes,3,rep,name=valid_node_versions,json=validNodeVersions,proto3" json:"valid_node_versions,omitempty"` + // Default image type. + DefaultImageType string `protobuf:"bytes,4,opt,name=default_image_type,json=defaultImageType,proto3" json:"default_image_type,omitempty"` + // List of valid image types. + ValidImageTypes []string `protobuf:"bytes,5,rep,name=valid_image_types,json=validImageTypes,proto3" json:"valid_image_types,omitempty"` + // List of valid master versions. + ValidMasterVersions []string `protobuf:"bytes,6,rep,name=valid_master_versions,json=validMasterVersions,proto3" json:"valid_master_versions,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ServerConfig) Reset() { *m = ServerConfig{} } +func (m *ServerConfig) String() string { return proto.CompactTextString(m) } +func (*ServerConfig) ProtoMessage() {} +func (*ServerConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{35} +} +func (m *ServerConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ServerConfig.Unmarshal(m, b) +} +func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic) +} +func (dst *ServerConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerConfig.Merge(dst, src) +} +func (m *ServerConfig) XXX_Size() int { + return xxx_messageInfo_ServerConfig.Size(m) +} +func (m *ServerConfig) XXX_DiscardUnknown() { + xxx_messageInfo_ServerConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_ServerConfig proto.InternalMessageInfo + +func (m *ServerConfig) GetDefaultClusterVersion() string { + if m != nil { + return m.DefaultClusterVersion + } + return "" +} + +func (m *ServerConfig) GetValidNodeVersions() []string { + if m != nil { + return m.ValidNodeVersions + } + return nil +} + +func (m *ServerConfig) GetDefaultImageType() string { + if m != nil { + return m.DefaultImageType + } + return "" +} + +func (m *ServerConfig) GetValidImageTypes() []string { + if m != nil { + return m.ValidImageTypes + } + return nil +} + +func (m *ServerConfig) GetValidMasterVersions() []string { + if m != nil { + return m.ValidMasterVersions + } + return nil +} + +// CreateNodePoolRequest creates a node pool for a cluster. +type CreateNodePoolRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the parent field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the parent field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the parent field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The node pool to create. + NodePool *NodePool `protobuf:"bytes,4,opt,name=node_pool,json=nodePool,proto3" json:"node_pool,omitempty"` + // The parent (project, location, cluster id) where the node pool will be + // created. Specified in the format + // 'projects/*/locations/*/clusters/*'. + Parent string `protobuf:"bytes,6,opt,name=parent,proto3" json:"parent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateNodePoolRequest) Reset() { *m = CreateNodePoolRequest{} } +func (m *CreateNodePoolRequest) String() string { return proto.CompactTextString(m) } +func (*CreateNodePoolRequest) ProtoMessage() {} +func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{36} +} +func (m *CreateNodePoolRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateNodePoolRequest.Unmarshal(m, b) +} +func (m *CreateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateNodePoolRequest.Marshal(b, m, deterministic) +} +func (dst *CreateNodePoolRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateNodePoolRequest.Merge(dst, src) +} +func (m *CreateNodePoolRequest) XXX_Size() int { + return xxx_messageInfo_CreateNodePoolRequest.Size(m) +} +func (m *CreateNodePoolRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CreateNodePoolRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateNodePoolRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *CreateNodePoolRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *CreateNodePoolRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *CreateNodePoolRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *CreateNodePoolRequest) GetNodePool() *NodePool { + if m != nil { + return m.NodePool + } + return nil +} + +func (m *CreateNodePoolRequest) GetParent() string { + if m != nil { + return m.Parent + } + return "" +} + +// DeleteNodePoolRequest deletes a node pool for a cluster. +type DeleteNodePoolRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the node pool to delete. + // This field has been deprecated and replaced by the name field. + NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, cluster, node pool id) of the node pool to + // delete. Specified in the format + // 'projects/*/locations/*/clusters/*/nodePools/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteNodePoolRequest) Reset() { *m = DeleteNodePoolRequest{} } +func (m *DeleteNodePoolRequest) String() string { return proto.CompactTextString(m) } +func (*DeleteNodePoolRequest) ProtoMessage() {} +func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{37} +} +func (m *DeleteNodePoolRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteNodePoolRequest.Unmarshal(m, b) +} +func (m *DeleteNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteNodePoolRequest.Marshal(b, m, deterministic) +} +func (dst *DeleteNodePoolRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteNodePoolRequest.Merge(dst, src) +} +func (m *DeleteNodePoolRequest) XXX_Size() int { + return xxx_messageInfo_DeleteNodePoolRequest.Size(m) +} +func (m *DeleteNodePoolRequest) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteNodePoolRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteNodePoolRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *DeleteNodePoolRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *DeleteNodePoolRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *DeleteNodePoolRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +// Deprecated: Do not use. +func (m *DeleteNodePoolRequest) GetNodePoolId() string { + if m != nil { + return m.NodePoolId + } + return "" +} + +func (m *DeleteNodePoolRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// ListNodePoolsRequest lists the node pool(s) for a cluster. +type ListNodePoolsRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the parent field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the parent field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the parent field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The parent (project, location, cluster id) where the node pools will be + // listed. Specified in the format 'projects/*/locations/*/clusters/*'. + Parent string `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListNodePoolsRequest) Reset() { *m = ListNodePoolsRequest{} } +func (m *ListNodePoolsRequest) String() string { return proto.CompactTextString(m) } +func (*ListNodePoolsRequest) ProtoMessage() {} +func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{38} +} +func (m *ListNodePoolsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListNodePoolsRequest.Unmarshal(m, b) +} +func (m *ListNodePoolsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListNodePoolsRequest.Marshal(b, m, deterministic) +} +func (dst *ListNodePoolsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListNodePoolsRequest.Merge(dst, src) +} +func (m *ListNodePoolsRequest) XXX_Size() int { + return xxx_messageInfo_ListNodePoolsRequest.Size(m) +} +func (m *ListNodePoolsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ListNodePoolsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ListNodePoolsRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *ListNodePoolsRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *ListNodePoolsRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *ListNodePoolsRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *ListNodePoolsRequest) GetParent() string { + if m != nil { + return m.Parent + } + return "" +} + +// GetNodePoolRequest retrieves a node pool for a cluster. +type GetNodePoolRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the node pool. + // This field has been deprecated and replaced by the name field. + NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, cluster, node pool id) of the node pool to + // get. Specified in the format + // 'projects/*/locations/*/clusters/*/nodePools/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetNodePoolRequest) Reset() { *m = GetNodePoolRequest{} } +func (m *GetNodePoolRequest) String() string { return proto.CompactTextString(m) } +func (*GetNodePoolRequest) ProtoMessage() {} +func (*GetNodePoolRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{39} +} +func (m *GetNodePoolRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetNodePoolRequest.Unmarshal(m, b) +} +func (m *GetNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetNodePoolRequest.Marshal(b, m, deterministic) +} +func (dst *GetNodePoolRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetNodePoolRequest.Merge(dst, src) +} +func (m *GetNodePoolRequest) XXX_Size() int { + return xxx_messageInfo_GetNodePoolRequest.Size(m) +} +func (m *GetNodePoolRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetNodePoolRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetNodePoolRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *GetNodePoolRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *GetNodePoolRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *GetNodePoolRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +// Deprecated: Do not use. +func (m *GetNodePoolRequest) GetNodePoolId() string { + if m != nil { + return m.NodePoolId + } + return "" +} + +func (m *GetNodePoolRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// NodePool contains the name and configuration for a cluster's node pool. +// Node pools are a set of nodes (i.e. VM's), with a common configuration and +// specification, under the control of the cluster master. They may have a set +// of Kubernetes labels applied to them, which may be used to reference them +// during pod scheduling. They may also be resized up or down, to accommodate +// the workload. +type NodePool struct { + // The name of the node pool. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // The node configuration of the pool. + Config *NodeConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + // The initial node count for the pool. You must ensure that your + // Compute Engine resource quota + // is sufficient for this number of instances. You must also have available + // firewall and routes quota. + InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"` + // [Output only] Server-defined URL for the resource. + SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"` + // The version of the Kubernetes of this node. + Version string `protobuf:"bytes,101,opt,name=version,proto3" json:"version,omitempty"` + // [Output only] The resource URLs of the [managed instance + // groups](/compute/docs/instance-groups/creating-groups-of-managed-instances) + // associated with this node pool. + InstanceGroupUrls []string `protobuf:"bytes,102,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"` + // [Output only] The status of the nodes in this pool instance. + Status NodePool_Status `protobuf:"varint,103,opt,name=status,proto3,enum=google.container.v1.NodePool_Status" json:"status,omitempty"` + // [Output only] Additional information about the current status of this + // node pool instance, if available. + StatusMessage string `protobuf:"bytes,104,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"` + // Autoscaler configuration for this NodePool. Autoscaler is enabled + // only if a valid configuration is present. + Autoscaling *NodePoolAutoscaling `protobuf:"bytes,4,opt,name=autoscaling,proto3" json:"autoscaling,omitempty"` + // NodeManagement configuration for this NodePool. + Management *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NodePool) Reset() { *m = NodePool{} } +func (m *NodePool) String() string { return proto.CompactTextString(m) } +func (*NodePool) ProtoMessage() {} +func (*NodePool) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{40} +} +func (m *NodePool) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NodePool.Unmarshal(m, b) +} +func (m *NodePool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NodePool.Marshal(b, m, deterministic) +} +func (dst *NodePool) XXX_Merge(src proto.Message) { + xxx_messageInfo_NodePool.Merge(dst, src) +} +func (m *NodePool) XXX_Size() int { + return xxx_messageInfo_NodePool.Size(m) +} +func (m *NodePool) XXX_DiscardUnknown() { + xxx_messageInfo_NodePool.DiscardUnknown(m) +} + +var xxx_messageInfo_NodePool proto.InternalMessageInfo + +func (m *NodePool) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *NodePool) GetConfig() *NodeConfig { + if m != nil { + return m.Config + } + return nil +} + +func (m *NodePool) GetInitialNodeCount() int32 { + if m != nil { + return m.InitialNodeCount + } + return 0 +} + +func (m *NodePool) GetSelfLink() string { + if m != nil { + return m.SelfLink + } + return "" +} + +func (m *NodePool) GetVersion() string { + if m != nil { + return m.Version + } + return "" +} + +func (m *NodePool) GetInstanceGroupUrls() []string { + if m != nil { + return m.InstanceGroupUrls + } + return nil +} + +func (m *NodePool) GetStatus() NodePool_Status { + if m != nil { + return m.Status + } + return NodePool_STATUS_UNSPECIFIED +} + +func (m *NodePool) GetStatusMessage() string { + if m != nil { + return m.StatusMessage + } + return "" +} + +func (m *NodePool) GetAutoscaling() *NodePoolAutoscaling { + if m != nil { + return m.Autoscaling + } + return nil +} + +func (m *NodePool) GetManagement() *NodeManagement { + if m != nil { + return m.Management + } + return nil +} + +// NodeManagement defines the set of node management services turned on for the +// node pool. +type NodeManagement struct { + // A flag that specifies whether node auto-upgrade is enabled for the node + // pool. If enabled, node auto-upgrade helps keep the nodes in your node pool + // up to date with the latest release version of Kubernetes. + AutoUpgrade bool `protobuf:"varint,1,opt,name=auto_upgrade,json=autoUpgrade,proto3" json:"auto_upgrade,omitempty"` + // A flag that specifies whether the node auto-repair is enabled for the node + // pool. If enabled, the nodes in this node pool will be monitored and, if + // they fail health checks too many times, an automatic repair action will be + // triggered. + AutoRepair bool `protobuf:"varint,2,opt,name=auto_repair,json=autoRepair,proto3" json:"auto_repair,omitempty"` + // Specifies the Auto Upgrade knobs for the node pool. + UpgradeOptions *AutoUpgradeOptions `protobuf:"bytes,10,opt,name=upgrade_options,json=upgradeOptions,proto3" json:"upgrade_options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NodeManagement) Reset() { *m = NodeManagement{} } +func (m *NodeManagement) String() string { return proto.CompactTextString(m) } +func (*NodeManagement) ProtoMessage() {} +func (*NodeManagement) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{41} +} +func (m *NodeManagement) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NodeManagement.Unmarshal(m, b) +} +func (m *NodeManagement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NodeManagement.Marshal(b, m, deterministic) +} +func (dst *NodeManagement) XXX_Merge(src proto.Message) { + xxx_messageInfo_NodeManagement.Merge(dst, src) +} +func (m *NodeManagement) XXX_Size() int { + return xxx_messageInfo_NodeManagement.Size(m) +} +func (m *NodeManagement) XXX_DiscardUnknown() { + xxx_messageInfo_NodeManagement.DiscardUnknown(m) +} + +var xxx_messageInfo_NodeManagement proto.InternalMessageInfo + +func (m *NodeManagement) GetAutoUpgrade() bool { + if m != nil { + return m.AutoUpgrade + } + return false +} + +func (m *NodeManagement) GetAutoRepair() bool { + if m != nil { + return m.AutoRepair + } + return false +} + +func (m *NodeManagement) GetUpgradeOptions() *AutoUpgradeOptions { + if m != nil { + return m.UpgradeOptions + } + return nil +} + +// AutoUpgradeOptions defines the set of options for the user to control how +// the Auto Upgrades will proceed. +type AutoUpgradeOptions struct { + // [Output only] This field is set when upgrades are about to commence + // with the approximate start time for the upgrades, in + // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. + AutoUpgradeStartTime string `protobuf:"bytes,1,opt,name=auto_upgrade_start_time,json=autoUpgradeStartTime,proto3" json:"auto_upgrade_start_time,omitempty"` + // [Output only] This field is set when upgrades are about to commence + // with the description of the upgrade. + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AutoUpgradeOptions) Reset() { *m = AutoUpgradeOptions{} } +func (m *AutoUpgradeOptions) String() string { return proto.CompactTextString(m) } +func (*AutoUpgradeOptions) ProtoMessage() {} +func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{42} +} +func (m *AutoUpgradeOptions) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_AutoUpgradeOptions.Unmarshal(m, b) +} +func (m *AutoUpgradeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_AutoUpgradeOptions.Marshal(b, m, deterministic) +} +func (dst *AutoUpgradeOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_AutoUpgradeOptions.Merge(dst, src) +} +func (m *AutoUpgradeOptions) XXX_Size() int { + return xxx_messageInfo_AutoUpgradeOptions.Size(m) +} +func (m *AutoUpgradeOptions) XXX_DiscardUnknown() { + xxx_messageInfo_AutoUpgradeOptions.DiscardUnknown(m) +} + +var xxx_messageInfo_AutoUpgradeOptions proto.InternalMessageInfo + +func (m *AutoUpgradeOptions) GetAutoUpgradeStartTime() string { + if m != nil { + return m.AutoUpgradeStartTime + } + return "" +} + +func (m *AutoUpgradeOptions) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +// MaintenancePolicy defines the maintenance policy to be used for the cluster. +type MaintenancePolicy struct { + // Specifies the maintenance window in which maintenance may be performed. + Window *MaintenanceWindow `protobuf:"bytes,1,opt,name=window,proto3" json:"window,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MaintenancePolicy) Reset() { *m = MaintenancePolicy{} } +func (m *MaintenancePolicy) String() string { return proto.CompactTextString(m) } +func (*MaintenancePolicy) ProtoMessage() {} +func (*MaintenancePolicy) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{43} +} +func (m *MaintenancePolicy) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MaintenancePolicy.Unmarshal(m, b) +} +func (m *MaintenancePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MaintenancePolicy.Marshal(b, m, deterministic) +} +func (dst *MaintenancePolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_MaintenancePolicy.Merge(dst, src) +} +func (m *MaintenancePolicy) XXX_Size() int { + return xxx_messageInfo_MaintenancePolicy.Size(m) +} +func (m *MaintenancePolicy) XXX_DiscardUnknown() { + xxx_messageInfo_MaintenancePolicy.DiscardUnknown(m) +} + +var xxx_messageInfo_MaintenancePolicy proto.InternalMessageInfo + +func (m *MaintenancePolicy) GetWindow() *MaintenanceWindow { + if m != nil { + return m.Window + } + return nil +} + +// MaintenanceWindow defines the maintenance window to be used for the cluster. +type MaintenanceWindow struct { + // Types that are valid to be assigned to Policy: + // *MaintenanceWindow_DailyMaintenanceWindow + Policy isMaintenanceWindow_Policy `protobuf_oneof:"policy"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MaintenanceWindow) Reset() { *m = MaintenanceWindow{} } +func (m *MaintenanceWindow) String() string { return proto.CompactTextString(m) } +func (*MaintenanceWindow) ProtoMessage() {} +func (*MaintenanceWindow) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{44} +} +func (m *MaintenanceWindow) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MaintenanceWindow.Unmarshal(m, b) +} +func (m *MaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MaintenanceWindow.Marshal(b, m, deterministic) +} +func (dst *MaintenanceWindow) XXX_Merge(src proto.Message) { + xxx_messageInfo_MaintenanceWindow.Merge(dst, src) +} +func (m *MaintenanceWindow) XXX_Size() int { + return xxx_messageInfo_MaintenanceWindow.Size(m) +} +func (m *MaintenanceWindow) XXX_DiscardUnknown() { + xxx_messageInfo_MaintenanceWindow.DiscardUnknown(m) +} + +var xxx_messageInfo_MaintenanceWindow proto.InternalMessageInfo + +type isMaintenanceWindow_Policy interface { + isMaintenanceWindow_Policy() +} + +type MaintenanceWindow_DailyMaintenanceWindow struct { + DailyMaintenanceWindow *DailyMaintenanceWindow `protobuf:"bytes,2,opt,name=daily_maintenance_window,json=dailyMaintenanceWindow,proto3,oneof"` +} + +func (*MaintenanceWindow_DailyMaintenanceWindow) isMaintenanceWindow_Policy() {} + +func (m *MaintenanceWindow) GetPolicy() isMaintenanceWindow_Policy { + if m != nil { + return m.Policy + } + return nil +} + +func (m *MaintenanceWindow) GetDailyMaintenanceWindow() *DailyMaintenanceWindow { + if x, ok := m.GetPolicy().(*MaintenanceWindow_DailyMaintenanceWindow); ok { + return x.DailyMaintenanceWindow + } + return nil +} + +// XXX_OneofFuncs is for the internal use of the proto package. +func (*MaintenanceWindow) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { + return _MaintenanceWindow_OneofMarshaler, _MaintenanceWindow_OneofUnmarshaler, _MaintenanceWindow_OneofSizer, []interface{}{ + (*MaintenanceWindow_DailyMaintenanceWindow)(nil), + } +} + +func _MaintenanceWindow_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { + m := msg.(*MaintenanceWindow) + // policy + switch x := m.Policy.(type) { + case *MaintenanceWindow_DailyMaintenanceWindow: + b.EncodeVarint(2<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.DailyMaintenanceWindow); err != nil { + return err + } + case nil: + default: + return fmt.Errorf("MaintenanceWindow.Policy has unexpected type %T", x) + } + return nil +} + +func _MaintenanceWindow_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { + m := msg.(*MaintenanceWindow) + switch tag { + case 2: // policy.daily_maintenance_window + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(DailyMaintenanceWindow) + err := b.DecodeMessage(msg) + m.Policy = &MaintenanceWindow_DailyMaintenanceWindow{msg} + return true, err + default: + return false, nil + } +} + +func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) { + m := msg.(*MaintenanceWindow) + // policy + switch x := m.Policy.(type) { + case *MaintenanceWindow_DailyMaintenanceWindow: + s := proto.Size(x.DailyMaintenanceWindow) + n += 1 // tag and wire + n += proto.SizeVarint(uint64(s)) + n += s + case nil: + default: + panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + } + return n +} + +// Time window specified for daily maintenance operations. +type DailyMaintenanceWindow struct { + // Time within the maintenance window to start the maintenance operations. + // Time format should be in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) + // format "HH:MM”, where HH : [00-23] and MM : [00-59] GMT. + StartTime string `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + // [Output only] Duration of the time window, automatically chosen to be + // smallest possible in the given scenario. + // Duration will be in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) + // format "PTnHnMnS". + Duration string `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DailyMaintenanceWindow) Reset() { *m = DailyMaintenanceWindow{} } +func (m *DailyMaintenanceWindow) String() string { return proto.CompactTextString(m) } +func (*DailyMaintenanceWindow) ProtoMessage() {} +func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{45} +} +func (m *DailyMaintenanceWindow) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DailyMaintenanceWindow.Unmarshal(m, b) +} +func (m *DailyMaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DailyMaintenanceWindow.Marshal(b, m, deterministic) +} +func (dst *DailyMaintenanceWindow) XXX_Merge(src proto.Message) { + xxx_messageInfo_DailyMaintenanceWindow.Merge(dst, src) +} +func (m *DailyMaintenanceWindow) XXX_Size() int { + return xxx_messageInfo_DailyMaintenanceWindow.Size(m) +} +func (m *DailyMaintenanceWindow) XXX_DiscardUnknown() { + xxx_messageInfo_DailyMaintenanceWindow.DiscardUnknown(m) +} + +var xxx_messageInfo_DailyMaintenanceWindow proto.InternalMessageInfo + +func (m *DailyMaintenanceWindow) GetStartTime() string { + if m != nil { + return m.StartTime + } + return "" +} + +func (m *DailyMaintenanceWindow) GetDuration() string { + if m != nil { + return m.Duration + } + return "" +} + +// SetNodePoolManagementRequest sets the node management properties of a node +// pool. +type SetNodePoolManagementRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to update. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the node pool to update. + // This field has been deprecated and replaced by the name field. + NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"` // Deprecated: Do not use. + // NodeManagement configuration for the node pool. + Management *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"` + // The name (project, location, cluster, node pool id) of the node pool to set + // management properties. Specified in the format + // 'projects/*/locations/*/clusters/*/nodePools/*'. + Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetNodePoolManagementRequest) Reset() { *m = SetNodePoolManagementRequest{} } +func (m *SetNodePoolManagementRequest) String() string { return proto.CompactTextString(m) } +func (*SetNodePoolManagementRequest) ProtoMessage() {} +func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{46} +} +func (m *SetNodePoolManagementRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetNodePoolManagementRequest.Unmarshal(m, b) +} +func (m *SetNodePoolManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetNodePoolManagementRequest.Marshal(b, m, deterministic) +} +func (dst *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetNodePoolManagementRequest.Merge(dst, src) +} +func (m *SetNodePoolManagementRequest) XXX_Size() int { + return xxx_messageInfo_SetNodePoolManagementRequest.Size(m) +} +func (m *SetNodePoolManagementRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetNodePoolManagementRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetNodePoolManagementRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetNodePoolManagementRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolManagementRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolManagementRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolManagementRequest) GetNodePoolId() string { + if m != nil { + return m.NodePoolId + } + return "" +} + +func (m *SetNodePoolManagementRequest) GetManagement() *NodeManagement { + if m != nil { + return m.Management + } + return nil +} + +func (m *SetNodePoolManagementRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetNodePoolSizeRequest sets the size a node +// pool. +type SetNodePoolSizeRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to update. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the node pool to update. + // This field has been deprecated and replaced by the name field. + NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"` // Deprecated: Do not use. + // The desired node count for the pool. + NodeCount int32 `protobuf:"varint,5,opt,name=node_count,json=nodeCount,proto3" json:"node_count,omitempty"` + // The name (project, location, cluster, node pool id) of the node pool to set + // size. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. + Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetNodePoolSizeRequest) Reset() { *m = SetNodePoolSizeRequest{} } +func (m *SetNodePoolSizeRequest) String() string { return proto.CompactTextString(m) } +func (*SetNodePoolSizeRequest) ProtoMessage() {} +func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{47} +} +func (m *SetNodePoolSizeRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetNodePoolSizeRequest.Unmarshal(m, b) +} +func (m *SetNodePoolSizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetNodePoolSizeRequest.Marshal(b, m, deterministic) +} +func (dst *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetNodePoolSizeRequest.Merge(dst, src) +} +func (m *SetNodePoolSizeRequest) XXX_Size() int { + return xxx_messageInfo_SetNodePoolSizeRequest.Size(m) +} +func (m *SetNodePoolSizeRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetNodePoolSizeRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetNodePoolSizeRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetNodePoolSizeRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolSizeRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolSizeRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNodePoolSizeRequest) GetNodePoolId() string { + if m != nil { + return m.NodePoolId + } + return "" +} + +func (m *SetNodePoolSizeRequest) GetNodeCount() int32 { + if m != nil { + return m.NodeCount + } + return 0 +} + +func (m *SetNodePoolSizeRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// RollbackNodePoolUpgradeRequest rollbacks the previously Aborted or Failed +// NodePool upgrade. This will be an no-op if the last upgrade successfully +// completed. +type RollbackNodePoolUpgradeRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to rollback. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the node pool to rollback. + // This field has been deprecated and replaced by the name field. + NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, cluster, node pool id) of the node poll to + // rollback upgrade. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RollbackNodePoolUpgradeRequest) Reset() { *m = RollbackNodePoolUpgradeRequest{} } +func (m *RollbackNodePoolUpgradeRequest) String() string { return proto.CompactTextString(m) } +func (*RollbackNodePoolUpgradeRequest) ProtoMessage() {} +func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{48} +} +func (m *RollbackNodePoolUpgradeRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Unmarshal(m, b) +} +func (m *RollbackNodePoolUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Marshal(b, m, deterministic) +} +func (dst *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(dst, src) +} +func (m *RollbackNodePoolUpgradeRequest) XXX_Size() int { + return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Size(m) +} +func (m *RollbackNodePoolUpgradeRequest) XXX_DiscardUnknown() { + xxx_messageInfo_RollbackNodePoolUpgradeRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_RollbackNodePoolUpgradeRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *RollbackNodePoolUpgradeRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *RollbackNodePoolUpgradeRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *RollbackNodePoolUpgradeRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +// Deprecated: Do not use. +func (m *RollbackNodePoolUpgradeRequest) GetNodePoolId() string { + if m != nil { + return m.NodePoolId + } + return "" +} + +func (m *RollbackNodePoolUpgradeRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// ListNodePoolsResponse is the result of ListNodePoolsRequest. +type ListNodePoolsResponse struct { + // A list of node pools for a cluster. + NodePools []*NodePool `protobuf:"bytes,1,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListNodePoolsResponse) Reset() { *m = ListNodePoolsResponse{} } +func (m *ListNodePoolsResponse) String() string { return proto.CompactTextString(m) } +func (*ListNodePoolsResponse) ProtoMessage() {} +func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{49} +} +func (m *ListNodePoolsResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListNodePoolsResponse.Unmarshal(m, b) +} +func (m *ListNodePoolsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListNodePoolsResponse.Marshal(b, m, deterministic) +} +func (dst *ListNodePoolsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListNodePoolsResponse.Merge(dst, src) +} +func (m *ListNodePoolsResponse) XXX_Size() int { + return xxx_messageInfo_ListNodePoolsResponse.Size(m) +} +func (m *ListNodePoolsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ListNodePoolsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ListNodePoolsResponse proto.InternalMessageInfo + +func (m *ListNodePoolsResponse) GetNodePools() []*NodePool { + if m != nil { + return m.NodePools + } + return nil +} + +// NodePoolAutoscaling contains information required by cluster autoscaler to +// adjust the size of the node pool to the current cluster usage. +type NodePoolAutoscaling struct { + // Is autoscaling enabled for this node pool. + Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"` + // Minimum number of nodes in the NodePool. Must be >= 1 and <= + // max_node_count. + MinNodeCount int32 `protobuf:"varint,2,opt,name=min_node_count,json=minNodeCount,proto3" json:"min_node_count,omitempty"` + // Maximum number of nodes in the NodePool. Must be >= min_node_count. There + // has to enough quota to scale up the cluster. + MaxNodeCount int32 `protobuf:"varint,3,opt,name=max_node_count,json=maxNodeCount,proto3" json:"max_node_count,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NodePoolAutoscaling) Reset() { *m = NodePoolAutoscaling{} } +func (m *NodePoolAutoscaling) String() string { return proto.CompactTextString(m) } +func (*NodePoolAutoscaling) ProtoMessage() {} +func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{50} +} +func (m *NodePoolAutoscaling) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NodePoolAutoscaling.Unmarshal(m, b) +} +func (m *NodePoolAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NodePoolAutoscaling.Marshal(b, m, deterministic) +} +func (dst *NodePoolAutoscaling) XXX_Merge(src proto.Message) { + xxx_messageInfo_NodePoolAutoscaling.Merge(dst, src) +} +func (m *NodePoolAutoscaling) XXX_Size() int { + return xxx_messageInfo_NodePoolAutoscaling.Size(m) +} +func (m *NodePoolAutoscaling) XXX_DiscardUnknown() { + xxx_messageInfo_NodePoolAutoscaling.DiscardUnknown(m) +} + +var xxx_messageInfo_NodePoolAutoscaling proto.InternalMessageInfo + +func (m *NodePoolAutoscaling) GetEnabled() bool { + if m != nil { + return m.Enabled + } + return false +} + +func (m *NodePoolAutoscaling) GetMinNodeCount() int32 { + if m != nil { + return m.MinNodeCount + } + return 0 +} + +func (m *NodePoolAutoscaling) GetMaxNodeCount() int32 { + if m != nil { + return m.MaxNodeCount + } + return 0 +} + +// SetLabelsRequest sets the Google Cloud Platform labels on a Google Container +// Engine cluster, which will in turn set them for Google Compute Engine +// resources used by that cluster +type SetLabelsRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The labels to set for that cluster. + ResourceLabels map[string]string `protobuf:"bytes,4,rep,name=resource_labels,json=resourceLabels,proto3" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // The fingerprint of the previous set of labels for this resource, + // used to detect conflicts. The fingerprint is initially generated by + // Kubernetes Engine and changes after every request to modify or update + // labels. You must always provide an up-to-date fingerprint hash when + // updating or changing labels. Make a get() request to the + // resource to get the latest fingerprint. + LabelFingerprint string `protobuf:"bytes,5,opt,name=label_fingerprint,json=labelFingerprint,proto3" json:"label_fingerprint,omitempty"` + // The name (project, location, cluster id) of the cluster to set labels. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetLabelsRequest) Reset() { *m = SetLabelsRequest{} } +func (m *SetLabelsRequest) String() string { return proto.CompactTextString(m) } +func (*SetLabelsRequest) ProtoMessage() {} +func (*SetLabelsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{51} +} +func (m *SetLabelsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetLabelsRequest.Unmarshal(m, b) +} +func (m *SetLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetLabelsRequest.Marshal(b, m, deterministic) +} +func (dst *SetLabelsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetLabelsRequest.Merge(dst, src) +} +func (m *SetLabelsRequest) XXX_Size() int { + return xxx_messageInfo_SetLabelsRequest.Size(m) +} +func (m *SetLabelsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetLabelsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetLabelsRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetLabelsRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetLabelsRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetLabelsRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetLabelsRequest) GetResourceLabels() map[string]string { + if m != nil { + return m.ResourceLabels + } + return nil +} + +func (m *SetLabelsRequest) GetLabelFingerprint() string { + if m != nil { + return m.LabelFingerprint + } + return "" +} + +func (m *SetLabelsRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetLegacyAbacRequest enables or disables the ABAC authorization mechanism for +// a cluster. +type SetLegacyAbacRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster to update. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Whether ABAC authorization will be enabled in the cluster. + Enabled bool `protobuf:"varint,4,opt,name=enabled,proto3" json:"enabled,omitempty"` + // The name (project, location, cluster id) of the cluster to set legacy abac. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetLegacyAbacRequest) Reset() { *m = SetLegacyAbacRequest{} } +func (m *SetLegacyAbacRequest) String() string { return proto.CompactTextString(m) } +func (*SetLegacyAbacRequest) ProtoMessage() {} +func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{52} +} +func (m *SetLegacyAbacRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetLegacyAbacRequest.Unmarshal(m, b) +} +func (m *SetLegacyAbacRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetLegacyAbacRequest.Marshal(b, m, deterministic) +} +func (dst *SetLegacyAbacRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetLegacyAbacRequest.Merge(dst, src) +} +func (m *SetLegacyAbacRequest) XXX_Size() int { + return xxx_messageInfo_SetLegacyAbacRequest.Size(m) +} +func (m *SetLegacyAbacRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetLegacyAbacRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetLegacyAbacRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetLegacyAbacRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetLegacyAbacRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetLegacyAbacRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetLegacyAbacRequest) GetEnabled() bool { + if m != nil { + return m.Enabled + } + return false +} + +func (m *SetLegacyAbacRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// StartIPRotationRequest creates a new IP for the cluster and then performs +// a node upgrade on each node pool to point to the new IP. +type StartIPRotationRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, cluster id) of the cluster to start IP + // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + // Whether to rotate credentials during IP rotation. + RotateCredentials bool `protobuf:"varint,7,opt,name=rotate_credentials,json=rotateCredentials,proto3" json:"rotate_credentials,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *StartIPRotationRequest) Reset() { *m = StartIPRotationRequest{} } +func (m *StartIPRotationRequest) String() string { return proto.CompactTextString(m) } +func (*StartIPRotationRequest) ProtoMessage() {} +func (*StartIPRotationRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{53} +} +func (m *StartIPRotationRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_StartIPRotationRequest.Unmarshal(m, b) +} +func (m *StartIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_StartIPRotationRequest.Marshal(b, m, deterministic) +} +func (dst *StartIPRotationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartIPRotationRequest.Merge(dst, src) +} +func (m *StartIPRotationRequest) XXX_Size() int { + return xxx_messageInfo_StartIPRotationRequest.Size(m) +} +func (m *StartIPRotationRequest) XXX_DiscardUnknown() { + xxx_messageInfo_StartIPRotationRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_StartIPRotationRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *StartIPRotationRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *StartIPRotationRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *StartIPRotationRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *StartIPRotationRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *StartIPRotationRequest) GetRotateCredentials() bool { + if m != nil { + return m.RotateCredentials + } + return false +} + +// CompleteIPRotationRequest moves the cluster master back into single-IP mode. +type CompleteIPRotationRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // The name (project, location, cluster id) of the cluster to complete IP + // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CompleteIPRotationRequest) Reset() { *m = CompleteIPRotationRequest{} } +func (m *CompleteIPRotationRequest) String() string { return proto.CompactTextString(m) } +func (*CompleteIPRotationRequest) ProtoMessage() {} +func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{54} +} +func (m *CompleteIPRotationRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CompleteIPRotationRequest.Unmarshal(m, b) +} +func (m *CompleteIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CompleteIPRotationRequest.Marshal(b, m, deterministic) +} +func (dst *CompleteIPRotationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CompleteIPRotationRequest.Merge(dst, src) +} +func (m *CompleteIPRotationRequest) XXX_Size() int { + return xxx_messageInfo_CompleteIPRotationRequest.Size(m) +} +func (m *CompleteIPRotationRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CompleteIPRotationRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_CompleteIPRotationRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *CompleteIPRotationRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *CompleteIPRotationRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *CompleteIPRotationRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *CompleteIPRotationRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// AcceleratorConfig represents a Hardware Accelerator request. +type AcceleratorConfig struct { + // The number of the accelerator cards exposed to an instance. + AcceleratorCount int64 `protobuf:"varint,1,opt,name=accelerator_count,json=acceleratorCount,proto3" json:"accelerator_count,omitempty"` + // The accelerator type resource name. List of supported accelerators + // [here](/compute/docs/gpus/#Introduction) + AcceleratorType string `protobuf:"bytes,2,opt,name=accelerator_type,json=acceleratorType,proto3" json:"accelerator_type,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AcceleratorConfig) Reset() { *m = AcceleratorConfig{} } +func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) } +func (*AcceleratorConfig) ProtoMessage() {} +func (*AcceleratorConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{55} +} +func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b) +} +func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic) +} +func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_AcceleratorConfig.Merge(dst, src) +} +func (m *AcceleratorConfig) XXX_Size() int { + return xxx_messageInfo_AcceleratorConfig.Size(m) +} +func (m *AcceleratorConfig) XXX_DiscardUnknown() { + xxx_messageInfo_AcceleratorConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_AcceleratorConfig proto.InternalMessageInfo + +func (m *AcceleratorConfig) GetAcceleratorCount() int64 { + if m != nil { + return m.AcceleratorCount + } + return 0 +} + +func (m *AcceleratorConfig) GetAcceleratorType() string { + if m != nil { + return m.AcceleratorType + } + return "" +} + +// SetNetworkPolicyRequest enables/disables network policy for a cluster. +type SetNetworkPolicyRequest struct { + // Deprecated. The Google Developers Console [project ID or project + // number](https://developers.google.com/console/help/new/#projectnumber). + // This field has been deprecated and replaced by the name field. + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + // This field has been deprecated and replaced by the name field. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` // Deprecated: Do not use. + // Deprecated. The name of the cluster. + // This field has been deprecated and replaced by the name field. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` // Deprecated: Do not use. + // Configuration options for the NetworkPolicy feature. + NetworkPolicy *NetworkPolicy `protobuf:"bytes,4,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"` + // The name (project, location, cluster id) of the cluster to set networking + // policy. Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetNetworkPolicyRequest) Reset() { *m = SetNetworkPolicyRequest{} } +func (m *SetNetworkPolicyRequest) String() string { return proto.CompactTextString(m) } +func (*SetNetworkPolicyRequest) ProtoMessage() {} +func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{56} +} +func (m *SetNetworkPolicyRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetNetworkPolicyRequest.Unmarshal(m, b) +} +func (m *SetNetworkPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetNetworkPolicyRequest.Marshal(b, m, deterministic) +} +func (dst *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetNetworkPolicyRequest.Merge(dst, src) +} +func (m *SetNetworkPolicyRequest) XXX_Size() int { + return xxx_messageInfo_SetNetworkPolicyRequest.Size(m) +} +func (m *SetNetworkPolicyRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetNetworkPolicyRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetNetworkPolicyRequest proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *SetNetworkPolicyRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNetworkPolicyRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +// Deprecated: Do not use. +func (m *SetNetworkPolicyRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetNetworkPolicyRequest) GetNetworkPolicy() *NetworkPolicy { + if m != nil { + return m.NetworkPolicy + } + return nil +} + +func (m *SetNetworkPolicyRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// SetMaintenancePolicyRequest sets the maintenance policy for a cluster. +type SetMaintenancePolicyRequest struct { + // The Google Developers Console [project ID or project + // number](https://support.google.com/cloud/answer/6158840). + ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` + // The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster + // resides. + Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"` + // The name of the cluster to update. + ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` + // The maintenance policy to be set for the cluster. An empty field + // clears the existing maintenance policy. + MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,4,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"` + // The name (project, location, cluster id) of the cluster to set maintenance + // policy. + // Specified in the format 'projects/*/locations/*/clusters/*'. + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetMaintenancePolicyRequest) Reset() { *m = SetMaintenancePolicyRequest{} } +func (m *SetMaintenancePolicyRequest) String() string { return proto.CompactTextString(m) } +func (*SetMaintenancePolicyRequest) ProtoMessage() {} +func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{57} +} +func (m *SetMaintenancePolicyRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetMaintenancePolicyRequest.Unmarshal(m, b) +} +func (m *SetMaintenancePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetMaintenancePolicyRequest.Marshal(b, m, deterministic) +} +func (dst *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetMaintenancePolicyRequest.Merge(dst, src) +} +func (m *SetMaintenancePolicyRequest) XXX_Size() int { + return xxx_messageInfo_SetMaintenancePolicyRequest.Size(m) +} +func (m *SetMaintenancePolicyRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetMaintenancePolicyRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetMaintenancePolicyRequest proto.InternalMessageInfo + +func (m *SetMaintenancePolicyRequest) GetProjectId() string { + if m != nil { + return m.ProjectId + } + return "" +} + +func (m *SetMaintenancePolicyRequest) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} + +func (m *SetMaintenancePolicyRequest) GetClusterId() string { + if m != nil { + return m.ClusterId + } + return "" +} + +func (m *SetMaintenancePolicyRequest) GetMaintenancePolicy() *MaintenancePolicy { + if m != nil { + return m.MaintenancePolicy + } + return nil +} + +func (m *SetMaintenancePolicyRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// NetworkConfig reports the relative names of network & subnetwork. +type NetworkConfig struct { + // Output only. The relative name of the Google Compute Engine + // [network][google.container.v1.NetworkConfig.network](/compute/docs/networks-and-firewalls#networks) to which + // the cluster is connected. + // Example: projects/my-project/global/networks/my-network + Network string `protobuf:"bytes,1,opt,name=network,proto3" json:"network,omitempty"` + // Output only. The relative name of the Google Compute Engine + // [subnetwork](/compute/docs/vpc) to which the cluster is connected. + // Example: projects/my-project/regions/us-central1/subnetworks/my-subnet + Subnetwork string `protobuf:"bytes,2,opt,name=subnetwork,proto3" json:"subnetwork,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NetworkConfig) Reset() { *m = NetworkConfig{} } +func (m *NetworkConfig) String() string { return proto.CompactTextString(m) } +func (*NetworkConfig) ProtoMessage() {} +func (*NetworkConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_cluster_service_ddce0395d8fb4971, []int{58} +} +func (m *NetworkConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NetworkConfig.Unmarshal(m, b) +} +func (m *NetworkConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NetworkConfig.Marshal(b, m, deterministic) +} +func (dst *NetworkConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkConfig.Merge(dst, src) +} +func (m *NetworkConfig) XXX_Size() int { + return xxx_messageInfo_NetworkConfig.Size(m) +} +func (m *NetworkConfig) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_NetworkConfig proto.InternalMessageInfo + +func (m *NetworkConfig) GetNetwork() string { + if m != nil { + return m.Network + } + return "" +} + +func (m *NetworkConfig) GetSubnetwork() string { + if m != nil { + return m.Subnetwork + } + return "" +} + +func init() { + proto.RegisterType((*NodeConfig)(nil), "google.container.v1.NodeConfig") + proto.RegisterMapType((map[string]string)(nil), "google.container.v1.NodeConfig.LabelsEntry") + proto.RegisterMapType((map[string]string)(nil), "google.container.v1.NodeConfig.MetadataEntry") + proto.RegisterType((*MasterAuth)(nil), "google.container.v1.MasterAuth") + proto.RegisterType((*ClientCertificateConfig)(nil), "google.container.v1.ClientCertificateConfig") + proto.RegisterType((*AddonsConfig)(nil), "google.container.v1.AddonsConfig") + proto.RegisterType((*HttpLoadBalancing)(nil), "google.container.v1.HttpLoadBalancing") + proto.RegisterType((*HorizontalPodAutoscaling)(nil), "google.container.v1.HorizontalPodAutoscaling") + proto.RegisterType((*KubernetesDashboard)(nil), "google.container.v1.KubernetesDashboard") + proto.RegisterType((*NetworkPolicyConfig)(nil), "google.container.v1.NetworkPolicyConfig") + proto.RegisterType((*PrivateClusterConfig)(nil), "google.container.v1.PrivateClusterConfig") + proto.RegisterType((*MasterAuthorizedNetworksConfig)(nil), "google.container.v1.MasterAuthorizedNetworksConfig") + proto.RegisterType((*MasterAuthorizedNetworksConfig_CidrBlock)(nil), "google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock") + proto.RegisterType((*LegacyAbac)(nil), "google.container.v1.LegacyAbac") + proto.RegisterType((*NetworkPolicy)(nil), "google.container.v1.NetworkPolicy") + proto.RegisterType((*IPAllocationPolicy)(nil), "google.container.v1.IPAllocationPolicy") + proto.RegisterType((*Cluster)(nil), "google.container.v1.Cluster") + proto.RegisterMapType((map[string]string)(nil), "google.container.v1.Cluster.ResourceLabelsEntry") + proto.RegisterType((*ClusterUpdate)(nil), "google.container.v1.ClusterUpdate") + proto.RegisterType((*Operation)(nil), "google.container.v1.Operation") + proto.RegisterType((*CreateClusterRequest)(nil), "google.container.v1.CreateClusterRequest") + proto.RegisterType((*GetClusterRequest)(nil), "google.container.v1.GetClusterRequest") + proto.RegisterType((*UpdateClusterRequest)(nil), "google.container.v1.UpdateClusterRequest") + proto.RegisterType((*UpdateNodePoolRequest)(nil), "google.container.v1.UpdateNodePoolRequest") + proto.RegisterType((*SetNodePoolAutoscalingRequest)(nil), "google.container.v1.SetNodePoolAutoscalingRequest") + proto.RegisterType((*SetLoggingServiceRequest)(nil), "google.container.v1.SetLoggingServiceRequest") + proto.RegisterType((*SetMonitoringServiceRequest)(nil), "google.container.v1.SetMonitoringServiceRequest") + proto.RegisterType((*SetAddonsConfigRequest)(nil), "google.container.v1.SetAddonsConfigRequest") + proto.RegisterType((*SetLocationsRequest)(nil), "google.container.v1.SetLocationsRequest") + proto.RegisterType((*UpdateMasterRequest)(nil), "google.container.v1.UpdateMasterRequest") + proto.RegisterType((*SetMasterAuthRequest)(nil), "google.container.v1.SetMasterAuthRequest") + proto.RegisterType((*DeleteClusterRequest)(nil), "google.container.v1.DeleteClusterRequest") + proto.RegisterType((*ListClustersRequest)(nil), "google.container.v1.ListClustersRequest") + proto.RegisterType((*ListClustersResponse)(nil), "google.container.v1.ListClustersResponse") + proto.RegisterType((*GetOperationRequest)(nil), "google.container.v1.GetOperationRequest") + proto.RegisterType((*ListOperationsRequest)(nil), "google.container.v1.ListOperationsRequest") + proto.RegisterType((*CancelOperationRequest)(nil), "google.container.v1.CancelOperationRequest") + proto.RegisterType((*ListOperationsResponse)(nil), "google.container.v1.ListOperationsResponse") + proto.RegisterType((*GetServerConfigRequest)(nil), "google.container.v1.GetServerConfigRequest") + proto.RegisterType((*ServerConfig)(nil), "google.container.v1.ServerConfig") + proto.RegisterType((*CreateNodePoolRequest)(nil), "google.container.v1.CreateNodePoolRequest") + proto.RegisterType((*DeleteNodePoolRequest)(nil), "google.container.v1.DeleteNodePoolRequest") + proto.RegisterType((*ListNodePoolsRequest)(nil), "google.container.v1.ListNodePoolsRequest") + proto.RegisterType((*GetNodePoolRequest)(nil), "google.container.v1.GetNodePoolRequest") + proto.RegisterType((*NodePool)(nil), "google.container.v1.NodePool") + proto.RegisterType((*NodeManagement)(nil), "google.container.v1.NodeManagement") + proto.RegisterType((*AutoUpgradeOptions)(nil), "google.container.v1.AutoUpgradeOptions") + proto.RegisterType((*MaintenancePolicy)(nil), "google.container.v1.MaintenancePolicy") + proto.RegisterType((*MaintenanceWindow)(nil), "google.container.v1.MaintenanceWindow") + proto.RegisterType((*DailyMaintenanceWindow)(nil), "google.container.v1.DailyMaintenanceWindow") + proto.RegisterType((*SetNodePoolManagementRequest)(nil), "google.container.v1.SetNodePoolManagementRequest") + proto.RegisterType((*SetNodePoolSizeRequest)(nil), "google.container.v1.SetNodePoolSizeRequest") + proto.RegisterType((*RollbackNodePoolUpgradeRequest)(nil), "google.container.v1.RollbackNodePoolUpgradeRequest") + proto.RegisterType((*ListNodePoolsResponse)(nil), "google.container.v1.ListNodePoolsResponse") + proto.RegisterType((*NodePoolAutoscaling)(nil), "google.container.v1.NodePoolAutoscaling") + proto.RegisterType((*SetLabelsRequest)(nil), "google.container.v1.SetLabelsRequest") + proto.RegisterMapType((map[string]string)(nil), "google.container.v1.SetLabelsRequest.ResourceLabelsEntry") + proto.RegisterType((*SetLegacyAbacRequest)(nil), "google.container.v1.SetLegacyAbacRequest") + proto.RegisterType((*StartIPRotationRequest)(nil), "google.container.v1.StartIPRotationRequest") + proto.RegisterType((*CompleteIPRotationRequest)(nil), "google.container.v1.CompleteIPRotationRequest") + proto.RegisterType((*AcceleratorConfig)(nil), "google.container.v1.AcceleratorConfig") + proto.RegisterType((*SetNetworkPolicyRequest)(nil), "google.container.v1.SetNetworkPolicyRequest") + proto.RegisterType((*SetMaintenancePolicyRequest)(nil), "google.container.v1.SetMaintenancePolicyRequest") + proto.RegisterType((*NetworkConfig)(nil), "google.container.v1.NetworkConfig") + proto.RegisterEnum("google.container.v1.NetworkPolicy_Provider", NetworkPolicy_Provider_name, NetworkPolicy_Provider_value) + proto.RegisterEnum("google.container.v1.Cluster_Status", Cluster_Status_name, Cluster_Status_value) + proto.RegisterEnum("google.container.v1.Operation_Status", Operation_Status_name, Operation_Status_value) + proto.RegisterEnum("google.container.v1.Operation_Type", Operation_Type_name, Operation_Type_value) + proto.RegisterEnum("google.container.v1.SetMasterAuthRequest_Action", SetMasterAuthRequest_Action_name, SetMasterAuthRequest_Action_value) + proto.RegisterEnum("google.container.v1.NodePool_Status", NodePool_Status_name, NodePool_Status_value) +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// ClusterManagerClient is the client API for ClusterManager service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type ClusterManagerClient interface { + // Lists all clusters owned by a project in either the specified zone or all + // zones. + ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) + // Gets the details of a specific cluster. + GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) + // Creates a cluster, consisting of the specified number and type of Google + // Compute Engine instances. + // + // By default, the cluster is created in the project's + // [default network](/compute/docs/networks-and-firewalls#networks). + // + // One firewall is added for the cluster. After cluster creation, + // the cluster creates routes for each node to allow the containers + // on that node to communicate with all other instances in the + // cluster. + // + // Finally, an entry is added to the project's global metadata indicating + // which CIDR range is being used by the cluster. + CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) + // Updates the settings of a specific cluster. + UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) + // Updates the version and/or image type for a specific node pool. + UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the autoscaling settings for a specific node pool. + SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the logging service for a specific cluster. + SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the monitoring service for a specific cluster. + SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the addons for a specific cluster. + SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the locations for a specific cluster. + SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) + // Updates the master for a specific cluster. + UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) + // Used to set master auth materials. Currently supports :- + // Changing the admin password for a specific cluster. + // This can be either via password generation or explicitly set the password. + SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) + // Deletes the cluster, including the Kubernetes endpoint and all worker + // nodes. + // + // Firewalls and routes that were configured during cluster creation + // are also deleted. + // + // Other Google Compute Engine resources that might be in use by the cluster + // (e.g. load balancer resources) will not be deleted if they weren't present + // at the initial create time. + DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) + // Lists all operations in a project in a specific zone or all zones. + ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) + // Gets the specified operation. + GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) + // Cancels the specified operation. + CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) + // Returns configuration info about the Kubernetes Engine service. + GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) + // Lists the node pools for a cluster. + ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) + // Retrieves the node pool requested. + GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) + // Creates a node pool for a cluster. + CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) + // Deletes a node pool from a cluster. + DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) + // Roll back the previously Aborted or Failed NodePool upgrade. + // This will be an no-op if the last upgrade successfully completed. + RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the NodeManagement options for a node pool. + SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets labels on a cluster. + SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) + // Enables or disables the ABAC authorization mechanism on a cluster. + SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) + // Start master IP rotation. + StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) + // Completes master IP rotation. + CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the size for a specific node pool. + SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) + // Enables/Disables Network Policy for a cluster. + SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) + // Sets the maintenance policy for a cluster. + SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) +} + +type clusterManagerClient struct { + cc *grpc.ClientConn +} + +func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient { + return &clusterManagerClient{cc} +} + +func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) { + out := new(ListClustersResponse) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListClusters", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) { + out := new(Cluster) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetCluster", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateCluster", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateCluster", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateNodePool", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLoggingService", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMonitoringService", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetAddonsConfig", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLocations", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateMaster", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMasterAuth", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteCluster", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) { + out := new(ListOperationsResponse) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListOperations", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetOperation", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) { + out := new(empty.Empty) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CancelOperation", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) { + out := new(ServerConfig) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetServerConfig", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) { + out := new(ListNodePoolsResponse) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListNodePools", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) { + out := new(NodePool) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetNodePool", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateNodePool", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteNodePool", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolManagement", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLabels", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLegacyAbac", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/StartIPRotation", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CompleteIPRotation", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolSize", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNetworkPolicy", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) { + out := new(Operation) + err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMaintenancePolicy", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// ClusterManagerServer is the server API for ClusterManager service. +type ClusterManagerServer interface { + // Lists all clusters owned by a project in either the specified zone or all + // zones. + ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error) + // Gets the details of a specific cluster. + GetCluster(context.Context, *GetClusterRequest) (*Cluster, error) + // Creates a cluster, consisting of the specified number and type of Google + // Compute Engine instances. + // + // By default, the cluster is created in the project's + // [default network](/compute/docs/networks-and-firewalls#networks). + // + // One firewall is added for the cluster. After cluster creation, + // the cluster creates routes for each node to allow the containers + // on that node to communicate with all other instances in the + // cluster. + // + // Finally, an entry is added to the project's global metadata indicating + // which CIDR range is being used by the cluster. + CreateCluster(context.Context, *CreateClusterRequest) (*Operation, error) + // Updates the settings of a specific cluster. + UpdateCluster(context.Context, *UpdateClusterRequest) (*Operation, error) + // Updates the version and/or image type for a specific node pool. + UpdateNodePool(context.Context, *UpdateNodePoolRequest) (*Operation, error) + // Sets the autoscaling settings for a specific node pool. + SetNodePoolAutoscaling(context.Context, *SetNodePoolAutoscalingRequest) (*Operation, error) + // Sets the logging service for a specific cluster. + SetLoggingService(context.Context, *SetLoggingServiceRequest) (*Operation, error) + // Sets the monitoring service for a specific cluster. + SetMonitoringService(context.Context, *SetMonitoringServiceRequest) (*Operation, error) + // Sets the addons for a specific cluster. + SetAddonsConfig(context.Context, *SetAddonsConfigRequest) (*Operation, error) + // Sets the locations for a specific cluster. + SetLocations(context.Context, *SetLocationsRequest) (*Operation, error) + // Updates the master for a specific cluster. + UpdateMaster(context.Context, *UpdateMasterRequest) (*Operation, error) + // Used to set master auth materials. Currently supports :- + // Changing the admin password for a specific cluster. + // This can be either via password generation or explicitly set the password. + SetMasterAuth(context.Context, *SetMasterAuthRequest) (*Operation, error) + // Deletes the cluster, including the Kubernetes endpoint and all worker + // nodes. + // + // Firewalls and routes that were configured during cluster creation + // are also deleted. + // + // Other Google Compute Engine resources that might be in use by the cluster + // (e.g. load balancer resources) will not be deleted if they weren't present + // at the initial create time. + DeleteCluster(context.Context, *DeleteClusterRequest) (*Operation, error) + // Lists all operations in a project in a specific zone or all zones. + ListOperations(context.Context, *ListOperationsRequest) (*ListOperationsResponse, error) + // Gets the specified operation. + GetOperation(context.Context, *GetOperationRequest) (*Operation, error) + // Cancels the specified operation. + CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error) + // Returns configuration info about the Kubernetes Engine service. + GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error) + // Lists the node pools for a cluster. + ListNodePools(context.Context, *ListNodePoolsRequest) (*ListNodePoolsResponse, error) + // Retrieves the node pool requested. + GetNodePool(context.Context, *GetNodePoolRequest) (*NodePool, error) + // Creates a node pool for a cluster. + CreateNodePool(context.Context, *CreateNodePoolRequest) (*Operation, error) + // Deletes a node pool from a cluster. + DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error) + // Roll back the previously Aborted or Failed NodePool upgrade. + // This will be an no-op if the last upgrade successfully completed. + RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error) + // Sets the NodeManagement options for a node pool. + SetNodePoolManagement(context.Context, *SetNodePoolManagementRequest) (*Operation, error) + // Sets labels on a cluster. + SetLabels(context.Context, *SetLabelsRequest) (*Operation, error) + // Enables or disables the ABAC authorization mechanism on a cluster. + SetLegacyAbac(context.Context, *SetLegacyAbacRequest) (*Operation, error) + // Start master IP rotation. + StartIPRotation(context.Context, *StartIPRotationRequest) (*Operation, error) + // Completes master IP rotation. + CompleteIPRotation(context.Context, *CompleteIPRotationRequest) (*Operation, error) + // Sets the size for a specific node pool. + SetNodePoolSize(context.Context, *SetNodePoolSizeRequest) (*Operation, error) + // Enables/Disables Network Policy for a cluster. + SetNetworkPolicy(context.Context, *SetNetworkPolicyRequest) (*Operation, error) + // Sets the maintenance policy for a cluster. + SetMaintenancePolicy(context.Context, *SetMaintenancePolicyRequest) (*Operation, error) +} + +func RegisterClusterManagerServer(s *grpc.Server, srv ClusterManagerServer) { + s.RegisterService(&_ClusterManager_serviceDesc, srv) +} + +func _ClusterManager_ListClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListClustersRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).ListClusters(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/ListClusters", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).ListClusters(ctx, req.(*ListClustersRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_GetCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).GetCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/GetCluster", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).GetCluster(ctx, req.(*GetClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_CreateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).CreateCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/CreateCluster", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).CreateCluster(ctx, req.(*CreateClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_UpdateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).UpdateCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/UpdateCluster", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).UpdateCluster(ctx, req.(*UpdateClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_UpdateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateNodePoolRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).UpdateNodePool(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/UpdateNodePool", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).UpdateNodePool(ctx, req.(*UpdateNodePoolRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetNodePoolAutoscaling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetNodePoolAutoscalingRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetNodePoolAutoscaling", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, req.(*SetNodePoolAutoscalingRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetLoggingService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetLoggingServiceRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetLoggingService(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetLoggingService", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetLoggingService(ctx, req.(*SetLoggingServiceRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetMonitoringService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetMonitoringServiceRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetMonitoringService(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetMonitoringService", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetMonitoringService(ctx, req.(*SetMonitoringServiceRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetAddonsConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetAddonsConfigRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetAddonsConfig(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetAddonsConfig", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetAddonsConfig(ctx, req.(*SetAddonsConfigRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetLocationsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetLocations(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetLocations", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetLocations(ctx, req.(*SetLocationsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_UpdateMaster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateMasterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).UpdateMaster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/UpdateMaster", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).UpdateMaster(ctx, req.(*UpdateMasterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetMasterAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetMasterAuthRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetMasterAuth(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetMasterAuth", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetMasterAuth(ctx, req.(*SetMasterAuthRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_DeleteCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).DeleteCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/DeleteCluster", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).DeleteCluster(ctx, req.(*DeleteClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_ListOperations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListOperationsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).ListOperations(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/ListOperations", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).ListOperations(ctx, req.(*ListOperationsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_GetOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetOperationRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).GetOperation(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/GetOperation", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).GetOperation(ctx, req.(*GetOperationRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_CancelOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CancelOperationRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).CancelOperation(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/CancelOperation", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).CancelOperation(ctx, req.(*CancelOperationRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetServerConfigRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).GetServerConfig(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/GetServerConfig", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).GetServerConfig(ctx, req.(*GetServerConfigRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_ListNodePools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListNodePoolsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).ListNodePools(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/ListNodePools", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).ListNodePools(ctx, req.(*ListNodePoolsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_GetNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetNodePoolRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).GetNodePool(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/GetNodePool", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).GetNodePool(ctx, req.(*GetNodePoolRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_CreateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateNodePoolRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).CreateNodePool(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/CreateNodePool", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).CreateNodePool(ctx, req.(*CreateNodePoolRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_DeleteNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteNodePoolRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).DeleteNodePool(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/DeleteNodePool", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).DeleteNodePool(ctx, req.(*DeleteNodePoolRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_RollbackNodePoolUpgrade_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RollbackNodePoolUpgradeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, req.(*RollbackNodePoolUpgradeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetNodePoolManagement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetNodePoolManagementRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetNodePoolManagement", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, req.(*SetNodePoolManagementRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetLabels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetLabelsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetLabels(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetLabels", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetLabels(ctx, req.(*SetLabelsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetLegacyAbac_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetLegacyAbacRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetLegacyAbac(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetLegacyAbac", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetLegacyAbac(ctx, req.(*SetLegacyAbacRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_StartIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StartIPRotationRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).StartIPRotation(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/StartIPRotation", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).StartIPRotation(ctx, req.(*StartIPRotationRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_CompleteIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CompleteIPRotationRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).CompleteIPRotation(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/CompleteIPRotation", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).CompleteIPRotation(ctx, req.(*CompleteIPRotationRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetNodePoolSize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetNodePoolSizeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetNodePoolSize(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetNodePoolSize", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetNodePoolSize(ctx, req.(*SetNodePoolSizeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetNetworkPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetNetworkPolicyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetNetworkPolicy", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, req.(*SetNetworkPolicyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ClusterManager_SetMaintenancePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetMaintenancePolicyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/google.container.v1.ClusterManager/SetMaintenancePolicy", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, req.(*SetMaintenancePolicyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _ClusterManager_serviceDesc = grpc.ServiceDesc{ + ServiceName: "google.container.v1.ClusterManager", + HandlerType: (*ClusterManagerServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "ListClusters", + Handler: _ClusterManager_ListClusters_Handler, + }, + { + MethodName: "GetCluster", + Handler: _ClusterManager_GetCluster_Handler, + }, + { + MethodName: "CreateCluster", + Handler: _ClusterManager_CreateCluster_Handler, + }, + { + MethodName: "UpdateCluster", + Handler: _ClusterManager_UpdateCluster_Handler, + }, + { + MethodName: "UpdateNodePool", + Handler: _ClusterManager_UpdateNodePool_Handler, + }, + { + MethodName: "SetNodePoolAutoscaling", + Handler: _ClusterManager_SetNodePoolAutoscaling_Handler, + }, + { + MethodName: "SetLoggingService", + Handler: _ClusterManager_SetLoggingService_Handler, + }, + { + MethodName: "SetMonitoringService", + Handler: _ClusterManager_SetMonitoringService_Handler, + }, + { + MethodName: "SetAddonsConfig", + Handler: _ClusterManager_SetAddonsConfig_Handler, + }, + { + MethodName: "SetLocations", + Handler: _ClusterManager_SetLocations_Handler, + }, + { + MethodName: "UpdateMaster", + Handler: _ClusterManager_UpdateMaster_Handler, + }, + { + MethodName: "SetMasterAuth", + Handler: _ClusterManager_SetMasterAuth_Handler, + }, + { + MethodName: "DeleteCluster", + Handler: _ClusterManager_DeleteCluster_Handler, + }, + { + MethodName: "ListOperations", + Handler: _ClusterManager_ListOperations_Handler, + }, + { + MethodName: "GetOperation", + Handler: _ClusterManager_GetOperation_Handler, + }, + { + MethodName: "CancelOperation", + Handler: _ClusterManager_CancelOperation_Handler, + }, + { + MethodName: "GetServerConfig", + Handler: _ClusterManager_GetServerConfig_Handler, + }, + { + MethodName: "ListNodePools", + Handler: _ClusterManager_ListNodePools_Handler, + }, + { + MethodName: "GetNodePool", + Handler: _ClusterManager_GetNodePool_Handler, + }, + { + MethodName: "CreateNodePool", + Handler: _ClusterManager_CreateNodePool_Handler, + }, + { + MethodName: "DeleteNodePool", + Handler: _ClusterManager_DeleteNodePool_Handler, + }, + { + MethodName: "RollbackNodePoolUpgrade", + Handler: _ClusterManager_RollbackNodePoolUpgrade_Handler, + }, + { + MethodName: "SetNodePoolManagement", + Handler: _ClusterManager_SetNodePoolManagement_Handler, + }, + { + MethodName: "SetLabels", + Handler: _ClusterManager_SetLabels_Handler, + }, + { + MethodName: "SetLegacyAbac", + Handler: _ClusterManager_SetLegacyAbac_Handler, + }, + { + MethodName: "StartIPRotation", + Handler: _ClusterManager_StartIPRotation_Handler, + }, + { + MethodName: "CompleteIPRotation", + Handler: _ClusterManager_CompleteIPRotation_Handler, + }, + { + MethodName: "SetNodePoolSize", + Handler: _ClusterManager_SetNodePoolSize_Handler, + }, + { + MethodName: "SetNetworkPolicy", + Handler: _ClusterManager_SetNetworkPolicy_Handler, + }, + { + MethodName: "SetMaintenancePolicy", + Handler: _ClusterManager_SetMaintenancePolicy_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "google/container/v1/cluster_service.proto", +} + +func init() { + proto.RegisterFile("google/container/v1/cluster_service.proto", fileDescriptor_cluster_service_ddce0395d8fb4971) +} + +var fileDescriptor_cluster_service_ddce0395d8fb4971 = []byte{ + // 5271 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x3c, 0x6d, 0x8c, 0x24, 0xd7, + 0x51, 0xe9, 0xd9, 0xd9, 0xd9, 0x9d, 0x9a, 0xd9, 0xd9, 0xd9, 0xb7, 0x1f, 0x37, 0x1e, 0xdf, 0xd9, + 0x77, 0x1d, 0x9f, 0x7d, 0xb7, 0xb6, 0x77, 0x7c, 0xe7, 0xef, 0xf3, 0xd9, 0xf1, 0xdc, 0xec, 0x78, + 0x6f, 0x7c, 0xfb, 0x31, 0xe9, 0xd9, 0xbd, 0x93, 0x0f, 0x93, 0x56, 0xef, 0x4c, 0xdf, 0x6c, 0x7b, + 0x7b, 0xba, 0x3b, 0xdd, 0x3d, 0x67, 0xef, 0x9d, 0x0e, 0xf1, 0x91, 0x04, 0x83, 0x63, 0x93, 0x90, + 0x04, 0xa4, 0xf0, 0x21, 0x02, 0x24, 0x28, 0x01, 0x41, 0x88, 0x88, 0x04, 0x02, 0x21, 0x21, 0xf1, + 0x83, 0x00, 0x12, 0x08, 0x90, 0x85, 0x90, 0xf8, 0x87, 0x10, 0x41, 0x42, 0x22, 0xc0, 0x1f, 0x04, + 0x88, 0xe8, 0x7d, 0x74, 0xf7, 0xeb, 0x99, 0xee, 0x99, 0x9d, 0xdd, 0xbb, 0xcd, 0xfd, 0xba, 0xed, + 0x7a, 0xaf, 0xde, 0xab, 0xaa, 0x57, 0xaf, 0xaa, 0x5e, 0x55, 0xcd, 0xc1, 0xd9, 0xb6, 0x69, 0xb6, + 0x75, 0xb5, 0xd4, 0x34, 0x0d, 0x57, 0xd1, 0x0c, 0xd5, 0x2e, 0xdd, 0x3c, 0x57, 0x6a, 0xea, 0x5d, + 0xc7, 0x55, 0x6d, 0xd9, 0x51, 0xed, 0x9b, 0x5a, 0x53, 0x5d, 0xb2, 0x6c, 0xd3, 0x35, 0xd1, 0x2c, + 0x9d, 0xba, 0xe4, 0x4f, 0x5d, 0xba, 0x79, 0xae, 0x78, 0x9c, 0xe1, 0x2b, 0x96, 0x56, 0x52, 0x0c, + 0xc3, 0x74, 0x15, 0x57, 0x33, 0x0d, 0x87, 0xa2, 0x14, 0x1f, 0x64, 0xa3, 0xe4, 0x6b, 0xbb, 0x7b, + 0xa3, 0xa4, 0x76, 0x2c, 0x77, 0x8f, 0x0e, 0x8a, 0xdf, 0x1e, 0x07, 0x58, 0x37, 0x5b, 0x6a, 0xc5, + 0x34, 0x6e, 0x68, 0x6d, 0x74, 0x0a, 0xb2, 0x1d, 0xa5, 0xb9, 0xa3, 0x19, 0xaa, 0xec, 0xee, 0x59, + 0x6a, 0x41, 0x38, 0x29, 0x9c, 0x49, 0x4b, 0x19, 0x06, 0xdb, 0xdc, 0xb3, 0x54, 0x74, 0x12, 0xb2, + 0x2d, 0xcd, 0xd9, 0x95, 0x1d, 0xed, 0x96, 0x2a, 0xb7, 0xb7, 0x0b, 0x89, 0x93, 0xc2, 0x99, 0x71, + 0x09, 0x30, 0xac, 0xa1, 0xdd, 0x52, 0x57, 0xb6, 0xf1, 0x22, 0xa6, 0xd2, 0x75, 0x77, 0x64, 0xa7, + 0x69, 0x5a, 0xaa, 0x53, 0x18, 0x3b, 0x39, 0x86, 0x17, 0x21, 0xb0, 0x06, 0x01, 0xa1, 0xc7, 0x60, + 0x9a, 0xf1, 0x25, 0x2b, 0xcd, 0xa6, 0xd9, 0x35, 0xdc, 0x42, 0x9a, 0x6c, 0x95, 0x63, 0xe0, 0x32, + 0x85, 0xa2, 0x1a, 0x4c, 0x76, 0x54, 0x57, 0x69, 0x29, 0xae, 0x52, 0x48, 0x9e, 0x1c, 0x3b, 0x93, + 0x39, 0xff, 0xe4, 0x52, 0x84, 0x08, 0x96, 0x02, 0x1e, 0x96, 0xd6, 0xd8, 0xfc, 0xaa, 0xe1, 0xda, + 0x7b, 0x92, 0x8f, 0x8e, 0x4e, 0x00, 0x68, 0x1d, 0xa5, 0xcd, 0x38, 0x1b, 0x27, 0xdb, 0xa5, 0x09, + 0x84, 0xf0, 0x55, 0x81, 0x94, 0xae, 0x6c, 0xab, 0xba, 0x53, 0x48, 0x91, 0x7d, 0x1e, 0x1f, 0xb6, + 0xcf, 0x2a, 0x99, 0x4d, 0x77, 0x61, 0xa8, 0xe8, 0x51, 0x98, 0xd6, 0xcd, 0xa6, 0xa2, 0xcb, 0x8e, + 0xd3, 0x92, 0x29, 0x5f, 0x13, 0x44, 0x3e, 0x53, 0x04, 0xdc, 0x70, 0x5a, 0x15, 0xc2, 0x16, 0x82, + 0xa4, 0xab, 0xb4, 0x9d, 0xc2, 0x24, 0x11, 0x0d, 0xf9, 0x1b, 0x9d, 0x84, 0x8c, 0x65, 0xab, 0xf8, + 0x70, 0xb4, 0x6d, 0x5d, 0x2d, 0xc0, 0x49, 0xe1, 0xcc, 0xa4, 0xc4, 0x83, 0xd0, 0xeb, 0x90, 0x55, + 0x9a, 0x4d, 0x55, 0x57, 0x6d, 0xc5, 0x35, 0x6d, 0xa7, 0x90, 0x21, 0x84, 0x3e, 0x1a, 0x49, 0x68, + 0x39, 0x98, 0x48, 0xe9, 0x95, 0x42, 0xb8, 0xe8, 0x41, 0x48, 0x93, 0x63, 0x24, 0xc2, 0xc8, 0x12, + 0x61, 0x4c, 0x62, 0x00, 0x91, 0xc5, 0x19, 0xc8, 0x77, 0x34, 0x43, 0x6e, 0x5a, 0x5d, 0xd9, 0xd2, + 0x15, 0xf7, 0x86, 0x69, 0x77, 0x0a, 0x53, 0xf4, 0x7c, 0x3a, 0x9a, 0x51, 0xb1, 0xba, 0x75, 0x06, + 0x2d, 0xbe, 0x04, 0x53, 0x21, 0x79, 0xa3, 0x3c, 0x8c, 0xed, 0xaa, 0x7b, 0x4c, 0x71, 0xf0, 0x9f, + 0x68, 0x0e, 0xc6, 0x6f, 0x2a, 0x7a, 0x57, 0x25, 0x9a, 0x92, 0x96, 0xe8, 0xc7, 0x85, 0xc4, 0x0b, + 0x42, 0xf1, 0x45, 0xc8, 0x70, 0x42, 0x1c, 0x05, 0x55, 0xfc, 0x56, 0x02, 0x60, 0x4d, 0xc1, 0x17, + 0xa4, 0xdc, 0x75, 0x77, 0x50, 0x11, 0x26, 0xbb, 0x8e, 0x6a, 0x1b, 0x4a, 0xc7, 0xd3, 0x59, 0xff, + 0x1b, 0x8f, 0x59, 0x8a, 0xe3, 0xbc, 0x6d, 0xda, 0x2d, 0xb6, 0x8e, 0xff, 0x8d, 0x76, 0xe0, 0x81, + 0xa6, 0xae, 0xa9, 0x86, 0x2b, 0x37, 0x55, 0xdb, 0xd5, 0x6e, 0x68, 0x4d, 0xc5, 0x55, 0xe5, 0x26, + 0x11, 0x58, 0x61, 0xec, 0xa4, 0x70, 0x26, 0x73, 0xfe, 0x89, 0x48, 0xf1, 0x56, 0x08, 0x56, 0x25, + 0x40, 0x62, 0x42, 0x3e, 0xd6, 0x8c, 0x1e, 0x40, 0xcf, 0xc0, 0x82, 0x77, 0xa3, 0x9b, 0x0a, 0xbf, + 0x5b, 0xa1, 0x45, 0x68, 0x9a, 0x63, 0xa3, 0x15, 0x85, 0xc3, 0x45, 0x4f, 0x02, 0xea, 0xa7, 0xaf, + 0xa0, 0x12, 0x8c, 0x99, 0xbe, 0xad, 0xb0, 0x8a, 0xb3, 0xe9, 0x58, 0x90, 0x37, 0xa8, 0x8a, 0x53, + 0xc8, 0x15, 0x75, 0x4f, 0x6c, 0xc0, 0xb1, 0x18, 0xba, 0xd1, 0x0b, 0x50, 0xd0, 0x1c, 0xa7, 0xab, + 0xca, 0x11, 0xdb, 0x09, 0x44, 0x13, 0x17, 0xc8, 0x78, 0x1f, 0xbe, 0xf8, 0xc1, 0x18, 0x64, 0xcb, + 0xad, 0x96, 0x69, 0x38, 0x6c, 0xa9, 0xab, 0x30, 0xbb, 0xe3, 0xba, 0x96, 0xac, 0x9b, 0x4a, 0x4b, + 0xde, 0x56, 0x74, 0xc5, 0x68, 0x6a, 0x46, 0x9b, 0xac, 0x12, 0xa7, 0xac, 0x97, 0x5d, 0xd7, 0x5a, + 0x35, 0x95, 0xd6, 0x25, 0x6f, 0xb6, 0x34, 0xb3, 0xd3, 0x0b, 0x42, 0xbb, 0x50, 0xdc, 0x31, 0x6d, + 0xed, 0x16, 0x46, 0xd4, 0x65, 0xcb, 0x6c, 0xc9, 0x4a, 0xd7, 0x35, 0x9d, 0xa6, 0xa2, 0xe3, 0xe5, + 0x13, 0x64, 0xf9, 0x68, 0xe3, 0x70, 0xd9, 0x47, 0xab, 0x9b, 0xad, 0x72, 0x80, 0x24, 0x15, 0x76, + 0x62, 0x46, 0xd0, 0x0f, 0xc1, 0xdc, 0x6e, 0x77, 0x5b, 0xb5, 0x0d, 0xd5, 0x55, 0x1d, 0xb9, 0xa5, + 0x38, 0x3b, 0xdb, 0xa6, 0x62, 0xb7, 0x98, 0x4e, 0x9c, 0x89, 0xdc, 0xe6, 0x8a, 0x8f, 0xb0, 0xec, + 0xcd, 0x97, 0x66, 0x77, 0xfb, 0x81, 0xe8, 0x4d, 0x98, 0x37, 0x54, 0xf7, 0x6d, 0xd3, 0xde, 0x95, + 0x2d, 0x53, 0xd7, 0x9a, 0x7b, 0x9e, 0xc6, 0x25, 0x07, 0xac, 0xbe, 0x4e, 0x31, 0xea, 0x04, 0x81, + 0x69, 0xdb, 0xac, 0xd1, 0x0f, 0x14, 0x4b, 0x30, 0xd3, 0x27, 0x4f, 0x7c, 0x09, 0x5a, 0x9a, 0xa3, + 0x6c, 0xeb, 0x6a, 0x8b, 0x9d, 0xa7, 0xff, 0x2d, 0x3e, 0x07, 0x85, 0x38, 0x09, 0x0d, 0xc4, 0x3b, + 0x07, 0xb3, 0x11, 0x2c, 0x0f, 0x43, 0x89, 0xe0, 0x63, 0x20, 0xca, 0x4f, 0x25, 0x60, 0xae, 0x6e, + 0x6b, 0x37, 0xb1, 0xae, 0xb2, 0x2b, 0x42, 0x91, 0x9e, 0x82, 0x39, 0xd5, 0xc0, 0x73, 0x64, 0x8b, + 0x0e, 0xcb, 0x86, 0xd9, 0x52, 0x1d, 0xb6, 0x00, 0xa2, 0x63, 0x0c, 0x13, 0x9b, 0x6d, 0x07, 0x3d, + 0x07, 0xc7, 0x7a, 0x30, 0x54, 0xa3, 0x65, 0x99, 0x9a, 0xe1, 0x12, 0xf5, 0x99, 0x94, 0xe6, 0x43, + 0x48, 0x55, 0x36, 0x88, 0x9e, 0x86, 0x85, 0x0e, 0xb1, 0x35, 0xb2, 0x66, 0xdd, 0x7c, 0x46, 0x6e, + 0x6a, 0x2d, 0x5b, 0xde, 0xd6, 0xcd, 0xe6, 0x2e, 0x51, 0x87, 0xb4, 0x34, 0x4b, 0x47, 0x6b, 0xd6, + 0xcd, 0x67, 0x2a, 0x5a, 0xcb, 0xbe, 0x84, 0x87, 0xd0, 0x59, 0xc8, 0xf7, 0xed, 0x92, 0x24, 0xd3, + 0xa7, 0xad, 0x9e, 0xf5, 0x1f, 0x83, 0x69, 0xab, 0xbb, 0xad, 0x6b, 0xcd, 0x60, 0x26, 0x75, 0x4f, + 0x39, 0x0a, 0xf6, 0x26, 0x8a, 0xdf, 0x15, 0xe0, 0xa1, 0xc0, 0xea, 0xe1, 0x33, 0x53, 0x5b, 0x4c, + 0x9e, 0xde, 0xed, 0x2b, 0xc0, 0x04, 0x65, 0xc2, 0x93, 0xa4, 0xf7, 0x89, 0x3e, 0x01, 0x99, 0x80, + 0x72, 0xa7, 0x90, 0x20, 0xce, 0xe3, 0xe5, 0x48, 0x5d, 0x1b, 0xbc, 0xc7, 0x92, 0xcf, 0xa4, 0x04, + 0x4d, 0xef, 0x4f, 0xa7, 0xb8, 0x06, 0xe9, 0x80, 0xfb, 0x53, 0x24, 0x4a, 0xb0, 0x74, 0x65, 0x4f, + 0xe6, 0x8c, 0x72, 0x86, 0xc1, 0xd6, 0xb1, 0x5d, 0xc6, 0xc6, 0x2a, 0x90, 0x64, 0x82, 0x19, 0x2b, + 0x6f, 0x05, 0xf1, 0x51, 0x80, 0x55, 0xb5, 0xad, 0x34, 0xf7, 0xca, 0xdb, 0x4a, 0x33, 0x9e, 0x2d, + 0xf1, 0xd7, 0x05, 0x98, 0x0a, 0xe9, 0x14, 0x5a, 0x81, 0x49, 0xcb, 0x36, 0x6f, 0x6a, 0x2d, 0xd5, + 0x26, 0x93, 0x73, 0x71, 0xbe, 0x9c, 0xc7, 0x5a, 0xaa, 0x33, 0x14, 0xc9, 0x47, 0xe6, 0x37, 0x4d, + 0x84, 0x37, 0x7d, 0x0a, 0x26, 0xeb, 0xc1, 0xac, 0xb9, 0xba, 0xb4, 0x71, 0xb5, 0xb6, 0x5c, 0x95, + 0xe4, 0xad, 0xf5, 0x46, 0xbd, 0x5a, 0xa9, 0xbd, 0x56, 0xab, 0x2e, 0xe7, 0x3f, 0x82, 0x00, 0x52, + 0x95, 0xf2, 0x6a, 0xad, 0xb2, 0x91, 0x17, 0xc4, 0x3f, 0x49, 0x02, 0xaa, 0xd5, 0xcb, 0x3a, 0x8e, + 0x03, 0x70, 0x74, 0xc6, 0x68, 0x7d, 0x04, 0x72, 0x5d, 0x47, 0x95, 0x35, 0x4b, 0x56, 0x74, 0x4d, + 0x71, 0x7c, 0xf5, 0xcd, 0x76, 0x1d, 0xb5, 0x66, 0x95, 0x29, 0x0c, 0x3d, 0x0e, 0x33, 0x4d, 0x5b, + 0xc5, 0xaa, 0xe4, 0x74, 0xb7, 0xd9, 0x9d, 0x67, 0x24, 0xe5, 0xe9, 0x40, 0xc3, 0x87, 0x93, 0xd8, + 0xca, 0xff, 0xa2, 0xd2, 0x1f, 0x63, 0xb1, 0x95, 0x0f, 0x26, 0x07, 0xb0, 0x04, 0x33, 0x9e, 0x4b, + 0xf2, 0xf5, 0x9a, 0xaa, 0xe8, 0xa5, 0x44, 0x41, 0x90, 0xa6, 0xd9, 0xa0, 0xa7, 0xd6, 0xe8, 0x0c, + 0xe4, 0xf0, 0x0d, 0xe3, 0x26, 0x8f, 0xfb, 0x93, 0xb3, 0x78, 0xc4, 0x9f, 0xf9, 0x14, 0x20, 0x16, + 0xc7, 0x39, 0xdc, 0xec, 0x94, 0x3f, 0x3b, 0xef, 0x8d, 0xfa, 0x18, 0x1f, 0x83, 0xe3, 0x41, 0xc0, + 0xdb, 0x34, 0x8d, 0x96, 0x62, 0xef, 0xc9, 0xb6, 0x62, 0xb4, 0x55, 0xca, 0xc1, 0x04, 0xe1, 0xe0, + 0x01, 0x36, 0xa7, 0xe1, 0x4d, 0x91, 0xf0, 0x0c, 0xc2, 0x4c, 0x19, 0x4e, 0xf8, 0x5b, 0x46, 0xae, + 0x30, 0x49, 0x56, 0x28, 0x7a, 0x93, 0x22, 0x96, 0x78, 0x16, 0x8e, 0xf5, 0xc9, 0x83, 0x69, 0x67, + 0x3a, 0xe4, 0xa3, 0xc3, 0x17, 0xbd, 0x04, 0x73, 0x61, 0xb1, 0x30, 0x1c, 0xa0, 0x5e, 0x9a, 0x17, + 0x0c, 0x45, 0x78, 0x1e, 0x0a, 0xfd, 0xd2, 0x61, 0x48, 0x19, 0x82, 0x34, 0xdf, 0x2b, 0x1f, 0x7a, + 0x25, 0xbe, 0x39, 0x03, 0x13, 0xcc, 0x06, 0xe2, 0x08, 0x92, 0xbb, 0x58, 0xe4, 0x6f, 0x1c, 0x41, + 0xb6, 0x54, 0xa7, 0x69, 0x6b, 0x16, 0xd6, 0x30, 0x76, 0xa5, 0x78, 0x10, 0x7a, 0x02, 0x90, 0x66, + 0x68, 0xae, 0xa6, 0xe8, 0xc4, 0x58, 0xb2, 0x10, 0x75, 0x8c, 0x84, 0xa8, 0x79, 0x36, 0x42, 0x43, + 0x5c, 0x1c, 0xa5, 0xbe, 0x0a, 0x19, 0x36, 0x8b, 0xf3, 0x4e, 0x0f, 0x0f, 0x89, 0x8b, 0x25, 0x30, + 0x82, 0xf7, 0xc4, 0xab, 0x90, 0x61, 0x96, 0x13, 0x07, 0xff, 0x44, 0x5f, 0xe2, 0x56, 0x08, 0x6c, + 0x8e, 0x04, 0x9d, 0x20, 0xb2, 0x7b, 0x0c, 0x47, 0xd4, 0xed, 0xb6, 0x66, 0xb4, 0xbd, 0x97, 0x10, + 0xd5, 0x23, 0x29, 0xc7, 0xc0, 0x0d, 0x0a, 0xc5, 0xa1, 0x52, 0xc7, 0x34, 0x34, 0xd7, 0xb4, 0xf9, + 0xb9, 0x54, 0x6f, 0x66, 0x82, 0x11, 0x6f, 0x7a, 0x01, 0x26, 0xbc, 0x8b, 0x44, 0x35, 0xc3, 0xfb, + 0x44, 0x8b, 0x51, 0xd7, 0x82, 0x2a, 0x40, 0xdf, 0x95, 0x78, 0x0d, 0xa6, 0x14, 0x12, 0xfb, 0x78, + 0x32, 0x02, 0xc2, 0xe1, 0xa9, 0xe8, 0x90, 0x9c, 0x8b, 0x92, 0xa4, 0xac, 0xc2, 0xc7, 0x4c, 0x0f, + 0x01, 0x70, 0x37, 0x9b, 0x2a, 0x01, 0x07, 0x41, 0x17, 0x81, 0x48, 0x55, 0xb6, 0x4c, 0x53, 0x77, + 0x0a, 0x59, 0x62, 0xba, 0x4f, 0xc4, 0x1e, 0x44, 0xdd, 0x34, 0x75, 0x29, 0x6d, 0xb0, 0xbf, 0x1c, + 0x74, 0x1c, 0xd2, 0x9e, 0xd9, 0x71, 0x0a, 0x53, 0xe4, 0xc9, 0x11, 0x00, 0x38, 0xaf, 0xc8, 0x45, + 0x3c, 0x8a, 0x6e, 0xed, 0x28, 0x85, 0x1c, 0xef, 0x15, 0x03, 0x5f, 0x5f, 0xc6, 0x83, 0xe8, 0x0d, + 0x98, 0xb6, 0x55, 0xc7, 0xec, 0xda, 0x4d, 0x55, 0x66, 0x2f, 0xa7, 0x69, 0x42, 0xd8, 0x53, 0x31, + 0x11, 0x33, 0x11, 0xdd, 0x92, 0xc4, 0x70, 0xf8, 0xe7, 0x53, 0xce, 0x0e, 0x01, 0xb1, 0xbd, 0x23, + 0x2b, 0xca, 0x37, 0x34, 0xa3, 0xad, 0xda, 0x96, 0x8d, 0x5d, 0x62, 0x9e, 0x48, 0x25, 0x4f, 0x06, + 0x5e, 0x0b, 0xe0, 0x58, 0xc7, 0x74, 0xe2, 0x28, 0x64, 0x65, 0x5b, 0x69, 0x16, 0xd0, 0x00, 0x1d, + 0x0b, 0x1c, 0x8a, 0x04, 0x7a, 0xe0, 0x5c, 0x6a, 0x90, 0x0b, 0xc7, 0x63, 0x85, 0x59, 0xb2, 0x88, + 0x38, 0xdc, 0x6d, 0x48, 0x53, 0xa1, 0x10, 0x0c, 0xbd, 0x01, 0x73, 0xc4, 0x96, 0x7b, 0xe2, 0xf5, + 0x16, 0x9c, 0x23, 0x0b, 0x3e, 0x16, 0xb9, 0x60, 0xbf, 0x5b, 0x90, 0x90, 0x66, 0xf5, 0xb9, 0x8a, + 0x1f, 0x81, 0x53, 0xdc, 0x5d, 0xa2, 0x8e, 0x59, 0x66, 0xbb, 0xfb, 0xfa, 0xb7, 0x40, 0xf6, 0x79, + 0xfa, 0x00, 0x5e, 0x5d, 0x7a, 0xa8, 0x33, 0x38, 0xb2, 0xd8, 0x02, 0xd4, 0x51, 0x34, 0xc3, 0x55, + 0x0d, 0xc5, 0x68, 0xaa, 0x1e, 0x63, 0xc7, 0x06, 0x84, 0xf5, 0x6b, 0xc1, 0x74, 0xc6, 0xd7, 0x4c, + 0xa7, 0x17, 0xc4, 0x0b, 0x9f, 0xf1, 0xf0, 0xe0, 0x70, 0xe1, 0x33, 0x92, 0x3d, 0xe1, 0x33, 0x0a, + 0x65, 0x58, 0xf0, 0x42, 0x2e, 0xff, 0xad, 0x45, 0x97, 0x3c, 0x4d, 0x96, 0x3c, 0x1b, 0xb9, 0x64, + 0x54, 0x70, 0x29, 0xcd, 0x59, 0x51, 0x21, 0xe7, 0x83, 0x90, 0x76, 0x54, 0xfd, 0x86, 0xac, 0x6b, + 0xc6, 0x2e, 0x7b, 0xb7, 0x4d, 0x62, 0xc0, 0xaa, 0x66, 0xec, 0xa2, 0x05, 0x48, 0xde, 0x32, 0x0d, + 0xf6, 0x3a, 0x23, 0x6e, 0x8e, 0x7c, 0xe3, 0xe0, 0xd6, 0x0f, 0xeb, 0xe8, 0x93, 0xcc, 0xff, 0xc6, + 0x77, 0xcf, 0xb3, 0xc7, 0x1e, 0xc5, 0x37, 0x55, 0xdb, 0xc1, 0xd6, 0xbb, 0x4d, 0x3d, 0x01, 0x1b, + 0x66, 0x74, 0x5c, 0xa5, 0x83, 0xe4, 0x35, 0xd9, 0xb5, 0x6d, 0xfc, 0x52, 0x63, 0x3a, 0xe1, 0xa1, + 0xed, 0x30, 0x4f, 0x45, 0x47, 0xe9, 0x91, 0x07, 0x58, 0x1e, 0x9c, 0x5a, 0x7f, 0x0f, 0x47, 0xf3, + 0x29, 0x46, 0x6c, 0x1c, 0x5b, 0x11, 0x0f, 0xeb, 0x61, 0xc8, 0xb0, 0xe0, 0xc3, 0xd5, 0x3a, 0x6a, + 0xe1, 0x2d, 0x6a, 0x9c, 0x28, 0x68, 0x53, 0xeb, 0xa8, 0xe8, 0x25, 0x48, 0x39, 0xae, 0xe2, 0x76, + 0x9d, 0xc2, 0x2e, 0x89, 0xb6, 0x3e, 0x3a, 0xf0, 0xfe, 0x37, 0xc8, 0x54, 0x89, 0xa1, 0xa0, 0xd3, + 0x90, 0xa3, 0x7f, 0xc9, 0x1d, 0xd5, 0x71, 0x94, 0xb6, 0x5a, 0xd0, 0xc9, 0x06, 0x53, 0x14, 0xba, + 0x46, 0x81, 0xe8, 0x49, 0x98, 0xed, 0x71, 0xb2, 0x8e, 0x76, 0x4b, 0x2d, 0x74, 0xa8, 0xe7, 0xe2, + 0x7d, 0x6c, 0x43, 0xbb, 0xa5, 0x62, 0x3f, 0x17, 0x11, 0x80, 0x18, 0xd4, 0x82, 0xf4, 0x05, 0x1f, + 0xe7, 0x61, 0x56, 0x33, 0x1c, 0x97, 0xa8, 0x75, 0xdb, 0x36, 0xbb, 0x96, 0xdc, 0xb5, 0x75, 0xa7, + 0x60, 0x62, 0x4b, 0x49, 0xc4, 0x32, 0xe3, 0x0d, 0xaf, 0xe0, 0xd1, 0x2d, 0x5b, 0x77, 0xf0, 0x0e, + 0x21, 0x59, 0x52, 0x4f, 0x6a, 0x51, 0x7a, 0x38, 0x29, 0x52, 0x4f, 0xfa, 0x30, 0x64, 0xd4, 0x77, + 0x2c, 0xcd, 0x66, 0x32, 0xfc, 0x24, 0x95, 0x21, 0x05, 0x11, 0x19, 0x16, 0x61, 0xd2, 0xbb, 0xee, + 0x05, 0x9b, 0x2a, 0x89, 0xf7, 0x5d, 0x2c, 0xc3, 0x6c, 0x84, 0xd1, 0x1c, 0x29, 0x5d, 0xf2, 0x36, + 0xa4, 0xa8, 0xdc, 0xd1, 0x02, 0xa0, 0xc6, 0x66, 0x79, 0x73, 0xab, 0xd1, 0x13, 0xab, 0xe6, 0x21, + 0x4b, 0xa2, 0xd8, 0x46, 0x6d, 0x63, 0xbd, 0xb6, 0xbe, 0x92, 0x17, 0x50, 0x06, 0x26, 0xa4, 0xad, + 0x75, 0xf2, 0x91, 0x40, 0xd3, 0x90, 0x91, 0xaa, 0x95, 0x8d, 0xf5, 0x4a, 0x6d, 0x15, 0x03, 0xc6, + 0x50, 0x16, 0x26, 0x1b, 0x9b, 0x1b, 0xf5, 0x3a, 0xfe, 0x4a, 0xa2, 0x34, 0x8c, 0x57, 0x25, 0x69, + 0x43, 0xca, 0x8f, 0xe3, 0x81, 0xe5, 0xea, 0x8a, 0x54, 0x5e, 0xae, 0x2e, 0xe7, 0x53, 0xe2, 0x97, + 0xc6, 0x61, 0x8a, 0x9d, 0xfc, 0x96, 0xd5, 0x52, 0x5c, 0x15, 0x3f, 0xdb, 0x5a, 0xaa, 0xa3, 0xd9, + 0xd8, 0x78, 0xf1, 0x4a, 0x48, 0xdf, 0x46, 0x88, 0x8d, 0xf1, 0x0a, 0x78, 0x11, 0x8a, 0x1e, 0x46, + 0x84, 0x87, 0xa7, 0x2f, 0xa5, 0x02, 0x9b, 0xb1, 0xd6, 0xe7, 0xe8, 0xb7, 0x60, 0xde, 0xc3, 0x0e, + 0xbb, 0xea, 0xd4, 0x7e, 0x5d, 0xf5, 0x2c, 0xc3, 0x0f, 0x65, 0x39, 0x4a, 0x3d, 0x6c, 0x60, 0xcf, + 0x2c, 0x6b, 0x2d, 0x2f, 0xe0, 0xe0, 0xd8, 0xc0, 0x3e, 0xb8, 0xd6, 0xc2, 0x0a, 0xe3, 0x21, 0x70, + 0x69, 0x48, 0x1a, 0x7b, 0xe4, 0xd9, 0x48, 0xcd, 0xcf, 0x46, 0xee, 0xc2, 0x89, 0xfe, 0xe5, 0xf9, + 0x7c, 0x47, 0x7a, 0x50, 0xaa, 0x80, 0xed, 0xca, 0xa7, 0x3a, 0x8a, 0x3d, 0x14, 0xf1, 0x8f, 0xfc, + 0xc7, 0xc1, 0xa3, 0x57, 0x0e, 0xe2, 0x04, 0x20, 0x71, 0x82, 0x47, 0xd9, 0xaa, 0x1f, 0x2e, 0xbc, + 0x2f, 0xc0, 0x59, 0xff, 0x38, 0x86, 0xfa, 0xa3, 0xec, 0xc1, 0xfd, 0xd1, 0x69, 0xef, 0x48, 0x07, + 0xbb, 0xa5, 0x67, 0x60, 0xa1, 0x87, 0x1c, 0x4f, 0xa3, 0x58, 0x62, 0x2d, 0xb4, 0x0c, 0xd3, 0x29, + 0xf1, 0xbb, 0x29, 0x48, 0x6f, 0x58, 0xaa, 0x4d, 0x98, 0x8a, 0x0c, 0xa6, 0x3d, 0x73, 0x9e, 0xe8, + 0x31, 0xe7, 0xaf, 0x43, 0xce, 0xf4, 0x10, 0xe9, 0x19, 0x8e, 0x0d, 0xb0, 0x7a, 0xfe, 0x1e, 0x4b, + 0xf8, 0x58, 0xa5, 0x29, 0x1f, 0x95, 0x9c, 0xf2, 0xcb, 0xbe, 0xe5, 0x4c, 0x92, 0x35, 0x4e, 0x0f, + 0x59, 0xa3, 0xc7, 0x76, 0x2e, 0x40, 0xaa, 0xa5, 0xba, 0x8a, 0xa6, 0x33, 0x35, 0x62, 0x5f, 0x11, + 0x36, 0x75, 0x3c, 0xca, 0xa6, 0x86, 0xbc, 0x59, 0xaa, 0xc7, 0x9b, 0x3d, 0x0c, 0x19, 0x57, 0xb1, + 0xdb, 0xaa, 0x4b, 0x87, 0xa9, 0x5a, 0x03, 0x05, 0x91, 0x09, 0xbc, 0xc5, 0x4a, 0x87, 0x2d, 0x16, + 0x7e, 0xda, 0x3b, 0xae, 0x62, 0xbb, 0xd4, 0xda, 0xd1, 0x87, 0x50, 0x9a, 0x40, 0x88, 0xb1, 0x7b, + 0x80, 0x78, 0x44, 0x3a, 0x48, 0x63, 0xdd, 0x09, 0xd5, 0x68, 0xe1, 0x21, 0x51, 0x1a, 0x6a, 0xa8, + 0x32, 0x30, 0x51, 0xaf, 0xae, 0x2f, 0x47, 0xd8, 0xa8, 0x49, 0x48, 0x2e, 0x6f, 0xac, 0x57, 0xa9, + 0x71, 0x2a, 0x5f, 0xda, 0x90, 0x36, 0x89, 0x71, 0x12, 0xff, 0x2f, 0x01, 0x49, 0x22, 0xee, 0x39, + 0xc8, 0x6f, 0xbe, 0x51, 0xaf, 0xf6, 0x2c, 0x88, 0x20, 0x57, 0x91, 0xaa, 0xe5, 0xcd, 0xaa, 0x5c, + 0x59, 0xdd, 0x6a, 0x6c, 0x56, 0xa5, 0xbc, 0x80, 0x61, 0xcb, 0xd5, 0xd5, 0x2a, 0x07, 0x4b, 0x60, + 0xd8, 0x56, 0x9d, 0x18, 0x36, 0x79, 0xad, 0x4c, 0x60, 0x63, 0x68, 0x06, 0xa6, 0x3c, 0xd8, 0xfa, + 0xc6, 0x72, 0xb5, 0x91, 0x4f, 0xe2, 0x69, 0x52, 0xb5, 0x5e, 0xae, 0x49, 0x3e, 0xea, 0x38, 0x45, + 0x5d, 0xe6, 0xb7, 0x48, 0x61, 0x62, 0xd8, 0xb6, 0x18, 0x53, 0xae, 0x6f, 0x6c, 0xac, 0xe6, 0x27, + 0x30, 0x94, 0x6d, 0x1c, 0x40, 0x27, 0xd1, 0x71, 0x28, 0x34, 0xaa, 0x9b, 0x01, 0x48, 0x5e, 0x2b, + 0xaf, 0x97, 0x57, 0xaa, 0x6b, 0xd5, 0xf5, 0xcd, 0x7c, 0x1a, 0xcd, 0xc3, 0x4c, 0x79, 0x6b, 0x73, + 0x43, 0x66, 0xdb, 0x52, 0x42, 0x00, 0x0b, 0x90, 0x80, 0xc3, 0x04, 0x66, 0x50, 0x0e, 0x00, 0x2f, + 0xb6, 0x5a, 0xbe, 0x54, 0x5d, 0x6d, 0xe4, 0xb3, 0x68, 0x16, 0xa6, 0xf1, 0x37, 0xe5, 0x49, 0x2e, + 0x6f, 0x6d, 0x5e, 0xce, 0x4f, 0x11, 0xe9, 0x87, 0x76, 0x6c, 0xd4, 0xae, 0x57, 0xf3, 0x39, 0x1f, + 0x5e, 0xdd, 0xbc, 0xb6, 0x21, 0x5d, 0x91, 0xeb, 0x1b, 0xab, 0xb5, 0xca, 0x1b, 0xf9, 0x69, 0x54, + 0x84, 0x05, 0xba, 0x48, 0x6d, 0x7d, 0xb3, 0xba, 0x5e, 0x5e, 0xaf, 0x54, 0xbd, 0xb1, 0xbc, 0xf8, + 0x15, 0x01, 0xe6, 0x2a, 0x24, 0x5c, 0x60, 0x9e, 0x40, 0x52, 0x3f, 0xd9, 0x55, 0x1d, 0x17, 0x9d, + 0x02, 0xb0, 0x6c, 0xf3, 0x2d, 0xb5, 0xe9, 0x62, 0xcb, 0x29, 0xf8, 0x17, 0x2d, 0xcd, 0xa0, 0xb5, + 0x56, 0xec, 0x2d, 0x7c, 0x0e, 0x26, 0x58, 0xc0, 0xc4, 0x52, 0xb2, 0xc7, 0x07, 0x05, 0x1d, 0x92, + 0x37, 0x19, 0x5f, 0x19, 0x4b, 0xc1, 0xbe, 0x99, 0x5d, 0x09, 0xf6, 0x25, 0x7e, 0x5a, 0x80, 0x99, + 0x15, 0xd5, 0xbd, 0x7b, 0x04, 0x9e, 0x02, 0xf0, 0x5f, 0x91, 0x34, 0x6d, 0xcc, 0x50, 0xbd, 0x27, + 0x64, 0xcb, 0xb7, 0x3a, 0xe3, 0x81, 0xd5, 0x11, 0xff, 0x54, 0x80, 0x39, 0xea, 0x28, 0x8f, 0x94, + 0x94, 0x0b, 0x90, 0xea, 0x92, 0x5d, 0xd9, 0x23, 0x5f, 0x1c, 0x24, 0x4d, 0x4a, 0x9f, 0xc4, 0x30, + 0x22, 0xd9, 0xf8, 0x9e, 0x00, 0xf3, 0x74, 0x9a, 0xff, 0x1e, 0x3d, 0x12, 0x3e, 0x1e, 0x81, 0x6c, + 0xc8, 0x1b, 0x07, 0xd9, 0x2c, 0x30, 0x02, 0x57, 0x7c, 0x8a, 0xcd, 0xf2, 0x1c, 0x05, 0xa5, 0x9c, + 0xe4, 0x3a, 0xbc, 0x98, 0x23, 0x5c, 0x2c, 0x4c, 0xf5, 0x16, 0x0b, 0x3d, 0x9e, 0x27, 0x39, 0x9e, + 0x7f, 0x22, 0x01, 0x27, 0x1a, 0xaa, 0x1b, 0xe5, 0x7c, 0xef, 0x23, 0xde, 0x5f, 0x87, 0x0c, 0x1f, + 0x46, 0x8c, 0x8f, 0x18, 0x46, 0xf0, 0xc8, 0xbe, 0x14, 0x52, 0x9c, 0x14, 0x7e, 0x57, 0x80, 0x42, + 0x43, 0x75, 0x57, 0x43, 0xc9, 0x99, 0x11, 0x04, 0x80, 0x78, 0x01, 0xec, 0x9f, 0xf9, 0x88, 0x34, + 0x51, 0x32, 0x32, 0x4d, 0x14, 0xa5, 0xad, 0x7f, 0x2c, 0xc0, 0x83, 0x0d, 0xd5, 0xed, 0x8b, 0x1d, + 0x8f, 0xe6, 0xdc, 0xa2, 0x13, 0x57, 0xc9, 0xb8, 0xc4, 0x55, 0x94, 0xd0, 0xff, 0x46, 0x80, 0x85, + 0x86, 0xea, 0x86, 0xa2, 0xd6, 0x23, 0xa1, 0xbd, 0x2f, 0xff, 0x95, 0x3c, 0x58, 0xfe, 0x2b, 0x8a, + 0xa9, 0xaf, 0x0a, 0x30, 0x4b, 0x34, 0x89, 0x45, 0x9e, 0x47, 0xc3, 0x51, 0x28, 0x57, 0x96, 0xec, + 0xcd, 0x95, 0x45, 0xd1, 0xf9, 0xdb, 0x02, 0xcc, 0x52, 0x5b, 0x47, 0x43, 0xcc, 0xa3, 0xa1, 0xf3, + 0x34, 0xe4, 0x7a, 0xc2, 0x5d, 0xaa, 0x31, 0x53, 0x9d, 0xd0, 0x93, 0xdf, 0x23, 0x78, 0x82, 0x23, + 0xf8, 0x1f, 0x13, 0x30, 0x87, 0xd5, 0x3d, 0x48, 0xb8, 0x1e, 0x09, 0xc5, 0x97, 0x21, 0xa5, 0x34, + 0x5d, 0x8f, 0xd2, 0x5c, 0x4c, 0x9a, 0x30, 0x8a, 0xb0, 0xa5, 0x32, 0xc1, 0x93, 0x18, 0x3e, 0x7a, + 0xde, 0xf7, 0x56, 0xfb, 0x4c, 0x28, 0xf7, 0xba, 0x2a, 0x5e, 0x1a, 0x75, 0x48, 0xd1, 0xe5, 0x71, + 0x30, 0xb9, 0xb5, 0x7e, 0x65, 0x7d, 0xe3, 0xda, 0x3a, 0x7d, 0x0f, 0xe3, 0x80, 0xa6, 0x5e, 0x6e, + 0x34, 0xae, 0x6d, 0x48, 0xcb, 0x79, 0x01, 0x87, 0x59, 0x2b, 0xd5, 0xf5, 0xaa, 0x84, 0x43, 0x36, + 0x1f, 0x9c, 0xf0, 0x26, 0x6e, 0x35, 0xaa, 0xd2, 0x7a, 0x79, 0xad, 0x9a, 0x1f, 0x13, 0xdf, 0x15, + 0x60, 0x6e, 0x59, 0xd5, 0xd5, 0x23, 0xf6, 0xe1, 0x1e, 0x73, 0x49, 0x8e, 0xb9, 0x1d, 0x98, 0x5d, + 0xd5, 0x1c, 0x2f, 0xac, 0xb9, 0x1b, 0x57, 0x28, 0x08, 0xa0, 0x92, 0xa1, 0x00, 0xaa, 0x0b, 0x73, + 0xe1, 0x9d, 0x1c, 0xcb, 0x34, 0x1c, 0x15, 0xbd, 0x00, 0x93, 0x8c, 0x44, 0xa7, 0x20, 0x90, 0xf4, + 0xf0, 0xe0, 0x48, 0xcd, 0x9f, 0x8d, 0x3e, 0x0a, 0x53, 0x1d, 0xcd, 0x71, 0xb0, 0x51, 0xc4, 0x3b, + 0xd3, 0x8a, 0x65, 0x5a, 0xca, 0x32, 0xe0, 0x75, 0x0c, 0x13, 0xdf, 0x13, 0x60, 0x76, 0x45, 0x75, + 0xfd, 0x27, 0xd2, 0x5d, 0xe0, 0xf0, 0x34, 0x64, 0x83, 0x07, 0x5e, 0x48, 0xd8, 0x19, 0x1f, 0x1e, + 0x13, 0xbd, 0xbd, 0x05, 0xf3, 0x58, 0x08, 0x3e, 0x35, 0xf7, 0x52, 0xe0, 0x1f, 0x08, 0xb0, 0x50, + 0x51, 0x8c, 0xa6, 0xaa, 0xff, 0x00, 0x99, 0xe7, 0x75, 0xed, 0x0e, 0x2c, 0xf4, 0x32, 0xcf, 0x74, + 0xe0, 0x15, 0x00, 0x1f, 0xd9, 0xd3, 0x82, 0x87, 0x06, 0x3f, 0x75, 0x25, 0x0e, 0x63, 0x7f, 0x9a, + 0xd0, 0x86, 0x85, 0x15, 0xd5, 0xc5, 0x5e, 0xd2, 0x4f, 0xe2, 0x1e, 0x5e, 0x1c, 0x51, 0x7c, 0x7e, + 0x2a, 0x01, 0x59, 0x7e, 0x1b, 0xf4, 0x1c, 0x1c, 0x6b, 0xa9, 0x37, 0x94, 0xae, 0xee, 0xf6, 0x25, + 0x71, 0x69, 0x42, 0x61, 0x9e, 0x0d, 0xf7, 0x24, 0x71, 0x97, 0x60, 0xf6, 0xa6, 0xa2, 0x6b, 0xe1, + 0x3c, 0x98, 0xd7, 0x2e, 0x37, 0x43, 0x86, 0xb8, 0x34, 0x98, 0x43, 0x33, 0x48, 0x74, 0x1f, 0x2e, + 0x36, 0x4d, 0x7a, 0x19, 0x24, 0x32, 0x12, 0x64, 0x90, 0x16, 0x81, 0x2e, 0xc1, 0xcd, 0x75, 0x0a, + 0xe3, 0x64, 0xed, 0x69, 0x32, 0xe0, 0x4f, 0x75, 0xd0, 0x79, 0x98, 0xa7, 0x73, 0xc3, 0x2e, 0x85, + 0xb6, 0xc2, 0xa5, 0x25, 0x4a, 0x66, 0x28, 0x81, 0xe2, 0x88, 0xdf, 0x11, 0x60, 0x9e, 0xbe, 0xea, + 0x8e, 0x36, 0xc4, 0xbf, 0x00, 0x69, 0x3f, 0xcc, 0x65, 0xe1, 0xc6, 0x90, 0x4a, 0xd8, 0xa4, 0x17, + 0xfe, 0x72, 0x77, 0x29, 0x15, 0xba, 0x4b, 0xbf, 0x23, 0xc0, 0x3c, 0xb5, 0xd8, 0xf7, 0xe3, 0x73, + 0x25, 0x2a, 0xe8, 0xf8, 0xac, 0x40, 0xed, 0xad, 0x47, 0xef, 0x11, 0x45, 0x47, 0x71, 0xcf, 0xe7, + 0xdf, 0x12, 0x00, 0xad, 0x04, 0x6f, 0x9f, 0xfb, 0x5d, 0x7a, 0xff, 0x9c, 0x84, 0x49, 0x8f, 0xd6, + 0xc8, 0xe4, 0xdf, 0xf3, 0x90, 0x62, 0x01, 0x6d, 0x62, 0x7f, 0x45, 0x6f, 0x36, 0x7d, 0xc4, 0x02, + 0xfb, 0xc0, 0x7a, 0x52, 0x01, 0x26, 0x3c, 0x33, 0x42, 0x1b, 0xfe, 0xbc, 0x4f, 0x6c, 0x38, 0xa2, + 0xea, 0x15, 0x37, 0xa8, 0xe1, 0xe8, 0xaf, 0x55, 0x5c, 0xf4, 0xd3, 0x8c, 0x6d, 0x12, 0x79, 0x3d, + 0x32, 0xf0, 0xbe, 0x0c, 0xaf, 0xd0, 0xec, 0x44, 0x65, 0x13, 0x7b, 0x1e, 0x96, 0xc9, 0xc3, 0x3c, + 0x2c, 0x2b, 0x00, 0x1d, 0xc5, 0x50, 0xda, 0x6a, 0xc7, 0x53, 0xb5, 0x4c, 0x4c, 0x7e, 0x15, 0x2f, + 0xb5, 0xe6, 0x4f, 0x95, 0x38, 0x34, 0xf1, 0xc7, 0x84, 0xc3, 0x16, 0x3d, 0x16, 0x00, 0xb1, 0x0f, + 0xf9, 0x5a, 0x6d, 0xf3, 0xb2, 0x4c, 0x4b, 0x1c, 0x63, 0xbd, 0xc5, 0x90, 0x64, 0xa8, 0x18, 0x32, + 0x1e, 0x14, 0x43, 0x52, 0xe2, 0xd7, 0x04, 0xc8, 0x85, 0x49, 0x44, 0xa7, 0x20, 0x8b, 0x59, 0x95, + 0xbb, 0x56, 0xdb, 0x56, 0x5a, 0x5e, 0x77, 0x25, 0x61, 0x7f, 0x8b, 0x82, 0xd0, 0xc3, 0x54, 0x94, + 0xb2, 0xad, 0x5a, 0x8a, 0x66, 0xb3, 0x46, 0x1f, 0xc0, 0x20, 0x89, 0x40, 0x50, 0x1d, 0xa6, 0x19, + 0xba, 0x6c, 0x5a, 0x5e, 0xba, 0x3e, 0xbe, 0xc0, 0x5c, 0x0e, 0xd6, 0xde, 0xa0, 0xd3, 0xa5, 0x5c, + 0x37, 0xf4, 0x2d, 0x76, 0x00, 0xf5, 0xcf, 0x42, 0xcf, 0xc2, 0x31, 0x9e, 0x56, 0x99, 0x4b, 0xea, + 0xd2, 0xdb, 0x32, 0xc7, 0x91, 0xdd, 0xf0, 0xf3, 0xbb, 0x43, 0xfb, 0x50, 0xc4, 0x06, 0xcc, 0xf4, + 0x15, 0x87, 0xd1, 0x2b, 0x90, 0x7a, 0x5b, 0x33, 0x5a, 0xe6, 0xdb, 0x03, 0x7b, 0x45, 0x39, 0xbc, + 0x6b, 0x64, 0xb6, 0xc4, 0xb0, 0xc4, 0xcf, 0x08, 0xa1, 0x55, 0xe9, 0x28, 0x6a, 0x43, 0xa1, 0xa5, + 0x68, 0xfa, 0x9e, 0xcc, 0x17, 0xaf, 0xd9, 0x3e, 0xf4, 0x72, 0x47, 0x77, 0x87, 0x2d, 0x63, 0xa4, + 0xbe, 0xe5, 0x2e, 0x7f, 0x44, 0x5a, 0x68, 0x45, 0x8e, 0x5c, 0x9a, 0x84, 0x14, 0xad, 0x89, 0x8b, + 0x0d, 0x58, 0x88, 0xc6, 0xee, 0x49, 0x8c, 0x27, 0x7a, 0x13, 0xe3, 0x45, 0x98, 0x6c, 0x75, 0x69, + 0xd4, 0xc3, 0x7a, 0xb6, 0xfc, 0x6f, 0xf1, 0x7f, 0x04, 0x38, 0xce, 0xa5, 0x97, 0x38, 0xa5, 0xbf, + 0x8f, 0x8c, 0xed, 0xdd, 0xb8, 0xb8, 0x91, 0xaf, 0xb4, 0xbf, 0xa2, 0x19, 0x0e, 0x8f, 0xfb, 0x86, + 0x76, 0x4b, 0xbd, 0x9f, 0xf8, 0x3e, 0xc1, 0xfa, 0x73, 0xa8, 0xb9, 0x1f, 0x27, 0xe6, 0x3e, 0x6d, + 0xf8, 0x76, 0x3e, 0x8a, 0xa3, 0xdf, 0x17, 0xe0, 0x21, 0xc9, 0xd4, 0xf5, 0x6d, 0xa5, 0xb9, 0xeb, + 0xb1, 0xc5, 0x6e, 0xd2, 0xfd, 0xee, 0x3e, 0xb7, 0xe8, 0x33, 0x87, 0x8b, 0x3d, 0x58, 0xa0, 0x1f, + 0x6e, 0x53, 0x12, 0x46, 0x6b, 0x53, 0x12, 0x6f, 0xc3, 0x6c, 0x54, 0x75, 0x32, 0xbe, 0xa3, 0xf5, + 0x11, 0xc8, 0x75, 0x34, 0x83, 0x77, 0xb4, 0xf4, 0xc7, 0x28, 0xd9, 0x8e, 0x66, 0x04, 0x4e, 0x16, + 0xcf, 0x52, 0xde, 0xe9, 0x77, 0xc7, 0xd9, 0x8e, 0xf2, 0x8e, 0x3f, 0x4b, 0xfc, 0xfb, 0x04, 0xe4, + 0x1b, 0xaa, 0x4b, 0x0b, 0xec, 0x47, 0x73, 0x00, 0xdb, 0xfd, 0x0d, 0x54, 0xf4, 0x27, 0x2e, 0x2f, + 0xc6, 0x65, 0x46, 0x42, 0xd4, 0x1d, 0xbc, 0x93, 0x6a, 0x3c, 0xa6, 0x93, 0x2a, 0x42, 0x4d, 0xef, + 0x46, 0xf3, 0xc1, 0xaf, 0x0a, 0x24, 0xdf, 0xc4, 0x35, 0x5f, 0x1d, 0x89, 0x78, 0x39, 0xbd, 0x49, + 0x86, 0xf5, 0x26, 0x4a, 0xa7, 0xff, 0x00, 0x1b, 0x18, 0x6c, 0x88, 0x6b, 0x75, 0x89, 0xfd, 0x80, + 0xea, 0x68, 0xd3, 0x36, 0x1c, 0x31, 0xe8, 0x49, 0x40, 0x36, 0x26, 0x42, 0x95, 0x9b, 0xb6, 0xda, + 0x52, 0x0d, 0x1c, 0x35, 0x3a, 0xe4, 0x58, 0x26, 0xa5, 0x19, 0x3a, 0x52, 0x09, 0x06, 0xc4, 0xf7, + 0x05, 0x78, 0xa0, 0x62, 0x76, 0x2c, 0xfc, 0x80, 0xf9, 0x41, 0x91, 0xcf, 0x9b, 0xb6, 0x5d, 0x98, + 0xe9, 0xfb, 0xf9, 0x11, 0xd6, 0x44, 0xee, 0x07, 0x48, 0xec, 0x26, 0x62, 0x6a, 0xc6, 0xa4, 0xbc, + 0xc2, 0xcf, 0xc6, 0x77, 0xf6, 0x2c, 0xf0, 0x30, 0xfa, 0xd0, 0xa5, 0x7a, 0x35, 0xcd, 0xc1, 0xf1, + 0xe3, 0x55, 0xfc, 0x50, 0x80, 0x63, 0xd8, 0x33, 0x84, 0xba, 0xf2, 0x8e, 0x84, 0xf5, 0xfe, 0xb6, + 0xc1, 0xe4, 0x41, 0xdb, 0x06, 0xa3, 0x34, 0xf2, 0x1f, 0x58, 0x55, 0xa2, 0xaf, 0x89, 0x8e, 0x31, + 0x77, 0xa2, 0x9f, 0xb9, 0x61, 0x85, 0x94, 0x13, 0xfd, 0x4c, 0xf1, 0x0c, 0x45, 0x77, 0xf8, 0x25, + 0x0f, 0xdb, 0xe1, 0x17, 0x95, 0x29, 0xab, 0xf9, 0x4d, 0xfb, 0xc1, 0xef, 0x16, 0xbc, 0xf6, 0x57, + 0x21, 0xdc, 0x8f, 0x1b, 0xee, 0x8d, 0x4d, 0xf4, 0xf6, 0xc6, 0x9e, 0xff, 0x8b, 0x17, 0x21, 0xc7, + 0x32, 0x2b, 0x34, 0xa0, 0xb0, 0xd1, 0x5f, 0x0a, 0x90, 0xe5, 0xb3, 0x91, 0x28, 0xfa, 0x1d, 0x12, + 0x91, 0x1a, 0x2d, 0x9e, 0xdd, 0xc7, 0x4c, 0xea, 0xed, 0xc4, 0xf6, 0x8f, 0xff, 0xed, 0x3f, 0x7d, + 0x21, 0xa1, 0xa0, 0x27, 0x4a, 0x37, 0xcf, 0x95, 0x6e, 0xd3, 0x97, 0xf0, 0xcb, 0xec, 0x00, 0x9c, + 0xd2, 0x62, 0xc9, 0x2f, 0x1b, 0x94, 0x16, 0xef, 0x78, 0x3f, 0xe7, 0x74, 0xae, 0x9f, 0x43, 0x25, + 0x3c, 0xdf, 0x9f, 0x77, 0x3b, 0x38, 0xc4, 0x3b, 0x25, 0x92, 0xde, 0x2a, 0xdd, 0xc6, 0xff, 0x04, + 0x28, 0xe8, 0xcf, 0x04, 0x80, 0xa0, 0x38, 0x8d, 0xa2, 0x8f, 0xa2, 0xaf, 0x7a, 0x5d, 0x1c, 0x98, + 0x68, 0x15, 0x5d, 0x42, 0xbd, 0xc1, 0xa8, 0xc7, 0x87, 0x12, 0x43, 0xbb, 0x4f, 0x47, 0x69, 0xf1, + 0xce, 0xf5, 0x57, 0xd0, 0xc5, 0x11, 0xa9, 0x2f, 0xdd, 0x0e, 0x54, 0xee, 0x0e, 0xfa, 0x8e, 0x00, + 0x53, 0xa1, 0x5e, 0x00, 0x14, 0x2d, 0xf0, 0xa8, 0x7e, 0x81, 0xe2, 0x90, 0x9c, 0xa1, 0xd8, 0x21, + 0x2c, 0xb5, 0xc5, 0x91, 0x0e, 0xe4, 0x82, 0xb0, 0x78, 0xfd, 0x19, 0x71, 0xd4, 0x33, 0xb9, 0x20, + 0x2c, 0xa2, 0x0f, 0x05, 0x98, 0x0a, 0xd5, 0xea, 0x63, 0x78, 0x89, 0xaa, 0xe7, 0x0f, 0xe5, 0xe5, + 0x16, 0xe1, 0xc5, 0x2d, 0x8e, 0x74, 0x3c, 0x98, 0x97, 0x72, 0xf1, 0x50, 0x27, 0x84, 0x19, 0xfb, + 0x4c, 0x02, 0x72, 0xe1, 0xea, 0x3d, 0x5a, 0x1c, 0xc0, 0x59, 0x4f, 0xd6, 0x67, 0x28, 0x6b, 0xbf, + 0x21, 0x10, 0xde, 0x7e, 0x45, 0x28, 0xbe, 0x30, 0x02, 0x73, 0x25, 0x3f, 0x50, 0x64, 0x8c, 0x2a, + 0xe2, 0x9b, 0x87, 0x61, 0x94, 0x5b, 0xef, 0x36, 0x1f, 0x07, 0xdf, 0x29, 0xd1, 0x62, 0x11, 0x16, + 0xc4, 0x37, 0x12, 0xa1, 0x57, 0x07, 0x1f, 0x95, 0x9e, 0x8f, 0x8b, 0xd1, 0xe2, 0xeb, 0xff, 0x43, + 0x05, 0xf3, 0x87, 0x54, 0x30, 0xbf, 0x27, 0x88, 0x2b, 0x07, 0x16, 0x8c, 0xa3, 0xba, 0xdc, 0xce, + 0x58, 0x4e, 0x37, 0x44, 0xe5, 0xde, 0xc8, 0x49, 0x09, 0xed, 0x83, 0xfe, 0x53, 0x80, 0x99, 0xbe, + 0xca, 0x3f, 0x7a, 0x32, 0x36, 0x96, 0x8d, 0xea, 0x10, 0x18, 0x2a, 0xa2, 0x0f, 0xa8, 0x88, 0x7e, + 0x52, 0x10, 0x9f, 0x1f, 0xe9, 0x62, 0x38, 0xfe, 0x86, 0x58, 0x24, 0x35, 0x71, 0xf9, 0x50, 0x22, + 0xd1, 0xfd, 0xa5, 0xd0, 0xff, 0xd3, 0xe0, 0xb6, 0xbf, 0xef, 0x34, 0xbe, 0xbc, 0x19, 0xd3, 0x66, + 0x30, 0x94, 0xf7, 0x2f, 0x52, 0xde, 0xdf, 0x17, 0xc4, 0x0b, 0xa3, 0xf2, 0x1e, 0xec, 0x89, 0xd9, + 0x5f, 0xa5, 0xfa, 0x75, 0x60, 0xf6, 0x3b, 0xfc, 0x6a, 0xe8, 0xdf, 0x04, 0x98, 0xee, 0x69, 0x3e, + 0x40, 0x8f, 0xc7, 0x31, 0x1f, 0xd1, 0xa2, 0x30, 0x94, 0xef, 0xcf, 0x52, 0xbe, 0x3f, 0x2d, 0x88, + 0xcf, 0x8d, 0xca, 0x37, 0xdd, 0x0e, 0xf3, 0x7c, 0x59, 0xac, 0x1c, 0x8a, 0x67, 0xc5, 0x5b, 0x09, + 0xf3, 0x9b, 0xe5, 0xfb, 0x12, 0x62, 0x82, 0x8b, 0x88, 0xd6, 0x85, 0xa1, 0x9c, 0xfe, 0x2c, 0xe5, + 0xf4, 0x3d, 0x41, 0x7c, 0x71, 0x74, 0xed, 0x66, 0x43, 0x98, 0xd9, 0x2b, 0xe2, 0x6b, 0x87, 0xd4, + 0xef, 0x60, 0x31, 0xf4, 0xaf, 0x02, 0x64, 0xf9, 0xfe, 0x86, 0x18, 0x7e, 0x23, 0x5a, 0x20, 0x86, + 0xf2, 0xfb, 0x33, 0x94, 0xdf, 0x77, 0x47, 0xe5, 0xb7, 0xcb, 0xed, 0x75, 0x37, 0x0e, 0xb7, 0xe3, + 0xad, 0x84, 0xfe, 0x4b, 0x80, 0xa9, 0x50, 0x0b, 0x42, 0x8c, 0x4f, 0x8f, 0x6a, 0x53, 0x18, 0xca, + 0xee, 0xcf, 0x53, 0x76, 0x3f, 0x77, 0x90, 0x0b, 0xec, 0x6f, 0x86, 0xf9, 0xdd, 0x10, 0x5f, 0x3f, + 0x94, 0x8f, 0xef, 0x5d, 0x10, 0xfd, 0xb5, 0x00, 0x53, 0xa1, 0x96, 0x85, 0x18, 0xb6, 0xa3, 0xda, + 0x1a, 0x86, 0xb2, 0xcd, 0x22, 0xcd, 0xc5, 0x11, 0x23, 0xcd, 0xc5, 0xc3, 0x45, 0x9a, 0x1f, 0x0a, + 0x90, 0x0b, 0xd7, 0xa3, 0x63, 0x82, 0x98, 0xc8, 0x8a, 0x7d, 0xf1, 0xf1, 0x7d, 0xcd, 0x65, 0x2f, + 0x81, 0x5d, 0xc2, 0xa1, 0x8a, 0x96, 0xf6, 0x13, 0x78, 0x06, 0x85, 0xed, 0xeb, 0x4f, 0xa3, 0x73, + 0xfb, 0xe4, 0x91, 0xab, 0x86, 0xff, 0x9d, 0x00, 0x59, 0xbe, 0xe5, 0x21, 0xe6, 0x3e, 0x46, 0x74, + 0x45, 0xec, 0x37, 0xe8, 0x64, 0x7c, 0x0c, 0x3a, 0xa9, 0x80, 0x1e, 0x7c, 0x56, 0x97, 0xd0, 0xab, + 0x23, 0xf3, 0x51, 0xba, 0xcd, 0x37, 0x1a, 0xdc, 0x41, 0xff, 0x22, 0xc0, 0x74, 0x4f, 0x3f, 0x43, + 0x8c, 0x1b, 0x89, 0xee, 0x7a, 0x28, 0x2e, 0x78, 0x93, 0xbd, 0xff, 0xe8, 0x66, 0xa9, 0xda, 0xb1, + 0xdc, 0x3d, 0xce, 0xc8, 0x3c, 0x3b, 0x1a, 0x5b, 0x17, 0x9a, 0x64, 0xa3, 0xd1, 0x3c, 0x66, 0x2c, + 0x83, 0xc1, 0x6a, 0xf8, 0xb6, 0x4d, 0xf7, 0xf4, 0x2a, 0xc4, 0xb0, 0x1a, 0xdd, 0xd1, 0x50, 0x3c, + 0x15, 0x63, 0x93, 0x82, 0x99, 0xde, 0x5b, 0x68, 0xf8, 0x51, 0xde, 0x29, 0x39, 0x1c, 0xde, 0xf5, + 0x67, 0xd1, 0xd3, 0xfb, 0xe4, 0x94, 0xa2, 0xb1, 0xba, 0x27, 0xb6, 0x9b, 0xa1, 0x9c, 0x30, 0x8a, + 0x7f, 0x48, 0xf7, 0xd6, 0xac, 0x8b, 0x8b, 0xfb, 0x99, 0xca, 0xae, 0xda, 0x7b, 0xf4, 0x34, 0x3f, + 0x25, 0xa0, 0x17, 0x86, 0x5f, 0x36, 0xde, 0xa0, 0x04, 0x71, 0xec, 0xf5, 0xcb, 0xe8, 0xb5, 0xbb, + 0x13, 0x11, 0xa3, 0xff, 0x10, 0x20, 0xc3, 0xd5, 0xbd, 0xd1, 0x63, 0x71, 0xa7, 0xd8, 0xfb, 0x46, + 0x1a, 0x9c, 0x15, 0x17, 0xbf, 0x4c, 0xb9, 0xfc, 0x82, 0xc7, 0xe5, 0x01, 0x5e, 0x02, 0xd7, 0xaf, + 0xa1, 0xad, 0x7b, 0x12, 0xf7, 0xa3, 0x7f, 0x17, 0x20, 0x17, 0xee, 0xfc, 0x88, 0xb1, 0xac, 0x91, + 0xed, 0x21, 0x43, 0x8d, 0xd0, 0xe7, 0x29, 0xef, 0x3f, 0x2d, 0x88, 0x07, 0x3e, 0xe1, 0xbb, 0x11, + 0x03, 0xf1, 0x8b, 0xa1, 0xff, 0x16, 0x20, 0x17, 0x6e, 0x10, 0x89, 0x61, 0x39, 0xb2, 0x8b, 0x64, + 0x28, 0xcb, 0xfe, 0x71, 0x2f, 0x1e, 0xe2, 0xb8, 0x17, 0xef, 0xd1, 0x71, 0xff, 0x5a, 0x02, 0x8e, + 0xc5, 0x14, 0xaa, 0x50, 0xf4, 0x0f, 0xbb, 0x06, 0x97, 0xb5, 0x86, 0x4a, 0xe3, 0x5b, 0x54, 0x1a, + 0xbf, 0x29, 0x88, 0xe5, 0x03, 0x3f, 0x83, 0x6d, 0x46, 0x02, 0xd6, 0x84, 0xa6, 0xf8, 0x89, 0x7b, + 0x22, 0x19, 0x7e, 0x13, 0xf4, 0xf5, 0x04, 0xcc, 0x47, 0x96, 0x67, 0xd1, 0xb9, 0x61, 0x99, 0x82, + 0xbe, 0x52, 0xee, 0x50, 0x09, 0xfd, 0x11, 0x95, 0xd0, 0xb7, 0x05, 0xaa, 0xe3, 0x07, 0x4d, 0x14, + 0x04, 0x1b, 0x63, 0x31, 0xed, 0x88, 0xcd, 0x7b, 0x93, 0x27, 0xe8, 0xdd, 0x09, 0x7d, 0x4f, 0x80, + 0xb4, 0x5f, 0xcd, 0x42, 0xa7, 0xf7, 0x55, 0xed, 0x1a, 0x2a, 0x93, 0x5f, 0xa4, 0x32, 0xf9, 0x92, + 0x20, 0xbe, 0x32, 0x6a, 0x70, 0x1d, 0x2e, 0x70, 0x61, 0x59, 0xd4, 0xc5, 0x2b, 0x87, 0x92, 0x85, + 0xdd, 0xbb, 0x22, 0xe6, 0x79, 0x2a, 0x54, 0x04, 0x8b, 0x7f, 0x58, 0xf4, 0x15, 0xca, 0xee, 0x65, + 0x66, 0x20, 0xd8, 0xec, 0x6e, 0x64, 0x06, 0x74, 0x7e, 0x35, 0xf4, 0xbf, 0x02, 0x4c, 0xf7, 0xd4, + 0xd4, 0xe2, 0x32, 0x03, 0x91, 0x95, 0xb7, 0xa1, 0x7c, 0xff, 0x02, 0xe5, 0xfb, 0x8b, 0x82, 0x78, + 0x71, 0x34, 0xbe, 0xc9, 0x76, 0x96, 0xb7, 0x1d, 0xe6, 0xfc, 0xe3, 0xe2, 0xea, 0xe1, 0x9e, 0x54, + 0x7d, 0x4b, 0xa2, 0x77, 0x13, 0x80, 0xfa, 0xcb, 0x72, 0x68, 0x29, 0xda, 0x57, 0xc6, 0xd5, 0xef, + 0x86, 0x0a, 0xe1, 0x2b, 0x54, 0x08, 0x5f, 0x16, 0xc4, 0x8f, 0x8d, 0x24, 0x84, 0xa6, 0xb7, 0x63, + 0x48, 0x0e, 0x9b, 0xe2, 0xc6, 0xa1, 0xe4, 0x10, 0xb9, 0x2a, 0xfa, 0x7c, 0x82, 0xe4, 0x88, 0xf8, + 0xf6, 0x8d, 0xf8, 0x1c, 0x51, 0x44, 0x93, 0xc7, 0x50, 0x21, 0x7c, 0x93, 0x0a, 0xe1, 0xeb, 0x82, + 0xf8, 0xea, 0x61, 0x2c, 0x22, 0xde, 0x12, 0x4b, 0x61, 0x5b, 0xfc, 0xe1, 0x7b, 0x66, 0x0b, 0xd9, + 0x1e, 0xe8, 0x47, 0x69, 0xc7, 0x41, 0xf8, 0xff, 0xae, 0x7a, 0x22, 0x56, 0x28, 0x11, 0xf5, 0xcd, + 0xa1, 0x52, 0xf9, 0x25, 0x2a, 0x95, 0x9f, 0x13, 0xc4, 0x97, 0x47, 0xb5, 0x0b, 0xa1, 0xfd, 0xb0, + 0x48, 0x24, 0x71, 0xed, 0xb0, 0x39, 0x87, 0xde, 0x35, 0xd1, 0xe7, 0xbc, 0x5f, 0xa2, 0xf4, 0x96, + 0x0c, 0x07, 0xfc, 0x36, 0x24, 0xba, 0x1a, 0x3a, 0x54, 0x14, 0x5f, 0xa5, 0xa2, 0xf8, 0xe5, 0xd1, + 0x82, 0x0a, 0xe6, 0x26, 0x7b, 0xf6, 0xc4, 0xe2, 0xb8, 0x2a, 0x7e, 0xfc, 0xf0, 0x29, 0x98, 0xfe, + 0x75, 0x2f, 0x7d, 0x4d, 0x80, 0x63, 0x4d, 0xb3, 0x13, 0xc5, 0xcd, 0xa5, 0xd9, 0x8a, 0xf7, 0xdf, + 0x5f, 0x91, 0xbc, 0x71, 0x1d, 0xbf, 0x73, 0xeb, 0xc2, 0xf5, 0x8b, 0x6c, 0x6e, 0xdb, 0xd4, 0x15, + 0xa3, 0xbd, 0x64, 0xda, 0xed, 0x52, 0x5b, 0x35, 0xc8, 0x2b, 0xb8, 0x44, 0x87, 0x14, 0x4b, 0x73, + 0x42, 0xff, 0xbb, 0xec, 0x4b, 0xfe, 0xc7, 0x37, 0x12, 0x0f, 0xac, 0x50, 0xf4, 0x8a, 0x6e, 0x76, + 0x5b, 0x4b, 0x15, 0x7f, 0xc3, 0xab, 0xe7, 0xfe, 0xdc, 0x1b, 0x7b, 0x93, 0x8c, 0xbd, 0xe9, 0x8f, + 0xbd, 0x79, 0xf5, 0xdc, 0x76, 0x8a, 0x6c, 0xf0, 0xf4, 0xf7, 0x03, 0x00, 0x00, 0xff, 0xff, 0x61, + 0xea, 0xa4, 0xfb, 0xbd, 0x56, 0x00, 0x00, +} diff --git a/vendor/github.com/knative/caching/.gitattributes b/vendor/knative.dev/caching/.gitattributes similarity index 100% rename from vendor/github.com/knative/caching/.gitattributes rename to vendor/knative.dev/caching/.gitattributes diff --git a/vendor/github.com/knative/caching/.github/issue-template.md b/vendor/knative.dev/caching/.github/issue-template.md similarity index 100% rename from vendor/github.com/knative/caching/.github/issue-template.md rename to vendor/knative.dev/caching/.github/issue-template.md diff --git a/vendor/github.com/knative/caching/.github/pull-request-template.md b/vendor/knative.dev/caching/.github/pull-request-template.md similarity index 100% rename from vendor/github.com/knative/caching/.github/pull-request-template.md rename to vendor/knative.dev/caching/.github/pull-request-template.md diff --git a/vendor/github.com/knative/caching/.gitignore b/vendor/knative.dev/caching/.gitignore similarity index 100% rename from vendor/github.com/knative/caching/.gitignore rename to vendor/knative.dev/caching/.gitignore diff --git a/vendor/github.com/knative/caching/CONTRIBUTING.md b/vendor/knative.dev/caching/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/knative/caching/CONTRIBUTING.md rename to vendor/knative.dev/caching/CONTRIBUTING.md diff --git a/vendor/github.com/knative/caching/DEVELOPMENT.md b/vendor/knative.dev/caching/DEVELOPMENT.md similarity index 100% rename from vendor/github.com/knative/caching/DEVELOPMENT.md rename to vendor/knative.dev/caching/DEVELOPMENT.md diff --git a/vendor/knative.dev/caching/Gopkg.lock b/vendor/knative.dev/caching/Gopkg.lock new file mode 100644 index 000000000..75812f03b --- /dev/null +++ b/vendor/knative.dev/caching/Gopkg.lock @@ -0,0 +1,1000 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + digest = "1:38bcd3b0c95bd3a0974789f73e8d70ae5a7bcf793a029a5ea4aecaacf166ee61" + name = "cloud.google.com/go" + packages = [ + "compute/metadata", + "monitoring/apiv3", + "trace/apiv2", + ] + pruneopts = "NUT" + revision = "775730d6e48254a2430366162cf6298e5368833c" + version = "v0.39.0" + +[[projects]] + digest = "1:642cf8e80572f9dc0677b0f241c8ab2e715c9dccc215270ea873c86ddca0062c" + name = "contrib.go.opencensus.io/exporter/prometheus" + packages = ["."] + pruneopts = "NUT" + revision = "f4a2c1e53ec45636355d35fb9022b64e4bdd4a91" + version = "v0.1.0" + +[[projects]] + digest = "1:b6eb7c2538ec2999a072c0e372a18d7b7e3aedac249f26e159586fa5f892909f" + name = "contrib.go.opencensus.io/exporter/stackdriver" + packages = [ + ".", + "monitoredresource", + ] + pruneopts = "NUT" + revision = "c06c82c832edca4eaf7b0241bd655560a1be0346" + +[[projects]] + digest = "1:fb85fce01f5a35c570e02749234c1cfe4bb8d31570cbe6b62d7beb27710c5954" + name = "github.com/aws/aws-sdk-go" + packages = [ + "aws", + "aws/awserr", + "aws/awsutil", + "aws/client", + "aws/client/metadata", + "aws/corehandlers", + "aws/credentials", + "aws/credentials/ec2rolecreds", + "aws/credentials/endpointcreds", + "aws/credentials/processcreds", + "aws/credentials/stscreds", + "aws/csm", + "aws/defaults", + "aws/ec2metadata", + "aws/endpoints", + "aws/request", + "aws/session", + "aws/signer/v4", + "internal/ini", + "internal/sdkio", + "internal/sdkrand", + "internal/sdkuri", + "internal/shareddefaults", + "private/protocol", + "private/protocol/json/jsonutil", + "private/protocol/query", + "private/protocol/query/queryutil", + "private/protocol/rest", + "private/protocol/xml/xmlutil", + "service/sts", + ] + pruneopts = "NUT" + revision = "742c1495174cefd893992396b014bd6b7c91a293" + version = "v1.19.42" + +[[projects]] + digest = "1:707ebe952a8b3d00b343c01536c79c73771d100f63ec6babeaed5c79e2b8a8dd" + name = "github.com/beorn7/perks" + packages = ["quantile"] + pruneopts = "NUT" + revision = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46" + version = "v1.0.0" + +[[projects]] + digest = "1:fa965c1fd0f17153f608037e109e62104058bc1d08d44849867795fd306fa8b8" + name = "github.com/census-instrumentation/opencensus-proto" + packages = [ + "gen-go/agent/common/v1", + "gen-go/metrics/v1", + "gen-go/resource/v1", + ] + pruneopts = "NUT" + revision = "7f2434bc10da710debe5c4315ed6d4df454b4024" + version = "v0.1.0" + +[[projects]] + digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" + name = "github.com/davecgh/go-spew" + packages = ["spew"] + pruneopts = "NUT" + revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" + version = "v1.1.1" + +[[projects]] + digest = "1:81466b4218bf6adddac2572a30ac733a9255919bc2f470b4827a317bd4ee1756" + name = "github.com/ghodss/yaml" + packages = ["."] + pruneopts = "NUT" + revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" + version = "v1.0.0" + +[[projects]] + digest = "1:abea725bcf0210887f5da19d804fffa1dd45a42a56bdf5f02322345e3fee4f0d" + name = "github.com/gogo/protobuf" + packages = [ + "proto", + "sortkeys", + ] + pruneopts = "NUT" + revision = "4cbf7e384e768b4e01799441fdf2a706a5635ae7" + version = "v1.2.0" + +[[projects]] + branch = "master" + digest = "1:e2b86e41f3d669fc36b50d31d32d22c8ac656c75aa5ea89717ce7177e134ff2a" + name = "github.com/golang/glog" + packages = ["."] + pruneopts = "NUT" + revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" + +[[projects]] + branch = "master" + digest = "1:b7cb6054d3dff43b38ad2e92492f220f57ae6087ee797dca298139776749ace8" + name = "github.com/golang/groupcache" + packages = ["lru"] + pruneopts = "NUT" + revision = "5b532d6fd5efaf7fa130d4e859a2fde0fc3a9e1b" + +[[projects]] + digest = "1:4dacf728c83400b3e9d1d3025dd3c1e93e9a1b033726d1b193dc209f3fa9cb7a" + name = "github.com/golang/protobuf" + packages = [ + "proto", + "protoc-gen-go/descriptor", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/empty", + "ptypes/struct", + "ptypes/timestamp", + "ptypes/wrappers", + ] + pruneopts = "NUT" + revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" + version = "v1.2.0" + +[[projects]] + branch = "master" + digest = "1:05f95ffdfcf651bdb0f05b40b69e7f5663047f8da75c72d58728acb59b5cc107" + name = "github.com/google/btree" + packages = ["."] + pruneopts = "NUT" + revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" + +[[projects]] + digest = "1:bf40199583e5143d1472fc34d10d6f4b69d97572142acf343b3e43136da40823" + name = "github.com/google/go-cmp" + packages = [ + "cmp", + "cmp/internal/diff", + "cmp/internal/flags", + "cmp/internal/function", + "cmp/internal/value", + ] + pruneopts = "NUT" + revision = "6f77996f0c42f7b84e5a2b252227263f93432e9b" + version = "v0.3.0" + +[[projects]] + branch = "master" + digest = "1:52c5834e2bebac9030c97cc0798ac11c3aa8a39f098aeb419f142533da6cd3cc" + name = "github.com/google/gofuzz" + packages = ["."] + pruneopts = "NUT" + revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" + +[[projects]] + branch = "master" + digest = "1:b6b3bd1c08338cb397623d1b9dedde711eccc2d3408fe9017a495d815065d869" + name = "github.com/google/licenseclassifier" + packages = [ + ".", + "internal/sets", + "stringclassifier", + "stringclassifier/internal/pq", + "stringclassifier/searchset", + "stringclassifier/searchset/tokenizer", + ] + pruneopts = "NUT" + revision = "c2a262e3078ad90718f59866f1ec18601b2fee1b" + +[[projects]] + digest = "1:ab3ec1fe3e39bac4b3ab63390767766622be35b7cab03f47f787f9ec60522a53" + name = "github.com/google/uuid" + packages = ["."] + pruneopts = "NUT" + revision = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4" + version = "v1.1.1" + +[[projects]] + digest = "1:fa300677001e58a995e10afe4e251d2a6e30d3815a234d553b5810db7795d5a2" + name = "github.com/googleapis/gax-go" + packages = ["v2"] + pruneopts = "NUT" + revision = "beaecbbdd8af86aa3acf14180d53828ce69400b2" + version = "v2.0.4" + +[[projects]] + digest = "1:06a7dadb7b760767341ffb6c8d377238d68a1226f2b21b5d497d2e3f6ecf6b4e" + name = "github.com/googleapis/gnostic" + packages = [ + "OpenAPIv2", + "compiler", + "extensions", + ] + pruneopts = "NUT" + revision = "7c663266750e7d82587642f65e60bc4083f1f84e" + version = "v0.2.0" + +[[projects]] + branch = "master" + digest = "1:7fdf3223c7372d1ced0b98bf53457c5e89d89aecbad9a77ba9fcc6e01f9e5621" + name = "github.com/gregjones/httpcache" + packages = [ + ".", + "diskcache", + ] + pruneopts = "NUT" + revision = "9cad4c3443a7200dd6400aef47183728de563a38" + +[[projects]] + digest = "1:b42cde0e1f3c816dd57f57f7bbcf05ca40263ad96f168714c130c611fc0856a6" + name = "github.com/hashicorp/golang-lru" + packages = [ + ".", + "simplelru", + ] + pruneopts = "NUT" + revision = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768" + version = "v0.5.0" + +[[projects]] + digest = "1:1f2aebae7e7c856562355ec0198d8ca2fa222fb05e5b1b66632a1fce39631885" + name = "github.com/jmespath/go-jmespath" + packages = ["."] + pruneopts = "NUT" + revision = "c2b33e84" + +[[projects]] + digest = "1:0243cffa4a3410f161ee613dfdd903a636d07e838a42d341da95d81f42cd1d41" + name = "github.com/json-iterator/go" + packages = ["."] + pruneopts = "NUT" + revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682" + +[[projects]] + branch = "master" + digest = "1:f91a467423c58e30754cb830f66a04fa3e6f28fe567e3e68e04aa61f3e51f377" + name = "github.com/knative/test-infra" + packages = [ + "scripts", + "tools/dep-collector", + ] + pruneopts = "UT" + revision = "cad8ba5b64ca151d6435a914fd29f0b8a5cdec74" + +[[projects]] + digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6" + name = "github.com/matttproud/golang_protobuf_extensions" + packages = ["pbutil"] + pruneopts = "NUT" + revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" + version = "v1.0.1" + +[[projects]] + digest = "1:2f42fa12d6911c7b7659738758631bec870b7e9b4c6be5444f963cdcfccc191f" + name = "github.com/modern-go/concurrent" + packages = ["."] + pruneopts = "NUT" + revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" + version = "1.0.3" + +[[projects]] + digest = "1:c6aca19413b13dc59c220ad7430329e2ec454cc310bc6d8de2c7e2b93c18a0f6" + name = "github.com/modern-go/reflect2" + packages = ["."] + pruneopts = "NUT" + revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" + version = "1.0.1" + +[[projects]] + branch = "master" + digest = "1:3bf17a6e6eaa6ad24152148a631d18662f7212e21637c2699bff3369b7f00fa2" + name = "github.com/petar/GoLLRB" + packages = ["llrb"] + pruneopts = "NUT" + revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" + +[[projects]] + digest = "1:6c6d91dc326ed6778783cff869c49fb2f61303cdd2ebbcf90abe53505793f3b6" + name = "github.com/peterbourgon/diskv" + packages = ["."] + pruneopts = "NUT" + revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" + version = "v2.0.1" + +[[projects]] + digest = "1:09fd8d3e830bac0a0e2d1f7009fe33a0c435ee14ae818be9cc9ceb5f77da18ae" + name = "github.com/prometheus/client_golang" + packages = [ + "prometheus", + "prometheus/internal", + "prometheus/promhttp", + ] + pruneopts = "NUT" + revision = "50c4339db732beb2165735d2cde0bff78eb3c5a5" + version = "v0.9.3" + +[[projects]] + branch = "master" + digest = "1:2d5cd61daa5565187e1d96bae64dbbc6080dacf741448e9629c64fd93203b0d4" + name = "github.com/prometheus/client_model" + packages = ["go"] + pruneopts = "NUT" + revision = "fd36f4220a901265f90734c3183c5f0c91daa0b8" + +[[projects]] + digest = "1:d03ca24670416dc8fccc78b05d6736ec655416ca7db0a028e8fb92cfdfe3b55e" + name = "github.com/prometheus/common" + packages = [ + "expfmt", + "internal/bitbucket.org/ww/goautoneg", + "model", + ] + pruneopts = "NUT" + revision = "17f5ca1748182ddf24fc33a5a7caaaf790a52fcc" + version = "v0.4.1" + +[[projects]] + digest = "1:88a65c1e94c5afaec74b2d9f8a03d352d8a95e87db6e0904eae9ccaadd6d3176" + name = "github.com/prometheus/procfs" + packages = [ + ".", + "internal/fs", + ] + pruneopts = "NUT" + revision = "65bdadfa96aecebf4dcf888da995a29eab4fc964" + version = "v0.0.1" + +[[projects]] + digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04" + name = "github.com/sergi/go-diff" + packages = ["diffmatchpatch"] + pruneopts = "NUT" + revision = "1744e2970ca51c86172c8190fadad617561ed6e7" + version = "v1.0.0" + +[[projects]] + digest = "1:9d8420bbf131d1618bde6530af37c3799340d3762cc47210c1d9532a4c3a2779" + name = "github.com/spf13/pflag" + packages = ["."] + pruneopts = "NUT" + revision = "298182f68c66c05229eb03ac171abe6e309ee79a" + version = "v1.0.3" + +[[projects]] + digest = "1:d2e799c7b52b568fa8ee9e62dbd2c5b0a1a34bf4a6bc43c2dd4b0b35bf52874f" + name = "go.opencensus.io" + packages = [ + ".", + "internal", + "internal/tagencoding", + "metric/metricdata", + "metric/metricexport", + "metric/metricproducer", + "plugin/ocgrpc", + "plugin/ochttp", + "plugin/ochttp/propagation/b3", + "resource", + "stats", + "stats/internal", + "stats/view", + "tag", + "trace", + "trace/internal", + "trace/propagation", + "trace/tracestate", + ] + pruneopts = "NUT" + revision = "9c377598961b706d1542bd2d84d538b5094d596e" + version = "v0.22.0" + +[[projects]] + digest = "1:cc9d86ec4e6e3bdf87e3a421273bfeed003cf8e21351c0302fe8b0eb7b10efe6" + name = "go.uber.org/atomic" + packages = ["."] + pruneopts = "NUT" + revision = "df976f2515e274675050de7b3f42545de80594fd" + version = "v1.4.0" + +[[projects]] + digest = "1:58ca93bdf81bac106ded02226b5395a0595d5346cdc4caa8d9c1f3a5f8f9976e" + name = "go.uber.org/multierr" + packages = ["."] + pruneopts = "NUT" + revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a" + version = "v1.1.0" + +[[projects]] + digest = "1:4af5a022f8c5c97734c3c6fad58fdce078e2322ddc98d3102b225a729f03916e" + name = "go.uber.org/zap" + packages = [ + ".", + "buffer", + "internal/bufferpool", + "internal/color", + "internal/exit", + "zapcore", + ] + pruneopts = "NUT" + revision = "27376062155ad36be76b0f12cf1572a221d3a48c" + version = "v1.10.0" + +[[projects]] + branch = "master" + digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + pruneopts = "NUT" + revision = "182538f80094b6a8efaade63a8fd8e0d9d5843dd" + +[[projects]] + branch = "master" + digest = "1:274c2fa94d93c89fb107c18f715732390bcc4cf337d8d82cdeee5d92d162ff14" + name = "golang.org/x/net" + packages = [ + "context", + "context/ctxhttp", + "http/httpguts", + "http2", + "http2/hpack", + "idna", + "internal/timeseries", + "trace", + ] + pruneopts = "NUT" + revision = "8a410e7b638dca158bf9e766925842f6651ff828" + +[[projects]] + branch = "master" + digest = "1:17ee74a4d9b6078611784b873cdbfe91892d2c73052c430724e66fcc015b6c7b" + name = "golang.org/x/oauth2" + packages = [ + ".", + "google", + "internal", + "jws", + "jwt", + ] + pruneopts = "NUT" + revision = "e64efc72b421e893cbf63f17ba2221e7d6d0b0f3" + +[[projects]] + branch = "master" + digest = "1:382bb5a7fb4034db3b6a2d19e5a4a6bcf52f4750530603c01ca18a172fa3089b" + name = "golang.org/x/sync" + packages = ["semaphore"] + pruneopts = "NUT" + revision = "112230192c580c3556b8cee6403af37a4fc5f28c" + +[[projects]] + branch = "master" + digest = "1:8270f14d85e8d36e852e018872ac923f7a2067648bfe8428d01be288818aa337" + name = "golang.org/x/sys" + packages = [ + "unix", + "windows", + ] + pruneopts = "NUT" + revision = "fa5fdf94c78965f1aa8423f0cc50b8b8d728b05a" + +[[projects]] + digest = "1:e7071ed636b5422cc51c0e3a6cebc229d6c9fffc528814b519a980641422d619" + name = "golang.org/x/text" + packages = [ + "collate", + "collate/build", + "internal/colltab", + "internal/gen", + "internal/tag", + "internal/triegen", + "internal/ucd", + "language", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable", + ] + pruneopts = "NUT" + revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" + version = "v0.3.0" + +[[projects]] + branch = "master" + digest = "1:c9e7a4b4d47c0ed205d257648b0e5b0440880cb728506e318f8ac7cd36270bc4" + name = "golang.org/x/time" + packages = ["rate"] + pruneopts = "NUT" + revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" + +[[projects]] + branch = "master" + digest = "1:a05bd2d296bc727082abcb63ff52615b4dcc6219d8b61e99fd83d605dc779a18" + name = "golang.org/x/tools" + packages = [ + "go/ast/astutil", + "imports", + "internal/fastwalk", + ] + pruneopts = "NUT" + revision = "7ca132754999accbaa5c1735eda29e7ce0f3bf03" + +[[projects]] + branch = "master" + digest = "1:f287c9d58e1a591510d69f14e2cebce953e003e0acdcca900bf2d7bc5627c06a" + name = "google.golang.org/api" + packages = [ + "googleapi/transport", + "internal", + "iterator", + "option", + "support/bundler", + "transport", + "transport/grpc", + "transport/http", + "transport/http/internal/propagation", + ] + pruneopts = "NUT" + revision = "2289773d28e83c781acd9e916f781d96cbd69ebe" + +[[projects]] + digest = "1:898bf528e5c601c4a1111586f75ab9515467ebe7a41ae849d5a839720d4e2580" + name = "google.golang.org/appengine" + packages = [ + ".", + "internal", + "internal/app_identity", + "internal/base", + "internal/datastore", + "internal/log", + "internal/modules", + "internal/remote_api", + "internal/socket", + "internal/urlfetch", + "socket", + "urlfetch", + ] + pruneopts = "NUT" + revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1" + version = "v1.4.0" + +[[projects]] + digest = "1:def98947a836b93bfa0a168c85631b13df2541db0bdf28f2034b6e914638aee1" + name = "google.golang.org/genproto" + packages = [ + "googleapis/api", + "googleapis/api/annotations", + "googleapis/api/distribution", + "googleapis/api/label", + "googleapis/api/metric", + "googleapis/api/monitoredres", + "googleapis/devtools/cloudtrace/v2", + "googleapis/monitoring/v3", + "googleapis/rpc/status", + "protobuf/field_mask", + ] + pruneopts = "NUT" + revision = "e7d98fc518a78c9f8b5ee77be7b0b317475d89e1" + +[[projects]] + digest = "1:a9916e8c1d943e1342550bdfb64df1225a1df0b4c23fd4a6583d6861302319df" + name = "google.golang.org/grpc" + packages = [ + ".", + "balancer", + "balancer/base", + "balancer/roundrobin", + "binarylog/grpc_binarylog_v1", + "codes", + "connectivity", + "credentials", + "credentials/internal", + "credentials/oauth", + "encoding", + "encoding/proto", + "grpclog", + "internal", + "internal/backoff", + "internal/balancerload", + "internal/binarylog", + "internal/channelz", + "internal/envconfig", + "internal/grpcrand", + "internal/grpcsync", + "internal/syscall", + "internal/transport", + "keepalive", + "metadata", + "naming", + "peer", + "resolver", + "resolver/dns", + "resolver/passthrough", + "stats", + "status", + "tap", + ] + pruneopts = "NUT" + revision = "869adfc8d5a43efc0d05780ad109106f457f51e4" + version = "v1.21.0" + +[[projects]] + digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" + name = "gopkg.in/inf.v0" + packages = ["."] + pruneopts = "NUT" + revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf" + version = "v0.9.1" + +[[projects]] + digest = "1:18108594151654e9e696b27b181b953f9a90b16bf14d253dd1b397b025a1487f" + name = "gopkg.in/yaml.v2" + packages = ["."] + pruneopts = "NUT" + revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" + version = "v2.2.2" + +[[projects]] + digest = "1:4485f6050feae6844efd79bce3f5b35e5ed4a21dd79ef6a2dbbee263531cea09" + name = "k8s.io/api" + packages = [ + "admissionregistration/v1alpha1", + "admissionregistration/v1beta1", + "apps/v1", + "apps/v1beta1", + "apps/v1beta2", + "authentication/v1", + "authentication/v1beta1", + "authorization/v1", + "authorization/v1beta1", + "autoscaling/v1", + "autoscaling/v2beta1", + "autoscaling/v2beta2", + "batch/v1", + "batch/v1beta1", + "batch/v2alpha1", + "certificates/v1beta1", + "coordination/v1beta1", + "core/v1", + "events/v1beta1", + "extensions/v1beta1", + "networking/v1", + "policy/v1beta1", + "rbac/v1", + "rbac/v1alpha1", + "rbac/v1beta1", + "scheduling/v1alpha1", + "scheduling/v1beta1", + "settings/v1alpha1", + "storage/v1", + "storage/v1alpha1", + "storage/v1beta1", + ] + pruneopts = "NUT" + revision = "9ad12a4af32677db3ae70bef3371bf9b618eb3a0" + version = "kubernetes-1.12.9" + +[[projects]] + digest = "1:119ae04ee44c5d179dcde1ee686f057cfe3fc54a7ee8484b920932a80309e88b" + name = "k8s.io/apimachinery" + packages = [ + "pkg/api/equality", + "pkg/api/errors", + "pkg/api/meta", + "pkg/api/resource", + "pkg/api/validation", + "pkg/apis/meta/internalversion", + "pkg/apis/meta/v1", + "pkg/apis/meta/v1/unstructured", + "pkg/apis/meta/v1/validation", + "pkg/apis/meta/v1beta1", + "pkg/conversion", + "pkg/conversion/queryparams", + "pkg/fields", + "pkg/labels", + "pkg/runtime", + "pkg/runtime/schema", + "pkg/runtime/serializer", + "pkg/runtime/serializer/json", + "pkg/runtime/serializer/protobuf", + "pkg/runtime/serializer/recognizer", + "pkg/runtime/serializer/streaming", + "pkg/runtime/serializer/versioning", + "pkg/selection", + "pkg/types", + "pkg/util/cache", + "pkg/util/clock", + "pkg/util/diff", + "pkg/util/errors", + "pkg/util/framer", + "pkg/util/intstr", + "pkg/util/json", + "pkg/util/mergepatch", + "pkg/util/naming", + "pkg/util/net", + "pkg/util/runtime", + "pkg/util/sets", + "pkg/util/sets/types", + "pkg/util/strategicpatch", + "pkg/util/validation", + "pkg/util/validation/field", + "pkg/util/wait", + "pkg/util/yaml", + "pkg/version", + "pkg/watch", + "third_party/forked/golang/json", + "third_party/forked/golang/reflect", + ] + pruneopts = "NUT" + revision = "01f179d85dbce0f2e0e4351a92394b38694b7cae" + version = "kubernetes-1.12.9" + +[[projects]] + digest = "1:147d0c12cd9b13bec31f9de85b5cab64f9b9c2b6e95200d25f3ae2753239e9df" + name = "k8s.io/client-go" + packages = [ + "discovery", + "discovery/fake", + "informers", + "informers/admissionregistration", + "informers/admissionregistration/v1alpha1", + "informers/admissionregistration/v1beta1", + "informers/apps", + "informers/apps/v1", + "informers/apps/v1beta1", + "informers/apps/v1beta2", + "informers/autoscaling", + "informers/autoscaling/v1", + "informers/autoscaling/v2beta1", + "informers/autoscaling/v2beta2", + "informers/batch", + "informers/batch/v1", + "informers/batch/v1beta1", + "informers/batch/v2alpha1", + "informers/certificates", + "informers/certificates/v1beta1", + "informers/coordination", + "informers/coordination/v1beta1", + "informers/core", + "informers/core/v1", + "informers/events", + "informers/events/v1beta1", + "informers/extensions", + "informers/extensions/v1beta1", + "informers/internalinterfaces", + "informers/networking", + "informers/networking/v1", + "informers/policy", + "informers/policy/v1beta1", + "informers/rbac", + "informers/rbac/v1", + "informers/rbac/v1alpha1", + "informers/rbac/v1beta1", + "informers/scheduling", + "informers/scheduling/v1alpha1", + "informers/scheduling/v1beta1", + "informers/settings", + "informers/settings/v1alpha1", + "informers/storage", + "informers/storage/v1", + "informers/storage/v1alpha1", + "informers/storage/v1beta1", + "kubernetes", + "kubernetes/scheme", + "kubernetes/typed/admissionregistration/v1alpha1", + "kubernetes/typed/admissionregistration/v1beta1", + "kubernetes/typed/apps/v1", + "kubernetes/typed/apps/v1beta1", + "kubernetes/typed/apps/v1beta2", + "kubernetes/typed/authentication/v1", + "kubernetes/typed/authentication/v1beta1", + "kubernetes/typed/authorization/v1", + "kubernetes/typed/authorization/v1beta1", + "kubernetes/typed/autoscaling/v1", + "kubernetes/typed/autoscaling/v2beta1", + "kubernetes/typed/autoscaling/v2beta2", + "kubernetes/typed/batch/v1", + "kubernetes/typed/batch/v1beta1", + "kubernetes/typed/batch/v2alpha1", + "kubernetes/typed/certificates/v1beta1", + "kubernetes/typed/coordination/v1beta1", + "kubernetes/typed/core/v1", + "kubernetes/typed/events/v1beta1", + "kubernetes/typed/extensions/v1beta1", + "kubernetes/typed/networking/v1", + "kubernetes/typed/policy/v1beta1", + "kubernetes/typed/rbac/v1", + "kubernetes/typed/rbac/v1alpha1", + "kubernetes/typed/rbac/v1beta1", + "kubernetes/typed/scheduling/v1alpha1", + "kubernetes/typed/scheduling/v1beta1", + "kubernetes/typed/settings/v1alpha1", + "kubernetes/typed/storage/v1", + "kubernetes/typed/storage/v1alpha1", + "kubernetes/typed/storage/v1beta1", + "listers/admissionregistration/v1alpha1", + "listers/admissionregistration/v1beta1", + "listers/apps/v1", + "listers/apps/v1beta1", + "listers/apps/v1beta2", + "listers/autoscaling/v1", + "listers/autoscaling/v2beta1", + "listers/autoscaling/v2beta2", + "listers/batch/v1", + "listers/batch/v1beta1", + "listers/batch/v2alpha1", + "listers/certificates/v1beta1", + "listers/coordination/v1beta1", + "listers/core/v1", + "listers/events/v1beta1", + "listers/extensions/v1beta1", + "listers/networking/v1", + "listers/policy/v1beta1", + "listers/rbac/v1", + "listers/rbac/v1alpha1", + "listers/rbac/v1beta1", + "listers/scheduling/v1alpha1", + "listers/scheduling/v1beta1", + "listers/settings/v1alpha1", + "listers/storage/v1", + "listers/storage/v1alpha1", + "listers/storage/v1beta1", + "pkg/apis/clientauthentication", + "pkg/apis/clientauthentication/v1alpha1", + "pkg/apis/clientauthentication/v1beta1", + "pkg/version", + "plugin/pkg/client/auth/exec", + "rest", + "rest/watch", + "testing", + "tools/cache", + "tools/clientcmd/api", + "tools/metrics", + "tools/pager", + "tools/record", + "tools/reference", + "transport", + "util/buffer", + "util/cert", + "util/connrotation", + "util/flowcontrol", + "util/integer", + "util/retry", + "util/workqueue", + ] + pruneopts = "NUT" + revision = "4f3abb12cae2d6817e1b6d72d9cbc3d3a6ddf965" + version = "kubernetes-1.12.9" + +[[projects]] + digest = "1:26b81b5e76e3f84ea5140da4f74649576e470f79091d2ef8e0d1b5000bc636ca" + name = "k8s.io/code-generator" + packages = [ + "cmd/client-gen", + "cmd/client-gen/args", + "cmd/client-gen/generators", + "cmd/client-gen/generators/fake", + "cmd/client-gen/generators/scheme", + "cmd/client-gen/generators/util", + "cmd/client-gen/path", + "cmd/client-gen/types", + "cmd/deepcopy-gen", + "cmd/deepcopy-gen/args", + "cmd/defaulter-gen", + "cmd/defaulter-gen/args", + "cmd/informer-gen", + "cmd/informer-gen/args", + "cmd/informer-gen/generators", + "cmd/lister-gen", + "cmd/lister-gen/args", + "cmd/lister-gen/generators", + "pkg/util", + ] + pruneopts = "T" + revision = "b1289fc74931d4b6b04bd1a259acfc88a2cb0a66" + version = "kubernetes-1.12.9" + +[[projects]] + digest = "1:39912eb5f8eaf46486faae0839586c27c93423e552f76875defa048f52c15c15" + name = "k8s.io/gengo" + packages = [ + "args", + "examples/deepcopy-gen/generators", + "examples/defaulter-gen/generators", + "examples/set-gen/sets", + "generator", + "namer", + "parser", + "types", + ] + pruneopts = "NUT" + revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985" + +[[projects]] + digest = "1:c263611800c3a97991dbcf9d3bc4de390f6224aaa8ca0a7226a9d734f65a416a" + name = "k8s.io/klog" + packages = ["."] + pruneopts = "NUT" + revision = "71442cd4037d612096940ceb0f3fec3f7fff66e0" + version = "v0.2.0" + +[[projects]] + branch = "master" + digest = "1:a2c842a1e0aed96fd732b535514556323a6f5edfded3b63e5e0ab1bce188aa54" + name = "k8s.io/kube-openapi" + packages = ["pkg/util/proto"] + pruneopts = "NUT" + revision = "e3762e86a74c878ffed47484592986685639c2cd" + +[[projects]] + branch = "master" + digest = "1:52d224343dc361c41a93a8c01685d2f491b52366830bc6a783cd3f7315b01716" + name = "knative.dev/pkg" + packages = [ + "apis", + "changeset", + "codegen/cmd/injection-gen", + "codegen/cmd/injection-gen/args", + "codegen/cmd/injection-gen/generators", + "configmap", + "controller", + "injection", + "kmeta", + "kmp", + "logging", + "logging/logkey", + "metrics", + "metrics/metricskey", + ] + pruneopts = "T" + revision = "8fe96d53cc1856e044988703a4e46e7b431cfcd3" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + input-imports = [ + "github.com/google/go-cmp/cmp", + "github.com/knative/test-infra/scripts", + "github.com/knative/test-infra/tools/dep-collector", + "k8s.io/api/core/v1", + "k8s.io/apimachinery/pkg/api/equality", + "k8s.io/apimachinery/pkg/api/errors", + "k8s.io/apimachinery/pkg/apis/meta/v1", + "k8s.io/apimachinery/pkg/labels", + "k8s.io/apimachinery/pkg/runtime", + "k8s.io/apimachinery/pkg/runtime/schema", + "k8s.io/apimachinery/pkg/runtime/serializer", + "k8s.io/apimachinery/pkg/types", + "k8s.io/apimachinery/pkg/util/runtime", + "k8s.io/apimachinery/pkg/util/sets/types", + "k8s.io/apimachinery/pkg/watch", + "k8s.io/client-go/discovery", + "k8s.io/client-go/discovery/fake", + "k8s.io/client-go/rest", + "k8s.io/client-go/testing", + "k8s.io/client-go/tools/cache", + "k8s.io/client-go/util/flowcontrol", + "k8s.io/code-generator/cmd/client-gen", + "k8s.io/code-generator/cmd/deepcopy-gen", + "k8s.io/code-generator/cmd/defaulter-gen", + "k8s.io/code-generator/cmd/informer-gen", + "k8s.io/code-generator/cmd/lister-gen", + "knative.dev/pkg/apis", + "knative.dev/pkg/codegen/cmd/injection-gen", + "knative.dev/pkg/controller", + "knative.dev/pkg/injection", + "knative.dev/pkg/kmeta", + "knative.dev/pkg/logging", + ] + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/vendor/knative.dev/caching/Gopkg.toml b/vendor/knative.dev/caching/Gopkg.toml new file mode 100644 index 000000000..083e2719c --- /dev/null +++ b/vendor/knative.dev/caching/Gopkg.toml @@ -0,0 +1,85 @@ +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. + +required = [ + "k8s.io/apimachinery/pkg/util/sets/types", + "k8s.io/code-generator/cmd/deepcopy-gen", + "k8s.io/code-generator/cmd/defaulter-gen", + "k8s.io/code-generator/cmd/client-gen", + "k8s.io/code-generator/cmd/lister-gen", + "k8s.io/code-generator/cmd/informer-gen", + "knative.dev/pkg/codegen/cmd/injection-gen", + "github.com/knative/test-infra/scripts", + "github.com/knative/test-infra/tools/dep-collector", +] + +[[override]] + name = "k8s.io/klog" + version = "v0.2.0" + +[[override]] + name = "k8s.io/gengo" + revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985" + +[[override]] + name = "k8s.io/api" + version = "kubernetes-1.12.9" + +[[override]] + name = "k8s.io/apimachinery" + version = "kubernetes-1.12.9" + +[[override]] + name = "k8s.io/code-generator" + version = "kubernetes-1.12.9" + +[[override]] + name = "k8s.io/client-go" + version = "kubernetes-1.12.9" + +[[override]] + name = "knative.dev/pkg" + branch = "master" + +[[override]] + name = "google.golang.org/genproto" + revision = "e7d98fc518a78c9f8b5ee77be7b0b317475d89e1" + +[[override]] + name = "github.com/census-instrumentation/opencensus-proto" + version = "0.1.0" + +[[override]] + name = "contrib.go.opencensus.io/exporter/stackdriver" + # HEAD as of 2019-02-11 + # Needed because this includes a fix to support Stackdriver built-in metrics + revision = "c06c82c832edca4eaf7b0241bd655560a1be0346" + +[[override]] + name = "contrib.go.opencensus.io/resource" + # Needed by the stackdriver exporter. + revision = "21591786a5e0c21806209b266cc6dfdfa85b3cdb" + +[[override]] + name = "go.opencensus.io" + # Needed because this includes the appropriate version of metricsdata + version = "v0.22.0" + +[prune] + go-tests = true + unused-packages = true + non-go = true + +[[prune.project]] + name = "k8s.io/code-generator" + unused-packages = false + non-go = false + +[[prune.project]] + name = "github.com/knative/test-infra" + non-go = false + +[[prune.project]] + name = "knative.dev/pkg" + unused-packages = false + non-go = false diff --git a/vendor/github.com/knative/pkg/LICENSE b/vendor/knative.dev/caching/LICENSE similarity index 100% rename from vendor/github.com/knative/pkg/LICENSE rename to vendor/knative.dev/caching/LICENSE diff --git a/vendor/github.com/knative/caching/hack/OWNERS b/vendor/knative.dev/caching/OWNERS similarity index 80% rename from vendor/github.com/knative/caching/hack/OWNERS rename to vendor/knative.dev/caching/OWNERS index d6d72cdeb..17666bfb8 100644 --- a/vendor/github.com/knative/caching/hack/OWNERS +++ b/vendor/knative.dev/caching/OWNERS @@ -1,4 +1,4 @@ # The OWNERS file is used by prow to automatically merge approved PRs. approvers: -- adrcunha +- caching-approvers diff --git a/vendor/knative.dev/caching/OWNERS_ALIASES b/vendor/knative.dev/caching/OWNERS_ALIASES new file mode 100644 index 000000000..03f908f7a --- /dev/null +++ b/vendor/knative.dev/caching/OWNERS_ALIASES @@ -0,0 +1,21 @@ +aliases: + caching-approvers: + - evankanderson + - mattmoor + - vaikas-google + + productivity-approvers: + - adrcunha + - chaodaiG + - srinivashegde86 + productivity-reviewers: + - adrcunha + - chaodaiG + - coryrc + - dushyanthsc + - ericKlawitter + - Fredy-Z + - nbarthwal + - srinivashegde86 + - steuhs + - yt3liu diff --git a/vendor/github.com/knative/caching/README.md b/vendor/knative.dev/caching/README.md similarity index 100% rename from vendor/github.com/knative/caching/README.md rename to vendor/knative.dev/caching/README.md diff --git a/vendor/github.com/knative/caching/code-of-conduct.md b/vendor/knative.dev/caching/code-of-conduct.md similarity index 100% rename from vendor/github.com/knative/caching/code-of-conduct.md rename to vendor/knative.dev/caching/code-of-conduct.md diff --git a/vendor/github.com/knative/caching/config/image.yaml b/vendor/knative.dev/caching/config/image.yaml similarity index 95% rename from vendor/github.com/knative/caching/config/image.yaml rename to vendor/knative.dev/caching/config/image.yaml index 50d3e9b67..3771a0d7b 100644 --- a/vendor/github.com/knative/caching/config/image.yaml +++ b/vendor/knative.dev/caching/config/image.yaml @@ -16,6 +16,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: images.caching.internal.knative.dev + labels: + knative.dev/crd-install: "true" spec: group: caching.internal.knative.dev version: v1alpha1 @@ -24,7 +26,6 @@ spec: plural: images singular: image categories: - - all - knative-internal - caching shortNames: diff --git a/vendor/github.com/knative/pkg/hack/OWNERS b/vendor/knative.dev/caching/hack/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/hack/OWNERS rename to vendor/knative.dev/caching/hack/OWNERS diff --git a/vendor/github.com/knative/caching/hack/boilerplate/add-boilerplate.sh b/vendor/knative.dev/caching/hack/boilerplate/add-boilerplate.sh similarity index 100% rename from vendor/github.com/knative/caching/hack/boilerplate/add-boilerplate.sh rename to vendor/knative.dev/caching/hack/boilerplate/add-boilerplate.sh diff --git a/vendor/github.com/knative/caching/hack/boilerplate/boilerplate.go.txt b/vendor/knative.dev/caching/hack/boilerplate/boilerplate.go.txt similarity index 100% rename from vendor/github.com/knative/caching/hack/boilerplate/boilerplate.go.txt rename to vendor/knative.dev/caching/hack/boilerplate/boilerplate.go.txt diff --git a/vendor/github.com/knative/caching/hack/boilerplate/boilerplate.sh.txt b/vendor/knative.dev/caching/hack/boilerplate/boilerplate.sh.txt similarity index 100% rename from vendor/github.com/knative/caching/hack/boilerplate/boilerplate.sh.txt rename to vendor/knative.dev/caching/hack/boilerplate/boilerplate.sh.txt diff --git a/vendor/github.com/knative/caching/hack/update-codegen.sh b/vendor/knative.dev/caching/hack/update-codegen.sh similarity index 76% rename from vendor/github.com/knative/caching/hack/update-codegen.sh rename to vendor/knative.dev/caching/hack/update-codegen.sh index 165b2b800..94880a3b2 100755 --- a/vendor/github.com/knative/caching/hack/update-codegen.sh +++ b/vendor/knative.dev/caching/hack/update-codegen.sh @@ -20,13 +20,20 @@ set -o pipefail REPO_ROOT=$(dirname ${BASH_SOURCE})/.. CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)} +KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT}; ls -d -1 ./vendor/knative.dev/pkg 2>/dev/null || echo ../pkg)} # generate the code with: # --output-base because this script should also be able to run inside the vendor dir of # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ - github.com/knative/caching/pkg/client github.com/knative/caching/pkg/apis \ + knative.dev/caching/pkg/client knative.dev/caching/pkg/apis \ + "caching:v1alpha1" \ + --go-header-file ${REPO_ROOT}/hack/boilerplate/boilerplate.go.txt + +# Knative Injection +${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \ + knative.dev/caching/pkg/client knative.dev/caching/pkg/apis \ "caching:v1alpha1" \ --go-header-file ${REPO_ROOT}/hack/boilerplate/boilerplate.go.txt diff --git a/vendor/github.com/knative/caching/hack/update-deps.sh b/vendor/knative.dev/caching/hack/update-deps.sh similarity index 100% rename from vendor/github.com/knative/caching/hack/update-deps.sh rename to vendor/knative.dev/caching/hack/update-deps.sh diff --git a/vendor/github.com/knative/caching/hack/verify-codegen.sh b/vendor/knative.dev/caching/hack/verify-codegen.sh similarity index 100% rename from vendor/github.com/knative/caching/hack/verify-codegen.sh rename to vendor/knative.dev/caching/hack/verify-codegen.sh diff --git a/vendor/github.com/knative/caching/pkg/apis/caching/register.go b/vendor/knative.dev/caching/pkg/apis/caching/register.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/apis/caching/register.go rename to vendor/knative.dev/caching/pkg/apis/caching/register.go diff --git a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/doc.go b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/doc.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/doc.go rename to vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/doc.go diff --git a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_defaults.go b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_defaults.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_defaults.go rename to vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_defaults.go diff --git a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_types.go b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_types.go similarity index 98% rename from vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_types.go rename to vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_types.go index edea28f29..3bad8776f 100644 --- a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_types.go +++ b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_types.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/kmeta" + "knative.dev/pkg/apis" + "knative.dev/pkg/kmeta" ) // +genclient diff --git a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_validation.go b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_validation.go similarity index 97% rename from vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_validation.go rename to vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_validation.go index 33a505782..4e644f952 100644 --- a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/image_validation.go +++ b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/image_validation.go @@ -23,7 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) func (rt *Image) Validate(ctx context.Context) *apis.FieldError { diff --git a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/register.go b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/register.go similarity index 97% rename from vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/register.go rename to vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/register.go index e5f710a7e..8855fcdf2 100644 --- a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/register.go +++ b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/knative/caching/pkg/apis/caching" + "knative.dev/caching/pkg/apis/caching" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/zz_generated.deepcopy.go b/vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/apis/caching/v1alpha1/zz_generated.deepcopy.go rename to vendor/knative.dev/caching/pkg/apis/caching/v1alpha1/zz_generated.deepcopy.go diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/clientset.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/clientset.go similarity index 96% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/clientset.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/clientset.go index fd1a378ba..5dbb4990a 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/clientset.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/clientset.go @@ -19,10 +19,10 @@ limitations under the License. package versioned import ( - cachingv1alpha1 "github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" + cachingv1alpha1 "knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1" ) type Interface interface { diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/doc.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/doc.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/doc.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/doc.go diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/clientset_generated.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 90% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/clientset_generated.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/clientset_generated.go index e090858f6..7c7266dce 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,14 +19,14 @@ limitations under the License. package fake import ( - clientset "github.com/knative/caching/pkg/client/clientset/versioned" - cachingv1alpha1 "github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1" - fakecachingv1alpha1 "github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" + clientset "knative.dev/caching/pkg/client/clientset/versioned" + cachingv1alpha1 "knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1" + fakecachingv1alpha1 "knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/doc.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/doc.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/doc.go diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/register.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/register.go similarity index 96% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/register.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/register.go index 69b5344e2..c2605bb53 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/fake/register.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/fake/register.go @@ -19,12 +19,12 @@ limitations under the License. package fake import ( - cachingv1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + cachingv1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/scheme/doc.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/scheme/doc.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/scheme/doc.go diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/scheme/register.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/scheme/register.go similarity index 96% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/scheme/register.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/scheme/register.go index f77d0548d..0cfe33888 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/scheme/register.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/scheme/register.go @@ -19,12 +19,12 @@ limitations under the License. package scheme import ( - cachingv1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + cachingv1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/caching_client.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/caching_client.go similarity index 94% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/caching_client.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/caching_client.go index 8167378f7..542b54142 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/caching_client.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/caching_client.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" - "github.com/knative/caching/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" + v1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" + "knative.dev/caching/pkg/client/clientset/versioned/scheme" ) type CachingV1alpha1Interface interface { diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/doc.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/doc.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/doc.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/doc.go diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/doc.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/doc.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/doc.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/doc.go diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_caching_client.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_caching_client.go similarity index 92% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_caching_client.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_caching_client.go index 2c63550c8..fb62252e0 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_caching_client.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_caching_client.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + v1alpha1 "knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1" ) type FakeCachingV1alpha1 struct { diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_image.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_image.go similarity index 98% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_image.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_image.go index 5046833de..e7c6e612f 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_image.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/fake/fake_image.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" ) // FakeImages implements ImageInterface diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/generated_expansion.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/generated_expansion.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/generated_expansion.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/generated_expansion.go diff --git a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/image.go b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/image.go similarity index 97% rename from vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/image.go rename to vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/image.go index da1af3212..b28365cad 100644 --- a/vendor/github.com/knative/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/image.go +++ b/vendor/knative.dev/caching/pkg/client/clientset/versioned/typed/caching/v1alpha1/image.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" - scheme "github.com/knative/caching/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" + scheme "knative.dev/caching/pkg/client/clientset/versioned/scheme" ) // ImagesGetter has a method to return a ImageInterface. diff --git a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/interface.go b/vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/interface.go similarity index 87% rename from vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/interface.go rename to vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/interface.go index f561ac17e..1c7084650 100644 --- a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/interface.go +++ b/vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/interface.go @@ -19,8 +19,8 @@ limitations under the License. package caching import ( - v1alpha1 "github.com/knative/caching/pkg/client/informers/externalversions/caching/v1alpha1" - internalinterfaces "github.com/knative/caching/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1" + internalinterfaces "knative.dev/caching/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/v1alpha1/image.go b/vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1/image.go similarity index 90% rename from vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/v1alpha1/image.go rename to vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1/image.go index 95793c185..d1ca7e60e 100644 --- a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/v1alpha1/image.go +++ b/vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1/image.go @@ -21,14 +21,14 @@ package v1alpha1 import ( time "time" - cachingv1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" - versioned "github.com/knative/caching/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/caching/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/knative/caching/pkg/client/listers/caching/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + cachingv1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" + versioned "knative.dev/caching/pkg/client/clientset/versioned" + internalinterfaces "knative.dev/caching/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/caching/pkg/client/listers/caching/v1alpha1" ) // ImageInformer provides access to a shared informer and lister for diff --git a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/v1alpha1/interface.go b/vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1/interface.go similarity index 93% rename from vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/v1alpha1/interface.go rename to vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1/interface.go index 9eda181ad..09191a1cb 100644 --- a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/caching/v1alpha1/interface.go +++ b/vendor/knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/knative/caching/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "knative.dev/caching/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/factory.go b/vendor/knative.dev/caching/pkg/client/informers/externalversions/factory.go similarity index 95% rename from vendor/github.com/knative/caching/pkg/client/informers/externalversions/factory.go rename to vendor/knative.dev/caching/pkg/client/informers/externalversions/factory.go index b31e38dda..a6747358a 100644 --- a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/factory.go +++ b/vendor/knative.dev/caching/pkg/client/informers/externalversions/factory.go @@ -23,13 +23,13 @@ import ( sync "sync" time "time" - versioned "github.com/knative/caching/pkg/client/clientset/versioned" - caching "github.com/knative/caching/pkg/client/informers/externalversions/caching" - internalinterfaces "github.com/knative/caching/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + versioned "knative.dev/caching/pkg/client/clientset/versioned" + caching "knative.dev/caching/pkg/client/informers/externalversions/caching" + internalinterfaces "knative.dev/caching/pkg/client/informers/externalversions/internalinterfaces" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/generic.go b/vendor/knative.dev/caching/pkg/client/informers/externalversions/generic.go similarity index 96% rename from vendor/github.com/knative/caching/pkg/client/informers/externalversions/generic.go rename to vendor/knative.dev/caching/pkg/client/informers/externalversions/generic.go index 5b935ccde..8234c5314 100644 --- a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/generic.go +++ b/vendor/knative.dev/caching/pkg/client/informers/externalversions/generic.go @@ -21,9 +21,9 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + v1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/vendor/knative.dev/caching/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from vendor/github.com/knative/caching/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to vendor/knative.dev/caching/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 7681abb4a..d9e34383c 100644 --- a/vendor/github.com/knative/caching/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/vendor/knative.dev/caching/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,10 +21,10 @@ package internalinterfaces import ( time "time" - versioned "github.com/knative/caching/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + versioned "knative.dev/caching/pkg/client/clientset/versioned" ) type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer diff --git a/vendor/knative.dev/caching/pkg/client/injection/client/client.go b/vendor/knative.dev/caching/pkg/client/injection/client/client.go new file mode 100644 index 000000000..fd236c576 --- /dev/null +++ b/vendor/knative.dev/caching/pkg/client/injection/client/client.go @@ -0,0 +1,49 @@ +/* +Copyright 2018 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by injection-gen. DO NOT EDIT. + +package client + +import ( + "context" + + rest "k8s.io/client-go/rest" + versioned "knative.dev/caching/pkg/client/clientset/versioned" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" +) + +func init() { + injection.Default.RegisterClient(withClient) +} + +// Key is used as the key for associating information with a context.Context. +type Key struct{} + +func withClient(ctx context.Context, cfg *rest.Config) context.Context { + return context.WithValue(ctx, Key{}, versioned.NewForConfigOrDie(cfg)) +} + +// Get extracts the versioned.Interface client from the context. +func Get(ctx context.Context) versioned.Interface { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Fatalf( + "Unable to fetch %T from context.", (versioned.Interface)(nil)) + } + return untyped.(versioned.Interface) +} diff --git a/vendor/knative.dev/caching/pkg/client/injection/client/fake/fake.go b/vendor/knative.dev/caching/pkg/client/injection/client/fake/fake.go new file mode 100644 index 000000000..52d201591 --- /dev/null +++ b/vendor/knative.dev/caching/pkg/client/injection/client/fake/fake.go @@ -0,0 +1,54 @@ +/* +Copyright 2018 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by injection-gen. DO NOT EDIT. + +package fake + +import ( + "context" + + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/rest" + fake "knative.dev/caching/pkg/client/clientset/versioned/fake" + client "knative.dev/caching/pkg/client/injection/client" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" +) + +func init() { + injection.Fake.RegisterClient(withClient) +} + +func withClient(ctx context.Context, cfg *rest.Config) context.Context { + ctx, _ = With(ctx) + return ctx +} + +func With(ctx context.Context, objects ...runtime.Object) (context.Context, *fake.Clientset) { + cs := fake.NewSimpleClientset(objects...) + return context.WithValue(ctx, client.Key{}, cs), cs +} + +// Get extracts the Kubernetes client from the context. +func Get(ctx context.Context) *fake.Clientset { + untyped := ctx.Value(client.Key{}) + if untyped == nil { + logging.FromContext(ctx).Fatalf( + "Unable to fetch %T from context.", (*fake.Clientset)(nil)) + } + return untyped.(*fake.Clientset) +} diff --git a/vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/cachingfactory.go b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/cachingfactory.go new file mode 100644 index 000000000..416749631 --- /dev/null +++ b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/cachingfactory.go @@ -0,0 +1,52 @@ +/* +Copyright 2018 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by injection-gen. DO NOT EDIT. + +package cachingfactory + +import ( + "context" + + externalversions "knative.dev/caching/pkg/client/informers/externalversions" + client "knative.dev/caching/pkg/client/injection/client" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" +) + +func init() { + injection.Default.RegisterInformerFactory(withInformerFactory) +} + +// Key is used as the key for associating information with a context.Context. +type Key struct{} + +func withInformerFactory(ctx context.Context) context.Context { + c := client.Get(ctx) + return context.WithValue(ctx, Key{}, + externalversions.NewSharedInformerFactory(c, controller.GetResyncPeriod(ctx))) +} + +// Get extracts the InformerFactory from the context. +func Get(ctx context.Context) externalversions.SharedInformerFactory { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Fatalf( + "Unable to fetch %T from context.", (externalversions.SharedInformerFactory)(nil)) + } + return untyped.(externalversions.SharedInformerFactory) +} diff --git a/vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/fake/fake.go b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/fake/fake.go new file mode 100644 index 000000000..80f8260e5 --- /dev/null +++ b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/factory/fake/fake.go @@ -0,0 +1,41 @@ +/* +Copyright 2018 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by injection-gen. DO NOT EDIT. + +package fake + +import ( + "context" + + externalversions "knative.dev/caching/pkg/client/informers/externalversions" + fake "knative.dev/caching/pkg/client/injection/client/fake" + factory "knative.dev/caching/pkg/client/injection/informers/caching/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" +) + +var Get = factory.Get + +func init() { + injection.Fake.RegisterInformerFactory(withInformerFactory) +} + +func withInformerFactory(ctx context.Context) context.Context { + c := fake.Get(ctx) + return context.WithValue(ctx, factory.Key{}, + externalversions.NewSharedInformerFactory(c, controller.GetResyncPeriod(ctx))) +} diff --git a/vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go new file mode 100644 index 000000000..89776352f --- /dev/null +++ b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go @@ -0,0 +1,40 @@ +/* +Copyright 2018 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by injection-gen. DO NOT EDIT. + +package fake + +import ( + "context" + + fake "knative.dev/caching/pkg/client/injection/informers/caching/factory/fake" + image "knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" +) + +var Get = image.Get + +func init() { + injection.Fake.RegisterInformer(withInformer) +} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := fake.Get(ctx) + inf := f.Caching().V1alpha1().Images() + return context.WithValue(ctx, image.Key{}, inf), inf.Informer() +} diff --git a/vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/image.go b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/image.go new file mode 100644 index 000000000..7fdd83258 --- /dev/null +++ b/vendor/knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/image.go @@ -0,0 +1,52 @@ +/* +Copyright 2018 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by injection-gen. DO NOT EDIT. + +package image + +import ( + "context" + + v1alpha1 "knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1" + factory "knative.dev/caching/pkg/client/injection/informers/caching/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" +) + +func init() { + injection.Default.RegisterInformer(withInformer) +} + +// Key is used for associating the Informer inside the context.Context. +type Key struct{} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := factory.Get(ctx) + inf := f.Caching().V1alpha1().Images() + return context.WithValue(ctx, Key{}, inf), inf.Informer() +} + +// Get extracts the typed informer from the context. +func Get(ctx context.Context) v1alpha1.ImageInformer { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Fatalf( + "Unable to fetch %T from context.", (v1alpha1.ImageInformer)(nil)) + } + return untyped.(v1alpha1.ImageInformer) +} diff --git a/vendor/github.com/knative/caching/pkg/client/listers/caching/v1alpha1/expansion_generated.go b/vendor/knative.dev/caching/pkg/client/listers/caching/v1alpha1/expansion_generated.go similarity index 100% rename from vendor/github.com/knative/caching/pkg/client/listers/caching/v1alpha1/expansion_generated.go rename to vendor/knative.dev/caching/pkg/client/listers/caching/v1alpha1/expansion_generated.go diff --git a/vendor/github.com/knative/caching/pkg/client/listers/caching/v1alpha1/image.go b/vendor/knative.dev/caching/pkg/client/listers/caching/v1alpha1/image.go similarity index 97% rename from vendor/github.com/knative/caching/pkg/client/listers/caching/v1alpha1/image.go rename to vendor/knative.dev/caching/pkg/client/listers/caching/v1alpha1/image.go index 4ee740e43..619699167 100644 --- a/vendor/github.com/knative/caching/pkg/client/listers/caching/v1alpha1/image.go +++ b/vendor/knative.dev/caching/pkg/client/listers/caching/v1alpha1/image.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/caching/pkg/apis/caching/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1alpha1 "knative.dev/caching/pkg/apis/caching/v1alpha1" ) // ImageLister helps list Images. diff --git a/vendor/github.com/knative/pkg/test/OWNERS b/vendor/knative.dev/caching/test/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/test/OWNERS rename to vendor/knative.dev/caching/test/OWNERS diff --git a/vendor/github.com/knative/caching/test/presubmit-tests.sh b/vendor/knative.dev/caching/test/presubmit-tests.sh similarity index 100% rename from vendor/github.com/knative/caching/test/presubmit-tests.sh rename to vendor/knative.dev/caching/test/presubmit-tests.sh diff --git a/vendor/github.com/knative/pkg/.gitattributes b/vendor/knative.dev/pkg/.gitattributes similarity index 100% rename from vendor/github.com/knative/pkg/.gitattributes rename to vendor/knative.dev/pkg/.gitattributes diff --git a/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/breaking-change.md b/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/breaking-change.md new file mode 100644 index 000000000..735866193 --- /dev/null +++ b/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/breaking-change.md @@ -0,0 +1,22 @@ +--- +name: Breaking Change +about: Makes a breaking change to knative/pkg +title: '' +labels: +assignees: 'mattmoor' + +--- + +BREAKING CHANGES MUST STAGE CHANGES ONTO DOWNSTREAM +KNATIVE REPOSITORIES + + +| Repo | Pull Request | +|-------------------|--------------------------------| +| Build | knative/build#1234 | +| Eventing | knative/eventing#1234 | +| Serving | knative/serving#1234 | +| Sample Controller | knative/sample-controller#1234 | + + +cc @n3wscott @jasonhall diff --git a/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/bug-fix.md b/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/bug-fix.md new file mode 100644 index 000000000..3fdf033ba --- /dev/null +++ b/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/bug-fix.md @@ -0,0 +1,10 @@ +--- +name: Bug Fix +about: Fixes a bug in knative/pkg +title: '' +labels: kind/bug +assignees: '' + +--- + +Fixes: diff --git a/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/normal-change.md b/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/normal-change.md new file mode 100644 index 000000000..cc751f59c --- /dev/null +++ b/vendor/knative.dev/pkg/.github/PULL_REQUEST_TEMPLATE/normal-change.md @@ -0,0 +1,8 @@ +--- +name: Normal Change +about: Makes a boring change to the repo. +title: '' +labels: +assignees: '' + +--- diff --git a/vendor/github.com/knative/pkg/.github/issue-template.md b/vendor/knative.dev/pkg/.github/issue-template.md similarity index 100% rename from vendor/github.com/knative/pkg/.github/issue-template.md rename to vendor/knative.dev/pkg/.github/issue-template.md diff --git a/vendor/github.com/knative/pkg/.gitignore b/vendor/knative.dev/pkg/.gitignore similarity index 100% rename from vendor/github.com/knative/pkg/.gitignore rename to vendor/knative.dev/pkg/.gitignore diff --git a/vendor/github.com/knative/pkg/CONTRIBUTING.md b/vendor/knative.dev/pkg/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/knative/pkg/CONTRIBUTING.md rename to vendor/knative.dev/pkg/CONTRIBUTING.md diff --git a/vendor/github.com/knative/pkg/DEVELOPMENT.md b/vendor/knative.dev/pkg/DEVELOPMENT.md similarity index 89% rename from vendor/github.com/knative/pkg/DEVELOPMENT.md rename to vendor/knative.dev/pkg/DEVELOPMENT.md index 31565202e..cacef1081 100644 --- a/vendor/github.com/knative/pkg/DEVELOPMENT.md +++ b/vendor/knative.dev/pkg/DEVELOPMENT.md @@ -45,9 +45,8 @@ export PATH="${PATH}:${GOPATH}/bin" ### Checkout your fork -The Go tools require that you clone the repository to the -`src/github.com/knative/pkg` directory in your -[`GOPATH`](https://github.com/golang/go/wiki/SettingGOPATH). +The Go tools require that you clone the repository to the `src/knative.dev/pkg` +directory in your [`GOPATH`](https://github.com/golang/go/wiki/SettingGOPATH). To check out this repository: @@ -56,8 +55,8 @@ To check out this repository: 1. Clone it to your machine: ```shell -mkdir -p ${GOPATH}/src/github.com/knative -cd ${GOPATH}/src/github.com/knative +mkdir -p ${GOPATH}/src/knative.dev +cd ${GOPATH}/src/knative.dev git clone git@github.com:${YOUR_GITHUB_USERNAME}/pkg.git cd pkg git remote add upstream git@github.com:knative/pkg.git diff --git a/vendor/github.com/knative/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock similarity index 77% rename from vendor/github.com/knative/pkg/Gopkg.lock rename to vendor/knative.dev/pkg/Gopkg.lock index 90cf61935..eb5750db4 100644 --- a/vendor/github.com/knative/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -2,7 +2,7 @@ [[projects]] - digest = "1:ef8da480a66d7e8e9819261c3526685601b573e0005e84b75e47548d82021a7d" + digest = "1:5f43842d8fe08b43ada82d57e48a844800b4163d1150f7f451e81cb347fccb72" name = "cloud.google.com/go" packages = [ "compute/metadata", @@ -12,30 +12,38 @@ "trace/apiv2", ] pruneopts = "NUT" - revision = "0ebda48a7f143b1cce9eb37a8c1106ac762a3430" - version = "v0.34.0" + revision = "cf81fad90a1a1de334c4fc27e23eb9a4224b627a" + version = "v0.41.0" [[projects]] - digest = "1:43fbf05ea84c860a4e86b557d156b1e72511cd29375d3f71adb522362710aea7" + digest = "1:642cf8e80572f9dc0677b0f241c8ab2e715c9dccc215270ea873c86ddca0062c" + name = "contrib.go.opencensus.io/exporter/prometheus" + packages = ["."] + pruneopts = "NUT" + revision = "f4a2c1e53ec45636355d35fb9022b64e4bdd4a91" + version = "v0.1.0" + +[[projects]] + digest = "1:83bd9ccdcc61bb43f45e4336cf9622849b5a867ef137f8b53303968202970225" name = "contrib.go.opencensus.io/exporter/stackdriver" packages = [ ".", "monitoredresource", ] pruneopts = "NUT" - revision = "ab5a58af316a529613aadf9f50eeed1b6f044b2f" - version = "v0.9.2" + revision = "68e3d742b03c099c35428443886e65d9587c8d76" + version = "v0.12.2" [[projects]] - branch = "master" - digest = "1:cef70b547ce62d12ea8e5dcb9905bccb57ea1bb253ee6809fd79a17c29ca3cd5" - name = "contrib.go.opencensus.io/resource" - packages = ["resourcekeys"] + digest = "1:7b5f423f5b0dd3dfa32a19a6183b0ab9129bff371ebf3f9efae32f87e4986d8f" + name = "contrib.go.opencensus.io/exporter/zipkin" + packages = ["."] pruneopts = "NUT" - revision = "21591786a5e0c21806209b266cc6dfdfa85b3cdb" + revision = "30f9fad5db2c8944c21d223496e2543aeb445d4c" + version = "v0.1.1" [[projects]] - digest = "1:4a31397b1b81c6856aab6d2d963a727b4235af18adaaedc2cc51646ae812f683" + digest = "1:acf5b7756eca7cd8133461c44771fd318ee2bef31d4cc013551165473a984ba8" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -62,6 +70,7 @@ "internal/sdkuri", "internal/shareddefaults", "private/protocol", + "private/protocol/json/jsonutil", "private/protocol/query", "private/protocol/query/queryutil", "private/protocol/rest", @@ -69,19 +78,19 @@ "service/sts", ] pruneopts = "NUT" - revision = "3991042237b45cf58c9d5f34295942d5533c28c6" - version = "v1.16.11" + revision = "420cda5d6383f94f7d9c231aa44bad3325181950" + version = "v1.20.20" [[projects]] - branch = "master" digest = "1:707ebe952a8b3d00b343c01536c79c73771d100f63ec6babeaed5c79e2b8a8dd" name = "github.com/beorn7/perks" packages = ["quantile"] pruneopts = "NUT" - revision = "3a771d992973f24aa725d07868b467d1ddfceafb" + revision = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46" + version = "v1.0.0" [[projects]] - digest = "1:fa965c1fd0f17153f608037e109e62104058bc1d08d44849867795fd306fa8b8" + digest = "1:06bd9f98d7cf2097c16f820f980709eb4d04e1c7369132c351fbf1ffb54d3117" name = "github.com/census-instrumentation/opencensus-proto" packages = [ "gen-go/agent/common/v1", @@ -89,55 +98,59 @@ "gen-go/resource/v1", ] pruneopts = "NUT" - revision = "7f2434bc10da710debe5c4315ed6d4df454b4024" - version = "v0.1.0" + revision = "a105b96453fe85139acc07b68de48f2cbdd71249" + version = "v0.2.0" [[projects]] - digest = "1:6b21090f60571b20b3ddc2c8e48547dffcf409498ed6002c2cada023725ed377" + digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" name = "github.com/davecgh/go-spew" packages = ["spew"] pruneopts = "NUT" - revision = "782f4967f2dc4564575ca782fe2d04090b5faca8" + revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" + version = "v1.1.1" [[projects]] - digest = "1:32598368f409bbee79deb9d43569fcd92b9fb27f39155f5e166b3371217f051f" + digest = "1:4304cca260ab815326ca42d9c28fb843342748267034c51963e13f5e54e727d1" name = "github.com/evanphx/json-patch" packages = ["."] pruneopts = "NUT" - revision = "72bf35d0ff611848c1dc9df0f976c81192392fa5" - version = "v4.1.0" + revision = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f" + version = "v4.5.0" [[projects]] - digest = "1:abfe129dc92b16fbf0cc9d6336096a2823151756f62072a700eb10754141b38e" + digest = "1:81466b4218bf6adddac2572a30ac733a9255919bc2f470b4827a317bd4ee1756" name = "github.com/ghodss/yaml" packages = ["."] pruneopts = "NUT" - revision = "73d445a93680fa1a78ae23a5839bad48f32ba1ee" + revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" + version = "v1.0.0" [[projects]] - digest = "1:373397317168dd5ac00efda13940668f1947fd641f572b9cf386a86a99c63ca9" + digest = "1:53151cc4366e3945282d4b783fd41f35222cabbc75601e68d8133648c63498d1" name = "github.com/gobuffalo/envy" packages = ["."] pruneopts = "NUT" - revision = "801d7253ade1f895f74596b9a96147ed2d3b087e" - version = "v1.6.11" + revision = "043cb4b8af871b49563291e32c66bb84378a60ac" + version = "v1.7.0" [[projects]] - digest = "1:a6afc27b2a73a5506832f3c5a1c19a30772cb69e7bd1ced4639eb36a55db224f" + digest = "1:a1b2a5e38f79688ee8250942d5fa960525fceb1024c855c7bc76fa77b0f3cca2" name = "github.com/gogo/protobuf" packages = [ "proto", "sortkeys", ] pruneopts = "NUT" - revision = "c0656edd0d9eab7c66d1eb0c568f9039345796f7" + revision = "ba06b47c162d49f2af050fb4c75bcbc86a159d5c" + version = "v1.2.1" [[projects]] - digest = "1:78b8040ece2ff622580def2708b9eb0b2857711b6744c475439bf337e9c677ea" + branch = "master" + digest = "1:e2b86e41f3d669fc36b50d31d32d22c8ac656c75aa5ea89717ce7177e134ff2a" name = "github.com/golang/glog" packages = ["."] pruneopts = "NUT" - revision = "44145f04b68cf362d9c4df2182967c2275eaefed" + revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] branch = "master" @@ -145,10 +158,10 @@ name = "github.com/golang/groupcache" packages = ["lru"] pruneopts = "NUT" - revision = "5b532d6fd5efaf7fa130d4e859a2fde0fc3a9e1b" + revision = "869f871628b6baa9cfbc11732cdf6546b17c1298" [[projects]] - digest = "1:4dacf728c83400b3e9d1d3025dd3c1e93e9a1b033726d1b193dc209f3fa9cb7a" + digest = "1:f5a98770ab68c1146ee5cc14ed24aafa2bb1a2b3c89cbeadc9eb913b1f9d930a" name = "github.com/golang/protobuf" packages = [ "proto", @@ -162,16 +175,16 @@ "ptypes/wrappers", ] pruneopts = "NUT" - revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" - version = "v1.2.0" + revision = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7" + version = "v1.3.2" [[projects]] - branch = "master" - digest = "1:245bd4eb633039cd66106a5d340ae826d87f4e36a8602fcc940e14176fd26ea7" + digest = "1:05f95ffdfcf651bdb0f05b40b69e7f5663047f8da75c72d58728acb59b5cc107" name = "github.com/google/btree" packages = ["."] pruneopts = "NUT" - revision = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4" + revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" + version = "v1.0.0" [[projects]] digest = "1:010d46ea3c1e730897e53058d1013a963f3f987675dda87df64f891b945281db" @@ -188,15 +201,16 @@ revision = "6f77996f0c42f7b84e5a2b252227263f93432e9b" [[projects]] - digest = "1:f9425215dccf1c63f659ec781ca46bc81804341821d0cd8d2459c5b58f8bd067" + digest = "1:52c5834e2bebac9030c97cc0798ac11c3aa8a39f098aeb419f142533da6cd3cc" name = "github.com/google/gofuzz" packages = ["."] pruneopts = "NUT" - revision = "44d81051d367757e1c7c6a5a86423ece9afcf63c" + revision = "f140a6486e521aad38f5917de355cbf147cc0496" + version = "v1.0.0" [[projects]] branch = "master" - digest = "1:0d5e3798bfa2642ac268341c96710b8def1f3cbc3bc803c421d90704d72107d8" + digest = "1:a8674ea5ceb0c2a72a9b9518415b73d26d6c77aec49fe7fee78f15d6d137fc3a" name = "github.com/google/licenseclassifier" packages = [ ".", @@ -207,7 +221,7 @@ "stringclassifier/searchset/tokenizer", ] pruneopts = "NUT" - revision = "e979a0b10eebe748549c702a25e997c556349da6" + revision = "c3068f13fcc3961fd05f96f13c8250e350db4209" [[projects]] digest = "1:ab3ec1fe3e39bac4b3ab63390767766622be35b7cab03f47f787f9ec60522a53" @@ -218,18 +232,15 @@ version = "v1.1.1" [[projects]] - digest = "1:fd4d1f4c2d75aee3833ee7d8ef11fcf42ddec3c63d1819548288c3d868d6eb14" + digest = "1:4b76f3e067eed897a45242383a2aa4d0a2fdbf73a8d00c03167dba80c43630b1" name = "github.com/googleapis/gax-go" - packages = [ - ".", - "v2", - ] + packages = ["v2"] pruneopts = "NUT" - revision = "c8a15bac9b9fe955bd9f900272f9a306465d28cf" - version = "v2.0.3" + revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2" + version = "v2.0.5" [[projects]] - digest = "1:27b4ab41ffdc76ad6db56db327a4db234a59588ef059fc3fd678ba0bc6b9094f" + digest = "1:459a00967aaf06edff3228e128dd243d7c91b0fc11ad2f7ceaa98f094bf66796" name = "github.com/googleapis/gnostic" packages = [ "OpenAPIv2", @@ -237,7 +248,8 @@ "extensions", ] pruneopts = "NUT" - revision = "0c5108395e2debce0d731cf0287ddf7242066aba" + revision = "e73c7ec21d36ddb0711cb36d1502d18363b5c2c9" + version = "v0.3.0" [[projects]] digest = "1:4a0c072e44da763409da72d41492373a034baf2e6d849c76d239b4abdfbb6c49" @@ -249,32 +261,33 @@ [[projects]] branch = "master" - digest = "1:7fdf3223c7372d1ced0b98bf53457c5e89d89aecbad9a77ba9fcc6e01f9e5621" + digest = "1:a86d65bc23eea505cd9139178e4d889733928fe165c7a008f41eaab039edf9df" name = "github.com/gregjones/httpcache" packages = [ ".", "diskcache", ] pruneopts = "NUT" - revision = "9cad4c3443a7200dd6400aef47183728de563a38" + revision = "901d90724c7919163f472a9812253fb26761123d" [[projects]] - digest = "1:475b179287e8afdcd352014b2c2500e67decdf63e66125e2129286873453e1cd" + digest = "1:52094d0f8bdf831d1a2401e9b6fee5795fdc0b2a2d1f8bb1980834c289e79129" name = "github.com/hashicorp/golang-lru" packages = [ ".", "simplelru", ] pruneopts = "NUT" - revision = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" + revision = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" + version = "v0.5.1" [[projects]] - digest = "1:9a52adf44086cead3b384e5d0dbf7a1c1cce65e67552ee3383a8561c42a18cd3" + digest = "1:aaa38889f11896ee3644d77e17dc7764cc47f5f3d3b488268df2af2b52541c5f" name = "github.com/imdario/mergo" packages = ["."] pruneopts = "NUT" - revision = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4" - version = "v0.3.6" + revision = "7c29201646fa3de8506f701213473dd407f19646" + version = "v0.3.7" [[projects]] digest = "1:1f2aebae7e7c856562355ec0198d8ca2fa222fb05e5b1b66632a1fce39631885" @@ -300,14 +313,14 @@ [[projects]] branch = "master" - digest = "1:1bfc083da5bbeb7abaac53c56890eb14eb11bac9ec985bfe338c4bbb0540c9ba" + digest = "1:f91a467423c58e30754cb830f66a04fa3e6f28fe567e3e68e04aa61f3e51f377" name = "github.com/knative/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "1576da30069624094cf01719452da944b3046826" + revision = "cad8ba5b64ca151d6435a914fd29f0b8a5cdec74" [[projects]] digest = "1:56dbf15e091bf7926cb33a57cb6bdfc658fc6d3498d2f76f10a97ce7856f1fde" @@ -350,7 +363,7 @@ version = "1.0.1" [[projects]] - digest = "1:22d4043da943b919108e0d1b07983b8d29edeadfba9fb8f3213208d3e9798aae" + digest = "1:1dd0ef584fe04a3e14297c004da996de66c1816666d25836d24696bea6194a63" name = "github.com/openzipkin/zipkin-go" packages = [ ".", @@ -362,24 +375,24 @@ "reporter/recorder", ] pruneopts = "NUT" - revision = "1b5162aa314e6ccfcf83777bfb5218988c9e8283" - version = "v0.1.6" + revision = "1277a5f30075b9c13d37775aed4f0f3b44d1a710" + version = "v0.2.0" [[projects]] branch = "master" - digest = "1:3bf17a6e6eaa6ad24152148a631d18662f7212e21637c2699bff3369b7f00fa2" + digest = "1:89da0f0574bc94cfd0ac8b59af67bf76cdd110d503df2721006b9f0492394333" name = "github.com/petar/GoLLRB" packages = ["llrb"] pruneopts = "NUT" - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" + revision = "33fb24c13b99c46c93183c291836c573ac382536" [[projects]] - digest = "1:6c6d91dc326ed6778783cff869c49fb2f61303cdd2ebbcf90abe53505793f3b6" + digest = "1:e1b94bd98c62fc2f905621fc6ba8209b7004e4513a1dfecb12a3de56ec2bb519" name = "github.com/peterbourgon/diskv" packages = ["."] pruneopts = "NUT" - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" + revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6" + version = "v3.0.0" [[projects]] digest = "1:14715f705ff5dfe0ffd6571d7d201dd8e921030f8070321a79380d8ca4ec1a24" @@ -390,7 +403,7 @@ version = "v0.8.1" [[projects]] - digest = "1:7c7cfeecd2b7147bcfec48a4bf622b4879e26aec145a9e373ce51d0c23b16f6b" + digest = "1:097cc61836050f45cbb712ae3bb45d66fba464c16b8fac09907fa3c1f753eff6" name = "github.com/prometheus/client_golang" packages = [ "prometheus", @@ -398,8 +411,8 @@ "prometheus/promhttp", ] pruneopts = "NUT" - revision = "505eaef017263e299324067d40ca2c48f6a2cf50" - version = "v0.9.2" + revision = "4ab88e80c249ed361d3299e2930427d9ac43ef8d" + version = "v1.0.0" [[projects]] branch = "master" @@ -407,11 +420,10 @@ name = "github.com/prometheus/client_model" packages = ["go"] pruneopts = "NUT" - revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" + revision = "fd36f4220a901265f90734c3183c5f0c91daa0b8" [[projects]] - branch = "master" - digest = "1:fad5a35eea6a1a33d6c8f949fbc146f24275ca809ece854248187683f52cc30b" + digest = "1:d03ca24670416dc8fccc78b05d6736ec655416ca7db0a028e8fb92cfdfe3b55e" name = "github.com/prometheus/common" packages = [ "expfmt", @@ -419,20 +431,19 @@ "model", ] pruneopts = "NUT" - revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" + revision = "31bed53e4047fd6c510e43a941f90cb31be0972a" + version = "v0.6.0" [[projects]] - branch = "master" - digest = "1:102dea0c03a915acfc634b7c67f2662012b5483b56d9025e33f5188e112759b6" + digest = "1:19305fc369377c111c865a7a01e11c675c57c52a932353bbd4ea360bd5b72d99" name = "github.com/prometheus/procfs" packages = [ ".", - "internal/util", - "nfs", - "xfs", + "internal/fs", ] pruneopts = "NUT" - revision = "185b4288413d2a0dd0806f78c90dde719829e5ae" + revision = "3f98efb27840a48a7a2898ec80be07674d19f9c8" + version = "v0.0.3" [[projects]] digest = "1:e09ada96a5a41deda4748b1659cc8953961799e798aea557257b56baee4ecaf3" @@ -443,7 +454,8 @@ "semver", ] pruneopts = "NUT" - revision = "4bbc89b6501cca7dd6b5557d78d70c8d2c6e8b97" + revision = "438578804ca6f31be148c27683afc419ce47c06e" + version = "v1.3.0" [[projects]] digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04" @@ -462,20 +474,20 @@ version = "v1.0.3" [[projects]] - digest = "1:b8baa7541ef444be218da02d3a7b607d33513263660e489d86d429afbffcdd86" + digest = "1:0e3fd52087079d1289983e4fef32268ca965973f5370b69204e2934185527baa" name = "go.opencensus.io" packages = [ ".", - "exporter/prometheus", - "exporter/zipkin", "internal", "internal/tagencoding", "metric/metricdata", + "metric/metricexport", "metric/metricproducer", "plugin/ocgrpc", "plugin/ochttp", "plugin/ochttp/propagation/b3", "resource", + "resource/resourcekeys", "stats", "stats/internal", "stats/view", @@ -486,16 +498,16 @@ "trace/tracestate", ] pruneopts = "NUT" - revision = "75c0cca22312e51bfd4fafdbe9197ae399e18b38" - version = "v0.20.2" + revision = "9c377598961b706d1542bd2d84d538b5094d596e" + version = "v0.22.0" [[projects]] - digest = "1:22f696cee54865fb8e9ff91df7b633f6b8f22037a8015253c6b6a71ca82219c7" + digest = "1:cc9d86ec4e6e3bdf87e3a421273bfeed003cf8e21351c0302fe8b0eb7b10efe6" name = "go.uber.org/atomic" packages = ["."] pruneopts = "NUT" - revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289" - version = "v1.3.2" + revision = "df976f2515e274675050de7b3f42545de80594fd" + version = "v1.4.0" [[projects]] digest = "1:58ca93bdf81bac106ded02226b5395a0595d5346cdc4caa8d9c1f3a5f8f9976e" @@ -522,15 +534,16 @@ revision = "67bc79d13d155c02fd008f721863ff8cc5f30659" [[projects]] - digest = "1:624a05c7c6ed502bf77364cd3d54631383dafc169982fddd8ee77b53c3d9cccf" + branch = "master" + digest = "1:bbe51412d9915d64ffaa96b51d409e070665efc5194fcf145c4a27d4133107a4" name = "golang.org/x/crypto" packages = ["ssh/terminal"] pruneopts = "NUT" - revision = "81e90905daefcd6fd217b62423c0908922eadb30" + revision = "4def268fd1a49955bfb3dda92fe3db4f924f2285" [[projects]] branch = "master" - digest = "1:3033eba8bb0c8f2c6720e68e4c14e55b577ae9debb5f5b7b8cc6f319d89edc82" + digest = "1:5578b99717f08e6480d7e0480f758749c12f9cc5da19a33a863dc7307fd699fb" name = "golang.org/x/net" packages = [ "context", @@ -543,11 +556,11 @@ "trace", ] pruneopts = "NUT" - revision = "49bb7cea24b1df9410e1712aa6433dae904ff66a" + revision = "da137c7871d730100384dbcf36e6f8fa493aef5b" [[projects]] branch = "master" - digest = "1:dcb89c032286a9c3c5118a1496f8e0e237c1437f5356ac9602f6fdef560a5c21" + digest = "1:1519760444b90c560eb01373869bc66fd539e6fe1bf77af22047c43edc40ab35" name = "golang.org/x/oauth2" packages = [ ".", @@ -557,38 +570,40 @@ "jwt", ] pruneopts = "NUT" - revision = "c57b0facaced709681d9f90397429b9430a74754" + revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" [[projects]] branch = "master" - digest = "1:c313aef534e493304f3666fbd24dca5932ebf776a82b7a40f961c9355794a1b1" + digest = "1:a2fc247e64b5dafd3251f12d396ec85f163d5bb38763c4997856addddf6e78d8" name = "golang.org/x/sync" packages = [ "errgroup", "semaphore", ] pruneopts = "NUT" - revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" + revision = "112230192c580c3556b8cee6403af37a4fc5f28c" [[projects]] branch = "master" - digest = "1:a801d3c417117b67a96353daad340b250619780b75c29b652ea13697c946553e" + digest = "1:5f0606c755c423ee9970d55028e0ee09df03e33297a39d6b83c2502dc9a2193f" name = "golang.org/x/sys" packages = [ "unix", "windows", ] pruneopts = "NUT" - revision = "e072cadbbdc8dd3d3ffa82b8b4b9304c261d9311" + revision = "fae7ac547cb717d141c433a2a173315e216b64c4" [[projects]] - digest = "1:e7071ed636b5422cc51c0e3a6cebc229d6c9fffc528814b519a980641422d619" + digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -601,31 +616,41 @@ "unicode/rangetable", ] pruneopts = "NUT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] - digest = "1:d37b0ef2944431fe9e8ef35c6fffc8990d9e2ca300588df94a6890f3649ae365" + branch = "master" + digest = "1:9fdc2b55e8e0fafe4b41884091e51e77344f7dc511c5acedcfd98200003bff90" name = "golang.org/x/time" packages = ["rate"] pruneopts = "NUT" - revision = "f51c12702a4d776e4c1fa9b0fabab841babae631" + revision = "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef" [[projects]] branch = "master" - digest = "1:e1c96c8c8ce0af57da9dccb008e540b3d13b55ea04b530fb4fceb81706082bdd" + digest = "1:59988b91533530837bdec96e34fefa9df629d8ee89f3603387c57763b9fed432" name = "golang.org/x/tools" packages = [ "go/ast/astutil", + "go/gcexportdata", + "go/internal/gcimporter", + "go/internal/packagesdriver", + "go/packages", + "go/types/typeutil", "imports", "internal/fastwalk", + "internal/gopathwalk", + "internal/imports", + "internal/module", + "internal/semver", ] pruneopts = "NUT" - revision = "bfb5194568d3c40db30de765edc44cae9fc94671" + revision = "8b927904ee0dec805c89aaf9172f4459296ed6e8" [[projects]] branch = "master" - digest = "1:7689634b1a2940f3e725a37a7598b5462674a5b016b17d8ce22c8f71cacb0b34" + digest = "1:9b9245bd124d95af7072487cd1e5861174b859ebc31cbe9fbab3b88456701485" name = "google.golang.org/api" packages = [ "googleapi/transport", @@ -639,10 +664,10 @@ "transport/http/internal/propagation", ] pruneopts = "NUT" - revision = "ce4acf611b3920b111e21272a15ddaea10c1fd2e" + revision = "aa15faf3c8a1cffc77fc3dabe95703bb12c5f6a9" [[projects]] - digest = "1:898bf528e5c601c4a1111586f75ab9515467ebe7a41ae849d5a839720d4e2580" + digest = "1:a955e7c44c2be14b61aa2ddda744edfdfbc6817e993703a16e303c277ba84449" name = "google.golang.org/appengine" packages = [ ".", @@ -659,12 +684,12 @@ "urlfetch", ] pruneopts = "NUT" - revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1" - version = "v1.4.0" + revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" + version = "v1.6.1" [[projects]] branch = "master" - digest = "1:3689f4cc57cc55b4631efc4b778c47d2a888a7060b4108f42cf289a2033be5ba" + digest = "1:0ee5f291bbeb4c9664aad14ad9a64e52cdeed406c97549beb6028adb9d7b8afc" name = "google.golang.org/genproto" packages = [ "googleapis/api", @@ -680,20 +705,30 @@ "protobuf/field_mask", ] pruneopts = "NUT" - revision = "e7d98fc518a78c9f8b5ee77be7b0b317475d89e1" + revision = "3bdd9d9f5532d75d09efb230bd767d265245cfe5" [[projects]] - digest = "1:40d377bfddee53c669db275071aa08b68d021941311580d902ab7c862d8741c1" + digest = "1:89cc3cf640fa24f7345509981e7ab088ee8d4d4f08cf3b5783508856b146b438" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", + "balancer/grpclb", + "balancer/grpclb/grpc_lb_v1", "balancer/roundrobin", "binarylog/grpc_binarylog_v1", "codes", "connectivity", "credentials", + "credentials/alts", + "credentials/alts/internal", + "credentials/alts/internal/authinfo", + "credentials/alts/internal/conn", + "credentials/alts/internal/handshaker", + "credentials/alts/internal/handshaker/service", + "credentials/alts/internal/proto/grpc_gcp", + "credentials/google", "credentials/internal", "credentials/oauth", "encoding", @@ -701,6 +736,7 @@ "grpclog", "internal", "internal/backoff", + "internal/balancerload", "internal/binarylog", "internal/channelz", "internal/envconfig", @@ -715,13 +751,14 @@ "resolver", "resolver/dns", "resolver/passthrough", + "serviceconfig", "stats", "status", "tap", ] pruneopts = "NUT" - revision = "df014850f6dee74ba2fc94874043a9f3f75fbfd8" - version = "v1.17.0" + revision = "1d89a3c832915b2314551c1d2a506874d62e53f7" + version = "v1.22.0" [[projects]] digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" @@ -777,8 +814,8 @@ "storage/v1beta1", ] pruneopts = "NUT" - revision = "145d52631d00cbfe68490d19ae4f0f501fd31a95" - version = "kubernetes-1.12.6" + revision = "9ad12a4af32677db3ae70bef3371bf9b618eb3a0" + version = "kubernetes-1.12.9" [[projects]] digest = "1:6def8acd040e85b3becb1dd73de1f22a787fd9776e32aa3bbac9cf9727b53d0d" @@ -798,8 +835,8 @@ "pkg/client/listers/apiextensions/v1beta1", ] pruneopts = "NUT" - revision = "bd0469a053ff88529a61145790499fe78a09a49d" - version = "kubernetes-1.12.6" + revision = "fa58353d80f37509c2b8de8e67f2377a2bc2ce80" + version = "kubernetes-1.12.9" [[projects]] digest = "1:119ae04ee44c5d179dcde1ee686f057cfe3fc54a7ee8484b920932a80309e88b" @@ -854,10 +891,10 @@ ] pruneopts = "NUT" revision = "01f179d85dbce0f2e0e4351a92394b38694b7cae" - version = "kubernetes-1.12.6" + version = "kubernetes-1.12.9" [[projects]] - digest = "1:b7dd0420e85cb2968ffb945f2810ea6c796dc2a08660618e2200c08c596f0624" + digest = "1:132ea9b0bdac4c461e2de359d44ece44531b3062c1d52ff88a7cc8857be25063" name = "k8s.io/client-go" packages = [ "discovery", @@ -1029,8 +1066,8 @@ "util/workqueue", ] pruneopts = "NUT" - revision = "78295b709ec6fa5be12e35892477a326dea2b5d3" - version = "kubernetes-1.12.6" + revision = "4f3abb12cae2d6817e1b6d72d9cbc3d3a6ddf965" + version = "kubernetes-1.12.9" [[projects]] digest = "1:26b81b5e76e3f84ea5140da4f74649576e470f79091d2ef8e0d1b5000bc636ca" @@ -1058,7 +1095,7 @@ ] pruneopts = "T" revision = "b1289fc74931d4b6b04bd1a259acfc88a2cb0a66" - version = "kubernetes-1.12.6" + version = "kubernetes-1.12.9" [[projects]] branch = "master" @@ -1078,28 +1115,30 @@ revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985" [[projects]] - digest = "1:c263611800c3a97991dbcf9d3bc4de390f6224aaa8ca0a7226a9d734f65a416a" + digest = "1:43099cc4ed575c40f80277c7ba7168df37d0c663bdc4f541325430bd175cce8a" name = "k8s.io/klog" packages = ["."] pruneopts = "NUT" - revision = "71442cd4037d612096940ceb0f3fec3f7fff66e0" - version = "v0.2.0" + revision = "d98d8acdac006fb39831f1b25640813fef9c314f" + version = "v0.3.3" [[projects]] branch = "master" - digest = "1:a2c842a1e0aed96fd732b535514556323a6f5edfded3b63e5e0ab1bce188aa54" + digest = "1:42674e29bf0cf4662d49bd9528e24b9ecc4895b32d0be281f9cf04d3a7671846" name = "k8s.io/kube-openapi" packages = ["pkg/util/proto"] pruneopts = "NUT" - revision = "e3762e86a74c878ffed47484592986685639c2cd" + revision = "33be087ad058f99c78e067996202b60230737e49" [solve-meta] analyzer-name = "dep" analyzer-version = 1 input-imports = [ "cloud.google.com/go/compute/metadata", + "contrib.go.opencensus.io/exporter/prometheus", "contrib.go.opencensus.io/exporter/stackdriver", "contrib.go.opencensus.io/exporter/stackdriver/monitoredresource", + "contrib.go.opencensus.io/exporter/zipkin", "github.com/davecgh/go-spew/spew", "github.com/evanphx/json-patch", "github.com/ghodss/yaml", @@ -1120,8 +1159,6 @@ "github.com/pkg/errors", "github.com/rogpeppe/go-internal/semver", "github.com/spf13/pflag", - "go.opencensus.io/exporter/prometheus", - "go.opencensus.io/exporter/zipkin", "go.opencensus.io/plugin/ochttp", "go.opencensus.io/plugin/ochttp/propagation/b3", "go.opencensus.io/stats", diff --git a/vendor/github.com/knative/pkg/Gopkg.toml b/vendor/knative.dev/pkg/Gopkg.toml similarity index 83% rename from vendor/github.com/knative/pkg/Gopkg.toml rename to vendor/knative.dev/pkg/Gopkg.toml index 4403eaaec..fe99cab6c 100644 --- a/vendor/github.com/knative/pkg/Gopkg.toml +++ b/vendor/knative.dev/pkg/Gopkg.toml @@ -16,23 +16,23 @@ required = [ [[constraint]] name = "k8s.io/api" - version = "kubernetes-1.12.6" + version = "kubernetes-1.12.9" [[override]] name = "k8s.io/apiextensions-apiserver" - version = "kubernetes-1.12.6" + version = "kubernetes-1.12.9" [[constraint]] name = "k8s.io/apimachinery" - version = "kubernetes-1.12.6" + version = "kubernetes-1.12.9" [[constraint]] name = "k8s.io/client-go" - version = "kubernetes-1.12.6" + version = "kubernetes-1.12.9" [[constraint]] name = "k8s.io/code-generator" - version = "kubernetes-1.12.6" + version = "kubernetes-1.12.9" [[override]] name = "github.com/json-iterator/go" @@ -51,13 +51,11 @@ required = [ [[override]] name = "github.com/rogpeppe/go-internal" - # HEAD as of 2019-01-09 - # Needed because release 1.0.0 does not contain a LICENSE file - revision = "4bbc89b6501cca7dd6b5557d78d70c8d2c6e8b97" + version = "1.3.0" [[constraint]] name = "contrib.go.opencensus.io/exporter/stackdriver" - version = "0.9.2" + version = "v0.12.2" [[constraint]] name = "github.com/knative/test-infra" diff --git a/vendor/knative.dev/pkg/LICENSE b/vendor/knative.dev/pkg/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/vendor/knative.dev/pkg/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/knative/pkg/OWNERS b/vendor/knative.dev/pkg/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/OWNERS rename to vendor/knative.dev/pkg/OWNERS diff --git a/vendor/github.com/knative/pkg/OWNERS_ALIASES b/vendor/knative.dev/pkg/OWNERS_ALIASES similarity index 96% rename from vendor/github.com/knative/pkg/OWNERS_ALIASES rename to vendor/knative.dev/pkg/OWNERS_ALIASES index beee78a4f..3a67d040e 100644 --- a/vendor/github.com/knative/pkg/OWNERS_ALIASES +++ b/vendor/knative.dev/pkg/OWNERS_ALIASES @@ -51,9 +51,7 @@ aliases: - chaodaiG - coryrc - dushyanthsc - - ericKlawitter - Fredy-Z - - nbarthwal - srinivashegde86 - steuhs - yt3liu diff --git a/vendor/github.com/knative/pkg/README.md b/vendor/knative.dev/pkg/README.md similarity index 100% rename from vendor/github.com/knative/pkg/README.md rename to vendor/knative.dev/pkg/README.md diff --git a/vendor/knative.dev/pkg/RELEASING.md b/vendor/knative.dev/pkg/RELEASING.md new file mode 100644 index 000000000..40ec7b2d4 --- /dev/null +++ b/vendor/knative.dev/pkg/RELEASING.md @@ -0,0 +1,91 @@ +# Releasing knative/pkg + +We release the components of Knative every 6 weeks. All of these components must +be moved to the latest "release" of the knative/pkg shared library prior to each +release, but likely this should happen incrementally over each milestone. + +## Release Process. + +### Step #1: Monday the week prior to each release. + +On Monday of the week prior to the Knative release, each of the downstream +repositories should stage a `[WIP]` Pull Request that advances the knative/pkg +dependency to the latest commit. + +At present, these downstream repositories include: + +1. knative/serving +1. knative/eventing +1. knative/eventing-contrib +1. knative/build +1. knative/sample-controller +1. GoogleCloudPlatform/cloud-run-events + +> The automation that auto-bumps these lives +> [here](https://github.com/mattmoor/knobots/tree/knative/cmd/periodic/kodata). + +`Gopkg.toml` should look like: + +```toml +[[override]] + name = "knative.dev/pkg" + branch = "master" +``` + +Then the following is run: + +```shell +dep ensure -update knative.dev/pkg +./hack/update-codegen.sh +``` + +If problems are found, they are addressed and the update is merged, and this +process repeats until knative/pkg can be cleanly updated without any changes. + +> If by mid-week, we do not have a clean PR in each repository, the person +> driving the update should escalate to avoid delaying the release. + +### Step #2: Friday the week prior to each release. + +A release branch is snapped on knative/pkg with the form `release-0.X` where `X` +reflects the forthcoming Knative release. The commit at which this branch is +snapped will be the version that has been staged into `[WIP]` PRs in every +repository. + +These staging PRs are then updated to: + +```toml +[[override]] + name = "knative.dev/pkg" + # The 0.X release branch. + branch = "release-0.X" +``` + +The `[WIP]` is removed, and the PRs are reviewed and merged. + +## Backporting Fixes + +If a problem is found in knative/pkg in an older release and a fix must be +backported then it should first be fixed at HEAD (if still relevant). It should +be called out and likely discussed (with a lead) in the original PR whether the +fix is desired and eligible for back-porting to a release branch. This may raise +the review bar, or lead to trade-offs in design; it is better to front-load this +consideration to avoid delaying a cherry-pick. + +Once that PR has merged (if still relevant), the same commit should be +cherry-picked onto `release-0.Y` and any merge problems fixed up. + +Once the change is ready, a PR should be sent against `release-0.Y` with the +prefix `[RELEASE-0.Y] Your PR Title` to clearly designate this PR as targeting +the release branch. A lead will review and make a ruling on the PR, but if this +consideration was front-loaded, it should be a short review. + +### Picking up fixes + +Downstream repositories should reference `knative/pkg` release branches from +their own release branches, so to update the `knative/pkg` dependency we run: + +```shell +dep ensure -update knative.dev/pkg +./hack/update-deps.sh +``` diff --git a/vendor/github.com/knative/pkg/apis/OWNERS b/vendor/knative.dev/pkg/apis/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/apis/OWNERS rename to vendor/knative.dev/pkg/apis/OWNERS diff --git a/vendor/github.com/knative/pkg/apis/condition_set.go b/vendor/knative.dev/pkg/apis/condition_set.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/condition_set.go rename to vendor/knative.dev/pkg/apis/condition_set.go diff --git a/vendor/github.com/knative/pkg/apis/condition_types.go b/vendor/knative.dev/pkg/apis/condition_types.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/condition_types.go rename to vendor/knative.dev/pkg/apis/condition_types.go index 8f5603c0f..31c566807 100644 --- a/vendor/github.com/knative/pkg/apis/condition_types.go +++ b/vendor/knative.dev/pkg/apis/condition_types.go @@ -55,6 +55,7 @@ const ( // Conditions defines a readiness condition for a Knative resource. // See: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#typical-status-properties // +k8s:deepcopy-gen=true +// +k8s:openapi-gen=true type Condition struct { // Type of condition. // +required diff --git a/vendor/github.com/knative/pkg/apis/contexts.go b/vendor/knative.dev/pkg/apis/contexts.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/contexts.go rename to vendor/knative.dev/pkg/apis/contexts.go diff --git a/vendor/github.com/knative/pkg/apis/deprecated.go b/vendor/knative.dev/pkg/apis/deprecated.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/deprecated.go rename to vendor/knative.dev/pkg/apis/deprecated.go diff --git a/vendor/github.com/knative/pkg/apis/doc.go b/vendor/knative.dev/pkg/apis/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/doc.go rename to vendor/knative.dev/pkg/apis/doc.go diff --git a/vendor/github.com/knative/pkg/apis/duck/OWNERS b/vendor/knative.dev/pkg/apis/duck/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/OWNERS rename to vendor/knative.dev/pkg/apis/duck/OWNERS diff --git a/vendor/github.com/knative/pkg/apis/duck/cached.go b/vendor/knative.dev/pkg/apis/duck/cached.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/cached.go rename to vendor/knative.dev/pkg/apis/duck/cached.go diff --git a/vendor/github.com/knative/pkg/apis/duck/doc.go b/vendor/knative.dev/pkg/apis/duck/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/doc.go rename to vendor/knative.dev/pkg/apis/duck/doc.go diff --git a/vendor/github.com/knative/pkg/apis/duck/enqueue.go b/vendor/knative.dev/pkg/apis/duck/enqueue.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/enqueue.go rename to vendor/knative.dev/pkg/apis/duck/enqueue.go diff --git a/vendor/github.com/knative/pkg/apis/duck/interface.go b/vendor/knative.dev/pkg/apis/duck/interface.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/interface.go rename to vendor/knative.dev/pkg/apis/duck/interface.go diff --git a/vendor/github.com/knative/pkg/apis/duck/patch.go b/vendor/knative.dev/pkg/apis/duck/patch.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/patch.go rename to vendor/knative.dev/pkg/apis/duck/patch.go diff --git a/vendor/github.com/knative/pkg/apis/duck/proxy.go b/vendor/knative.dev/pkg/apis/duck/proxy.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/proxy.go rename to vendor/knative.dev/pkg/apis/duck/proxy.go diff --git a/vendor/github.com/knative/pkg/apis/duck/register.go b/vendor/knative.dev/pkg/apis/duck/register.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/register.go rename to vendor/knative.dev/pkg/apis/duck/register.go diff --git a/vendor/github.com/knative/pkg/apis/duck/typed.go b/vendor/knative.dev/pkg/apis/duck/typed.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/duck/typed.go rename to vendor/knative.dev/pkg/apis/duck/typed.go index 397f3a874..bf992c49f 100644 --- a/vendor/github.com/knative/pkg/apis/duck/typed.go +++ b/vendor/knative.dev/pkg/apis/duck/typed.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/tools/cache" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) // TypedInformerFactory implements InformerFactory such that the elements diff --git a/vendor/github.com/knative/pkg/apis/duck/unstructured.go b/vendor/knative.dev/pkg/apis/duck/unstructured.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/unstructured.go rename to vendor/knative.dev/pkg/apis/duck/unstructured.go diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/addressable_types.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/addressable_types.go similarity index 96% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/addressable_types.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/addressable_types.go index 75ab2f573..2b5fcbd9e 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/addressable_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1alpha1/addressable_types.go @@ -20,9 +20,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/apis/duck" - "github.com/knative/pkg/apis/duck/v1beta1" + "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck" + "knative.dev/pkg/apis/duck/v1beta1" ) // Addressable provides a generic mechanism for a custom resource diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/condition_set.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/condition_set.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/condition_set.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/condition_set.go index 72d4bf605..20deaefd1 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/condition_set.go +++ b/vendor/knative.dev/pkg/apis/duck/v1alpha1/condition_set.go @@ -23,9 +23,9 @@ import ( "fmt" - "github.com/knative/pkg/apis" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" ) // Conditions is the interface for a Resource that implements the getter and diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/conditions_types.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/conditions_types.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/conditions_types.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/conditions_types.go index b82de3c4c..12003a586 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/conditions_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1alpha1/conditions_types.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/apis/duck" + "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck" ) // Conditions is the schema for the conditions portion of the payload diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/doc.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/doc.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/doc.go diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/legacy_targetable_types.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/legacy_targetable_types.go similarity index 97% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/legacy_targetable_types.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/legacy_targetable_types.go index 5e4d6f2e3..27e7c3daa 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/legacy_targetable_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1alpha1/legacy_targetable_types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/apis/duck" + "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck" ) // LegacyTargetable left around until we migrate to Addressable in the diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/register.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/register.go similarity index 98% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/register.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/register.go index 4bb344f2a..a66a2c38d 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/register.go +++ b/vendor/knative.dev/pkg/apis/duck/v1alpha1/register.go @@ -17,10 +17,10 @@ limitations under the License. package v1alpha1 import ( - "github.com/knative/pkg/apis/duck" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/pkg/apis/duck" ) // SchemeGroupVersion is group version used to register these objects diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/retired_targetable_types.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/retired_targetable_types.go similarity index 97% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/retired_targetable_types.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/retired_targetable_types.go index 0e91aef8a..9306336d2 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/retired_targetable_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1alpha1/retired_targetable_types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/apis/duck" + "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck" ) // Targetable is an earlier version of the Callable interface. diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/v1alpha1/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/apis/duck/v1alpha1/zz_generated.deepcopy.go diff --git a/vendor/github.com/knative/pkg/apis/duck/v1beta1/addressable_types.go b/vendor/knative.dev/pkg/apis/duck/v1beta1/addressable_types.go similarity index 97% rename from vendor/github.com/knative/pkg/apis/duck/v1beta1/addressable_types.go rename to vendor/knative.dev/pkg/apis/duck/v1beta1/addressable_types.go index 379098e7f..817585a3b 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1beta1/addressable_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1beta1/addressable_types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/apis/duck" + "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck" ) // Addressable provides a generic mechanism for a custom resource diff --git a/vendor/github.com/knative/pkg/apis/duck/v1beta1/doc.go b/vendor/knative.dev/pkg/apis/duck/v1beta1/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/duck/v1beta1/doc.go rename to vendor/knative.dev/pkg/apis/duck/v1beta1/doc.go diff --git a/vendor/github.com/knative/pkg/apis/duck/v1beta1/register.go b/vendor/knative.dev/pkg/apis/duck/v1beta1/register.go similarity index 97% rename from vendor/github.com/knative/pkg/apis/duck/v1beta1/register.go rename to vendor/knative.dev/pkg/apis/duck/v1beta1/register.go index c337e4a61..ca8388ad4 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1beta1/register.go +++ b/vendor/knative.dev/pkg/apis/duck/v1beta1/register.go @@ -17,10 +17,10 @@ limitations under the License. package v1beta1 import ( - "github.com/knative/pkg/apis/duck" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/pkg/apis/duck" ) // SchemeGroupVersion is group version used to register these objects diff --git a/vendor/github.com/knative/pkg/apis/duck/v1beta1/status_types.go b/vendor/knative.dev/pkg/apis/duck/v1beta1/status_types.go similarity index 98% rename from vendor/github.com/knative/pkg/apis/duck/v1beta1/status_types.go rename to vendor/knative.dev/pkg/apis/duck/v1beta1/status_types.go index b999737ae..ef6804dea 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1beta1/status_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1beta1/status_types.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/apis/duck" + "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck" ) // Conditions is a simple wrapper around apis.Conditions to implement duck.Implementable. @@ -36,6 +36,7 @@ var _ duck.Implementable = (*Conditions)(nil) // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// +k8s:openapi-gen=true // KResource is a skeleton type wrapping Conditions in the manner we expect // resource writers defining compatible resources to embed it. We will diff --git a/vendor/github.com/knative/pkg/apis/duck/v1beta1/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/apis/duck/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/duck/v1beta1/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/apis/duck/v1beta1/zz_generated.deepcopy.go index 791c06d96..329aabb64 100644 --- a/vendor/github.com/knative/pkg/apis/duck/v1beta1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/pkg/apis/duck/v1beta1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1beta1 import ( - apis "github.com/knative/pkg/apis" runtime "k8s.io/apimachinery/pkg/runtime" + apis "knative.dev/pkg/apis" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/vendor/github.com/knative/pkg/apis/duck/verify.go b/vendor/knative.dev/pkg/apis/duck/verify.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/duck/verify.go rename to vendor/knative.dev/pkg/apis/duck/verify.go index eb6bdebf4..236a392c7 100644 --- a/vendor/github.com/knative/pkg/apis/duck/verify.go +++ b/vendor/knative.dev/pkg/apis/duck/verify.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/knative/pkg/kmp" + "knative.dev/pkg/kmp" ) // Implementable is implemented by the Fooable duck type that consumers diff --git a/vendor/github.com/knative/pkg/apis/field_error.go b/vendor/knative.dev/pkg/apis/field_error.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/field_error.go rename to vendor/knative.dev/pkg/apis/field_error.go index 8b56be976..59b281d6e 100644 --- a/vendor/github.com/knative/pkg/apis/field_error.go +++ b/vendor/knative.dev/pkg/apis/field_error.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/knative/pkg/kmp" + "knative.dev/pkg/kmp" ) // CurrentField is a constant to supply as a fieldPath for when there is diff --git a/vendor/github.com/knative/pkg/apis/interfaces.go b/vendor/knative.dev/pkg/apis/interfaces.go similarity index 90% rename from vendor/github.com/knative/pkg/apis/interfaces.go rename to vendor/knative.dev/pkg/apis/interfaces.go index 601d083dd..6b6c772d7 100644 --- a/vendor/github.com/knative/pkg/apis/interfaces.go +++ b/vendor/knative.dev/pkg/apis/interfaces.go @@ -66,3 +66,10 @@ type Listable interface { // The webhook functionality for this has been turned down, which is why this // interface is empty. type Annotatable interface{} + +// HasSpec indicates that a particular type has a specification information +// and that information is retrievable. +type HasSpec interface { + // GetUntypedSpec returns the spec of the resource. + GetUntypedSpec() interface{} +} diff --git a/vendor/github.com/knative/pkg/apis/istio/OWNERS b/vendor/knative.dev/pkg/apis/istio/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/OWNERS rename to vendor/knative.dev/pkg/apis/istio/OWNERS diff --git a/vendor/github.com/knative/pkg/apis/istio/authentication/register.go b/vendor/knative.dev/pkg/apis/istio/authentication/register.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/authentication/register.go rename to vendor/knative.dev/pkg/apis/istio/authentication/register.go diff --git a/vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/doc.go b/vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/doc.go rename to vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/doc.go diff --git a/vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/policy_types.go b/vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/policy_types.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/policy_types.go rename to vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/policy_types.go index 882b1fc3f..cbda34d21 100644 --- a/vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/policy_types.go +++ b/vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/policy_types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - "github.com/knative/pkg/apis/istio/common/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis/istio/common/v1alpha1" ) // +genclient diff --git a/vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/register.go b/vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/register.go similarity index 96% rename from vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/register.go rename to vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/register.go index 7809d1cd9..612813332 100644 --- a/vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/register.go +++ b/vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/register.go @@ -17,10 +17,10 @@ limitations under the License. package v1alpha1 import ( - "github.com/knative/pkg/apis/istio/authentication" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/pkg/apis/istio/authentication" ) // SchemeGroupVersion is group version used to register these objects diff --git a/vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/zz_generated.deepcopy.go index 20f900c9b..19f95f30d 100644 --- a/vendor/github.com/knative/pkg/apis/istio/authentication/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/pkg/apis/istio/authentication/v1alpha1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1alpha1 import ( - commonv1alpha1 "github.com/knative/pkg/apis/istio/common/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" + commonv1alpha1 "knative.dev/pkg/apis/istio/common/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/vendor/github.com/knative/pkg/apis/istio/common/v1alpha1/string.go b/vendor/knative.dev/pkg/apis/istio/common/v1alpha1/string.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/common/v1alpha1/string.go rename to vendor/knative.dev/pkg/apis/istio/common/v1alpha1/string.go diff --git a/vendor/github.com/knative/pkg/apis/istio/register.go b/vendor/knative.dev/pkg/apis/istio/register.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/register.go rename to vendor/knative.dev/pkg/apis/istio/register.go diff --git a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/README.md b/vendor/knative.dev/pkg/apis/istio/v1alpha3/README.md similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/v1alpha3/README.md rename to vendor/knative.dev/pkg/apis/istio/v1alpha3/README.md diff --git a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/destinationrule_types.go b/vendor/knative.dev/pkg/apis/istio/v1alpha3/destinationrule_types.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/v1alpha3/destinationrule_types.go rename to vendor/knative.dev/pkg/apis/istio/v1alpha3/destinationrule_types.go diff --git a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/doc.go b/vendor/knative.dev/pkg/apis/istio/v1alpha3/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/v1alpha3/doc.go rename to vendor/knative.dev/pkg/apis/istio/v1alpha3/doc.go diff --git a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/gateway_types.go b/vendor/knative.dev/pkg/apis/istio/v1alpha3/gateway_types.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/istio/v1alpha3/gateway_types.go rename to vendor/knative.dev/pkg/apis/istio/v1alpha3/gateway_types.go diff --git a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/register.go b/vendor/knative.dev/pkg/apis/istio/v1alpha3/register.go similarity index 97% rename from vendor/github.com/knative/pkg/apis/istio/v1alpha3/register.go rename to vendor/knative.dev/pkg/apis/istio/v1alpha3/register.go index c2089e5c2..301109ea5 100644 --- a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/register.go +++ b/vendor/knative.dev/pkg/apis/istio/v1alpha3/register.go @@ -17,10 +17,10 @@ limitations under the License. package v1alpha3 import ( - "github.com/knative/pkg/apis/istio" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/pkg/apis/istio" ) // SchemeGroupVersion is group version used to register these objects diff --git a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/virtualservice_types.go b/vendor/knative.dev/pkg/apis/istio/v1alpha3/virtualservice_types.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/istio/v1alpha3/virtualservice_types.go rename to vendor/knative.dev/pkg/apis/istio/v1alpha3/virtualservice_types.go index 8798cfa37..adb41d9e8 100644 --- a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/virtualservice_types.go +++ b/vendor/knative.dev/pkg/apis/istio/v1alpha3/virtualservice_types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha3 import ( - "github.com/knative/pkg/apis/istio/common/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis/istio/common/v1alpha1" ) // +genclient diff --git a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/apis/istio/v1alpha3/zz_generated.deepcopy.go similarity index 99% rename from vendor/github.com/knative/pkg/apis/istio/v1alpha3/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/apis/istio/v1alpha3/zz_generated.deepcopy.go index 67cf72128..b503c307a 100644 --- a/vendor/github.com/knative/pkg/apis/istio/v1alpha3/zz_generated.deepcopy.go +++ b/vendor/knative.dev/pkg/apis/istio/v1alpha3/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1alpha3 import ( - v1alpha1 "github.com/knative/pkg/apis/istio/common/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" + v1alpha1 "knative.dev/pkg/apis/istio/common/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/vendor/github.com/knative/pkg/apis/kind2resource.go b/vendor/knative.dev/pkg/apis/kind2resource.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/kind2resource.go rename to vendor/knative.dev/pkg/apis/kind2resource.go diff --git a/vendor/github.com/knative/pkg/apis/metadata_validation.go b/vendor/knative.dev/pkg/apis/metadata_validation.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/metadata_validation.go rename to vendor/knative.dev/pkg/apis/metadata_validation.go diff --git a/vendor/github.com/knative/pkg/apis/testing/conditions.go b/vendor/knative.dev/pkg/apis/testing/conditions.go similarity index 95% rename from vendor/github.com/knative/pkg/apis/testing/conditions.go rename to vendor/knative.dev/pkg/apis/testing/conditions.go index 5aee8880c..ada1d8d15 100644 --- a/vendor/github.com/knative/pkg/apis/testing/conditions.go +++ b/vendor/knative.dev/pkg/apis/testing/conditions.go @@ -19,9 +19,9 @@ import ( "fmt" "testing" - "github.com/knative/pkg/apis" - duckv1b1 "github.com/knative/pkg/apis/duck/v1beta1" corev1 "k8s.io/api/core/v1" + "knative.dev/pkg/apis" + duckv1b1 "knative.dev/pkg/apis/duck/v1beta1" ) // CheckCondition checks if condition `c` on `cc` has value `cs`. diff --git a/vendor/github.com/knative/pkg/apis/url.go b/vendor/knative.dev/pkg/apis/url.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/url.go rename to vendor/knative.dev/pkg/apis/url.go diff --git a/vendor/github.com/knative/pkg/apis/volatile_time.go b/vendor/knative.dev/pkg/apis/volatile_time.go similarity index 97% rename from vendor/github.com/knative/pkg/apis/volatile_time.go rename to vendor/knative.dev/pkg/apis/volatile_time.go index 3d2daa277..48d790d92 100644 --- a/vendor/github.com/knative/pkg/apis/volatile_time.go +++ b/vendor/knative.dev/pkg/apis/volatile_time.go @@ -22,6 +22,7 @@ import ( ) // VolatileTime wraps metav1.Time +// +k8s:openapi-gen=true type VolatileTime struct { Inner metav1.Time } diff --git a/vendor/github.com/knative/pkg/apis/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/apis/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/knative/pkg/apis/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/apis/zz_generated.deepcopy.go diff --git a/vendor/github.com/knative/pkg/changeset/commit.go b/vendor/knative.dev/pkg/changeset/commit.go similarity index 100% rename from vendor/github.com/knative/pkg/changeset/commit.go rename to vendor/knative.dev/pkg/changeset/commit.go diff --git a/vendor/github.com/knative/pkg/changeset/doc.go b/vendor/knative.dev/pkg/changeset/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/changeset/doc.go rename to vendor/knative.dev/pkg/changeset/doc.go diff --git a/vendor/github.com/knative/pkg/changeset/testdata/HEAD b/vendor/knative.dev/pkg/changeset/testdata/HEAD similarity index 100% rename from vendor/github.com/knative/pkg/changeset/testdata/HEAD rename to vendor/knative.dev/pkg/changeset/testdata/HEAD diff --git a/vendor/github.com/knative/pkg/changeset/testdata/noncommitted/HEAD b/vendor/knative.dev/pkg/changeset/testdata/noncommitted/HEAD similarity index 100% rename from vendor/github.com/knative/pkg/changeset/testdata/noncommitted/HEAD rename to vendor/knative.dev/pkg/changeset/testdata/noncommitted/HEAD diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/clientset.go b/vendor/knative.dev/pkg/client/clientset/versioned/clientset.go similarity index 95% rename from vendor/github.com/knative/pkg/client/clientset/versioned/clientset.go rename to vendor/knative.dev/pkg/client/clientset/versioned/clientset.go index 5c00fdb6a..861211662 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/clientset.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/clientset.go @@ -19,11 +19,11 @@ limitations under the License. package versioned import ( - authenticationv1alpha1 "github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1" - networkingv1alpha3 "github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" + authenticationv1alpha1 "knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1" + networkingv1alpha3 "knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3" ) type Interface interface { diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/doc.go b/vendor/knative.dev/pkg/client/clientset/versioned/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/doc.go rename to vendor/knative.dev/pkg/client/clientset/versioned/doc.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/fake/clientset_generated.go b/vendor/knative.dev/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 86% rename from vendor/github.com/knative/pkg/client/clientset/versioned/fake/clientset_generated.go rename to vendor/knative.dev/pkg/client/clientset/versioned/fake/clientset_generated.go index df8348fcf..e2657088d 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,16 +19,16 @@ limitations under the License. package fake import ( - clientset "github.com/knative/pkg/client/clientset/versioned" - authenticationv1alpha1 "github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1" - fakeauthenticationv1alpha1 "github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake" - networkingv1alpha3 "github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3" - fakenetworkingv1alpha3 "github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" + clientset "knative.dev/pkg/client/clientset/versioned" + authenticationv1alpha1 "knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1" + fakeauthenticationv1alpha1 "knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake" + networkingv1alpha3 "knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3" + fakenetworkingv1alpha3 "knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/fake/doc.go b/vendor/knative.dev/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/fake/doc.go rename to vendor/knative.dev/pkg/client/clientset/versioned/fake/doc.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/fake/register.go b/vendor/knative.dev/pkg/client/clientset/versioned/fake/register.go similarity index 92% rename from vendor/github.com/knative/pkg/client/clientset/versioned/fake/register.go rename to vendor/knative.dev/pkg/client/clientset/versioned/fake/register.go index f00f2c9fe..ee498aad6 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/fake/register.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/fake/register.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - authenticationv1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" - networkingv1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + authenticationv1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" + networkingv1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) var scheme = runtime.NewScheme() diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/scheme/doc.go b/vendor/knative.dev/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/scheme/doc.go rename to vendor/knative.dev/pkg/client/clientset/versioned/scheme/doc.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/scheme/register.go b/vendor/knative.dev/pkg/client/clientset/versioned/scheme/register.go similarity index 92% rename from vendor/github.com/knative/pkg/client/clientset/versioned/scheme/register.go rename to vendor/knative.dev/pkg/client/clientset/versioned/scheme/register.go index cca6f2788..192e1e3dd 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/scheme/register.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/scheme/register.go @@ -19,13 +19,13 @@ limitations under the License. package scheme import ( - authenticationv1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" - networkingv1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + authenticationv1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" + networkingv1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) var Scheme = runtime.NewScheme() diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go similarity index 95% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go index 918f9cd78..caedb2ea8 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" - "github.com/knative/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" + v1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" + "knative.dev/pkg/client/clientset/versioned/scheme" ) type AuthenticationV1alpha1Interface interface { diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/doc.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/doc.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/doc.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/doc.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/doc.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/doc.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go similarity index 92% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go index f947ca535..4cfd52043 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + v1alpha1 "knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1" ) type FakeAuthenticationV1alpha1 struct { diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_policy.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_policy.go similarity index 98% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_policy.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_policy.go index f5d54444e..ab10fcd4d 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_policy.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/fake/fake_policy.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" ) // FakePolicies implements PolicyInterface diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/generated_expansion.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/generated_expansion.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/generated_expansion.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/generated_expansion.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/policy.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/policy.go similarity index 97% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/policy.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/policy.go index 961aaf008..2d6dd5ec0 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1/policy.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/authentication/v1alpha1/policy.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" - scheme "github.com/knative/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" + scheme "knative.dev/pkg/client/clientset/versioned/scheme" ) // PoliciesGetter has a method to return a PolicyInterface. diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/destinationrule.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/destinationrule.go similarity index 97% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/destinationrule.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/destinationrule.go index 242f213f3..d4b6e4359 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/destinationrule.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/destinationrule.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha3 import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" - scheme "github.com/knative/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" + scheme "knative.dev/pkg/client/clientset/versioned/scheme" ) // DestinationRulesGetter has a method to return a DestinationRuleInterface. diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/doc.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/doc.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/doc.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/doc.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/doc.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/doc.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_destinationrule.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_destinationrule.go similarity index 98% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_destinationrule.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_destinationrule.go index e493908eb..471c9a42d 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_destinationrule.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_destinationrule.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) // FakeDestinationRules implements DestinationRuleInterface diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_gateway.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_gateway.go similarity index 98% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_gateway.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_gateway.go index 249414948..1b202fa51 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_gateway.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_gateway.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) // FakeGateways implements GatewayInterface diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_istio_client.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_istio_client.go similarity index 94% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_istio_client.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_istio_client.go index fddb1d475..4f3cbd6e4 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_istio_client.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_istio_client.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - v1alpha3 "github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + v1alpha3 "knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3" ) type FakeNetworkingV1alpha3 struct { diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_virtualservice.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_virtualservice.go similarity index 98% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_virtualservice.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_virtualservice.go index 98b25259a..a4a3000bc 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_virtualservice.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/fake/fake_virtualservice.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) // FakeVirtualServices implements VirtualServiceInterface diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/gateway.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/gateway.go similarity index 97% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/gateway.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/gateway.go index 151bfef4c..6e81a459b 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/gateway.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/gateway.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha3 import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" - scheme "github.com/knative/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" + scheme "knative.dev/pkg/client/clientset/versioned/scheme" ) // GatewaysGetter has a method to return a GatewayInterface. diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/generated_expansion.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/generated_expansion.go similarity index 100% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/generated_expansion.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/generated_expansion.go diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/istio_client.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/istio_client.go similarity index 96% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/istio_client.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/istio_client.go index 33bda021c..fe6419799 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/istio_client.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/istio_client.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha3 import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" - "github.com/knative/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" + "knative.dev/pkg/client/clientset/versioned/scheme" ) type NetworkingV1alpha3Interface interface { diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/virtualservice.go b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/virtualservice.go similarity index 97% rename from vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/virtualservice.go rename to vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/virtualservice.go index 11bbb6242..ba4618072 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3/virtualservice.go +++ b/vendor/knative.dev/pkg/client/clientset/versioned/typed/istio/v1alpha3/virtualservice.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha3 import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" - scheme "github.com/knative/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" + scheme "knative.dev/pkg/client/clientset/versioned/scheme" ) // VirtualServicesGetter has a method to return a VirtualServiceInterface. diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/authentication/interface.go b/vendor/knative.dev/pkg/client/informers/externalversions/authentication/interface.go similarity index 88% rename from vendor/github.com/knative/pkg/client/informers/externalversions/authentication/interface.go rename to vendor/knative.dev/pkg/client/informers/externalversions/authentication/interface.go index 2c0a8ce89..ae7084221 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/authentication/interface.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/authentication/interface.go @@ -19,8 +19,8 @@ limitations under the License. package authentication import ( - v1alpha1 "github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1" - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1/interface.go b/vendor/knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1/interface.go similarity index 93% rename from vendor/github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1/interface.go rename to vendor/knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1/interface.go index a46940a96..fe0057fd6 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1/interface.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1/policy.go b/vendor/knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1/policy.go similarity index 91% rename from vendor/github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1/policy.go rename to vendor/knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1/policy.go index 912860c94..e59af59c7 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1/policy.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1/policy.go @@ -21,14 +21,14 @@ package v1alpha1 import ( time "time" - authenticationv1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" - versioned "github.com/knative/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/knative/pkg/client/listers/authentication/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + authenticationv1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" + versioned "knative.dev/pkg/client/clientset/versioned" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/pkg/client/listers/authentication/v1alpha1" ) // PolicyInformer provides access to a shared informer and lister for diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/factory.go b/vendor/knative.dev/pkg/client/informers/externalversions/factory.go similarity index 95% rename from vendor/github.com/knative/pkg/client/informers/externalversions/factory.go rename to vendor/knative.dev/pkg/client/informers/externalversions/factory.go index a8e88a5b7..0044e9aee 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/factory.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/factory.go @@ -23,14 +23,14 @@ import ( sync "sync" time "time" - versioned "github.com/knative/pkg/client/clientset/versioned" - authentication "github.com/knative/pkg/client/informers/externalversions/authentication" - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" - istio "github.com/knative/pkg/client/informers/externalversions/istio" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + versioned "knative.dev/pkg/client/clientset/versioned" + authentication "knative.dev/pkg/client/informers/externalversions/authentication" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" + istio "knative.dev/pkg/client/informers/externalversions/istio" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/generic.go b/vendor/knative.dev/pkg/client/informers/externalversions/generic.go similarity index 95% rename from vendor/github.com/knative/pkg/client/informers/externalversions/generic.go rename to vendor/knative.dev/pkg/client/informers/externalversions/generic.go index 2a1524610..18a4d1b21 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/generic.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/generic.go @@ -21,10 +21,10 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + v1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/vendor/knative.dev/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from vendor/github.com/knative/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to vendor/knative.dev/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 3cd3cb329..356bd6453 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,10 +21,10 @@ package internalinterfaces import ( time "time" - versioned "github.com/knative/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + versioned "knative.dev/pkg/client/clientset/versioned" ) type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/interface.go b/vendor/knative.dev/pkg/client/informers/externalversions/istio/interface.go similarity index 88% rename from vendor/github.com/knative/pkg/client/informers/externalversions/istio/interface.go rename to vendor/knative.dev/pkg/client/informers/externalversions/istio/interface.go index d7db9d27a..79a62b888 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/interface.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/istio/interface.go @@ -19,8 +19,8 @@ limitations under the License. package networking import ( - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" - v1alpha3 "github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" + v1alpha3 "knative.dev/pkg/client/informers/externalversions/istio/v1alpha3" ) // Interface provides access to each of this group's versions. diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/destinationrule.go b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/destinationrule.go similarity index 92% rename from vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/destinationrule.go rename to vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/destinationrule.go index d4a035b6e..184fd358f 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/destinationrule.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/destinationrule.go @@ -21,14 +21,14 @@ package v1alpha3 import ( time "time" - istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" - versioned "github.com/knative/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" - v1alpha3 "github.com/knative/pkg/client/listers/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + istiov1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" + versioned "knative.dev/pkg/client/clientset/versioned" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" + v1alpha3 "knative.dev/pkg/client/listers/istio/v1alpha3" ) // DestinationRuleInformer provides access to a shared informer and lister for diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/gateway.go b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/gateway.go similarity index 91% rename from vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/gateway.go rename to vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/gateway.go index 844704d99..59d99e128 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/gateway.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/gateway.go @@ -21,14 +21,14 @@ package v1alpha3 import ( time "time" - istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" - versioned "github.com/knative/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" - v1alpha3 "github.com/knative/pkg/client/listers/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + istiov1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" + versioned "knative.dev/pkg/client/clientset/versioned" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" + v1alpha3 "knative.dev/pkg/client/listers/istio/v1alpha3" ) // GatewayInformer provides access to a shared informer and lister for diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/interface.go b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/interface.go similarity index 95% rename from vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/interface.go rename to vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/interface.go index bd4808d71..a37a1c0f1 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/interface.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha3 import ( - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/virtualservice.go b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/virtualservice.go similarity index 92% rename from vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/virtualservice.go rename to vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/virtualservice.go index cecb442ee..f0468e223 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3/virtualservice.go +++ b/vendor/knative.dev/pkg/client/informers/externalversions/istio/v1alpha3/virtualservice.go @@ -21,14 +21,14 @@ package v1alpha3 import ( time "time" - istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" - versioned "github.com/knative/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" - v1alpha3 "github.com/knative/pkg/client/listers/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + istiov1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" + versioned "knative.dev/pkg/client/clientset/versioned" + internalinterfaces "knative.dev/pkg/client/informers/externalversions/internalinterfaces" + v1alpha3 "knative.dev/pkg/client/listers/istio/v1alpha3" ) // VirtualServiceInformer provides access to a shared informer and lister for diff --git a/vendor/github.com/knative/pkg/client/injection/client/client.go b/vendor/knative.dev/pkg/client/injection/client/client.go similarity index 89% rename from vendor/github.com/knative/pkg/client/injection/client/client.go rename to vendor/knative.dev/pkg/client/injection/client/client.go index 0eb124722..b4784b21a 100644 --- a/vendor/github.com/knative/pkg/client/injection/client/client.go +++ b/vendor/knative.dev/pkg/client/injection/client/client.go @@ -21,10 +21,10 @@ package client import ( "context" - versioned "github.com/knative/pkg/client/clientset/versioned" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" rest "k8s.io/client-go/rest" + versioned "knative.dev/pkg/client/clientset/versioned" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/injection/client/fake/fake.go b/vendor/knative.dev/pkg/client/injection/client/fake/fake.go similarity index 86% rename from vendor/github.com/knative/pkg/client/injection/client/fake/fake.go rename to vendor/knative.dev/pkg/client/injection/client/fake/fake.go index ae3688909..d661247b6 100644 --- a/vendor/github.com/knative/pkg/client/injection/client/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/client/fake/fake.go @@ -21,12 +21,12 @@ package fake import ( "context" - fake "github.com/knative/pkg/client/clientset/versioned/fake" - client "github.com/knative/pkg/client/injection/client" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" + fake "knative.dev/pkg/client/clientset/versioned/fake" + client "knative.dev/pkg/client/injection/client" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/injection/informers/authentication/factory/authenticationfactory.go b/vendor/knative.dev/pkg/client/injection/informers/authentication/factory/authenticationfactory.go similarity index 83% rename from vendor/github.com/knative/pkg/client/injection/informers/authentication/factory/authenticationfactory.go rename to vendor/knative.dev/pkg/client/injection/informers/authentication/factory/authenticationfactory.go index 2be38ccaa..a90c27dc8 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/authentication/factory/authenticationfactory.go +++ b/vendor/knative.dev/pkg/client/injection/informers/authentication/factory/authenticationfactory.go @@ -21,11 +21,11 @@ package authenticationfactory import ( "context" - externalversions "github.com/knative/pkg/client/informers/externalversions" - client "github.com/knative/pkg/client/injection/client" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" + externalversions "knative.dev/pkg/client/informers/externalversions" + client "knative.dev/pkg/client/injection/client" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/factory/fake/fake.go b/vendor/knative.dev/pkg/client/injection/informers/authentication/factory/fake/fake.go similarity index 76% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/factory/fake/fake.go rename to vendor/knative.dev/pkg/client/injection/informers/authentication/factory/fake/fake.go index 8180c2e58..a7fabb7c7 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/factory/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/informers/authentication/factory/fake/fake.go @@ -21,11 +21,11 @@ package fake import ( "context" - externalversions "github.com/knative/pkg/client/informers/externalversions" - fake "github.com/knative/pkg/client/injection/client/fake" - factory "github.com/knative/pkg/client/injection/informers/istio/factory" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" + externalversions "knative.dev/pkg/client/informers/externalversions" + fake "knative.dev/pkg/client/injection/client/fake" + factory "knative.dev/pkg/client/injection/informers/authentication/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = factory.Get diff --git a/vendor/github.com/knative/pkg/client/injection/informers/authentication/v1alpha1/policy/fake/fake.go b/vendor/knative.dev/pkg/client/injection/informers/authentication/v1alpha1/policy/fake/fake.go similarity index 77% rename from vendor/github.com/knative/pkg/client/injection/informers/authentication/v1alpha1/policy/fake/fake.go rename to vendor/knative.dev/pkg/client/injection/informers/authentication/v1alpha1/policy/fake/fake.go index bd8c1e974..873623a1e 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/authentication/v1alpha1/policy/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/informers/authentication/v1alpha1/policy/fake/fake.go @@ -21,10 +21,10 @@ package fake import ( "context" - fake "github.com/knative/pkg/client/injection/informers/authentication/factory/fake" - policy "github.com/knative/pkg/client/injection/informers/authentication/v1alpha1/policy" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" + fake "knative.dev/pkg/client/injection/informers/authentication/factory/fake" + policy "knative.dev/pkg/client/injection/informers/authentication/v1alpha1/policy" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = policy.Get diff --git a/vendor/github.com/knative/pkg/client/injection/informers/authentication/v1alpha1/policy/policy.go b/vendor/knative.dev/pkg/client/injection/informers/authentication/v1alpha1/policy/policy.go similarity index 81% rename from vendor/github.com/knative/pkg/client/injection/informers/authentication/v1alpha1/policy/policy.go rename to vendor/knative.dev/pkg/client/injection/informers/authentication/v1alpha1/policy/policy.go index 449afb544..67c59a6c8 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/authentication/v1alpha1/policy/policy.go +++ b/vendor/knative.dev/pkg/client/injection/informers/authentication/v1alpha1/policy/policy.go @@ -21,11 +21,11 @@ package policy import ( "context" - v1alpha1 "github.com/knative/pkg/client/informers/externalversions/authentication/v1alpha1" - factory "github.com/knative/pkg/client/injection/informers/authentication/factory" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" + v1alpha1 "knative.dev/pkg/client/informers/externalversions/authentication/v1alpha1" + factory "knative.dev/pkg/client/injection/informers/authentication/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/injection/informers/authentication/factory/fake/fake.go b/vendor/knative.dev/pkg/client/injection/informers/istio/factory/fake/fake.go similarity index 75% rename from vendor/github.com/knative/pkg/client/injection/informers/authentication/factory/fake/fake.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/factory/fake/fake.go index 813706b95..00051861f 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/authentication/factory/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/factory/fake/fake.go @@ -21,11 +21,11 @@ package fake import ( "context" - externalversions "github.com/knative/pkg/client/informers/externalversions" - fake "github.com/knative/pkg/client/injection/client/fake" - factory "github.com/knative/pkg/client/injection/informers/authentication/factory" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" + externalversions "knative.dev/pkg/client/informers/externalversions" + fake "knative.dev/pkg/client/injection/client/fake" + factory "knative.dev/pkg/client/injection/informers/istio/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = factory.Get diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/factory/istiofactory.go b/vendor/knative.dev/pkg/client/injection/informers/istio/factory/istiofactory.go similarity index 83% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/factory/istiofactory.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/factory/istiofactory.go index 3dde0a3b8..b0ec80951 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/factory/istiofactory.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/factory/istiofactory.go @@ -21,11 +21,11 @@ package istiofactory import ( "context" - externalversions "github.com/knative/pkg/client/informers/externalversions" - client "github.com/knative/pkg/client/injection/client" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" + externalversions "knative.dev/pkg/client/informers/externalversions" + client "knative.dev/pkg/client/injection/client" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/destinationrule/destinationrule.go b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/destinationrule/destinationrule.go similarity index 82% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/destinationrule/destinationrule.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/destinationrule/destinationrule.go index eca63acd5..39167203e 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/destinationrule/destinationrule.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/destinationrule/destinationrule.go @@ -21,11 +21,11 @@ package destinationrule import ( "context" - v1alpha3 "github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3" - factory "github.com/knative/pkg/client/injection/informers/istio/factory" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" + v1alpha3 "knative.dev/pkg/client/informers/externalversions/istio/v1alpha3" + factory "knative.dev/pkg/client/injection/informers/istio/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/destinationrule/fake/fake.go b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/destinationrule/fake/fake.go similarity index 78% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/destinationrule/fake/fake.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/destinationrule/fake/fake.go index 2df358ca4..e7110ca13 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/destinationrule/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/destinationrule/fake/fake.go @@ -21,10 +21,10 @@ package fake import ( "context" - fake "github.com/knative/pkg/client/injection/informers/istio/factory/fake" - destinationrule "github.com/knative/pkg/client/injection/informers/istio/v1alpha3/destinationrule" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" + fake "knative.dev/pkg/client/injection/informers/istio/factory/fake" + destinationrule "knative.dev/pkg/client/injection/informers/istio/v1alpha3/destinationrule" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = destinationrule.Get diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/gateway/fake/fake.go b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/gateway/fake/fake.go similarity index 78% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/gateway/fake/fake.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/gateway/fake/fake.go index b7ba4e9b2..4fe670a9e 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/gateway/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/gateway/fake/fake.go @@ -21,10 +21,10 @@ package fake import ( "context" - fake "github.com/knative/pkg/client/injection/informers/istio/factory/fake" - gateway "github.com/knative/pkg/client/injection/informers/istio/v1alpha3/gateway" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" + fake "knative.dev/pkg/client/injection/informers/istio/factory/fake" + gateway "knative.dev/pkg/client/injection/informers/istio/v1alpha3/gateway" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = gateway.Get diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/gateway/gateway.go b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/gateway/gateway.go similarity index 81% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/gateway/gateway.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/gateway/gateway.go index b2400e2dd..3829ebd91 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/gateway/gateway.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/gateway/gateway.go @@ -21,11 +21,11 @@ package gateway import ( "context" - v1alpha3 "github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3" - factory "github.com/knative/pkg/client/injection/informers/istio/factory" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" + v1alpha3 "knative.dev/pkg/client/informers/externalversions/istio/v1alpha3" + factory "knative.dev/pkg/client/injection/informers/istio/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/virtualservice/fake/fake.go b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/virtualservice/fake/fake.go similarity index 78% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/virtualservice/fake/fake.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/virtualservice/fake/fake.go index 7ad5cb341..689a33f99 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/virtualservice/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/virtualservice/fake/fake.go @@ -21,10 +21,10 @@ package fake import ( "context" - fake "github.com/knative/pkg/client/injection/informers/istio/factory/fake" - virtualservice "github.com/knative/pkg/client/injection/informers/istio/v1alpha3/virtualservice" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" + fake "knative.dev/pkg/client/injection/informers/istio/factory/fake" + virtualservice "knative.dev/pkg/client/injection/informers/istio/v1alpha3/virtualservice" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" ) var Get = virtualservice.Get diff --git a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/virtualservice/virtualservice.go b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/virtualservice/virtualservice.go similarity index 82% rename from vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/virtualservice/virtualservice.go rename to vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/virtualservice/virtualservice.go index 7206062f9..6d3151ee3 100644 --- a/vendor/github.com/knative/pkg/client/injection/informers/istio/v1alpha3/virtualservice/virtualservice.go +++ b/vendor/knative.dev/pkg/client/injection/informers/istio/v1alpha3/virtualservice/virtualservice.go @@ -21,11 +21,11 @@ package virtualservice import ( "context" - v1alpha3 "github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3" - factory "github.com/knative/pkg/client/injection/informers/istio/factory" - controller "github.com/knative/pkg/controller" - injection "github.com/knative/pkg/injection" - logging "github.com/knative/pkg/logging" + v1alpha3 "knative.dev/pkg/client/informers/externalversions/istio/v1alpha3" + factory "knative.dev/pkg/client/injection/informers/istio/factory" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/client/listers/authentication/v1alpha1/expansion_generated.go b/vendor/knative.dev/pkg/client/listers/authentication/v1alpha1/expansion_generated.go similarity index 100% rename from vendor/github.com/knative/pkg/client/listers/authentication/v1alpha1/expansion_generated.go rename to vendor/knative.dev/pkg/client/listers/authentication/v1alpha1/expansion_generated.go diff --git a/vendor/github.com/knative/pkg/client/listers/authentication/v1alpha1/policy.go b/vendor/knative.dev/pkg/client/listers/authentication/v1alpha1/policy.go similarity index 97% rename from vendor/github.com/knative/pkg/client/listers/authentication/v1alpha1/policy.go rename to vendor/knative.dev/pkg/client/listers/authentication/v1alpha1/policy.go index a8581d3e9..e8c786d9a 100644 --- a/vendor/github.com/knative/pkg/client/listers/authentication/v1alpha1/policy.go +++ b/vendor/knative.dev/pkg/client/listers/authentication/v1alpha1/policy.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1alpha1 "knative.dev/pkg/apis/istio/authentication/v1alpha1" ) // PolicyLister helps list Policies. diff --git a/vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/destinationrule.go b/vendor/knative.dev/pkg/client/listers/istio/v1alpha3/destinationrule.go similarity index 98% rename from vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/destinationrule.go rename to vendor/knative.dev/pkg/client/listers/istio/v1alpha3/destinationrule.go index ec1ff7556..ae687a0aa 100644 --- a/vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/destinationrule.go +++ b/vendor/knative.dev/pkg/client/listers/istio/v1alpha3/destinationrule.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha3 import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) // DestinationRuleLister helps list DestinationRules. diff --git a/vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/expansion_generated.go b/vendor/knative.dev/pkg/client/listers/istio/v1alpha3/expansion_generated.go similarity index 100% rename from vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/expansion_generated.go rename to vendor/knative.dev/pkg/client/listers/istio/v1alpha3/expansion_generated.go diff --git a/vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/gateway.go b/vendor/knative.dev/pkg/client/listers/istio/v1alpha3/gateway.go similarity index 98% rename from vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/gateway.go rename to vendor/knative.dev/pkg/client/listers/istio/v1alpha3/gateway.go index 62a78893a..5af2802a6 100644 --- a/vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/gateway.go +++ b/vendor/knative.dev/pkg/client/listers/istio/v1alpha3/gateway.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha3 import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) // GatewayLister helps list Gateways. diff --git a/vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/virtualservice.go b/vendor/knative.dev/pkg/client/listers/istio/v1alpha3/virtualservice.go similarity index 98% rename from vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/virtualservice.go rename to vendor/knative.dev/pkg/client/listers/istio/v1alpha3/virtualservice.go index 3284cda81..d7dcd2a5e 100644 --- a/vendor/github.com/knative/pkg/client/listers/istio/v1alpha3/virtualservice.go +++ b/vendor/knative.dev/pkg/client/listers/istio/v1alpha3/virtualservice.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha3 import ( - v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1alpha3 "knative.dev/pkg/apis/istio/v1alpha3" ) // VirtualServiceLister helps list VirtualServices. diff --git a/vendor/github.com/knative/pkg/cloudevents/OWNERS b/vendor/knative.dev/pkg/cloudevents/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/OWNERS rename to vendor/knative.dev/pkg/cloudevents/OWNERS diff --git a/vendor/github.com/knative/pkg/cloudevents/README.md b/vendor/knative.dev/pkg/cloudevents/README.md similarity index 97% rename from vendor/github.com/knative/pkg/cloudevents/README.md rename to vendor/knative.dev/pkg/cloudevents/README.md index 8e3e541f4..0489cb5d7 100644 --- a/vendor/github.com/knative/pkg/cloudevents/README.md +++ b/vendor/knative.dev/pkg/cloudevents/README.md @@ -47,7 +47,7 @@ events to `"http://localhost:8080"`. package main import ( - "github.com/knative/pkg/cloudevents" + "knative.dev/pkg/cloudevents" "log" ) @@ -92,7 +92,7 @@ import ( "net/http" "time" - "github.com/knative/pkg/cloudevents" + "knative.dev/pkg/cloudevents" ) type Example struct { diff --git a/vendor/github.com/knative/pkg/cloudevents/builder.go b/vendor/knative.dev/pkg/cloudevents/builder.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/builder.go rename to vendor/knative.dev/pkg/cloudevents/builder.go diff --git a/vendor/github.com/knative/pkg/cloudevents/client.go b/vendor/knative.dev/pkg/cloudevents/client.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/client.go rename to vendor/knative.dev/pkg/cloudevents/client.go diff --git a/vendor/github.com/knative/pkg/cloudevents/doc.go b/vendor/knative.dev/pkg/cloudevents/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/doc.go rename to vendor/knative.dev/pkg/cloudevents/doc.go diff --git a/vendor/github.com/knative/pkg/cloudevents/encoding_binary.go b/vendor/knative.dev/pkg/cloudevents/encoding_binary.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/encoding_binary.go rename to vendor/knative.dev/pkg/cloudevents/encoding_binary.go diff --git a/vendor/github.com/knative/pkg/cloudevents/encoding_structured.go b/vendor/knative.dev/pkg/cloudevents/encoding_structured.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/encoding_structured.go rename to vendor/knative.dev/pkg/cloudevents/encoding_structured.go diff --git a/vendor/github.com/knative/pkg/cloudevents/event.go b/vendor/knative.dev/pkg/cloudevents/event.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/event.go rename to vendor/knative.dev/pkg/cloudevents/event.go diff --git a/vendor/github.com/knative/pkg/cloudevents/event_v01.go b/vendor/knative.dev/pkg/cloudevents/event_v01.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/event_v01.go rename to vendor/knative.dev/pkg/cloudevents/event_v01.go diff --git a/vendor/github.com/knative/pkg/cloudevents/event_v02.go b/vendor/knative.dev/pkg/cloudevents/event_v02.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/event_v02.go rename to vendor/knative.dev/pkg/cloudevents/event_v02.go diff --git a/vendor/github.com/knative/pkg/cloudevents/handler.go b/vendor/knative.dev/pkg/cloudevents/handler.go similarity index 100% rename from vendor/github.com/knative/pkg/cloudevents/handler.go rename to vendor/knative.dev/pkg/cloudevents/handler.go diff --git a/vendor/github.com/knative/pkg/code-of-conduct.md b/vendor/knative.dev/pkg/code-of-conduct.md similarity index 100% rename from vendor/github.com/knative/pkg/code-of-conduct.md rename to vendor/knative.dev/pkg/code-of-conduct.md diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/args/args.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/args/args.go similarity index 100% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/args/args.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/args/args.go diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/client.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/client.go similarity index 96% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/client.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/client.go index ff42212fe..0238b32fb 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/client.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/client.go @@ -65,10 +65,10 @@ func (g *clientGenerator) GenerateType(c *generator.Context, t *types.Type, w io m := map[string]interface{}{ "clientSetNewForConfigOrDie": c.Universe.Function(types.Name{Package: g.clientSetPackage, Name: "NewForConfigOrDie"}), "clientSetInterface": c.Universe.Type(types.Name{Package: g.clientSetPackage, Name: "Interface"}), - "injectionRegisterClient": c.Universe.Function(types.Name{Package: "github.com/knative/pkg/injection", Name: "Default.RegisterClient"}), + "injectionRegisterClient": c.Universe.Function(types.Name{Package: "knative.dev/pkg/injection", Name: "Default.RegisterClient"}), "restConfig": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Config"}), "loggingFromContext": c.Universe.Function(types.Name{ - Package: "github.com/knative/pkg/logging", + Package: "knative.dev/pkg/logging", Name: "FromContext", }), } diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/factory.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/factory.go similarity index 93% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/factory.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/factory.go index 0c25fde79..a81bd2be8 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/factory.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/factory.go @@ -67,10 +67,10 @@ func (g *factoryGenerator) GenerateType(c *generator.Context, t *types.Type, w i "cachingClientGet": c.Universe.Type(types.Name{Package: g.cachingClientSetPackage, Name: "Get"}), "informersNewSharedInformerFactory": c.Universe.Function(types.Name{Package: g.sharedInformerFactoryPackage, Name: "NewSharedInformerFactory"}), "informersSharedInformerFactory": c.Universe.Function(types.Name{Package: g.sharedInformerFactoryPackage, Name: "SharedInformerFactory"}), - "injectionRegisterInformerFactory": c.Universe.Type(types.Name{Package: "github.com/knative/pkg/injection", Name: "Default.RegisterInformerFactory"}), - "controllerGetResyncPeriod": c.Universe.Type(types.Name{Package: "github.com/knative/pkg/controller", Name: "GetResyncPeriod"}), + "injectionRegisterInformerFactory": c.Universe.Type(types.Name{Package: "knative.dev/pkg/injection", Name: "Default.RegisterInformerFactory"}), + "controllerGetResyncPeriod": c.Universe.Type(types.Name{Package: "knative.dev/pkg/controller", Name: "GetResyncPeriod"}), "loggingFromContext": c.Universe.Function(types.Name{ - Package: "github.com/knative/pkg/logging", + Package: "knative.dev/pkg/logging", Name: "FromContext", }), } diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakeclient.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeclient.go similarity index 96% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakeclient.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeclient.go index 36babebf1..428c665ba 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakeclient.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeclient.go @@ -68,11 +68,11 @@ func (g *fakeClientGenerator) GenerateType(c *generator.Context, t *types.Type, "clientKey": c.Universe.Type(types.Name{Package: g.clientInjectionPkg, Name: "Key"}), "fakeClient": c.Universe.Type(types.Name{Package: g.fakeClientPkg, Name: "Clientset"}), "injectionRegisterClient": c.Universe.Function(types.Name{ - Package: "github.com/knative/pkg/injection", + Package: "knative.dev/pkg/injection", Name: "Fake.RegisterClient", }), "loggingFromContext": c.Universe.Function(types.Name{ - Package: "github.com/knative/pkg/logging", + Package: "knative.dev/pkg/logging", Name: "FromContext", }), } diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakefactory.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakefactory.go similarity index 96% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakefactory.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakefactory.go index 1c0953d4b..9aa16d75d 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakefactory.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakefactory.go @@ -71,10 +71,10 @@ func (g *fakeFactoryGenerator) GenerateType(c *generator.Context, t *types.Type, "clientGet": c.Universe.Function(types.Name{Package: g.fakeClientInjectionPkg, Name: "Get"}), "informersNewSharedInformerFactory": c.Universe.Function(types.Name{Package: g.sharedInformerFactoryPackage, Name: "NewSharedInformerFactory"}), "injectionRegisterInformerFactory": c.Universe.Function(types.Name{ - Package: "github.com/knative/pkg/injection", + Package: "knative.dev/pkg/injection", Name: "Fake.RegisterInformerFactory", }), - "controllerGetResyncPeriod": c.Universe.Type(types.Name{Package: "github.com/knative/pkg/controller", Name: "GetResyncPeriod"}), + "controllerGetResyncPeriod": c.Universe.Type(types.Name{Package: "knative.dev/pkg/controller", Name: "GetResyncPeriod"}), } sw.Do(injectionFakeInformerFactory, m) diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go similarity index 95% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go index 6dde06070..9218c418d 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go @@ -87,9 +87,9 @@ func (g *fakeInformerGenerator) GenerateType(c *generator.Context, t *types.Type "group": namer.IC(g.groupGoName), "type": t, "version": namer.IC(g.groupVersion.Version.String()), - "controllerInformer": c.Universe.Type(types.Name{Package: "github.com/knative/pkg/controller", Name: "Informer"}), + "controllerInformer": c.Universe.Type(types.Name{Package: "knative.dev/pkg/controller", Name: "Informer"}), "injectionRegisterInformer": c.Universe.Function(types.Name{ - Package: "github.com/knative/pkg/injection", + Package: "knative.dev/pkg/injection", Name: "Fake.RegisterInformer", }), } diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/informer.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/informer.go similarity index 95% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/informer.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/informer.go index 8fcaeefcc..e42eeb6e9 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/informer.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/informer.go @@ -82,12 +82,12 @@ func (g *injectionGenerator) GenerateType(c *generator.Context, t *types.Type, w "group": namer.IC(g.groupGoName), "type": t, "version": namer.IC(g.groupVersion.Version.String()), - "injectionRegisterInformer": c.Universe.Type(types.Name{Package: "github.com/knative/pkg/injection", Name: "Default.RegisterInformer"}), - "controllerInformer": c.Universe.Type(types.Name{Package: "github.com/knative/pkg/controller", Name: "Informer"}), + "injectionRegisterInformer": c.Universe.Type(types.Name{Package: "knative.dev/pkg/injection", Name: "Default.RegisterInformer"}), + "controllerInformer": c.Universe.Type(types.Name{Package: "knative.dev/pkg/controller", Name: "Informer"}), "informersTypedInformer": c.Universe.Type(types.Name{Package: g.typedInformerPackage, Name: t.Name.Name + "Informer"}), "factoryGet": c.Universe.Type(types.Name{Package: g.groupInformerFactoryPackage, Name: "Get"}), "loggingFromContext": c.Universe.Function(types.Name{ - Package: "github.com/knative/pkg/logging", + Package: "knative.dev/pkg/logging", Name: "FromContext", }), } diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/namesystems.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/namesystems.go similarity index 100% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/namesystems.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/namesystems.go diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/packages.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go similarity index 99% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/packages.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go index f8359af9b..f8866bded 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/generators/packages.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go @@ -30,7 +30,7 @@ import ( "k8s.io/gengo/types" "k8s.io/klog" - informergenargs "github.com/knative/pkg/codegen/cmd/injection-gen/args" + informergenargs "knative.dev/pkg/codegen/cmd/injection-gen/args" ) // Packages makes the client package definition. diff --git a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/main.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/main.go similarity index 91% rename from vendor/github.com/knative/pkg/codegen/cmd/injection-gen/main.go rename to vendor/knative.dev/pkg/codegen/cmd/injection-gen/main.go index 4120d65cc..26410cc99 100644 --- a/vendor/github.com/knative/pkg/codegen/cmd/injection-gen/main.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/main.go @@ -24,9 +24,9 @@ import ( "k8s.io/gengo/args" "k8s.io/klog" - generatorargs "github.com/knative/pkg/codegen/cmd/injection-gen/args" - "github.com/knative/pkg/codegen/cmd/injection-gen/generators" "github.com/spf13/pflag" + generatorargs "knative.dev/pkg/codegen/cmd/injection-gen/args" + "knative.dev/pkg/codegen/cmd/injection-gen/generators" ) func main() { diff --git a/vendor/github.com/knative/pkg/configmap/OWNERS b/vendor/knative.dev/pkg/configmap/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/configmap/OWNERS rename to vendor/knative.dev/pkg/configmap/OWNERS diff --git a/vendor/github.com/knative/pkg/configmap/doc.go b/vendor/knative.dev/pkg/configmap/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/configmap/doc.go rename to vendor/knative.dev/pkg/configmap/doc.go diff --git a/vendor/github.com/knative/pkg/configmap/filter.go b/vendor/knative.dev/pkg/configmap/filter.go similarity index 100% rename from vendor/github.com/knative/pkg/configmap/filter.go rename to vendor/knative.dev/pkg/configmap/filter.go diff --git a/vendor/github.com/knative/pkg/configmap/informed_watcher.go b/vendor/knative.dev/pkg/configmap/informed_watcher.go similarity index 100% rename from vendor/github.com/knative/pkg/configmap/informed_watcher.go rename to vendor/knative.dev/pkg/configmap/informed_watcher.go diff --git a/vendor/github.com/knative/pkg/configmap/load.go b/vendor/knative.dev/pkg/configmap/load.go similarity index 100% rename from vendor/github.com/knative/pkg/configmap/load.go rename to vendor/knative.dev/pkg/configmap/load.go diff --git a/vendor/github.com/knative/pkg/configmap/manual_watcher.go b/vendor/knative.dev/pkg/configmap/manual_watcher.go similarity index 100% rename from vendor/github.com/knative/pkg/configmap/manual_watcher.go rename to vendor/knative.dev/pkg/configmap/manual_watcher.go diff --git a/vendor/github.com/knative/pkg/configmap/static_watcher.go b/vendor/knative.dev/pkg/configmap/static_watcher.go similarity index 100% rename from vendor/github.com/knative/pkg/configmap/static_watcher.go rename to vendor/knative.dev/pkg/configmap/static_watcher.go diff --git a/vendor/github.com/knative/pkg/configmap/store.go b/vendor/knative.dev/pkg/configmap/store.go similarity index 98% rename from vendor/github.com/knative/pkg/configmap/store.go rename to vendor/knative.dev/pkg/configmap/store.go index 612d07930..452830eb6 100644 --- a/vendor/github.com/knative/pkg/configmap/store.go +++ b/vendor/knative.dev/pkg/configmap/store.go @@ -23,6 +23,9 @@ import ( corev1 "k8s.io/api/core/v1" ) +// ExampleKey signifies a given example configuration in a ConfigMap. +const ExampleKey = "_example" + // Logger is the interface that UntypedStore expects its logger to conform to. // UntypedStore will log when updates succeed or fail. type Logger interface { diff --git a/vendor/github.com/knative/pkg/configmap/testing/configmap.go b/vendor/knative.dev/pkg/configmap/testing/configmap.go similarity index 95% rename from vendor/github.com/knative/pkg/configmap/testing/configmap.go rename to vendor/knative.dev/pkg/configmap/testing/configmap.go index 57646a7f8..2e1932bf1 100644 --- a/vendor/github.com/knative/pkg/configmap/testing/configmap.go +++ b/vendor/knative.dev/pkg/configmap/testing/configmap.go @@ -22,10 +22,9 @@ import ( "github.com/ghodss/yaml" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" + "knative.dev/pkg/configmap" ) -const ExampleKey = "_example" - // ConfigMapFromTestFile creates a v1.ConfigMap from a YAML file // It loads the YAML file from the testdata folder. func ConfigMapFromTestFile(t *testing.T, name string, allowed ...string) *corev1.ConfigMap { @@ -57,7 +56,7 @@ func ConfigMapsFromTestFile(t *testing.T, name string, allowed ...string) (*core // We expect each of the allowed keys, and a key holding an example // configuration for us to validate. - allowed = append(allowed, ExampleKey) + allowed = append(allowed, configmap.ExampleKey) if len(orig.Data) != len(allowed) { // See here for why we only check in empty ConfigMaps: @@ -72,7 +71,7 @@ func ConfigMapsFromTestFile(t *testing.T, name string, allowed ...string) (*core } // With the length and membership checks, we know that the keyspace matches. - exampleBody := orig.Data[ExampleKey] + exampleBody := orig.Data[configmap.ExampleKey] // Check that exampleBody does not have lines that end in a trailing space, for i, line := range strings.Split(exampleBody, "\n") { if strings.HasSuffix(line, " ") { diff --git a/vendor/github.com/knative/pkg/configmap/watcher.go b/vendor/knative.dev/pkg/configmap/watcher.go similarity index 100% rename from vendor/github.com/knative/pkg/configmap/watcher.go rename to vendor/knative.dev/pkg/configmap/watcher.go diff --git a/vendor/github.com/knative/pkg/controller/OWNERS b/vendor/knative.dev/pkg/controller/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/controller/OWNERS rename to vendor/knative.dev/pkg/controller/OWNERS diff --git a/vendor/github.com/knative/pkg/controller/controller.go b/vendor/knative.dev/pkg/controller/controller.go similarity index 99% rename from vendor/github.com/knative/pkg/controller/controller.go rename to vendor/knative.dev/pkg/controller/controller.go index 4471b9016..355435525 100644 --- a/vendor/github.com/knative/pkg/controller/controller.go +++ b/vendor/knative.dev/pkg/controller/controller.go @@ -32,9 +32,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "github.com/knative/pkg/kmeta" - "github.com/knative/pkg/logging" - "github.com/knative/pkg/logging/logkey" + "knative.dev/pkg/kmeta" + "knative.dev/pkg/logging" + "knative.dev/pkg/logging/logkey" ) const ( diff --git a/vendor/github.com/knative/pkg/controller/helper.go b/vendor/knative.dev/pkg/controller/helper.go similarity index 98% rename from vendor/github.com/knative/pkg/controller/helper.go rename to vendor/knative.dev/pkg/controller/helper.go index 887d715ea..b326cc5b1 100644 --- a/vendor/github.com/knative/pkg/controller/helper.go +++ b/vendor/knative.dev/pkg/controller/helper.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" - "github.com/knative/pkg/kmeta" + "knative.dev/pkg/kmeta" ) type Callback func(interface{}) diff --git a/vendor/github.com/knative/pkg/controller/stats_reporter.go b/vendor/knative.dev/pkg/controller/stats_reporter.go similarity index 99% rename from vendor/github.com/knative/pkg/controller/stats_reporter.go rename to vendor/knative.dev/pkg/controller/stats_reporter.go index 2dff988ed..60a9157c5 100644 --- a/vendor/github.com/knative/pkg/controller/stats_reporter.go +++ b/vendor/knative.dev/pkg/controller/stats_reporter.go @@ -21,11 +21,11 @@ import ( "errors" "time" - "github.com/knative/pkg/metrics" "go.opencensus.io/stats" "go.opencensus.io/stats/view" "go.opencensus.io/tag" "go.uber.org/zap" + "knative.dev/pkg/metrics" ) var ( diff --git a/vendor/github.com/knative/pkg/controller/testing/fake_stats_reporter.go b/vendor/knative.dev/pkg/controller/testing/fake_stats_reporter.go similarity index 100% rename from vendor/github.com/knative/pkg/controller/testing/fake_stats_reporter.go rename to vendor/knative.dev/pkg/controller/testing/fake_stats_reporter.go diff --git a/vendor/knative.dev/pkg/hack/OWNERS b/vendor/knative.dev/pkg/hack/OWNERS new file mode 100644 index 000000000..c50adc849 --- /dev/null +++ b/vendor/knative.dev/pkg/hack/OWNERS @@ -0,0 +1,10 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- productivity-approvers + +reviewers: +- productivity-reviewers + +labels: +- area/test-and-release diff --git a/vendor/github.com/knative/pkg/hack/boilerplate/boilerplate.go.txt b/vendor/knative.dev/pkg/hack/boilerplate/boilerplate.go.txt similarity index 100% rename from vendor/github.com/knative/pkg/hack/boilerplate/boilerplate.go.txt rename to vendor/knative.dev/pkg/hack/boilerplate/boilerplate.go.txt diff --git a/vendor/github.com/knative/pkg/hack/generate-knative.sh b/vendor/knative.dev/pkg/hack/generate-knative.sh similarity index 100% rename from vendor/github.com/knative/pkg/hack/generate-knative.sh rename to vendor/knative.dev/pkg/hack/generate-knative.sh diff --git a/vendor/github.com/knative/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh similarity index 88% rename from vendor/github.com/knative/pkg/hack/update-codegen.sh rename to vendor/knative.dev/pkg/hack/update-codegen.sh index ed4695d85..4adf2ead7 100755 --- a/vendor/github.com/knative/pkg/hack/update-codegen.sh +++ b/vendor/knative.dev/pkg/hack/update-codegen.sh @@ -29,25 +29,25 @@ go install ./vendor/k8s.io/code-generator/cmd/deepcopy-gen # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ - github.com/knative/pkg/client github.com/knative/pkg/apis \ + knative.dev/pkg/client knative.dev/pkg/apis \ "istio:v1alpha3 istio/authentication:v1alpha1" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt # Knative Injection ${REPO_ROOT_DIR}/hack/generate-knative.sh "injection" \ - github.com/knative/pkg/client github.com/knative/pkg/apis \ + knative.dev/pkg/client knative.dev/pkg/apis \ "istio:v1alpha3 istio/authentication:v1alpha1" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt # Only deepcopy the Duck types, as they are not real resources. ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \ - github.com/knative/pkg/client github.com/knative/pkg/apis \ + knative.dev/pkg/client knative.dev/pkg/apis \ "duck:v1alpha1,v1beta1" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt # Depends on generate-groups.sh to install bin/deepcopy-gen ${GOPATH}/bin/deepcopy-gen --input-dirs \ - github.com/knative/pkg/apis,github.com/knative/pkg/logging,github.com/knative/pkg/testing \ + knative.dev/pkg/apis,knative.dev/pkg/logging,knative.dev/pkg/testing \ -O zz_generated.deepcopy \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt diff --git a/vendor/github.com/knative/pkg/hack/update-deps.sh b/vendor/knative.dev/pkg/hack/update-deps.sh similarity index 86% rename from vendor/github.com/knative/pkg/hack/update-deps.sh rename to vendor/knative.dev/pkg/hack/update-deps.sh index 2213d6510..27e26454d 100755 --- a/vendor/github.com/knative/pkg/hack/update-deps.sh +++ b/vendor/knative.dev/pkg/hack/update-deps.sh @@ -14,13 +14,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +readonly ROOT_DIR=$(dirname $0)/.. +source ${ROOT_DIR}/vendor/github.com/knative/test-infra/scripts/library.sh + set -o errexit set -o nounset set -o pipefail -source $(dirname $0)/../vendor/github.com/knative/test-infra/scripts/library.sh - -cd ${REPO_ROOT_DIR} +cd ${ROOT_DIR} # Ensure we have everything we need under vendor/ dep ensure diff --git a/vendor/github.com/knative/pkg/hack/verify-codegen.sh b/vendor/knative.dev/pkg/hack/verify-codegen.sh similarity index 100% rename from vendor/github.com/knative/pkg/hack/verify-codegen.sh rename to vendor/knative.dev/pkg/hack/verify-codegen.sh diff --git a/vendor/github.com/knative/pkg/injection/OWNERS b/vendor/knative.dev/pkg/injection/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/injection/OWNERS rename to vendor/knative.dev/pkg/injection/OWNERS diff --git a/vendor/github.com/knative/pkg/injection/README.md b/vendor/knative.dev/pkg/injection/README.md similarity index 84% rename from vendor/github.com/knative/pkg/injection/README.md rename to vendor/knative.dev/pkg/injection/README.md index fce4aefc3..8f9712b71 100644 --- a/vendor/github.com/knative/pkg/injection/README.md +++ b/vendor/knative.dev/pkg/injection/README.md @@ -12,9 +12,9 @@ with the following controller constructor: import ( "context" - "github.com/knative/pkg/configmap" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/logging" + "knative.dev/pkg/configmap" + "knative.dev/pkg/controller" + "knative.dev/pkg/logging" ) func NewController(ctx context.Context, cmw configmap.Watcher) *controller.Impl { @@ -48,8 +48,8 @@ these below). import ( // These are how you access a client or informer off of the "ctx" passed // to set up the controller. - "github.com/knative/pkg/injection/clients/kubeclient" - svcinformer "github.com/knative/pkg/injection/informers/kubeinformers/corev1/service" + "knative.dev/pkg/injection/clients/kubeclient" + svcinformer "knative.dev/pkg/injection/informers/kubeinformers/corev1/service" // Other imports ... ) @@ -91,11 +91,11 @@ import ( "testing" // Link the fakes for any informers our controller accesses. - _ "github.com/knative/pkg/injection/informers/kubeinformers/corev1/service/fake" + _ "knative.dev/pkg/injection/informers/kubeinformers/corev1/service/fake" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - logtesting "github.com/knative/pkg/logging/testing" + "knative.dev/pkg/injection" + logtesting "knative.dev/pkg/logging/testing" ) func TestFoo(t *testing.T) { @@ -116,11 +116,11 @@ The fake clients also support manually setting up contexts seeded with objects: import ( "testing" - fakekubeclient "github.com/knative/pkg/injection/clients/kubeclient/fake" + fakekubeclient "knative.dev/pkg/injection/clients/kubeclient/fake" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - logtesting "github.com/knative/pkg/logging/testing" + "knative.dev/pkg/injection" + logtesting "knative.dev/pkg/logging/testing" ) func TestFoo(t *testing.T) { @@ -147,8 +147,8 @@ func TestFoo(t *testing.T) { ## Starting controllers All we do is import the controller packages and pass their constructors along -with a component name to our shared main. Then our shared main method sets it -all up and runs our controllers. +with a component name (single word) to our shared main. Then our shared main +method sets it all up and runs our controllers. ```go package main @@ -159,11 +159,11 @@ import ( "github.com/knative/baz/pkg/reconciler/blah" // This defines the shared main for injected controllers. - "github.com/knative/pkg/injection/sharedmain" + "knative.dev/pkg/injection/sharedmain" ) func main() { - sharedmain.Main("component-name", + sharedmain.Main("componentname", bar.NewController, blah.NewController, ) @@ -191,7 +191,7 @@ group): ```shell -KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT}; ls -d -1 ./vendor/github.com/knative/pkg 2>/dev/null || echo ../pkg)} +KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT}; ls -d -1 ./vendor/knative.dev/pkg 2>/dev/null || echo ../pkg)} ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \ github.com/knative/sample-controller/pkg/client github.com/knative/sample-controller/pkg/apis \ @@ -205,14 +205,14 @@ To ensure the appropriate tooling is vendored, add the following to ```toml required = [ - "github.com/knative/pkg/codegen/cmd/injection-gen", + "knative.dev/pkg/codegen/cmd/injection-gen", ] # .. Constraints # Keeps things like the generate-knative.sh script [[prune.project]] - name = "github.com/knative/pkg" + name = "knative.dev/pkg" unused-packages = false non-go = false ``` diff --git a/vendor/github.com/knative/pkg/injection/clients.go b/vendor/knative.dev/pkg/injection/clients.go similarity index 100% rename from vendor/github.com/knative/pkg/injection/clients.go rename to vendor/knative.dev/pkg/injection/clients.go diff --git a/vendor/github.com/knative/pkg/injection/clients/apiextclient/apiext.go b/vendor/knative.dev/pkg/injection/clients/apiextclient/apiext.go similarity index 95% rename from vendor/github.com/knative/pkg/injection/clients/apiextclient/apiext.go rename to vendor/knative.dev/pkg/injection/clients/apiextclient/apiext.go index 258ce7ff0..212f4650e 100644 --- a/vendor/github.com/knative/pkg/injection/clients/apiextclient/apiext.go +++ b/vendor/knative.dev/pkg/injection/clients/apiextclient/apiext.go @@ -22,8 +22,8 @@ import ( "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/logging" + "knative.dev/pkg/injection" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/clients/apiextclient/fake/fake.go b/vendor/knative.dev/pkg/injection/clients/apiextclient/fake/fake.go similarity index 91% rename from vendor/github.com/knative/pkg/injection/clients/apiextclient/fake/fake.go rename to vendor/knative.dev/pkg/injection/clients/apiextclient/fake/fake.go index ab3dc6815..4cacf6181 100644 --- a/vendor/github.com/knative/pkg/injection/clients/apiextclient/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/clients/apiextclient/fake/fake.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/apiextclient" - "github.com/knative/pkg/logging" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/apiextclient" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/clients/dynamicclient/dynamicclient.go b/vendor/knative.dev/pkg/injection/clients/dynamicclient/dynamicclient.go similarity index 94% rename from vendor/github.com/knative/pkg/injection/clients/dynamicclient/dynamicclient.go rename to vendor/knative.dev/pkg/injection/clients/dynamicclient/dynamicclient.go index 27e55b8a4..19b4674b8 100644 --- a/vendor/github.com/knative/pkg/injection/clients/dynamicclient/dynamicclient.go +++ b/vendor/knative.dev/pkg/injection/clients/dynamicclient/dynamicclient.go @@ -22,8 +22,8 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/logging" + "knative.dev/pkg/injection" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/clients/dynamicclient/fake/fake.go b/vendor/knative.dev/pkg/injection/clients/dynamicclient/fake/fake.go similarity index 91% rename from vendor/github.com/knative/pkg/injection/clients/dynamicclient/fake/fake.go rename to vendor/knative.dev/pkg/injection/clients/dynamicclient/fake/fake.go index 62759e614..12670edd2 100644 --- a/vendor/github.com/knative/pkg/injection/clients/dynamicclient/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/clients/dynamicclient/fake/fake.go @@ -23,9 +23,9 @@ import ( "k8s.io/client-go/dynamic/fake" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/dynamicclient" - "github.com/knative/pkg/logging" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/dynamicclient" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/clients/kubeclient/fake/fake.go b/vendor/knative.dev/pkg/injection/clients/kubeclient/fake/fake.go similarity index 91% rename from vendor/github.com/knative/pkg/injection/clients/kubeclient/fake/fake.go rename to vendor/knative.dev/pkg/injection/clients/kubeclient/fake/fake.go index 1c7806191..269839bc6 100644 --- a/vendor/github.com/knative/pkg/injection/clients/kubeclient/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/clients/kubeclient/fake/fake.go @@ -23,9 +23,9 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/kubeclient" - "github.com/knative/pkg/logging" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/kubeclient" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/clients/kubeclient/kubeclient.go b/vendor/knative.dev/pkg/injection/clients/kubeclient/kubeclient.go similarity index 94% rename from vendor/github.com/knative/pkg/injection/clients/kubeclient/kubeclient.go rename to vendor/knative.dev/pkg/injection/clients/kubeclient/kubeclient.go index 1cc05f64d..6b60663f7 100644 --- a/vendor/github.com/knative/pkg/injection/clients/kubeclient/kubeclient.go +++ b/vendor/knative.dev/pkg/injection/clients/kubeclient/kubeclient.go @@ -22,8 +22,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/logging" + "knative.dev/pkg/injection" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/doc.go b/vendor/knative.dev/pkg/injection/doc.go similarity index 91% rename from vendor/github.com/knative/pkg/injection/doc.go rename to vendor/knative.dev/pkg/injection/doc.go index 857e3d728..c9da28918 100644 --- a/vendor/github.com/knative/pkg/injection/doc.go +++ b/vendor/knative.dev/pkg/injection/doc.go @@ -26,8 +26,8 @@ limitations under the License. // // Simply linking this triggers the injection of the informer, which links // // the factory triggering its injection, and which links the client, // // triggering its injection. All you need to know is that it works :) -// deployinformer "github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment" -// "github.com/knative/pkg/injection" +// deployinformer "knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment" +// "knative.dev/pkg/injection" // ) // // func NewController(ctx context.Context) *controller.Impl { @@ -52,11 +52,11 @@ limitations under the License. // "github.com/knative/foo/pkg/reconciler/dave" // // // This defines the shared main for injected controllers. -// "github.com/knative/pkg/injection/sharedmain" +// "knative.dev/pkg/injection/sharedmain" // ) // // func main() { -// sharedmain.Main("my-component", +// sharedmain.Main("mycomponent", // // We pass in the list of controllers to construct, and that's it! // // If we forget to add this, go will complain about the unused import. // matt.NewController, diff --git a/vendor/github.com/knative/pkg/injection/factories.go b/vendor/knative.dev/pkg/injection/factories.go similarity index 100% rename from vendor/github.com/knative/pkg/injection/factories.go rename to vendor/knative.dev/pkg/injection/factories.go diff --git a/vendor/github.com/knative/pkg/injection/informers.go b/vendor/knative.dev/pkg/injection/informers.go similarity index 98% rename from vendor/github.com/knative/pkg/injection/informers.go rename to vendor/knative.dev/pkg/injection/informers.go index 0425ae498..2da9ad2c5 100644 --- a/vendor/github.com/knative/pkg/injection/informers.go +++ b/vendor/knative.dev/pkg/injection/informers.go @@ -21,7 +21,7 @@ import ( "k8s.io/client-go/rest" - "github.com/knative/pkg/controller" + "knative.dev/pkg/controller" ) // InformerInjector holds the type of a callback that attaches a particular diff --git a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/crd.go b/vendor/knative.dev/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/crd.go similarity index 89% rename from vendor/github.com/knative/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/crd.go rename to vendor/knative.dev/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/crd.go index 3ea6e9fb3..312180ed9 100644 --- a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/crd.go +++ b/vendor/knative.dev/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/crd.go @@ -21,10 +21,10 @@ import ( apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/apiextinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/apiextinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/fake/fake.go similarity index 79% rename from vendor/github.com/knative/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/fake/fake.go index d501712c4..60aa8690a 100644 --- a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd" - "github.com/knative/pkg/injection/informers/apiextinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/apiextinformers/apiextensionsv1beta1/crd" + "knative.dev/pkg/injection/informers/apiextinformers/factory/fake" ) var Get = crd.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/factory/factory.go b/vendor/knative.dev/pkg/injection/informers/apiextinformers/factory/factory.go similarity index 89% rename from vendor/github.com/knative/pkg/injection/informers/apiextinformers/factory/factory.go rename to vendor/knative.dev/pkg/injection/informers/apiextinformers/factory/factory.go index 8ce6976b9..ba8a1c710 100644 --- a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/factory/factory.go +++ b/vendor/knative.dev/pkg/injection/informers/apiextinformers/factory/factory.go @@ -19,13 +19,13 @@ package factory import ( "context" - "github.com/knative/pkg/logging" + "knative.dev/pkg/logging" informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/apiextclient" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/apiextclient" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/factory/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/apiextinformers/factory/fake/fake.go similarity index 82% rename from vendor/github.com/knative/pkg/injection/informers/apiextinformers/factory/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/apiextinformers/factory/fake/fake.go index ec3d3d6aa..d814fed5f 100644 --- a/vendor/github.com/knative/pkg/injection/informers/apiextinformers/factory/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/apiextinformers/factory/fake/fake.go @@ -21,10 +21,10 @@ import ( informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/apiextclient/fake" - "github.com/knative/pkg/injection/informers/apiextinformers/factory" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/apiextclient/fake" + "knative.dev/pkg/injection/informers/apiextinformers/factory" ) var Get = factory.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment/deployment.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment/deployment.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment/deployment.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment/deployment.go index 6f712497c..ce9a5366c 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment/deployment.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment/deployment.go @@ -21,10 +21,10 @@ import ( appsv1 "k8s.io/client-go/informers/apps/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment/fake/fake.go index 51cebf9e8..1fa3fb262 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/appsv1/deployment" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = deployment.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/fake/fake.go index 4e33caed3..c7e8818fe 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv1/hpa" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/autoscalingv1/hpa" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = hpa.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/hpa.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/hpa.go similarity index 89% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/hpa.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/hpa.go index 59d361524..bc07cae80 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/hpa.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv1/hpa/hpa.go @@ -21,10 +21,10 @@ import ( autoscalingv1 "k8s.io/client-go/informers/autoscaling/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/fake/fake.go similarity index 79% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/fake/fake.go index 5a9fabd0c..739550584 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = hpa.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/hpa.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/hpa.go similarity index 89% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/hpa.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/hpa.go index 5e2f482a7..0e3a4dc8a 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/hpa.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/autoscalingv2beta1/hpa/hpa.go @@ -21,10 +21,10 @@ import ( autoscalingv2beta1 "k8s.io/client-go/informers/autoscaling/v2beta1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/batchv1/job/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/batchv1/job/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/batchv1/job/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/batchv1/job/fake/fake.go index a0cb5d729..12bf78088 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/batchv1/job/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/batchv1/job/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/batchv1/job" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/batchv1/job" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = job.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/batchv1/job/job.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/batchv1/job/job.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/batchv1/job/job.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/batchv1/job/job.go index 422b1efe9..926e945bf 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/batchv1/job/job.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/batchv1/job/job.go @@ -21,10 +21,10 @@ import ( batchv1 "k8s.io/client-go/informers/batch/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/configmap/configmap.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/configmap/configmap.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/configmap/configmap.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/configmap/configmap.go index 815d64fde..44394d838 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/configmap/configmap.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/configmap/configmap.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/client-go/informers/core/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/configmap/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/configmap/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/configmap/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/configmap/fake/fake.go index 089cb95f0..841b78eae 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/configmap/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/configmap/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/corev1/configmap" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/configmap" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = configmap.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/endpoints/endpoints.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/endpoints/endpoints.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/endpoints/endpoints.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/endpoints/endpoints.go index e3bb337c5..985261a92 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/endpoints/endpoints.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/endpoints/endpoints.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/client-go/informers/core/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/endpoints/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/endpoints/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/endpoints/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/endpoints/fake/fake.go index 2504c1bde..3c24196d5 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/endpoints/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/endpoints/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/corev1/endpoints" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/endpoints" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = endpoints.Get diff --git a/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/fake/fake.go new file mode 100644 index 000000000..6215ca9e2 --- /dev/null +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/fake/fake.go @@ -0,0 +1,38 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + "context" + + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" +) + +var Get = limitrange.Get + +func init() { + injection.Fake.RegisterInformer(withInformer) +} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := fake.Get(ctx) + inf := f.Core().V1().LimitRanges() + return context.WithValue(ctx, limitrange.Key{}, inf), inf.Informer() +} diff --git a/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/limitrange.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/limitrange.go new file mode 100644 index 000000000..805937dde --- /dev/null +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/limitrange/limitrange.go @@ -0,0 +1,52 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package limitrange + +import ( + "context" + + corev1 "k8s.io/client-go/informers/core/v1" + + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" +) + +func init() { + injection.Default.RegisterInformer(withInformer) +} + +// Key is used as the key for associating information +// with a context.Context. +type Key struct{} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := factory.Get(ctx) + inf := f.Core().V1().LimitRanges() + return context.WithValue(ctx, Key{}, inf), inf.Informer() +} + +// Get extracts the Kubernetes ConfigMap informer from the context. +func Get(ctx context.Context) corev1.LimitRangeInformer { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Panicf( + "Unable to fetch %T from context.", (corev1.LimitRangeInformer)(nil)) + } + return untyped.(corev1.LimitRangeInformer) +} diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/namespace/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/namespace/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/namespace/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/namespace/fake/fake.go index fa76a3628..a13eed7ae 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/namespace/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/namespace/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/corev1/namespace" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/namespace" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = namespace.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/namespace/namespace.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/namespace/namespace.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/namespace/namespace.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/namespace/namespace.go index ffc3237e6..95ec1d603 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/namespace/namespace.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/namespace/namespace.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/client-go/informers/core/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/pod/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/pod/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/pod/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/pod/fake/fake.go index a4b8c8cee..36d9b7eba 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/pod/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/pod/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/corev1/pod" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/pod" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = pod.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/pod/pod.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/pod/pod.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/pod/pod.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/pod/pod.go index 2ce0f56a4..a454764e6 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/pod/pod.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/pod/pod.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/client-go/informers/core/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/fake/fake.go new file mode 100644 index 000000000..c25aa64cb --- /dev/null +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/fake/fake.go @@ -0,0 +1,38 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + "context" + + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" +) + +var Get = resourcequota.Get + +func init() { + injection.Fake.RegisterInformer(withInformer) +} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := fake.Get(ctx) + inf := f.Core().V1().ResourceQuotas() + return context.WithValue(ctx, resourcequota.Key{}, inf), inf.Informer() +} diff --git a/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/resourcequota.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/resourcequota.go new file mode 100644 index 000000000..a69b99145 --- /dev/null +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/resourcequota/resourcequota.go @@ -0,0 +1,52 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package resourcequota + +import ( + "context" + + corev1 "k8s.io/client-go/informers/core/v1" + + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" +) + +func init() { + injection.Default.RegisterInformer(withInformer) +} + +// Key is used as the key for associating information +// with a context.Context. +type Key struct{} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := factory.Get(ctx) + inf := f.Core().V1().ResourceQuotas() + return context.WithValue(ctx, Key{}, inf), inf.Informer() +} + +// Get extracts the Kubernetes ResourceQuota informer from the context. +func Get(ctx context.Context) corev1.ResourceQuotaInformer { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Panicf( + "Unable to fetch %T from context.", (corev1.ResourceQuotaInformer)(nil)) + } + return untyped.(corev1.ResourceQuotaInformer) +} diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/secret/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/secret/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/secret/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/secret/fake/fake.go index 37a4a5153..6e01b5d05 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/secret/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/secret/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/corev1/secret" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/secret" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = secret.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/secret/secret.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/secret/secret.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/secret/secret.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/secret/secret.go index 30a9dc069..7c6efe0f7 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/secret/secret.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/secret/secret.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/client-go/informers/core/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/service/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/service/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/service/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/service/fake/fake.go index 8c52d19ab..449843c32 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/service/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/service/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/corev1/service" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/service" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = service.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/service/service.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/service/service.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/service/service.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/service/service.go index 442b29cea..946123d2a 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/service/service.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/service/service.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/client-go/informers/core/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/serviceaccount/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/serviceaccount/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/serviceaccount/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/serviceaccount/fake/fake.go index f4e075895..ef1456d3b 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/serviceaccount/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/serviceaccount/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/corev1/serviceaccount" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/corev1/serviceaccount" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" ) var Get = serviceaccount.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/serviceaccount/service.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/serviceaccount/service.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/serviceaccount/service.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/serviceaccount/service.go index 7dc45f01c..f99250110 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/corev1/serviceaccount/service.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/corev1/serviceaccount/service.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/client-go/informers/core/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/factory/factory.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/factory/factory.go similarity index 89% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/factory/factory.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/factory/factory.go index d1a68de11..a72408be2 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/factory/factory.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/factory/factory.go @@ -21,10 +21,10 @@ import ( "k8s.io/client-go/informers" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/kubeclient" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/kubeclient" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/factory/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/factory/fake/fake.go similarity index 82% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/factory/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/factory/fake/fake.go index 7588aec5a..1432c6b68 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/factory/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/factory/fake/fake.go @@ -21,10 +21,10 @@ import ( "k8s.io/client-go/informers" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/kubeclient/fake" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/kubeclient/fake" + "knative.dev/pkg/injection/informers/kubeinformers/factory" ) var Get = factory.Get diff --git a/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/fake/fake.go new file mode 100644 index 000000000..3171ad0b6 --- /dev/null +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/fake/fake.go @@ -0,0 +1,38 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + "context" + + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role" +) + +var Get = role.Get + +func init() { + injection.Fake.RegisterInformer(withInformer) +} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := fake.Get(ctx) + inf := f.Rbac().V1().Roles() + return context.WithValue(ctx, role.Key{}, inf), inf.Informer() +} diff --git a/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/role.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/role.go new file mode 100644 index 000000000..a074d6566 --- /dev/null +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/role/role.go @@ -0,0 +1,52 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package role + +import ( + "context" + + rbacv1 "k8s.io/client-go/informers/rbac/v1" + + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" +) + +func init() { + injection.Default.RegisterInformer(withInformer) +} + +// Key is used as the key for associating information +// with a context.Context. +type Key struct{} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := factory.Get(ctx) + inf := f.Rbac().V1().Roles() + return context.WithValue(ctx, Key{}, inf), inf.Informer() +} + +// Get extracts the Kubernetes Role Binding informer from the context. +func Get(ctx context.Context) rbacv1.RoleInformer { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Panicf( + "Unable to fetch %T from context.", (rbacv1.RoleInformer)(nil)) + } + return untyped.(rbacv1.RoleInformer) +} diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/fake/fake.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/fake/fake.go similarity index 80% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/fake/fake.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/fake/fake.go index deedcba4f..7c1ee8a8b 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/fake/fake.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/fake/fake.go @@ -19,10 +19,10 @@ package fake import ( "context" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory/fake" - "github.com/knative/pkg/injection/informers/kubeinformers/rbacv1/rolebinding" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory/fake" + "knative.dev/pkg/injection/informers/kubeinformers/rbacv1/rolebinding" ) var Get = rolebinding.Get diff --git a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/rolebinding.go b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/rolebinding.go similarity index 88% rename from vendor/github.com/knative/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/rolebinding.go rename to vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/rolebinding.go index f7dca0d23..f740b64a9 100644 --- a/vendor/github.com/knative/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/rolebinding.go +++ b/vendor/knative.dev/pkg/injection/informers/kubeinformers/rbacv1/rolebinding/rolebinding.go @@ -21,10 +21,10 @@ import ( rbacv1 "k8s.io/client-go/informers/rbac/v1" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/informers/kubeinformers/factory" - "github.com/knative/pkg/logging" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/informers/kubeinformers/factory" + "knative.dev/pkg/logging" ) func init() { diff --git a/vendor/github.com/knative/pkg/injection/interface.go b/vendor/knative.dev/pkg/injection/interface.go similarity index 97% rename from vendor/github.com/knative/pkg/injection/interface.go rename to vendor/knative.dev/pkg/injection/interface.go index 6413b0619..bf6e7eef9 100644 --- a/vendor/github.com/knative/pkg/injection/interface.go +++ b/vendor/knative.dev/pkg/injection/interface.go @@ -22,8 +22,8 @@ import ( "k8s.io/client-go/rest" - "github.com/knative/pkg/configmap" - "github.com/knative/pkg/controller" + "knative.dev/pkg/configmap" + "knative.dev/pkg/controller" ) // Interface is the interface for interacting with injection diff --git a/vendor/github.com/knative/pkg/injection/sharedmain/main.go b/vendor/knative.dev/pkg/injection/sharedmain/main.go similarity index 92% rename from vendor/github.com/knative/pkg/injection/sharedmain/main.go rename to vendor/knative.dev/pkg/injection/sharedmain/main.go index 08c1ef2bf..eada5b7c1 100644 --- a/vendor/github.com/knative/pkg/injection/sharedmain/main.go +++ b/vendor/knative.dev/pkg/injection/sharedmain/main.go @@ -24,15 +24,15 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/knative/pkg/configmap" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - "github.com/knative/pkg/injection/clients/kubeclient" - "github.com/knative/pkg/logging" - "github.com/knative/pkg/metrics" - "github.com/knative/pkg/signals" - "github.com/knative/pkg/system" "go.uber.org/zap" + "knative.dev/pkg/configmap" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + "knative.dev/pkg/injection/clients/kubeclient" + "knative.dev/pkg/logging" + "knative.dev/pkg/metrics" + "knative.dev/pkg/signals" + "knative.dev/pkg/system" ) func Main(component string, ctors ...injection.ControllerConstructor) { diff --git a/vendor/github.com/knative/pkg/kmeta/OWNERS b/vendor/knative.dev/pkg/kmeta/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/kmeta/OWNERS rename to vendor/knative.dev/pkg/kmeta/OWNERS diff --git a/vendor/github.com/knative/pkg/kmeta/accessor.go b/vendor/knative.dev/pkg/kmeta/accessor.go similarity index 100% rename from vendor/github.com/knative/pkg/kmeta/accessor.go rename to vendor/knative.dev/pkg/kmeta/accessor.go diff --git a/vendor/github.com/knative/pkg/kmeta/doc.go b/vendor/knative.dev/pkg/kmeta/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/kmeta/doc.go rename to vendor/knative.dev/pkg/kmeta/doc.go diff --git a/vendor/github.com/knative/pkg/kmeta/labels.go b/vendor/knative.dev/pkg/kmeta/labels.go similarity index 100% rename from vendor/github.com/knative/pkg/kmeta/labels.go rename to vendor/knative.dev/pkg/kmeta/labels.go diff --git a/vendor/knative.dev/pkg/kmeta/names.go b/vendor/knative.dev/pkg/kmeta/names.go new file mode 100644 index 000000000..1efa7108b --- /dev/null +++ b/vendor/knative.dev/pkg/kmeta/names.go @@ -0,0 +1,41 @@ +/* +copyright 2019 the knative authors + +licensed under the apache license, version 2.0 (the "license"); +you may not use this file except in compliance with the license. +you may obtain a copy of the license at + + http://www.apache.org/licenses/license-2.0 + +unless required by applicable law or agreed to in writing, software +distributed under the license is distributed on an "as is" basis, +without warranties or conditions of any kind, either express or implied. +see the license for the specific language governing permissions and +limitations under the license. +*/ + +package kmeta + +import ( + "crypto/md5" + "fmt" +) + +// The longest name supported by the K8s is 63. +// These constants +const ( + longest = 63 + md5Len = 32 + head = longest - md5Len +) + +// ChildName generates a name for the resource based upong the parent resource and suffix. +// If the concatenated name is longer than K8s permits the name is hashed and truncated to permit +// construction of the resource, but still keeps it unique. +func ChildName(parent, suffix string) string { + n := parent + if len(parent) > (longest - len(suffix)) { + n = fmt.Sprintf("%s%x", parent[:head-len(suffix)], md5.Sum([]byte(parent))) + } + return n + suffix +} diff --git a/vendor/github.com/knative/pkg/kmeta/owner_references.go b/vendor/knative.dev/pkg/kmeta/owner_references.go similarity index 100% rename from vendor/github.com/knative/pkg/kmeta/owner_references.go rename to vendor/knative.dev/pkg/kmeta/owner_references.go diff --git a/vendor/knative.dev/pkg/kmeta/ownerrefable_accessor.go b/vendor/knative.dev/pkg/kmeta/ownerrefable_accessor.go new file mode 100644 index 000000000..822a7ac0c --- /dev/null +++ b/vendor/knative.dev/pkg/kmeta/ownerrefable_accessor.go @@ -0,0 +1,25 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +package kmeta + +// OwnerRefableAccessor is a combination of OwnerRefable interface and Accessor interface +// which inidcates that it has 1) sufficient information to produce a metav1.OwnerReference to an object, +// 2) and a collection of interfaces from metav1.TypeMeta runtime.Object and metav1.Object that Kubernetes API types +// registered with runtime.Scheme must support. +type OwnerRefableAccessor interface { + OwnerRefable + Accessor +} diff --git a/vendor/github.com/knative/pkg/kmp/diff.go b/vendor/knative.dev/pkg/kmp/diff.go similarity index 100% rename from vendor/github.com/knative/pkg/kmp/diff.go rename to vendor/knative.dev/pkg/kmp/diff.go diff --git a/vendor/github.com/knative/pkg/kmp/doc.go b/vendor/knative.dev/pkg/kmp/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/kmp/doc.go rename to vendor/knative.dev/pkg/kmp/doc.go diff --git a/vendor/github.com/knative/pkg/kmp/reporters.go b/vendor/knative.dev/pkg/kmp/reporters.go similarity index 88% rename from vendor/github.com/knative/pkg/kmp/reporters.go rename to vendor/knative.dev/pkg/kmp/reporters.go index e09cf2f37..6221b16e9 100644 --- a/vendor/github.com/knative/pkg/kmp/reporters.go +++ b/vendor/knative.dev/pkg/kmp/reporters.go @@ -111,16 +111,28 @@ func (r *ShortDiffReporter) Report(rs cmp.Result) { t := cur.Type() var diff string // Prefix struct values with the types to add clarity in output - if !vx.IsValid() || !vy.IsValid() { + if !vx.IsValid() && !vy.IsValid() { r.err = fmt.Errorf("Unable to diff %+v and %+v on path %#v", vx, vy, r.path) - } else if t.Kind() == reflect.Struct { - diff = fmt.Sprintf("%#v:\n\t-: %+v: \"%+v\"\n\t+: %+v: \"%+v\"\n", r.path, t, vx, t, vy) } else { - diff = fmt.Sprintf("%#v:\n\t-: \"%+v\"\n\t+: \"%+v\"\n", r.path, vx, vy) + diff = fmt.Sprintf("%#v:\n", r.path) + if vx.IsValid() { + diff += r.diffString("-", t, vx) + } + if vy.IsValid() { + diff += r.diffString("+", t, vy) + } } r.diffs = append(r.diffs, diff) } +func (r *ShortDiffReporter) diffString(diffType string, t reflect.Type, v reflect.Value) string { + if t.Kind() == reflect.Struct { + return fmt.Sprintf("\t%s: %+v: \"%+v\"\n", diffType, t, v) + } else { + return fmt.Sprintf("\t%s: \"%+v\"\n", diffType, v) + } +} + // PopStep implements the cmp.Reporter. func (r *ShortDiffReporter) PopStep() { r.path = r.path[:len(r.path)-1] diff --git a/vendor/github.com/knative/pkg/logging/OWNERS b/vendor/knative.dev/pkg/logging/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/logging/OWNERS rename to vendor/knative.dev/pkg/logging/OWNERS diff --git a/vendor/github.com/knative/pkg/logging/config.go b/vendor/knative.dev/pkg/logging/config.go similarity index 98% rename from vendor/github.com/knative/pkg/logging/config.go rename to vendor/knative.dev/pkg/logging/config.go index 236a44986..1a658fdc0 100644 --- a/vendor/github.com/knative/pkg/logging/config.go +++ b/vendor/knative.dev/pkg/logging/config.go @@ -27,8 +27,8 @@ import ( "go.uber.org/zap/zapcore" corev1 "k8s.io/api/core/v1" - "github.com/knative/pkg/changeset" - "github.com/knative/pkg/logging/logkey" + "knative.dev/pkg/changeset" + "knative.dev/pkg/logging/logkey" ) const ConfigMapNameEnv = "CONFIG_LOGGING_NAME" diff --git a/vendor/github.com/knative/pkg/logging/logger.go b/vendor/knative.dev/pkg/logging/logger.go similarity index 100% rename from vendor/github.com/knative/pkg/logging/logger.go rename to vendor/knative.dev/pkg/logging/logger.go diff --git a/vendor/github.com/knative/pkg/logging/logkey/constants.go b/vendor/knative.dev/pkg/logging/logkey/constants.go similarity index 100% rename from vendor/github.com/knative/pkg/logging/logkey/constants.go rename to vendor/knative.dev/pkg/logging/logkey/constants.go diff --git a/vendor/github.com/knative/pkg/logging/testing/util.go b/vendor/knative.dev/pkg/logging/testing/util.go similarity index 97% rename from vendor/github.com/knative/pkg/logging/testing/util.go rename to vendor/knative.dev/pkg/logging/testing/util.go index 05179648f..29daf9934 100644 --- a/vendor/github.com/knative/pkg/logging/testing/util.go +++ b/vendor/knative.dev/pkg/logging/testing/util.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - "github.com/knative/pkg/logging" + "knative.dev/pkg/logging" ) var ( diff --git a/vendor/github.com/knative/pkg/logging/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/logging/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/knative/pkg/logging/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/logging/zz_generated.deepcopy.go diff --git a/vendor/github.com/knative/pkg/metrics/OWNERS b/vendor/knative.dev/pkg/metrics/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/metrics/OWNERS rename to vendor/knative.dev/pkg/metrics/OWNERS diff --git a/vendor/github.com/knative/pkg/metrics/config.go b/vendor/knative.dev/pkg/metrics/config.go similarity index 99% rename from vendor/github.com/knative/pkg/metrics/config.go rename to vendor/knative.dev/pkg/metrics/config.go index cdce9b53f..627e064a3 100644 --- a/vendor/github.com/knative/pkg/metrics/config.go +++ b/vendor/knative.dev/pkg/metrics/config.go @@ -288,6 +288,6 @@ If this is a Go unit test consuming metric.Domain() then it should add the following import: import ( - _ "github.com/knative/pkg/metrics/testing" + _ "knative.dev/pkg/metrics/testing" )`, DomainEnv, DomainEnv)) } diff --git a/vendor/github.com/knative/pkg/metrics/doc.go b/vendor/knative.dev/pkg/metrics/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/metrics/doc.go rename to vendor/knative.dev/pkg/metrics/doc.go diff --git a/vendor/github.com/knative/pkg/metrics/exporter.go b/vendor/knative.dev/pkg/metrics/exporter.go similarity index 100% rename from vendor/github.com/knative/pkg/metrics/exporter.go rename to vendor/knative.dev/pkg/metrics/exporter.go diff --git a/vendor/github.com/knative/pkg/metrics/gcp_metadata.go b/vendor/knative.dev/pkg/metrics/gcp_metadata.go similarity index 91% rename from vendor/github.com/knative/pkg/metrics/gcp_metadata.go rename to vendor/knative.dev/pkg/metrics/gcp_metadata.go index ed64fb733..5f33e3ea4 100644 --- a/vendor/github.com/knative/pkg/metrics/gcp_metadata.go +++ b/vendor/knative.dev/pkg/metrics/gcp_metadata.go @@ -15,7 +15,7 @@ package metrics import ( "cloud.google.com/go/compute/metadata" - "github.com/knative/pkg/metrics/metricskey" + "knative.dev/pkg/metrics/metricskey" ) func retrieveGCPMetadata() *gcpMetadata { @@ -28,7 +28,7 @@ func retrieveGCPMetadata() *gcpMetadata { if err == nil && project != "" { gm.project = project } - location, err := metadata.Zone() + location, err := metadata.InstanceAttributeValue("cluster-location") if err == nil && location != "" { gm.location = location } diff --git a/vendor/github.com/knative/pkg/metrics/metricskey/constants.go b/vendor/knative.dev/pkg/metrics/metricskey/constants.go similarity index 100% rename from vendor/github.com/knative/pkg/metrics/metricskey/constants.go rename to vendor/knative.dev/pkg/metrics/metricskey/constants.go diff --git a/vendor/knative.dev/pkg/metrics/metricstest/metricstest.go b/vendor/knative.dev/pkg/metrics/metricstest/metricstest.go new file mode 100644 index 000000000..91416da26 --- /dev/null +++ b/vendor/knative.dev/pkg/metrics/metricstest/metricstest.go @@ -0,0 +1,161 @@ +/* +Copyright 2019 The Knative Authors +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package metricstest + +import ( + "testing" + + "go.opencensus.io/stats/view" +) + +// CheckStatsReported checks that there is a view registered with the given name for each string in names, +// and that each view has at least one record. +func CheckStatsReported(t *testing.T, names ...string) { + t.Helper() + for _, name := range names { + d, err := view.RetrieveData(name) + if err != nil { + t.Errorf("For metric %s: Reporter.Report() error = %v", name, err) + } + if len(d) < 1 { + t.Errorf("For metric %s: No data reported when data was expected, view data is empty.", name) + } + } +} + +// CheckStatsNotReported checks that there are no records for any views that a name matching a string in names. +// Names that do not match registered views are considered not reported. +func CheckStatsNotReported(t *testing.T, names ...string) { + t.Helper() + for _, name := range names { + d, err := view.RetrieveData(name) + // err == nil means a valid stat exists matching "name" + // len(d) > 0 means a component recorded metrics for that stat + if err == nil && len(d) > 0 { + t.Errorf("For metric %s: Unexpected data reported when no data was expected. Reporter len(d) = %d", name, len(d)) + } + } +} + +// CheckCountData checks the view with a name matching string name to verify that the CountData stats +// reported are tagged with the tags in wantTags and that wantValue matches reported count. +func CheckCountData(t *testing.T, name string, wantTags map[string]string, wantValue int64) { + t.Helper() + if row := checkExactlyOneRow(t, name, wantTags); row != nil { + checkRowTags(t, row, name, wantTags) + + if s, ok := row.Data.(*view.CountData); !ok { + t.Errorf("For metric %s: Reporter expected a CountData type", name) + } else if s.Value != wantValue { + t.Errorf("For metric %s: value = %v, want: %d", name, s.Value, wantValue) + } + } +} + +// CheckDistributionData checks the view with a name matching string name to verify that the DistributionData stats reported +// are tagged with the tags in wantTags and that expectedCount number of records were reported. +// It also checks that expectedMin and expectedMax match the minimum and maximum reported values, respectively. +func CheckDistributionData(t *testing.T, name string, wantTags map[string]string, expectedCount int64, expectedMin float64, expectedMax float64) { + t.Helper() + if row := checkExactlyOneRow(t, name, wantTags); row != nil { + checkRowTags(t, row, name, wantTags) + + if s, ok := row.Data.(*view.DistributionData); !ok { + t.Errorf("For metric %s: Reporter expected a DistributionData type", name) + } else { + if s.Count != expectedCount { + t.Errorf("For metric %s: reporter count = %d, want = %d", name, s.Count, expectedCount) + } + if s.Min != expectedMin { + t.Errorf("For metric %s: reporter count = %f, want = %f", name, s.Min, expectedMin) + } + if s.Max != expectedMax { + t.Errorf("For metric %s: reporter count = %f, want = %f", name, s.Max, expectedMax) + } + } + } +} + +// CheckLastValueData checks the view with a name matching string name to verify that the LastValueData stats +// reported are tagged with the tags in wantTags and that wantValue matches reported last value. +func CheckLastValueData(t *testing.T, name string, wantTags map[string]string, wantValue float64) { + t.Helper() + if row := checkExactlyOneRow(t, name, wantTags); row != nil { + checkRowTags(t, row, name, wantTags) + + if s, ok := row.Data.(*view.LastValueData); !ok { + t.Errorf("For metric %s: Reporter.Report() expected a LastValueData type", name) + } else if s.Value != wantValue { + t.Errorf("For metric %s: Reporter.Report() expected %v got %v", name, s.Value, wantValue) + } + } +} + +// CheckSumData checks the view with a name matching string name to verify that the SumData stats +// reported are tagged with the tags in wantTags and that wantValue matches the reported sum. +func CheckSumData(t *testing.T, name string, wantTags map[string]string, wantValue float64) { + t.Helper() + if row := checkExactlyOneRow(t, name, wantTags); row != nil { + checkRowTags(t, row, name, wantTags) + + if s, ok := row.Data.(*view.SumData); !ok { + t.Errorf("For metric %s: Reporter expected a SumData type", name) + } else if s.Value != wantValue { + t.Errorf("For metric %s: value = %v, want: %v", name, s.Value, wantValue) + } + } +} + +// Unregister unregisters the metrics that were registered. +// This is useful for testing since golang execute test iterations within the same process and +// opencensus views maintain global state. At the beginning of each test, tests should +// unregister for all metrics and then re-register for the same metrics. This effectively clears +// out any existing data and avoids a panic due to re-registering a metric. +// +// In normal process shutdown, metrics do not need to be unregistered. +func Unregister(names ...string) { + for _, n := range names { + if v := view.Find(n); v != nil { + view.Unregister(v) + } + } +} + +func checkExactlyOneRow(t *testing.T, name string, wantTags map[string]string) *view.Row { + t.Helper() + d, err := view.RetrieveData(name) + if err != nil { + t.Errorf("For metric %s: Reporter.Report() error = %v", name, err) + return nil + } + if len(d) != 1 { + t.Errorf("For metric %s: Reporter.Report() len(d)=%v, want 1", name, len(d)) + } + + return d[0] +} + +func checkRowTags(t *testing.T, row *view.Row, name string, wantTags map[string]string) { + t.Helper() + for _, got := range row.Tags { + n := got.Key.Name() + if want, ok := wantTags[n]; !ok { + t.Errorf("For metric %s: Reporter got an extra tag %v: %v", name, n, got.Value) + } else if got.Value != want { + t.Errorf("For metric %s: Reporter expected a different tag value for key: %s, got: %s, want: %s", name, n, got.Value, want) + } + } +} diff --git a/vendor/github.com/knative/pkg/metrics/monitored_resources.go b/vendor/knative.dev/pkg/metrics/monitored_resources.go similarity index 97% rename from vendor/github.com/knative/pkg/metrics/monitored_resources.go rename to vendor/knative.dev/pkg/metrics/monitored_resources.go index 295fb778f..d8ab5d875 100644 --- a/vendor/github.com/knative/pkg/metrics/monitored_resources.go +++ b/vendor/knative.dev/pkg/metrics/monitored_resources.go @@ -14,7 +14,7 @@ limitations under the License. package metrics import ( - "github.com/knative/pkg/metrics/metricskey" + "knative.dev/pkg/metrics/metricskey" ) type gcpMetadata struct { diff --git a/vendor/github.com/knative/pkg/metrics/prometheus_exporter.go b/vendor/knative.dev/pkg/metrics/prometheus_exporter.go similarity index 97% rename from vendor/github.com/knative/pkg/metrics/prometheus_exporter.go rename to vendor/knative.dev/pkg/metrics/prometheus_exporter.go index c3c0d55d0..b83b23a0d 100644 --- a/vendor/github.com/knative/pkg/metrics/prometheus_exporter.go +++ b/vendor/knative.dev/pkg/metrics/prometheus_exporter.go @@ -18,7 +18,7 @@ import ( "net/http" "sync" - "go.opencensus.io/exporter/prometheus" + "contrib.go.opencensus.io/exporter/prometheus" "go.opencensus.io/stats/view" "go.uber.org/zap" ) diff --git a/vendor/github.com/knative/pkg/metrics/record.go b/vendor/knative.dev/pkg/metrics/record.go similarity index 80% rename from vendor/github.com/knative/pkg/metrics/record.go rename to vendor/knative.dev/pkg/metrics/record.go index 98a007cfe..1b045ea0a 100644 --- a/vendor/github.com/knative/pkg/metrics/record.go +++ b/vendor/knative.dev/pkg/metrics/record.go @@ -20,8 +20,8 @@ import ( "context" "path" - "github.com/knative/pkg/metrics/metricskey" "go.opencensus.io/stats" + "knative.dev/pkg/metrics/metricskey" ) // Record decides whether to record one measurement via OpenCensus based on the @@ -54,3 +54,14 @@ func Record(ctx context.Context, ms stats.Measurement) { stats.Record(ctx, ms) } } + +// Buckets125 generates an array of buckets with approximate powers-of-two +// buckets that also aligns with powers of 10 on every 3rd step. This can +// be used to create a view.Distribution. +func Buckets125(low, high float64) []float64 { + buckets := []float64{low} + for last := low; last < high; last = last * 10 { + buckets = append(buckets, 2*last, 5*last, 10*last) + } + return buckets +} diff --git a/vendor/github.com/knative/pkg/metrics/stackdriver_exporter.go b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go similarity index 99% rename from vendor/github.com/knative/pkg/metrics/stackdriver_exporter.go rename to vendor/knative.dev/pkg/metrics/stackdriver_exporter.go index 60bf1d5f3..6d2a8cab8 100644 --- a/vendor/github.com/knative/pkg/metrics/stackdriver_exporter.go +++ b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go @@ -18,10 +18,10 @@ import ( "contrib.go.opencensus.io/exporter/stackdriver" "contrib.go.opencensus.io/exporter/stackdriver/monitoredresource" - "github.com/knative/pkg/metrics/metricskey" "go.opencensus.io/stats/view" "go.opencensus.io/tag" "go.uber.org/zap" + "knative.dev/pkg/metrics/metricskey" ) // customMetricTypePrefix is the metric type prefix for unsupported metrics by diff --git a/vendor/github.com/knative/pkg/metrics/testing/config.go b/vendor/knative.dev/pkg/metrics/testing/config.go similarity index 95% rename from vendor/github.com/knative/pkg/metrics/testing/config.go rename to vendor/knative.dev/pkg/metrics/testing/config.go index 5b19816d7..a0932f005 100644 --- a/vendor/github.com/knative/pkg/metrics/testing/config.go +++ b/vendor/knative.dev/pkg/metrics/testing/config.go @@ -19,7 +19,7 @@ package testing import ( "os" - "github.com/knative/pkg/metrics" + "knative.dev/pkg/metrics" ) func init() { diff --git a/vendor/github.com/knative/pkg/ptr/doc.go b/vendor/knative.dev/pkg/ptr/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/ptr/doc.go rename to vendor/knative.dev/pkg/ptr/doc.go diff --git a/vendor/github.com/knative/pkg/ptr/ptr.go b/vendor/knative.dev/pkg/ptr/ptr.go similarity index 76% rename from vendor/github.com/knative/pkg/ptr/ptr.go rename to vendor/knative.dev/pkg/ptr/ptr.go index 356464733..a3bfef85c 100644 --- a/vendor/github.com/knative/pkg/ptr/ptr.go +++ b/vendor/knative.dev/pkg/ptr/ptr.go @@ -16,6 +16,8 @@ limitations under the License. package ptr +import "time" + // Int32 is a helper for turning integers into pointers for use in // API types that want *int32. func Int32(i int32) *int32 { @@ -39,3 +41,15 @@ func Bool(b bool) *bool { func String(s string) *string { return &s } + +// Duration is a helper for turning time.Duration into pointers for use in +// API types that want *time.Duration. +func Duration(t time.Duration) *time.Duration { + return &t +} + +// Time is a helper for turning a const time.Time into a pointer for use in +// API types that want *time.Duration. +func Time(t time.Time) *time.Time { + return &t +} diff --git a/vendor/github.com/knative/pkg/reconciler/testing/actions.go b/vendor/knative.dev/pkg/reconciler/testing/actions.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/actions.go rename to vendor/knative.dev/pkg/reconciler/testing/actions.go diff --git a/vendor/github.com/knative/pkg/reconciler/testing/clock.go b/vendor/knative.dev/pkg/reconciler/testing/clock.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/clock.go rename to vendor/knative.dev/pkg/reconciler/testing/clock.go diff --git a/vendor/github.com/knative/pkg/reconciler/testing/context.go b/vendor/knative.dev/pkg/reconciler/testing/context.go similarity index 88% rename from vendor/github.com/knative/pkg/reconciler/testing/context.go rename to vendor/knative.dev/pkg/reconciler/testing/context.go index f9692c810..723c87efa 100644 --- a/vendor/github.com/knative/pkg/reconciler/testing/context.go +++ b/vendor/knative.dev/pkg/reconciler/testing/context.go @@ -23,9 +23,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/injection" - logtesting "github.com/knative/pkg/logging/testing" + "knative.dev/pkg/controller" + "knative.dev/pkg/injection" + logtesting "knative.dev/pkg/logging/testing" ) func SetupFakeContext(t *testing.T) (context.Context, []controller.Informer) { diff --git a/vendor/github.com/knative/pkg/reconciler/testing/events.go b/vendor/knative.dev/pkg/reconciler/testing/events.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/events.go rename to vendor/knative.dev/pkg/reconciler/testing/events.go diff --git a/vendor/github.com/knative/pkg/reconciler/testing/generate_name_reactor.go b/vendor/knative.dev/pkg/reconciler/testing/generate_name_reactor.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/generate_name_reactor.go rename to vendor/knative.dev/pkg/reconciler/testing/generate_name_reactor.go diff --git a/vendor/github.com/knative/pkg/reconciler/testing/hooks.go b/vendor/knative.dev/pkg/reconciler/testing/hooks.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/hooks.go rename to vendor/knative.dev/pkg/reconciler/testing/hooks.go diff --git a/vendor/github.com/knative/pkg/reconciler/testing/reactions.go b/vendor/knative.dev/pkg/reconciler/testing/reactions.go similarity index 98% rename from vendor/github.com/knative/pkg/reconciler/testing/reactions.go rename to vendor/knative.dev/pkg/reconciler/testing/reactions.go index 9ce0e4044..09caae767 100644 --- a/vendor/github.com/knative/pkg/reconciler/testing/reactions.go +++ b/vendor/knative.dev/pkg/reconciler/testing/reactions.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" clientgotesting "k8s.io/client-go/testing" - "github.com/knative/pkg/apis" + "knative.dev/pkg/apis" ) // InduceFailure is used in conjunction with TableTest's WithReactors field. diff --git a/vendor/github.com/knative/pkg/reconciler/testing/sorter.go b/vendor/knative.dev/pkg/reconciler/testing/sorter.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/sorter.go rename to vendor/knative.dev/pkg/reconciler/testing/sorter.go diff --git a/vendor/github.com/knative/pkg/reconciler/testing/stats.go b/vendor/knative.dev/pkg/reconciler/testing/stats.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/stats.go rename to vendor/knative.dev/pkg/reconciler/testing/stats.go diff --git a/vendor/github.com/knative/pkg/reconciler/testing/table.go b/vendor/knative.dev/pkg/reconciler/testing/table.go similarity index 98% rename from vendor/github.com/knative/pkg/reconciler/testing/table.go rename to vendor/knative.dev/pkg/reconciler/testing/table.go index 2d445cd06..2e8ce0759 100644 --- a/vendor/github.com/knative/pkg/reconciler/testing/table.go +++ b/vendor/knative.dev/pkg/reconciler/testing/table.go @@ -25,13 +25,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/knative/pkg/controller" - "github.com/knative/pkg/kmeta" - _ "github.com/knative/pkg/system/testing" // Setup system.Namespace() "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" clientgotesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + "knative.dev/pkg/controller" + "knative.dev/pkg/kmeta" + _ "knative.dev/pkg/system/testing" // Setup system.Namespace() ) // TableRow holds a single row of our table test. diff --git a/vendor/github.com/knative/pkg/reconciler/testing/tracker.go b/vendor/knative.dev/pkg/reconciler/testing/tracker.go similarity index 96% rename from vendor/github.com/knative/pkg/reconciler/testing/tracker.go rename to vendor/knative.dev/pkg/reconciler/testing/tracker.go index 893ba86aa..480598938 100644 --- a/vendor/github.com/knative/pkg/reconciler/testing/tracker.go +++ b/vendor/knative.dev/pkg/reconciler/testing/tracker.go @@ -19,7 +19,7 @@ package testing import ( corev1 "k8s.io/api/core/v1" - "github.com/knative/pkg/tracker" + "knative.dev/pkg/tracker" ) // NullTracker implements Tracker. diff --git a/vendor/github.com/knative/pkg/reconciler/testing/util.go b/vendor/knative.dev/pkg/reconciler/testing/util.go similarity index 100% rename from vendor/github.com/knative/pkg/reconciler/testing/util.go rename to vendor/knative.dev/pkg/reconciler/testing/util.go diff --git a/vendor/github.com/knative/pkg/signals/signal.go b/vendor/knative.dev/pkg/signals/signal.go similarity index 100% rename from vendor/github.com/knative/pkg/signals/signal.go rename to vendor/knative.dev/pkg/signals/signal.go diff --git a/vendor/github.com/knative/pkg/signals/signal_posix.go b/vendor/knative.dev/pkg/signals/signal_posix.go similarity index 100% rename from vendor/github.com/knative/pkg/signals/signal_posix.go rename to vendor/knative.dev/pkg/signals/signal_posix.go diff --git a/vendor/github.com/knative/pkg/signals/signal_windows.go b/vendor/knative.dev/pkg/signals/signal_windows.go similarity index 100% rename from vendor/github.com/knative/pkg/signals/signal_windows.go rename to vendor/knative.dev/pkg/signals/signal_windows.go diff --git a/vendor/github.com/knative/pkg/system/clock.go b/vendor/knative.dev/pkg/system/clock.go similarity index 100% rename from vendor/github.com/knative/pkg/system/clock.go rename to vendor/knative.dev/pkg/system/clock.go diff --git a/vendor/github.com/knative/pkg/system/names.go b/vendor/knative.dev/pkg/system/names.go similarity index 96% rename from vendor/github.com/knative/pkg/system/names.go rename to vendor/knative.dev/pkg/system/names.go index fdd6a576e..13a07c8ed 100644 --- a/vendor/github.com/knative/pkg/system/names.go +++ b/vendor/knative.dev/pkg/system/names.go @@ -47,6 +47,6 @@ If this is a Go unit test consuming system.Namespace() then it should add the following import: import ( - _ "github.com/knative/pkg/system/testing" + _ "knative.dev/pkg/system/testing" )`, NamespaceEnvKey, NamespaceEnvKey)) } diff --git a/vendor/github.com/knative/pkg/system/testing/names.go b/vendor/knative.dev/pkg/system/testing/names.go similarity index 95% rename from vendor/github.com/knative/pkg/system/testing/names.go rename to vendor/knative.dev/pkg/system/testing/names.go index ac4945a96..6f674f16b 100644 --- a/vendor/github.com/knative/pkg/system/testing/names.go +++ b/vendor/knative.dev/pkg/system/testing/names.go @@ -19,7 +19,7 @@ package testing import ( "os" - "github.com/knative/pkg/system" + "knative.dev/pkg/system" ) func init() { diff --git a/vendor/knative.dev/pkg/test/OWNERS b/vendor/knative.dev/pkg/test/OWNERS new file mode 100644 index 000000000..c50adc849 --- /dev/null +++ b/vendor/knative.dev/pkg/test/OWNERS @@ -0,0 +1,10 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- productivity-approvers + +reviewers: +- productivity-reviewers + +labels: +- area/test-and-release diff --git a/vendor/github.com/knative/pkg/test/README.md b/vendor/knative.dev/pkg/test/README.md similarity index 97% rename from vendor/github.com/knative/pkg/test/README.md rename to vendor/knative.dev/pkg/test/README.md index 422e5ed60..60e5d484e 100644 --- a/vendor/github.com/knative/pkg/test/README.md +++ b/vendor/knative.dev/pkg/test/README.md @@ -31,8 +31,8 @@ These flags are useful for running against an existing cluster, making use of your existing [environment setup](https://github.com/knative/serving/blob/master/DEVELOPMENT.md#environment-setup). -By importing `github.com/knative/pkg/test` you get access to a global variable -called `test.Flags` which holds the values of +By importing `knative.dev/pkg/test` you get access to a global variable called +`test.Flags` which holds the values of [the command line flags](/test/README.md#flags). ```go @@ -170,8 +170,7 @@ _See [cleanup.go](./cleanup.go)._ Importing [the test library](#test-library) adds flags that are useful for end to end tests that need to run against a cluster. -Tests importing [`github.com/knative/pkg/test`](#test-library) recognize these -flags: +Tests importing [`knative.dev/pkg/test`](#test-library) recognize these flags: - [`--kubeconfig`](#specifying-kubeconfig) - [`--cluster`](#specifying-cluster) diff --git a/vendor/github.com/knative/pkg/test/cleanup.go b/vendor/knative.dev/pkg/test/cleanup.go similarity index 96% rename from vendor/github.com/knative/pkg/test/cleanup.go rename to vendor/knative.dev/pkg/test/cleanup.go index aa2c860fd..b34917262 100644 --- a/vendor/github.com/knative/pkg/test/cleanup.go +++ b/vendor/knative.dev/pkg/test/cleanup.go @@ -23,7 +23,7 @@ import ( "os" "os/signal" - "github.com/knative/pkg/test/logging" + "knative.dev/pkg/test/logging" ) // CleanupOnInterrupt will execute the function cleanup if an interrupt signal is caught diff --git a/vendor/github.com/knative/pkg/test/clients.go b/vendor/knative.dev/pkg/test/clients.go similarity index 98% rename from vendor/github.com/knative/pkg/test/clients.go rename to vendor/knative.dev/pkg/test/clients.go index fbd9e6583..4162a386c 100644 --- a/vendor/github.com/knative/pkg/test/clients.go +++ b/vendor/knative.dev/pkg/test/clients.go @@ -22,14 +22,14 @@ import ( "fmt" "strings" - "github.com/knative/pkg/test/logging" - "github.com/knative/pkg/test/spoof" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" k8styped "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + "knative.dev/pkg/test/logging" + "knative.dev/pkg/test/spoof" ) // KubeClient holds instances of interfaces for making requests to kubernetes client. diff --git a/vendor/github.com/knative/pkg/test/crd.go b/vendor/knative.dev/pkg/test/crd.go similarity index 100% rename from vendor/github.com/knative/pkg/test/crd.go rename to vendor/knative.dev/pkg/test/crd.go diff --git a/vendor/github.com/knative/pkg/test/e2e_flags.go b/vendor/knative.dev/pkg/test/e2e_flags.go similarity index 100% rename from vendor/github.com/knative/pkg/test/e2e_flags.go rename to vendor/knative.dev/pkg/test/e2e_flags.go diff --git a/vendor/github.com/knative/pkg/test/helpers/data.go b/vendor/knative.dev/pkg/test/helpers/data.go similarity index 100% rename from vendor/github.com/knative/pkg/test/helpers/data.go rename to vendor/knative.dev/pkg/test/helpers/data.go diff --git a/vendor/knative.dev/pkg/test/helpers/name.go b/vendor/knative.dev/pkg/test/helpers/name.go new file mode 100644 index 000000000..50ad03a86 --- /dev/null +++ b/vendor/knative.dev/pkg/test/helpers/name.go @@ -0,0 +1,36 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package helpers + +import ( + "strings" + "testing" +) + +const ( + testNamePrefix = "Test" +) + +// ObjectPrefixForTest returns the name prefix for this test's random names. +func ObjectPrefixForTest(t *testing.T) string { + return MakeK8sNamePrefix(strings.TrimPrefix(t.Name(), testNamePrefix)) +} + +// ObjectNameForTest generates a random object name based on the test name. +func ObjectNameForTest(t *testing.T) string { + return AppendRandomString(ObjectPrefixForTest(t)) +} diff --git a/vendor/github.com/knative/pkg/test/ingress/ingress.go b/vendor/knative.dev/pkg/test/ingress/ingress.go similarity index 100% rename from vendor/github.com/knative/pkg/test/ingress/ingress.go rename to vendor/knative.dev/pkg/test/ingress/ingress.go diff --git a/vendor/github.com/knative/pkg/test/kube_checks.go b/vendor/knative.dev/pkg/test/kube_checks.go similarity index 99% rename from vendor/github.com/knative/pkg/test/kube_checks.go rename to vendor/knative.dev/pkg/test/kube_checks.go index 1b78914f5..b15f8ea2b 100644 --- a/vendor/github.com/knative/pkg/test/kube_checks.go +++ b/vendor/knative.dev/pkg/test/kube_checks.go @@ -25,12 +25,12 @@ import ( "strings" "time" - "github.com/knative/pkg/test/logging" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" k8styped "k8s.io/client-go/kubernetes/typed/core/v1" + "knative.dev/pkg/test/logging" ) const ( diff --git a/vendor/github.com/knative/pkg/test/logging/logging.go b/vendor/knative.dev/pkg/test/logging/logging.go similarity index 99% rename from vendor/github.com/knative/pkg/test/logging/logging.go rename to vendor/knative.dev/pkg/test/logging/logging.go index 2c641bd7a..4d9c5a96f 100644 --- a/vendor/github.com/knative/pkg/test/logging/logging.go +++ b/vendor/knative.dev/pkg/test/logging/logging.go @@ -28,10 +28,10 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/golang/glog" - "github.com/knative/pkg/logging" "go.opencensus.io/stats/view" "go.opencensus.io/trace" "go.uber.org/zap" + "knative.dev/pkg/logging" ) const ( diff --git a/vendor/knative.dev/pkg/test/logstream/doc.go b/vendor/knative.dev/pkg/test/logstream/doc.go new file mode 100644 index 000000000..ddad2c446 --- /dev/null +++ b/vendor/knative.dev/pkg/test/logstream/doc.go @@ -0,0 +1,21 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Package logstream lets end-to-end tests incorporate controller logs +// into the error output of tests. It is enabled by setting the +// SYSTEM_NAMESPACE environment variable, which tells this package +// what namespace to stream logs from. +package logstream diff --git a/vendor/knative.dev/pkg/test/logstream/interface.go b/vendor/knative.dev/pkg/test/logstream/interface.go new file mode 100644 index 000000000..6aadddc77 --- /dev/null +++ b/vendor/knative.dev/pkg/test/logstream/interface.go @@ -0,0 +1,52 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package logstream + +import ( + "os" + "testing" + + "knative.dev/pkg/system" +) + +// Canceler is the type of a function returned when a logstream is started to be +// deferred so that the logstream can be stopped when the test is complete. +type Canceler func() + +// Start begins streaming the logs from system components with a `key:` matching +// `test.ObjectNameForTest(t)` to `t.Log`. It returns a Canceler, which must +// be called before the test completes. +func Start(t *testing.T) Canceler { + return stream.Start(t) +} + +type streamer interface { + Start(t *testing.T) Canceler +} + +var stream streamer + +func init() { + ns := os.Getenv(system.NamespaceEnvKey) + if ns != "" { + // If SYSTEM_NAMESPACE is set, then start the stream. + stream = &kubelogs{namespace: ns} + } else { + // Otherwise set up a null stream. + stream = &null{} + } +} diff --git a/vendor/knative.dev/pkg/test/logstream/kubelogs.go b/vendor/knative.dev/pkg/test/logstream/kubelogs.go new file mode 100644 index 000000000..b18a5f144 --- /dev/null +++ b/vendor/knative.dev/pkg/test/logstream/kubelogs.go @@ -0,0 +1,177 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package logstream + +import ( + "bufio" + "encoding/json" + "fmt" + "strings" + "sync" + "testing" + "time" + + "golang.org/x/sync/errgroup" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "knative.dev/pkg/ptr" + "knative.dev/pkg/test" + "knative.dev/pkg/test/helpers" +) + +type kubelogs struct { + namespace string + + once sync.Once + m sync.RWMutex + keys map[string]logger + err error +} + +type logger func(string, ...interface{}) + +var _ streamer = (*kubelogs)(nil) + +// timeFormat defines a simple timestamp with millisecond granularity +const timeFormat = "15:04:05.000" + +func (k *kubelogs) init(t *testing.T) { + k.keys = make(map[string]logger) + + kc, err := test.NewKubeClient(test.Flags.Kubeconfig, test.Flags.Cluster) + if err != nil { + t.Errorf("Error loading client config: %v", err) + } + + // List the pods in the given namespace. + pl, err := kc.Kube.CoreV1().Pods(k.namespace).List(metav1.ListOptions{}) + if err != nil { + t.Errorf("Error listing pods: %v", err) + } + + eg := errgroup.Group{} + for _, pod := range pl.Items { + // Grab data from all containers in the pods. We need this in case + // an envoy sidecar is injected for mesh installs. This should be + // equivalent to --all-containers. + for _, container := range pod.Spec.Containers { + // Required for capture below. + pod, container := pod, container + eg.Go(func() error { + options := &corev1.PodLogOptions{ + Container: container.Name, + // Follow directs the api server to continuously stream logs back. + Follow: true, + // Only return new logs (this value is being used for "epsilon"). + SinceSeconds: ptr.Int64(1), + } + + req := kc.Kube.CoreV1().Pods(k.namespace).GetLogs(pod.Name, options) + stream, err := req.Stream() + if err != nil { + return err + } + defer stream.Close() + // Read this container's stream. + for scanner := bufio.NewScanner(stream); scanner.Scan(); { + k.handleLine(scanner.Text()) + } + return fmt.Errorf("logstream completed prematurely for: %s/%s", pod.Name, container.Name) + }) + } + } + + // Monitor the error group in the background and surface an error on the kubelogs + // in case anything had an active stream open. + go func() { + if err := eg.Wait(); err != nil { + k.m.Lock() + defer k.m.Unlock() + k.err = err + } + }() +} + +func (k *kubelogs) handleLine(l string) { + // This holds the standard structure of our logs. + var line struct { + Level string `json:"level"` + Timestamp time.Time `json:"ts"` + Controller string `json:"knative.dev/controller"` + Caller string `json:"caller"` + Key string `json:"knative.dev/key"` + Message string `json:"msg"` + Error string `json:"error"` + + // TODO(mattmoor): Parse out more context. + } + if err := json.Unmarshal([]byte(l), &line); err != nil { + // Ignore malformed lines. + return + } + if line.Key == "" { + return + } + + k.m.RLock() + defer k.m.RUnlock() + + for name, logf := range k.keys { + // TODO(mattmoor): Do a slightly smarter match. + if !strings.Contains(line.Key, name) { + continue + } + + // E 15:04:05.000 [route-controller] [default/testroute-xyz] this is my message + msg := fmt.Sprintf("%s %s [%s] [%s] %s", + strings.ToUpper(string(line.Level[0])), + line.Timestamp.Format(timeFormat), + line.Controller, + line.Key, + line.Message) + + if line.Error != "" { + msg += " err=" + line.Error + } + + logf(msg) + } +} + +// Start implements streamer +func (k *kubelogs) Start(t *testing.T) Canceler { + k.once.Do(func() { k.init(t) }) + + name := helpers.ObjectPrefixForTest(t) + + // Register a key + k.m.Lock() + defer k.m.Unlock() + k.keys[name] = t.Logf + + // Return a function that unregisters that key. + return func() { + k.m.Lock() + defer k.m.Unlock() + delete(k.keys, name) + + if k.err != nil { + t.Errorf("error during logstream: %v", k.err) + } + } +} diff --git a/vendor/knative.dev/pkg/test/logstream/null.go b/vendor/knative.dev/pkg/test/logstream/null.go new file mode 100644 index 000000000..bbc6cfd2c --- /dev/null +++ b/vendor/knative.dev/pkg/test/logstream/null.go @@ -0,0 +1,30 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package logstream + +import ( + "testing" +) + +type null struct{} + +var _ streamer = (*null)(nil) + +// Start implements streamer +func (*null) Start(t *testing.T) Canceler { + return func() {} +} diff --git a/vendor/github.com/knative/pkg/test/monitoring/doc.go b/vendor/knative.dev/pkg/test/monitoring/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/test/monitoring/doc.go rename to vendor/knative.dev/pkg/test/monitoring/doc.go diff --git a/vendor/github.com/knative/pkg/test/monitoring/monitoring.go b/vendor/knative.dev/pkg/test/monitoring/monitoring.go similarity index 98% rename from vendor/github.com/knative/pkg/test/monitoring/monitoring.go rename to vendor/knative.dev/pkg/test/monitoring/monitoring.go index ccbad42b1..708b0cae1 100644 --- a/vendor/github.com/knative/pkg/test/monitoring/monitoring.go +++ b/vendor/knative.dev/pkg/test/monitoring/monitoring.go @@ -23,10 +23,10 @@ import ( "os/exec" "strings" - "github.com/knative/pkg/test/logging" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + "knative.dev/pkg/test/logging" ) // CheckPortAvailability checks to see if the port is available on the machine. diff --git a/vendor/github.com/knative/pkg/test/presubmit-tests.sh b/vendor/knative.dev/pkg/test/presubmit-tests.sh similarity index 100% rename from vendor/github.com/knative/pkg/test/presubmit-tests.sh rename to vendor/knative.dev/pkg/test/presubmit-tests.sh diff --git a/vendor/github.com/knative/pkg/test/request.go b/vendor/knative.dev/pkg/test/request.go similarity index 87% rename from vendor/github.com/knative/pkg/test/request.go rename to vendor/knative.dev/pkg/test/request.go index 1735b6073..462c857e2 100644 --- a/vendor/github.com/knative/pkg/test/request.go +++ b/vendor/knative.dev/pkg/test/request.go @@ -26,10 +26,29 @@ import ( "strings" "time" - "github.com/knative/pkg/test/logging" - "github.com/knative/pkg/test/spoof" + "knative.dev/pkg/test/logging" + "knative.dev/pkg/test/spoof" ) +// RequestOption enables configuration of requests +// when polling for endpoint states. +type RequestOption func(*http.Request) + +// WithHeader will add the provided headers to the request. +func WithHeader(header http.Header) RequestOption { + return func(r *http.Request) { + if r.Header == nil { + r.Header = header + return + } + for key, values := range header { + for _, value := range values { + r.Header.Add(key, value) + } + } + } +} + // Retrying modifies a ResponseChecker to retry certain response codes. func Retrying(rc spoof.ResponseChecker, codes ...int) spoof.ResponseChecker { return func(resp *spoof.Response) (bool, error) { @@ -115,8 +134,8 @@ func MatchesAllOf(checkers ...spoof.ResponseChecker) spoof.ResponseChecker { // the domain in the request headers, otherwise it will make the request directly to domain. // desc will be used to name the metric that is emitted to track how long it took for the // domain to get into the state checked by inState. Commas in `desc` must be escaped. -func WaitForEndpointState(kubeClient *KubeClient, logf logging.FormatLogger, theURL string, inState spoof.ResponseChecker, desc string, resolvable bool) (*spoof.Response, error) { - return WaitForEndpointStateWithTimeout(kubeClient, logf, theURL, inState, desc, resolvable, spoof.RequestTimeout) +func WaitForEndpointState(kubeClient *KubeClient, logf logging.FormatLogger, theURL string, inState spoof.ResponseChecker, desc string, resolvable bool, opts ...RequestOption) (*spoof.Response, error) { + return WaitForEndpointStateWithTimeout(kubeClient, logf, theURL, inState, desc, resolvable, spoof.RequestTimeout, opts...) } // WaitForEndpointStateWithTimeout will poll an endpoint until inState indicates the state is achieved @@ -127,7 +146,7 @@ func WaitForEndpointState(kubeClient *KubeClient, logf logging.FormatLogger, the // domain to get into the state checked by inState. Commas in `desc` must be escaped. func WaitForEndpointStateWithTimeout( kubeClient *KubeClient, logf logging.FormatLogger, theURL string, inState spoof.ResponseChecker, - desc string, resolvable bool, timeout time.Duration) (*spoof.Response, error) { + desc string, resolvable bool, timeout time.Duration, opts ...RequestOption) (*spoof.Response, error) { defer logging.GetEmitableSpan(context.Background(), fmt.Sprintf("WaitForEndpointState/%s", desc)).End() // Try parsing the "theURL" with and without a scheme. @@ -144,6 +163,10 @@ func WaitForEndpointStateWithTimeout( return nil, err } + for _, opt := range opts { + opt(req) + } + client, err := NewSpoofingClient(kubeClient, logf, asURL.Hostname(), resolvable) if err != nil { return nil, err diff --git a/vendor/github.com/knative/pkg/test/spoof/error_checks.go b/vendor/knative.dev/pkg/test/spoof/error_checks.go similarity index 100% rename from vendor/github.com/knative/pkg/test/spoof/error_checks.go rename to vendor/knative.dev/pkg/test/spoof/error_checks.go diff --git a/vendor/github.com/knative/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go similarity index 98% rename from vendor/github.com/knative/pkg/test/spoof/spoof.go rename to vendor/knative.dev/pkg/test/spoof/spoof.go index f23d3049e..5e58905bb 100644 --- a/vendor/github.com/knative/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -24,12 +24,12 @@ import ( "net/http" "time" - ingress "github.com/knative/pkg/test/ingress" - "github.com/knative/pkg/test/logging" - "github.com/knative/pkg/test/zipkin" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" + ingress "knative.dev/pkg/test/ingress" + "knative.dev/pkg/test/logging" + "knative.dev/pkg/test/zipkin" "go.opencensus.io/plugin/ochttp" "go.opencensus.io/plugin/ochttp/propagation/b3" diff --git a/vendor/github.com/knative/pkg/test/zipkin/doc.go b/vendor/knative.dev/pkg/test/zipkin/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/test/zipkin/doc.go rename to vendor/knative.dev/pkg/test/zipkin/doc.go diff --git a/vendor/github.com/knative/pkg/test/zipkin/util.go b/vendor/knative.dev/pkg/test/zipkin/util.go similarity index 98% rename from vendor/github.com/knative/pkg/test/zipkin/util.go rename to vendor/knative.dev/pkg/test/zipkin/util.go index add07498f..9196db9f2 100644 --- a/vendor/github.com/knative/pkg/test/zipkin/util.go +++ b/vendor/knative.dev/pkg/test/zipkin/util.go @@ -25,10 +25,10 @@ import ( "net/http" "sync" - "github.com/knative/pkg/test/logging" - "github.com/knative/pkg/test/monitoring" "go.opencensus.io/trace" "k8s.io/client-go/kubernetes" + "knative.dev/pkg/test/logging" + "knative.dev/pkg/test/monitoring" ) const ( diff --git a/vendor/github.com/knative/pkg/testing/doc.go b/vendor/knative.dev/pkg/testing/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/testing/doc.go rename to vendor/knative.dev/pkg/testing/doc.go diff --git a/vendor/github.com/knative/pkg/testing/inner_default_resource.go b/vendor/knative.dev/pkg/testing/inner_default_resource.go similarity index 99% rename from vendor/github.com/knative/pkg/testing/inner_default_resource.go rename to vendor/knative.dev/pkg/testing/inner_default_resource.go index 5ee675648..df57397f8 100644 --- a/vendor/github.com/knative/pkg/testing/inner_default_resource.go +++ b/vendor/knative.dev/pkg/testing/inner_default_resource.go @@ -19,8 +19,8 @@ package testing import ( "context" - "github.com/knative/pkg/apis" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/vendor/github.com/knative/pkg/testing/register.go b/vendor/knative.dev/pkg/testing/register.go similarity index 100% rename from vendor/github.com/knative/pkg/testing/register.go rename to vendor/knative.dev/pkg/testing/register.go diff --git a/vendor/github.com/knative/pkg/testing/resource.go b/vendor/knative.dev/pkg/testing/resource.go similarity index 73% rename from vendor/github.com/knative/pkg/testing/resource.go rename to vendor/knative.dev/pkg/testing/resource.go index d553f8d47..aa1d68139 100644 --- a/vendor/github.com/knative/pkg/testing/resource.go +++ b/vendor/knative.dev/pkg/testing/resource.go @@ -20,12 +20,9 @@ import ( "context" "fmt" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/kmp" - - authenticationv1 "k8s.io/api/authentication/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "knative.dev/pkg/apis" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -38,13 +35,6 @@ type Resource struct { Spec ResourceSpec `json:"spec,omitempty"` } -const ( - // CreatorAnnotation is the annotation that denotes the user that created the resource. - CreatorAnnotation = "testing.knative.dev/creator" - // UpdaterAnnotation is the annotation that denotes the user that last updated the resource. - UpdaterAnnotation = "testing.knative.dev/updater" -) - // Check that Resource may be validated and defaulted. var _ apis.Validatable = (*Resource)(nil) var _ apis.Defaultable = (*Resource)(nil) @@ -60,47 +50,14 @@ type ResourceSpec struct { FieldThatsImmutableWithDefault string `json:"fieldThatsImmutableWithDefault,omitempty"` } +// GetUntypedSpec returns the spec of the resource. +func (r *Resource) GetUntypedSpec() interface{} { + return r.Spec +} + // SetDefaults sets the defaults on the object. func (c *Resource) SetDefaults(ctx context.Context) { c.Spec.SetDefaults(ctx) - - if apis.IsInUpdate(ctx) { - old := apis.GetBaseline(ctx).(*Resource) - c.AnnotateUserInfo(ctx, old, apis.GetUserInfo(ctx)) - } else { - c.AnnotateUserInfo(ctx, nil, apis.GetUserInfo(ctx)) - } -} - -// AnnotateUserInfo satisfies the Annotatable interface. -func (c *Resource) AnnotateUserInfo(ctx context.Context, prev *Resource, ui *authenticationv1.UserInfo) { - a := c.ObjectMeta.GetAnnotations() - if a == nil { - a = map[string]string{} - } - userName := ui.Username - - // If previous is nil (i.e. this is `Create` operation), - // then we set both fields. - // Otherwise copy creator from the previous state. - if prev == nil { - a[CreatorAnnotation] = userName - } else { - // No spec update ==> bail out. - if ok, _ := kmp.SafeEqual(prev.Spec, c.Spec); ok { - if prev.ObjectMeta.GetAnnotations() != nil { - a[CreatorAnnotation] = prev.ObjectMeta.GetAnnotations()[CreatorAnnotation] - userName = prev.ObjectMeta.GetAnnotations()[UpdaterAnnotation] - } - } else { - if prev.ObjectMeta.GetAnnotations() != nil { - a[CreatorAnnotation] = prev.ObjectMeta.GetAnnotations()[CreatorAnnotation] - } - } - } - // Regardless of `old` set the updater. - a[UpdaterAnnotation] = userName - c.ObjectMeta.SetAnnotations(a) } func (c *Resource) Validate(ctx context.Context) *apis.FieldError { diff --git a/vendor/github.com/knative/pkg/testing/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/testing/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/knative/pkg/testing/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/testing/zz_generated.deepcopy.go diff --git a/vendor/github.com/knative/pkg/tracing/config/doc.go b/vendor/knative.dev/pkg/tracing/config/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/tracing/config/doc.go rename to vendor/knative.dev/pkg/tracing/config/doc.go diff --git a/vendor/github.com/knative/pkg/tracing/config/tracing.go b/vendor/knative.dev/pkg/tracing/config/tracing.go similarity index 100% rename from vendor/github.com/knative/pkg/tracing/config/tracing.go rename to vendor/knative.dev/pkg/tracing/config/tracing.go diff --git a/vendor/github.com/knative/pkg/tracing/config/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/tracing/config/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/knative/pkg/tracing/config/zz_generated.deepcopy.go rename to vendor/knative.dev/pkg/tracing/config/zz_generated.deepcopy.go diff --git a/vendor/github.com/knative/pkg/tracing/http.go b/vendor/knative.dev/pkg/tracing/http.go similarity index 100% rename from vendor/github.com/knative/pkg/tracing/http.go rename to vendor/knative.dev/pkg/tracing/http.go diff --git a/vendor/github.com/knative/pkg/tracing/opencensus.go b/vendor/knative.dev/pkg/tracing/opencensus.go similarity index 97% rename from vendor/github.com/knative/pkg/tracing/opencensus.go rename to vendor/knative.dev/pkg/tracing/opencensus.go index e022164f3..5560413b7 100644 --- a/vendor/github.com/knative/pkg/tracing/opencensus.go +++ b/vendor/knative.dev/pkg/tracing/opencensus.go @@ -4,11 +4,12 @@ import ( "errors" "sync" - "github.com/knative/pkg/tracing/config" + "contrib.go.opencensus.io/exporter/zipkin" zipkinmodel "github.com/openzipkin/zipkin-go/model" zipkinreporter "github.com/openzipkin/zipkin-go/reporter" - "go.opencensus.io/exporter/zipkin" "go.opencensus.io/trace" + + "knative.dev/pkg/tracing/config" ) // ConfigOption is the interface for adding additional exporters and configuring opencensus tracing. diff --git a/vendor/github.com/knative/pkg/tracing/zipkin.go b/vendor/knative.dev/pkg/tracing/zipkin.go similarity index 96% rename from vendor/github.com/knative/pkg/tracing/zipkin.go rename to vendor/knative.dev/pkg/tracing/zipkin.go index c455c47ed..330b3ae8b 100644 --- a/vendor/github.com/knative/pkg/tracing/zipkin.go +++ b/vendor/knative.dev/pkg/tracing/zipkin.go @@ -20,7 +20,7 @@ import ( zipkinreporter "github.com/openzipkin/zipkin-go/reporter" httpreporter "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/knative/pkg/tracing/config" + "knative.dev/pkg/tracing/config" ) // ZipkinReporterFactory is a factory function which creates a reporter given a config diff --git a/vendor/github.com/knative/pkg/tracker/doc.go b/vendor/knative.dev/pkg/tracker/doc.go similarity index 100% rename from vendor/github.com/knative/pkg/tracker/doc.go rename to vendor/knative.dev/pkg/tracker/doc.go diff --git a/vendor/github.com/knative/pkg/tracker/enqueue.go b/vendor/knative.dev/pkg/tracker/enqueue.go similarity index 99% rename from vendor/github.com/knative/pkg/tracker/enqueue.go rename to vendor/knative.dev/pkg/tracker/enqueue.go index ed225c0c4..278fbc0a1 100644 --- a/vendor/github.com/knative/pkg/tracker/enqueue.go +++ b/vendor/knative.dev/pkg/tracker/enqueue.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "k8s.io/client-go/tools/cache" - "github.com/knative/pkg/kmeta" + "knative.dev/pkg/kmeta" ) // New returns an implementation of Interface that lets a Reconciler diff --git a/vendor/github.com/knative/pkg/tracker/interface.go b/vendor/knative.dev/pkg/tracker/interface.go similarity index 100% rename from vendor/github.com/knative/pkg/tracker/interface.go rename to vendor/knative.dev/pkg/tracker/interface.go diff --git a/vendor/github.com/knative/pkg/version/version.go b/vendor/knative.dev/pkg/version/version.go similarity index 100% rename from vendor/github.com/knative/pkg/version/version.go rename to vendor/knative.dev/pkg/version/version.go diff --git a/vendor/github.com/knative/pkg/webhook/OWNERS b/vendor/knative.dev/pkg/webhook/OWNERS similarity index 100% rename from vendor/github.com/knative/pkg/webhook/OWNERS rename to vendor/knative.dev/pkg/webhook/OWNERS diff --git a/vendor/github.com/knative/pkg/webhook/certs.go b/vendor/knative.dev/pkg/webhook/certs.go similarity index 99% rename from vendor/github.com/knative/pkg/webhook/certs.go rename to vendor/knative.dev/pkg/webhook/certs.go index ba0ee7393..1a0348394 100644 --- a/vendor/github.com/knative/pkg/webhook/certs.go +++ b/vendor/knative.dev/pkg/webhook/certs.go @@ -29,7 +29,7 @@ import ( "go.uber.org/zap" - "github.com/knative/pkg/logging" + "knative.dev/pkg/logging" ) const ( diff --git a/vendor/knative.dev/pkg/webhook/stats_reporter.go b/vendor/knative.dev/pkg/webhook/stats_reporter.go new file mode 100644 index 000000000..a1bd4d535 --- /dev/null +++ b/vendor/knative.dev/pkg/webhook/stats_reporter.go @@ -0,0 +1,151 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package webhook + +import ( + "context" + "strconv" + "time" + + "go.opencensus.io/stats" + "go.opencensus.io/stats/view" + "go.opencensus.io/tag" + admissionv1beta1 "k8s.io/api/admission/v1beta1" + "knative.dev/pkg/metrics" +) + +const ( + requestCountName = "request_count" + requestLatenciesName = "request_latencies" +) + +var ( + requestCountM = stats.Int64( + requestCountName, + "The number of requests that are routed to webhook", + stats.UnitDimensionless) + responseTimeInMsecM = stats.Float64( + requestLatenciesName, + "The response time in milliseconds", + stats.UnitMilliseconds) + + // Create the tag keys that will be used to add tags to our measurements. + // Tag keys must conform to the restrictions described in + // go.opencensus.io/tag/validate.go. Currently those restrictions are: + // - length between 1 and 255 inclusive + // - characters are printable US-ASCII + requestOperationKey = mustNewTagKey("request_operation") + kindGroupKey = mustNewTagKey("kind_group") + kindVersionKey = mustNewTagKey("kind_version") + kindKindKey = mustNewTagKey("kind_kind") + resourceGroupKey = mustNewTagKey("resource_group") + resourceVersionKey = mustNewTagKey("resource_version") + resourceResourceKey = mustNewTagKey("resource_resource") + resourceNameKey = mustNewTagKey("resource_name") + resourceNamespaceKey = mustNewTagKey("resource_namespace") + admissionAllowedKey = mustNewTagKey("admission_allowed") +) + +func init() { + register() +} + +// StatsReporter reports webhook metrics +type StatsReporter interface { + ReportRequest(request *admissionv1beta1.AdmissionRequest, response *admissionv1beta1.AdmissionResponse, d time.Duration) error +} + +// reporter implements StatsReporter interface +type reporter struct { + ctx context.Context +} + +// NewStatsReporter creaters a reporter for webhook metrics +func NewStatsReporter() (StatsReporter, error) { + ctx, err := tag.New( + context.Background(), + ) + if err != nil { + return nil, err + } + + return &reporter{ctx: ctx}, nil +} + +// Captures req count metric, recording the count and the duration +func (r *reporter) ReportRequest(req *admissionv1beta1.AdmissionRequest, resp *admissionv1beta1.AdmissionResponse, d time.Duration) error { + ctx, err := tag.New( + r.ctx, + tag.Insert(requestOperationKey, string(req.Operation)), + tag.Insert(kindGroupKey, req.Kind.Group), + tag.Insert(kindVersionKey, req.Kind.Version), + tag.Insert(kindKindKey, req.Kind.Kind), + tag.Insert(resourceGroupKey, req.Resource.Group), + tag.Insert(resourceVersionKey, req.Resource.Version), + tag.Insert(resourceResourceKey, req.Resource.Resource), + tag.Insert(resourceNameKey, req.Name), + tag.Insert(resourceNamespaceKey, req.Namespace), + tag.Insert(admissionAllowedKey, strconv.FormatBool(resp.Allowed)), + ) + if err != nil { + return err + } + + metrics.Record(ctx, requestCountM.M(1)) + // Convert time.Duration in nanoseconds to milliseconds + metrics.Record(ctx, responseTimeInMsecM.M(float64(d/time.Millisecond))) + return nil +} + +func register() { + tagKeys := []tag.Key{ + requestOperationKey, + kindGroupKey, + kindVersionKey, + kindKindKey, + resourceGroupKey, + resourceVersionKey, + resourceResourceKey, + resourceNamespaceKey, + resourceNameKey, + admissionAllowedKey} + + if err := view.Register( + &view.View{ + Description: requestCountM.Description(), + Measure: requestCountM, + Aggregation: view.Count(), + TagKeys: tagKeys, + }, + &view.View{ + Description: responseTimeInMsecM.Description(), + Measure: responseTimeInMsecM, + Aggregation: view.Distribution(metrics.Buckets125(1, 100000)...), // [1 2 5 10 20 50 100 200 500 1000 2000 5000 10000 20000 50000 100000]ms + TagKeys: tagKeys, + }, + ); err != nil { + panic(err) + } +} + +func mustNewTagKey(s string) tag.Key { + tagKey, err := tag.NewKey(s) + if err != nil { + panic(err) + } + return tagKey +} diff --git a/vendor/knative.dev/pkg/webhook/user_info.go b/vendor/knative.dev/pkg/webhook/user_info.go new file mode 100644 index 000000000..11f4e54a4 --- /dev/null +++ b/vendor/knative.dev/pkg/webhook/user_info.go @@ -0,0 +1,62 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package webhook + +import ( + "context" + + "k8s.io/apimachinery/pkg/api/equality" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "knative.dev/pkg/apis" +) + +const ( + // CreatorAnnotationSuffix is the suffix of the annotation key to describe + // the user that created the resource. + CreatorAnnotationSuffix = "/creator" + + // UpdaterAnnotationSuffix is the suffix of the annotation key to describe + // the user who last modified the resource. + UpdaterAnnotationSuffix = "/lastModifier" +) + +// SetUserInfoAnnotations sets creator and updater annotations on a resource. +func SetUserInfoAnnotations(resource apis.HasSpec, ctx context.Context, groupName string) { + if ui := apis.GetUserInfo(ctx); ui != nil { + objectMetaAccessor, ok := resource.(metav1.ObjectMetaAccessor) + if !ok { + return + } + + annotations := objectMetaAccessor.GetObjectMeta().GetAnnotations() + if annotations == nil { + annotations = map[string]string{} + objectMetaAccessor.GetObjectMeta().SetAnnotations(annotations) + } + + if apis.IsInUpdate(ctx) { + old := apis.GetBaseline(ctx).(apis.HasSpec) + if equality.Semantic.DeepEqual(old.GetUntypedSpec(), resource.GetUntypedSpec()) { + return + } + annotations[groupName+UpdaterAnnotationSuffix] = ui.Username + } else { + annotations[groupName+CreatorAnnotationSuffix] = ui.Username + annotations[groupName+UpdaterAnnotationSuffix] = ui.Username + } + } +} diff --git a/vendor/github.com/knative/pkg/webhook/webhook.go b/vendor/knative.dev/pkg/webhook/webhook.go similarity index 91% rename from vendor/github.com/knative/pkg/webhook/webhook.go rename to vendor/knative.dev/pkg/webhook/webhook.go index 8ed641765..3aa67dd96 100644 --- a/vendor/github.com/knative/pkg/webhook/webhook.go +++ b/vendor/knative.dev/pkg/webhook/webhook.go @@ -31,11 +31,11 @@ import ( "go.uber.org/zap" - "github.com/knative/pkg/apis" - "github.com/knative/pkg/apis/duck" - "github.com/knative/pkg/kmp" - "github.com/knative/pkg/logging" - "github.com/knative/pkg/logging/logkey" + "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck" + "knative.dev/pkg/kmp" + "knative.dev/pkg/logging" + "knative.dev/pkg/logging/logkey" "github.com/markbates/inflect" "github.com/mattbaird/jsonpatch" @@ -99,6 +99,10 @@ type ControllerOptions struct { // TLS Client Authentication. // The default value is tls.NoClientCert. ClientAuth tls.ClientAuthType + + // StatsReporter reports metrics about the webhook. + // This will be automatically initialized by the constructor if left uninitialized. + StatsReporter StatsReporter } // ResourceCallback defines a signature for resource specific (Route, Configuration, etc.) @@ -135,6 +139,33 @@ type GenericCRD interface { runtime.Object } +// NewAdmissionController constructs an AdmissionController +func NewAdmissionController( + client kubernetes.Interface, + opts ControllerOptions, + handlers map[schema.GroupVersionKind]GenericCRD, + logger *zap.SugaredLogger, + ctx func(context.Context) context.Context, + disallowUnknownFields bool) (*AdmissionController, error) { + + if opts.StatsReporter == nil { + reporter, err := NewStatsReporter() + if err != nil { + return nil, err + } + opts.StatsReporter = reporter + } + + return &AdmissionController{ + Client: client, + Options: opts, + Handlers: handlers, + Logger: logger, + WithContext: ctx, + DisallowUnknownFields: disallowUnknownFields, + }, nil +} + // GetAPIServerExtensionCACert gets the Kubernetes aggregate apiserver // client CA cert used by validator. // @@ -408,6 +439,7 @@ func (ac *AdmissionController) register( // ServeHTTP implements the external admission webhook for mutating // serving resources. func (ac *AdmissionController) ServeHTTP(w http.ResponseWriter, r *http.Request) { + var ttStart = time.Now() logger := ac.Logger logger.Infof("Webhook ServeHTTP request=%#v", r) @@ -452,6 +484,11 @@ func (ac *AdmissionController) ServeHTTP(w http.ResponseWriter, r *http.Request) http.Error(w, fmt.Sprintf("could encode response: %v", err), http.StatusInternalServerError) return } + + if ac.Options.StatsReporter != nil { + // Only report valid requests + ac.Options.StatsReporter.ReportRequest(review.Request, response.Response, time.Since(ttStart)) + } } func makeErrorStatus(reason string, args ...interface{}) *admissionv1beta1.AdmissionResponse { @@ -550,6 +587,11 @@ func (ac *AdmissionController) mutate(ctx context.Context, req *admissionv1beta1 oldObj = oldObj.DeepCopyObject().(GenericCRD) oldObj.SetDefaults(ctx) + s, ok := oldObj.(apis.HasSpec) + if ok { + SetUserInfoAnnotations(s, ctx, req.Resource.Group) + } + if req.SubResource == "" { ctx = apis.WithinUpdate(ctx, oldObj) } else { @@ -568,6 +610,11 @@ func (ac *AdmissionController) mutate(ctx context.Context, req *admissionv1beta1 return nil, err } + if patches, err = ac.setUserInfoAnnotations(ctx, patches, newObj, req.Resource.Group); err != nil { + logger.Errorw("Failed the resource user info annotator", zap.Error(err)) + return nil, err + } + // None of the validators will accept a nil value for newObj. if newObj == nil { return nil, errMissingNewObject @@ -582,6 +629,26 @@ func (ac *AdmissionController) mutate(ctx context.Context, req *admissionv1beta1 return json.Marshal(patches) } +func (ac *AdmissionController) setUserInfoAnnotations(ctx context.Context, patches duck.JSONPatch, new GenericCRD, groupName string) (duck.JSONPatch, error) { + if new == nil { + return patches, nil + } + nh, ok := new.(apis.HasSpec) + if !ok { + return patches, nil + } + + b, a := new.DeepCopyObject().(apis.HasSpec), nh + + SetUserInfoAnnotations(nh, ctx, groupName) + + patch, err := duck.CreatePatch(b, a) + if err != nil { + return nil, err + } + return append(patches, patch...), nil +} + // roundTripPatch generates the JSONPatch that corresponds to round tripping the given bytes through // the Golang type (JSON -> Golang type -> JSON). Because it is not always true that // bytes == json.Marshal(json.Unmarshal(bytes)). diff --git a/vendor/github.com/knative/pkg/websocket/connection.go b/vendor/knative.dev/pkg/websocket/connection.go similarity index 100% rename from vendor/github.com/knative/pkg/websocket/connection.go rename to vendor/knative.dev/pkg/websocket/connection.go diff --git a/vendor/github.com/knative/pkg/websocket/hijack.go b/vendor/knative.dev/pkg/websocket/hijack.go similarity index 100% rename from vendor/github.com/knative/pkg/websocket/hijack.go rename to vendor/knative.dev/pkg/websocket/hijack.go